rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address PR Feedback

This commit is contained in:
Neil MacDougall 2021-06-25 11:33:52 +01:00
parent 89fb0f4ed1 838407262f
commit fd4d6d474d
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/translations/en-us.yaml
View File

@ -4679,9 +4679,6 @@ v1ClusterTools:
istio: istio:
label: Istio (Legacy) 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.' 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: legacy:
alerts: Alerts alerts: Alerts

3
components/EmberPage.vue
View File

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

17
pages/c/_cluster/explorer/tools/index.vue
View File

@ -26,11 +26,14 @@ export default {
// If legacy feature flag enabled // If legacy feature flag enabled
if (this.legacyEnabled) { 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) { if (res) {
this.v1SystemCatalog = res.data.reduce((map, template) => { this.v1SystemCatalog = res.reduce((map, template) => {
map[template.name] = template; map[template.spec.displayName] = template;
return map; return map;
}, {}); }, {});
@ -108,7 +111,6 @@ export default {
this.moveAppWhenLegacy(chartsWithApps, 'v1-monitoring', 'rancher-monitoring'); this.moveAppWhenLegacy(chartsWithApps, 'v1-monitoring', 'rancher-monitoring');
this.moveAppWhenLegacy(chartsWithApps, 'v1-logging', 'rancher-logging'); this.moveAppWhenLegacy(chartsWithApps, 'v1-logging', 'rancher-logging');
this.moveAppWhenLegacy(chartsWithApps, 'v1-istio', 'rancher-istio'); this.moveAppWhenLegacy(chartsWithApps, 'v1-istio', 'rancher-istio');
this.moveAppWhenLegacy(chartsWithApps, 'v1-cis', 'rancher-cis');
} }
return chartsWithApps; return chartsWithApps;
@ -120,7 +122,6 @@ export default {
this._legacyChart('monitoring'), this._legacyChart('monitoring'),
this._legacyChart('logging'), this._legacyChart('logging'),
this._legacyChart('istio'), this._legacyChart('istio'),
this._legacyChart('cis'),
]; ];
} }
}, },
@ -176,8 +177,8 @@ export default {
const versions = []; const versions = [];
const c = this.v1SystemCatalog?.[id]; const c = this.v1SystemCatalog?.[id];
if (c) { if (c?.spec?.versions) {
Object.keys(c.versionLinks).forEach(v => versions.unshift({ version: v })); c.spec.versions.forEach(v => versions.push({ version: v.version }));
} }
return versions; return versions;