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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/authenticated/cluster/edit/route.js
View File

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

7
app/components/page-header/template.hbs
View File

@ -214,13 +214,6 @@
</span>
{{/link-to}}
</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 {{action dd.actions.close}}>
{{#link-to "logout" class="user-logout"}}

14
app/instance-initializers/nav.js
View File

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

16
lib/global-admin/addon/cluster-templates/route.js
View File

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

16
lib/global-admin/addon/clusters/index/route.js
View File

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

8
lib/global-admin/addon/settings/advanced/route.js
View File

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

8
lib/monitoring/addon/index/route.js
View File

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

2
package.json
View File

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

6
yarn.lock
View File

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