{{/if}}
{{#if (has-block)}}
{{yield}}
diff --git a/ui/lib/kmip/addon/templates/credentials/show.hbs b/ui/lib/kmip/addon/templates/credentials/show.hbs
index bffa36672c..e3b71e0332 100644
--- a/ui/lib/kmip/addon/templates/credentials/show.hbs
+++ b/ui/lib/kmip/addon/templates/credentials/show.hbs
@@ -31,30 +31,29 @@
-
-
-
- Warning
- You will not be able to access the private key later, so please copy the information below.
-
-
-
+ {{#if this.model.privateKey}}
+
+
+
+ Warning
+ You will not be able to access the private key later, so please copy the information below.
+
+
+
+ {{/if}}
diff --git a/ui/lib/kv/addon/components/page/secret/paths.hbs b/ui/lib/kv/addon/components/page/secret/paths.hbs
index 28c2c2d204..79f9bea88b 100644
--- a/ui/lib/kv/addon/components/page/secret/paths.hbs
+++ b/ui/lib/kv/addon/components/page/secret/paths.hbs
@@ -16,15 +16,7 @@
{{#each this.paths as |path|}}
- {{! replace with Hds::Copy::Snippet }}
-
-
-
+
{{path.snippet}}
diff --git a/ui/lib/replication/addon/templates/mode/secondaries/add.hbs b/ui/lib/replication/addon/templates/mode/secondaries/add.hbs
index e44f1b34db..77914bca76 100644
--- a/ui/lib/replication/addon/templates/mode/secondaries/add.hbs
+++ b/ui/lib/replication/addon/templates/mode/secondaries/add.hbs
@@ -81,16 +81,12 @@
{{/if}}
\ No newline at end of file
diff --git a/ui/package.json b/ui/package.json
index 273b8016e9..b85b1a8553 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -65,7 +65,7 @@
"@ember/test-waiters": "^3.0.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
- "@hashicorp/ember-flight-icons": "3.0.5",
+ "@hashicorp/ember-flight-icons": "^3.0.9",
"@hashicorp/structure-icons": "^1.3.0",
"@icholy/duration": "^5.1.0",
"@tsconfig/ember": "^1.0.1",
@@ -125,7 +125,6 @@
"ember-cli": "~4.12.1",
"ember-cli-autoprefixer": "^0.8.1",
"ember-cli-babel": "^7.26.11",
- "ember-cli-clipboard": "0.16.0",
"ember-cli-content-security-policy": "2.0.3",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-deprecation-workflow": "^2.1.0",
@@ -249,7 +248,7 @@
]
},
"dependencies": {
- "@hashicorp/design-system-components": "2.7.0",
+ "@hashicorp/design-system-components": "^2.9.0",
"handlebars": "4.7.7",
"highlight.js": "^10.4.1",
"node-notifier": "^8.0.1",
diff --git a/ui/tests/integration/components/hover-copy-button-test.js b/ui/tests/integration/components/hover-copy-button-test.js
deleted file mode 100644
index 818987890b..0000000000
--- a/ui/tests/integration/components/hover-copy-button-test.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, settled } from '@ember/test-helpers';
-import { create } from 'ember-cli-page-object';
-import hbs from 'htmlbars-inline-precompile';
-import copyButton from 'vault/tests/pages/components/hover-copy-button';
-const component = create(copyButton);
-
-module('Integration | Component | hover copy button', function (hooks) {
- setupRenderingTest(hooks);
-
- // ember-cli-clipboard helpers don't like the new style
- test('it shows success message in tooltip', async function (assert) {
- await render(hbs`
-
-
-
- `);
- await component.focusContainer();
- await settled();
- assert.ok(component.buttonIsVisible);
- await component.mouseEnter();
- await settled();
- assert.strictEqual(component.tooltipText, 'Copy', 'shows copy');
- });
-
- test('it has the correct class when alwaysShow is true', async function (assert) {
- await render(hbs`
-
- `);
- await render(hbs`{{hover-copy-button alwaysShow=true copyValue=this.copyValue}}`);
- assert.ok(component.buttonIsVisible);
- assert.ok(component.wrapperClass.includes('hover-copy-button-static'));
- });
-});
diff --git a/ui/tests/integration/components/info-table-row-test.js b/ui/tests/integration/components/info-table-row-test.js
index 486ae5cac0..238c019e2d 100644
--- a/ui/tests/integration/components/info-table-row-test.js
+++ b/ui/tests/integration/components/info-table-row-test.js
@@ -76,7 +76,7 @@ module('Integration | Component | InfoTableRow', function (hooks) {
});
test('it should copy tooltip', async function (assert) {
- assert.expect(4);
+ assert.expect(3);
this.set('isCopyable', false);
@@ -91,13 +91,12 @@ module('Integration | Component | InfoTableRow', function (hooks) {
await triggerEvent('[data-test-value-div="test label"] .ember-basic-dropdown-trigger', 'mouseenter');
- assert.dom('[data-test-tooltip-copy]').hasAttribute('disabled', '', 'Tooltip copy button is disabled');
+ assert.dom('[data-test-tooltip-copy]').doesNotExist('Tooltip has no copy button');
+ this.set('isCopyable', true);
+ assert.dom('[data-test-tooltip-copy]').exists('Tooltip has copy button');
assert
.dom('[data-test-tooltip-copy]')
- .doesNotHaveClass('has-pointer', 'Pointer class not applied when disabled');
- this.set('isCopyable', true);
- assert.dom('[data-test-tooltip-copy]').doesNotHaveAttribute('disabled', 'Tooltip copy button is enabled');
- assert.dom('[data-test-tooltip-copy]').hasClass('has-pointer', 'Pointer class applied to copy button');
+ .hasAttribute('data-clipboard-text', 'Foo bar', 'Copy button will copy the tooltip text');
});
test('it renders a string with no link if isLink is true and the item type is not an array.', async function (assert) {
@@ -138,13 +137,13 @@ module('Integration | Component | InfoTableRow', function (hooks) {
this.set('value', '');
this.set('label', LABEL);
- assert.dom('div.column.is-flex .flight-icon').exists('Renders a dash (-) for empty string value');
+ assert.dom('div.column.is-flex-center .flight-icon').exists('Renders a dash (-) for empty string value');
this.set('value', null);
- assert.dom('div.column.is-flex .flight-icon').exists('Renders a dash (-) for null value');
+ assert.dom('div.column.is-flex-center .flight-icon').exists('Renders a dash (-) for null value');
this.set('value', undefined);
- assert.dom('div.column.is-flex .flight-icon').exists('Renders a dash (-) for undefined value');
+ assert.dom('div.column.is-flex-center .flight-icon').exists('Renders a dash (-) for undefined value');
this.set('default', DEFAULT);
assert.dom('[data-test-value-div]').hasText(DEFAULT, 'Renders default text if value is empty');
diff --git a/ui/tests/integration/components/json-editor-test.js b/ui/tests/integration/components/json-editor-test.js
index f38e17f8ae..724924d554 100644
--- a/ui/tests/integration/components/json-editor-test.js
+++ b/ui/tests/integration/components/json-editor-test.js
@@ -41,6 +41,7 @@ module('Integration | Component | json-editor', function (hooks) {
assert.strictEqual(component.title, 'Test title', 'renders the provided title');
assert.true(component.hasToolbar, 'renders the toolbar');
+ assert.true(component.hasCopyButton, 'renders the copy button');
assert.true(component.hasJSONEditor, 'renders the code mirror modifier');
assert.ok(component.canEdit, 'json editor can be edited');
});
diff --git a/ui/tests/integration/components/masked-input-test.js b/ui/tests/integration/components/masked-input-test.js
index 7f2fd57683..cbde84551f 100644
--- a/ui/tests/integration/components/masked-input-test.js
+++ b/ui/tests/integration/components/masked-input-test.js
@@ -125,34 +125,4 @@ module('Integration | Component | masked input', function (hooks) {
.dom('[data-test-icon="minus"]')
.exists('shows minus icon when unmasked because value is empty string');
});
-
- test('it shows "success" flash message when the value is successfully copied', async function (assert) {
- await render(hbs`
-
- `);
- assert.dom('[data-test-masked-input]').exists('shows masked input');
- assert.ok(component.copyButtonIsPresent);
- await component.copyValue();
- assert.ok(this.flashSuccessSpy.calledWith('Data copied!'), 'Renders correct flash message');
- });
-
- test('it shows "danger" flash message when the value fails to be copied (no value)', async function (assert) {
- await render(hbs`
-
- `);
- assert.dom('[data-test-masked-input]').exists('shows masked input');
- assert.ok(component.copyButtonIsPresent);
- await component.copyValue();
- assert.ok(this.flashDangerSpy.calledWith('Error copying data'), 'Renders correct flash message');
- });
});
diff --git a/ui/tests/integration/components/oidc/scope-form-test.js b/ui/tests/integration/components/oidc/scope-form-test.js
index 46ffae8c01..36619bb582 100644
--- a/ui/tests/integration/components/oidc/scope-form-test.js
+++ b/ui/tests/integration/components/oidc/scope-form-test.js
@@ -154,10 +154,20 @@ module('Integration | Component | oidc/scope-form', function (hooks) {
});
test('it should show example template modal', async function (assert) {
- assert.expect(6);
+ assert.expect(8);
this.model = this.store.createRecord('oidc/scope');
+ // formatting here is purposeful so that it matches formatting in the template modal
+ const exampleTemplate = `{
+ "username": {{identity.entity.aliases.$MOUNT_ACCESSOR.name}},
+ "contact": {
+ "email": {{identity.entity.metadata.email}},
+ "phone_number": {{identity.entity.metadata.phone_number}}
+ },
+ "groups": {{identity.entity.groups.names}}
+}`;
+
await render(hbs`
=3.0.0 <4.0.0"
+ immutable: ^4.0.0
+ source-map-js: ">=0.6.2 <2.0.0"
+ bin:
+ sass: sass.js
+ checksum: 33e325fc80cd07489992e0814cd4929496f87493ffe78c423c2dbafa5746a574e6f3bde20c2a3e4ea47b16ee3d6bc5afcf1d36b405227b829d6c4c9ddcc7f8e2
+ languageName: node
+ linkType: hard
+
"sax@npm:~1.2.4":
version: 1.2.4
resolution: "sax@npm:1.2.4"
@@ -25919,8 +25918,8 @@ __metadata:
"@ember/test-waiters": ^3.0.0
"@glimmer/component": ^1.1.2
"@glimmer/tracking": ^1.1.2
- "@hashicorp/design-system-components": 2.7.0
- "@hashicorp/ember-flight-icons": 3.0.5
+ "@hashicorp/design-system-components": ^2.9.0
+ "@hashicorp/ember-flight-icons": ^3.0.9
"@hashicorp/structure-icons": ^1.3.0
"@icholy/duration": ^5.1.0
"@tsconfig/ember": ^1.0.1
@@ -25980,7 +25979,6 @@ __metadata:
ember-cli: ~4.12.1
ember-cli-autoprefixer: ^0.8.1
ember-cli-babel: ^7.26.11
- ember-cli-clipboard: 0.16.0
ember-cli-content-security-policy: 2.0.3
ember-cli-dependency-checker: ^3.3.1
ember-cli-deprecation-workflow: ^2.1.0