Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions addon/components/autocomplete-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion addon/components/comment-thread.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion addon/components/comment-thread/comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 3 additions & 4 deletions addon/components/fetch-select.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion addon/components/locale-selector-tray.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 4 additions & 5 deletions addon/components/model-select.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down
16 changes: 9 additions & 7 deletions addon/components/phone-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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',
});
Expand Down
4 changes: 2 additions & 2 deletions addon/initializers/define-task-test-waiter-modifier.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion addon/services/dashboard.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 2 additions & 0 deletions addon/styles/addon.css
Original file line number Diff line number Diff line change
Expand Up @@ -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';
4 changes: 4 additions & 0 deletions addon/styles/components/basic-dropdown.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ body[data-theme='dark'] .ember-power-select-multiple-option {
.ember-basic-dropdown.listbox-2xl .ember-power-select-options[role='listbox'] {
max-height: 40rem;
}

body.fleetbase-console .ember-basic-dropdown-content {
background-color: transparent;
}
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fleetbase/ember-ui",
"version": "0.3.0",
"version": "0.3.1",
"description": "Fleetbase UI provides all the interface components, helpers, services and utilities for building a Fleetbase extension into the Console.",
"keywords": [
"fleetbase-ui",
Expand Down Expand Up @@ -76,16 +76,14 @@
"date-fns": "^2.30.0",
"ember-animated": "^1.1.2",
"ember-auto-import": "^2.7.4",
"ember-basic-dropdown": "^7.3.0",
"ember-basic-dropdown": "8.4.0",
"ember-can": "^6.0.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-postcss": "^8.2.0",
"ember-cli-string-helpers": "^6.1.0",
"ember-composable-helpers": "^5.0.0",
"ember-concurrency": "^3.1.1",
"ember-concurrency-decorators": "^2.0.3",
"ember-concurrency-test-waiter": "^0.4.0",
"ember-concurrency": "^4.0.4",
"ember-file-upload": "8.4.0",
"ember-focus-trap": "^1.0.1",
"ember-get-config": "^2.1.1",
Expand All @@ -97,7 +95,7 @@
"ember-modifier": "^4.1.0",
"ember-on-helper": "^0.1.0",
"ember-power-calendar": "^0.18.0",
"ember-power-select": "^7.2.0",
"ember-power-select": "8.6.2",
"ember-ref-bucket": "^4.1.0",
"ember-responsive": "^5.0.0",
"ember-style-modifier": "^3.0.1",
Expand Down
Loading
Loading