UI: Remove custom service (hashicorp#19925)

ui/app/app.js

@@ -15,12 +15,12 @@ export default class App extends Application {
   engines = {
     openApiExplorer: {
       dependencies: {
-        services: ['auth', 'flash-messages', 'namespace', 'router', 'version'],
+        services: ['auth', 'namespace', 'router', 'version'],
       },
     },
     replication: {
       dependencies: {
-        services: ['auth', 'flash-messages', 'namespace', 'replication-mode', 'router', 'store', 'version'],
+        services: ['auth', 'namespace', 'replication-mode', 'router', 'store', 'version'],
         externalRoutes: {
           replication: 'vault.cluster.replication.index',
         },
@@ -31,7 +31,6 @@ export default class App extends Application {
         services: [
           'auth',
           'download',
-          'flash-messages',
           'namespace',
           'path-help',
           'router',
@@ -46,7 +45,7 @@ export default class App extends Application {
     },
     kubernetes: {
       dependencies: {
-        services: ['router', 'store', 'secret-mount-path', 'flashMessages'],
+        services: ['router', 'store', 'secret-mount-path'],
         externalRoutes: {
           secrets: 'vault.cluster.secrets.backends',
         },
@@ -57,7 +56,6 @@ export default class App extends Application {
         services: [
           'auth',
           'download',
-          'flash-messages',
           'namespace',
           'path-help',
           'router',

ui/app/components/transform-role-edit.js

@@ -65,7 +65,10 @@ export default TransformBase.extend({
           message =
             'This role was edited to remove transformations, but this role was not removed from those transformations’ allowed_roles due to a lack of permissions.';
         }
-        this.flashMessages.stickyInfo(message);
+        this.flashMessages.info(message, {
+          sticky: true,
+          priority: 300,
+        });
       }
     });
   },

ui/app/components/transformation-edit.js

@@ -82,7 +82,10 @@ export default TransformBase.extend({
           // eg. trying to update a role with empty array as transformations
           message = `You've edited the allowed_roles for this transformation. However, the corresponding edits to some roles' transformations were not made`;
         }
-        this.flashMessages.stickyInfo(message);
+        this.flashMessages.info(message, {
+          sticky: true,
+          priority: 300,
+        });
       }
     });
   },

ui/app/routes/vault/cluster/auth.js

@@ -31,7 +31,10 @@ export default ClusterRouteBase.extend({
 
   afterModel() {
     if (config.welcomeMessage) {
-      this.flashMessages.stickyInfo(config.welcomeMessage);
+      this.flashMessages.info(config.welcomeMessage, {
+        sticky: true,
+        priority: 300,
+      });
     }
   },
 });

ui/lib/kmip/package.json

@@ -6,6 +6,7 @@
   ],
   "dependencies": {
     "ember-cli-htmlbars": "*",
+    "ember-cli-flash": "*",
     "ember-cli-babel": "*"
   },
   "ember-addon": {

ui/lib/kubernetes/package.json

@@ -7,6 +7,7 @@
   "dependencies": {
     "ember-cli-htmlbars": "*",
     "ember-cli-babel": "*",
+    "ember-cli-flash": "*",
     "ember-concurrency": "*",
     "@ember/test-waiters": "*",
     "ember-inflector": "*"

ui/lib/open-api-explorer/package.json

@@ -7,6 +7,7 @@
   "dependencies": {
     "ember-cli-htmlbars": "*",
     "ember-cli-babel": "*",
+    "ember-cli-flash": "*",
     "ember-auto-import": "*",
     "swagger-ui-dist": "*"
   },

ui/lib/pki/addon/components/page/pki-certificate-details.ts

@@ -9,7 +9,7 @@ import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
 import errorMessage from 'vault/utils/error-message';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import DownloadService from 'vault/services/download';
 import PkiCertificateBaseModel from 'vault/models/pki/certificate/base';
 

ui/lib/pki/addon/components/page/pki-configure-create.ts

@@ -9,7 +9,7 @@ import { tracked } from '@glimmer/tracking';
 // TYPES
 import Store from '@ember-data/store';
 import Router from '@ember/routing/router';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import PkiActionModel from 'vault/models/pki/action';
 import { Breadcrumb } from 'vault/vault/app-types';
 

ui/lib/pki/addon/components/page/pki-issuer-edit.ts

@@ -11,7 +11,7 @@ import { task } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
 import errorMessage from 'vault/utils/error-message';
 import RouterService from '@ember/routing/router-service';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import PkiIssuerModel from 'vault/models/pki/issuer';
 
 interface Args {

ui/lib/pki/addon/components/page/pki-key-details.ts

@@ -6,7 +6,7 @@
 import { action } from '@ember/object';
 import Component from '@glimmer/component';
 import RouterService from '@ember/routing/router-service';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import { inject as service } from '@ember/service';
 import errorMessage from 'vault/utils/error-message';
 import PkiKeyModel from 'vault/models/pki/key';

ui/lib/pki/addon/components/page/pki-role-details.ts

@@ -6,7 +6,7 @@
 import { action } from '@ember/object';
 import RouterService from '@ember/routing/router-service';
 import Component from '@glimmer/component';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import SecretMountPath from 'vault/services/secret-mount-path';
 import { inject as service } from '@ember/service';
 import errorMessage from 'vault/utils/error-message';

ui/lib/pki/addon/components/pki-generate-csr.ts

@@ -10,7 +10,7 @@ import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import PkiActionModel from 'vault/models/pki/action';
 import errorMessage from 'vault/utils/error-message';
 

ui/lib/pki/addon/components/pki-generate-root.ts

@@ -12,7 +12,7 @@ import { tracked } from '@glimmer/tracking';
 import { task } from 'ember-concurrency';
 import PkiActionModel from 'vault/models/pki/action';
 import PkiUrlsModel from 'vault/models/pki/urls';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import errorMessage from 'vault/utils/error-message';
 
 interface AdapterOptions {

ui/lib/pki/addon/components/pki-import-pem-bundle.ts

@@ -5,7 +5,7 @@
 
 import { action } from '@ember/object';
 import Component from '@glimmer/component';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
 import { tracked } from '@glimmer/tracking';

ui/lib/pki/addon/components/pki-role-generate.ts

@@ -11,7 +11,7 @@ import Router from '@ember/routing/router';
 import Store from '@ember-data/store';
 import { tracked } from '@glimmer/tracking';
 import errorMessage from 'vault/utils/error-message';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import DownloadService from 'vault/services/download';
 import PkiCertificateGenerateModel from 'vault/models/pki/certificate/generate';
 import PkiCertificateSignModel from 'vault/models/pki/certificate/sign';

ui/lib/pki/addon/components/pki-sign-intermediate-form.ts

@@ -10,7 +10,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { task } from 'ember-concurrency';
 import PkiCertificateSignIntermediate from 'vault/models/pki/certificate/sign-intermediate';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import errorMessage from 'vault/utils/error-message';
 
 interface Args {

ui/lib/pki/package.json

@@ -7,6 +7,7 @@
   "dependencies": {
     "ember-cli-babel": "*",
     "ember-cli-htmlbars": "*",
+    "ember-cli-flash": "*",
     "ember-cli-typescript": "*",
     "@types/ember": "latest",
     "@types/ember-data": "latest",

ui/lib/replication/package.json

@@ -6,6 +6,7 @@
   ],
   "dependencies": {
     "ember-cli-htmlbars": "*",
+    "ember-cli-flash": "*",
     "ember-cli-babel": "*"
   },
   "ember-addon": {