update: bumped ember to 3.12

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

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

Author: therealbobo

.eslintignore

@@ -8,9 +8,11 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
+!.*
 
 # ember-try
 /.node_modules.ember-try/

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 2017,
+    ecmaVersion: 2018,
     sourceType: 'module'
   },
   plugins: [
@@ -20,21 +20,30 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
-        'lib/*/index.js'
+        'lib/*/index.js',
+        'server/**/*.js'
       ],
       parserOptions: {
-        sourceType: 'script',
-        ecmaVersion: 2015
+        sourceType: 'script'
       },
       env: {
         browser: false,
         node: true
-      }
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+
+        // this can be removed once the following is fixed
+        // https://github.com/mysticatea/eslint-plugin-node/issues/77
+        'node/no-unpublished-require': 'off'
+      })
     }
   ]
 };

.gitignore

@@ -1,7 +1,6 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-<<<<<<< HEAD
 /dist
 /tmp
 /out
@@ -27,25 +26,3 @@ ember-electron/resources/capture-samples/
 
 # virtualenv
 /venv
-=======
-/dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
-
-# misc
-/.sass-cache
-/connect.lock
-/coverage/
-/libpeerconnection.log
-/npm-debug.log*
-/testem.log
-/yarn-error.log
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
->>>>>>> d31eb24 (v3.1.4...v3.2.0)

app/styles/app.less

@@ -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 "../../lib/ui-toolkit/addon/styles/addon.less";
-@import "../../lib/wsd-core/addon/styles/addon.less";
+@import "lib/ui-toolkit/addon/styles/addon.less";
+@import "lib/wsd-core/addon/styles/addon.less";
 
 @import "welcome.less";

app/templates/capture.hbs

@@ -15,28 +15,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --}}
 
 <div class="wsd-page__header">
-    {{wsd-capture-header
-        filePath=model.filePath
-        openFile=(action "openFile")
-        openFileBrowser=(action "openFileBrowser")
-    }}
+    <WsdCaptureHeader @filePath={{model.filePath}} @openFile={{action "openFile"}} @openFileBrowser={{action "openFileBrowser"}} />
 </div>
 
 <div class="wsd-page__content">
-    {{#wsd-capture-panel
-        filePath=model.filePath
-        drilldownInfoParam=model.queryParams.drilldownInfoParam
-        timelines=captureTimelines.timelines
-        timeWindow=timeWindow
-        selectedViewId=selectedViewId
-        filter=filter
-        navigateTo=(route-action "drillDown")
-        drillDown=(route-action "drillDown")
-        selectTimeWindow=(route-action "selectTimeWindow")
-        removeMetricTimeline=(route-action "removeMetricTimeline")
-        applyFilter=(route-action "applyFilter")
-        applySearch=(route-action "applySearch")
-    }}
+    <WsdCapturePanel @filePath={{model.filePath}} @drilldownInfoParam={{model.queryParams.drilldownInfoParam}} @timelines={{captureTimelines.timelines}} @timeWindow={{timeWindow}} @selectedViewId={{selectedViewId}} @filter={{filter}} @navigateTo={{route-action "drillDown"}} @drillDown={{route-action "drillDown"}} @selectTimeWindow={{route-action "selectTimeWindow"}} @removeMetricTimeline={{route-action "removeMetricTimeline"}} @applyFilter={{route-action "applyFilter"}} @applySearch={{route-action "applySearch"}}>
         {{outlet}}
-    {{/wsd-capture-panel}}
+    </WsdCapturePanel>
 </div>

app/templates/capture/views/view.hbs

@@ -14,13 +14,4 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --}}
 
-{{wsd-capture-view
-    viewId=model.viewId
-    captureInfo=model.capture
-    drilldownInfoParam=model.queryParams.drilldownInfoParam
-    filter=model.filter
-    timelines=metricTimelines
-    toggleMetricTimeline=(route-action "toggleMetricTimeline")
-    select=(route-action "select")
-    drillDown=(route-action "drillDown")
-}}
+<WsdCaptureView @viewId={{model.viewId}} @captureInfo={{model.capture}} @drilldownInfoParam={{model.queryParams.drilldownInfoParam}} @filter={{model.filter}} @timelines={{metricTimelines}} @toggleMetricTimeline={{route-action "toggleMetricTimeline"}} @select={{route-action "select"}} @drillDown={{route-action "drillDown"}} />

app/templates/index.hbs

@@ -49,29 +49,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     </div>
                     <div class="wsd-welcome__card-footer">
                         {{#if isElectron}}
-                            {{#sd-button
-                                iconName="file_black"
-                                classNames="sd-button--raised"
-                                size="lg"
-                                title="Open capture"
-                                click=(route-action "openFileBrowser")
-                            }}
+                            <SdButton @iconName="file_black" @classNames="sd-button--raised" @size="lg" @title="Open capture" @click={{route-action "openFileBrowser"}}>
                                 Open Capture
-                            {{/sd-button}}
+                            </SdButton>
                         {{else}}
-                            {{sd-input
-                                name="file-path"
-                                placeholder="Capture file path"
-                                isAcceptChangeMode=true
-                                changeValue=(route-action "openFile")
-                            }}
+                            <SdInput @name="file-path" @placeholder="Capture file path" @isAcceptChangeMode={{true}} @changeValue={{route-action "openFile"}} />
                         {{/if}}
                     </div>
                     <div class="wsd-welcome__card-extra-footer">
                         {{#if isElectron}}
                             or try one of the
-                            {{#link-to "capture" "capture-samples/502Error.scap"}}capture{{/link-to}}
-                            {{#link-to "capture" "capture-samples/404Error.scap"}}samples{{/link-to}}
+                            <LinkTo @route="capture" @model="capture-samples/502Error.scap">capture</LinkTo>
+                            <LinkTo @route="capture" @model="capture-samples/404Error.scap">samples</LinkTo>
                         {{/if}}
                     </div>
                 </div>

config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.4.4",
+      "version": "3.12.1",
       "blueprints": [
         {
           "name": "app",

config/environment.js

@@ -1,8 +1,26 @@
 'use strict';
 
 module.exports = function(environment) {
+//<<<<<<< HEAD
     const rootURLParamIndex = process.argv.indexOf('--root-url');
     const rootURL = rootURLParamIndex >= 0 ? process.argv[rootURLParamIndex + 1] : '/';
+//=======
+//  let ENV = {
+//    modulePrefix: 'sysdig-inspect',
+//    environment,
+//    rootURL: '/',
+//    locationType: 'auto',
+//    EmberENV: {
+//      FEATURES: {
+//        // Here you can enable experimental features on an ember canary build
+//        // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
+//      },
+//      EXTEND_PROTOTYPES: {
+//        // Prevent Ember Data from overriding Date.parse.
+//        Date: false
+//      }
+//    },
+//>>>>>>> bd341dc (v3.4.4...v3.12.1)
 
     const targetEnvParamIndex = process.argv.indexOf('--target-env');
     const targetEnv = targetEnvParamIndex >= 0 ? process.argv[targetEnvParamIndex + 1] : 'electron';

lib/ui-toolkit/addon/services/layout-provider.js

@@ -23,6 +23,7 @@ import Service from '@ember/service';
 
 export default Service.extend(Evented, {
     init() {
+		this._super(...arguments);
         window.addEventListener('resize', () => {
             debounce(this, triggerEvent, 20);
         });