dropdown on gis-search-form

.editorconfig

@@ -13,22 +13,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
 [*.hbs]
 insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
 
 [*.{diff,md}]
 trim_trailing_whitespace = false

.eslintignore

@@ -0,0 +1 @@
+/blueprints/*/files/**/*.js

.eslintrc.js

@@ -0,0 +1,91 @@
+/* eslint import/no-extraneous-dependencies: ["error", {"devDependencies": true}] */
+const NodeRules = require('eslint-plugin-node').configs.recommended.rules;
+const {
+  DEFAULT_IGNORED_PROPERTIES,
+} = require('eslint-plugin-ember/lib/rules/avoid-leaking-state-in-ember-objects');
+
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 2017,
+    sourceType: 'module',
+  },
+  plugins: ['ember'],
+  extends: ['eslint:recommended', 'airbnb-base', 'plugin:import/errors', 'plugin:import/warnings', 'plugin:ember/recommended'],
+  env: {
+    browser: true,
+  },
+  globals: {
+    Inputmask: 'writable',
+    Base64: 'writable',
+    L: 'writable',
+  },
+  rules: {
+    'import/no-extraneous-dependencies': ['error', { devDependencies: true, }],
+    'import/no-unresolved': 'off',
+    'import/extensions': 'off',
+    'import/core-modules': [ 'sinon' ],
+    'ember/no-observers': 'off',
+    'ember/new-module-imports': 'off',
+    'ember/closure-actions': 'off',
+    'ember/no-arrow-function-computed-properties': 'error',
+    'prefer-arrow-callback': 'off',
+    'func-names': ['error', 'never'],
+    'no-continue': 'off',
+    'no-underscore-dangle': 'off',
+    'max-len': [
+      'error',
+      {
+        code: 160,
+      }
+    ],
+    indent: [
+      'error',
+      2,
+      {
+        FunctionDeclaration: {
+          body: 1,
+          parameters: 2,
+        },
+        SwitchCase: 1,
+      }
+    ],
+    'ember/avoid-leaking-state-in-ember-objects': [
+      'error',
+      [...DEFAULT_IGNORED_PROPERTIES, 'developerUserSettings']
+    ],
+    'prefer-rest-params': 'off',
+    'comma-dangle': ['error', { objects: 'always', }],
+    'comma-style': ['error', 'last', { exceptions: { CallExpression: true, }, }],
+    'no-param-reassign': 'off',
+    'padding-line-between-statements': ['error', { blankLine: 'always', prev: 'if', next: '*', }],
+    'ember/no-new-mixins': 'off',
+    'no-return-assign': ['error', 'except-parens'],
+    'arrow-parens': ['error', 'always'],
+    'consistent-return': 'off',
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'ember-cli-build.js',
+        'index.js',
+        'testem.js',
+        'blueprints/*/index.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015,
+      },
+      env: {
+        browser: false,
+        node: true,
+      },
+      plugins: ['node'],
+      rules: NodeRules, // add your custom rules and overrides for node files here
+    }
+  ],
+};

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,10 +13,16 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
+yarn-error.log
 testem.log
 /.vscode
 /.githooks
 jsconfig.json
 typings/ember/ember.d.ts
-/package-lock.json
+/package-lock.json
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.npmignore

@@ -7,10 +7,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
+.eslintrc.js
 .gitignore
-.jshintrc
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.travis.yml

@@ -17,16 +17,10 @@ env:
 matrix:
   fast_finish: true
 
-dist: trusty
 
 addons:
   chrome: stable
 
-before_install:
-  - sudo chown root /opt/google/chrome/chrome-sandbox
-  - sudo chmod 4755 /opt/google/chrome/chrome-sandbox
-  - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
-  - yarn global add [email protected]
   - yarn global add bower
 install:
   - yarn install

addon/adapters/odata.js

@@ -1,16 +1,27 @@
+import { run } from '@ember/runloop';
+import { A } from '@ember/array';
+import $ from 'jquery';
+import { reject, Promise } from 'rsvp';
+import { isNone } from '@ember/utils';
 import Ember from 'ember';
-import { Projection, Adapter } from 'ember-flexberry-data';
 import ODataQueryAdapter from 'ember-flexberry-data/query/odata-adapter';
-import { getResponseMeta, getBatchResponses, parseBatchResponse } from 'ember-flexberry-data/utils/batch-queries';
+import {
+  getResponseMeta,
+  getBatchResponses,
+  parseBatchResponse
+} from 'ember-flexberry-data/utils/batch-queries';
 import generateUniqueId from 'ember-flexberry-data/utils/generate-unique-id';
 
