fix switch context on cluster overview (kyma-project#2360)

* fix switch context on cluster overview * bump * remove clg
Ressetkk · Feb 23, 2023 · 8843941 · 8843941
1 parent 60126d3
commit 8843941
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 20 deletions.
diff --git a/resources/web/deployment.yaml b/resources/web/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: busola
-          image: eu.gcr.io/kyma-project/busola-web:PR-2361
+          image: eu.gcr.io/kyma-project/busola-web:PR-2360
           imagePullPolicy: Always
           resources:
             requests:

diff --git a/src/command-pallette/CommandPalletteUI/handlers/clusterResourceHandler.ts b/src/command-pallette/CommandPalletteUI/handlers/clusterResourceHandler.ts
@@ -214,26 +214,41 @@ function createResults(context: CommandPaletteContext): Result[] {
   };
 
   if (resourceType === 'namespaces' && ['-a', '*', 'all'].includes(name)) {
-    return [
-      {
-        label: t('navigation.all-namespaces'),
-        category: resourceTypeText,
-        query: matchedNode.resourceType,
-        onActivate: () =>
-          sendNamespaceSwitchMessage('-all-', activeClusterName!, navigate),
-        customActionText: t('command-palette.item-actions.switch'),
-      },
-      {
-        label: t('navigation.all-namespaces'),
-        category: resourceTypeText,
-        query: matchedNode.resourceType,
-        onActivate: () => {
-          const pathname = `/cluster/${activeClusterName}/namespaces/-all-`;
-          navigate(pathname);
+    if (window.location.pathname.includes('namespaces')) {
+      return [
+        {
+          label: t('navigation.all-namespaces'),
+          category: resourceTypeText,
+          query: matchedNode.resourceType,
+          onActivate: () =>
+            sendNamespaceSwitchMessage('-all-', activeClusterName!, navigate),
+          customActionText: t('command-palette.item-actions.switch'),
         },
-      },
-      linkToList,
-    ];
+        {
+          label: t('navigation.all-namespaces'),
+          category: resourceTypeText,
+          query: matchedNode.resourceType,
+          onActivate: () => {
+            const pathname = `/cluster/${activeClusterName}/namespaces/-all-`;
+            navigate(pathname);
+          },
+        },
+        linkToList,
+      ];
+    } else {
+      return [
+        {
+          label: t('navigation.all-namespaces'),
+          category: resourceTypeText,
+          query: matchedNode.resourceType,
+          onActivate: () => {
+            const pathname = `/cluster/${activeClusterName}/namespaces/-all-`;
+            navigate(pathname);
+          },
+        },
+        linkToList,
+      ];
+    }
   }
 
   let resources = resourceCache[resourceType];