diff --git a/ui/core/app/components/copyable/index.hbs b/ui/core/app/components/copyable/index.hbs index 8d0a3df75..499c4fc43 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={{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 01dcad838..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,11 +11,9 @@ export default class CopyableComponent extends Component { // =attributes id = generateComponentID(); - copyableButtonId = `copyable-button-${this.id}`; icon = 'copy-action'; - - @tracked text; - @tracked clipboard; + copyableButtonId = `copyable-button-${this.id}`; + copyableButtonText = this.args.buttonText; /** * A Ember Concurrency-based task that updates copy icon to a success state @@ -30,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/styles/app.scss b/ui/core/app/styles/app.scss index 1f19644b9..06cc0a0d9 100644 --- a/ui/core/app/styles/app.scss +++ b/ui/core/app/styles/app.scss @@ -86,6 +86,9 @@ .copyable { .copyable-button { - padding: 0; + position: relative; + top: -2px; + 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..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,3 +1,9 @@

{{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..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,2 +1,8 @@

{{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..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,3 +1,9 @@

{{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 7df042046..1e92188b6 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,13 @@ {{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..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,13 @@ - {{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..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,3 +1,9 @@

{{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..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,13 @@ {{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..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,3 +1,9 @@

{{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..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,3 +1,9 @@

{{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..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,13 @@ {{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..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,3 +1,9 @@

{{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..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,13 @@ - {{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..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,13 @@ - {{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..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,13 @@

{{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..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,13 @@ {{#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..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,13 @@ {{/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..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,3 +1,9 @@

{{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..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,13 @@ {{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..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,3 +1,9 @@

{{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..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,3 +1,9 @@

{{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..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,13 @@ {{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.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..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,13 @@

{{user.description}}

- {{user.id}} + + {{user.id}} + {{/each}} diff --git a/ui/core/app/templates/scopes/scope/users/user/-header.hbs b/ui/core/app/templates/scopes/scope/users/user/-header.hbs index 2b107e842..d67b6c679 100644 --- a/ui/core/app/templates/scopes/scope/users/user/-header.hbs +++ b/ui/core/app/templates/scopes/scope/users/user/-header.hbs @@ -1,3 +1,9 @@

{{t "resources.user.title"}}

{{t "resources.user.description"}}

-

{{@model.id}}

+ + {{@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'); 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