-export default Adapter.Odata.extend(Projection.AdapterMixin, {
+import AdapterMixin from 'ember-flexberry-data/mixins/adapter';
+import OdataAdapter from 'ember-flexberry-data/adapters/odata';
+
+export default OdataAdapter.extend(AdapterMixin, {
   batchLoadModel(modelName, query, store) {
-    if (Ember.isNone(modelName) || Ember.isNone(query)) {
-      return Ember.RSVP.reject();
+    if (isNone(modelName) || isNone(query)) {
+      return reject();
     }
 
-    if (Ember.isNone(store)) {
+    if (isNone(store)) {
       store = this.get('store');
     }
 
@@ -24,50 +35,51 @@ export default Adapter.Odata.extend(Projection.AdapterMixin, {
     const queryAdapter = new ODataQueryAdapter(getUrl, store);
     const fullUrl = queryAdapter.getODataFullUrl(query);
 
-    requestBody += '\r\nGET ' + fullUrl + ' HTTP/1.1\r\n';
+    requestBody += `\r\nGET ${fullUrl} HTTP/1.1\r\n`;
     requestBody += 'Content-Type: application/json;type=entry\r\n';
     requestBody += 'Prefer: return=representation\r\n';
 
     const url = `${this._buildURL()}/$batch`;
 
-    const headers = Ember.$.extend({}, this.get('headers'));
+    const headers = $.extend({}, this.get('headers'));
     headers['Content-Type'] = `multipart/mixed;boundary=${boundary}`;
     const httpMethod = 'POST';
 
     const options = {
       method: httpMethod,
       headers,
       dataType: 'text',
-      data: requestBody };
+      data: requestBody,
+    };
 
-    return new Ember.RSVP.Promise((resolve, reject) => Ember.$.ajax(url, options).done((response, statusText, xhr) => {
+    return new Promise((resolve, reject) => $.ajax(url, options).done((response, statusText, xhr) => {
       const meta = getResponseMeta(xhr.getResponseHeader('Content-Type'));
       if (meta.contentType !== 'multipart/mixed') {
         return reject(new Ember.DS.AdapterError('Invalid response type.'));
       }
 
       try {
         const batchResponses = getBatchResponses(response, meta.boundary).map(parseBatchResponse);
-        const result = batchResponses.filter(r => r.contentType === 'application/http')[0];
+        const result = batchResponses.filter((r) => r.contentType === 'application/http')[0];
 
-        const normalizedRecords = { data: Ember.A(), included: Ember.A() };
-        let odataValue = result.response.body.value;
-        if (!Ember.isNone(odataValue)) {
-          odataValue.forEach(record => {
+        const normalizedRecords = { data: A(), included: A(), };
+        const odataValue = result.response.body.value;
+        if (!isNone(odataValue)) {
+          odataValue.forEach((record) => {
             const normalized = store.normalize(modelName, record);
             normalizedRecords.data.addObject(normalized.data);
             if (normalized.included) {
               normalizedRecords.included.addObjects(normalized.included);
             }
           });
         } else {
-          console.error('Error batch: ' + result.response.body);
+          console.error(`Error batch: ${result.response.body}`);
         }
 
-        return resolve(Ember.run(store, store.push, normalizedRecords));
+        return resolve(run(store, store.push, normalizedRecords));
       } catch (e) {
         return reject(e);
       }
     }).fail(reject));
-  }
+  },
 });

addon/components/base-control.js

@@ -2,7 +2,10 @@
   @module ember-flexberry-gis
  */
 
-import Ember from 'ember';
+import { isNone } from '@ember/utils';
+
+import { observer } from '@ember/object';
+import Component from '@ember/component';
 
 import LeafletOptionsMixin from 'ember-flexberry-gis/mixins/leaflet-options';
 
@@ -12,7 +15,7 @@ import LeafletOptionsMixin from 'ember-flexberry-gis/mixins/leaflet-options';
   @extends <a href="http://emberjs.com/api/classes/Ember.Component.html">Ember.Component</a>
   @uses LeafletOptionsMixin
 */
-export default Ember.Component.extend(LeafletOptionsMixin, {
+export default Component.extend(LeafletOptionsMixin, {
   /**
     Leaflet map for this control.
 
@@ -85,10 +88,10 @@ export default Ember.Component.extend(LeafletOptionsMixin, {
 
     @method initControl
   */
-  initControl: Ember.observer('leafletMap', function () {
-    let leafletMap = this.get('leafletMap');
-    if (!Ember.isNone(leafletMap)) {
-      let control = this.createControl();
+  initControl: observer('leafletMap', function () {
+    const leafletMap = this.get('leafletMap');
+    if (!isNone(leafletMap)) {
+      const control = this.createControl();
       this.set('control', control);
 
       leafletMap.addControl(control);
@@ -102,12 +105,12 @@ export default Ember.Component.extend(LeafletOptionsMixin, {
     @method initControl
   */
   destroyControl() {
-    let leafletMap = this.get('leafletMap');
-    let control = this.get('control');
-    if (!Ember.isNone(leafletMap) && !Ember.isNone(control)) {
+    const leafletMap = this.get('leafletMap');
+    const control = this.get('control');
+    if (!isNone(leafletMap) && !isNone(control)) {
       leafletMap.removeControl(control);
     }
 
     this.set('control', null);
-  }
+  },
 });