Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/authenticated/cluster/edit/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
},
Expand Down
7 changes: 0 additions & 7 deletions app/components/page-header/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
Expand Down
14 changes: 7 additions & 7 deletions app/instance-initializers/nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
16 changes: 8 additions & 8 deletions lib/global-admin/addon/cluster-templates/route.js
Original file line number Diff line number Diff line change
@@ -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 changes: 8 additions & 8 deletions lib/global-admin/addon/clusters/index/route.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
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({
globalStore: service(),

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() {
Expand Down
8 changes: 4 additions & 4 deletions lib/global-admin/addon/settings/advanced/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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,
};
Expand Down
8 changes: 4 additions & 4 deletions lib/monitoring/addon/index/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down