Merge pull request meshery#8314 from theBeginner86/theBeginner86/chor…

…e/14 [bug] Fix K8s Ctx Selector
sudhanshutech · Jul 31, 2023 · ecd4a03 · ecd4a03
2 parents 4fa80e2 + a7e1e73
commit ecd4a03
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 28 deletions.
diff --git a/ui/components/DashboardComponent.js b/ui/components/DashboardComponent.js
@@ -1229,7 +1229,7 @@ class DashboardComponent extends React.Component {
   };
 
   render() {
-    console.info("Rerendering Dashboard")
+    // console.info("Rerendering Dashboard")
     return this.configureTemplate();
   }
 }

diff --git a/ui/components/Header.js b/ui/components/Header.js
@@ -539,9 +539,6 @@ class Header extends React.Component {
       this.setState({ capabilityregistryObj : new CapabilityRegistryClass(this.props.capabilitiesRegistry) });
     }
 
-
-
-
   }
 
   componentWillUnmount = () => {

diff --git a/ui/components/MeshConfigComponent.js b/ui/components/MeshConfigComponent.js
@@ -947,7 +947,7 @@ function MesherySettingsNew({ classes, enqueueSnackbar, closeSnackbar, updatePro
   return (
     <div style={{ display : 'table', tableLayout : 'fixed', width : '100%' }}>
       <div className={classes.topToolbar}>
-        < MesherySettingsEnvButtons/>
+        <MesherySettingsEnvButtons/>
       </div>
       <DataTable
         columns={columns}

diff --git a/ui/components/MesherySettings.js b/ui/components/MesherySettings.js
@@ -432,7 +432,7 @@ class MesherySettings extends React.Component {
           </Tabs>
         </Paper>
         {tabVal === 0 && (
-          <MeshConfigComponent />
+          <MeshConfigComponent/>
         )}
         {tabVal === 1 && (
           <TabContainer>

diff --git a/ui/lib/store.js b/ui/lib/store.js
@@ -247,7 +247,7 @@ export const updateK8SConfig = ({ k8sConfig }) => dispatch => {
   return dispatch({ type : actionTypes.UPDATE_CLUSTER_CONFIG, k8sConfig });
 }
 
-export const setK8sContexts = ({  selectedK8sContexts}) => dispatch => {
+export const setK8sContexts = ({ selectedK8sContexts }) => dispatch => {
   return dispatch({ type : actionTypes.SET_K8S_CONTEXT, selectedK8sContexts });
 }
 

diff --git a/ui/pages/_app.js b/ui/pages/_app.js
@@ -160,7 +160,7 @@ class MesheryApp extends App {
 
     const k8sContextSubscription = (page="", search="", pageSize="10", order="") => {
       return subscribeK8sContext((result) => {
-        this.setState({ k8sContexts : result.k8sContext }, () => this.setActiveContexts("all"))
+        this.setState({ k8sContexts : result.k8sContext }, () =>  this.setActiveContexts("all"))
         this.props.store.dispatch({ type : actionTypes.UPDATE_CLUSTER_CONFIG, k8sConfig : result.k8sContext.contexts });
       },
       {
@@ -245,11 +245,8 @@ class MesheryApp extends App {
           activeContexts.push(ctx.id)
         );
         activeContexts.push("all");
-        this.setState(state => {
-          if (state.activeK8sContexts?.includes("all")) return { activeK8sContexts : [] };
-          return { activeK8sContexts : activeContexts };
-        },
-        () => this.activeContextChangeCallback(this.state.activeK8sContexts));
+        this.setState({ activeK8sContexts : activeContexts },
+          () => this.activeContextChangeCallback(this.state.activeK8sContexts));
         return;
       }
 
@@ -292,19 +289,6 @@ class MesheryApp extends App {
         credentials : 'include',
       }, result => {
         if (result) {
-          if (result.k8sConfig && result.k8sConfig.length != 0) {
-            const kubeConfigs = result.k8sConfig.map(config => Object.assign({
-              inClusterConfig : false,
-              k8sfile : "",
-              name : "",
-              clusterConfigured : "",
-              server : "",
-              created_at : "",
-              updated_at : "",
-              ts : new Date()
-            }, config));
-            store.dispatch({ type : actionTypes.UPDATE_CLUSTER_CONFIG, k8sConfig : kubeConfigs });
-          }
           if (result.meshAdapters && result.meshAdapters !== null && result.meshAdapters.length > 0) {
             store.dispatch({ type : actionTypes.UPDATE_ADAPTERS_INFO, meshAdapters : result.meshAdapters });
           }

diff --git a/ui/utils/multi-ctx.js b/ui/utils/multi-ctx.js
@@ -32,9 +32,8 @@ export const getK8sClusterIdsFromCtxId = (selectedContexts, k8sconfig) => {
   }
 
   const clusterIds = [];
-
   selectedContexts.forEach(context => {
-    const clusterId = k8sconfig.find(cfg => cfg.id === context)?.clusterID
+    const clusterId = k8sconfig.find(cfg => cfg.id === context)?.kubernetes_server_id
     if (clusterId) {
       clusterIds.push(clusterId)
     }