fix: start cluster connection

kubeshop · Feb 22, 2023 · d2816b5 · d2816b5
1 parent 6171068
commit d2816b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/redux/reducers/ui.ts b/src/redux/reducers/ui.ts
@@ -8,6 +8,7 @@ import {Entries} from 'type-fest';
 import {DEFAULT_PANE_CONFIGURATION} from '@constants/constants';
 
 import initialState from '@redux/initialState';
+import {loadClusterResources} from '@redux/thunks/cluster';
 import {setRootFolder} from '@redux/thunks/setRootFolder';
 
 import {ROOT_FILE_ENTRY} from '@shared/constants/fileEntry';
@@ -348,6 +349,10 @@ export const uiSlice = createSlice({
       })
       .addCase(setRootFolder.rejected, state => {
         state.isFolderLoading = false;
+      })
+      .addCase(loadClusterResources.fulfilled, state => {
+        state.leftMenu.selection = 'dashboard';
+        state.leftMenu.isActive = true;
       });
   },
 });

diff --git a/src/redux/thunks/cluster/startClusterConnection.ts b/src/redux/thunks/cluster/startClusterConnection.ts
@@ -1,7 +1,6 @@
 import {createAsyncThunk} from '@reduxjs/toolkit';
 
 import {setClusterProxyPort} from '@redux/appConfig';
-import {setLeftMenuSelection} from '@redux/reducers/ui';
 import {disconnectFromCluster} from '@redux/services/clusterResourceWatcher';
 import {stopPreview} from '@redux/services/preview';
 
@@ -39,7 +38,6 @@ export const startClusterConnection = createAsyncThunk<
       thunkAPI.dispatch(reloadClusterResources({context, namespace}));
     } else {
       thunkAPI.dispatch(loadClusterResources({context, namespace}));
-      thunkAPI.dispatch(setLeftMenuSelection('dashboard'));
     }
 
     return;
@@ -50,7 +48,6 @@ export const startClusterConnection = createAsyncThunk<
       thunkAPI.dispatch(reloadClusterResources({context, namespace, port: clusterProxyPort}));
     } else {
       thunkAPI.dispatch(loadClusterResources({context, namespace, port: clusterProxyPort}));
-      thunkAPI.dispatch(setLeftMenuSelection('dashboard'));
     }
 
     return;