From 3fe16387b4df33740179b18ce7f0138a9ab257a1 Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Thu, 30 Nov 2017 16:48:08 -0700 Subject: [PATCH] lint errors --- app/authenticated/cluster/ns/index/controller.js | 2 +- app/models/cluster.js | 16 ++++++++-------- app/models/podsecuritypolicytemplate.js | 1 - app/models/project.js | 3 +++ lib/global-admin/addon/application/route.js | 16 ++++++++-------- .../components/modal-add-cluster/component.js | 3 +-- lib/shared/addon/mixins/host-driver.js | 2 +- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/authenticated/cluster/ns/index/controller.js b/app/authenticated/cluster/ns/index/controller.js index 9c0a93cf5..898b0c26b 100644 --- a/app/authenticated/cluster/ns/index/controller.js +++ b/app/authenticated/cluster/ns/index/controller.js @@ -1,5 +1,5 @@ import { inject as service } from '@ember/service'; -import Controller, { inject as controller } from '@ember/controller'; +import Controller from '@ember/controller'; import { alias } from '@ember/object/computed'; export const headers = [ diff --git a/app/models/cluster.js b/app/models/cluster.js index dee5c3a46..3b6ca1b05 100644 --- a/app/models/cluster.js +++ b/app/models/cluster.js @@ -38,17 +38,17 @@ var Cluster = Resource.extend(PolledResource, { }, - _allProjects: null, + // _allProjects: null, - projects: computed('_allProjects.@each.clusterName', function() { - let x = this.get('_allProjects'); + // projects: computed('_allProjects.@each.clusterName', function() { + // let x = this.get('_allProjects'); - if (!x) { - x = this.set('_allProjects', this.get('authzStore').all('project')); - } + // if (!x) { + // x = this.set('_allProjects', this.get('authzStore').all('project')); + // } - return x.filterBy('clusterName', this.get('id')); - }), + // return x.filterBy('clusterName', this.get('id')); + // }), defaultProject: computed('projects.@each.{name,clusterOwner}', function() { let projects = this.get('projects'); diff --git a/app/models/podsecuritypolicytemplate.js b/app/models/podsecuritypolicytemplate.js index e342411e6..ea0d9c89b 100644 --- a/app/models/podsecuritypolicytemplate.js +++ b/app/models/podsecuritypolicytemplate.js @@ -1,5 +1,4 @@ import { inject as service } from '@ember/service'; - import Resource from 'ember-api-store/models/resource'; import PolledResource from 'ui/mixins/cattle-polled-resource'; diff --git a/app/models/project.js b/app/models/project.js index 858689bbb..6e7b0c382 100644 --- a/app/models/project.js +++ b/app/models/project.js @@ -69,6 +69,9 @@ var Project = Resource.extend(PolledResource, { }, availableActions: computed('actionLinks.{activate,deactivate}', 'links.{update,remove}', 'state', 'canSetDefault', function () { + // let a = this.get('actionLinks'); + // let l = this.get('links'); + var choices = [ { label: 'action.edit', icon: 'icon icon-edit', action: 'edit', enabled: true }, { divider: true }, diff --git a/lib/global-admin/addon/application/route.js b/lib/global-admin/addon/application/route.js index 9d9a54cb8..5f87688c0 100644 --- a/lib/global-admin/addon/application/route.js +++ b/lib/global-admin/addon/application/route.js @@ -21,7 +21,7 @@ export default Route.extend({ }, model() { - let settings = this.get('settings'); + // let settings = this.get('settings'); // @TODO-2.0 return EmberObject.create({ @@ -30,13 +30,13 @@ export default Route.extend({ telemetry: 'out', }); - return this.get('userStore').find('setting').then(() => { - return EmberObject.create({ - host: settings.get(C.SETTING.API_HOST), - catalog: settings.get(C.SETTING.CATALOG_URL), - telemetry: settings.get(C.SETTING.TELEMETRY), - }); - }); + // return this.get('userStore').find('setting').then(() => { + // return EmberObject.create({ + // host: settings.get(C.SETTING.API_HOST), + // catalog: settings.get(C.SETTING.CATALOG_URL), + // telemetry: settings.get(C.SETTING.TELEMETRY), + // }); + // }); }, resetController(controller, isExiting /*, transition*/ ) { diff --git a/lib/shared/addon/components/modal-add-cluster/component.js b/lib/shared/addon/components/modal-add-cluster/component.js index 4a14a2784..1e0e09379 100644 --- a/lib/shared/addon/components/modal-add-cluster/component.js +++ b/lib/shared/addon/components/modal-add-cluster/component.js @@ -3,7 +3,6 @@ import ModalBase from 'shared/mixins/modal-base'; import layout from './template'; import { get, set } from '@ember/object'; import { alias } from '@ember/object/computed'; -import { inject as service } from '@ember/service'; export default Component.extend(ModalBase, { layout, @@ -24,7 +23,7 @@ export default Component.extend(ModalBase, { }, actions: { - completed(cb) { + completed() { this.get('modalService').toggleModal(); }, diff --git a/lib/shared/addon/mixins/host-driver.js b/lib/shared/addon/mixins/host-driver.js index 7f91d9cfe..4e901c7f2 100644 --- a/lib/shared/addon/mixins/host-driver.js +++ b/lib/shared/addon/mixins/host-driver.js @@ -286,7 +286,7 @@ export default Mixin.create(NewOrEdit, ManageLabels, { } }, - doneSaving(neu) { + doneSaving(/* neu */) { let out = this._super(); // let project = this.get('scope.current'); // let cluster = this.get('clusterStore').all('cluster').findBy('id', neu.clusterId);