From 8bfa454df5692e28c308058e420145f1377bf532 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 3 Jan 2022 12:35:48 -0500 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20migrate=20to=20route?= =?UTF-8?q?r.transitionTo=20due=20to=20deprecations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/routes/account.js | 3 ++- ui/admin/app/routes/index.js | 7 ++++++- ui/admin/app/routes/scopes/index.js | 5 +++-- ui/admin/app/routes/scopes/scope.js | 4 ++-- ui/admin/app/routes/scopes/scope/auth-methods.js | 8 ++++---- .../scopes/scope/auth-methods/auth-method/accounts.js | 10 +++++++--- .../scope/auth-methods/auth-method/managed-groups.js | 8 +++++--- ui/admin/app/routes/scopes/scope/authenticate.js | 4 +++- .../app/routes/scopes/scope/authenticate/index.js | 10 +++++++++- .../app/routes/scopes/scope/authenticate/method.js | 5 +++-- .../routes/scopes/scope/authenticate/method/oidc.js | 3 ++- ui/admin/app/routes/scopes/scope/credential-stores.js | 9 ++++++--- .../credential-store/credential-libraries.js | 11 +++++++---- ui/admin/app/routes/scopes/scope/edit.js | 3 ++- ui/admin/app/routes/scopes/scope/groups.js | 8 ++++---- ui/admin/app/routes/scopes/scope/host-catalogs.js | 6 +++--- .../scope/host-catalogs/host-catalog/host-sets.js | 8 +++++--- .../scopes/scope/host-catalogs/host-catalog/hosts.js | 8 +++++--- ui/admin/app/routes/scopes/scope/index.js | 7 ++++--- ui/admin/app/routes/scopes/scope/new.js | 3 ++- ui/admin/app/routes/scopes/scope/roles.js | 8 ++++---- ui/admin/app/routes/scopes/scope/scopes.js | 3 ++- ui/admin/app/routes/scopes/scope/sessions.js | 3 ++- ui/admin/app/routes/scopes/scope/targets.js | 8 ++++---- ui/admin/app/routes/scopes/scope/users.js | 8 ++++---- .../app/routes/scopes/scope/authenticate/method.js | 5 +++-- .../routes/scopes/scope/authenticate/method/oidc.js | 5 ++--- ui/desktop/app/routes/scopes/scope/projects.js | 3 ++- .../app/routes/scopes/scope/projects/sessions.js | 3 ++- .../app/routes/scopes/scope/projects/targets.js | 3 ++- .../scopes/scope/projects/targets/target/index.js | 7 ++++++- 31 files changed, 117 insertions(+), 69 deletions(-) diff --git a/ui/admin/app/routes/account.js b/ui/admin/app/routes/account.js index 064525911..36a8e6011 100644 --- a/ui/admin/app/routes/account.js +++ b/ui/admin/app/routes/account.js @@ -5,6 +5,7 @@ export default class AccountRoute extends Route { // =services @service session; + @service router; // =methods @@ -12,6 +13,6 @@ export default class AccountRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } } diff --git a/ui/admin/app/routes/index.js b/ui/admin/app/routes/index.js index c8728d037..ba3d014d2 100644 --- a/ui/admin/app/routes/index.js +++ b/ui/admin/app/routes/index.js @@ -1,12 +1,17 @@ import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; export default class IndexRoute extends Route { + // =services + + @service router; + // =methods /** * Redirects to scopes route for further processing. */ redirect() { - this.transitionTo('scopes'); + this.router.transitionTo('scopes'); } } diff --git a/ui/admin/app/routes/scopes/index.js b/ui/admin/app/routes/scopes/index.js index b1ec77f7f..526d5f4fe 100644 --- a/ui/admin/app/routes/scopes/index.js +++ b/ui/admin/app/routes/scopes/index.js @@ -6,6 +6,7 @@ export default class ScopesIndexRoute extends Route { // =services @service session; + @service router; // =methods @@ -21,9 +22,9 @@ export default class ScopesIndexRoute extends Route { 'data.authenticated.scope.id' ); if (authenticatedScopeID) { - this.transitionTo('scopes.scope', authenticatedScopeID); + this.router.transitionTo('scopes.scope', authenticatedScopeID); } else { - this.transitionTo('scopes.scope', 'global'); + this.router.transitionTo('scopes.scope', 'global'); } } } diff --git a/ui/admin/app/routes/scopes/scope.js b/ui/admin/app/routes/scopes/scope.js index 998117b27..534940834 100644 --- a/ui/admin/app/routes/scopes/scope.js +++ b/ui/admin/app/routes/scopes/scope.js @@ -117,7 +117,7 @@ export default class ScopesScopeRoute extends Route { cancel(scope) { const { isNew } = scope; scope.rollbackAttributes(); - if (isNew) this.transitionTo('scopes.scope'); + if (isNew) this.router.transitionTo('scopes.scope'); } /** @@ -134,7 +134,7 @@ export default class ScopesScopeRoute extends Route { async save(scope) { const { isNew } = scope; await scope.save(); - await this.transitionTo('scopes.scope.edit', scope); + await this.router.transitionTo('scopes.scope.edit', scope); if (isNew) this.refresh(); } diff --git a/ui/admin/app/routes/scopes/scope/auth-methods.js b/ui/admin/app/routes/scopes/scope/auth-methods.js index 2348a2d83..e56b1843b 100644 --- a/ui/admin/app/routes/scopes/scope/auth-methods.js +++ b/ui/admin/app/routes/scopes/scope/auth-methods.js @@ -26,7 +26,7 @@ export default class ScopesScopeAuthMethodsRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** @@ -57,7 +57,7 @@ export default class ScopesScopeAuthMethodsRoute extends Route { cancel(authMethod) { const { isNew } = authMethod; authMethod.rollbackAttributes(); - if (isNew) this.transitionTo('scopes.scope.auth-methods'); + if (isNew) this.router.transitionTo('scopes.scope.auth-methods'); } /** @@ -73,12 +73,12 @@ export default class ScopesScopeAuthMethodsRoute extends Route { async save(authMethod) { await authMethod.save(); if (this.can.can('read model', authMethod)) { - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.auth-methods.auth-method', authMethod ); } else { - await this.transitionTo('scopes.scope.auth-methods'); + await this.router.transitionTo('scopes.scope.auth-methods'); } this.refresh(); } diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js index cce5799e7..9fcb9b990 100644 --- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js +++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js @@ -42,7 +42,9 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsRoute extends Route const { isNew } = account; account.rollbackAttributes(); if (isNew) - this.transitionTo('scopes.scope.auth-methods.auth-method.accounts'); + this.router.transitionTo( + 'scopes.scope.auth-methods.auth-method.accounts' + ); } /** @@ -63,12 +65,14 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsRoute extends Route } await account.save({ adapterOptions }); if (this.can.can('read model', account)) { - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.auth-methods.auth-method.accounts.account', account ); } else { - await this.transitionTo('scopes.scope.auth-methods.auth-method.accounts'); + await this.router.transitionTo( + 'scopes.scope.auth-methods.auth-method.accounts' + ); } this.refresh(); } diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js index 820ef822a..51b55adb9 100644 --- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js +++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js @@ -41,7 +41,9 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends const { isNew } = managedGroup; managedGroup.rollbackAttributes(); if (isNew) { - this.transitionTo('scopes.scope.auth-methods.auth-method.managed-groups'); + this.router.transitionTo( + 'scopes.scope.auth-methods.auth-method.managed-groups' + ); } } @@ -58,12 +60,12 @@ export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends async save(managedGroup) { await managedGroup.save(); if (this.can.can('read model', managedGroup)) { - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.auth-methods.auth-method.managed-groups.managed-group', managedGroup ); } else { - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.auth-methods.auth-method.managed-groups' ); } diff --git a/ui/admin/app/routes/scopes/scope/authenticate.js b/ui/admin/app/routes/scopes/scope/authenticate.js index 21d9de8e4..9f1130ce6 100644 --- a/ui/admin/app/routes/scopes/scope/authenticate.js +++ b/ui/admin/app/routes/scopes/scope/authenticate.js @@ -6,11 +6,13 @@ export default class ScopesScopeAuthenticateRoute extends Route { // =services @service session; + @service router; // =methods beforeModel() { - if (this.session.isAuthenticated) this.transitionTo('scopes.scope.index'); + if (this.session.isAuthenticated) + this.router.transitionTo('scopes.scope.index'); } /** diff --git a/ui/admin/app/routes/scopes/scope/authenticate/index.js b/ui/admin/app/routes/scopes/scope/authenticate/index.js index 9d6ce9d61..beb525fec 100644 --- a/ui/admin/app/routes/scopes/scope/authenticate/index.js +++ b/ui/admin/app/routes/scopes/scope/authenticate/index.js @@ -1,6 +1,11 @@ import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; export default class ScopesScopeAuthenticateIndexRoute extends Route { + // =services + + @service router; + // =methods /** @@ -12,7 +17,10 @@ export default class ScopesScopeAuthenticateIndexRoute extends Route { redirect({ authMethods }) { const firstAuthMethod = authMethods.firstObject; if (firstAuthMethod) { - this.transitionTo('scopes.scope.authenticate.method', firstAuthMethod); + this.router.transitionTo( + 'scopes.scope.authenticate.method', + firstAuthMethod + ); } } } diff --git a/ui/admin/app/routes/scopes/scope/authenticate/method.js b/ui/admin/app/routes/scopes/scope/authenticate/method.js index 8da0f3cae..d09ef3688 100644 --- a/ui/admin/app/routes/scopes/scope/authenticate/method.js +++ b/ui/admin/app/routes/scopes/scope/authenticate/method.js @@ -12,6 +12,7 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route { @service notify; @service intl; @service windowManager; + @service router; // =methods @@ -60,14 +61,14 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route { requestCookies, { scope, authMethod } ); - this.transitionTo('index'); + this.router.transitionTo('index'); break; case 'oidc': await this.startOIDCAuthentication(authenticatorName, { scope, authMethod, }); - this.transitionTo('scopes.scope.authenticate.method.oidc'); + this.router.transitionTo('scopes.scope.authenticate.method.oidc'); break; } } diff --git a/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js b/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js index b8fa4519c..7cc24d5c5 100644 --- a/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js +++ b/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js @@ -13,6 +13,7 @@ export default class ScopesScopeAuthenticateMethodOidcRoute extends Route { @service session; @service windowManager; + @service router; // =methods @@ -47,7 +48,7 @@ export default class ScopesScopeAuthenticateMethodOidcRoute extends Route { @action @notifyError(() => 'errors.authentication-failed.title', { catch: true }) error(e) { - this.transitionTo('scopes.scope.authenticate.method.index'); + this.router.transitionTo('scopes.scope.authenticate.method.index'); // rethrow the error to activate the notifyError decorator throw e; } diff --git a/ui/admin/app/routes/scopes/scope/credential-stores.js b/ui/admin/app/routes/scopes/scope/credential-stores.js index dbdd28f24..028318ede 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores.js @@ -6,10 +6,13 @@ import { confirm } from 'core/decorators/confirm'; import { notifySuccess, notifyError } from 'core/decorators/notify'; export default class ScopesScopeCredentialStoresRoute extends Route { - // =methods + // =services + @service can; @service router; + // =methods + /** * Load all credential stores under current scope * @returns {Promise[CredentialStoreModel]} @@ -38,7 +41,7 @@ export default class ScopesScopeCredentialStoresRoute extends Route { @notifySuccess('notifications.save-success') async save(credentialStore) { await credentialStore.save(); - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.credential-stores.credential-store', credentialStore ); @@ -53,7 +56,7 @@ export default class ScopesScopeCredentialStoresRoute extends Route { cancel(credentialStore) { const { isNew } = credentialStore; credentialStore.rollbackAttributes(); - if (isNew) this.transitionTo('scopes.scope.credential-stores'); + if (isNew) this.router.transitionTo('scopes.scope.credential-stores'); } /** diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js index 8b8b0b259..a8f8db78a 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js @@ -6,10 +6,13 @@ import { notifySuccess, notifyError } from 'core/decorators/notify'; import { inject as service } from '@ember/service'; export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesRoute extends Route { - // =methods + // =services + @service can; @service router; + // =methods + /** * Loads all credential libraries under the current credential store. * @return {Promise{[CredentialLibraryModel]}} @@ -39,7 +42,7 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari const { isNew } = credentialLibrary; credentialLibrary.rollbackAttributes(); if (isNew) - this.transitionTo( + this.router.transitionTo( 'scopes.scope.credential-stores.credential-store.credential-libraries' ); } @@ -57,12 +60,12 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari async save(credentialLibrary) { await credentialLibrary.save(); if (this.can.can('read model', credentialLibrary)) { - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.credential-stores.credential-store.credential-libraries.credential-library', credentialLibrary ); } else { - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.credential-stores.credential-store.credential-libraries' ); } diff --git a/ui/admin/app/routes/scopes/scope/edit.js b/ui/admin/app/routes/scopes/scope/edit.js index 5928b678f..b227adfd5 100644 --- a/ui/admin/app/routes/scopes/scope/edit.js +++ b/ui/admin/app/routes/scopes/scope/edit.js @@ -5,6 +5,7 @@ export default class ScopesScopeEditRoute extends Route { // =services @service session; + @service router; // =methods @@ -12,6 +13,6 @@ export default class ScopesScopeEditRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } } diff --git a/ui/admin/app/routes/scopes/scope/groups.js b/ui/admin/app/routes/scopes/scope/groups.js index 18ac1bef8..26a4b5412 100644 --- a/ui/admin/app/routes/scopes/scope/groups.js +++ b/ui/admin/app/routes/scopes/scope/groups.js @@ -20,7 +20,7 @@ export default class ScopesScopeGroupsRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** @@ -44,7 +44,7 @@ export default class ScopesScopeGroupsRoute extends Route { cancel(group) { const { isNew } = group; group.rollbackAttributes(); - if (isNew) this.transitionTo('scopes.scope.groups'); + if (isNew) this.router.transitionTo('scopes.scope.groups'); } /** @@ -60,9 +60,9 @@ export default class ScopesScopeGroupsRoute extends Route { async save(group) { await group.save(); if (this.can.can('read model', group)) { - await this.transitionTo('scopes.scope.groups.group', group); + await this.router.transitionTo('scopes.scope.groups.group', group); } else { - await this.transitionTo('scopes.scope.groups'); + await this.router.transitionTo('scopes.scope.groups'); } this.refresh(); } diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs.js b/ui/admin/app/routes/scopes/scope/host-catalogs.js index 50fea0152..bb041225c 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs.js @@ -20,7 +20,7 @@ export default class ScopesScopeHostCatalogsRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** @@ -47,7 +47,7 @@ export default class ScopesScopeHostCatalogsRoute extends Route { cancel(hostCatalog) { const { isNew } = hostCatalog; hostCatalog.rollbackAttributes(); - if (isNew) this.transitionTo('scopes.scope.host-catalogs'); + if (isNew) this.router.transitionTo('scopes.scope.host-catalogs'); } /** @@ -63,7 +63,7 @@ export default class ScopesScopeHostCatalogsRoute extends Route { ) async save(hostCatalog) { await hostCatalog.save(); - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.host-catalogs.host-catalog', hostCatalog ); diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js index a5cb4df1f..b8f8c16f7 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js @@ -45,7 +45,9 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Rou const { isNew } = hostSet; hostSet.rollbackAttributes(); if (isNew) - this.transitionTo('scopes.scope.host-catalogs.host-catalog.host-sets'); + this.router.transitionTo( + 'scopes.scope.host-catalogs.host-catalog.host-sets' + ); } /** @@ -62,12 +64,12 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Rou async save(hostSet) { await hostSet.save(); if (this.can.can('read model', hostSet)) { - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.host-catalogs.host-catalog.host-sets.host-set', hostSet ); } else { - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.host-catalogs.host-catalog.host-sets' ); } diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js index 06ced047b..ff9475ddb 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js @@ -44,7 +44,7 @@ export default class ScopesScopeHostCatalogsHostCatalogHostsRoute extends Route const { isNew } = host; host.rollbackAttributes(); if (isNew) - this.transitionTo('scopes.scope.host-catalogs.host-catalog.hosts'); + this.router.transitionTo('scopes.scope.host-catalogs.host-catalog.hosts'); } /** @@ -61,12 +61,14 @@ export default class ScopesScopeHostCatalogsHostCatalogHostsRoute extends Route async save(host) { await host.save(); if (this.can.can('read model', host)) { - await this.transitionTo( + await this.router.transitionTo( 'scopes.scope.host-catalogs.host-catalog.hosts.host', host ); } else { - await this.transitionTo('scopes.scope.host-catalogs.host-catalog.hosts'); + await this.router.transitionTo( + 'scopes.scope.host-catalogs.host-catalog.hosts' + ); } this.refresh(); } diff --git a/ui/admin/app/routes/scopes/scope/index.js b/ui/admin/app/routes/scopes/scope/index.js index 8ae76d0a6..d2d2efeea 100644 --- a/ui/admin/app/routes/scopes/scope/index.js +++ b/ui/admin/app/routes/scopes/scope/index.js @@ -5,6 +5,7 @@ export default class ScopesScopeIndexRoute extends Route { // =services @service session; + @service router; // =methods @@ -15,11 +16,11 @@ export default class ScopesScopeIndexRoute extends Route { */ redirect(model) { if (!this.session.isAuthenticated) { - this.transitionTo('scopes.scope.authenticate'); + this.router.transitionTo('scopes.scope.authenticate'); } else if (model.isProject) { - this.transitionTo('scopes.scope.edit'); + this.router.transitionTo('scopes.scope.edit'); } else { - this.transitionTo('scopes.scope.scopes'); + this.router.transitionTo('scopes.scope.scopes'); } } } diff --git a/ui/admin/app/routes/scopes/scope/new.js b/ui/admin/app/routes/scopes/scope/new.js index 54a0949be..c5de307ba 100644 --- a/ui/admin/app/routes/scopes/scope/new.js +++ b/ui/admin/app/routes/scopes/scope/new.js @@ -5,6 +5,7 @@ export default class ScopesScopeNewRoute extends Route { // =services @service session; + @service router; // =methods @@ -12,7 +13,7 @@ export default class ScopesScopeNewRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** diff --git a/ui/admin/app/routes/scopes/scope/roles.js b/ui/admin/app/routes/scopes/scope/roles.js index 61d763561..508295d34 100644 --- a/ui/admin/app/routes/scopes/scope/roles.js +++ b/ui/admin/app/routes/scopes/scope/roles.js @@ -20,7 +20,7 @@ export default class ScopesScopeRolesRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** @@ -44,7 +44,7 @@ export default class ScopesScopeRolesRoute extends Route { cancel(role) { const { isNew } = role; role.rollbackAttributes(); - if (isNew) this.transitionTo('scopes.scope.roles'); + if (isNew) this.router.transitionTo('scopes.scope.roles'); } /** @@ -60,9 +60,9 @@ export default class ScopesScopeRolesRoute extends Route { async save(role) { await role.save(); if (this.can.can('read model', role)) { - await this.transitionTo('scopes.scope.roles.role', role); + await this.router.transitionTo('scopes.scope.roles.role', role); } else { - await this.transitionTo('scopes.scope.roles'); + await this.router.transitionTo('scopes.scope.roles'); } this.refresh(); } diff --git a/ui/admin/app/routes/scopes/scope/scopes.js b/ui/admin/app/routes/scopes/scope/scopes.js index 7a588dd2c..4052d285a 100644 --- a/ui/admin/app/routes/scopes/scope/scopes.js +++ b/ui/admin/app/routes/scopes/scope/scopes.js @@ -10,6 +10,7 @@ export default class ScopesScopeScopesRoute extends Route { // =services @service session; + @service router; // =methods @@ -17,7 +18,7 @@ export default class ScopesScopeScopesRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** diff --git a/ui/admin/app/routes/scopes/scope/sessions.js b/ui/admin/app/routes/scopes/scope/sessions.js index 71038382c..b17f548ce 100644 --- a/ui/admin/app/routes/scopes/scope/sessions.js +++ b/ui/admin/app/routes/scopes/scope/sessions.js @@ -17,6 +17,7 @@ export default class ScopesScopeSessionsRoute extends Route { @service notify; @service session; @service resourceFilterStore; + @service router; // =attributes @@ -37,7 +38,7 @@ export default class ScopesScopeSessionsRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** diff --git a/ui/admin/app/routes/scopes/scope/targets.js b/ui/admin/app/routes/scopes/scope/targets.js index 1fc5d68ec..b64d915ce 100644 --- a/ui/admin/app/routes/scopes/scope/targets.js +++ b/ui/admin/app/routes/scopes/scope/targets.js @@ -20,7 +20,7 @@ export default class ScopesScopeTargetsRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** @@ -45,7 +45,7 @@ export default class ScopesScopeTargetsRoute extends Route { cancel(target) { const { isNew } = target; target.rollbackAttributes(); - if (isNew) this.transitionTo('scopes.scope.targets'); + if (isNew) this.router.transitionTo('scopes.scope.targets'); } /** @@ -62,9 +62,9 @@ export default class ScopesScopeTargetsRoute extends Route { async save(target) { await target.save(); if (this.can.can('read model', target)) { - await this.transitionTo('scopes.scope.targets.target', target); + await this.router.transitionTo('scopes.scope.targets.target', target); } else { - await this.transitionTo('scopes.scope.targets'); + await this.router.transitionTo('scopes.scope.targets'); } this.refresh(); } diff --git a/ui/admin/app/routes/scopes/scope/users.js b/ui/admin/app/routes/scopes/scope/users.js index de0aa8b0f..5b921a65d 100644 --- a/ui/admin/app/routes/scopes/scope/users.js +++ b/ui/admin/app/routes/scopes/scope/users.js @@ -20,7 +20,7 @@ export default class ScopesScopeUsersRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** @@ -44,7 +44,7 @@ export default class ScopesScopeUsersRoute extends Route { cancel(user) { const { isNew } = user; user.rollbackAttributes(); - if (isNew) this.transitionTo('scopes.scope.users'); + if (isNew) this.router.transitionTo('scopes.scope.users'); } /** @@ -61,9 +61,9 @@ export default class ScopesScopeUsersRoute extends Route { async save(user) { await user.save(); if (this.can.can('read model', user)) { - await this.transitionTo('scopes.scope.users.user', user); + await this.router.transitionTo('scopes.scope.users.user', user); } else { - await this.transitionTo('scopes.scope.users'); + await this.router.transitionTo('scopes.scope.users'); } this.refresh(); } diff --git a/ui/desktop/app/routes/scopes/scope/authenticate/method.js b/ui/desktop/app/routes/scopes/scope/authenticate/method.js index c88264f72..02d8d90d8 100644 --- a/ui/desktop/app/routes/scopes/scope/authenticate/method.js +++ b/ui/desktop/app/routes/scopes/scope/authenticate/method.js @@ -12,6 +12,7 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route { @service notify; @service ipc; @service intl; + @service router; // =methods @@ -67,14 +68,14 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route { requestCookies, { scope, authMethod } ); - this.transitionTo('index'); + this.router.transitionTo('index'); break; case 'oidc': await this.startOIDCAuthentication(authenticatorName, { scope, authMethod, }); - this.transitionTo('scopes.scope.authenticate.method.oidc'); + this.router.transitionTo('scopes.scope.authenticate.method.oidc'); break; } } diff --git a/ui/desktop/app/routes/scopes/scope/authenticate/method/oidc.js b/ui/desktop/app/routes/scopes/scope/authenticate/method/oidc.js index f2f8f81cd..322693876 100644 --- a/ui/desktop/app/routes/scopes/scope/authenticate/method/oidc.js +++ b/ui/desktop/app/routes/scopes/scope/authenticate/method/oidc.js @@ -12,8 +12,7 @@ export default class ScopesScopeAuthenticateMethodOidcRoute extends Route { // =services @service session; - - // =attributes + @service router; // =methods @@ -39,7 +38,7 @@ export default class ScopesScopeAuthenticateMethodOidcRoute extends Route { @action @notifyError(() => 'errors.authentication-failed.title', { catch: true }) error(e) { - this.transitionTo('scopes.scope.authenticate.method.index'); + this.router.transitionTo('scopes.scope.authenticate.method.index'); // rethrow the error to activate the notifyError decorator throw e; } diff --git a/ui/desktop/app/routes/scopes/scope/projects.js b/ui/desktop/app/routes/scopes/scope/projects.js index 1a92b91a8..192bf87de 100644 --- a/ui/desktop/app/routes/scopes/scope/projects.js +++ b/ui/desktop/app/routes/scopes/scope/projects.js @@ -20,6 +20,7 @@ export default class ScopesScopeProjectsRoute extends Route { @service session; @service resourceFilterStore; + @service router; // =methods @@ -27,7 +28,7 @@ export default class ScopesScopeProjectsRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions.js b/ui/desktop/app/routes/scopes/scope/projects/sessions.js index 668d0cc52..d592ed90e 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/sessions.js +++ b/ui/desktop/app/routes/scopes/scope/projects/sessions.js @@ -14,6 +14,7 @@ export default class ScopesScopeProjectsSessionsRoute extends Route { @service ipc; @service session; @service resourceFilterStore; + @service router; // =attributes @@ -36,7 +37,7 @@ export default class ScopesScopeProjectsSessionsRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets.js b/ui/desktop/app/routes/scopes/scope/projects/targets.js index e33c5b833..345467ff0 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/targets.js +++ b/ui/desktop/app/routes/scopes/scope/projects/targets.js @@ -16,6 +16,7 @@ export default class ScopesScopeProjectsTargetsRoute extends Route { @service notify; @service confirm; @service resourceFilterStore; + @service router; // =attributes @@ -32,7 +33,7 @@ export default class ScopesScopeProjectsTargetsRoute extends Route { * If arriving here unauthenticated, redirect to index for further processing. */ beforeModel() { - if (!this.session.isAuthenticated) this.transitionTo('index'); + if (!this.session.isAuthenticated) this.router.transitionTo('index'); } /** diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets/target/index.js b/ui/desktop/app/routes/scopes/scope/projects/targets/target/index.js index 82513fa81..c0e280c73 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/targets/target/index.js +++ b/ui/desktop/app/routes/scopes/scope/projects/targets/target/index.js @@ -1,12 +1,17 @@ import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; export default class ScopesScopeProjectsTargetsTargetIndexRoute extends Route { + // =services + + @service router; + // =methods /** * Navigate to hosts within a target. */ afterModel() { - this.transitionTo('scopes.scope.projects.targets.target.sessions'); + this.router.transitionTo('scopes.scope.projects.targets.target.sessions'); } }