Merge pull request #81 from fleetbase/dev-v0.3.1

Dev v0.3.1

Author: roncodes

addon/components/autocomplete-input.js

@@ -5,8 +5,7 @@ import { action, computed } from '@ember/object';
 import { later } from '@ember/runloop';
 import { isBlank } from '@ember/utils';
 import { isArray } from '@ember/array';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
+import { timeout, task } from 'ember-concurrency';
 
 export default class AutocompleteInputComponent extends Component {
     @service fetch;

addon/components/comment-thread.js

@@ -1,7 +1,7 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 import getModelName from '@fleetbase/ember-core/utils/get-model-name';
 

addon/components/comment-thread/comment.js

@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 
 /**
  * Component to handle individual comments in a comment thread.

addon/components/fetch-select.js

@@ -5,8 +5,7 @@ import { isEmpty } from '@ember/utils';
 import { action, set } from '@ember/object';
 import { isArray } from '@ember/array';
 import { assert } from '@ember/debug';
-import { timeout } from 'ember-concurrency';
-import { restartableTask } from 'ember-concurrency-decorators';
+import { timeout, restartableTask } from 'ember-concurrency';
 
 /**
  * FetchSelectComponent is a Glimmer component responsible for rendering a
@@ -75,7 +74,7 @@ export default class FetchSelectComponent extends Component {
      * @param {boolean} [initialLoad=false] - Whether this is the initial load.
      * @task
      */
-    @restartableTask({ withTestWaiter: true }) searchOptions = function* (term, options = {}, initialLoad = false) {
+    @restartableTask() searchOptions = function* (term, options = {}, initialLoad = false) {
         if (!initialLoad) {
             yield timeout(this.debounceDuration);
         }
@@ -90,7 +89,7 @@ export default class FetchSelectComponent extends Component {
      * @param {Object} [options={}] - Additional options for the fetch.
      * @task
      */
-    @restartableTask({ withTestWaiter: true }) fetchOptions = function* (term, options = {}) {
+    @restartableTask() fetchOptions = function* (term, options = {}) {
         // query might be an EmptyObject/{{hash}}, make it a normal Object
         const query = Object.assign({}, this.args.query);
 

addon/components/locale-selector-tray.js

@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { debug } from '@ember/debug';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import calculatePosition from 'ember-basic-dropdown/utils/calculate-position';
 
 export default class LocaleSelectorTrayComponent extends Component {

addon/components/model-select.js

@@ -4,8 +4,7 @@ import { action, get, set } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { A } from '@ember/array';
 import { tracked } from '@glimmer/tracking';
-import { timeout } from 'ember-concurrency';
-import { restartableTask, dropTask } from 'ember-concurrency-decorators';
+import { timeout, restartableTask, dropTask } from 'ember-concurrency';
 import generateUuid from '@fleetbase/ember-core/utils/generate-uuid';
 import config from 'ember-get-config';
 
@@ -160,7 +159,7 @@ export default class ModelSelectComponent extends Component {
         this.selectedModel = selectedModel;
     }
 
-    @dropTask({ withTestWaiter: true }) findRecord = function* (modelName, id) {
+    @dropTask findRecord = function* (modelName, id) {
         // this wrapper task is requried to avoid the following error upon fast changes
         // of selectedModel:
         // Error: Assertion Failed: You attempted to remove a function listener which
@@ -172,7 +171,7 @@ export default class ModelSelectComponent extends Component {
         return resolvedModel;
     };
 
-    @restartableTask({ withTestWaiter: true }) searchModels = function* (term, options, initialLoad = false) {
+    @restartableTask searchModels = function* (term, options, initialLoad = false) {
         if (this.doesntHavePermissions || this.disabled) {
             return;
         }
@@ -195,7 +194,7 @@ export default class ModelSelectComponent extends Component {
         yield this.loadModels.perform(term, createOption);
     };
 
-    @restartableTask({ withTestWaiter: true }) loadModels = function* (term, createOption) {
+    @restartableTask loadModels = function* (term, createOption) {
         if (this.doesntHavePermissions || this.disabled) {
             return;
         }

addon/components/phone-input.js

@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import { debug } from '@ember/debug';
 import intlTelInput from 'intl-tel-input';
 
 export default class PhoneInputComponent extends Component {
@@ -14,13 +15,14 @@ export default class PhoneInputComponent extends Component {
             initialCountry: 'auto',
             separateDialCode: true,
             formatAsYouType: true,
-            geoIpLookup: (success, failure) => {
-                this.fetch
-                    .get('lookup/whois')
-                    .then((response) => {
-                        success(response.country_code);
-                    })
-                    .catch(failure);
+            geoIpLookup: async (success, failure) => {
+                try {
+                    const { country_code } = await this.fetch.get('lookup/whois');
+                    success(country_code);
+                } catch (error) {
+                    debug('Failed to lookup country code with whois API.');
+                    failure(error);
+                }
             },
             utilsScript: '/assets/libphonenumber/utils.js',
         });

addon/initializers/define-task-test-waiter-modifier.js

@@ -1,7 +1,7 @@
-import defineModifier from 'ember-concurrency-test-waiter/define-modifier';
+// import defineModifier from 'ember-concurrency-test-waiter/define-modifier';
 
 export function initialize() {
-    defineModifier();
+    // defineModifier();
 }
 
 export default {

addon/services/dashboard.js

@@ -1,7 +1,7 @@
 import Service from '@ember/service';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency-decorators';
+import { task } from 'ember-concurrency';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 

addon/styles/addon.css

@@ -48,4 +48,6 @@
 @import 'components/tip-tap-editor.css';
 
 /** Third party */
+@import "ember-basic-dropdown/vendor/ember-basic-dropdown.css";
+@import 'ember-power-select/vendor/ember-power-select.css';
 @import 'air-datepicker/air-datepicker.css';