Skip to content

Commit 5267b6d

Browse files
committed
Update caniuselite and fix broken pages dues to RKE1 removal
1 parent 1322490 commit 5267b6d

File tree

9 files changed

+33
-40
lines changed

9 files changed

+33
-40
lines changed

app/authenticated/cluster/edit/route.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ export default Route.extend({
4040
this.releaseVersions.getAllVersions(cluster.driver);
4141
}
4242

43-
if (!isEmpty(cluster.clusterTemplateRevisionId)) {
44-
setProperties(modelOut, {
45-
clusterTemplateRevisions: globalStore.findAll('clustertemplaterevision'),
46-
clusterTemplates: globalStore.findAll('clustertemplate'),
47-
});
48-
}
43+
// if (!isEmpty(cluster.clusterTemplateRevisionId)) {
44+
// setProperties(modelOut, {
45+
// clusterTemplateRevisions: globalStore.findAll('clustertemplaterevision'),
46+
// clusterTemplates: globalStore.findAll('clustertemplate'),
47+
// });
48+
// }
4949

5050
return hash(modelOut);
5151
},

app/components/page-header/template.hbs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,6 @@
214214
</span>
215215
{{/link-to}}
216216
</li>
217-
<li {{action dd.actions.close}}>
218-
{{#link-to "nodes.node-templates"}}
219-
<span>
220-
{{t "nav.nodeTemplates.link"}}
221-
</span>
222-
{{/link-to}}
223-
</li>
224217
<li role="separator" class="divider"></li>
225218
<li {{action dd.actions.close}}>
226219
{{#link-to "logout" class="user-logout"}}

app/instance-initializers/nav.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,13 @@ const rootNav = [
321321
// resource: ['globaldns'],
322322
// resourceScope: 'global',
323323
// },
324-
{
325-
id: 'rke-template',
326-
localizedLabel: 'nav.admin.clusters.rkeTemplate',
327-
route: 'global-admin.cluster-templates',
328-
resource: ['clustertemplate'],
329-
resourceScope: 'global',
330-
},
324+
// {
325+
// id: 'rke-template',
326+
// localizedLabel: 'nav.admin.clusters.rkeTemplate',
327+
// route: 'global-admin.cluster-templates',
328+
// resource: ['clustertemplate'],
329+
// resourceScope: 'global',
330+
// },
331331
{ divider: true },
332332
{
333333
id: 'tools-fleet',

lib/global-admin/addon/cluster-templates/route.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export default Route.extend({
88
model() {
99
const { globalStore: gs } = this;
1010

11-
return hash({
12-
clusterTemplates: gs.findAll('clustertemplate'),
13-
clusterTemplateRevisions: gs.findAll('clustertemplaterevision'),
14-
});
11+
// return hash({
12+
// clusterTemplates: gs.findAll('clustertemplate'),
13+
// clusterTemplateRevisions: gs.findAll('clustertemplaterevision'),
14+
// });
1515
}
1616
});

lib/global-admin/addon/clusters/index/route.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ export default Route.extend({
1010
shortcuts: { 'g': 'toggleGrouping', },
1111

1212
afterModel() {
13-
return hash(
14-
get(this, 'globalStore').findAll('clusterTemplateRevision'),
15-
get(this, 'globalStore').findAll('clusterTemplate'),
16-
);
13+
// return hash(
14+
// get(this, 'globalStore').findAll('clusterTemplateRevision'),
15+
// get(this, 'globalStore').findAll('clusterTemplate'),
16+
// );
1717
},
1818

1919
actions: {

lib/global-admin/addon/settings/advanced/route.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export default Route.extend({
88
globalStore: service(),
99

1010
beforeModel() {
11-
return this.get('settings').load([
12-
C.SETTING.TELEMETRY,
13-
]);
11+
// return this.get('settings').load([
12+
// C.SETTING.TELEMETRY,
13+
// ]);
1414
},
1515

1616
model() {
@@ -21,7 +21,7 @@ export default Route.extend({
2121
let serverUrl = settings.findBy('id', C.SETTING.SERVER_URL);
2222

2323
return {
24-
telemetry: settings.findBy('id', C.SETTING.TELEMETRY),
24+
telemetry: false,
2525
serverUrl: get(serverUrl, 'value') || window.location.host,
2626
serverUrlSetting: serverUrl,
2727
};

lib/monitoring/addon/index/route.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ export default Route.extend({
4646
},
4747

4848
afterModel() {
49-
return hash(
50-
get(this, 'globalStore').findAll('clusterTemplateRevision'),
51-
get(this, 'globalStore').findAll('clusterTemplate'),
52-
);
49+
// return hash(
50+
// get(this, 'globalStore').findAll('clusterTemplateRevision'),
51+
// get(this, 'globalStore').findAll('clusterTemplate'),
52+
// );
5353
},
5454

5555
setDefaultRoute: on('activate', function() {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
"js-yaml": "3.14.0",
9090
"json2yaml": "^1.1.0",
9191
"jsondiffpatch": "^0.4.1",
92-
"linkifyjs": "^4.1.3",
9392
"linkify-string": "^4.1.3",
93+
"linkifyjs": "^4.1.3",
9494
"loader.js": "^4.7.0",
9595
"moment": "~2.29.4",
9696
"node-sass": "4.14.1",

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5416,9 +5416,9 @@ caniuse-api@^3.0.0:
54165416
lodash.uniq "^4.5.0"
54175417

54185418
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219:
5419-
version "1.0.30001644"
5420-
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001644.tgz"
5421-
integrity sha512-YGvlOZB4QhZuiis+ETS0VXR+MExbFf4fZYYeMTEE0aTQd/RdIjkTyZjLrbYVKnHzppDvnOhritRVv+i7Go6mHw==
5419+
version "1.0.30001737"
5420+
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001737.tgz"
5421+
integrity sha512-BiloLiXtQNrY5UyF0+1nSJLXUENuhka2pzy2Fx5pGxqavdrxSCW4U6Pn/PoG3Efspi2frRbHpBV2XsrPE6EDlw==
54225422

54235423
capture-exit@^2.0.0:
54245424
version "2.0.0"

0 commit comments

Comments
 (0)