Update caniuselite and fix broken pages dues to RKE1 removal (#5243)

* Update caniuselite and fix broken pages dues to RKE1 removal

* Fix lint issues
This commit is contained in:
Neil MacDougall 2025-09-03 08:57:27 +01:00 committed by GitHub
parent ed4a13926f
commit b79cb11a86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 41 additions and 48 deletions

View File

@ -40,12 +40,12 @@ export default Route.extend({
this.releaseVersions.getAllVersions(cluster.driver); this.releaseVersions.getAllVersions(cluster.driver);
} }
if (!isEmpty(cluster.clusterTemplateRevisionId)) { // if (!isEmpty(cluster.clusterTemplateRevisionId)) {
setProperties(modelOut, { // setProperties(modelOut, {
clusterTemplateRevisions: globalStore.findAll('clustertemplaterevision'), // clusterTemplateRevisions: globalStore.findAll('clustertemplaterevision'),
clusterTemplates: globalStore.findAll('clustertemplate'), // clusterTemplates: globalStore.findAll('clustertemplate'),
}); // });
} // }
return hash(modelOut); return hash(modelOut);
}, },

View File

@ -214,13 +214,6 @@
</span> </span>
{{/link-to}} {{/link-to}}
</li> </li>
<li {{action dd.actions.close}}>
{{#link-to "nodes.node-templates"}}
<span>
{{t "nav.nodeTemplates.link"}}
</span>
{{/link-to}}
</li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li {{action dd.actions.close}}> <li {{action dd.actions.close}}>
{{#link-to "logout" class="user-logout"}} {{#link-to "logout" class="user-logout"}}

View File

@ -321,13 +321,13 @@ const rootNav = [
// resource: ['globaldns'], // resource: ['globaldns'],
// resourceScope: 'global', // resourceScope: 'global',
// }, // },
{ // {
id: 'rke-template', // id: 'rke-template',
localizedLabel: 'nav.admin.clusters.rkeTemplate', // localizedLabel: 'nav.admin.clusters.rkeTemplate',
route: 'global-admin.cluster-templates', // route: 'global-admin.cluster-templates',
resource: ['clustertemplate'], // resource: ['clustertemplate'],
resourceScope: 'global', // resourceScope: 'global',
}, // },
{ divider: true }, { divider: true },
{ {
id: 'tools-fleet', id: 'tools-fleet',

View File

@ -1,16 +1,16 @@
import Route from '@ember/routing/route'; import Route from '@ember/routing/route';
import { hash } from 'rsvp'; // import { hash } from 'rsvp';
import { inject as service } from '@ember/service'; import { inject as service } from '@ember/service';
export default Route.extend({ export default Route.extend({
globalStore: service(), globalStore: service(),
model() { // model() {
const { globalStore: gs } = this; // const { globalStore: gs } = this;
return hash({ // return hash({
clusterTemplates: gs.findAll('clustertemplate'), // clusterTemplates: gs.findAll('clustertemplate'),
clusterTemplateRevisions: gs.findAll('clustertemplaterevision'), // clusterTemplateRevisions: gs.findAll('clustertemplaterevision'),
}); // });
} // }
}); });

View File

@ -1,7 +1,7 @@
import { next } from '@ember/runloop'; import { next } from '@ember/runloop';
import { hash } from 'rsvp'; // import { hash } from 'rsvp';
import { inject as service } from '@ember/service'; import { inject as service } from '@ember/service';
import { get } from '@ember/object'; // import { get } from '@ember/object';
import Route from '@ember/routing/route'; import Route from '@ember/routing/route';
export default Route.extend({ export default Route.extend({
@ -9,12 +9,12 @@ export default Route.extend({
shortcuts: { 'g': 'toggleGrouping', }, shortcuts: { 'g': 'toggleGrouping', },
afterModel() { // afterModel() {
return hash( // return hash(
get(this, 'globalStore').findAll('clusterTemplateRevision'), // get(this, 'globalStore').findAll('clusterTemplateRevision'),
get(this, 'globalStore').findAll('clusterTemplate'), // get(this, 'globalStore').findAll('clusterTemplate'),
); // );
}, // },
actions: { actions: {
toggleGrouping() { toggleGrouping() {

View File

@ -8,9 +8,9 @@ export default Route.extend({
globalStore: service(), globalStore: service(),
beforeModel() { beforeModel() {
return this.get('settings').load([ // return this.get('settings').load([
C.SETTING.TELEMETRY, // C.SETTING.TELEMETRY,
]); // ]);
}, },
model() { model() {
@ -21,7 +21,7 @@ export default Route.extend({
let serverUrl = settings.findBy('id', C.SETTING.SERVER_URL); let serverUrl = settings.findBy('id', C.SETTING.SERVER_URL);
return { return {
telemetry: settings.findBy('id', C.SETTING.TELEMETRY), telemetry: false,
serverUrl: get(serverUrl, 'value') || window.location.host, serverUrl: get(serverUrl, 'value') || window.location.host,
serverUrlSetting: serverUrl, serverUrlSetting: serverUrl,
}; };

View File

@ -46,10 +46,10 @@ export default Route.extend({
}, },
afterModel() { afterModel() {
return hash( // return hash(
get(this, 'globalStore').findAll('clusterTemplateRevision'), // get(this, 'globalStore').findAll('clusterTemplateRevision'),
get(this, 'globalStore').findAll('clusterTemplate'), // get(this, 'globalStore').findAll('clusterTemplate'),
); // );
}, },
setDefaultRoute: on('activate', function() { setDefaultRoute: on('activate', function() {

View File

@ -89,8 +89,8 @@
"js-yaml": "3.14.0", "js-yaml": "3.14.0",
"json2yaml": "^1.1.0", "json2yaml": "^1.1.0",
"jsondiffpatch": "^0.4.1", "jsondiffpatch": "^0.4.1",
"linkifyjs": "^4.1.3",
"linkify-string": "^4.1.3", "linkify-string": "^4.1.3",
"linkifyjs": "^4.1.3",
"loader.js": "^4.7.0", "loader.js": "^4.7.0",
"moment": "~2.29.4", "moment": "~2.29.4",
"node-sass": "4.14.1", "node-sass": "4.14.1",

View File

@ -5416,9 +5416,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219:
version "1.0.30001644" version "1.0.30001737"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001644.tgz" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001737.tgz"
integrity sha512-YGvlOZB4QhZuiis+ETS0VXR+MExbFf4fZYYeMTEE0aTQd/RdIjkTyZjLrbYVKnHzppDvnOhritRVv+i7Go6mHw== integrity sha512-BiloLiXtQNrY5UyF0+1nSJLXUENuhka2pzy2Fx5pGxqavdrxSCW4U6Pn/PoG3Efspi2frRbHpBV2XsrPE6EDlw==
capture-exit@^2.0.0: capture-exit@^2.0.0:
version "2.0.0" version "2.0.0"