diff --git a/addon/components/webhook/attempts.js b/addon/components/webhook/attempts.js index ee01d9a..924858d 100644 --- a/addon/components/webhook/attempts.js +++ b/addon/components/webhook/attempts.js @@ -6,19 +6,9 @@ import { none } from '@ember/object/computed'; import copyToClipboard from '@fleetbase/ember-core/utils/copy-to-clipboard'; export default class WebhookAttemptsComponent extends Component { - /** - * Inject the `store` service - * - * @var {Service} - */ @service store; - - /** - * Inject the `intl` service - * - * @var {Service} - */ @service intl; + @service hostRouter; /** * The current viewing webhook status @@ -158,7 +148,7 @@ export default class WebhookAttemptsComponent extends Component { * @void */ @action viewWebhookRequestEvent(webhook) { - return this.transitionToRoute('events.event', webhook.api_event); + return this.hostRouter.transitionTo('console.developers.events.view', webhook.api_event); } /** diff --git a/addon/components/webhook/details.hbs b/addon/components/webhook/details.hbs index 9de67f7..8c01953 100644 --- a/addon/components/webhook/details.hbs +++ b/addon/components/webhook/details.hbs @@ -18,7 +18,7 @@ {{t "developers.common.url"}} - {{n-a @webhook.url}} + {{n-a @webhook.url}} diff --git a/addon/controllers/api-keys/index.js b/addon/controllers/api-keys/index.js index b0fce2e..25045c7 100644 --- a/addon/controllers/api-keys/index.js +++ b/addon/controllers/api-keys/index.js @@ -457,7 +457,7 @@ export default class ApiKeysIndexController extends Controller { * @void */ @action viewRequestLogs(apiKey) { - return this.universe.transitionToEngineRoute('@fleetbase/dev-engine', 'logs.index', { + return this.hostRouter.transitionTo('console.developers.logs.index', { queryParams: { key: apiKey.id }, }); } diff --git a/addon/controllers/events/index.js b/addon/controllers/events/index.js index 55b7c84..31bbeec 100644 --- a/addon/controllers/events/index.js +++ b/addon/controllers/events/index.js @@ -142,7 +142,7 @@ export default class EventsIndexController extends BaseController { * @void */ @action onRowClick(log) { - return this.transitionToRoute('events.view', log); + return this.hostRouter.transitionTo('console.developers.events.view', log); } /** diff --git a/addon/controllers/logs/index.js b/addon/controllers/logs/index.js index 356a4c1..be6ce3a 100644 --- a/addon/controllers/logs/index.js +++ b/addon/controllers/logs/index.js @@ -194,7 +194,7 @@ export default class LogsIndexController extends BaseController { * @void */ @action onRowClick(log) { - return this.transitionToRoute('logs.view', log); + return this.hostRouter.transitionTo('console.developers.logs.view', log); } /** diff --git a/addon/controllers/sockets/index.js b/addon/controllers/sockets/index.js index 71ce388..2692d0e 100644 --- a/addon/controllers/sockets/index.js +++ b/addon/controllers/sockets/index.js @@ -82,7 +82,7 @@ export default class SocketsIndexController extends BaseController { * @void */ @action onRowClick(row) { - return this.transitionToRoute('sockets.view', row); + return this.hostRouter.transitionTo('console.developers.sockets.view', row); } /** @@ -102,7 +102,7 @@ export default class SocketsIndexController extends BaseController { modal.startLoading(); const channelId = modal.getOption('channelId'); - return this.transitionToRoute('sockets.view', { name: channelId }); + return this.hostRouter.transitionTo('console.developers.sockets.view', { name: channelId }); }, }); } diff --git a/addon/controllers/webhooks/index.js b/addon/controllers/webhooks/index.js index f9bae1f..17ae163 100644 --- a/addon/controllers/webhooks/index.js +++ b/addon/controllers/webhooks/index.js @@ -335,7 +335,7 @@ export default class WebhooksIndexController extends BaseController { * @memberof WebhooksIndexController */ @action viewWebhook(webhook) { - return this.transitionToRoute('webhooks.view', webhook); + return this.hostRouter.transitionTo('console.developers.webhooks.view', webhook); } /** diff --git a/addon/controllers/webhooks/view.js b/addon/controllers/webhooks/view.js index 029b7a4..e877c00 100644 --- a/addon/controllers/webhooks/view.js +++ b/addon/controllers/webhooks/view.js @@ -58,7 +58,7 @@ export default class WebhooksViewController extends BaseController { this.webhooksIndexController.deleteWebhook(webhook, { onConfirm: () => { this.notifications.success(this.intl.t('developers.webhooks.view.webhook-deleted-success-message')); - return this.transitionToRoute('webhooks.index'); + return this.hostRouter.transitionTo('console.developers.webhooks.index'); }, }); } diff --git a/package.json b/package.json index df0c612..2aa4413 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@fleetbase/dev-engine", - "version": "0.2.7", + "version": "0.2.8", "description": "Fleetbase Developers extension provides a module for managing developer resources such as API keys, webhooks, sockets, events and logs.", "fleetbase": { "route": "developers" @@ -42,8 +42,8 @@ }, "dependencies": { "@babel/core": "^7.23.2", - "@fleetbase/ember-core": "^0.2.19", - "@fleetbase/ember-ui": "^0.2.32", + "@fleetbase/ember-core": "^0.2.21", + "@fleetbase/ember-ui": "^0.2.35", "@fortawesome/ember-fontawesome": "^2.0.0", "@fortawesome/fontawesome-svg-core": "6.4.0", "@fortawesome/free-brands-svg-icons": "6.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 35dac2a..4ffa1c3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,11 +12,11 @@ importers: specifier: ^7.23.2 version: 7.25.2 '@fleetbase/ember-core': - specifier: ^0.2.19 - version: 0.2.19(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0) + specifier: ^0.2.21 + version: 0.2.21(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0) '@fleetbase/ember-ui': - specifier: ^0.2.32 - version: 0.2.32(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.3.0)(webpack@5.93.0) + specifier: ^0.2.35 + version: 0.2.35(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.3.0)(webpack@5.93.0) '@fortawesome/ember-fontawesome': specifier: ^2.0.0 version: 2.0.0(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(rollup@2.79.1)(webpack@5.93.0) @@ -1325,12 +1325,12 @@ packages: peerDependencies: ember-source: '>= 4.0.0' - '@fleetbase/ember-core@0.2.19': - resolution: {integrity: sha512-xXRBp+dqZ975bPyAxvxlw1K+kcVxu1XZ9/Db+eySNPS2ua+wswg8+KyegnU6hkJflDgFjo7xTqBL30WVrjRUiQ==} + '@fleetbase/ember-core@0.2.21': + resolution: {integrity: sha512-Jwe4ME+cJp24Oaf6wfd1QJK6g3D6/Ff+qUMinJ40yoMImpo3zKA+IAxfQSBPIf+9BrmNG31wquTz4WR7Um47LQ==} engines: {node: '>= 18'} - '@fleetbase/ember-ui@0.2.32': - resolution: {integrity: sha512-+6lPyziomGKA405ILe6DSY9tBfehMTO1pSpe/8ZUQrez06wda6Ci4C2DCNd5vWmOlOtiC91cRKLUcN6Myx9dwQ==} + '@fleetbase/ember-ui@0.2.35': + resolution: {integrity: sha512-diJRlY92LTSFhf2bMlO2j8uyVabeTTC5YHuRqYYpTHk6GjLcVHUVeL4MrLnskKzkkbRsAgmoavkW9HcXNBN8Ow==} engines: {node: '>= 18'} '@fleetbase/intl-lint@0.0.1': @@ -9716,7 +9716,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@fleetbase/ember-core@0.2.19(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0)': + '@fleetbase/ember-core@0.2.21(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0)': dependencies: '@babel/core': 7.25.2 compress-json: 3.1.0 @@ -9749,7 +9749,7 @@ snapshots: - utf-8-validate - webpack - '@fleetbase/ember-ui@0.2.32(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.3.0)(webpack@5.93.0)': + '@fleetbase/ember-ui@0.2.35(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.3.0)(webpack@5.93.0)': dependencies: '@babel/core': 7.25.2 '@ember/render-modifiers': 2.1.0(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.93.0))