change flash message name to be consistent throughout application

fopina · Apr 3, 2023 · 17de498 · 17de498
1 parent c8097be
commit 17de498
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 30 deletions.
diff --git a/ui/app/services/flash-messages.ts b/ui/app/services/flash-messages.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import FlashMessages from 'ember-cli-flash/services/flash-messages';
+import EmberCliFlash from 'ember-cli-flash/services/flash-messages';
 
-export default class FlashMessageService extends FlashMessages {
+export default class FlashMessages extends EmberCliFlash {
   stickyInfo(message: string) {
     return this.info(message, {
       sticky: true,

diff --git a/ui/lib/pki/addon/components/page/pki-certificate-details.ts b/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 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

diff --git a/ui/lib/pki/addon/components/page/pki-configure-create.ts b/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 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';
 

diff --git a/ui/lib/pki/addon/components/page/pki-issuer-edit.ts b/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 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;

diff --git a/ui/lib/pki/addon/components/page/pki-issuer-rotate-root.ts b/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;

diff --git a/ui/lib/pki/addon/components/page/pki-key-details.ts b/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 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() {

diff --git a/ui/lib/pki/addon/components/page/pki-role-details.ts b/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 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() {

diff --git a/ui/lib/pki/addon/components/pki-generate-csr.ts b/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 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;

diff --git a/ui/lib/pki/addon/components/pki-generate-root.ts b/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 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;

diff --git a/ui/lib/pki/addon/components/pki-import-pem-bundle.ts b/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 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 = '';
 

diff --git a/ui/lib/pki/addon/components/pki-role-generate.ts b/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 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 = '';

diff --git a/ui/lib/pki/addon/components/pki-sign-intermediate-form.ts b/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 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;

diff --git a/ui/types/ember-cli-flash/services/flash-messages.d.ts b/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;
 }