From b871072e0103e9b4589de35dbb6a40aabe35c7d8 Mon Sep 17 00:00:00 2001 From: Donghuang Date: Fri, 24 Jun 2022 21:56:55 +0800 Subject: [PATCH] code cleanup --- web/app/components/form-input-checkbox.js | 4 ++-- web/app/components/form-input-color.js | 7 ++++--- web/app/components/form-input-enabled.js | 4 ++-- web/app/components/home-board.js | 4 ++-- web/app/components/input-spinner.js | 6 +++--- web/app/components/issue-cell.js | 3 ++- web/app/components/status-toggle-button.js | 7 ++++--- web/app/helpers/array.js | 4 ++-- web/app/helpers/loose-eq.js | 4 ++-- web/app/helpers/number-us.js | 7 ++++--- web/app/helpers/obj-merge.js | 4 ++-- web/app/helpers/obj-query-params.js | 7 ++++--- web/app/helpers/repeat-it.js | 7 ++++--- web/app/router.js | 4 ++-- web/app/routes/base-list-select.js | 10 +++++----- web/app/routes/base.js | 4 ++-- web/app/routes/customer-property/list.js | 4 ++-- web/app/routes/customer-status/create.js | 4 ++-- web/app/routes/customer-status/edit.js | 4 ++-- web/app/routes/customer-status/list-select.js | 4 ++-- web/app/routes/customer/list/advanced-query.js | 4 ++-- web/app/routes/customer/show.js | 9 +++++---- web/app/routes/index.js | 3 ++- web/app/routes/user/update-password.js | 8 ++++---- web/tests/helpers/start-app.js | 4 ++-- .../unit/mixins/app/manage/version/basic-route-test.js | 4 ++-- web/tests/unit/mixins/basic-list-route-test.js | 4 ++-- 27 files changed, 73 insertions(+), 65 deletions(-) diff --git a/web/app/components/form-input-checkbox.js b/web/app/components/form-input-checkbox.js index 16e1a7a..15b754c 100644 --- a/web/app/components/form-input-checkbox.js +++ b/web/app/components/form-input-checkbox.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { isNone } from '@ember/utils'; import BaseFormInput from './base-form-input'; export default BaseFormInput.extend({ @@ -8,6 +8,6 @@ export default BaseFormInput.extend({ didReceiveAttrs() { let me = this; me._super(...arguments); - Ember.isNone(me.getVal()) && me.setVal(false); + isNone(me.getVal()) && me.setVal(false); } }); diff --git a/web/app/components/form-input-color.js b/web/app/components/form-input-color.js index f33aeaf..cb75ef0 100644 --- a/web/app/components/form-input-color.js +++ b/web/app/components/form-input-color.js @@ -1,4 +1,5 @@ -import Ember from 'ember'; +import { observer } from '@ember/object'; +import { addObserver } from '@ember/object/observers'; import BaseFormInput from './base-form-input'; import $ from 'jquery' @@ -8,7 +9,7 @@ export default BaseFormInput.extend({ let me = this; me._super(...arguments); - Ember.addObserver(me, me.getFieldPath(), me, 'colorChanged'); + addObserver(me, me.getFieldPath(), me, 'colorChanged'); me.colorChanged(); }, didInsertElement() { @@ -35,7 +36,7 @@ export default BaseFormInput.extend({ me.set('lockColor', false); } }, - hexColorObserver: Ember.observer('hexColor', function() { + hexColorObserver: observer('hexColor', function() { let me = this; if (!me.get('lockHexColor')) { let hexColor = me.get('hexColor'); diff --git a/web/app/components/form-input-enabled.js b/web/app/components/form-input-enabled.js index 97b5a59..56b969e 100644 --- a/web/app/components/form-input-enabled.js +++ b/web/app/components/form-input-enabled.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { isNone } from '@ember/utils'; import BaseFormInput from './base-form-input'; export default BaseFormInput.extend({ @@ -10,6 +10,6 @@ export default BaseFormInput.extend({ didReceiveAttrs() { let me = this; me._super(...arguments); - Ember.isNone(me.getVal()) && me.setVal(false); + isNone(me.getVal()) && me.setVal(false); } }); diff --git a/web/app/components/home-board.js b/web/app/components/home-board.js index 83ce237..2078841 100644 --- a/web/app/components/home-board.js +++ b/web/app/components/home-board.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { bind } from '@ember/runloop'; import Component from '@ember/component'; import $ from 'jquery'; @@ -7,7 +7,7 @@ export default Component.extend({ init() { let me = this; me._super(...arguments); - $(window).on('resize', Ember.run.bind(me, me.onWindowResize)); + $(window).on('resize', bind(me, me.onWindowResize)); }, didInsertElement() { let me = this; diff --git a/web/app/components/input-spinner.js b/web/app/components/input-spinner.js index a49564d..1725e3f 100644 --- a/web/app/components/input-spinner.js +++ b/web/app/components/input-spinner.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { isNone } from '@ember/utils'; import Component from '@ember/component'; export default Component.extend({ @@ -9,7 +9,7 @@ export default Component.extend({ increase() { let me = this; let max = me.get('max'); - if (!Ember.isNone(max) && me.get('value') == max) { + if (!isNone(max) && me.get('value') == max) { console.info('Spinner increase to max: ', max); return; } @@ -18,7 +18,7 @@ export default Component.extend({ decrease() { let me = this; let min = me.get('min'); - if (!Ember.isNone(min) && me.get('value') == min) { + if (!isNone(min) && me.get('value') == min) { console.info('Spinner decrease to min: ', min); return; } diff --git a/web/app/components/issue-cell.js b/web/app/components/issue-cell.js index 7ba0297..f82e750 100644 --- a/web/app/components/issue-cell.js +++ b/web/app/components/issue-cell.js @@ -1,4 +1,5 @@ import Component from '@ember/component'; +import { htmlSafe } from '@ember/template'; import $ from 'jquery' export default Component.extend({ @@ -8,7 +9,7 @@ export default Component.extend({ me._super(...arguments); const issue = me.get('issue').replace(/\r?\n/g, '
'); me.set('issuePopover', issue); - me.set('issueHtml', Ember.String.htmlSafe(issue)); + me.set('issueHtml', htmlSafe(issue)); }, didInsertElement() { const me = this; diff --git a/web/app/components/status-toggle-button.js b/web/app/components/status-toggle-button.js index 36b9e6d..9eab50c 100644 --- a/web/app/components/status-toggle-button.js +++ b/web/app/components/status-toggle-button.js @@ -1,5 +1,6 @@ -import { computed } from '@ember/object'; +import { computed, set } from '@ember/object'; import { alias } from '@ember/object/computed'; +import { merge } from '@ember/polyfills'; import BaseComponent from './basic-component'; export default BaseComponent.extend({ @@ -41,10 +42,10 @@ export default BaseComponent.extend({ let me = this; me.dialog.confirm('Are you sure to ' + me.get('title') + ' row?', () => { let model = me.get('model'); - Ember.set(model, 'enabled', !me.get('enabled')); + set(model, 'enabled', !me.get('enabled')); let params = me.get('params'); me.get('service').update(params ? - Ember.merge(params, model) : model, true); + merge(params, model) : model, true); }); } }); diff --git a/web/app/helpers/array.js b/web/app/helpers/array.js index 9df61af..cce5a22 100644 --- a/web/app/helpers/array.js +++ b/web/app/helpers/array.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import { helper } from '@ember/component/helper'; export function array(params/*, hash*/) { console.info('Array: ', params); return params; } -export default Ember.Helper.helper(array); +export default helper(array); diff --git a/web/app/helpers/loose-eq.js b/web/app/helpers/loose-eq.js index 9e394f7..4f792b8 100644 --- a/web/app/helpers/loose-eq.js +++ b/web/app/helpers/loose-eq.js @@ -1,7 +1,7 @@ -import Ember from 'ember'; +import { helper } from '@ember/component/helper'; export function looseEq(params) { return params[0] == params[1]; } -export default Ember.Helper.helper(looseEq); +export default helper(looseEq); diff --git a/web/app/helpers/number-us.js b/web/app/helpers/number-us.js index 1cf1400..e48de18 100644 --- a/web/app/helpers/number-us.js +++ b/web/app/helpers/number-us.js @@ -1,10 +1,11 @@ -import Ember from 'ember'; +import { helper } from '@ember/component/helper'; +import { isNone } from '@ember/utils'; export function numberUs(params) { - let num = Ember.isNone(params[0]) ? 0 : params[0]; + let num = isNone(params[0]) ? 0 : params[0]; let p = num.toFixed(2).split('.'); return p[0].split('').reverse().reduce(function(acc, num, i, orig) { return num == '-' ? '-' + acc : num + (i && !(i % 3) ? ',' : '') + acc; }, ''); // + '.' + p[1]; } -export default Ember.Helper.helper(numberUs); +export default helper(numberUs); diff --git a/web/app/helpers/obj-merge.js b/web/app/helpers/obj-merge.js index c00e64e..883a133 100644 --- a/web/app/helpers/obj-merge.js +++ b/web/app/helpers/obj-merge.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import { helper } from '@ember/component/helper'; import $ from 'jquery' export function objMerge(params) { return $.extend(true, {}, ...params); } -export default Ember.Helper.helper(objMerge); +export default helper(objMerge); diff --git a/web/app/helpers/obj-query-params.js b/web/app/helpers/obj-query-params.js index 24ead47..30a2cb6 100644 --- a/web/app/helpers/obj-query-params.js +++ b/web/app/helpers/obj-query-params.js @@ -1,11 +1,12 @@ -import Ember from 'ember'; +import EmberObject from '@ember/object'; +import { helper } from '@ember/component/helper'; export function objQueryParams(params, hash) { console.debug('Obj Query Params: ', params, hash); - return Ember.Object.create({ + return EmberObject.create({ isQueryParams: true, values: hash.length > 0 ? hash : params[0] }); } -export default Ember.Helper.helper(objQueryParams); +export default helper(objQueryParams); diff --git a/web/app/helpers/repeat-it.js b/web/app/helpers/repeat-it.js index 4a4d972..ddceaa8 100644 --- a/web/app/helpers/repeat-it.js +++ b/web/app/helpers/repeat-it.js @@ -1,7 +1,8 @@ -import Ember from 'ember'; +import { helper } from '@ember/component/helper'; +import { htmlSafe } from '@ember/template'; export function repeatIt([val, t]) { - return Ember.String.htmlSafe(Array(t).fill(val).join('')); + return htmlSafe(Array(t).fill(val).join('')); } -export default Ember.Helper.helper(repeatIt); +export default helper(repeatIt); diff --git a/web/app/router.js b/web/app/router.js index 82903dc..a21c708 100644 --- a/web/app/router.js +++ b/web/app/router.js @@ -1,7 +1,7 @@ -import Ember from 'ember'; +import EmberRouter from '@ember/routing/router'; import config from './config/environment'; -const Router = Ember.Router.extend({ +const Router = EmberRouter.extend({ location: config.locationType }); diff --git a/web/app/routes/base-list-select.js b/web/app/routes/base-list-select.js index 1f1caad..a585dae 100644 --- a/web/app/routes/base-list-select.js +++ b/web/app/routes/base-list-select.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { set } from '@ember/object'; import BaseListRoute from './base-list'; export default BaseListRoute.extend({ @@ -42,14 +42,14 @@ export default BaseListRoute.extend({ let it = me.get('controller.selectedModel'); if (it) { console.info('select: ', it); - Ember.set(parentModel, me.get('controller.idField'), itId); - Ember.set(parentModel, me.get('controller.nameField'), it.name); + set(parentModel, me.get('controller.idField'), itId); + set(parentModel, me.get('controller.nameField'), it.name); } } // not select else { - Ember.set(parentModel, me.get('controller.idField'), ''); - Ember.set(parentModel, me.get('controller.nameField'), ''); + set(parentModel, me.get('controller.idField'), ''); + set(parentModel, me.get('controller.nameField'), ''); } me.router.transitionTo(parentRouteName); } diff --git a/web/app/routes/base.js b/web/app/routes/base.js index 2183748..912170b 100644 --- a/web/app/routes/base.js +++ b/web/app/routes/base.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; import Route from '@ember/routing/route'; export default Route.extend({ - toolService: Ember.inject.service('tool-service'), + toolService: service('tool-service'), beforeModel(transition) { let me = this; let service = me.get('service'); diff --git a/web/app/routes/customer-property/list.js b/web/app/routes/customer-property/list.js index 137f1b5..ac6deef 100644 --- a/web/app/routes/customer-property/list.js +++ b/web/app/routes/customer-property/list.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; import BaseListRoute from './../base-list'; export default BaseListRoute.extend({ - service: Ember.inject.service('customer-property.service'), + service: service('customer-property.service'), actions: { moveUp(it) { let me = this; diff --git a/web/app/routes/customer-status/create.js b/web/app/routes/customer-status/create.js index 3aa0700..ac6acee 100644 --- a/web/app/routes/customer-status/create.js +++ b/web/app/routes/customer-status/create.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; import BaseRoute from '../base'; export default BaseRoute.extend({ - service: Ember.inject.service('customer-property.service'), + service: service('customer-property.service'), breadcrumbs: [{route: 'customer-status.list', params: 1, text: 'Customer Status'}, {text: 'Create Customer Status'}], model() { diff --git a/web/app/routes/customer-status/edit.js b/web/app/routes/customer-status/edit.js index 023ac5f..82ec312 100644 --- a/web/app/routes/customer-status/edit.js +++ b/web/app/routes/customer-status/edit.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; import BaseEditRoute from '../base-edit'; export default BaseEditRoute.extend({ - service: Ember.inject.service('customer-property.service'), + service: service('customer-property.service'), afterModel(model) { this.set('breadcrumbs', [{route: 'customer-status.list', params: 1, text: 'Customer Status'}, diff --git a/web/app/routes/customer-status/list-select.js b/web/app/routes/customer-status/list-select.js index c4e440b..d9419a8 100644 --- a/web/app/routes/customer-status/list-select.js +++ b/web/app/routes/customer-status/list-select.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; import BaseListSelectRoute from '../base-list-select'; export default BaseListSelectRoute.extend({ - service: Ember.inject.service('customer-property.service'), + service: service('customer-property.service'), extraParams() { return { type: 'STATUS', diff --git a/web/app/routes/customer/list/advanced-query.js b/web/app/routes/customer/list/advanced-query.js index 5d8e40e..77431c3 100644 --- a/web/app/routes/customer/list/advanced-query.js +++ b/web/app/routes/customer/list/advanced-query.js @@ -1,6 +1,6 @@ -import Ember from 'ember'; +import Route from '@ember/routing/route'; -export default Ember.Route.extend({ +export default Route.extend({ model() { let me = this; let parentController = me.controllerFor(me.getParentRouteName()); diff --git a/web/app/routes/customer/show.js b/web/app/routes/customer/show.js index 533a91a..354b031 100644 --- a/web/app/routes/customer/show.js +++ b/web/app/routes/customer/show.js @@ -1,8 +1,9 @@ -import Ember from 'ember'; +import { get, set } from '@ember/object'; +import { inject as service } from '@ember/service'; import BaseEditRoute from '../base-edit'; export default BaseEditRoute.extend({ - issueService: Ember.inject.service('customer-issue/service'), + issueService: service('customer-issue/service'), afterModel(model) { let me = this; me._super(...arguments); @@ -18,13 +19,13 @@ export default BaseEditRoute.extend({ }); } - Ember.set(model, 'userAccounts', Ember.get(model, 'users').mapBy('account').join(', ')); + set(model, 'userAccounts', get(model, 'users').mapBy('account').join(', ')); }, actions: { removeIssue(issue) { let me = this; me.get('dialog').confirm('Are you sure to remove customer comment?', () => { - Ember.set(issue, 'enabled', false); + set(issue, 'enabled', false); me.get('issueService').update(issue).then(() => { me.get('message').alert('Comment removed'); me.get('controller.model.issues').removeObject(issue); diff --git a/web/app/routes/index.js b/web/app/routes/index.js index 8137eee..b629df1 100644 --- a/web/app/routes/index.js +++ b/web/app/routes/index.js @@ -1,4 +1,5 @@ import Route from '@ember/routing/route'; +import { htmlSafe } from '@ember/template'; export default Route.extend({ model() { @@ -10,7 +11,7 @@ export default Route.extend({ console.log('home page loaded: ', model); if (model.content) { // model.content = - model.content = Ember.String.htmlSafe(model.content); + model.content = htmlSafe(model.content); } // this.transitionTo('app.list', 1); }, diff --git a/web/app/routes/user/update-password.js b/web/app/routes/user/update-password.js index 148e1ab..f1d9c97 100644 --- a/web/app/routes/user/update-password.js +++ b/web/app/routes/user/update-password.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; -import BaseEditRoute from '../base-edit'; +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; -export default Ember.Route.extend({ - service: Ember.inject.service('user.service'), +export default Route.extend({ + service: service('user.service'), breadcrumbs: [{text: 'Change Password'}], model() { return {}; diff --git a/web/tests/helpers/start-app.js b/web/tests/helpers/start-app.js index e098f1d..dad9f9a 100644 --- a/web/tests/helpers/start-app.js +++ b/web/tests/helpers/start-app.js @@ -1,12 +1,12 @@ import Ember from 'ember'; +import { merge } from '@ember/polyfills'; import Application from '../../app'; import config from '../../config/environment'; export default function startApp(attrs) { let application; - let attributes = Ember.merge({}, config.APP); - attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; + const attributes = merge(merge({}, config.APP), attrs); // use defaults, but you can override; Ember.run(() => { application = Application.create(attributes); diff --git a/web/tests/unit/mixins/app/manage/version/basic-route-test.js b/web/tests/unit/mixins/app/manage/version/basic-route-test.js index 0d47e32..89a13c1 100644 --- a/web/tests/unit/mixins/app/manage/version/basic-route-test.js +++ b/web/tests/unit/mixins/app/manage/version/basic-route-test.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import EmberObject from '@ember/object'; import AppManageVersionBasicRouteMixin from '../../../mixins/app/manage/version/basic-route'; import { module, test } from 'qunit'; @@ -6,7 +6,7 @@ module('Unit | Mixin | app/manage/version/basic route'); // Replace this with your real tests. test('it works', function(assert) { - var AppManageVersionBasicRouteObject = Ember.Object.extend(AppManageVersionBasicRouteMixin); + var AppManageVersionBasicRouteObject = EmberObject.extend(AppManageVersionBasicRouteMixin); var subject = AppManageVersionBasicRouteObject.create(); assert.ok(subject); }); diff --git a/web/tests/unit/mixins/basic-list-route-test.js b/web/tests/unit/mixins/basic-list-route-test.js index 3dc946b..c106704 100644 --- a/web/tests/unit/mixins/basic-list-route-test.js +++ b/web/tests/unit/mixins/basic-list-route-test.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import EmberObject from '@ember/object'; import BasicListRouteMixin from '../../../mixins/basic-list-route'; import { module, test } from 'qunit'; @@ -6,7 +6,7 @@ module('Unit | Mixin | basic list route'); // Replace this with your real tests. test('it works', function(assert) { - var BasicListRouteObject = Ember.Object.extend(BasicListRouteMixin); + var BasicListRouteObject = EmberObject.extend(BasicListRouteMixin); var subject = BasicListRouteObject.create(); assert.ok(subject); });