code cleanup

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);
     }
 });

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');

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);
     }
 });

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;

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;
             }

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, '<br />');
         me.set('issuePopover', issue);
-        me.set('issueHtml', Ember.String.htmlSafe(issue));
+        me.set('issueHtml', htmlSafe(issue));
     },
     didInsertElement() {
         const me = this;

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);
         });
     }
 });

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);

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);

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);

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);

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);

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);

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
 });
 

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);
+                    set(parentModel, me.get('controller.idField'), itId);
-                    Ember.set(parentModel, me.get('controller.nameField'), it.name);
+                    set(parentModel, me.get('controller.nameField'), it.name);
                 }
             }
             // not select
             else {
-                Ember.set(parentModel, me.get('controller.idField'), '');
+                set(parentModel, me.get('controller.idField'), '');
-                Ember.set(parentModel, me.get('controller.nameField'), '');
+                set(parentModel, me.get('controller.nameField'), '');
             }
             me.router.transitionTo(parentRouteName);
         }

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');

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;

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() {

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'}, 

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',

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());

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);

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);
     },

web/app/routes/user/update-password.js

@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
-import BaseEditRoute from '../base-edit';
+import { inject as service } from '@ember/service';
 
-export default Ember.Route.extend({
+export default Route.extend({
-    service: Ember.inject.service('user.service'),
+    service: service('user.service'),
     breadcrumbs: [{text: 'Change Password'}],
     model() {
         return {};

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);
+  const attributes = merge(merge({}, config.APP), attrs); // use defaults, but you can override;
-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
   Ember.run(() => {
     application = Application.create(attributes);

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);
 });

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);
 });