Skip to content

Commit 05f32b6

Browse files
hellobontempohellobontempo
authored
UI: upgrade HDS to 4.12.0 (#28525)
* update hds to latest version * yield dropdown Interactive text instead of use @text arg, results after running codemod * remaining dropdown changes * address sidebar nav IconButton deprecation, fix secret tests * revert * explicitly select popupmenu * more test changes * fix pki toggle button * remove tracked prop in oidc client controller * aaand more test updates * change to tilde * tilde yarn lock changes * small cleanup items
1 parent bae0072 commit 05f32b6

File tree

67 files changed

+282
-419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+282
-419
lines changed

‎ui/app/components/sidebar/frame.hbs

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
/>
1919
</:logo>
2020
<:actions>
21-
<Hds::SideNav::Header::IconButton
21+
<Hds::Button
22+
@isIconOnly={{true}}
23+
@size="large"
2224
@icon="terminal-screen"
23-
@ariaLabel="Console toggle"
25+
@text="Console toggle"
2426
data-test-console-toggle
2527
{{on "click" (fn (mut this.console.isOpen) (not this.console.isOpen))}}
2628
/>

‎ui/app/components/sidebar/user-menu.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
as |Dropdown|
1313
>
1414
<Dropdown.Trigger data-test-user-menu-trigger>
15-
<Hds::SideNav::Header::IconButton @icon="user" @ariaLabel="User menu" />
15+
<Hds::Button @isIconOnly={{true}} @size="large" @icon="user" @text="User menu" />
1616
</Dropdown.Trigger>
1717
<Dropdown.Content>
1818
<div class="popup-menu-content" data-test-user-menu-content>

‎ui/app/controllers/vault/cluster/access/oidc/clients/client.js

-15
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,7 @@
55

66
import Controller from '@ember/controller';
77
import { service } from '@ember/service';
8-
import { tracked } from '@glimmer/tracking';
98

109
export default class OidcClientController extends Controller {
1110
@service router;
12-
@tracked isEditRoute;
13-
14-
constructor() {
15-
super(...arguments);
16-
this.router.on(
17-
'routeDidChange',
18-
({ targetName }) => (this.isEditRoute = targetName.includes('edit') ? true : false)
19-
);
20-
}
21-
22-
get showHeader() {
23-
// hide header when rendering the edit form
24-
return !this.isEditRoute;
25-
}
2611
}

‎ui/app/controllers/vault/cluster/access/oidc/keys/key.js

-14
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,7 @@
55

66
import Controller from '@ember/controller';
77
import { service } from '@ember/service';
8-
import { tracked } from '@glimmer/tracking';
98

109
export default class OidcKeyController extends Controller {
1110
@service router;
12-
@tracked isEditRoute;
13-
14-
constructor() {
15-
super(...arguments);
16-
this.router.on('routeDidChange', ({ targetName }) => {
17-
return (this.isEditRoute = targetName.includes('edit') ? true : false);
18-
});
19-
}
20-
21-
get showHeader() {
22-
// hide header when rendering the edit form
23-
return !this.isEditRoute;
24-
}
2511
}

‎ui/app/controllers/vault/cluster/access/oidc/providers/provider.js

-14
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,7 @@
55

66
import Controller from '@ember/controller';
77
import { service } from '@ember/service';
8-
import { tracked } from '@glimmer/tracking';
98

109
export default class OidcProviderController extends Controller {
1110
@service router;
12-
@tracked isEditRoute;
13-
14-
constructor() {
15-
super(...arguments);
16-
this.router.on('routeDidChange', ({ targetName }) => {
17-
return (this.isEditRoute = targetName.includes('edit') ? true : false);
18-
});
19-
}
20-
21-
get showHeader() {
22-
// hide header when rendering the edit form
23-
return !this.isEditRoute;
24-
}
2511
}

‎ui/app/styles/components/popup-menu.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
&:hover {
5656
background-color: $ui-gray-050;
5757
}
58-
div {
58+
div,
59+
span {
5960
margin-left: -$spacing-4;
6061
font-size: $size-7;
6162
font-weight: $font-weight-semibold;

‎ui/app/styles/core/element-styling.scss

-5
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,3 @@ label {
195195
cursor: not-allowed;
196196
}
197197
}
198-
199-
// TODO remove when HDS has released fix
200-
.hds-form-masked-input .hds-form-masked-input__toggle-button {
201-
margin-right: $spacing-12;
202-
}

‎ui/app/templates/components/generated-item-list.hbs

+6-9
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,17 @@
7979
data-test-popup-menu-trigger
8080
/>
8181
<dd.Interactive
82-
@text="View {{singularize @itemType}}"
8382
@route="vault.cluster.access.method.item.show"
8483
@models={{array @methodModel.id @itemType list.item.id}}
85-
/>
84+
>View {{singularize @itemType}}</dd.Interactive>
8685
<dd.Interactive
87-
@text="Edit {{singularize @itemType}}"
8886
@route="vault.cluster.access.method.item.edit"
8987
@models={{array @methodModel.id @itemType list.item.id}}
90-
/>
91-
<dd.Interactive
92-
@text="Delete {{singularize @itemType}}"
93-
@color="critical"
94-
{{on "click" (fn (mut this.itemToDelete) list.item)}}
95-
/>
88+
>Edit {{singularize @itemType}}</dd.Interactive>
89+
<dd.Interactive @color="critical" {{on "click" (fn (mut this.itemToDelete) list.item)}}>
90+
Delete
91+
{{singularize @itemType}}
92+
</dd.Interactive>
9693
</Hds::Dropdown>
9794
</Item.menu>
9895
{{#if (eq list.item this.itemToDelete)}}

‎ui/app/templates/components/identity/popup-alias.hbs

+3-6
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,26 @@
1212
data-test-popup-menu-trigger
1313
/>
1414
<dd.Interactive
15-
@text="Details"
1615
@route="vault.cluster.access.identity.aliases.show"
1716
@models={{array (pluralize @item.parentType) @item.id "details"}}
18-
/>
17+
>Details</dd.Interactive>
1918
{{#if @item.updatePath.isPending}}
2019
<dd.Generic class="has-text-center">
2120
<LoadingDropdownOption />
2221
</dd.Generic>
2322
{{else}}
2423
{{#if @item.canEdit}}
2524
<dd.Interactive
26-
@text="Edit"
2725
@route="vault.cluster.access.identity.aliases.edit"
2826
@models={{array (pluralize @item.parentType) @item.id}}
29-
/>
27+
>Edit</dd.Interactive>
3028
{{/if}}
3129
{{#if @item.canDelete}}
3230
<dd.Interactive
33-
@text="Remove"
3431
@color="critical"
3532
{{on "click" (fn (mut this.showConfirmModal) true)}}
3633
data-test-popup-menu="delete"
37-
/>
34+
>Remove</dd.Interactive>
3835
{{/if}}
3936
{{/if}}
4037
</Hds::Dropdown>

‎ui/app/templates/components/identity/popup-members.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@hasChevron={{false}}
1212
data-test-popup-menu-trigger
1313
/>
14-
<dd.Interactive @text="Remove" @color="critical" {{on "click" (fn (mut this.showConfirmModal) true)}} />
14+
<dd.Interactive @color="critical" {{on "click" (fn (mut this.showConfirmModal) true)}}>Remove</dd.Interactive>
1515
</Hds::Dropdown>
1616
</div>
1717

‎ui/app/templates/components/identity/popup-metadata.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="has-text-right">
77
<Hds::Dropdown @isInline={{true}} @listPosition="bottom-right" as |dd|>
88
<dd.ToggleIcon @icon="more-horizontal" @text="Metadata options" @hasChevron={{false}} data-test-popup-menu-trigger />
9-
<dd.Interactive @text="Remove" @color="critical" {{on "click" (fn (mut this.showConfirmModal) true)}} />
9+
<dd.Interactive @color="critical" {{on "click" (fn (mut this.showConfirmModal) true)}}>Remove</dd.Interactive>
1010
</Hds::Dropdown>
1111
</div>
1212

‎ui/app/templates/components/identity/popup-policy.hbs

+6-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111
@hasChevron={{false}}
1212
data-test-popup-menu-trigger
1313
/>
14-
<dd.Interactive @text="View policy" @route="vault.cluster.policy.show" @models={{array "acl" @policyName}} />
15-
<dd.Interactive @text="Edit policy" @route="vault.cluster.policy.edit" @models={{array "acl" @policyName}} />
16-
<dd.Interactive
17-
@text="Remove from {{@model.identityType}}"
18-
@color="critical"
19-
{{on "click" (fn (mut this.showConfirmModal) true)}}
20-
/>
14+
<dd.Interactive @route="vault.cluster.policy.show" @models={{array "acl" @policyName}}>View policy</dd.Interactive>
15+
<dd.Interactive @route="vault.cluster.policy.edit" @models={{array "acl" @policyName}}>Edit policy</dd.Interactive>
16+
<dd.Interactive @color="critical" {{on "click" (fn (mut this.showConfirmModal) true)}}>
17+
Remove from
18+
{{@model.identityType}}
19+
</dd.Interactive>
2120
</Hds::Dropdown>
2221
</div>
2322

‎ui/app/templates/components/mfa/login-enforcement-list-item.hbs

+2-4
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,15 @@
2727
data-test-popup-menu-trigger
2828
/>
2929
<dd.Interactive
30-
@text="Details"
3130
@route="vault.cluster.access.mfa.enforcements.enforcement"
3231
@model={{@model.name}}
3332
data-test-list-item-link="details"
34-
/>
33+
>Details</dd.Interactive>
3534
<dd.Interactive
36-
@text="Edit"
3735
@route="vault.cluster.access.mfa.enforcements.enforcement.edit"
3836
@model={{@model.name}}
3937
data-test-list-item-link="edit"
40-
/>
38+
>Edit</dd.Interactive>
4139
</Hds::Dropdown>
4240
</div>
4341
</div>

‎ui/app/templates/components/mfa/method-list-item.hbs

+2-4
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,15 @@
3838
data-test-popup-menu-trigger
3939
/>
4040
<dd.Interactive
41-
@text="Details"
4241
@route="vault.cluster.access.mfa.methods.method"
4342
@model={{@model.id}}
4443
data-test-mfa-method-menu-link="details"
45-
/>
44+
>Details</dd.Interactive>
4645
<dd.Interactive
47-
@text="Edit"
4846
@route="vault.cluster.access.mfa.methods.method.edit"
4947
@model={{@model.id}}
5048
data-test-mfa-method-menu-link="edit"
51-
/>
49+
>Edit</dd.Interactive>
5250
</Hds::Dropdown>
5351
</div>
5452
</div>

‎ui/app/templates/components/oidc/client-list.hbs

+2-4
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,17 @@
3434
/>
3535
{{#if client.canRead}}
3636
<dd.Interactive
37-
@text="Details"
3837
@route="vault.cluster.access.oidc.clients.client.details"
3938
@model={{client.name}}
4039
data-test-oidc-client-menu-link="details"
41-
/>
40+
>Details</dd.Interactive>
4241
{{/if}}
4342
{{#if client.canEdit}}
4443
<dd.Interactive
45-
@text="Edit"
4644
@route="vault.cluster.access.oidc.clients.client.edit"
4745
@model={{client.name}}
4846
data-test-oidc-client-menu-link="edit"
49-
/>
47+
>Edit</dd.Interactive>
5048
{{/if}}
5149
</Hds::Dropdown>
5250
{{/if}}

‎ui/app/templates/components/oidc/provider-list.hbs

+2-4
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,17 @@
3434
/>
3535
{{#if provider.canRead}}
3636
<dd.Interactive
37-
@text="Details"
3837
@route="vault.cluster.access.oidc.providers.provider.details"
3938
@model={{provider.name}}
4039
data-test-oidc-provider-menu-link="details"
41-
/>
40+
>Details</dd.Interactive>
4241
{{/if}}
4342
{{#if provider.canEdit}}
4443
<dd.Interactive
45-
@text="Edit"
4644
@route="vault.cluster.access.oidc.providers.provider.edit"
4745
@model={{provider.name}}
4846
data-test-oidc-provider-menu-link="edit"
49-
/>
47+
>Edit</dd.Interactive>
5048
{{/if}}
5149
</Hds::Dropdown>
5250
{{/if}}

‎ui/app/templates/components/raft-storage-overview.hbs

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
<dd.Interactive
1313
@href="/v1/sys/storage/raft/snapshot"
1414
@isHrefExternal={{false}}
15-
@text="Download"
1615
{{on "click" (action "downloadViaServiceWorker")}}
17-
/>
16+
>Download</dd.Interactive>
1817
{{else}}
19-
<dd.Interactive @text="Download" {{on "click" (action "downloadSnapshot")}} />
18+
<dd.Interactive {{on "click" (action "downloadSnapshot")}}>Download</dd.Interactive>
2019
{{/if}}
21-
<dd.Interactive @text="Restore" @route="vault.cluster.storage-restore" />
20+
<dd.Interactive @route="vault.cluster.storage-restore">Restore</dd.Interactive>
2221
</Hds::Dropdown>
2322
</PH.Actions>
2423
</Hds::PageHeader>

‎ui/app/templates/components/secret-list/aws-role-item.hbs

+4-8
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@
3636
</dd.Generic>
3737
{{else if @item.canGenerate}}
3838
<dd.Interactive
39-
@text="Generate credentials"
4039
@route="vault.cluster.secrets.backend.credentials"
4140
@model={{@item.id}}
4241
data-test-role-aws-link="generate"
43-
/>
42+
>Generate credentials</dd.Interactive>
4443
{{/if}}
4544
{{#if @item.updatePath.isPending}}
4645
<dd.Generic class="has-text-center">
@@ -49,27 +48,24 @@
4948
{{else}}
5049
{{#if @item.canRead}}
5150
<dd.Interactive
52-
@text="Details"
5351
@route="vault.cluster.secrets.backend.show"
5452
@model={{@item.id}}
5553
data-test-role-ssh-link="show"
56-
/>
54+
>Details</dd.Interactive>
5755
{{/if}}
5856
{{#if @item.canEdit}}
5957
<dd.Interactive
60-
@text="Edit"
6158
@route="vault.cluster.secrets.backend.edit"
6259
@model={{@item.id}}
6360
data-test-role-ssh-link="edit"
64-
/>
61+
>Edit</dd.Interactive>
6562
{{/if}}
6663
{{#if @item.canDelete}}
6764
<dd.Interactive
68-
@text="Delete"
6965
@color="critical"
7066
{{on "click" (fn (mut this.showConfirmModal) true)}}
7167
data-test-aws-role-delete={{@item.id}}
72-
/>
68+
>Delete</dd.Interactive>
7369
{{/if}}
7470
{{/if}}
7571
</Hds::Dropdown>

0 commit comments

Comments
 (0)