From 040e0476c7db52d49f4f987bdddf247c04bde72c Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Sat, 30 Sep 2023 14:57:02 +0900 Subject: [PATCH 1/4] dont use setTimeout() --- addon/controllers/api-keys/index.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/addon/controllers/api-keys/index.js b/addon/controllers/api-keys/index.js index b11bdeb..a61dfd9 100644 --- a/addon/controllers/api-keys/index.js +++ b/addon/controllers/api-keys/index.js @@ -5,6 +5,7 @@ import { action, computed } from '@ember/object'; import { isBlank } from '@ember/utils'; import { not } from '@ember/object/computed'; import { timeout } from 'ember-concurrency'; +import { later } from '@ember/runloop'; import { task } from 'ember-concurrency-decorators'; import { format as formatDate } from 'date-fns'; @@ -483,9 +484,13 @@ export default class ApiKeysIndexController extends Controller { } ) .then(() => { - setTimeout(() => { - return done(); - }, 600); + later( + this, + () => { + return done(); + }, + 600 + ); }) .catch((error) => { modal.stopLoading(); From 7bd488190f97b5e6de3ddcb093b6528f69880463 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Sat, 30 Sep 2023 14:58:04 +0900 Subject: [PATCH 2/4] update dependencies --- package.json | 4 ++-- pnpm-lock.yaml | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 9245ab9..6317bf4 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,8 @@ "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish" }, "dependencies": { - "@fleetbase/ember-core": "^0.1.2", - "@fleetbase/ember-ui": "^0.1.8", + "@fleetbase/ember-core": "^0.1.3", + "@fleetbase/ember-ui": "^0.1.9", "@fortawesome/ember-fontawesome": "^0.4.1", "@fortawesome/fontawesome-svg-core": "^6.4.0", "@fortawesome/free-solid-svg-icons": "^6.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b7bc8b7..7fa8cc2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,11 +2,11 @@ lockfileVersion: '6.0' dependencies: '@fleetbase/ember-core': - specifier: ^0.1.2 - version: 0.1.2(@babel/core@7.22.10)(ember-fetch@8.1.2)(postcss@8.4.28)(webpack@5.74.0) + specifier: ^0.1.3 + version: 0.1.3(@babel/core@7.22.10)(ember-fetch@8.1.2)(postcss@8.4.28)(webpack@5.74.0) '@fleetbase/ember-ui': - specifier: ^0.1.8 - version: 0.1.8(@babel/core@7.22.10)(@ember/test-helpers@2.8.1)(ember-source@4.6.0)(postcss@8.4.28)(rollup@3.28.0)(webpack@5.74.0) + specifier: ^0.1.9 + version: 0.1.9(@babel/core@7.22.10)(@ember/test-helpers@2.8.1)(ember-source@4.6.0)(postcss@8.4.28)(rollup@3.28.0)(webpack@5.74.0) '@fortawesome/ember-fontawesome': specifier: ^0.4.1 version: 0.4.1(rollup@3.28.0) @@ -462,6 +462,7 @@ packages: /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.22.10): resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: @@ -473,6 +474,7 @@ packages: /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.22.10): resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: @@ -2166,8 +2168,8 @@ packages: - supports-color dev: true - /@fleetbase/ember-core@0.1.2(@babel/core@7.22.10)(ember-fetch@8.1.2)(postcss@8.4.28)(webpack@5.74.0): - resolution: {integrity: sha512-cd6rKJWxiXgI8OZtwp8bHOF1BLyfjQPAg3bqzSO/31MPVQHL230tmjbfB1yggb72iv247LXxgHHjiTb2th9lPw==} + /@fleetbase/ember-core@0.1.3(@babel/core@7.22.10)(ember-fetch@8.1.2)(postcss@8.4.28)(webpack@5.74.0): + resolution: {integrity: sha512-eTcVzpVz7J7B0ctZLIsyrJ3wk4ATDahfer/WK/udW4M8Q5vEgEXXr0e+Wjzy6g7gv+n9f0DKe6eZ3uz5NoGzQg==} engines: {node: 14.* || >= 16} dependencies: date-fns: 2.30.0 @@ -2198,8 +2200,8 @@ packages: - webpack dev: false - /@fleetbase/ember-ui@0.1.8(@babel/core@7.22.10)(@ember/test-helpers@2.8.1)(ember-source@4.6.0)(postcss@8.4.28)(rollup@3.28.0)(webpack@5.74.0): - resolution: {integrity: sha512-9MAICV1fp25SPROLrJV1Sn6VtWiWkbZQtcD58ITzYQaqRBSvN8pbu3/OPeXpa8KqZjhmDyMn4zXshRj3rc28Ng==} + /@fleetbase/ember-ui@0.1.9(@babel/core@7.22.10)(@ember/test-helpers@2.8.1)(ember-source@4.6.0)(postcss@8.4.28)(rollup@3.28.0)(webpack@5.74.0): + resolution: {integrity: sha512-zB/a/r9YYW8QkZqKsaN/Af0wJWM/P1+/m5V/JK+jLO4yojUOa/e7oZYeeE/GRB1Kz3LwaSmhEWCMYKnxeiey2A==} engines: {node: 14.* || >= 16} dependencies: '@ember/render-modifiers': 2.1.0(@babel/core@7.22.10)(ember-source@4.6.0) From bd4e8431d5cf4026e8624eeed66e19248c7386a3 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Mon, 23 Oct 2023 19:04:38 +0800 Subject: [PATCH 3/4] refactor for new `LoaderService` updates --- addon/routes/api-keys/index.js | 2 +- addon/routes/events/index.js | 2 +- addon/routes/logs/index.js | 2 +- addon/routes/sockets/index.js | 2 +- addon/routes/webhooks/index.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addon/routes/api-keys/index.js b/addon/routes/api-keys/index.js index f7ea19a..c058825 100644 --- a/addon/routes/api-keys/index.js +++ b/addon/routes/api-keys/index.js @@ -23,7 +23,7 @@ export default class ApiKeysIndexRoute extends Route { }; @action loading(transition) { - this.loader.showOnInitialTransition(transition, 'section.next-view-section', 'Loading api keys...'); + this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading api keys...' }); } model(params) { diff --git a/addon/routes/events/index.js b/addon/routes/events/index.js index 96b4283..384c6a9 100644 --- a/addon/routes/events/index.js +++ b/addon/routes/events/index.js @@ -28,7 +28,7 @@ export default class EventsIndexRoute extends Route { }; @action loading(transition) { - this.loader.showOnInitialTransition(transition, 'section.next-view-section', 'Loading events...'); + this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading events...' }); } model(params) { diff --git a/addon/routes/logs/index.js b/addon/routes/logs/index.js index f98bbfe..70e1eb3 100644 --- a/addon/routes/logs/index.js +++ b/addon/routes/logs/index.js @@ -34,7 +34,7 @@ export default class LogsIndexRoute extends Route { }; @action loading(transition) { - this.loader.showOnInitialTransition(transition, 'section.next-view-section', 'Loading logs...'); + this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading logs...' }); } model(params) { diff --git a/addon/routes/sockets/index.js b/addon/routes/sockets/index.js index 9993072..84e0fcf 100644 --- a/addon/routes/sockets/index.js +++ b/addon/routes/sockets/index.js @@ -6,6 +6,6 @@ export default class SocketsIndexRoute extends Route { @service loader; @action loading(transition) { - this.loader.showOnInitialTransition(transition, 'section.next-view-section', 'Loading websockets...'); + this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading websockets...' }); } } diff --git a/addon/routes/webhooks/index.js b/addon/routes/webhooks/index.js index a968c3f..37873a5 100644 --- a/addon/routes/webhooks/index.js +++ b/addon/routes/webhooks/index.js @@ -20,7 +20,7 @@ export default class WebhooksIndexRoute extends Route { }; @action loading(transition) { - this.loader.showOnInitialTransition(transition, 'section.next-view-section', 'Loading webhooks...'); + this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading webhooks...' }); } model(params) { From f0748cce875643d7e344a104783fda5af95031b5 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Fri, 27 Oct 2023 04:51:29 +0800 Subject: [PATCH 4/4] upgraded core dependencies --- package.json | 6 +++--- pnpm-lock.yaml | 30 ++++++++++++++---------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 6317bf4..d43aab8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@fleetbase/dev-engine", - "version": "0.1.8", + "version": "0.1.9", "description": "Fleetbase Developers extension provides a module for managing developer resources such as API keys, webhooks, sockets, events and logs.", "fleetbase": { "route": "developers" @@ -38,8 +38,8 @@ "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish" }, "dependencies": { - "@fleetbase/ember-core": "^0.1.3", - "@fleetbase/ember-ui": "^0.1.9", + "@fleetbase/ember-core": "^0.1.6", + "@fleetbase/ember-ui": "^0.2.1", "@fortawesome/ember-fontawesome": "^0.4.1", "@fortawesome/fontawesome-svg-core": "^6.4.0", "@fortawesome/free-solid-svg-icons": "^6.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7fa8cc2..837419c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,11 +2,11 @@ lockfileVersion: '6.0' dependencies: '@fleetbase/ember-core': - specifier: ^0.1.3 - version: 0.1.3(@babel/core@7.22.10)(ember-fetch@8.1.2)(postcss@8.4.28)(webpack@5.74.0) + specifier: ^0.1.6 + version: 0.1.6(@babel/core@7.22.10)(ember-fetch@8.1.2)(postcss@8.4.28)(webpack@5.74.0) '@fleetbase/ember-ui': - specifier: ^0.1.9 - version: 0.1.9(@babel/core@7.22.10)(@ember/test-helpers@2.8.1)(ember-source@4.6.0)(postcss@8.4.28)(rollup@3.28.0)(webpack@5.74.0) + specifier: ^0.2.1 + version: 0.2.1(@babel/core@7.22.10)(@ember/test-helpers@2.8.1)(ember-source@4.6.0)(postcss@8.4.28)(rollup@3.28.0)(webpack@5.74.0) '@fortawesome/ember-fontawesome': specifier: ^0.4.1 version: 0.4.1(rollup@3.28.0) @@ -1753,7 +1753,7 @@ packages: '@ember-data/store': 4.6.0(@babel/core@7.22.10)(webpack@5.74.0) '@ember/edition-utils': 1.2.0 '@ember/string': 3.1.1 - ember-auto-import: 2.4.2(webpack@5.74.0) + ember-auto-import: 2.6.3(webpack@5.74.0) ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 ember-cli-typescript: 5.2.1 @@ -1781,7 +1781,7 @@ packages: '@ember-data/private-build-infra': 4.6.0(@babel/core@7.22.10) '@ember/edition-utils': 1.2.0 '@ember/string': 3.1.1 - ember-auto-import: 2.4.2(webpack@5.74.0) + ember-auto-import: 2.6.3(webpack@5.74.0) ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 ember-cli-typescript: 5.2.1 @@ -1802,7 +1802,7 @@ packages: '@ember/edition-utils': 1.2.0 '@ember/string': 3.1.1 '@embroider/macros': 1.13.1 - ember-auto-import: 2.4.2(webpack@5.74.0) + ember-auto-import: 2.6.3(webpack@5.74.0) ember-cached-decorator-polyfill: 0.1.4(@babel/core@7.22.10) ember-cli-babel: 7.26.11 ember-cli-string-utils: 1.1.0 @@ -1859,7 +1859,7 @@ packages: '@ember-data/private-build-infra': 4.6.0(@babel/core@7.22.10) '@ember-data/store': 4.6.0(@babel/core@7.22.10)(webpack@5.74.0) '@ember/edition-utils': 1.2.0 - ember-auto-import: 2.4.2(webpack@5.74.0) + ember-auto-import: 2.6.3(webpack@5.74.0) ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 ember-cli-typescript: 5.2.1 @@ -1879,7 +1879,7 @@ packages: dependencies: '@ember-data/private-build-infra': 4.6.0(@babel/core@7.22.10) '@ember-data/store': 4.6.0(@babel/core@7.22.10)(webpack@5.74.0) - ember-auto-import: 2.4.2(webpack@5.74.0) + ember-auto-import: 2.6.3(webpack@5.74.0) ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 ember-cli-typescript: 5.2.1 @@ -1899,7 +1899,7 @@ packages: '@ember/string': 3.1.1 '@embroider/macros': 1.13.1 '@glimmer/tracking': 1.1.2 - ember-auto-import: 2.4.2(webpack@5.74.0) + ember-auto-import: 2.6.3(webpack@5.74.0) ember-cached-decorator-polyfill: 0.1.4(@babel/core@7.22.10) ember-cli-babel: 7.26.11 ember-cli-path-utils: 1.0.0 @@ -2168,8 +2168,8 @@ packages: - supports-color dev: true - /@fleetbase/ember-core@0.1.3(@babel/core@7.22.10)(ember-fetch@8.1.2)(postcss@8.4.28)(webpack@5.74.0): - resolution: {integrity: sha512-eTcVzpVz7J7B0ctZLIsyrJ3wk4ATDahfer/WK/udW4M8Q5vEgEXXr0e+Wjzy6g7gv+n9f0DKe6eZ3uz5NoGzQg==} + /@fleetbase/ember-core@0.1.6(@babel/core@7.22.10)(ember-fetch@8.1.2)(postcss@8.4.28)(webpack@5.74.0): + resolution: {integrity: sha512-S17tzOM/h+ao8vX9t3Fn8Dr+Ge/oznFOUaB4cXzlnChpB/UBAVvAXocikFnuMWiHUaZqm498oQRo2Fp9zc+Y2w==} engines: {node: 14.* || >= 16} dependencies: date-fns: 2.30.0 @@ -2200,8 +2200,8 @@ packages: - webpack dev: false - /@fleetbase/ember-ui@0.1.9(@babel/core@7.22.10)(@ember/test-helpers@2.8.1)(ember-source@4.6.0)(postcss@8.4.28)(rollup@3.28.0)(webpack@5.74.0): - resolution: {integrity: sha512-zB/a/r9YYW8QkZqKsaN/Af0wJWM/P1+/m5V/JK+jLO4yojUOa/e7oZYeeE/GRB1Kz3LwaSmhEWCMYKnxeiey2A==} + /@fleetbase/ember-ui@0.2.1(@babel/core@7.22.10)(@ember/test-helpers@2.8.1)(ember-source@4.6.0)(postcss@8.4.28)(rollup@3.28.0)(webpack@5.74.0): + resolution: {integrity: sha512-yxQFvPxY+6paJkj0pa6dW2+DpIEGAi053hsGEo9+7oyLpKD14x4kYTXh94q1z1wHx4+1gNGEuFkc1oEzsC+aqA==} engines: {node: 14.* || >= 16} dependencies: '@ember/render-modifiers': 2.1.0(@babel/core@7.22.10)(ember-source@4.6.0) @@ -3763,7 +3763,6 @@ packages: dependencies: '@glimmer/syntax': 0.84.3 babel-import-util: 2.0.0 - dev: false /babel-plugin-filter-imports@4.0.0: resolution: {integrity: sha512-jDLlxI8QnfKd7PtieH6pl4tZJzymzfCDCPGdTq/grgbiYAikwDPp/oL0IlFJn0HQjLpcLkyYhPKkUVneRESw5w==} @@ -6308,7 +6307,6 @@ packages: - '@glint/template' - supports-color - webpack - dev: false /ember-basic-dropdown@6.0.2(@babel/core@7.22.10)(ember-source@4.6.0): resolution: {integrity: sha512-JgI/cy7eS/Y2WoQl7B2Mko/1aFTAlxr5d+KpQeH7rBKOFml7IQtLvhiDQrpU/FLkrQ9aLNEJtzwtDZV1xQxAKA==}