luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

feat: update notification to use hds toast component (#16519)

This commit is contained in:
Valeriia Ruban 2023-03-06 14:10:09 -08:00 committed by GitHub
parent a673767fe9
commit d40fc3cc9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 428 additions and 847 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/16519.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
ui: Update to use Hds::Toast component to show notifications
```

38
ui/packages/consul-lock-sessions/app/components/consul/lock-session/notifications/index.hbs
View File

@ -1,37 +1,27 @@
{{#if (eq @type 'remove')}} {{#if (eq @type 'remove')}}
{{#if @error}} {{#if @error}}
<Notice <Hds::Toast
class="notification-delete" @color='critical'
@type="error"
...attributes ...attributes
as |notice|> as |T|>
<notice.Header> <T.Title>Error!</T.Title>
<strong>Error!</strong> <T.Description>
</notice.Header>
<notice.Body>
<p>
There was an error invalidating the Lock Session. There was an error invalidating the Lock Session.
{{#if (and @error.status @error.detail)}} {{#if (and @error.status @error.detail)}}
<br />{{@error.status}}: {{@error.detail}} <br />{{@error.status}}: {{@error.detail}}
{{/if}} {{/if}}
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{else}} {{else}}
<Notice <Hds::Toast
class="notification-delete" @color='success'
@type="success"
...attributes ...attributes
as |notice|> as |T|>
<notice.Header> <T.Title>Success!</T.Title>
<strong>Success!</strong> <T.Description>
</notice.Header>
<notice.Body>
<p>
Your Lock Session has been invalidated. Your Lock Session has been invalidated.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{/if}} {{/if}}
{{else if (eq @type 'kv')}} {{else if (eq @type 'kv')}}
<Hds::Alert @type='inline' @color='warning' class='mb-3' data-test-session-warning as |A|> <Hds::Alert @type='inline' @color='warning' class='mb-3' data-test-session-warning as |A|>

18
ui/packages/consul-nspaces/app/components/consul/nspace/notifications/index.hbs
View File

@ -1,16 +1,8 @@
{{#if (eq @type 'remove')}} {{#if (eq @type 'remove')}}
<Notice <Hds::Toast @color='success'
class="notification-delete"
@type="success"
...attributes ...attributes
as |notice|> as |T|>
<notice.Header> <T.Title>Success!</T.Title>
<strong>Success!</strong> <T.Description>Your Namespace has been marked for deletion.</T.Description>
</notice.Header> </Hds::Toast>
<notice.Body>
<p>
Your Namespace has been marked for deletion.
</p>
</notice.Body>
</Notice>
{{/if}} {{/if}}

19
ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs
View File

@ -1,16 +1,11 @@
{{#if (eq @type 'remove')}} {{#if (eq @type 'remove')}}
<Notice <Hds::Toast
class="notification-delete" @color='success'
@type="success"
...attributes ...attributes
as |notice|> as |T|>
<notice.Header> <T.Title>Success!</T.Title>
<strong>Success!</strong> <T.Description>
</notice.Header>
<notice.Body>
<p>
Your Partition has been marked for deletion. Your Partition has been marked for deletion.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{/if}} {{/if}}

19
ui/packages/consul-peerings/app/components/consul/peer/notifications/index.hbs
View File

@ -1,16 +1,11 @@
{{#if (eq @type 'remove')}} {{#if (eq @type 'remove')}}
<Notice <Hds::Toast
class="notification-delete" @color='success'
@type="success"
...attributes ...attributes
as |notice|> as |T|>
<notice.Header> <T.Title>Success!</T.Title>
<strong>Success!</strong> <T.Description>
</notice.Header>
<notice.Body>
<p>
Your Peer has been marked for deletion. Your Peer has been marked for deletion.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{/if}} {{/if}}

11
ui/packages/consul-ui/app/components/app/index.scss
View File

@ -5,14 +5,10 @@
@extend %app-notifications; @extend %app-notifications;
} }
%app-notifications { %app-notifications {
display: flex;
flex-direction: column;
align-items: center;
position: fixed; position: fixed;
z-index: 50; z-index: 100;
top: -45px; bottom: 2rem;
left: 0; left: 1.5rem;
pointer-events: none; pointer-events: none;
} }
@ -125,7 +121,6 @@ main {
%main-nav-horizontal-toggle:checked + header > div > nav:first-of-type { %main-nav-horizontal-toggle:checked + header > div > nav:first-of-type {
left: calc(var(--chrome-width, 280px) * -1); left: calc(var(--chrome-width, 280px) * -1);
} }
%main-nav-horizontal-toggle ~ main .notifications,
%main-nav-horizontal-toggle ~ main { %main-nav-horizontal-toggle ~ main {
margin-left: var(--chrome-width, 280px); margin-left: var(--chrome-width, 280px);
} }

2
ui/packages/consul-ui/app/components/app/notification/index.hbs
View File

@ -1,5 +1,5 @@
<div <div
class="app-notification" class='app-notification'
...attributes ...attributes
{{style {{style
(array (array

38
ui/packages/consul-ui/app/components/consul/intention/form/index.hbs
View File

@ -16,42 +16,32 @@ as |api|>
<BlockSlot @name="error" as |after|> <BlockSlot @name="error" as |after|>
{{#if (string-starts-with api.error.detail 'duplicate intention found:')}} {{#if (string-starts-with api.error.detail 'duplicate intention found:')}}
<Notice <Hds::Toast
@color='critical'
{{notification {{notification
after=(action after) after=(action after)
}} }}
class="notification-update" as |T|>
@type="error" <T.Title>Intention exists!</T.Title>
as |notice|> <T.Description>
<notice.Header>
<strong>Intention exists!</strong>
</notice.Header>
<notice.Body>
<p>
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. 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.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{else}} {{else}}
<Notice <Hds::Toast
@color='critical'
{{notification {{notification
after=(action after) after=(action after)
}} }}
class="notification-update" as |T|>
@type="error" <T.Title>Error!</T.Title>
as |notice|> <T.Description>
<notice.Header>
<strong>Error!</strong>
</notice.Header>
<notice.Body>
<p>
There was an error saving your intention. There was an error saving your intention.
{{#if (and api.error.status api.error.detail)}} {{#if (and api.error.status api.error.detail)}}
<br />{{api.error.status}}: {{api.error.detail}} <br />{{api.error.status}}: {{api.error.detail}}
{{/if}} {{/if}}
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{/if}} {{/if}}
</BlockSlot> </BlockSlot>

9
ui/packages/consul-ui/app/components/consul/intention/list/components.scss
View File

@ -15,13 +15,4 @@
td.intent- strong { td.intent- strong {
@extend %pill-l7; @extend %pill-l7;
} }
.notice.allow {
@extend %notice-success;
}
.notice.deny {
@extend %notice-error;
}
.notice.permissions {
@extend %notice-info;
}
} }

19
ui/packages/consul-ui/app/components/data-loader/index.hbs
View File

@ -56,22 +56,13 @@
{{#yield-slot name="disconnected" params=(block-params (action dispatch "RESET"))}} {{#yield-slot name="disconnected" params=(block-params (action dispatch "RESET"))}}
{{yield api}} {{yield api}}
{{else}} {{else}}
<Notice <Hds::Toast @color='warning'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>An error was returned whilst loading this data, refresh to try again.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
An error was returned whilst loading this data, refresh to try again.
</p>
</notice.Body>
</Notice>
{{/yield-slot}} {{/yield-slot}}
{{/if}} {{/if}}
</State> </State>

61
ui/packages/consul-ui/app/components/data-writer/index.hbs
View File

@ -39,22 +39,14 @@ as |after|}}
{{#yield-slot name="removed" params=(block-params after)}} {{#yield-slot name="removed" params=(block-params after)}}
{{yield api}} {{yield api}}
{{else}} {{else}}
<Notice <Hds::Toast
@color='success'
{{notification {{notification
after=(action after) after=(action after)
}} }} as |T|>
class="notification-delete" <T.Title>Success!</T.Title>
@type="success" <T.Description>Your {{or label type}} has been deleted.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Success!</strong>
</notice.Header>
<notice.Body>
<p>
Your {{or label type}} has been deleted.
</p>
</notice.Body>
</Notice>
{{/yield-slot}} {{/yield-slot}}
{{/let}} {{/let}}
</State> </State>
@ -66,22 +58,14 @@ as |after|}}
{{#yield-slot name="persisted" params=(block-params after)}} {{#yield-slot name="persisted" params=(block-params after)}}
{{yield api}} {{yield api}}
{{else}} {{else}}
<Notice <Hds::Toast
@color='success'
{{notification {{notification
after=(action after) after=(action after)
}} }} as |T|>
class="notification-update" <T.Title>Success!</T.Title>
@type="success" <T.Description>Your {{or label type}} has been saved.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Success!</strong>
</notice.Header>
<notice.Body>
<p>
Your {{or label type}} has been saved.
</p>
</notice.Body>
</Notice>
{{/yield-slot}} {{/yield-slot}}
{{/let}} {{/let}}
</State> </State>
@ -93,27 +77,20 @@ as |after|}}
{{#yield-slot name="error" params=(block-params after api.error)}} {{#yield-slot name="error" params=(block-params after api.error)}}
{{yield api}} {{yield api}}
{{else}} {{else}}
<Notice <Hds::Toast
@color='critical'
{{notification {{notification
after=(action after) after=(action after)
}} }} as |T|>
class="notification-update" <T.Title>Error!</T.Title>
@type="error" <T.Description>There was an error saving your {{or label type}}.
as |notice|>
<notice.Header>
<strong>Error!</strong>
</notice.Header>
<notice.Body>
<p>
There was an error saving your {{or label type}}.
{{#if (and api.error.status api.error.detail)}} {{#if (and api.error.status api.error.detail)}}
<br />{{api.error.status}}: {{api.error.detail}} <br />{{api.error.status}}: {{api.error.detail}}
{{else if api.error.message}} {{else if api.error.message}}
<br />{{api.error.message}} <br />{{api.error.message}}
{{/if}} {{/if}}
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{/yield-slot}} {{/yield-slot}}
{{/let}} {{/let}}
</State> </State>

24
ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
View File

@ -7,20 +7,12 @@
{{{flash.dom}}} {{{flash.dom}}}
{{else}} {{else}}
{{#let (lowercase flash.type) (lowercase flash.action) as |status type|}} {{#let (lowercase flash.type) (lowercase flash.action) as |status type|}}
<Notice <Hds::Toast
role='alert' @color={{if (eq status 'error') 'critical' status}}
class={{concat status ' notification-' type}}
data-notification data-notification
@type={{status}} as |T|>
as |notice| <T.Title>{{capitalize status}}!</T.Title>
> <T.Description>
<notice.Header>
<strong>
{{capitalize status}}!
</strong>
</notice.Header>
<notice.Body>
<p>
{{#if (eq type 'logout')}} {{#if (eq type 'logout')}}
{{#if (eq status 'success')}} {{#if (eq status 'success')}}
You are now logged out. You are now logged out.
@ -64,9 +56,9 @@
/> />
{{/if}} {{/if}}
{{/if}} {{/if}}
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{/let}} {{/let}}
{{/if}} {{/if}}
</app.Notification> </app.Notification>

50
ui/packages/consul-ui/app/components/notice/README.mdx
View File

@ -1,50 +0,0 @@
# Notice
Presentational component for informational/warning/error banners/notices.
```hbs preview-template
<Notice
@type={{this.type}}
as |notice|>
<notice.Header>
<h3>Header</h3>
</notice.Header>
<notice.Body>
<p>
Body
</p>
</notice.Body>
<notice.Footer>
<p>
<a href="">Footer link</a>
</p>
</notice.Footer>
</Notice>
<figure>
<figcaption>Provide a widget to change the <code>@type</code></figcaption>
<select
onchange={{action (mut this.type) value="target.value"}}
>
<option>info</option>
<option>success</option>
<option>warning</option>
<option>error</option>
</select>
</figure>
```
## Arguments
| Argument/Attribute | Type | Default | Description |
| --- | --- | --- | --- |
| `type` | `String` | `info` | Type of notice [info\|warning\|error] |
## See
- [Template Source Code](./index.hbs)
---

10
ui/packages/consul-ui/app/components/notice/index.hbs
View File

@ -1,10 +0,0 @@
<div
class="notice {{or @type 'info'}}"
...attributes
>
{{yield (hash
Header=(component 'anonymous' tagName="header")
Body=(component 'anonymous')
Footer=(component 'anonymous' tagName="footer")
)}}
</div>

31
ui/packages/consul-ui/app/components/notice/index.scss
View File

@ -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;
}

24
ui/packages/consul-ui/app/components/notice/layout.scss
View File

@ -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;
}

77
ui/packages/consul-ui/app/components/notice/skin.scss
View File

@ -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);
}

21
ui/packages/consul-ui/app/modifiers/notification.mdx
View File

@ -7,24 +7,17 @@ like the below:
```hbs preview-template ```hbs preview-template
<figure> <figure>
<figcaption>Attach a Warning notice to the top of the app ^^^</figcaption> <figcaption>Attach a Warning notice to the top of the app ^^^</figcaption>
<Hds::Toast
<Notice @color='warning'
class="notification-update"
@type="warning"
{{notification {{notification
sticky=true sticky=true
}} }}
as |notice|> as |T|>
<notice.Header> <T.Title>Warning!</T.Title>
<strong>Warning!</strong> <T.Description>
</notice.Header>
<notice.Body>
<p>
This service has been deregistered and no longer exists in the catalog. This service has been deregistered and no longer exists in the catalog.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
</figure> </figure>
``` ```

1
ui/packages/consul-ui/app/styles/components.scss
View File

@ -66,7 +66,6 @@
@import 'consul-ui/components/inline-code'; @import 'consul-ui/components/inline-code';
@import 'consul-ui/components/overlay'; @import 'consul-ui/components/overlay';
@import 'consul-ui/components/tooltip'; @import 'consul-ui/components/tooltip';
@import 'consul-ui/components/notice';
@import 'consul-ui/components/modal-dialog'; @import 'consul-ui/components/modal-dialog';
@import 'consul-ui/components/list-collection'; @import 'consul-ui/components/list-collection';
@import 'consul-ui/components/filter-bar'; @import 'consul-ui/components/filter-bar';

3
ui/packages/consul-ui/app/styles/layout.scss
View File

@ -79,9 +79,6 @@ html[data-route='dc.services.index'] .consul-service-list ul,
.consul-auth-method-list ul { .consul-auth-method-list ul {
@extend %list-after-filter-bar; @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 // TODO: This shouldn't be done here, decide the best way to do this
// %main-decoration ? %main-skin ? %content-skin ? // %main-decoration ? %main-skin ? %content-skin ?

69
ui/packages/consul-ui/app/templates/dc/kv/index.hbs
View File

@ -30,56 +30,35 @@ as |route|>
</BlockSlot> </BlockSlot>
<BlockSlot @name="disconnected" as |after|> <BlockSlot @name="disconnected" as |after|>
{{#if (eq loader.error.status "404")}} {{#if (eq loader.error.status "404")}}
<Notice <Hds::Toast
{{notification @color='warning'
sticky=true {{notification sticky=true}}
}} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>
as |notice|>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
This KV or parent of this KV was deleted. This KV or parent of this KV was deleted.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{else if (eq loader.error.status "403")}} {{else if (eq loader.error.status "403")}}
<Notice <Hds::Toast
{{notification @color='critical'
sticky=true {{notification sticky=true}}
}} as |T|>
class="notification-update" <T.Title>Error!</T.Title>
@type="error" <T.Description>
as |notice|>
<notice.Header>
<strong>Error!</strong>
</notice.Header>
<notice.Body>
<p>
You no longer have access to this KV. You no longer have access to this KV.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{else}} {{else}}
<Notice <Hds::Toast
{{notification @color='warning'
sticky=true {{notification sticky=true}}
}} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>
as |notice|>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
An error was returned whilst loading this data, refresh to try again. An error was returned whilst loading this data, refresh to try again.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{/if}} {{/if}}
</BlockSlot> </BlockSlot>

60
ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
View File

@ -29,56 +29,32 @@ as |route|>
<BlockSlot @name="disconnected" as |after|> <BlockSlot @name="disconnected" as |after|>
{{#if (eq loader.error.status "404")}} {{#if (eq loader.error.status "404")}}
<Notice <Hds::Toast
@color='warning'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>This node no longer exists in the catalog.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
This node no longer exists in the catalog.
</p>
</notice.Body>
</Notice>
{{else if (eq loader.error.status "403")}} {{else if (eq loader.error.status "403")}}
<Notice <Hds::Toast
@color='critical'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Error!</T.Title>
@type="error" <T.Description>You no longer have access to this node.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Error!</strong>
</notice.Header>
<notice.Body>
<p>
You no longer have access to this node
</p>
</notice.Body>
</Notice>
{{else}} {{else}}
<Notice <Hds::Toast
@color='warning'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>An error was returned whilst loading this data, refresh to try again.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
An error was returned whilst loading this data, refresh to try again.
</p>
</notice.Body>
</Notice>
{{/if}} {{/if}}
</BlockSlot> </BlockSlot>
<BlockSlot @name="loaded"> <BlockSlot @name="loaded">

56
ui/packages/consul-ui/app/templates/dc/services/instance.hbs
View File

@ -21,43 +21,35 @@
<BlockSlot @name='disconnected' as |after|> <BlockSlot @name='disconnected' as |after|>
{{#if (eq loader.error.status '404')}} {{#if (eq loader.error.status '404')}}
<Notice <Hds::Toast
@color='warning'
{{notification sticky=true}} {{notification sticky=true}}
class='notification-update' as |T|>
@type='warning' <T.Title>Warning!</T.Title>
as |notice| <T.Description>
>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
This service has been deregistered and no longer exists in the catalog. This service has been deregistered and no longer exists in the catalog.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{else if (eq loader.error.status '403')}} {{else if (eq loader.error.status '403')}}
<Notice {{notification sticky=true}} class='notification-update' @type='error' as |notice|> <Hds::Toast
<notice.Header> @color='critical'
<strong>Error!</strong> {{notification sticky=true}}
</notice.Header> as |T|>
<notice.Body> <T.Title>Error!</T.Title>
<p> <T.Description>
You no longer have access to this service You no longer have access to this service.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{else}} {{else}}
<Notice {{notification sticky=true}} class='notification-update' @type='error' as |notice|> <Hds::Toast
<notice.Header> @color='critical'
<strong>Warning!</strong> {{notification sticky=true}}
</notice.Header> as |T|>
<notice.Body> <T.Title>Warning!</T.Title>
<p> <T.Description>
An error was returned whilst loading this data, refresh to try again. An error was returned whilst loading this data, refresh to try again.
</p> </T.Description>
</notice.Body> </Hds::Toast>
</Notice>
{{/if}} {{/if}}
</BlockSlot> </BlockSlot>

60
ui/packages/consul-ui/app/templates/dc/services/show.hbs
View File

@ -22,56 +22,32 @@ as |route|>
<BlockSlot @name="disconnected" as |after|> <BlockSlot @name="disconnected" as |after|>
{{#if (eq loader.error.status "404")}} {{#if (eq loader.error.status "404")}}
<Notice <Hds::Toast
@color='warning'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>This service has been deregistered and no longer exists in the catalog.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
This service has been deregistered and no longer exists in the catalog.
</p>
</notice.Body>
</Notice>
{{else if (eq loader.error.status "403")}} {{else if (eq loader.error.status "403")}}
<Notice <Hds::Toast
@color='critical'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Error!</T.Title>
@type="error" <T.Description>You no longer have access to this service.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Error!</strong>
</notice.Header>
<notice.Body>
<p>
You no longer have access to this service
</p>
</notice.Body>
</Notice>
{{else}} {{else}}
<Notice <Hds::Toast
@color='warning'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>An error was returned whilst loading this data, refresh to try again.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
An error was returned whilst loading this data, refresh to try again.
</p>
</notice.Body>
</Notice>
{{/if}} {{/if}}
</BlockSlot> </BlockSlot>

57
ui/packages/consul-ui/app/templates/dc/show/license.hbs
View File

@ -24,56 +24,29 @@ as |item|}}
<BlockSlot @name="disconnected" as |after|> <BlockSlot @name="disconnected" as |after|>
{{#if (eq loader.error.status "404")}} {{#if (eq loader.error.status "404")}}
<Notice <Hds::Toast @color='warning'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>This service has been deregistered and no longer exists in the catalog.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
This service has been deregistered and no longer exists in the catalog.
</p>
</notice.Body>
</Notice>
{{else if (eq loader.error.status "403")}} {{else if (eq loader.error.status "403")}}
<Notice <Hds::Toast @color='critical'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Error!</T.Title>
@type="error" <T.Description>You no longer have access to this service.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Error!</strong>
</notice.Header>
<notice.Body>
<p>
You no longer have access to this service
</p>
</notice.Body>
</Notice>
{{else}} {{else}}
<Notice <Hds::Toast @color='warning'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>An error was returned whilst loading this data, refresh to try again.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
An error was returned whilst loading this data, refresh to try again.
</p>
</notice.Body>
</Notice>
{{/if}} {{/if}}
</BlockSlot> </BlockSlot>

60
ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs
View File

@ -24,56 +24,32 @@ as |item|}}
<BlockSlot @name="disconnected" as |after|> <BlockSlot @name="disconnected" as |after|>
{{#if (eq loader.error.status "404")}} {{#if (eq loader.error.status "404")}}
<Notice <Hds::Toast
@color='warning'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>This service has been deregistered and no longer exists in the catalog.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
This service has been deregistered and no longer exists in the catalog.
</p>
</notice.Body>
</Notice>
{{else if (eq loader.error.status "403")}} {{else if (eq loader.error.status "403")}}
<Notice <Hds::Toast
@color='critical'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Error!</T.Title>
@type="error" <T.Description>You no longer have access to this service.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Error!</strong>
</notice.Header>
<notice.Body>
<p>
You no longer have access to this service
</p>
</notice.Body>
</Notice>
{{else}} {{else}}
<Notice <Hds::Toast
@color='warning'
{{notification {{notification
sticky=true sticky=true
}} }} as |T|>
class="notification-update" <T.Title>Warning!</T.Title>
@type="warning" <T.Description>An error was returned whilst loading this data, refresh to try again.</T.Description>
as |notice|> </Hds::Toast>
<notice.Header>
<strong>Warning!</strong>
</notice.Header>
<notice.Body>
<p>
An error was returned whilst loading this data, refresh to try again.
</p>
</notice.Body>
</Notice>
{{/if}} {{/if}}
</BlockSlot> </BlockSlot>

4
ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-existing.feature
View File

@ -41,8 +41,8 @@ Feature: dc / acls / policies / as many / add existing: Add existing policy
Name: Policy 2 Name: Policy 2
--- ---
Then the url should be /datacenter/acls/[Model]s Then the url should be /datacenter/acls/[Model]s
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
------------- -------------
| Model | | Model |

12
ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-new.feature
View File

@ -39,8 +39,8 @@ Feature: dc / acls / policies / as many / add new: Add new policy
Name: New-Policy Name: New-Policy
--- ---
Then the url should be /datacenter/acls/[Model]s Then the url should be /datacenter/acls/[Model]s
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
------------- -------------
| Model | | Model |
@ -62,8 +62,8 @@ Feature: dc / acls / policies / as many / add new: Add new policy
- ServiceName: New-Service-Identity - ServiceName: New-Service-Identity
--- ---
Then the url should be /datacenter/acls/[Model]s Then the url should be /datacenter/acls/[Model]s
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
------------- -------------
| Model | | Model |
@ -86,8 +86,8 @@ Feature: dc / acls / policies / as many / add new: Add new policy
Datacenter: datacenter Datacenter: datacenter
--- ---
Then the url should be /datacenter/acls/[Model]s Then the url should be /datacenter/acls/[Model]s
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
------------- -------------
| Model | | Model |

8
ui/packages/consul-ui/tests/acceptance/dc/acls/policies/create.feature
View File

@ -24,8 +24,8 @@ Feature: dc / acls / policies / create
Description: [Description] Description: [Description]
--- ---
Then the url should be /datacenter/acls/policies Then the url should be /datacenter/acls/policies
And "[data-notification]" has the "notification-create" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
--------------------------- ---------------------------
| Description | | Description |
@ -46,5 +46,5 @@ Feature: dc / acls / policies / create
- Namespace - Namespace
--- ---
Then the url should be /datacenter/acls/policies Then the url should be /datacenter/acls/policies
And "[data-notification]" has the "notification-create" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

12
ui/packages/consul-ui/tests/acceptance/dc/acls/policies/delete.feature
View File

@ -15,8 +15,8 @@ Feature: dc / acls / policies / delete: Policy Delete
And I click delete on the policies And I click delete on the policies
And I click confirmDelete 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" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Deleting a policy model from the policies listing page errors 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 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 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 actions on the policies
And I click delete on the policies And I click delete on the policies
And I click confirmDelete on the policies And I click confirmDelete on the policies
And "[data-notification]" has the "notification-delete" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class
Scenario: Deleting a policy from the policy detail page Scenario: Deleting a policy from the policy detail page
When I visit the policy page for yaml 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 delete
And I click confirmDelete on the deleteModal 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" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
# FIXME # FIXME
# Scenario: Deleting a policy from the policy detail page errors # 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 # Given the url "/v1/acl/policy/1981f51d-301a-497b-89a0-05112ef02b4b?dc=datacenter&ns=@namespace" responds with a 500 status

12
ui/packages/consul-ui/tests/acceptance/dc/acls/policies/update.feature
View File

@ -37,8 +37,8 @@ Feature: dc / acls / policies / update: ACL Policy Update
--- ---
Then the url should be /datacenter/acls/policies Then the url should be /datacenter/acls/policies
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
| Name | Rules | Description | | 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 Given the url "/v1/acl/policy/policy-id" responds with a 500 status
And I submit And I submit
Then the url should be /datacenter/acls/policies/policy-id Then the url should be /datacenter/acls/policies/policy-id
Then "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class
@notNamespaceable @notNamespaceable
Scenario: Updating a simple ACL policy when Namespaces are disabled does not send Namespace 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 - Namespace
--- ---
Then the url should be /datacenter/acls/policies Then the url should be /datacenter/acls/policies
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

4
ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-existing.feature
View File

@ -46,5 +46,5 @@ Feature: dc / acls / roles / as many / add existing: Add existing
Name: Role 2 Name: Role 2
--- ---
Then the url should be /datacenter/acls/tokens Then the url should be /datacenter/acls/tokens
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

16
ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-new.feature
View File

@ -46,8 +46,8 @@ Feature: dc / acls / roles / as-many / add-new: Add new
ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1 ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1
--- ---
Then the url should be /datacenter/acls/tokens Then the url should be /datacenter/acls/tokens
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Add Role that has an existing Policy Scenario: Add Role that has an existing Policy
And I click "#new-role .ember-power-select-trigger" And I click "#new-role .ember-power-select-trigger"
And I click ".ember-power-select-option:first-child" 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 ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1
--- ---
Then the url should be /datacenter/acls/tokens Then the url should be /datacenter/acls/tokens
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Add Role and add a new Policy Scenario: Add Role and add a new Policy
And I click roles.form.policies.create And I click roles.form.policies.create
Then I fill in the roles.form.policies.form with yaml 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 ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1
--- ---
Then the url should be /datacenter/acls/tokens Then the url should be /datacenter/acls/tokens
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Add Role and add a new Service Identity Scenario: Add Role and add a new Service Identity
And I click roles.form.policies.create And I click roles.form.policies.create
Then I fill in the roles.form.policies.form with yaml 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 ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1
--- ---
Then the url should be /datacenter/acls/tokens Then the url should be /datacenter/acls/tokens
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
@ignore: @ignore:
Scenario: Click the cancel form Scenario: Click the cancel form
Then ok Then ok

9
ui/packages/consul-ui/tests/acceptance/dc/acls/roles/create.feature
View File

@ -24,8 +24,8 @@ Feature: dc / acls / roles / create
Description: [Description] Description: [Description]
--- ---
Then the url should be /datacenter/acls/roles Then the url should be /datacenter/acls/roles
And "[data-notification]" has the "notification-create" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
--------------------------- ---------------------------
| Description | | Description |
@ -45,6 +45,5 @@ Feature: dc / acls / roles / create
- Namespace - Namespace
--- ---
Then the url should be /datacenter/acls/roles Then the url should be /datacenter/acls/roles
And "[data-notification]" has the "notification-create" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

12
ui/packages/consul-ui/tests/acceptance/dc/acls/roles/update.feature
View File

@ -29,8 +29,8 @@ Feature: dc / acls / roles / update: ACL Role Update
Description: [Description] Description: [Description]
--- ---
Then the url should be /datacenter/acls/roles Then the url should be /datacenter/acls/roles
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
------------------------------------------ ------------------------------------------
| Name | Description | | 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 Given the url "/v1/acl/role/role-id" responds with a 500 status
And I submit And I submit
Then the url should be /datacenter/acls/roles/role-id Then the url should be /datacenter/acls/roles/role-id
Then "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class
@notNamespaceable @notNamespaceable
Scenario: Updating a simple ACL role when Namespaces are disabled does not send Namespace 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 - Namespace
--- ---
Then the url should be /datacenter/acls/roles Then the url should be /datacenter/acls/roles
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

8
ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/clone.feature
View File

@ -16,8 +16,8 @@ Feature: dc / acls / tokens / clone: Cloning an ACL token
And I click actions on the tokens And I click actions on the tokens
And I click clone 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 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Using an ACL token from the detail page Scenario: Using an ACL token from the detail page
When I visit the token page for yaml 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 And I click clone
Then the url should be /datacenter/acls/tokens Then the url should be /datacenter/acls/tokens
Then "[data-notification]" has the "notification-clone" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

8
ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/create.feature
View File

@ -21,8 +21,8 @@ Feature: dc / acls / tokens / create
Description: [Description] Description: [Description]
--- ---
Then the url should be /datacenter/acls/tokens Then the url should be /datacenter/acls/tokens
And "[data-notification]" has the "notification-create" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
--------------------------- ---------------------------
| Description | | Description |
@ -41,5 +41,5 @@ Feature: dc / acls / tokens / create
- Namespace - Namespace
--- ---
Then the url should be /datacenter/acls/tokens Then the url should be /datacenter/acls/tokens
And "[data-notification]" has the "notification-create" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

4
ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/own-no-delete.feature
View File

@ -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 actions on the tokens
And I click use on the tokens And I click use on the tokens
And I click confirmUse on the tokens And I click confirmUse on the tokens
Then "[data-notification]" has the "notification-use" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Then I have settings like yaml Then I have settings like yaml
--- ---
consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}" consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}"

12
ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/update.feature
View File

@ -26,8 +26,8 @@ Feature: dc / acls / tokens / update: ACL Token Update
Description: [Description] Description: [Description]
--- ---
Then the url should be /datacenter/acls/tokens Then the url should be /datacenter/acls/tokens
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
--------------------------- ---------------------------
| Description | | 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 Given the url "/v1/acl/token/key" responds with a 500 status
And I submit And I submit
Then the url should be /datacenter/acls/tokens/key Then the url should be /datacenter/acls/tokens/key
Then "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class
@notNamespaceable @notNamespaceable
Scenario: Updating a simple ACL token when Namespaces are disabled does not send Namespace 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 - Namespace
--- ---
Then the url should be /datacenter/acls/tokens Then the url should be /datacenter/acls/tokens
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

8
ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/use.feature
View File

@ -24,8 +24,8 @@ Feature: dc / acls / tokens / use: Using an ACL token
And I click actions on the tokens And I click actions on the tokens
And I click use on the tokens And I click use on the tokens
And I click confirmUse on the tokens And I click confirmUse on the tokens
Then "[data-notification]" has the "notification-use" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Then I have settings like yaml Then I have settings like yaml
--- ---
consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}" 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 use
And I click confirmUse And I click confirmUse
Then "[data-notification]" has the "notification-use" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Then I have settings like yaml Then I have settings like yaml
--- ---
consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}" consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}"

8
ui/packages/consul-ui/tests/acceptance/dc/intentions/create.feature
View File

@ -59,8 +59,8 @@ Feature: dc / intentions / create: Intention Create
--- ---
Then the url should be /datacenter/intentions Then the url should be /datacenter/intentions
And the title should be "Intentions - Consul" And the title should be "Intentions - Consul"
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
@notNamespaceable @notNamespaceable
Scenario: with namespaces disabled Scenario: with namespaces disabled
Given 1 datacenter model with the value "datacenter" 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 Then the url should be /datacenter/intentions
And the title should be "Intentions - Consul" And the title should be "Intentions - Consul"
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

17
ui/packages/consul-ui/tests/acceptance/dc/intentions/delete.feature
View File

@ -23,8 +23,8 @@ Feature: dc / intentions / deleting: Deleting items with confirmations, success
And I click delete on the intentionList.intentions And I click delete on the intentionList.intentions
And I click confirmInlineDelete 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" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Deleting an intention from the intention detail page Scenario: Deleting an intention from the intention detail page
When I visit the intention page for yaml 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 delete
And I click confirmDelete 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" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Deleting an intention from the intention detail page and getting an error Scenario: Deleting an intention from the intention detail page and getting an error
When I visit the intention page for yaml 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 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 delete
And I click confirmDelete And I click confirmDelete
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" 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 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 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 delete
And I click confirmDelete And I click confirmDelete
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class
And I see the text "Intention exists" in "[data-notification] strong"

8
ui/packages/consul-ui/tests/acceptance/dc/intentions/update.feature
View File

@ -33,8 +33,8 @@ Feature: dc / intentions / update: Intention Update
--- ---
Then the url should be /datacenter/intentions Then the url should be /datacenter/intentions
And the title should be "Intentions - Consul" And the title should be "Intentions - Consul"
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
------------------------------ ------------------------------
| Description | Action | | 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 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 And I submit
Then the url should be /datacenter/intentions/intention-id Then the url should be /datacenter/intentions/intention-id
Then "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class

8
ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature
View File

@ -16,8 +16,8 @@ Feature: dc / kvs / create
And I submit And I submit
Then the url should be /datacenter/kv Then the url should be /datacenter/kv
Then a PUT request was made to "/v1/kv/key-value?dc=datacenter&ns=@namespace" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Creating a folder Scenario: Creating a folder
Given 1 datacenter model with the value "datacenter" Given 1 datacenter model with the value "datacenter"
When I visit the kv page for yaml When I visit the kv page for yaml
@ -33,8 +33,8 @@ Feature: dc / kvs / create
And I submit And I submit
Then the url should be /datacenter/kv Then the url should be /datacenter/kv
Then a PUT request was made to "/v1/kv/key-value/?dc=datacenter&ns=@namespace" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Clicking create from within a folder Scenario: Clicking create from within a folder
Given 1 datacenter model with the value "datacenter" Given 1 datacenter model with the value "datacenter"
And 1 kv model from yaml And 1 kv model from yaml

12
ui/packages/consul-ui/tests/acceptance/dc/kvs/delete.feature
View File

@ -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 delete on the kvs
And I click confirmInlineDelete 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" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Deleting an kv from the kv detail page Scenario: Deleting an kv from the kv detail page
When I visit the kv page for yaml 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 delete
And I click confirmDelete And I click confirmDelete
Then a DELETE request was made to "/v1/kv/key-name?dc=datacenter&ns=@!namespace" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Deleting an kv from the kv detail page and getting an error Scenario: Deleting an kv from the kv detail page and getting an error
When I visit the kv page for yaml 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 Given the url "/v1/kv/key-name?dc=datacenter&ns=@!namespace" responds with a 500 status
And I click delete And I click delete
And I click confirmDelete And I click confirmDelete
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class

8
ui/packages/consul-ui/tests/acceptance/dc/kvs/sessions/invalidate.feature
View File

@ -21,12 +21,12 @@ Feature: dc / kvs / sessions / invalidate: Invalidate Lock Sessions
And I click confirmDelete on the session 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 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 Then the url should be /datacenter/kv/key/edit
And "[data-notification]" has the "notification-delete" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Invalidating a lock session and receiving an error 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 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 delete on the session
And I click confirmDelete on the session And I click confirmDelete on the session
Then the url should be /datacenter/kv/key/edit Then the url should be /datacenter/kv/key/edit
And "[data-notification]" has the "notification-delete" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class

20
ui/packages/consul-ui/tests/acceptance/dc/kvs/update.feature
View File

@ -23,8 +23,8 @@ Feature: dc / kvs / update: KV Update
--- ---
And I submit And I submit
Then a PUT request was made to "/v1/kv/[EncodedName]?dc=datacenter&ns=@!namespace&flags=12" with the body "[Value]" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
--------------------------------------------------------- ---------------------------------------------------------
| Name | EncodedName | Value | | 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 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 Then the url should be /datacenter/kv
And the title should be "Key / Value - Consul" And the title should be "Key / Value - Consul"
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Update to a key change value to '' Scenario: Update to a key change value to ''
And 1 kv model from yaml And 1 kv model from yaml
--- ---
@ -79,8 +79,8 @@ Feature: dc / kvs / update: KV Update
And I submit And I submit
Then a PUT request was made to "/v1/kv/key?dc=datacenter&ns=@!namespace&flags=12" with no body 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 Then the url should be /datacenter/kv
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Update to a key when the value is empty Scenario: Update to a key when the value is empty
And 1 kv model from yaml And 1 kv model from yaml
--- ---
@ -97,8 +97,8 @@ Feature: dc / kvs / update: KV Update
And I submit And I submit
Then a PUT request was made to "/v1/kv/key?dc=datacenter&ns=@!namespace&flags=12" with no body 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 Then the url should be /datacenter/kv
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: There was an error saving the key Scenario: There was an error saving the key
When I visit the kv page for yaml 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 Given the url "/v1/kv/key" responds with a 500 status
And I submit And I submit
Then the url should be /datacenter/kv/key/edit Then the url should be /datacenter/kv/key/edit
Then "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class
@ignore @ignore
Scenario: KV's with spaces are saved correctly Scenario: KV's with spaces are saved correctly
Then ok Then ok

8
ui/packages/consul-ui/tests/acceptance/dc/nodes/sessions/invalidate.feature
View File

@ -27,12 +27,12 @@ Feature: dc / nodes / sessions / invalidate: Invalidate Lock Sessions
And I click confirmDelete on the 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 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 Then the url should be /dc1/nodes/node-0/lock-sessions
And "[data-notification]" has the "notification-delete" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Invalidating a lock session and receiving an error 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 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 delete on the sessions
And I click confirmDelete on the sessions And I click confirmDelete on the sessions
Then the url should be /dc1/nodes/node-0/lock-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 "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class

12
ui/packages/consul-ui/tests/acceptance/dc/nspaces/delete.feature
View File

@ -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 delete on the [Listing]
And I click confirmDelete on the [Listing] And I click confirmDelete on the [Listing]
Then a [Method] request was made to "[URL]" Then a [Method] request was made to "[URL]"
And "[data-notification]" has the "notification-delete" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
-------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------
| Edit | Listing | Method | URL | Data | | 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 delete
And I click confirmDelete And I click confirmDelete
Then a DELETE request was made to "/v1/namespace/a-namespace?dc=datacenter" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Deleting a [Model] from the [Model] detail page with error Scenario: Deleting a [Model] from the [Model] detail page with error
When I visit the [Model] page for yaml 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 Given the url "[URL]" responds with a 500 status
And I click delete And I click delete
And I click confirmDelete And I click confirmDelete
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class
Where: Where:
------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------
| Model | Method | URL | Slug | | Model | Method | URL | Slug |

8
ui/packages/consul-ui/tests/acceptance/dc/nspaces/update.feature
View File

@ -28,8 +28,8 @@ Feature: dc / nspaces / update: Nspace Update
Description: [Description] Description: [Description]
--- ---
Then the url should be /datacenter/namespaces Then the url should be /datacenter/namespaces
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
--------------------------- ---------------------------
| Description | | Description |
@ -40,5 +40,5 @@ Feature: dc / nspaces / update: Nspace Update
Given the url "/v1/namespace/namespace?dc=datacenter" responds with a 500 status Given the url "/v1/namespace/namespace?dc=datacenter" responds with a 500 status
And I submit And I submit
Then the url should be /datacenter/namespaces/namespace Then the url should be /datacenter/namespaces/namespace
Then "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class

8
ui/packages/consul-ui/tests/acceptance/dc/peers/delete.feature
View File

@ -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 delete on the peers
And I click confirmDelete on the peers And I click confirmDelete on the peers
Then a DELETE request was made to "/v1/peering/peer-name" Then a DELETE request was made to "/v1/peering/peer-name"
And "[data-notification]" has the "notification-delete" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Scenario: Deleting a peer from the peer listing page with error Scenario: Deleting a peer from the peer listing page with error
Given 1 peer model from yaml 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 actions on the peers
And I click delete on the peers And I click delete on the peers
And I click confirmDelete on the peers And I click confirmDelete on the peers
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class
Scenario: A Peer currently deleting cannot be deleted Scenario: A Peer currently deleting cannot be deleted
Given 1 peer model from yaml Given 1 peer model from yaml
--- ---

4
ui/packages/consul-ui/tests/acceptance/dc/peers/establish.feature
View File

@ -26,6 +26,6 @@ Feature: dc / peers / establish: Peer Establish Peering
PeerName: new-peer PeerName: new-peer
PeeringToken: an-encoded-token PeeringToken: an-encoded-token
--- ---
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
And the url should be /dc-1/peers/new-peer/imported-services And the url should be /dc-1/peers/new-peer/imported-services

3
ui/packages/consul-ui/tests/acceptance/dc/services/show.feature
View File

@ -299,6 +299,7 @@ Feature: dc / services / show: Show Service
# authorization requests are not blocking so we just wait until the next # authorization requests are not blocking so we just wait until the next
# service blocking query responds # service blocking query responds
Then pause until I see the text "no longer have access" in "[data-notification]" 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" And I see status on the error like "403"

8
ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/create.feature
View File

@ -62,8 +62,8 @@ Feature: dc / services / intentions / create: Intention Create per Service
Action: deny Action: deny
--- ---
Then the url should be /datacenter/services/db/intentions Then the url should be /datacenter/services/db/intentions
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
@notNamespaceable @notNamespaceable
Scenario: with namespaces disabled Scenario: with namespaces disabled
Given 1 datacenter model with the value "datacenter" Given 1 datacenter model with the value "datacenter"
@ -104,5 +104,5 @@ Feature: dc / services / intentions / create: Intention Create per Service
Action: deny Action: deny
--- ---
Then the url should be /datacenter/services/db/intentions Then the url should be /datacenter/services/db/intentions
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

4
ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/index.feature
View File

@ -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 delete on the intentionList.intentions component
And I click confirmInlineDelete 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=dc1" 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

6
ui/packages/consul-ui/tests/acceptance/dc/services/show/topology/intentions.feature
View File

@ -36,7 +36,8 @@ Feature: dc / services / show / topology / intentions
--- ---
When I click ".consul-topology-metrics [data-test-action]" When I click ".consul-topology-metrics [data-test-action]"
And I click ".consul-topology-metrics [data-test-confirm]" 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 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 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 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]" When I click ".consul-topology-metrics [data-test-action]"
And I click ".consul-topology-metrics [data-test-confirm]" And I click ".consul-topology-metrics [data-test-confirm]"
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

12
ui/packages/consul-ui/tests/acceptance/deleting.feature
View File

@ -18,8 +18,8 @@ Feature: deleting: Deleting items with confirmations, success and error notifica
And I click delete on the [Listing] And I click delete on the [Listing]
And I click confirmDelete on the [Listing] And I click confirmDelete on the [Listing]
Then a [Method] request was made to "[URL]" Then a [Method] request was made to "[URL]"
And "[data-notification]" has the "notification-delete" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
| Edit | Listing | Method | URL | Data | | 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 delete
And I click confirmDelete And I click confirmDelete
Then a [Method] request was made to "[URL]" Then a [Method] request was made to "[URL]"
And "[data-notification]" has the "notification-delete" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class
Where: Where:
----------------------------------------------------------------------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------------------------------------------------------
| Model | Method | URL | Slug | | 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 Given the url "[URL]" responds with a 500 status
And I click delete And I click delete
And I click confirmDelete And I click confirmDelete
And "[data-notification]" has the "notification-delete" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "error" class And "[data-notification]" has the "hds-alert--color-critical" class
Where: Where:
----------------------------------------------------------------------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------------------------------------------------------
| Model | Method | URL | Slug | | Model | Method | URL | Slug |

4
ui/packages/consul-ui/tests/acceptance/login.feature
View File

@ -48,5 +48,5 @@ Feature: login
And I click ".okta-oidc-provider" 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" 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 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 "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class

4
ui/packages/consul-ui/tests/acceptance/settings/update.feature
View File

@ -18,6 +18,6 @@ Feature: settings / update: Update Settings
consul:token: '' consul:token: ''
--- ---
And the url should be /settings And the url should be /settings
And "[data-notification]" has the "notification-update" class And "[data-notification]" has the "hds-toast" class
And "[data-notification]" has the "success" class And "[data-notification]" has the "hds-alert--color-success" class