@type to @color on flash messages

hashicorp · Feb 8, 2023 · 0292e9a · 0292e9a
1 parent 5a2e375
commit 0292e9a
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 28 deletions.
diff --git a/ui/app/components/job-page/parts/title.js b/ui/app/components/job-page/parts/title.js
@@ -9,6 +9,7 @@ import classic from 'ember-classic-decorator';
 @tagName('')
 export default class Title extends Component {
   @service router;
+  @service flashMessages;
 
   job = null;
   title = null;
@@ -37,7 +38,7 @@ export default class Title extends Component {
       this.flashMessages.add({
         title: 'Job Purged',
         message: `You have purged ${this.job.name}`,
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 5000,
       });

diff --git a/ui/app/components/policy-editor.js b/ui/app/components/policy-editor.js
@@ -43,7 +43,7 @@ export default class PolicyEditorComponent extends Component {
 
       this.flashMessages.add({
         title: 'Policy Saved',
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 5000,
       });
@@ -55,7 +55,7 @@ export default class PolicyEditorComponent extends Component {
       this.flashMessages.add({
         title: `Error creating Policy ${this.policy.name}`,
         message: error,
-        type: 'error',
+        color: 'critical',
         destroyOnClick: false,
         sticky: true,
       });

diff --git a/ui/app/components/variable-form.js b/ui/app/components/variable-form.js
@@ -233,7 +233,7 @@ export default class VariableFormComponent extends Component {
       this.flashMessages.add({
         title: 'Variable saved',
         message: `${this.path} successfully saved`,
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 5000,
       });
@@ -245,7 +245,7 @@ export default class VariableFormComponent extends Component {
         this.flashMessages.add({
           title: `Error saving ${this.path}`,
           message: error,
-          type: 'error',
+          color: 'critical',
           destroyOnClick: false,
           sticky: true,
         });

diff --git a/ui/app/controllers/clients/client/index.js b/ui/app/controllers/clients/client/index.js
@@ -319,7 +319,7 @@ export default class ClientController extends Controller.extend(
       this.flashMessages.add({
         title: 'Metadata added',
         message: `${key} successfully saved`,
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 3000,
       });
@@ -329,7 +329,7 @@ export default class ClientController extends Controller.extend(
       this.flashMessages.add({
         title: `Error saving Metadata`,
         message: error,
-        type: 'error',
+        color: 'critical',
         destroyOnClick: false,
         sticky: true,
       });

diff --git a/ui/app/controllers/jobs/run/templates/manage.js b/ui/app/controllers/jobs/run/templates/manage.js
@@ -30,15 +30,15 @@ export default class JobsRunTemplatesManageController extends Controller {
       this.flashMessages.add({
         title: 'Job template deleted',
         message: `${model.path} successfully deleted`,
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 5000,
       });
     } catch (err) {
       this.flashMessages.add({
         title: `Job template could not be deleted.`,
         message: err,
-        type: 'error',
+        color: 'critical',
         destroyOnClick: false,
         sticky: true,
       });

diff --git a/ui/app/controllers/jobs/run/templates/new.js b/ui/app/controllers/jobs/run/templates/new.js
@@ -63,7 +63,7 @@ export default class JobsRunTemplatesNewController extends Controller {
       this.flashMessages.add({
         title: 'Job template saved',
         message: `${this.templateName} successfully saved`,
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 5000,
       });
@@ -73,7 +73,7 @@ export default class JobsRunTemplatesNewController extends Controller {
       this.flashMessages.add({
         title: 'Job template cannot be saved.',
         message: e,
-        type: 'error',
+        color: 'critical',
         destroyOnClick: false,
         timeout: 5000,
       });

diff --git a/ui/app/controllers/jobs/run/templates/template.js b/ui/app/controllers/jobs/run/templates/template.js
@@ -37,7 +37,7 @@ export default class JobsRunTemplatesController extends Controller {
       this.flashMessages.add({
         title: 'Job template saved',
         message: `${this.model.path} successfully editted`,
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 5000,
       });
@@ -47,7 +47,7 @@ export default class JobsRunTemplatesController extends Controller {
       this.flashMessages.add({
         title: 'Job template cannot be editted.',
         message: e,
-        type: 'error',
+        color: 'critical',
         destroyOnClick: false,
         timeout: 5000,
       });
@@ -61,7 +61,7 @@ export default class JobsRunTemplatesController extends Controller {
       this.flashMessages.add({
         title: 'Job template deleted',
         message: `${this.model.path} successfully deleted`,
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 5000,
       });
@@ -70,7 +70,7 @@ export default class JobsRunTemplatesController extends Controller {
       this.flashMessages.add({
         title: `Job template could not be deleted.`,
         message: err,
-        type: 'error',
+        color: 'critical',
         destroyOnClick: false,
         sticky: true,
       });

diff --git a/ui/app/controllers/policies/policy.js b/ui/app/controllers/policies/policy.js
@@ -39,7 +39,7 @@ export default class PoliciesPolicyController extends Controller {
       yield this.policy.save();
       this.flashMessages.add({
         title: 'Policy Deleted',
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 5000,
       });
@@ -48,7 +48,7 @@ export default class PoliciesPolicyController extends Controller {
       this.flashMessages.add({
         title: `Error deleting Policy ${this.policy.name}`,
         message: err,
-        type: 'error',
+        color: 'critical',
         destroyOnClick: false,
         sticky: true,
       });
@@ -78,7 +78,7 @@ export default class PoliciesPolicyController extends Controller {
       this.flashMessages.add({
         title: 'Example Token Created',
         message: `${newToken.secret}`,
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 30000,
         customAction: {
@@ -106,7 +106,7 @@ export default class PoliciesPolicyController extends Controller {
       yield this.refreshTokens();
       this.flashMessages.add({
         title: 'Token successfully deleted',
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 5000,
       });

diff --git a/ui/app/controllers/variables/variable/index.js b/ui/app/controllers/variables/variable/index.js
@@ -42,15 +42,15 @@ export default class VariablesVariableIndexController extends Controller {
       this.flashMessages.add({
         title: 'Variable deleted',
         message: `${this.model.path} successfully deleted`,
-        type: 'success',
+        color: 'success',
         destroyOnClick: false,
         timeout: 5000,
       });
     } catch (err) {
       this.flashMessages.add({
         title: `Error deleting ${this.model.path}`,
         message: err,
-        type: 'error',
+        color: 'critical',
         destroyOnClick: false,
         sticky: true,
       });

diff --git a/ui/app/routes/allocations/allocation.js b/ui/app/routes/allocations/allocation.js
@@ -54,7 +54,7 @@ export default class AllocationRoute extends Route.extend(WithWatchers) {
         this.flashMessages.add({
           title: `Error:  Not Found`,
           message: `Allocation of id:  ${allocId} was not found.`,
-          type: 'error',
+          color: 'critical',
           destroyOnClick: false,
           sticky: true,
         });

diff --git a/ui/app/routes/jobs/run/index.js b/ui/app/routes/jobs/run/index.js
@@ -54,7 +54,7 @@ export default class JobsRunIndexRoute extends Route {
       this.flashMessages.add({
         title: `Error loading job template`,
         message: error404.detail,
-        type: 'error',
+        color: 'critical',
         destroyOnClick: false,
         sticky: true,
       });

diff --git a/ui/app/services/token.js b/ui/app/services/token.js
@@ -154,7 +154,7 @@ export default class TokenService extends Service {
                 message: `Your token access expires ${moment(
                   this.selfToken.expirationTime
                 ).fromNow()}`,
-                type: 'error',
+                color: 'warning',
                 destroyOnClick: false,
                 sticky: true,
                 customCloseAction: () => {

diff --git a/ui/app/styles/core/notifications.scss b/ui/app/styles/core/notifications.scss
@@ -1,5 +1,3 @@
-$bonusRightPadding: 20px;
-
 section.notifications {
   position: fixed;
   bottom: 20px;

diff --git a/ui/app/templates/application.hbs b/ui/app/templates/application.hbs
@@ -12,10 +12,10 @@
     <Hds::Toast
       @color={{or flash.color "neutral"}}
       @onDismiss={{
-        (queue
+        queue
           (action close)
           (action (optional flash.customCloseAction))
-        )
+
       }}
     as |T|>
       {{#if flash.title}}