diff --git a/.changelog/16519.txt b/.changelog/16519.txt new file mode 100644 index 000000000..758d4cb11 --- /dev/null +++ b/.changelog/16519.txt @@ -0,0 +1,3 @@ +```release-note:improvement +ui: Update to use Hds::Toast component to show notifications +``` \ No newline at end of file diff --git a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/notifications/index.hbs b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/notifications/index.hbs index 132749f8b..8b37123b9 100644 --- a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/notifications/index.hbs +++ b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/notifications/index.hbs @@ -1,37 +1,27 @@ {{#if (eq @type 'remove')}} {{#if @error}} - - - Error! - - -

- There was an error invalidating the Lock Session. - {{#if (and @error.status @error.detail)}} + as |T|> + Error! + + There was an error invalidating the Lock Session. + {{#if (and @error.status @error.detail)}}
{{@error.status}}: {{@error.detail}} - {{/if}} -

- - + {{/if}} + + {{else}} - - - Success! - - -

- Your Lock Session has been invalidated. -

- - + as |T|> + Success! + + Your Lock Session has been invalidated. + + {{/if}} {{else if (eq @type 'kv')}} diff --git a/ui/packages/consul-nspaces/app/components/consul/nspace/notifications/index.hbs b/ui/packages/consul-nspaces/app/components/consul/nspace/notifications/index.hbs index c373a535b..9ed7dfd3e 100644 --- a/ui/packages/consul-nspaces/app/components/consul/nspace/notifications/index.hbs +++ b/ui/packages/consul-nspaces/app/components/consul/nspace/notifications/index.hbs @@ -1,16 +1,8 @@ {{#if (eq @type 'remove')}} - - - Success! - - -

- Your Namespace has been marked for deletion. -

- - + + Success! + Your Namespace has been marked for deletion. + {{/if}} diff --git a/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs index 5b50a2f66..5db208cb2 100644 --- a/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs +++ b/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs @@ -1,16 +1,11 @@ {{#if (eq @type 'remove')}} - - - Success! - - -

- Your Partition has been marked for deletion. -

- - + as |T|> + Success! + + Your Partition has been marked for deletion. + + {{/if}} diff --git a/ui/packages/consul-peerings/app/components/consul/peer/notifications/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/notifications/index.hbs index 972c5c10e..4e2ebfdfd 100644 --- a/ui/packages/consul-peerings/app/components/consul/peer/notifications/index.hbs +++ b/ui/packages/consul-peerings/app/components/consul/peer/notifications/index.hbs @@ -1,16 +1,11 @@ {{#if (eq @type 'remove')}} - - - Success! - - -

- Your Peer has been marked for deletion. -

- - + as |T|> + Success! + + Your Peer has been marked for deletion. + + {{/if}} diff --git a/ui/packages/consul-ui/app/components/app/index.scss b/ui/packages/consul-ui/app/components/app/index.scss index 589238748..10300a85c 100644 --- a/ui/packages/consul-ui/app/components/app/index.scss +++ b/ui/packages/consul-ui/app/components/app/index.scss @@ -5,14 +5,10 @@ @extend %app-notifications; } %app-notifications { - display: flex; - flex-direction: column; - align-items: center; - position: fixed; - z-index: 50; - top: -45px; - left: 0; + z-index: 100; + bottom: 2rem; + left: 1.5rem; pointer-events: none; } @@ -125,7 +121,6 @@ main { %main-nav-horizontal-toggle:checked + header > div > nav:first-of-type { left: calc(var(--chrome-width, 280px) * -1); } - %main-nav-horizontal-toggle ~ main .notifications, %main-nav-horizontal-toggle ~ main { margin-left: var(--chrome-width, 280px); } diff --git a/ui/packages/consul-ui/app/components/app/notification/index.hbs b/ui/packages/consul-ui/app/components/app/notification/index.hbs index e6653d302..1009ddb11 100644 --- a/ui/packages/consul-ui/app/components/app/notification/index.hbs +++ b/ui/packages/consul-ui/app/components/app/notification/index.hbs @@ -1,5 +1,5 @@
{{#if (string-starts-with api.error.detail 'duplicate intention found:')}} - - - Intention exists! - - -

- An intention already exists for this Source-Destination pair. Please enter a different combination of Services, or search the intentions to edit an existing intention. -

- - + + Intention exists! + + An intention already exists for this Source-Destination pair. Please enter a different combination of Services, or search the intentions to edit an existing intention. + + {{else}} - - - Error! - - -

- There was an error saving your intention. - {{#if (and api.error.status api.error.detail)}} -
{{api.error.status}}: {{api.error.detail}} - {{/if}} -

- - + + Error! + + There was an error saving your intention. + {{#if (and api.error.status api.error.detail)}} +
{{api.error.status}}: {{api.error.detail}} + {{/if}} + + {{/if}} diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/components.scss b/ui/packages/consul-ui/app/components/consul/intention/list/components.scss index b7a0760b8..796bd8113 100644 --- a/ui/packages/consul-ui/app/components/consul/intention/list/components.scss +++ b/ui/packages/consul-ui/app/components/consul/intention/list/components.scss @@ -15,13 +15,4 @@ td.intent- strong { @extend %pill-l7; } - .notice.allow { - @extend %notice-success; - } - .notice.deny { - @extend %notice-error; - } - .notice.permissions { - @extend %notice-info; - } } diff --git a/ui/packages/consul-ui/app/components/data-loader/index.hbs b/ui/packages/consul-ui/app/components/data-loader/index.hbs index 6be3fd61c..e207e4481 100644 --- a/ui/packages/consul-ui/app/components/data-loader/index.hbs +++ b/ui/packages/consul-ui/app/components/data-loader/index.hbs @@ -56,22 +56,13 @@ {{#yield-slot name="disconnected" params=(block-params (action dispatch "RESET"))}} {{yield api}} {{else}} - - - Warning! - - -

- An error was returned whilst loading this data, refresh to try again. -

- - + }} as |T|> + Warning! + An error was returned whilst loading this data, refresh to try again. + {{/yield-slot}} {{/if}} diff --git a/ui/packages/consul-ui/app/components/data-writer/index.hbs b/ui/packages/consul-ui/app/components/data-writer/index.hbs index 36f418459..a042fd6c2 100644 --- a/ui/packages/consul-ui/app/components/data-writer/index.hbs +++ b/ui/packages/consul-ui/app/components/data-writer/index.hbs @@ -39,22 +39,14 @@ as |after|}} {{#yield-slot name="removed" params=(block-params after)}} {{yield api}} {{else}} - - - Success! - - -

- Your {{or label type}} has been deleted. -

- - + + Success! + Your {{or label type}} has been deleted. + {{/yield-slot}} {{/let}} @@ -66,22 +58,14 @@ as |after|}} {{#yield-slot name="persisted" params=(block-params after)}} {{yield api}} {{else}} - - - Success! - - -

- Your {{or label type}} has been saved. -

- - + }} as |T|> + Success! + Your {{or label type}} has been saved. + {{/yield-slot}} {{/let}} @@ -93,27 +77,20 @@ as |after|}} {{#yield-slot name="error" params=(block-params after api.error)}} {{yield api}} {{else}} - - - Error! - - -

- There was an error saving your {{or label type}}. - {{#if (and api.error.status api.error.detail)}} + }} as |T|> + Error! + There was an error saving your {{or label type}}. + {{#if (and api.error.status api.error.detail)}}
{{api.error.status}}: {{api.error.detail}} - {{else if api.error.message}} + {{else if api.error.message}}
{{api.error.message}} - {{/if}} -

- - + {{/if}} + + {{/yield-slot}} {{/let}} diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs index 6942abded..5d1e5a247 100644 --- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs +++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs @@ -7,66 +7,58 @@ {{{flash.dom}}} {{else}} {{#let (lowercase flash.type) (lowercase flash.action) as |status type|}} - - - - {{capitalize status}}! - - - -

- {{#if (eq type 'logout')}} - {{#if (eq status 'success')}} - You are now logged out. - {{else}} - There was an error logging out. - {{/if}} - {{else if (eq type 'authorize')}} - {{#if (eq status 'success')}} - You are now logged in. - {{else}} - There was an error, please check your SecretID/Token - {{/if}} + as |T|> + {{capitalize status}}! + + {{#if (eq type 'logout')}} + {{#if (eq status 'success')}} + You are now logged out. {{else}} - {{#if (or (eq type 'use') (eq flash.model 'token'))}} - - {{else if (eq flash.model 'intention')}} - - {{else if (eq flash.model 'role')}} - - {{else if (eq flash.model 'policy')}} - - {{/if}} + There was an error logging out. {{/if}} -

- - + {{else if (eq type 'authorize')}} + {{#if (eq status 'success')}} + You are now logged in. + {{else}} + There was an error, please check your SecretID/Token + {{/if}} + {{else}} + {{#if (or (eq type 'use') (eq flash.model 'token'))}} + + {{else if (eq flash.model 'intention')}} + + {{else if (eq flash.model 'role')}} + + {{else if (eq flash.model 'policy')}} + + {{/if}} + {{/if}} + + + {{/let}} {{/if}} diff --git a/ui/packages/consul-ui/app/components/notice/README.mdx b/ui/packages/consul-ui/app/components/notice/README.mdx deleted file mode 100644 index ed05cb8a2..000000000 --- a/ui/packages/consul-ui/app/components/notice/README.mdx +++ /dev/null @@ -1,50 +0,0 @@ -# Notice - -Presentational component for informational/warning/error banners/notices. - - -```hbs preview-template - - -

Header

- - -

- Body -

- - -

- Footer link -

- - - -
-
Provide a widget to change the @type
- - - -
-``` - -## Arguments - -| Argument/Attribute | Type | Default | Description | -| --- | --- | --- | --- | -| `type` | `String` | `info` | Type of notice [info\|warning\|error] | - -## See - -- [Template Source Code](./index.hbs) - ---- diff --git a/ui/packages/consul-ui/app/components/notice/index.hbs b/ui/packages/consul-ui/app/components/notice/index.hbs deleted file mode 100644 index 59448aed0..000000000 --- a/ui/packages/consul-ui/app/components/notice/index.hbs +++ /dev/null @@ -1,10 +0,0 @@ -
-{{yield (hash - Header=(component 'anonymous' tagName="header") - Body=(component 'anonymous') - Footer=(component 'anonymous' tagName="footer") -)}} -
diff --git a/ui/packages/consul-ui/app/components/notice/index.scss b/ui/packages/consul-ui/app/components/notice/index.scss deleted file mode 100644 index a965188ec..000000000 --- a/ui/packages/consul-ui/app/components/notice/index.scss +++ /dev/null @@ -1,31 +0,0 @@ -@import './skin'; -@import './layout'; - -%notice { - margin: 1em 0; -} -/**/ -.notice.success { - @extend %notice-success; -} -.notice.warning { - @extend %notice-warning; -} -.notice.error { - @extend %notice-error; -} -.notice.info { - @extend %notice-info; -} -.notice.highlight { - @extend %notice-highlight; -} -.notice.policy-management { - @extend %notice-highlight; -} -.notice.crd::before { - -webkit-mask-image: none; - mask-image: none; - background-color: transparent; - @extend %with-logo-kubernetes-color-icon; -} diff --git a/ui/packages/consul-ui/app/components/notice/layout.scss b/ui/packages/consul-ui/app/components/notice/layout.scss deleted file mode 100644 index f7f49a9d4..000000000 --- a/ui/packages/consul-ui/app/components/notice/layout.scss +++ /dev/null @@ -1,24 +0,0 @@ -%notice { - position: relative; - padding: 0.8rem; -} -%notice header { - margin-bottom: 0.1rem; -} -%notice header > * { - margin-bottom: 0; -} -%notice p { - margin-bottom: 0.3rem; - line-height: 1.4; -} -/* this is probably skin */ -%notice { - padding-left: calc(0.8rem + 1.4rem); -} -%notice::before { - position: absolute; - top: 0.8rem; - left: 0.6rem; - font-size: 1rem; -} diff --git a/ui/packages/consul-ui/app/components/notice/skin.scss b/ui/packages/consul-ui/app/components/notice/skin.scss deleted file mode 100644 index b8c2dc4dc..000000000 --- a/ui/packages/consul-ui/app/components/notice/skin.scss +++ /dev/null @@ -1,77 +0,0 @@ -%notice { - border-radius: var(--decor-radius-100); - border: var(--decor-border-100); - color: var(--token-color-hashicorp-brand); -} -%notice::before { - @extend %as-pseudo; -} -%notice header > * { - @extend %h300; -} -%notice footer * { - @extend %p3; - font-weight: var(--typo-weight-bold); -} -%notice-success, -%notice-info, -%notice-highlight, -%notice-error, -%notice-warning { - @extend %notice; -} -%notice-success { - background-color: var(--token-color-surface-success); - border-color: var(--token-color-foreground-success); -} -%notice-success header * { - color: var(--token-color-palette-green-400); -} -%notice-info { - border-color: var(--token-color-border-action); - background-color: var(--token-color-surface-action); -} -%notice-info header * { - color: var(--token-color-foreground-action-active); -} -%notice-highlight { - background-color: var(--token-color-surface-strong); - border-color: var(--token-color-palette-neutral-300); -} -%notice-info header * { - color: var(--token-color-foreground-action-active); -} -%notice-warning { - border-color: var(--token-color-vault-border); - background-color: var(--token-color-vault-gradient-faint-start); -} -%notice-warning header * { - color: var(--token-color-vault-foreground); -} -%notice-error { - background-color: var(--token-color-surface-critical); - border-color: var(--token-color-foreground-critical); -} -%notice-error header * { - color: var(--token-color-foreground-critical); -} -%notice-success::before { - @extend %with-check-circle-fill-mask; - color: var(--token-color-foreground-success); -} -%notice-info::before { - @extend %with-info-circle-fill-mask; - color: var(--token-color-foreground-action); -} -%notice-highlight::before { - @extend %with-star-fill-mask; - color: var(--token-color-vault-brand); -} -%notice-warning::before { - @extend %with-alert-triangle-mask; - color: var(--token-color-foreground-warning); -} -%notice-error::before { - @extend %with-cancel-square-fill-mask; - color: var(--token-color-foreground-critical); -} diff --git a/ui/packages/consul-ui/app/modifiers/notification.mdx b/ui/packages/consul-ui/app/modifiers/notification.mdx index c888c096f..3b16c826b 100644 --- a/ui/packages/consul-ui/app/modifiers/notification.mdx +++ b/ui/packages/consul-ui/app/modifiers/notification.mdx @@ -7,24 +7,17 @@ like the below: ```hbs preview-template
Attach a Warning notice to the top of the app ^^^
- - - - Warning! - - -

+ + Warning! + This service has been deregistered and no longer exists in the catalog. -

- - - + +
``` diff --git a/ui/packages/consul-ui/app/styles/components.scss b/ui/packages/consul-ui/app/styles/components.scss index 656b05cf1..6af53eb84 100644 --- a/ui/packages/consul-ui/app/styles/components.scss +++ b/ui/packages/consul-ui/app/styles/components.scss @@ -66,7 +66,6 @@ @import 'consul-ui/components/inline-code'; @import 'consul-ui/components/overlay'; @import 'consul-ui/components/tooltip'; -@import 'consul-ui/components/notice'; @import 'consul-ui/components/modal-dialog'; @import 'consul-ui/components/list-collection'; @import 'consul-ui/components/filter-bar'; diff --git a/ui/packages/consul-ui/app/styles/layout.scss b/ui/packages/consul-ui/app/styles/layout.scss index 5221f6d08..99c84a0d1 100644 --- a/ui/packages/consul-ui/app/styles/layout.scss +++ b/ui/packages/consul-ui/app/styles/layout.scss @@ -79,9 +79,6 @@ html[data-route='dc.services.index'] .consul-service-list ul, .consul-auth-method-list ul { @extend %list-after-filter-bar; } -.notice + .consul-token-list ul { - border-top-width: 1px !important; -} // TODO: This shouldn't be done here, decide the best way to do this // %main-decoration ? %main-skin ? %content-skin ? diff --git a/ui/packages/consul-ui/app/templates/dc/kv/index.hbs b/ui/packages/consul-ui/app/templates/dc/kv/index.hbs index bd0b135e3..d9de97440 100644 --- a/ui/packages/consul-ui/app/templates/dc/kv/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/kv/index.hbs @@ -30,56 +30,35 @@ as |route|> {{#if (eq loader.error.status "404")}} - - - Warning! - - -

- This KV or parent of this KV was deleted. -

- - + + Warning! + + This KV or parent of this KV was deleted. + + {{else if (eq loader.error.status "403")}} - - - Error! - - -

- You no longer have access to this KV. -

- - + + Error! + + You no longer have access to this KV. + + {{else}} - - - Warning! - - -

- An error was returned whilst loading this data, refresh to try again. -

- - + + Warning! + + An error was returned whilst loading this data, refresh to try again. + + {{/if}} diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs index ec7f46493..647c75073 100644 --- a/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs @@ -29,56 +29,32 @@ as |route|> {{#if (eq loader.error.status "404")}} - - - Warning! - - -

- This node no longer exists in the catalog. -

- - + }} as |T|> + Warning! + This node no longer exists in the catalog. + {{else if (eq loader.error.status "403")}} - - - Error! - - -

- You no longer have access to this node -

- - + }} as |T|> + Error! + You no longer have access to this node. + {{else}} - - - Warning! - - -

- An error was returned whilst loading this data, refresh to try again. -

- - + }} as |T|> + Warning! + An error was returned whilst loading this data, refresh to try again. + {{/if}} diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance.hbs index dcbb0a3dd..b032d5125 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/instance.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/instance.hbs @@ -21,43 +21,35 @@ {{#if (eq loader.error.status '404')}} - - - Warning! - - -

- This service has been deregistered and no longer exists in the catalog. -

- - + as |T|> + Warning! + + This service has been deregistered and no longer exists in the catalog. + + {{else if (eq loader.error.status '403')}} - - - Error! - - -

- You no longer have access to this service -

- - + + Error! + + You no longer have access to this service. + + {{else}} - - - Warning! - - -

- An error was returned whilst loading this data, refresh to try again. -

- - + + Warning! + + An error was returned whilst loading this data, refresh to try again. + + {{/if}} diff --git a/ui/packages/consul-ui/app/templates/dc/services/show.hbs b/ui/packages/consul-ui/app/templates/dc/services/show.hbs index e8c0044e6..9a9810632 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/show.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/show.hbs @@ -22,56 +22,32 @@ as |route|> {{#if (eq loader.error.status "404")}} - - - Warning! - - -

- This service has been deregistered and no longer exists in the catalog. -

- - + }} as |T|> + Warning! + This service has been deregistered and no longer exists in the catalog. + {{else if (eq loader.error.status "403")}} - - - Error! - - -

- You no longer have access to this service -

- - + }} as |T|> + Error! + You no longer have access to this service. + {{else}} - - - Warning! - - -

- An error was returned whilst loading this data, refresh to try again. -

- - + }} as |T|> + Warning! + An error was returned whilst loading this data, refresh to try again. + {{/if}} diff --git a/ui/packages/consul-ui/app/templates/dc/show/license.hbs b/ui/packages/consul-ui/app/templates/dc/show/license.hbs index db0096907..53c1fbe73 100644 --- a/ui/packages/consul-ui/app/templates/dc/show/license.hbs +++ b/ui/packages/consul-ui/app/templates/dc/show/license.hbs @@ -24,56 +24,29 @@ as |item|}} {{#if (eq loader.error.status "404")}} - - - Warning! - - -

- This service has been deregistered and no longer exists in the catalog. -

- - + }} as |T|> + Warning! + This service has been deregistered and no longer exists in the catalog. + {{else if (eq loader.error.status "403")}} - - - Error! - - -

- You no longer have access to this service -

- - + }} as |T|> + Error! + You no longer have access to this service. + {{else}} - - - Warning! - - -

- An error was returned whilst loading this data, refresh to try again. -

- - + }} as |T|> + Warning! + An error was returned whilst loading this data, refresh to try again. + {{/if}} diff --git a/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs b/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs index 6e8adf899..75e166fe1 100644 --- a/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs +++ b/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs @@ -24,56 +24,32 @@ as |item|}} {{#if (eq loader.error.status "404")}} - - - Warning! - - -

- This service has been deregistered and no longer exists in the catalog. -

- - + }} as |T|> + Warning! + This service has been deregistered and no longer exists in the catalog. + {{else if (eq loader.error.status "403")}} - - - Error! - - -

- You no longer have access to this service -

- - + }} as |T|> + Error! + You no longer have access to this service. + {{else}} - - - Warning! - - -

- An error was returned whilst loading this data, refresh to try again. -

- - + }} as |T|> + Warning! + An error was returned whilst loading this data, refresh to try again. + {{/if}} diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-existing.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-existing.feature index 54e64f8b4..bf9464e50 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-existing.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-existing.feature @@ -41,8 +41,8 @@ Feature: dc / acls / policies / as many / add existing: Add existing policy Name: Policy 2 --- Then the url should be /datacenter/acls/[Model]s - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: ------------- | Model | diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-new.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-new.feature index 367ae9221..599fc69e7 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-new.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-new.feature @@ -39,8 +39,8 @@ Feature: dc / acls / policies / as many / add new: Add new policy Name: New-Policy --- Then the url should be /datacenter/acls/[Model]s - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: ------------- | Model | @@ -62,8 +62,8 @@ Feature: dc / acls / policies / as many / add new: Add new policy - ServiceName: New-Service-Identity --- Then the url should be /datacenter/acls/[Model]s - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: ------------- | Model | @@ -86,8 +86,8 @@ Feature: dc / acls / policies / as many / add new: Add new policy Datacenter: datacenter --- Then the url should be /datacenter/acls/[Model]s - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: ------------- | Model | diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/create.feature index 0e9f6a21d..85589fcfe 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/create.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/create.feature @@ -24,8 +24,8 @@ Feature: dc / acls / policies / create Description: [Description] --- Then the url should be /datacenter/acls/policies - And "[data-notification]" has the "notification-create" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: --------------------------- | Description | @@ -46,5 +46,5 @@ Feature: dc / acls / policies / create - Namespace --- Then the url should be /datacenter/acls/policies - And "[data-notification]" has the "notification-create" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/delete.feature index c75b75c89..87a6be3e1 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/delete.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/delete.feature @@ -15,8 +15,8 @@ Feature: dc / acls / policies / delete: Policy Delete And I click delete on the policies And I click confirmDelete on the policies Then a DELETE request was made to "/v1/acl/policy/1981f51d-301a-497b-89a0-05112ef02b4b?dc=datacenter&ns=@!namespace" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Deleting a policy model from the policies listing page errors Given the url "/v1/acl/policy/1981f51d-301a-497b-89a0-05112ef02b4b?dc=datacenter&ns=@namespace" responds with a 500 status And 1 policy model from yaml @@ -30,8 +30,8 @@ Feature: dc / acls / policies / delete: Policy Delete And I click actions on the policies And I click delete on the policies And I click confirmDelete on the policies - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class Scenario: Deleting a policy from the policy detail page When I visit the policy page for yaml --- @@ -41,8 +41,8 @@ Feature: dc / acls / policies / delete: Policy Delete And I click delete And I click confirmDelete on the deleteModal Then a DELETE request was made to "/v1/acl/policy/1981f51d-301a-497b-89a0-05112ef02b4b?dc=datacenter&ns=@!namespace" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class # FIXME # Scenario: Deleting a policy from the policy detail page errors # Given the url "/v1/acl/policy/1981f51d-301a-497b-89a0-05112ef02b4b?dc=datacenter&ns=@namespace" responds with a 500 status diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/update.feature index e0857d14e..f207a078d 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/update.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/update.feature @@ -37,8 +37,8 @@ Feature: dc / acls / policies / update: ACL Policy Update --- Then the url should be /datacenter/acls/policies - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: ------------------------------------------------------------------------------ | Name | Rules | Description | @@ -50,8 +50,8 @@ Feature: dc / acls / policies / update: ACL Policy Update Given the url "/v1/acl/policy/policy-id" responds with a 500 status And I submit Then the url should be /datacenter/acls/policies/policy-id - Then "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class @notNamespaceable Scenario: Updating a simple ACL policy when Namespaces are disabled does not send Namespace @@ -65,5 +65,5 @@ Feature: dc / acls / policies / update: ACL Policy Update - Namespace --- Then the url should be /datacenter/acls/policies - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-existing.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-existing.feature index 6f2297575..acf4e16a2 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-existing.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-existing.feature @@ -46,5 +46,5 @@ Feature: dc / acls / roles / as many / add existing: Add existing Name: Role 2 --- Then the url should be /datacenter/acls/tokens - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-new.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-new.feature index 45249a8e4..601c17bb7 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-new.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-new.feature @@ -46,8 +46,8 @@ Feature: dc / acls / roles / as-many / add-new: Add new ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1 --- Then the url should be /datacenter/acls/tokens - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Add Role that has an existing Policy And I click "#new-role .ember-power-select-trigger" And I click ".ember-power-select-option:first-child" @@ -71,8 +71,8 @@ Feature: dc / acls / roles / as-many / add-new: Add new ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1 --- Then the url should be /datacenter/acls/tokens - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Add Role and add a new Policy And I click roles.form.policies.create Then I fill in the roles.form.policies.form with yaml @@ -111,8 +111,8 @@ Feature: dc / acls / roles / as-many / add-new: Add new ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1 --- Then the url should be /datacenter/acls/tokens - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Add Role and add a new Service Identity And I click roles.form.policies.create Then I fill in the roles.form.policies.form with yaml @@ -141,8 +141,8 @@ Feature: dc / acls / roles / as-many / add-new: Add new ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1 --- Then the url should be /datacenter/acls/tokens - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class @ignore: Scenario: Click the cancel form Then ok diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/create.feature index ce63a93df..0c5a51101 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/create.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/create.feature @@ -24,8 +24,8 @@ Feature: dc / acls / roles / create Description: [Description] --- Then the url should be /datacenter/acls/roles - And "[data-notification]" has the "notification-create" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: --------------------------- | Description | @@ -45,6 +45,5 @@ Feature: dc / acls / roles / create - Namespace --- Then the url should be /datacenter/acls/roles - And "[data-notification]" has the "notification-create" class - And "[data-notification]" has the "success" class - + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/update.feature index 795fd7908..081dc174c 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/update.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/update.feature @@ -29,8 +29,8 @@ Feature: dc / acls / roles / update: ACL Role Update Description: [Description] --- Then the url should be /datacenter/acls/roles - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: ------------------------------------------ | Name | Description | @@ -42,8 +42,8 @@ Feature: dc / acls / roles / update: ACL Role Update Given the url "/v1/acl/role/role-id" responds with a 500 status And I submit Then the url should be /datacenter/acls/roles/role-id - Then "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class @notNamespaceable Scenario: Updating a simple ACL role when Namespaces are disabled does not send Namespace @@ -57,5 +57,5 @@ Feature: dc / acls / roles / update: ACL Role Update - Namespace --- Then the url should be /datacenter/acls/roles - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/clone.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/clone.feature index dba4efc39..c03c5ef35 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/clone.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/clone.feature @@ -16,8 +16,8 @@ Feature: dc / acls / tokens / clone: Cloning an ACL token And I click actions on the tokens And I click clone on the tokens Then a PUT request was made to "/v1/acl/token/token/clone?dc=datacenter&ns=@!namespace" - Then "[data-notification]" has the "notification-clone" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Using an ACL token from the detail page When I visit the token page for yaml --- @@ -26,5 +26,5 @@ Feature: dc / acls / tokens / clone: Cloning an ACL token --- And I click clone Then the url should be /datacenter/acls/tokens - Then "[data-notification]" has the "notification-clone" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/create.feature index 351b21aa3..c330e4f07 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/create.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/create.feature @@ -21,8 +21,8 @@ Feature: dc / acls / tokens / create Description: [Description] --- Then the url should be /datacenter/acls/tokens - And "[data-notification]" has the "notification-create" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: --------------------------- | Description | @@ -41,5 +41,5 @@ Feature: dc / acls / tokens / create - Namespace --- Then the url should be /datacenter/acls/tokens - And "[data-notification]" has the "notification-create" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/own-no-delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/own-no-delete.feature index b3e05853c..b5e5484f4 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/own-no-delete.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/own-no-delete.feature @@ -25,8 +25,8 @@ Feature: dc / acls / tokens / own-no-delete: Your current token has no delete bu And I click actions on the tokens And I click use on the tokens And I click confirmUse on the tokens - Then "[data-notification]" has the "notification-use" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Then I have settings like yaml --- consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}" diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/update.feature index 4770cedf5..745521456 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/update.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/update.feature @@ -26,8 +26,8 @@ Feature: dc / acls / tokens / update: ACL Token Update Description: [Description] --- Then the url should be /datacenter/acls/tokens - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: --------------------------- | Description | @@ -38,8 +38,8 @@ Feature: dc / acls / tokens / update: ACL Token Update Given the url "/v1/acl/token/key" responds with a 500 status And I submit Then the url should be /datacenter/acls/tokens/key - Then "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class @notNamespaceable Scenario: Updating a simple ACL token when Namespaces are disabled does not send Namespace @@ -53,5 +53,5 @@ Feature: dc / acls / tokens / update: ACL Token Update - Namespace --- Then the url should be /datacenter/acls/tokens - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/use.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/use.feature index 1e354f404..52c9b973d 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/use.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/use.feature @@ -24,8 +24,8 @@ Feature: dc / acls / tokens / use: Using an ACL token And I click actions on the tokens And I click use on the tokens And I click confirmUse on the tokens - Then "[data-notification]" has the "notification-use" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Then I have settings like yaml --- consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}" @@ -40,8 +40,8 @@ Feature: dc / acls / tokens / use: Using an ACL token --- And I click use And I click confirmUse - Then "[data-notification]" has the "notification-use" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Then I have settings like yaml --- consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}" diff --git a/ui/packages/consul-ui/tests/acceptance/dc/intentions/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/intentions/create.feature index 0b4c6baa6..2d074876e 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/intentions/create.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/intentions/create.feature @@ -59,8 +59,8 @@ Feature: dc / intentions / create: Intention Create --- Then the url should be /datacenter/intentions And the title should be "Intentions - Consul" - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class @notNamespaceable Scenario: with namespaces disabled Given 1 datacenter model with the value "datacenter" @@ -101,5 +101,5 @@ Feature: dc / intentions / create: Intention Create --- Then the url should be /datacenter/intentions And the title should be "Intentions - Consul" - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/intentions/delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/intentions/delete.feature index 84b2e295a..f85b0b2b6 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/intentions/delete.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/intentions/delete.feature @@ -23,8 +23,8 @@ Feature: dc / intentions / deleting: Deleting items with confirmations, success And I click delete on the intentionList.intentions And I click confirmInlineDelete on the intentionList.intentions Then a DELETE request was made to "/v1/connect/intentions/exact?source=default%2Fdefault%2Fname&destination=default%2Fdefault%2Fdestination&dc=datacenter" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Deleting an intention from the intention detail page When I visit the intention page for yaml --- @@ -34,8 +34,8 @@ Feature: dc / intentions / deleting: Deleting items with confirmations, success And I click delete And I click confirmDelete Then a DELETE request was made to "/v1/connect/intentions/exact?source=default%2Fdefault%2Fname&destination=default%2Fdefault%2Fdestination&dc=datacenter" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Deleting an intention from the intention detail page and getting an error When I visit the intention page for yaml --- @@ -45,8 +45,8 @@ Feature: dc / intentions / deleting: Deleting items with confirmations, success Given the url "/v1/connect/intentions/exact?source=default%2Fdefault%2Fname&destination=default%2Fdefault%2Fdestination&dc=datacenter" responds with a 500 status And I click delete And I click confirmDelete - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class Scenario: Deleting an intention from the intention detail page and getting an error due to a duplicate intention When I visit the intention page for yaml --- @@ -60,6 +60,5 @@ Feature: dc / intentions / deleting: Deleting items with confirmations, success --- And I click delete And I click confirmDelete - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class - And I see the text "Intention exists" in "[data-notification] strong" + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/intentions/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/intentions/update.feature index 0d7b8525c..5faa16281 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/intentions/update.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/intentions/update.feature @@ -33,8 +33,8 @@ Feature: dc / intentions / update: Intention Update --- Then the url should be /datacenter/intentions And the title should be "Intentions - Consul" - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: ------------------------------ | Description | Action | @@ -44,6 +44,6 @@ Feature: dc / intentions / update: Intention Update Given the url "/v1/connect/intentions/exact?source=default%2Fdefault%2Fweb&destination=default%2Fdefault%2Fdb&dc=datacenter" responds with a 500 status And I submit Then the url should be /datacenter/intentions/intention-id - Then "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature index bd10541a7..9a98ba71f 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature @@ -16,8 +16,8 @@ Feature: dc / kvs / create And I submit Then the url should be /datacenter/kv Then a PUT request was made to "/v1/kv/key-value?dc=datacenter&ns=@namespace" - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Creating a folder Given 1 datacenter model with the value "datacenter" When I visit the kv page for yaml @@ -33,8 +33,8 @@ Feature: dc / kvs / create And I submit Then the url should be /datacenter/kv Then a PUT request was made to "/v1/kv/key-value/?dc=datacenter&ns=@namespace" - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Clicking create from within a folder Given 1 datacenter model with the value "datacenter" And 1 kv model from yaml diff --git a/ui/packages/consul-ui/tests/acceptance/dc/kvs/delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/kvs/delete.feature index 203daa90d..01d3f99d2 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/kvs/delete.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/kvs/delete.feature @@ -15,8 +15,8 @@ Feature: dc / kvs / deleting: Deleting items with confirmations, success and err And I click delete on the kvs And I click confirmInlineDelete on the kvs Then a DELETE request was made to "/v1/kv/key-name?dc=datacenter&ns=@!namespace" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Deleting an kv from the kv detail page When I visit the kv page for yaml --- @@ -26,8 +26,8 @@ Feature: dc / kvs / deleting: Deleting items with confirmations, success and err And I click delete And I click confirmDelete Then a DELETE request was made to "/v1/kv/key-name?dc=datacenter&ns=@!namespace" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Deleting an kv from the kv detail page and getting an error When I visit the kv page for yaml --- @@ -37,6 +37,6 @@ Feature: dc / kvs / deleting: Deleting items with confirmations, success and err Given the url "/v1/kv/key-name?dc=datacenter&ns=@!namespace" responds with a 500 status And I click delete And I click confirmDelete - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/kvs/sessions/invalidate.feature b/ui/packages/consul-ui/tests/acceptance/dc/kvs/sessions/invalidate.feature index 6959dba8b..66d46a3a1 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/kvs/sessions/invalidate.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/kvs/sessions/invalidate.feature @@ -21,12 +21,12 @@ Feature: dc / kvs / sessions / invalidate: Invalidate Lock Sessions And I click confirmDelete on the session Then a PUT request was made to "/v1/session/destroy/ee52203d-989f-4f7a-ab5a-2bef004164ca?dc=datacenter&ns=@!namespace" Then the url should be /datacenter/kv/key/edit - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Invalidating a lock session and receiving an error Given the url "/v1/session/destroy/ee52203d-989f-4f7a-ab5a-2bef004164ca?dc=datacenter&ns=@namespace" responds with a 500 status And I click delete on the session And I click confirmDelete on the session Then the url should be /datacenter/kv/key/edit - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/kvs/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/kvs/update.feature index ce9773914..4ee40a60b 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/kvs/update.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/kvs/update.feature @@ -23,8 +23,8 @@ Feature: dc / kvs / update: KV Update --- And I submit Then a PUT request was made to "/v1/kv/[EncodedName]?dc=datacenter&ns=@!namespace&flags=12" with the body "[Value]" - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: --------------------------------------------------------- | Name | EncodedName | Value | @@ -56,8 +56,8 @@ Feature: dc / kvs / update: KV Update Then a PUT request was made to "/v1/kv/key?dc=datacenter&ns=@!namespace&flags=12" with the body " " Then the url should be /datacenter/kv And the title should be "Key / Value - Consul" - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Update to a key change value to '' And 1 kv model from yaml --- @@ -79,8 +79,8 @@ Feature: dc / kvs / update: KV Update And I submit Then a PUT request was made to "/v1/kv/key?dc=datacenter&ns=@!namespace&flags=12" with no body Then the url should be /datacenter/kv - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Update to a key when the value is empty And 1 kv model from yaml --- @@ -97,8 +97,8 @@ Feature: dc / kvs / update: KV Update And I submit Then a PUT request was made to "/v1/kv/key?dc=datacenter&ns=@!namespace&flags=12" with no body Then the url should be /datacenter/kv - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: There was an error saving the key When I visit the kv page for yaml --- @@ -110,8 +110,8 @@ Feature: dc / kvs / update: KV Update Given the url "/v1/kv/key" responds with a 500 status And I submit Then the url should be /datacenter/kv/key/edit - Then "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class @ignore Scenario: KV's with spaces are saved correctly Then ok diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/sessions/invalidate.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/sessions/invalidate.feature index 43dfcb7ae..b6df7fc16 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/sessions/invalidate.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/sessions/invalidate.feature @@ -27,12 +27,12 @@ Feature: dc / nodes / sessions / invalidate: Invalidate Lock Sessions And I click confirmDelete on the sessions Then a PUT request was made to "/v1/session/destroy/7bbbd8bb-fff3-4292-b6e3-cfedd788546a?dc=dc1&ns=@!namespace" Then the url should be /dc1/nodes/node-0/lock-sessions - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Invalidating a lock session and receiving an error Given the url "/v1/session/destroy/7bbbd8bb-fff3-4292-b6e3-cfedd788546a?dc=dc1&ns=@namespace" responds with a 500 status And I click delete on the sessions And I click confirmDelete on the sessions Then the url should be /dc1/nodes/node-0/lock-sessions - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nspaces/delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/nspaces/delete.feature index 36bce2f65..e536b66fc 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nspaces/delete.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nspaces/delete.feature @@ -19,8 +19,8 @@ Feature: dc / nspaces / delete: Deleting items with confirmations, success and e And I click delete on the [Listing] And I click confirmDelete on the [Listing] Then a [Method] request was made to "[URL]" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: -------------------------------------------------------------------------------------------------------- | Edit | Listing | Method | URL | Data | @@ -35,8 +35,8 @@ Feature: dc / nspaces / delete: Deleting items with confirmations, success and e And I click delete And I click confirmDelete Then a DELETE request was made to "/v1/namespace/a-namespace?dc=datacenter" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Deleting a [Model] from the [Model] detail page with error When I visit the [Model] page for yaml --- @@ -46,8 +46,8 @@ Feature: dc / nspaces / delete: Deleting items with confirmations, success and e Given the url "[URL]" responds with a 500 status And I click delete And I click confirmDelete - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class Where: ------------------------------------------------------------------------------------------- | Model | Method | URL | Slug | diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nspaces/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/nspaces/update.feature index 0b4a5bdc6..7feb09ca7 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nspaces/update.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nspaces/update.feature @@ -28,8 +28,8 @@ Feature: dc / nspaces / update: Nspace Update Description: [Description] --- Then the url should be /datacenter/namespaces - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: --------------------------- | Description | @@ -40,5 +40,5 @@ Feature: dc / nspaces / update: Nspace Update Given the url "/v1/namespace/namespace?dc=datacenter" responds with a 500 status And I submit Then the url should be /datacenter/namespaces/namespace - Then "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/peers/delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/peers/delete.feature index 7cd6b4b31..7106105cb 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/peers/delete.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/peers/delete.feature @@ -16,8 +16,8 @@ Feature: dc / peers / delete: Deleting items with confirmations, success and err And I click delete on the peers And I click confirmDelete on the peers Then a DELETE request was made to "/v1/peering/peer-name" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: Deleting a peer from the peer listing page with error Given 1 peer model from yaml --- @@ -32,8 +32,8 @@ Feature: dc / peers / delete: Deleting items with confirmations, success and err And I click actions on the peers And I click delete on the peers And I click confirmDelete on the peers - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class Scenario: A Peer currently deleting cannot be deleted Given 1 peer model from yaml --- diff --git a/ui/packages/consul-ui/tests/acceptance/dc/peers/establish.feature b/ui/packages/consul-ui/tests/acceptance/dc/peers/establish.feature index c773155ac..6388f824a 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/peers/establish.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/peers/establish.feature @@ -26,6 +26,6 @@ Feature: dc / peers / establish: Peer Establish Peering PeerName: new-peer PeeringToken: an-encoded-token --- - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class And the url should be /dc-1/peers/new-peer/imported-services diff --git a/ui/packages/consul-ui/tests/acceptance/dc/services/show.feature b/ui/packages/consul-ui/tests/acceptance/dc/services/show.feature index 496b17742..647217eec 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/services/show.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/services/show.feature @@ -299,6 +299,7 @@ Feature: dc / services / show: Show Service # authorization requests are not blocking so we just wait until the next # service blocking query responds Then pause until I see the text "no longer have access" in "[data-notification]" - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class And I see status on the error like "403" diff --git a/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/create.feature index e95b03d62..0f518420e 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/create.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/create.feature @@ -62,8 +62,8 @@ Feature: dc / services / intentions / create: Intention Create per Service Action: deny --- Then the url should be /datacenter/services/db/intentions - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class @notNamespaceable Scenario: with namespaces disabled Given 1 datacenter model with the value "datacenter" @@ -104,5 +104,5 @@ Feature: dc / services / intentions / create: Intention Create per Service Action: deny --- Then the url should be /datacenter/services/db/intentions - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/index.feature b/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/index.feature index 25a58b1a7..b94c4ab3b 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/index.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/index.feature @@ -50,5 +50,5 @@ Feature: dc / services / show / intentions / index: Intentions per service And I click delete on the intentionList.intentions component And I click confirmInlineDelete on the intentionList.intentions Then a DELETE request was made to "/v1/connect/intentions/exact?source=default%2Fdefault%2Fname&destination=default%2Fdefault%2Fdestination&dc=dc1" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/dc/services/show/topology/intentions.feature b/ui/packages/consul-ui/tests/acceptance/dc/services/show/topology/intentions.feature index a93e27c6a..35e823711 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/services/show/topology/intentions.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/services/show/topology/intentions.feature @@ -36,7 +36,8 @@ Feature: dc / services / show / topology / intentions --- When I click ".consul-topology-metrics [data-test-action]" And I click ".consul-topology-metrics [data-test-confirm]" - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Scenario: There was an error saving the intention Given the url "/v1/connect/intentions/exact?source=default%2Fweb&destination=default%2Fdb&dc=datacenter" responds with a 500 status When I visit the service page for yaml @@ -46,4 +47,5 @@ Feature: dc / services / show / topology / intentions --- When I click ".consul-topology-metrics [data-test-action]" And I click ".consul-topology-metrics [data-test-confirm]" - And "[data-notification]" has the "error" class \ No newline at end of file + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class \ No newline at end of file diff --git a/ui/packages/consul-ui/tests/acceptance/deleting.feature b/ui/packages/consul-ui/tests/acceptance/deleting.feature index f3e58219e..2aa21edb3 100644 --- a/ui/packages/consul-ui/tests/acceptance/deleting.feature +++ b/ui/packages/consul-ui/tests/acceptance/deleting.feature @@ -18,8 +18,8 @@ Feature: deleting: Deleting items with confirmations, success and error notifica And I click delete on the [Listing] And I click confirmDelete on the [Listing] Then a [Method] request was made to "[URL]" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | Edit | Listing | Method | URL | Data | @@ -34,8 +34,8 @@ Feature: deleting: Deleting items with confirmations, success and error notifica And I click delete And I click confirmDelete Then a [Method] request was made to "[URL]" - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class Where: ----------------------------------------------------------------------------------------------------------------------------------------------------------- | Model | Method | URL | Slug | @@ -50,8 +50,8 @@ Feature: deleting: Deleting items with confirmations, success and error notifica Given the url "[URL]" responds with a 500 status And I click delete And I click confirmDelete - And "[data-notification]" has the "notification-delete" class - And "[data-notification]" has the "error" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-critical" class Where: ----------------------------------------------------------------------------------------------------------------------------------------------------------- | Model | Method | URL | Slug | diff --git a/ui/packages/consul-ui/tests/acceptance/login.feature b/ui/packages/consul-ui/tests/acceptance/login.feature index 9af0bbfee..8e59f5892 100644 --- a/ui/packages/consul-ui/tests/acceptance/login.feature +++ b/ui/packages/consul-ui/tests/acceptance/login.feature @@ -48,5 +48,5 @@ Feature: login And I click ".okta-oidc-provider" Then a POST request was made to "/v1/acl/oidc/auth-url?dc=dc-1&ns=@!namespace&partition=partition" And a POST request was made to "/v1/acl/oidc/callback?dc=dc-1&ns=@!namespace&partition=partition" - And "[data-notification]" has the "notification-authorize" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class diff --git a/ui/packages/consul-ui/tests/acceptance/settings/update.feature b/ui/packages/consul-ui/tests/acceptance/settings/update.feature index 680c69577..9409d5ad9 100644 --- a/ui/packages/consul-ui/tests/acceptance/settings/update.feature +++ b/ui/packages/consul-ui/tests/acceptance/settings/update.feature @@ -18,6 +18,6 @@ Feature: settings / update: Update Settings consul:token: '' --- And the url should be /settings - And "[data-notification]" has the "notification-update" class - And "[data-notification]" has the "success" class + And "[data-notification]" has the "hds-toast" class + And "[data-notification]" has the "hds-alert--color-success" class