From da6192a3cd2704dc9f532ba80caa52820684f10d Mon Sep 17 00:00:00 2001
From: Susmitha Girumala
Date: Wed, 30 Sep 2020 12:18:12 -0400
Subject: [PATCH 1/3] feat: Make all ids copyable
---
ui/core/app/components/copyable/index.js | 1 -
ui/core/app/styles/app.scss | 3 ++-
.../scopes/scope/auth-methods/auth-method/-header.hbs | 4 +++-
.../auth-methods/auth-method/accounts/account/-header.hbs | 4 +++-
.../auth-method/accounts/account/set-password/-header.hbs | 4 +++-
.../scopes/scope/auth-methods/auth-method/accounts/index.hbs | 4 +++-
ui/core/app/templates/scopes/scope/auth-methods/index.hbs | 4 +++-
ui/core/app/templates/scopes/scope/groups/group/-header.hbs | 4 +++-
ui/core/app/templates/scopes/scope/groups/group/members.hbs | 4 +++-
ui/core/app/templates/scopes/scope/groups/index.hbs | 4 +++-
.../projects/project/host-catalogs/host-catalog/-header.hbs | 4 +++-
.../project/host-catalogs/host-catalog/host-sets/-header.hbs | 4 +++-
.../host-catalogs/host-catalog/host-sets/host-set/hosts.hbs | 4 +++-
.../project/host-catalogs/host-catalog/host-sets/index.hbs | 4 +++-
.../project/host-catalogs/host-catalog/hosts/-header.hbs | 4 +++-
.../project/host-catalogs/host-catalog/hosts/index.hbs | 4 +++-
.../scopes/scope/projects/project/host-catalogs/index.hbs | 4 +++-
ui/core/app/templates/scopes/scope/projects/project/index.hbs | 4 +++-
.../scopes/scope/projects/project/sessions/index.hbs | 4 +++-
.../templates/scopes/scope/projects/project/targets/index.hbs | 4 +++-
.../scopes/scope/projects/project/targets/target/-header.hbs | 4 +++-
.../scope/projects/project/targets/target/host-sets.hbs | 4 +++-
ui/core/app/templates/scopes/scope/roles/index.hbs | 4 +++-
ui/core/app/templates/scopes/scope/roles/role/-header.hbs | 4 +++-
.../app/templates/scopes/scope/roles/role/grants/-header.hbs | 4 +++-
ui/core/app/templates/scopes/scope/roles/role/principals.hbs | 4 +++-
.../templates/scopes/scope/roles/role/principals/-header.hbs | 4 +++-
ui/core/app/templates/scopes/scope/users/index.hbs | 4 +++-
ui/core/app/templates/scopes/scope/users/user/index.hbs | 4 +++-
29 files changed, 83 insertions(+), 29 deletions(-)
diff --git a/ui/core/app/components/copyable/index.js b/ui/core/app/components/copyable/index.js
index 01dcad838..cefc032fa 100644
--- a/ui/core/app/components/copyable/index.js
+++ b/ui/core/app/components/copyable/index.js
@@ -16,7 +16,6 @@ export default class CopyableComponent extends Component {
icon = 'copy-action';
@tracked text;
- @tracked clipboard;
/**
* A Ember Concurrency-based task that updates copy icon to a success state
diff --git a/ui/core/app/styles/app.scss b/ui/core/app/styles/app.scss
index 9e72b055f..dfe9fe1f9 100644
--- a/ui/core/app/styles/app.scss
+++ b/ui/core/app/styles/app.scss
@@ -82,5 +82,6 @@
}
.copyable .copyable-button {
- padding: 0rem;
+ padding: 0 sizing.rems(xxs);
+ margin: 0;
}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
index ba94f66be..0748ed7b8 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
@@ -1,3 +1,5 @@
{{t "resources.auth-method.title"}}
{{t "resources.auth-method.description"}}
-{{@model.id}}
+
+ {{@model.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
index 938c5fedb..c7a1ec474 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
@@ -1,2 +1,4 @@
{{t "resources.account.title"}}
-{{@model.id}}
\ No newline at end of file
+
+ {{@model.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
index 5c5ee4dd4..1805683a2 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
@@ -1,3 +1,5 @@
{{t "resources.account.title"}}
{{t 'resources.account.messages.set-password.description'}}
-{{@model.id}}
+
+ {{@model.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
index 81b93da9c..d399eb1d8 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
@@ -24,7 +24,9 @@
{{account.username}}
- {{account.id}}
+
+ {{account.id}}
+
{{/each}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
index e1c23f96f..26027d51b 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
@@ -46,7 +46,9 @@
- {{authMethod.id}}
+
+ {{authMethod.id}}
+
{{/each}}
diff --git a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
index ac1e772a0..a876cafac 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
@@ -1,3 +1,5 @@
{{t "resources.group.title"}}
{{t "resources.group.description"}}
-{{@model.id}}
+
+ {{@model.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/groups/group/members.hbs b/ui/core/app/templates/scopes/scope/groups/group/members.hbs
index 0b6dee825..ce5eee601 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/members.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/members.hbs
@@ -17,7 +17,9 @@
{{member.displayName}}
- {{member.id}}
+
+ {{member.id}}
+
{{group.description}}
- {{group.id}}
+
+ {{group.id}}
+
{{/each}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
index 77e14a09b..8857383a2 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
@@ -1,3 +1,5 @@
{{t "resources.host-catalog.title"}}
{{t "resources.host-catalog.description"}}
-{{@model.id}}
+
+ {{@model.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
index 752eae74c..26afcea96 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
@@ -1,3 +1,5 @@
{{t "resources.host-set.title"}}
{{t "resources.host-set.description"}}
-{{@model.id}}
+
+ {{@model.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
index abc6852da..7b65efa26 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
@@ -25,7 +25,9 @@
{{host.type}}
- {{host.id}}
+
+ {{host.id}}
+
- {{hostSet.id}}
+
+ {{hostSet.id}}
+
{{/each}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
index e8a7b9c8d..f0d679039 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
@@ -1,3 +1,5 @@
{{t "resources.host.title"}}
{{t "resources.host.description"}}
-{{@model.id}}
+
+ {{@model.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
index 3f1c23860..87ae8db1a 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
@@ -27,7 +27,9 @@
- {{host.id}}
+
+ {{host.id}}
+
{{host.attributes.address}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
index 578a59c4a..2f758b992 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
@@ -47,7 +47,9 @@
- {{hostCatalog.id}}
+
+ {{hostCatalog.id}}
+
{{/each}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/index.hbs
index 79c5e6e41..58395a683 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/index.hbs
@@ -7,7 +7,9 @@
{{t "resources.project.title"}}
{{t "resources.project.description"}}
- {{@model.id}}
+
+ {{@model.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
index a34ceb077..b4e5d3e4f 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
@@ -28,7 +28,9 @@
{{#each @model as |sessionAggregate|}}
- {{sessionAggregate.session.id}}
+
+ {{sessionAggregate.session.id}}
+
{{sessionAggregate.user.displayName}}
{{sessionAggregate.target.displayName}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
index d6e45da25..ff84ac48e 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
@@ -51,7 +51,9 @@
{{/if}}
- {{target.id}}
+
+ {{target.id}}
+
{{/each}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
index 280737623..b96093e47 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
@@ -1,3 +1,5 @@
{{t "resources.target.title"}}
{{t "resources.target.description"}}
-{{@model.id}}
+
+ {{@model.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
index 827793ccd..e03aa2610 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
@@ -22,7 +22,9 @@
{{t (concat 'resources.host-set.types.' hostSet.model.type)}}
- {{hostSet.model.id}}
+
+ {{hostSet.model.id}}
+
{{role.description}}
- {{role.id}}
+
+ {{role.id}}
+
{{/each}}
diff --git a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
index ccad156d5..926771735 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
@@ -1,3 +1,5 @@
{{t "resources.role.title"}}
{{t "resources.role.description"}}
-{{@model.id}}
+
+ {{@model.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
index aa96ca797..ccea2b2d0 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
@@ -1,3 +1,5 @@
{{t "resources.role.title"}}
{{t "resources.role.grant.description"}}
-{{@model.id}}
+
+ {{@model.id}}
+
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
index 73ac90715..58041d4a0 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
@@ -21,7 +21,9 @@
{{t (concat 'resources.role.principal.types.' principal.type)}}
- {{principal.model.id}}
+
+ {{principal.model.id}}
+
{{t "resources.role.title"}}
{{t "resources.role.principal.description"}}
-{{@model.role.id}}
+
+ {{@model.role.id}}
+
diff --git a/ui/core/app/templates/scopes/scope/users/index.hbs b/ui/core/app/templates/scopes/scope/users/index.hbs
index 26458d273..50bcd7b74 100644
--- a/ui/core/app/templates/scopes/scope/users/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/index.hbs
@@ -41,7 +41,9 @@
{{user.description}}
- {{user.id}}
+
+ {{user.id}}
+
{{/each}}
diff --git a/ui/core/app/templates/scopes/scope/users/user/index.hbs b/ui/core/app/templates/scopes/scope/users/user/index.hbs
index 35db006e9..7f9218f1b 100644
--- a/ui/core/app/templates/scopes/scope/users/user/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/index.hbs
@@ -7,7 +7,9 @@
{{t "resources.user.title"}}
{{t "resources.user.description"}}
- {{@model.id}}
+
+ {{@model.id}}
+
From 56b99a99a044dc5eb494f565740d0631070654e9 Mon Sep 17 00:00:00 2001
From: Randall Morey
Date: Wed, 30 Sep 2020 14:15:32 -0400
Subject: [PATCH 2/3] chore: tweak button position, a11y, and add button text
---
ui/core/app/components/copyable/index.hbs | 5 +++--
ui/core/app/styles/app.scss | 10 +++++++---
.../templates/scopes/scope/projects/project/index.hbs | 6 +++++-
ui/core/translations/actions/en-us.yaml | 3 ++-
ui/core/translations/states/en-us.yaml | 1 +
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ui/core/app/components/copyable/index.hbs b/ui/core/app/components/copyable/index.hbs
index 8d0a3df75..fc47d613c 100644
--- a/ui/core/app/components/copyable/index.hbs
+++ b/ui/core/app/components/copyable/index.hbs
@@ -1,7 +1,6 @@
{{#if this.isClipboardLibrarySupported}}
{{@text}}
+ title={{@buttonText}}
+ >{{@buttonText}}
{{else}}
{{yield}}
diff --git a/ui/core/app/styles/app.scss b/ui/core/app/styles/app.scss
index dfe9fe1f9..2cd923218 100644
--- a/ui/core/app/styles/app.scss
+++ b/ui/core/app/styles/app.scss
@@ -81,7 +81,11 @@
}
}
-.copyable .copyable-button {
- padding: 0 sizing.rems(xxs);
- margin: 0;
+.copyable {
+ .copyable-button {
+ position: relative;
+ top: -2px;
+ padding: 0 sizing.rems(xxs);
+ margin: 0;
+ }
}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/index.hbs
index 58395a683..0de5bb65c 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/index.hbs
@@ -7,7 +7,11 @@
{{t "resources.project.title"}}
{{t "resources.project.description"}}
-
+
{{@model.id}}
diff --git a/ui/core/translations/actions/en-us.yaml b/ui/core/translations/actions/en-us.yaml
index 7e7a9002a..9b1fa9751 100644
--- a/ui/core/translations/actions/en-us.yaml
+++ b/ui/core/translations/actions/en-us.yaml
@@ -7,6 +7,7 @@ save: Save
manage: Manage
help: Need help?
back: Back
+copy-to-clipboard: Copy to Clipboard
authenticate: Authenticate
deauthenticate: Deauthenticate
choose-org: Choose Scope
@@ -27,4 +28,4 @@ add-members: Add Members
add-hosts: Add Hosts
set-password: Set Password
change-password: Change Password
-edit-form: Edit Form
\ No newline at end of file
+edit-form: Edit Form
diff --git a/ui/core/translations/states/en-us.yaml b/ui/core/translations/states/en-us.yaml
index 585ed6a26..96b1fd92c 100644
--- a/ui/core/translations/states/en-us.yaml
+++ b/ui/core/translations/states/en-us.yaml
@@ -2,3 +2,4 @@ info: Info
success: Success
warning: Warning
error: Error
+copied: Copied
From ce2fb39f596e8469047fde67dff3a9821c50add0 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala
Date: Wed, 30 Sep 2020 22:15:30 -0400
Subject: [PATCH 3/3] refactor: Show acknowledgement text when copied using
copyabl
---
ui/core/app/components/copyable/index.hbs | 4 ++--
ui/core/app/components/copyable/index.js | 8 ++++----
.../scopes/scope/auth-methods/auth-method/-header.hbs | 6 +++++-
.../auth-methods/auth-method/accounts/account/-header.hbs | 6 +++++-
.../auth-method/accounts/account/set-password/-header.hbs | 6 +++++-
.../scope/auth-methods/auth-method/accounts/index.hbs | 6 +++++-
ui/core/app/templates/scopes/scope/auth-methods/index.hbs | 6 +++++-
.../app/templates/scopes/scope/groups/group/-header.hbs | 6 +++++-
.../app/templates/scopes/scope/groups/group/members.hbs | 6 +++++-
ui/core/app/templates/scopes/scope/groups/index.hbs | 6 +++++-
.../project/host-catalogs/host-catalog/-header.hbs | 6 +++++-
.../host-catalogs/host-catalog/host-sets/-header.hbs | 6 +++++-
.../host-catalog/host-sets/host-set/hosts.hbs | 6 +++++-
.../host-catalogs/host-catalog/host-sets/index.hbs | 6 +++++-
.../project/host-catalogs/host-catalog/hosts/-header.hbs | 6 +++++-
.../project/host-catalogs/host-catalog/hosts/index.hbs | 6 +++++-
.../scopes/scope/projects/project/host-catalogs/index.hbs | 6 +++++-
.../scopes/scope/projects/project/sessions/index.hbs | 6 +++++-
.../scopes/scope/projects/project/targets/index.hbs | 6 +++++-
.../scope/projects/project/targets/target/-header.hbs | 6 +++++-
.../scope/projects/project/targets/target/host-sets.hbs | 6 +++++-
ui/core/app/templates/scopes/scope/roles/index.hbs | 6 +++++-
ui/core/app/templates/scopes/scope/roles/role/-header.hbs | 6 +++++-
.../templates/scopes/scope/roles/role/grants/-header.hbs | 6 +++++-
.../app/templates/scopes/scope/roles/role/principals.hbs | 6 +++++-
.../scopes/scope/roles/role/principals/-header.hbs | 8 ++++++--
ui/core/app/templates/scopes/scope/users/index.hbs | 6 +++++-
ui/core/app/templates/scopes/scope/users/user/index.hbs | 6 +++++-
ui/core/tests/integration/components/copyable-test.js | 2 +-
29 files changed, 138 insertions(+), 34 deletions(-)
diff --git a/ui/core/app/components/copyable/index.hbs b/ui/core/app/components/copyable/index.hbs
index fc47d613c..499c4fc43 100644
--- a/ui/core/app/components/copyable/index.hbs
+++ b/ui/core/app/components/copyable/index.hbs
@@ -15,8 +15,8 @@
class="copyable-button"
@style="ghost"
@iconOnly={{this.icon}}
- title={{@buttonText}}
- >{{@buttonText}}
+ title={{this.copyableButtonText}}
+ >{{this.copyableButtonText}}
{{else}}
{{yield}}
diff --git a/ui/core/app/components/copyable/index.js b/ui/core/app/components/copyable/index.js
index cefc032fa..010c12758 100644
--- a/ui/core/app/components/copyable/index.js
+++ b/ui/core/app/components/copyable/index.js
@@ -1,7 +1,6 @@
import Component from '@glimmer/component';
import ClipboardJS from 'clipboard';
import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
import { generateComponentID } from 'rose/utilities/component-auto-id';
import { task, timeout } from 'ember-concurrency';
import { set } from '@ember/object';
@@ -12,10 +11,9 @@ export default class CopyableComponent extends Component {
// =attributes
id = generateComponentID();
- copyableButtonId = `copyable-button-${this.id}`;
icon = 'copy-action';
-
- @tracked text;
+ copyableButtonId = `copyable-button-${this.id}`;
+ copyableButtonText = this.args.buttonText;
/**
* A Ember Concurrency-based task that updates copy icon to a success state
@@ -29,8 +27,10 @@ export default class CopyableComponent extends Component {
*/
@task(function * () {
set(this, 'icon', 'copy-success');
+ set(this, 'copyableButtonText', this.args.acknowledgeText);
yield timeout(1000);
set(this, 'icon', 'copy-action');
+ set(this, 'copyableButtonText', this.args.buttonText);
}).drop() successIconTimer;
// =methods
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
index 0748ed7b8..bd1bc825e 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
@@ -1,5 +1,9 @@
{{t "resources.auth-method.title"}}
{{t "resources.auth-method.description"}}
-
+
{{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
index c7a1ec474..d67dca8b1 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
@@ -1,4 +1,8 @@
{{t "resources.account.title"}}
-
+
{{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
index 1805683a2..c7d1d4670 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
@@ -1,5 +1,9 @@
{{t "resources.account.title"}}
{{t 'resources.account.messages.set-password.description'}}
-
+
{{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
index d399eb1d8..195e5a00b 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
@@ -24,7 +24,11 @@
{{account.username}}
-
+
{{account.id}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
index 26027d51b..08b4606fe 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
@@ -46,7 +46,11 @@
-
+
{{authMethod.id}}
diff --git a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
index a876cafac..ae241529b 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
@@ -1,5 +1,9 @@
{{t "resources.group.title"}}
{{t "resources.group.description"}}
-
+
{{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/groups/group/members.hbs b/ui/core/app/templates/scopes/scope/groups/group/members.hbs
index ce5eee601..a478d6b83 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/members.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/members.hbs
@@ -17,7 +17,11 @@
{{member.displayName}}
-
+
{{member.id}}
diff --git a/ui/core/app/templates/scopes/scope/groups/index.hbs b/ui/core/app/templates/scopes/scope/groups/index.hbs
index 9f9ad3fd2..559fb8314 100644
--- a/ui/core/app/templates/scopes/scope/groups/index.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/index.hbs
@@ -39,7 +39,11 @@
{{group.description}}
-
+
{{group.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
index 8857383a2..647741ad9 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
@@ -1,5 +1,9 @@
{{t "resources.host-catalog.title"}}
{{t "resources.host-catalog.description"}}
-
+
{{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
index 26afcea96..3c76eafd3 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
@@ -1,5 +1,9 @@
{{t "resources.host-set.title"}}
{{t "resources.host-set.description"}}
-
+
{{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
index 7b65efa26..74cbbe2bb 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
@@ -25,7 +25,11 @@
{{host.type}}
-
+
{{host.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
index f2dff570d..bb5f4c14c 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
@@ -26,7 +26,11 @@
-
+
{{hostSet.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
index f0d679039..d2628a102 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
@@ -1,5 +1,9 @@
{{t "resources.host.title"}}
{{t "resources.host.description"}}
-
+
{{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
index 87ae8db1a..e29e8dca1 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
@@ -27,7 +27,11 @@
-
+
{{host.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
index 2f758b992..0a70b3ee4 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
@@ -47,7 +47,11 @@
-
+
{{hostCatalog.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
index b4e5d3e4f..16fc16a1c 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
@@ -28,7 +28,11 @@
{{#each @model as |sessionAggregate|}}
-
+
{{sessionAggregate.session.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
index ff84ac48e..2cb938f29 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
@@ -51,7 +51,11 @@
{{/if}}
-
+
{{target.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
index b96093e47..b6f507ea4 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
@@ -1,5 +1,9 @@
{{t "resources.target.title"}}
{{t "resources.target.description"}}
-
+
{{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
index e03aa2610..f6e32b99a 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
@@ -22,7 +22,11 @@
{{t (concat 'resources.host-set.types.' hostSet.model.type)}}
-
+
{{hostSet.model.id}}
diff --git a/ui/core/app/templates/scopes/scope/roles/index.hbs b/ui/core/app/templates/scopes/scope/roles/index.hbs
index 417860216..77c5d7d6a 100644
--- a/ui/core/app/templates/scopes/scope/roles/index.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/index.hbs
@@ -41,7 +41,11 @@
{{role.description}}
-
+
{{role.id}}
diff --git a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
index 926771735..03164c9b2 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
@@ -1,5 +1,9 @@
{{t "resources.role.title"}}
{{t "resources.role.description"}}
-
+
{{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
index ccea2b2d0..48e974188 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
@@ -1,5 +1,9 @@
{{t "resources.role.title"}}
{{t "resources.role.grant.description"}}
-
+
{{@model.id}}
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
index 58041d4a0..668b93e4f 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
@@ -21,7 +21,11 @@
{{t (concat 'resources.role.principal.types.' principal.type)}}
-
+
{{principal.model.id}}
diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
index 057a23f76..499d7ff96 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
@@ -1,5 +1,9 @@
{{t "resources.role.title"}}
{{t "resources.role.principal.description"}}
-
- {{@model.role.id}}
+
+ {{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/users/index.hbs b/ui/core/app/templates/scopes/scope/users/index.hbs
index 50bcd7b74..7f5154949 100644
--- a/ui/core/app/templates/scopes/scope/users/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/index.hbs
@@ -41,7 +41,11 @@
{{user.description}}
-
+
{{user.id}}
diff --git a/ui/core/app/templates/scopes/scope/users/user/index.hbs b/ui/core/app/templates/scopes/scope/users/user/index.hbs
index 7f9218f1b..e88672ab6 100644
--- a/ui/core/app/templates/scopes/scope/users/user/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/index.hbs
@@ -7,7 +7,11 @@
{{t "resources.user.title"}}
{{t "resources.user.description"}}
-
+
{{@model.id}}
diff --git a/ui/core/tests/integration/components/copyable-test.js b/ui/core/tests/integration/components/copyable-test.js
index 07be2788f..8d6a29cf9 100644
--- a/ui/core/tests/integration/components/copyable-test.js
+++ b/ui/core/tests/integration/components/copyable-test.js
@@ -7,7 +7,7 @@ module('Integration | Component | copyable', function(hooks) {
setupRenderingTest(hooks);
test('it renders', async function(assert) {
- await render(hbs`text`);
+ await render(hbs`text`);
assert.ok(find('.copyable'));
assert.equal(find('.copyable-content').textContent.trim(), 'text');
assert.equal(find('.copyable-button').textContent.trim(), 'Copy me');