UI: Handle deprecation router service from host

ui/app/adapters/named-path.js

@@ -30,7 +30,7 @@ export default class NamedPathAdapter extends ApplicationAdapter {
     const [store, { modelName }, snapshot] = arguments;
     const name = snapshot.attr('name');
     // throw error if user attempts to create a record with same name, otherwise POST request silently overrides (updates) the existing model
-    if (store.hasRecordForId(modelName, name)) {
+    if (store.peekRecord({ type: modelName, id: name }) !== null) {
       throw new Error(`A record already exists with the name: ${name}`);
     } else {
       return this._saveRecord(...arguments);

ui/app/app.js

@@ -15,12 +15,20 @@ export default class App extends Application {
   engines = {
     'config-ui': {
       dependencies: {
-        services: ['auth', 'flash-messages', 'namespace', 'router', 'store', 'version', 'custom-messages'],
+        services: [
+          'auth',
+          'flash-messages',
+          'namespace',
+          { 'app-router': 'router' },
+          'store',
+          'version',
+          'custom-messages',
+        ],
       },
     },
     'open-api-explorer': {
       dependencies: {
-        services: ['auth', 'flash-messages', 'namespace', 'router', 'version'],
+        services: ['auth', 'flash-messages', 'namespace', { 'app-router': 'router' }, 'version'],
       },
     },
     replication: {
@@ -30,7 +38,7 @@ export default class App extends Application {
           'flash-messages',
           'namespace',
           'replication-mode',
-          'router',
+          'router', // TODO: resolve
           'store',
           'version',
           '-portal',
@@ -49,7 +57,7 @@ export default class App extends Application {
           'flash-messages',
           'namespace',
           'path-help',
-          'router',
+          { 'app-router': 'router' },
           'store',
           'version',
           'secret-mount-path',
@@ -61,15 +69,15 @@ export default class App extends Application {
     },
     kubernetes: {
       dependencies: {
-        services: ['router', 'store', 'secret-mount-path', 'flash-messages'],
+        services: [{ 'app-router': 'router' }, 'store', 'secret-mount-path', 'flash-messages'],
         externalRoutes: {
           secrets: 'vault.cluster.secrets.backends',
         },
       },
     },
     ldap: {
       dependencies: {
-        services: ['router', 'store', 'secret-mount-path', 'flash-messages', 'auth'],
+        services: [{ 'app-router': 'router' }, 'store', 'secret-mount-path', 'flash-messages', 'auth'],
         externalRoutes: {
           secrets: 'vault.cluster.secrets.backends',
         },
@@ -83,7 +91,7 @@ export default class App extends Application {
           'download',
           'flash-messages',
           'namespace',
-          'router',
+          { 'app-router': 'router' },
           'secret-mount-path',
           'store',
           'version',
@@ -102,7 +110,7 @@ export default class App extends Application {
           'flash-messages',
           'namespace',
           'path-help',
-          'router',
+          { 'app-router': 'router' },
           'secret-mount-path',
           'store',
           'version',
@@ -116,7 +124,7 @@ export default class App extends Application {
     },
     sync: {
       dependencies: {
-        services: ['flash-messages', 'flags', 'router', 'store', 'version'],
+        services: ['flash-messages', 'flags', { 'app-router': 'router' }, 'store', 'version'],
         externalRoutes: {
           kvSecretOverview: 'vault.cluster.secrets.backend.kv.secret.index',
           clientCountOverview: 'vault.cluster.clients',

ui/app/controllers/vault/cluster/init.js

@@ -40,7 +40,8 @@ export default Controller.extend(DEFAULTS, {
   }),
 
   actions: {
-    initCluster(data) {
+    initCluster(payload) {
+      const data = { ...payload };
       const isCloudSeal = !!this.model.sealType && this.model.sealType !== 'shamir';
       if (data.secret_shares) {
         const shares = parseInt(data.secret_shares, 10);

ui/app/initializers/deprecation-filter.js

@@ -10,7 +10,8 @@ export function initialize() {
   registerDeprecationHandler((message, options, next) => {
     // filter deprecations that are scheduled to be removed in a specific version
     // when upgrading or addressing deprecation warnings be sure to update this or remove if not needed
-    if (options?.until.includes('5.0') && options?.id.startsWith('ember-data')) {
+    if (options?.until.includes('6.0')) {
+      // ignore all deprecations for 6+
       return;
     }
     next(message, options);

ui/app/models/auth-config.js

@@ -6,5 +6,10 @@
 import Model, { belongsTo } from '@ember-data/model';
 
 export default Model.extend({
-  backend: belongsTo('auth-method', { inverse: 'authConfigs', readOnly: true, async: false }),
+  backend: belongsTo('auth-method', {
+    inverse: 'authConfigs',
+    readOnly: true,
+    async: false,
+    as: 'auth-config',
+  }),
 });

ui/config/deprecation-workflow.js

@@ -5,20 +5,19 @@
 
 /* global self */
 self.deprecationWorkflow = self.deprecationWorkflow || {};
-//self.deprecationWorkflow.config = {
-//throwOnUnhandled: true
-//}
+self.deprecationWorkflow.config = {
+  throwOnUnhandled: false,
+};
+
 self.deprecationWorkflow.config = {
   // current output from deprecationWorkflow.flushDeprecations();
-  // deprecations that will not be removed until 5.0.0 are filtered by deprecation-filter initializer rather than silencing below
   workflow: [
-    { handler: 'silence', matchId: 'ember-data:model-save-promise' },
-    { handler: 'silence', matchId: 'ember-engines.deprecation-camelized-engine-names' },
     { handler: 'silence', matchId: 'ember-engines.deprecation-router-service-from-host' },
-    { handler: 'silence', matchId: 'ember-modifier.use-modify' },
-    { handler: 'silence', matchId: 'ember-modifier.no-element-property' },
-    { handler: 'silence', matchId: 'ember-modifier.no-args-property' },
-    { handler: 'silence', matchId: 'ember-cli-mirage-config-routes-only-export' },
-    { handler: 'silence', matchId: 'setting-on-hash' },
+    // ember-data
+    { handler: 'silence', matchId: 'ember-data:deprecate-early-static' },
+    { handler: 'silence', matchId: 'ember-data:deprecate-model-reopen' },
+    { handler: 'silence', matchId: 'ember-data:deprecate-promise-proxies' },
+    { handler: 'silence', matchId: 'ember-data:no-a-with-array-like' },
+    { handler: 'silence', matchId: 'ember-data:deprecate-promise-many-array-behaviors' },
   ],
 };

ui/lib/config-ui/addon/components/messages/page/create-and-edit.js

@@ -23,7 +23,7 @@ import { isAfter } from 'date-fns';
  */
 
 export default class MessagesList extends Component {
-  @service router;
+  @service('app-router') router;
   @service store;
   @service flashMessages;
   @service customMessages;

ui/lib/config-ui/addon/components/messages/page/details.js

@@ -20,7 +20,7 @@ import errorMessage from 'vault/utils/error-message';
 
 export default class MessageDetails extends Component {
   @service store;
-  @service router;
+  @service('app-router') router;
   @service flashMessages;
   @service customMessages;
   @service namespace;

ui/lib/config-ui/addon/components/messages/page/list.js

@@ -24,7 +24,7 @@ import errorMessage from 'vault/utils/error-message';
 
 export default class MessagesList extends Component {
   @service store;
-  @service router;
+  @service('app-router') router;
   @service flashMessages;
   @service namespace;
   @service customMessages;

ui/lib/config-ui/addon/engine.js

@@ -16,7 +16,7 @@ export default class ConfigUiEngine extends Engine {
   modulePrefix = modulePrefix;
   Resolver = Resolver;
   dependencies = {
-    services: ['auth', 'store', 'flash-messages', 'namespace', 'router', 'version', 'custom-messages'],
+    services: ['auth', 'store', 'flash-messages', 'namespace', 'app-router', 'version', 'custom-messages'],
   };
 }
 

ui/lib/core/addon/components/linked-block.js

@@ -26,8 +26,20 @@ import { encodePath } from 'vault/utils/path-encoding-helpers';
  */
 
 export default class LinkedBlockComponent extends Component {
+  @service('app-router') appRouter;
   @service router;
 
+  transitionTo(...args) {
+    // when this component is used within an engine
+    // appRouter will be available and should be used
+    // otherwise we use the regular router service
+    if (this.appRouter) {
+      this.appRouter.transitionTo(...args);
+    } else {
+      this.router.transitionTo(...args);
+    }
+  }
+
   @action
   onClick(event) {
     if (!this.args.disabled) {
@@ -56,7 +68,7 @@ export default class LinkedBlockComponent extends Component {
           targetRoute = `${this.args.linkPrefix}.${targetRoute}`;
           this.args.params[0] = targetRoute;
         }
-        this.router.transitionTo(...params);
+        this.transitionTo(...params);
       }
     }
   }

ui/lib/core/addon/helpers/engine-transition-to.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
+import Helper from '@ember/component/helper';
+import { service } from '@ember/service';
+
+// this is a helper specifically for routable engines, and assumes that the parent's router is mounted as `app-router`.
+export default class EngineTransitionTo extends Helper {
+  @service('app-router') router;
+
+  compute(positional, { external = false }) {
+    if (external) {
+      return () => this.router.transitionToExternal(...positional);
+    }
+    return () => this.router.transitionTo(...positional);
+  }
+}

ui/lib/core/app/helpers/engine-transition-to.js

@@ -0,0 +1 @@
+export { default } from 'core/helpers/engine-transition-to';

ui/lib/kmip/addon/controllers/credentials/show.js

@@ -9,7 +9,7 @@ import { action } from '@ember/object';
 
 export default class CredentialsShowController extends Controller {
   @service flashMessages;
-  @service router;
+  @service('app-router') router;
 
   @action
   async revokeCredentials() {

ui/lib/kmip/addon/controllers/role.js

@@ -9,7 +9,7 @@ import { action } from '@ember/object';
 
 export default class RoleController extends Controller {
   @service flashMessages;
-  @service router;
+  @service('app-router') router;
 
   @action
   async deleteRole() {

ui/lib/kmip/addon/engine.js

@@ -20,7 +20,7 @@ const Eng = Engine.extend({
       'flash-messages',
       'namespace',
       'path-help',
-      'router',
+      'app-router',
       'store',
       'version',
       'secret-mount-path',

ui/lib/kmip/addon/templates/configure.hbs

@@ -16,6 +16,6 @@
 </PageHeader>
 <EditForm
   @model={{this.model}}
-  @onSave={{transition-to "vault.cluster.secrets.backend.kmip.configuration"}}
+  @onSave={{engine-transition-to "vault.cluster.secrets.backend.kmip.configuration"}}
   @cancelLinkParams={{array "configuration"}}
 />

ui/lib/kmip/addon/templates/credentials/generate.hbs

@@ -15,7 +15,7 @@
 </PageHeader>
 <EditForm
   @model={{this.model}}
-  @onSave={{transition-to "vault.cluster.secrets.backend.kmip.credentials.show" this.model.id}}
+  @onSave={{engine-transition-to "vault.cluster.secrets.backend.kmip.credentials.show" this.model.id}}
   @callOnSaveAfterRender={{true}}
   @successMessage={{concat "Successfully generated credentials from role:" this.role "!"}}
   @cancelLinkParams={{array "credentials.index"}}

ui/lib/kmip/addon/templates/role/edit.hbs

@@ -15,6 +15,6 @@
 </PageHeader>
 <EditFormKmipRole
   @model={{this.model}}
-  @onSave={{transition-to "vault.cluster.secrets.backend.kmip.role" this.scope this.role}}
+  @onSave={{engine-transition-to "vault.cluster.secrets.backend.kmip.role" this.scope this.role}}
   @cancelLinkParams={{array "role" this.scope this.role}}
 />

ui/lib/kmip/addon/templates/scope/roles/create.hbs

@@ -16,6 +16,6 @@
 <EditFormKmipRole
   @model={{this.model}}
   @mode="create"
-  @onSave={{transition-to "vault.cluster.secrets.backend.kmip.scope.roles" this.scope}}
+  @onSave={{engine-transition-to "vault.cluster.secrets.backend.kmip.scope.roles" this.scope}}
   @cancelLinkParams={{array "scope.roles" this.scope}}
 />

ui/lib/kmip/addon/templates/scopes/create.hbs

@@ -15,6 +15,6 @@
 </PageHeader>
 <EditForm
   @model={{this.model}}
-  @onSave={{transition-to "vault.cluster.secrets.backend.kmip.scopes.index"}}
+  @onSave={{engine-transition-to "vault.cluster.secrets.backend.kmip.scopes.index"}}
   @cancelLinkParams={{array "scopes.index"}}
 />

ui/lib/kubernetes/addon/components/page/configure.js

@@ -18,7 +18,7 @@ import errorMessage from 'vault/utils/error-message';
  * @param {object} model - config model that contains kubernetes configuration
  */
 export default class ConfigurePageComponent extends Component {
-  @service router;
+  @service('app-router') router;
   @service store;
 
   @tracked inferredState;

ui/lib/kubernetes/addon/components/page/credentials.js

@@ -23,7 +23,7 @@ import timestamp from 'vault/utils/timestamp';
  */
 export default class CredentialsPageComponent extends Component {
   @service store;
-  @service router;
+  @service('app-router') router;
 
   @tracked ttl = '';
   @tracked clusterRoleBinding = false;

ui/lib/kubernetes/addon/components/page/overview.js

@@ -19,7 +19,7 @@ import { action } from '@ember/object';
  */
 
 export default class OverviewPageComponent extends Component {
-  @service router;
+  @service('app-router') router;
 
   @tracked selectedRole = null;
   @tracked roleOptions = [];

ui/lib/kubernetes/addon/components/page/role/create-and-edit.js

@@ -20,7 +20,7 @@ import errorMessage from 'vault/utils/error-message';
  */
 
 export default class CreateAndEditRolePageComponent extends Component {
-  @service router;
+  @service('app-router') router;
   @service flashMessages;
 
   @tracked roleRulesTemplates;

ui/lib/kubernetes/addon/components/page/role/details.js

@@ -17,7 +17,7 @@ import errorMessage from 'vault/utils/error-message';
  */
 
 export default class RoleDetailsPageComponent extends Component {
-  @service router;
+  @service('app-router') router;
   @service flashMessages;
 
   get extraFields() {

ui/lib/kubernetes/addon/components/page/roles.js

@@ -23,7 +23,7 @@ import keys from 'core/utils/key-codes';
  */
 export default class RolesPageComponent extends Component {
   @service flashMessages;
-  @service router;
+  @service('app-router') router;
   @tracked query;
   @tracked roleToDelete = null;
 

ui/lib/kubernetes/addon/engine.js

@@ -16,7 +16,7 @@ export default class KubernetesEngine extends Engine {
   modulePrefix = modulePrefix;
   Resolver = Resolver;
   dependencies = {
-    services: ['router', 'store', 'secret-mount-path', 'flash-messages'],
+    services: ['app-router', 'store', 'secret-mount-path', 'flash-messages'],
     externalRoutes: ['secrets'],
   };
 }

ui/lib/kubernetes/addon/routes/index.js

@@ -7,7 +7,7 @@ import Route from '@ember/routing/route';
 import { service } from '@ember/service';
 
 export default class KubernetesRoute extends Route {
-  @service router;
+  @service('app-router') router;
 
   redirect() {
     this.router.transitionTo('vault.cluster.secrets.backend.kubernetes.overview');

ui/lib/kubernetes/addon/routes/roles/role/index.js

@@ -7,7 +7,7 @@ import Route from '@ember/routing/route';
 import { service } from '@ember/service';
 
 export default class KubernetesRoleRoute extends Route {
-  @service router;
+  @service('app-router') router;
 
   redirect() {
     this.router.transitionTo('vault.cluster.secrets.backend.kubernetes.roles.role.details');