Skip to content

Commit d0aa0d6

Browse files
committed
Merge branch 'spike-BUTTON-LINK-CTA-main' into spike-interactive-generic-component
2 parents 61f54d9 + 7926217 commit d0aa0d6

File tree

6 files changed

+41
-37
lines changed

6 files changed

+41
-37
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
# This expects you to have a script called release which does a build for your packages and calls changeset publish
3232
publish: yarn release
3333
env:
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
# Token setup in Dhaulagiri's account
35+
GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
3536
# Token setup in Dhaulagiri's account
3637
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

packages/components/addon/components/hds/dropdown/list-item/copy-item.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { tracked } from '@glimmer/tracking';
44
import { action } from '@ember/object';
55

66
export default class HdsDropdownListItemCopyItemComponent extends Component {
7-
@tracked isSuccess = this.args.isSuccess ?? false;
7+
@tracked isSuccess = false;
88

99
/**
1010
* @param text
@@ -37,12 +37,19 @@ export default class HdsDropdownListItemCopyItemComponent extends Component {
3737
}
3838

3939
@action
40-
copyCode() {
41-
navigator.clipboard.writeText(this.args.text);
42-
// this if statement resolves to [object Promise] so maybe some improvements
43-
// could be made here
44-
if (navigator.clipboard.readText()) {
40+
async copyCode() {
41+
// https://developer.mozilla.org/en-US/docs/Web/API/Clipboard
42+
await navigator.clipboard.writeText(this.args.text);
43+
const result = await navigator.clipboard.readText();
44+
45+
if (result === this.args.text) {
4546
this.isSuccess = true;
47+
// console.log(`result is ${result}`);
48+
49+
// make it fade back to the default state
50+
setTimeout(() => {
51+
this.isSuccess = false;
52+
}, 1000);
4653
}
4754
}
4855
}

packages/components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"broccoli-asset-rev": "^3.0.0",
5858
"ember-a11y-refocus": "^2.1.0",
5959
"ember-cli": "~4.3.0",
60-
"ember-cli-clipboard": "^0.15.0",
60+
"ember-cli-clipboard": "^0.16.0",
6161
"ember-cli-dependency-checker": "^3.3.0",
6262
"ember-cli-deprecation-workflow": "^2.1.0",
6363
"ember-cli-inject-live-reload": "^2.1.0",

packages/components/tests/dummy/app/templates/components/dropdown.hbs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,16 @@
153153
</dd>
154154
</dl>
155155

156-
<h4 class="dummy-h4">ListItem::CopyItem</h4>
157-
{{! TODO: add props here if we decide to use the current version }}
158-
<p class="dummy-paragraph">[WIP]</p>
156+
<h4 class="dummy-h4" id="api-listitem-copyitem">ListItem::CopyItem</h4>
157+
<dl class="dummy-component-props" aria-labelledby="api-listitem-copyitem">
158+
<dt>copyItemTitle <code>string</code></dt>
159+
<dd>Optional. Provides a contextual title for the text to be copied.</dd>
160+
<dt>text <code>string</code></dt>
161+
<dd>
162+
<p>The text to be copied.</p>
163+
<p><em>If no text value is defined an error will be thrown.</em></p>
164+
</dd>
165+
</dl>
159166

160167
<h4 class="dummy-h4">ListItem::Description</h4>
161168
<p class="dummy-paragraph" id="component-api-listitem-description">Here is the API for the "description" list item
@@ -483,10 +490,7 @@
483490
&lt;Hds::Link::Standalone @text="Watch tutorial video" @icon="film" href="/" /&gt;
484491
&lt;/dd.Generic&gt;
485492
&lt;dd.CopyItem @text="https://api.cloud.hashicorp.com" @copyItemTitle="Endpoint URL" /&gt;
486-
&lt;dd.CopyLabel /&gt;
487-
&lt;dd.CopyItem @text="91ee1e8ef65b337f0e70d793f456c71d" @text="HMAC Key" /&gt;
488-
&lt;dd.Separator /&gt;
489-
&lt;dd.Interactive @route="components.dropdown" @text="Docs: Import usage" @icon="docs-link" /&gt;
493+
&lt;dd.CopyItem @text="91ee1e8ef65b337f0e70d793f456c71d" @copyItemTitle="HMAC Key" /&gt;
490494
&lt;/Hds::Dropdown&gt;
491495
'
492496
/>

packages/flight-website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"ember-cli": "~4.3.0",
4545
"ember-cli-app-version": "^5.0.0",
4646
"ember-cli-babel": "^7.26.11",
47-
"ember-cli-clipboard": "^0.15.0",
47+
"ember-cli-clipboard": "^0.16.0",
4848
"ember-cli-dependency-checker": "^3.3.0",
4949
"ember-cli-htmlbars": "^6.0.1",
5050
"ember-cli-inject-live-reload": "^2.1.0",

yarn.lock

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,15 +1352,7 @@
13521352
mkdirp "^1.0.4"
13531353
silent-error "^1.1.1"
13541354

1355-
"@ember/render-modifiers@^1.0.1":
1356-
version "1.0.2"
1357-
resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-1.0.2.tgz#2e87c48db49d922ce4850d707215caaac60d8444"
1358-
integrity sha512-6tEnHl5+62NTSAG2mwhGMFPhUrJQjoVqV+slsn+rlTknm2Zik+iwxBQEbwaiQOU1FUYxkS8RWcieovRNMR8inQ==
1359-
dependencies:
1360-
ember-cli-babel "^7.10.0"
1361-
ember-modifier-manager-polyfill "^1.1.0"
1362-
1363-
"@ember/render-modifiers@^2.0.0":
1355+
"@ember/render-modifiers@^1.0.2 || ^2.0.0", "@ember/render-modifiers@^2.0.0":
13641356
version "2.0.4"
13651357
resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.0.4.tgz#0ac7af647cb736076dbfcd54ca71e090cd329d71"
13661358
integrity sha512-Zh/fo5VUmVzYHkHVvzWVjJ1RjFUxA2jH0zCp2+DQa80Bf3DUXauiEByxU22UkN4LFT55DBFttC0xCQSJG3WTsg==
@@ -5920,7 +5912,7 @@ ember-a11y-refocus@^2.1.0:
59205912
ember-cli-babel "^7.26.11"
59215913
ember-cli-htmlbars "^6.0.1"
59225914

5923-
ember-auto-import@^1.11.3, ember-auto-import@^1.5.3:
5915+
ember-auto-import@^1.11.3:
59245916
version "1.12.1"
59255917
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.1.tgz#09967bd35cd56ac45f413c48deabf7cfb3a785f6"
59265918
integrity sha512-Jm0vWKNAy/wYMrdSQIrG8sRsvarIRHZ2sS/CGhMdMqVKJR48AhGU7NgPJ5SIlO/+seL2VSO+dtv7aEOEIaT6BA==
@@ -6040,7 +6032,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, em
60406032
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
60416033
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
60426034

6043-
ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
6035+
ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.19.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
60446036
version "7.26.11"
60456037
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
60466038
integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -6076,16 +6068,16 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.10.0, ember-c
60766068
rimraf "^3.0.1"
60776069
semver "^5.5.0"
60786070

6079-
ember-cli-clipboard@^0.15.0:
6080-
version "0.15.0"
6081-
resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.15.0.tgz#3704baaeab1f0a2df13b3d77632dea7266aabe54"
6082-
integrity sha512-gcjm2ofr3NOGH6/MFp+2AVqEKTYkdRUvRsVovTg45Iy414jKyWwxu9l3jWM0ZZkRc2IqjE0V2ta9JJe2/HRPUA==
6071+
ember-cli-clipboard@^0.16.0:
6072+
version "0.16.0"
6073+
resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.16.0.tgz#f4878cbbfbc56e0bc6d2a65ccf5a334c47b0f614"
6074+
integrity sha512-l9iDVjcJLkbgpdbJe+bN29q2ibZmEpEV6bXstIG9q4HPvaqbXw0PbSFhaNeQWpJKNkd5dFKSNdgEfli6heJSFw==
60836075
dependencies:
6084-
"@ember/render-modifiers" "^1.0.1"
6076+
"@ember/render-modifiers" "^1.0.2 || ^2.0.0"
60856077
clipboard "^2.0.6"
6086-
ember-auto-import "^1.5.3"
6087-
ember-cli-babel "^7.20.2"
6088-
ember-cli-htmlbars "^4.2.3"
6078+
ember-auto-import "^1.11.3"
6079+
ember-cli-babel "^7.26.6"
6080+
ember-cli-htmlbars "^5.7.1"
60896081

60906082
ember-cli-dependency-checker@^3.3.0:
60916083
version "3.3.1"
@@ -6113,7 +6105,7 @@ ember-cli-get-component-path-option@^1.0.0:
61136105
resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
61146106
integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
61156107

6116-
ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1:
6108+
ember-cli-htmlbars@^4.3.1:
61176109
version "4.5.0"
61186110
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e"
61196111
integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw==
@@ -6602,7 +6594,7 @@ ember-load-initializers@^2.1.2:
66026594
ember-cli-babel "^7.13.0"
66036595
ember-cli-typescript "^2.0.2"
66046596

6605-
ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0:
6597+
ember-modifier-manager-polyfill@^1.2.0:
66066598
version "1.2.0"
66076599
resolved "https://registry.yarnpkg.com/ember-modifier-manager-polyfill/-/ember-modifier-manager-polyfill-1.2.0.tgz#cf4444e11a42ac84f5c8badd85e635df57565dda"
66086600
integrity sha512-bnaKF1LLKMkBNeDoetvIJ4vhwRPKIIumWr6dbVuW6W6p4QV8ZiO+GdF8J7mxDNlog9CeL9Z/7wam4YS86G8BYA==

0 commit comments

Comments
 (0)