diff --git a/app/authenticated/cluster/edit/route.js b/app/authenticated/cluster/edit/route.js
index bc0dc40ac..34425e188 100644
--- a/app/authenticated/cluster/edit/route.js
+++ b/app/authenticated/cluster/edit/route.js
@@ -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);
},
diff --git a/app/components/page-header/template.hbs b/app/components/page-header/template.hbs
index f719b389d..f17cde65d 100644
--- a/app/components/page-header/template.hbs
+++ b/app/components/page-header/template.hbs
@@ -214,13 +214,6 @@
{{/link-to}}
-
- {{#link-to "nodes.node-templates"}}
-
- {{t "nav.nodeTemplates.link"}}
-
- {{/link-to}}
-
{{#link-to "logout" class="user-logout"}}
diff --git a/app/instance-initializers/nav.js b/app/instance-initializers/nav.js
index 0845a0018..9406dda91 100644
--- a/app/instance-initializers/nav.js
+++ b/app/instance-initializers/nav.js
@@ -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',
diff --git a/lib/global-admin/addon/cluster-templates/route.js b/lib/global-admin/addon/cluster-templates/route.js
index 0338534a6..db07451e8 100644
--- a/lib/global-admin/addon/cluster-templates/route.js
+++ b/lib/global-admin/addon/cluster-templates/route.js
@@ -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'),
+ // });
+ // }
});
diff --git a/lib/global-admin/addon/clusters/index/route.js b/lib/global-admin/addon/clusters/index/route.js
index 5ff521245..85d582eb1 100644
--- a/lib/global-admin/addon/clusters/index/route.js
+++ b/lib/global-admin/addon/clusters/index/route.js
@@ -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() {
diff --git a/lib/global-admin/addon/settings/advanced/route.js b/lib/global-admin/addon/settings/advanced/route.js
index f8b193a7b..bdf53036d 100644
--- a/lib/global-admin/addon/settings/advanced/route.js
+++ b/lib/global-admin/addon/settings/advanced/route.js
@@ -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,
};
diff --git a/lib/monitoring/addon/index/route.js b/lib/monitoring/addon/index/route.js
index 83e6a4376..364708f62 100644
--- a/lib/monitoring/addon/index/route.js
+++ b/lib/monitoring/addon/index/route.js
@@ -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() {
diff --git a/package.json b/package.json
index 0e2cdd988..ec3dccdcf 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/yarn.lock b/yarn.lock
index f6d4a098f..ef06dbf94 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -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"