update: bumped ember to 3.0

sysdig-CLA-1.0-signed-off-by: Roberto Scolaro <[email protected]>

Signed-off-by: Roberto Scolaro <[email protected]>

Author: therealbobo

.eslintrc.js

@@ -20,8 +20,8 @@ module.exports = {
     // node files
     {
       files: [
-        'testem.js',
         'ember-cli-build.js',
+        'testem.js',
         'config/**/*.js',
         'lib/*/index.js'
       ],
@@ -33,15 +33,6 @@ module.exports = {
         browser: false,
         node: true
       }
-    },
-
-    // test files
-    {
-      files: ['tests/**/*.js'],
-      excludedFiles: ['tests/dummy/**/*.js'],
-      env: {
-        embertest: true
-      }
     }
   ]
 };

app/app.js

@@ -14,20 +14,22 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import Component from '@ember/component';
+
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const App = Ember.Application.extend({
+const App = Application.extend({
     modulePrefix: config.modulePrefix,
     podModulePrefix: config.podModulePrefix,
     Resolver,
 });
 
 loadInitializers(App, config.modulePrefix);
 
-Ember.Component.reopen({
+Component.reopen({
     attributeBindings: ['data-ref'],
 });
 

app/controllers/application.js

@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

app/controllers/capture.js

@@ -14,28 +14,32 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import { isNone } from '@ember/utils';
+
+import { computed } from '@ember/object';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
 import electronUtils from 'wsd-core/utils/electron';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
     queryParams: {
         drilldownInfoParam: 'dd',
         metricTimelinesParam: 'tl',
         timeFrom: 'f',
         timeTo: 't',
     },
 
-    application: Ember.inject.controller('application'),
-    captureTimelines: Ember.inject.service('capture-timelines'),
+    application: controller('application'),
+    captureTimelines: service('capture-timelines'),
 
     selectedViewId: null,
 
     filter: null,
 
     drilldownInfoParam: null,
     metricTimelinesParam: null,
-    timeWindow: Ember.computed('model.queryParams.timeFrom', 'model.queryParams.timeTo', function() {
-        if (Ember.isNone(this.get('model.queryParams.timeFrom')) === false && Ember.isNone(this.get('model.queryParams.timeTo')) === false) {
+    timeWindow: computed('model.queryParams.timeFrom', 'model.queryParams.timeTo', function() {
+        if (isNone(this.get('model.queryParams.timeFrom')) === false && isNone(this.get('model.queryParams.timeTo')) === false) {
             return {
                 from: this.get('model.queryParams.timeFrom'),
                 to: this.get('model.queryParams.timeTo'),

app/controllers/index.js

@@ -14,14 +14,16 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import { computed } from '@ember/object';
+
+import Controller, { inject as controller } from '@ember/controller';
 import electronUtils from 'wsd-core/utils/electron';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
     queryParams: ['port'],
-    application: Ember.inject.controller('application'),
+    application: controller('application'),
 
-    isElectron: Ember.computed(function() {
+    isElectron: computed(function() {
         return electronUtils.isElectron();
     }),
 

app/controllers/views/view.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
     queryParams: {
         filter: 'filter',
         searchPattern: 'search',

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,
     rootURL: config.rootURL,
 });

app/routes/application.js

@@ -14,13 +14,16 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import { isEmpty } from '@ember/utils';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import electronUtils from 'wsd-core/utils/electron';
 
-export default Ember.Route.extend({
-    shortcutsService: Ember.inject.service('keyboard-shortcuts'),
-    colorProvider: Ember.inject.service('color-provider'),
-    userTracking: Ember.inject.service('user-tracking'),
+export default Route.extend({
+    shortcutsService: service('keyboard-shortcuts'),
+    colorProvider: service('color-provider'),
+    userTracking: service('user-tracking'),
 
     setupController() {
         this._super(...arguments);
@@ -87,7 +90,7 @@ export default Ember.Route.extend({
             if (electronUtils.isElectron()) {
                 let fileNames = electronUtils.openFileDialog();
 
-                if (Ember.isEmpty(fileNames) === false) {
+                if (isEmpty(fileNames) === false) {
                     this.send('openFile', fileNames[0]);
                 } else {
                     console.log('Not file choosen.');

app/routes/capture.js

@@ -14,19 +14,22 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import { isEmpty, isNone } from '@ember/utils';
 
-export default Ember.Route.extend({
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
+
+export default Route.extend({
     queryParams: {
         drilldownInfoParam: { refreshModel: true },
         metricTimelinesParam: { refreshModel: true },
         timeFrom: { refreshModel: true },
         timeTo: { refreshModel: true },
     },
 
-    captureTimelines: Ember.inject.service('capture-timelines'),
-    dataSearchService: Ember.inject.service('data-search'),
-    userTracking: Ember.inject.service('user-tracking'),
+    captureTimelines: service('capture-timelines'),
+    dataSearchService: service('data-search'),
+    userTracking: service('user-tracking'),
 
     model(params) {
         return new CaptureModel(
@@ -86,13 +89,13 @@ export default Ember.Route.extend({
         applyFilter(filter) {
             this.get('userTracking').action(this.get('userTracking').ACTIONS.INTERACTION, {
                 name: 'apply sysdig filter',
-                'is set': Ember.isEmpty(filter) === false,
+                'is set': isEmpty(filter) === false,
             });
 
             console.debug('route:application.capture', 'applyFilter', ...arguments);
             this.transitionTo('capture.views.view', this.controller.get('selectedViewId'), {
                 queryParams: this.getCurrentQueryParams({
-                    filter: Ember.isEmpty(filter) ? undefined : filter,
+                    filter: isEmpty(filter) ? undefined : filter,
                 }),
             });
         },
@@ -101,13 +104,13 @@ export default Ember.Route.extend({
             console.debug('route:application.capture', 'applySearch', ...arguments);
             this.transitionTo('capture.views.view', this.controller.get('selectedViewId'), {
                 queryParams: this.getCurrentQueryParams({
-                    searchPattern: Ember.isEmpty(searchPattern) ? undefined : searchPattern,
+                    searchPattern: isEmpty(searchPattern) ? undefined : searchPattern,
                 }),
             });
         },
 
         selectTimeWindow(from, to) {
-            if (Ember.isNone(from) === false && Ember.isNone(to) === false) {
+            if (isNone(from) === false && isNone(to) === false) {
                 this.replaceWith('capture.views.view', this.controller.get('selectedViewId'), {
                     queryParams: this.getCurrentQueryParams({
                         timeFrom: from,

app/routes/capture/index.js

@@ -14,10 +14,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import { isEmpty } from '@ember/utils';
 
-export default Ember.Route.extend({
-    drilldownManager: Ember.inject.service('drilldown-manager'),
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+    drilldownManager: service('drilldown-manager'),
 
     beforeModel() {
         const captureModel = this.modelFor('capture');
@@ -27,7 +30,7 @@ export default Ember.Route.extend({
                 drilldownInfoParam: captureModel.queryParams.drilldownInfoParam,
             });
 
-            if (Ember.isEmpty(steps)) {
+            if (isEmpty(steps)) {
                 this.replaceWith('capture.views.view', 'overview', {
                     queryParams: Object.assign({}, captureModel.queryParams),
                 });