Overview page fixes

kiali · Jun 9, 2023 · aba3401 · aba3401
1 parent 5a17b2c
commit aba3401
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/business/istio_config_test.go b/business/istio_config_test.go
@@ -227,7 +227,7 @@ func TestCheckMulticlusterPermissions(t *testing.T) {
 
 	istioConfigDetailsRemote, err := configService.GetIstioConfigDetails(context.TODO(), "east", "test", "gateways", "gw-1")
 	assert.Equal("gw-1", istioConfigDetailsRemote.Gateway.Name)
-	assert.False(istioConfigDetailsRemote.Permissions.Update)
+	assert.True(istioConfigDetailsRemote.Permissions.Update)
 	assert.False(istioConfigDetailsRemote.Permissions.Delete)
 	assert.Nil(err)
 }

diff --git a/frontend/src/pages/Overview/OverviewPage.tsx b/frontend/src/pages/Overview/OverviewPage.tsx
@@ -506,14 +506,15 @@ export class OverviewPage extends React.Component<OverviewProps, State> {
   }
 
   fetchValidationResultForCluster(namespaces: NamespaceInfo[], cluster: string) {
-    return Promise.all([API.getConfigValidations(cluster), API.getAllIstioConfigs([], [], false, '', '')])
+    return Promise.all([API.getConfigValidations(cluster), API.getAllIstioConfigs([], [], false, '', '', cluster)])
       .then(results => {
         namespaces.forEach(nsInfo => {
           if (nsInfo.cluster && nsInfo.cluster === cluster && results[0].data[nsInfo.cluster]) {
             nsInfo.validations = results[0].data[nsInfo.cluster][nsInfo.name];
           }
-          // TODO: cluster param here when remote cluster config creation supported
-          nsInfo.istioConfig = results[1].data[nsInfo.name];
+          if (nsInfo.cluster && nsInfo.cluster === cluster) {
+            nsInfo.istioConfig = results[1].data[nsInfo.name];
+          }
         });
       })
       .catch(err => this.handleAxiosError('Could not fetch validations status', err));

diff --git a/frontend/src/pages/Overview/OverviewTrafficPolicies.tsx b/frontend/src/pages/Overview/OverviewTrafficPolicies.tsx
@@ -252,7 +252,11 @@ export default class OverviewTrafficPolicies extends React.Component<OverviewTra
     const aps = items.filter(i => i.type === 'authorizationPolicy')[0];
     const sds = items.filter(i => i.type === 'sidecar')[0];
     this.setState(
-      { authorizationPolicies: aps.items as AuthorizationPolicy[], sidecars: sds.items as Sidecar[], loaded: false },
+      {
+        authorizationPolicies: aps ? (aps.items as AuthorizationPolicy[]) : [],
+        sidecars: sds ? (sds.items as Sidecar[]) : [],
+        loaded: false
+      },
       () => this.fetchPermission(true, false)
     );
   };