Address PR Feedback

assets/translations/en-us.yaml

@@ -4679,9 +4679,6 @@ v1ClusterTools:
   istio:
     label: Istio (Legacy)
     description: 'Legacy V1 Istio. Istio v1.5 has been deprecated since Rancher 2.5.0. <a target="blank" href="https://rancher.com/docs/rancher/v2.5/en/istio/#migrate-from-previous-istio-version">Learn more</a> about migrating to the latest version.'
-  cis:
-    label: CIS Scanning (Legacy)
-    description: Leagcy CIS Scanning. CIS Scanning has been deprecated as of Rancher 2.5.0 - use the newer CIS Benchmarking.
 
 legacy:
   alerts: Alerts

components/EmberPage.vue

@@ -45,8 +45,7 @@ const INTERCEPTS = {
     }
   },
   'authenticated.cluster.istio.cluster-setting': {
-    name:   'c-cluster-explorer-tools-pages-page',
-    params: { page: 'istio' }
+    name:   'c-cluster-explorer-tools',
   },
 };
 

pages/c/_cluster/explorer/tools/index.vue

@@ -26,11 +26,14 @@ export default {
 
     // If legacy feature flag enabled
     if (this.legacyEnabled) {
-      const res = await this.$store.dispatch('cluster/request', { url: '/v3/templates?catalogId=system-library' });
+      const res = await this.$store.dispatch('management/findMatching', {
+        type: 'management.cattle.io.catalogtemplate',
+        selector: 'catalog.cattle.io/name=system-library'
+      });
 
-      if (res && res.data) {
-        this.v1SystemCatalog = res.data.reduce((map, template) => {
-          map[template.name] = template;
+      if (res) {
+        this.v1SystemCatalog = res.reduce((map, template) => {
+          map[template.spec.displayName] = template;
 
           return map;
         }, {});
@@ -108,7 +111,6 @@ export default {
         this.moveAppWhenLegacy(chartsWithApps, 'v1-monitoring', 'rancher-monitoring');
         this.moveAppWhenLegacy(chartsWithApps, 'v1-logging', 'rancher-logging');
         this.moveAppWhenLegacy(chartsWithApps, 'v1-istio', 'rancher-istio');
-        this.moveAppWhenLegacy(chartsWithApps, 'v1-cis', 'rancher-cis');
       }
 
       return chartsWithApps;
@@ -120,7 +122,6 @@ export default {
         this._legacyChart('monitoring'),
         this._legacyChart('logging'),
         this._legacyChart('istio'),
-        this._legacyChart('cis'),
       ];
     }
   },
@@ -176,8 +177,8 @@ export default {
       const versions = [];
       const c = this.v1SystemCatalog?.[id];
 
-      if (c) {
-        Object.keys(c.versionLinks).forEach(v => versions.unshift({ version: v }));
+      if (c?.spec?.versions) {
+        c.spec.versions.forEach(v => versions.push({ version: v.version }));
       }
 
       return versions;