From e9f32d1d9b75571d86956ef589e41b25af9aafbe Mon Sep 17 00:00:00 2001 From: claire bontempo <68122737+hellobontempo@users.noreply.github.com> Date: Mon, 3 Apr 2023 10:36:26 -0600 Subject: [PATCH 1/8] Revert "UI: Remove custom service (#19925)" This reverts commit b04751d22437b06947a84148c499c4728602b5e1. --- ui/app/app.js | 8 +++++--- ui/app/components/transform-role-edit.js | 5 +---- ui/app/components/transformation-edit.js | 5 +---- ui/app/routes/vault/cluster/auth.js | 5 +---- ui/app/services/flash-messages.ts | 15 +++++++++++++++ ui/lib/kmip/package.json | 1 - ui/lib/kubernetes/package.json | 1 - ui/lib/open-api-explorer/package.json | 1 - .../components/page/pki-certificate-details.ts | 2 +- .../addon/components/page/pki-configure-create.ts | 2 +- .../pki/addon/components/page/pki-issuer-edit.ts | 2 +- .../pki/addon/components/page/pki-key-details.ts | 2 +- .../pki/addon/components/page/pki-role-details.ts | 2 +- ui/lib/pki/addon/components/pki-generate-csr.ts | 2 +- ui/lib/pki/addon/components/pki-generate-root.ts | 2 +- .../pki/addon/components/pki-import-pem-bundle.ts | 2 +- ui/lib/pki/addon/components/pki-role-generate.ts | 2 +- .../components/pki-sign-intermediate-form.ts | 2 +- ui/lib/pki/package.json | 1 - ui/lib/replication/package.json | 1 - 20 files changed, 33 insertions(+), 30 deletions(-) create mode 100644 ui/app/services/flash-messages.ts diff --git a/ui/app/app.js b/ui/app/app.js index ca321646f4b0..6ff5b818f58f 100644 --- a/ui/app/app.js +++ b/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', 'flashMessages'], 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', diff --git a/ui/app/components/transform-role-edit.js b/ui/app/components/transform-role-edit.js index 83c2fe5f3b48..923ded5387a6 100644 --- a/ui/app/components/transform-role-edit.js +++ b/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); } }); }, diff --git a/ui/app/components/transformation-edit.js b/ui/app/components/transformation-edit.js index 15444da7b728..260dabf385cc 100644 --- a/ui/app/components/transformation-edit.js +++ b/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); } }); }, diff --git a/ui/app/routes/vault/cluster/auth.js b/ui/app/routes/vault/cluster/auth.js index fa9866e3ba42..d20c249b3f1d 100644 --- a/ui/app/routes/vault/cluster/auth.js +++ b/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); } }, }); diff --git a/ui/app/services/flash-messages.ts b/ui/app/services/flash-messages.ts new file mode 100644 index 000000000000..a3aa8d44b1f8 --- /dev/null +++ b/ui/app/services/flash-messages.ts @@ -0,0 +1,15 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + +import FlashMessages from 'ember-cli-flash/services/flash-messages'; + +export default class FlashMessageService extends FlashMessages { + stickyInfo(message: string) { + return this.info(message, { + sticky: true, + priority: 300, + }); + } +} diff --git a/ui/lib/kmip/package.json b/ui/lib/kmip/package.json index 21a5a131d5eb..d3732ae651e7 100644 --- a/ui/lib/kmip/package.json +++ b/ui/lib/kmip/package.json @@ -6,7 +6,6 @@ ], "dependencies": { "ember-cli-htmlbars": "*", - "ember-cli-flash": "*", "ember-cli-babel": "*" }, "ember-addon": { diff --git a/ui/lib/kubernetes/package.json b/ui/lib/kubernetes/package.json index d5c7895ba5a2..068934f6f16b 100644 --- a/ui/lib/kubernetes/package.json +++ b/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": "*" diff --git a/ui/lib/open-api-explorer/package.json b/ui/lib/open-api-explorer/package.json index 2e727637a2a1..f08b841fe38f 100644 --- a/ui/lib/open-api-explorer/package.json +++ b/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": "*" }, diff --git a/ui/lib/pki/addon/components/page/pki-certificate-details.ts b/ui/lib/pki/addon/components/page/pki-certificate-details.ts index 3ea0f3979268..4dcbfc3a9e5d 100644 --- 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 'ember-cli-flash/services/flash-messages'; +import FlashMessageService from 'vault/services/flash-messages'; import DownloadService from 'vault/services/download'; import PkiCertificateBaseModel from 'vault/models/pki/certificate/base'; diff --git a/ui/lib/pki/addon/components/page/pki-configure-create.ts b/ui/lib/pki/addon/components/page/pki-configure-create.ts index d130e824ee53..94c859a81fc6 100644 --- 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 'ember-cli-flash/services/flash-messages'; +import FlashMessageService from 'vault/services/flash-messages'; import PkiActionModel from 'vault/models/pki/action'; import { Breadcrumb } from 'vault/vault/app-types'; diff --git a/ui/lib/pki/addon/components/page/pki-issuer-edit.ts b/ui/lib/pki/addon/components/page/pki-issuer-edit.ts index c75bb8b03706..6cef16de4e01 100644 --- 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 'ember-cli-flash/services/flash-messages'; +import FlashMessageService from 'vault/services/flash-messages'; import PkiIssuerModel from 'vault/models/pki/issuer'; interface Args { diff --git a/ui/lib/pki/addon/components/page/pki-key-details.ts b/ui/lib/pki/addon/components/page/pki-key-details.ts index b14045d14649..c164b6cb4d98 100644 --- 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 'ember-cli-flash/services/flash-messages'; +import FlashMessageService 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'; diff --git a/ui/lib/pki/addon/components/page/pki-role-details.ts b/ui/lib/pki/addon/components/page/pki-role-details.ts index 3d9348c9d984..2e9a27f9a1eb 100644 --- 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 'ember-cli-flash/services/flash-messages'; +import FlashMessageService 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'; diff --git a/ui/lib/pki/addon/components/pki-generate-csr.ts b/ui/lib/pki/addon/components/pki-generate-csr.ts index e288f45a5d4c..e85f6a2fa76f 100644 --- 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 'ember-cli-flash/services/flash-messages'; +import FlashMessageService from 'vault/services/flash-messages'; import PkiActionModel from 'vault/models/pki/action'; import errorMessage from 'vault/utils/error-message'; diff --git a/ui/lib/pki/addon/components/pki-generate-root.ts b/ui/lib/pki/addon/components/pki-generate-root.ts index df43adf319f5..6a4177dce99f 100644 --- 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 'ember-cli-flash/services/flash-messages'; +import FlashMessageService from 'vault/services/flash-messages'; import errorMessage from 'vault/utils/error-message'; import { parsedParameters } from 'vault/utils/parse-pki-cert-oids'; diff --git a/ui/lib/pki/addon/components/pki-import-pem-bundle.ts b/ui/lib/pki/addon/components/pki-import-pem-bundle.ts index a8ebf4215199..3549ce314981 100644 --- 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 'ember-cli-flash/services/flash-messages'; +import FlashMessageService from 'vault/services/flash-messages'; import { inject as service } from '@ember/service'; import { task } from 'ember-concurrency'; import { tracked } from '@glimmer/tracking'; diff --git a/ui/lib/pki/addon/components/pki-role-generate.ts b/ui/lib/pki/addon/components/pki-role-generate.ts index 6a6ac855a88a..a4ee5df51358 100644 --- 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 'ember-cli-flash/services/flash-messages'; +import FlashMessageService 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'; diff --git a/ui/lib/pki/addon/components/pki-sign-intermediate-form.ts b/ui/lib/pki/addon/components/pki-sign-intermediate-form.ts index 1feb298df522..83ecae25d13f 100644 --- 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 'ember-cli-flash/services/flash-messages'; +import FlashMessageService from 'vault/services/flash-messages'; import errorMessage from 'vault/utils/error-message'; interface Args { diff --git a/ui/lib/pki/package.json b/ui/lib/pki/package.json index a619c65db765..5f86b47157b4 100644 --- a/ui/lib/pki/package.json +++ b/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", diff --git a/ui/lib/replication/package.json b/ui/lib/replication/package.json index a6e00ce9f409..108f8834884a 100644 --- a/ui/lib/replication/package.json +++ b/ui/lib/replication/package.json @@ -6,7 +6,6 @@ ], "dependencies": { "ember-cli-htmlbars": "*", - "ember-cli-flash": "*", "ember-cli-babel": "*" }, "ember-addon": { From a67995dc8f75fecde234a3d23434cbcb06e94195 Mon Sep 17 00:00:00 2001 From: Chelsea Shaw Date: Fri, 31 Mar 2023 15:47:49 -0500 Subject: [PATCH 2/8] replace stickyInfo with options info --- ui/app/components/transform-role-edit.js | 5 ++++- ui/app/components/transformation-edit.js | 5 ++++- ui/app/routes/vault/cluster/auth.js | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ui/app/components/transform-role-edit.js b/ui/app/components/transform-role-edit.js index 923ded5387a6..83c2fe5f3b48 100644 --- a/ui/app/components/transform-role-edit.js +++ b/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, + }); } }); }, diff --git a/ui/app/components/transformation-edit.js b/ui/app/components/transformation-edit.js index 260dabf385cc..15444da7b728 100644 --- a/ui/app/components/transformation-edit.js +++ b/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, + }); } }); }, diff --git a/ui/app/routes/vault/cluster/auth.js b/ui/app/routes/vault/cluster/auth.js index d20c249b3f1d..fa9866e3ba42 100644 --- a/ui/app/routes/vault/cluster/auth.js +++ b/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, + }); } }, }); From c8097bee6a85c5382390df70816836dbe68cb65f Mon Sep 17 00:00:00 2001 From: "clairebontempo@gmail.com" Date: Mon, 3 Apr 2023 11:12:35 -0600 Subject: [PATCH 3/8] revert replacing custom stickyInfo --- ui/app/components/transform-role-edit.js | 5 +---- ui/app/components/transformation-edit.js | 5 +---- ui/app/routes/vault/cluster/auth.js | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ui/app/components/transform-role-edit.js b/ui/app/components/transform-role-edit.js index 83c2fe5f3b48..923ded5387a6 100644 --- a/ui/app/components/transform-role-edit.js +++ b/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); } }); }, diff --git a/ui/app/components/transformation-edit.js b/ui/app/components/transformation-edit.js index 15444da7b728..260dabf385cc 100644 --- a/ui/app/components/transformation-edit.js +++ b/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); } }); }, diff --git a/ui/app/routes/vault/cluster/auth.js b/ui/app/routes/vault/cluster/auth.js index fa9866e3ba42..d20c249b3f1d 100644 --- a/ui/app/routes/vault/cluster/auth.js +++ b/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); } }, }); From 17de49894de3976ed708fcf15f19f6f1eb1012a5 Mon Sep 17 00:00:00 2001 From: "clairebontempo@gmail.com" Date: Mon, 3 Apr 2023 11:18:01 -0600 Subject: [PATCH 4/8] change flash message name to be consistent throughout application --- ui/app/services/flash-messages.ts | 4 ++-- .../addon/components/page/pki-certificate-details.ts | 4 ++-- .../addon/components/page/pki-configure-create.ts | 4 ++-- ui/lib/pki/addon/components/page/pki-issuer-edit.ts | 4 ++-- .../addon/components/page/pki-issuer-rotate-root.ts | 4 ++-- ui/lib/pki/addon/components/page/pki-key-details.ts | 4 ++-- ui/lib/pki/addon/components/page/pki-role-details.ts | 4 ++-- ui/lib/pki/addon/components/pki-generate-csr.ts | 4 ++-- ui/lib/pki/addon/components/pki-generate-root.ts | 4 ++-- ui/lib/pki/addon/components/pki-import-pem-bundle.ts | 4 ++-- ui/lib/pki/addon/components/pki-role-generate.ts | 4 ++-- .../addon/components/pki-sign-intermediate-form.ts | 4 ++-- .../ember-cli-flash/services/flash-messages.d.ts | 12 ++++++------ 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ui/app/services/flash-messages.ts b/ui/app/services/flash-messages.ts index a3aa8d44b1f8..b173769fcb50 100644 --- 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 index 4dcbfc3a9e5d..0da653a33586 100644 --- 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 { - @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 index 94c859a81fc6..0e1a12e482ae 100644 --- 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 { @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 index 6cef16de4e01..374492245180 100644 --- 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 { @service declare readonly router: RouterService; - @service declare readonly flashMessages: FlashMessageService; + @service declare readonly flashMessages: FlashMessages; @tracked usageValues: Array = []; @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 index 9080da63b0a0..4be73030356d 100644 --- 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 { @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 index c164b6cb4d98..1f4cbf8d4124 100644 --- 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 { @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 index 2e9a27f9a1eb..e0d56e67f532 100644 --- 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 { @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 index e85f6a2fa76f..91d83419da5d 100644 --- 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 { - @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 index 6a4177dce99f..b61bcd750e61 100644 --- 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 { - @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 index 3549ce314981..cb502eb01a1f 100644 --- 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 { - @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 index a4ee5df51358..d52ce6186386 100644 --- 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 { @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 index 83ecae25d13f..81a8cf8f6a28 100644 --- 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 { - @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 index 409cc0ec77d5..5589dc78f9cd 100644 --- 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): FlashMessageService; + (message: string, options?: Partial): FlashMessages; } - class FlashMessageService extends Service { + class FlashMessages extends Service { queue: A; 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; } From 02a7843246d9f41c621fba2b0244652cafd059c3 Mon Sep 17 00:00:00 2001 From: "clairebontempo@gmail.com" Date: Mon, 3 Apr 2023 11:57:11 -0600 Subject: [PATCH 5/8] make service imports consistent for k8 engine --- ui/app/app.js | 2 +- ui/lib/kubernetes/addon/engine.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/app/app.js b/ui/app/app.js index 6ff5b818f58f..da3e07a3ec75 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -46,7 +46,7 @@ export default class App extends Application { }, kubernetes: { dependencies: { - services: ['router', 'store', 'secret-mount-path', 'flashMessages'], + services: ['router', 'store', 'secret-mount-path', 'flash-messages'], externalRoutes: { secrets: 'vault.cluster.secrets.backends', }, diff --git a/ui/lib/kubernetes/addon/engine.js b/ui/lib/kubernetes/addon/engine.js index 686f412ff750..5830ad465283 100644 --- a/ui/lib/kubernetes/addon/engine.js +++ b/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'], }; } From bfa06fbe70346a171480f7e9eb1aab78f8a5ef2e Mon Sep 17 00:00:00 2001 From: Chelsea Shaw Date: Fri, 31 Mar 2023 15:47:49 -0500 Subject: [PATCH 6/8] replace stickyInfo with options info --- ui/app/components/transform-role-edit.js | 5 ++++- ui/app/components/transformation-edit.js | 5 ++++- ui/app/routes/vault/cluster/auth.js | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ui/app/components/transform-role-edit.js b/ui/app/components/transform-role-edit.js index 923ded5387a6..83c2fe5f3b48 100644 --- a/ui/app/components/transform-role-edit.js +++ b/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, + }); } }); }, diff --git a/ui/app/components/transformation-edit.js b/ui/app/components/transformation-edit.js index 260dabf385cc..15444da7b728 100644 --- a/ui/app/components/transformation-edit.js +++ b/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, + }); } }); }, diff --git a/ui/app/routes/vault/cluster/auth.js b/ui/app/routes/vault/cluster/auth.js index d20c249b3f1d..fa9866e3ba42 100644 --- a/ui/app/routes/vault/cluster/auth.js +++ b/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, + }); } }, }); From c62cd7bc53bdd7b0888768837c0f09ec3af331eb Mon Sep 17 00:00:00 2001 From: "clairebontempo@gmail.com" Date: Mon, 3 Apr 2023 12:23:16 -0600 Subject: [PATCH 7/8] Revert "change flash message name to be consistent throughout application" This reverts commit 17de49894de3976ed708fcf15f19f6f1eb1012a5. --- ui/app/services/flash-messages.ts | 4 ++-- .../addon/components/page/pki-certificate-details.ts | 4 ++-- .../addon/components/page/pki-configure-create.ts | 4 ++-- ui/lib/pki/addon/components/page/pki-issuer-edit.ts | 4 ++-- .../addon/components/page/pki-issuer-rotate-root.ts | 4 ++-- ui/lib/pki/addon/components/page/pki-key-details.ts | 4 ++-- ui/lib/pki/addon/components/page/pki-role-details.ts | 4 ++-- ui/lib/pki/addon/components/pki-generate-csr.ts | 4 ++-- ui/lib/pki/addon/components/pki-generate-root.ts | 4 ++-- ui/lib/pki/addon/components/pki-import-pem-bundle.ts | 4 ++-- ui/lib/pki/addon/components/pki-role-generate.ts | 4 ++-- .../addon/components/pki-sign-intermediate-form.ts | 4 ++-- .../ember-cli-flash/services/flash-messages.d.ts | 12 ++++++------ 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ui/app/services/flash-messages.ts b/ui/app/services/flash-messages.ts index b173769fcb50..a3aa8d44b1f8 100644 --- 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 EmberCliFlash from 'ember-cli-flash/services/flash-messages'; +import FlashMessages from 'ember-cli-flash/services/flash-messages'; -export default class FlashMessages extends EmberCliFlash { +export default class FlashMessageService extends FlashMessages { 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 index 0da653a33586..4dcbfc3a9e5d 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @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 index 0e1a12e482ae..94c859a81fc6 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { @service declare readonly store: Store; @service declare readonly router: Router; - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @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 index 374492245180..6cef16de4e01 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { @service declare readonly router: RouterService; - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @tracked usageValues: Array = []; @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 index 4be73030356d..9080da63b0a0 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { @service declare readonly store: Store; @service declare readonly router: Router; - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @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 index 1f4cbf8d4124..c164b6cb4d98 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { @service declare readonly router: RouterService; - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @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 index e0d56e67f532..2e9a27f9a1eb 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { @service declare readonly router: RouterService; - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @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 index 91d83419da5d..e85f6a2fa76f 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @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 index b61bcd750e61..6a4177dce99f 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @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 index cb502eb01a1f..3549ce314981 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @tracked errorBanner = ''; diff --git a/ui/lib/pki/addon/components/pki-role-generate.ts b/ui/lib/pki/addon/components/pki-role-generate.ts index d52ce6186386..a4ee5df51358 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { @service declare readonly router: Router; @service declare readonly store: Store; - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @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 index 81a8cf8f6a28..83ecae25d13f 100644 --- 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 FlashMessages from 'vault/services/flash-messages'; +import FlashMessageService 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 { - @service declare readonly flashMessages: FlashMessages; + @service declare readonly flashMessages: FlashMessageService; @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 index 5589dc78f9cd..409cc0ec77d5 100644 --- 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): FlashMessages; + (message: string, options?: Partial): FlashMessageService; } - class FlashMessages extends Service { + class FlashMessageService extends Service { queue: A; 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): FlashMessages; - clearMessages(): FlashMessages; - registerTypes(types: string[]): FlashMessages; + add(messageInfo: CustomMessageInfo): FlashMessageService; + clearMessages(): FlashMessageService; + registerTypes(types: string[]): FlashMessageService; getFlashObject(): FlashObject; } - export default FlashMessages; + export default FlashMessageService; } From f6817811768ed9515c44683d7ce6d3b3d4b57f68 Mon Sep 17 00:00:00 2001 From: "clairebontempo@gmail.com" Date: Mon, 3 Apr 2023 12:25:37 -0600 Subject: [PATCH 8/8] add comment --- ui/app/services/flash-messages.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/ui/app/services/flash-messages.ts b/ui/app/services/flash-messages.ts index a3aa8d44b1f8..708fad47e48c 100644 --- a/ui/app/services/flash-messages.ts +++ b/ui/app/services/flash-messages.ts @@ -5,11 +5,9 @@ import FlashMessages from 'ember-cli-flash/services/flash-messages'; -export default class FlashMessageService extends FlashMessages { - stickyInfo(message: string) { - return this.info(message, { - sticky: true, - priority: 300, - }); - } -} +/* +we extend the ember-cli-flash service here so each ember engine can +import 'flash-messages' as a dependency giving it access to the + template in the main app's cluster.hbs file +*/ +export default class FlashMessageService extends FlashMessages {}