Re-add custom flash service so engines can extend cluster's template

ui/app/app.js

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

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

@@ -65,10 +65,7 @@ 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.info(message, {
-          sticky: true,
-          priority: 300,
-        });
+        this.flashMessages.stickyInfo(message);
       }
     });
   },

ui/app/components/transformation-edit.js

@@ -82,10 +82,7 @@ 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.info(message, {
-          sticky: true,
-          priority: 300,
-        });
+        this.flashMessages.stickyInfo(message);
       }
     });
   },

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

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

ui/app/services/flash-messages.ts

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import EmberCliFlash from 'ember-cli-flash/services/flash-messages';
+
+export default class FlashMessages extends EmberCliFlash {
+  stickyInfo(message: string) {
+    return this.info(message, {
+      sticky: true,
+      priority: 300,
+    });
+  }
+}

ui/lib/kmip/package.json

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

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', 'flashMessages'],
+    services: ['router', 'store', 'secret-mount-path', 'flash-messages'],
     externalRoutes: ['secrets'],
   };
 }

ui/lib/kubernetes/package.json

@@ -7,7 +7,6 @@
   "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,7 +7,6 @@
   "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 'ember-cli-flash/services/flash-messages';
+import FlashMessages from 'vault/services/flash-messages';
 import DownloadService from 'vault/services/download';
 import PkiCertificateBaseModel from 'vault/models/pki/certificate/base';
 
@@ -20,7 +20,7 @@ interface Args {
 }
 
 export default class PkiCertificateDetailsComponent extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
   @service declare readonly download: DownloadService;
 
   @action

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 'ember-cli-flash/services/flash-messages';
+import FlashMessages from 'vault/services/flash-messages';
 import PkiActionModel from 'vault/models/pki/action';
 import { Breadcrumb } from 'vault/vault/app-types';
 
