Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ui: Add copy button for Secret ID in Tokens list page #10735

Merged
merged 6 commits into from
Jul 30, 2021
Merged

ui: Add copy button for Secret ID in Tokens list page #10735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3170a65
Add a Secret ID copy button to token list
kaxcode Jul 30, 2021
2909cfd
Update the consul/tokens mock-api
kaxcode Jul 30, 2021
77c176c
Add additional secretID as a common consul translation
kaxcode Jul 30, 2021
e93e5ce
Add changelog
kaxcode Jul 30, 2021
091b4f7
Add computed func checking valid SecretID response
kaxcode Jul 30, 2021
1387259
Moved secretID translation to components translations file
kaxcode Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/10735.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:feature
ui: Adds a copy button to each composite row in tokens list page, if Secret ID returns an actual ID
```
5 changes: 2 additions & 3 deletions ui/packages/consul-ui/app/components/composite-row/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%composite-row {
display: grid;
grid-template-columns: auto 50px;
grid-template-columns: 1fr auto;
grid-template-rows: 50% 50%;

grid-template-areas:
Expand All @@ -25,8 +25,7 @@
}
%composite-row-actions {
grid-area: actions;
justify-self: center;
align-self: center;
display: inline-flex;
}

%composite-row-header:nth-last-child(2) {
Expand Down
9 changes: 8 additions & 1 deletion ui/packages/consul-ui/app/components/consul/token/list/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,14 @@ as |item|>
</dl>
</BlockSlot>
<BlockSlot @name="actions" as |Actions|>

{{#if item.hasSecretID}}
<CopyButton
@value={{item.SecretID}}
@name={{t "components.consul.token.secretID"}}
>
{{t "components.consul.token.secretID"}}
</CopyButton>
{{/if}}
<Actions as |Action|>
<Action data-test-edit-action @href={{href-to 'dc.acls.tokens.edit' item.AccessorID}}>
<BlockSlot @name="label">
Expand Down
5 changes: 5 additions & 0 deletions ui/packages/consul-ui/app/models/token.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,9 @@ export default class Token extends Model {
get isGlobalManagement() {
return (this.Policies || []).find(item => item.ID === MANAGEMENT_ID);
}

@computed('SecretID')
get hasSecretID() {
return this.SecretID !== '' && this.SecretID !== '<hidden>';
}
}
5 changes: 3 additions & 2 deletions ui/packages/consul-ui/mock-api/v1/acl/tokens
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ ${ env('CONSUL_ACLS_LEGACY', false) ? `rpc error making call: rpc: can't find me
return `
{
"AccessorID": "${i === 1 ? '00000000-0000-0000-0000-000000000002' : fake.random.uuid()}",
"SecretID": "${fake.helpers.randomize([fake.random.uuid(), '<hidden>', ''])}",
"Name": "token-${i}",
${typeof location.search.ns !== 'undefined' ? `
"Namespace": "${location.search.ns}",
` : ``}
"IDPName": "${fake.hacker.noun()}",
"Policies": [
${
range(env('CONSUL_POLICY_COUNT', 10)).map(
range(env('CONSUL_POLICY_COUNT', 3)).map(
function(item, j) {
if(i == 1 && j == 0) {
return `
Expand All @@ -44,7 +45,7 @@ ${typeof location.search.ns !== 'undefined' ? `
],
"Roles": [
${
range(env('CONSUL_ROLE_COUNT', 10)).map(
range(env('CONSUL_ROLE_COUNT', 3)).map(
function(item, j) {
return `
{
Expand Down
1 change: 1 addition & 0 deletions ui/packages/consul-ui/translations/components/consul/en-us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ token:
global-management: Global Management
global: Global Scope
local: Local Scope
secretID: Secret ID
policy:
search-bar:
kind:
Expand Down