@@ -29,7 +29,7 @@ interface Args {
 export default class PkiConfigureCreate extends Component<Args> {
   @service declare readonly store: Store;
   @service declare readonly router: Router;
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
 
   @tracked title = 'Configure PKI';
 

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 'ember-cli-flash/services/flash-messages';
+import FlashMessages from 'vault/services/flash-messages';
 import PkiIssuerModel from 'vault/models/pki/issuer';
 
 interface Args {
@@ -20,7 +20,7 @@ interface Args {
 
 export default class PkiIssuerEditComponent extends Component<Args> {
   @service declare readonly router: RouterService;
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
 
   @tracked usageValues: Array<string> = [];
   @tracked error = null;

ui/lib/pki/addon/components/page/pki-issuer-rotate-root.ts

@@ -8,7 +8,7 @@ import errorMessage from 'vault/utils/error-message';
 // TYPES
 import Store from '@ember-data/store';
 import Router from '@ember/routing/router';
-import FlashMessageService from 'vault/services/flash-messages';
+import FlashMessages from 'vault/services/flash-messages';
 import SecretMountPath from 'vault/services/secret-mount-path';
 import PkiIssuerModel from 'vault/models/pki/issuer';
 import PkiActionModel from 'vault/vault/models/pki/action';
@@ -30,7 +30,7 @@ const RADIO_BUTTON_KEY = {
 export default class PagePkiIssuerRotateRootComponent extends Component<Args> {
   @service declare readonly store: Store;
   @service declare readonly router: Router;
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
   @service declare readonly secretMountPath: SecretMountPath;
 
   @tracked displayedForm = RADIO_BUTTON_KEY.oldSettings;

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 'ember-cli-flash/services/flash-messages';
+import FlashMessages from 'vault/services/flash-messages';
 import { inject as service } from '@ember/service';
 import errorMessage from 'vault/utils/error-message';
 import PkiKeyModel from 'vault/models/pki/key';
@@ -16,7 +16,7 @@ interface Args {
 
 export default class PkiKeyDetails extends Component<Args> {
   @service declare readonly router: RouterService;
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
 
   @action
   async deleteKey() {

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 'ember-cli-flash/services/flash-messages';
+import FlashMessages from 'vault/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';
@@ -18,7 +18,7 @@ interface Args {
 
 export default class DetailsPage extends Component<Args> {
   @service declare readonly router: RouterService;
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
   @service declare readonly secretMountPath: SecretMountPath;
 
   get breadcrumbs() {

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 'ember-cli-flash/services/flash-messages';
+import FlashMessages from 'vault/services/flash-messages';
 import PkiActionModel from 'vault/models/pki/action';
 import errorMessage from 'vault/utils/error-message';
 
@@ -42,7 +42,7 @@ interface Args {
  * @param {Object} adapterOptions - object passed as adapterOptions on the model.save method
  */
 export default class PkiGenerateCsrComponent extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
 
   @tracked modelValidations = null;
   @tracked error: string | null = null;

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 'ember-cli-flash/services/flash-messages';
+import FlashMessages from 'vault/services/flash-messages';
 import errorMessage from 'vault/utils/error-message';
 import { parsedParameters } from 'vault/utils/parse-pki-cert-oids';
 
@@ -50,7 +50,7 @@ interface Args {
  * @param {Object} adapterOptions - object passed as adapterOptions on the model.save method
  */
 export default class PkiGenerateRootComponent extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
   @service declare readonly router: RouterService;
 
   @tracked modelValidations = null;

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 'ember-cli-flash/services/flash-messages';
+import FlashMessages from 'vault/services/flash-messages';
 import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
 import { tracked } from '@glimmer/tracking';
@@ -41,7 +41,7 @@ interface Args {
 }
 
 export default class PkiImportPemBundle extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
 
   @tracked errorBanner = '';
 

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 'ember-cli-flash/services/flash-messages';
+import FlashMessages from 'vault/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';
@@ -25,7 +25,7 @@ interface Args {
 export default class PkiRoleGenerate extends Component<Args> {
   @service declare readonly router: Router;
   @service declare readonly store: Store;
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
   @service declare readonly download: DownloadService;
 
   @tracked errorBanner = '';

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 'ember-cli-flash/services/flash-messages';
+import FlashMessages from 'vault/services/flash-messages';
 import errorMessage from 'vault/utils/error-message';
 
 interface Args {
@@ -19,7 +19,7 @@ interface Args {
 }
 
 export default class PkiSignIntermediateFormComponent extends Component<Args> {
-  @service declare readonly flashMessages: FlashMessageService;
+  @service declare readonly flashMessages: FlashMessages;
   @tracked errorBanner = '';
   @tracked inlineFormAlert = '';
   @tracked modelValidations = null;

ui/lib/pki/package.json

@@ -7,7 +7,6 @@
   "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,7 +6,6 @@
   ],
   "dependencies": {
     "ember-cli-htmlbars": "*",
-    "ember-cli-flash": "*",
     "ember-cli-babel": "*"
   },
   "ember-addon": {

ui/types/ember-cli-flash/services/flash-messages.d.ts

@@ -27,10 +27,10 @@ declare module 'ember-cli-flash/services/flash-messages' {
   }
 
   interface FlashFunction {
-    (message: string, options?: Partial<MessageOptions>): FlashMessageService;
+    (message: string, options?: Partial<MessageOptions>): FlashMessages;
   }
 
-  class FlashMessageService extends Service {
+  class FlashMessages extends Service {
     queue: A<FlashObject>;
     success: FlashFunction;
     warning: FlashFunction;
@@ -39,11 +39,11 @@ declare module 'ember-cli-flash/services/flash-messages' {
     danger: FlashFunction;
     alert: FlashFunction;
     secondary: FlashFunction;
-    add(messageInfo: CustomMessageInfo): FlashMessageService;
-    clearMessages(): FlashMessageService;
-    registerTypes(types: string[]): FlashMessageService;
+    add(messageInfo: CustomMessageInfo): FlashMessages;
+    clearMessages(): FlashMessages;
+    registerTypes(types: string[]): FlashMessages;
     getFlashObject(): FlashObject;
   }
 
-  export default FlashMessageService;
+  export default FlashMessages;
 }