Skip to content

Commit c820f88

Browse files
authored
Merge pull request #2513 from hashicorp/alex-ju/fix-deprecated-arg
Fix Dropdown-related deprecation warnings in `website` and `showcase`
2 parents c78be54 + 8faad90 commit c820f88

File tree

20 files changed

+337
-329
lines changed

20 files changed

+337
-329
lines changed

showcase/app/templates/components/app-footer.hbs

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@
8080
<AF.ExtraBefore>
8181
<Hds::Dropdown as |D|>
8282
<D.ToggleButton @text="Theme" @color="secondary" @size="small" />
83-
<D.Interactive @icon="monitor" {{on "click" D.close}} @text="System" />
84-
<D.Interactive @icon="moon" {{on "click" D.close}} @text="Dark" />
85-
<D.Interactive @icon="sun" {{on "click" D.close}} @text="Light" />
83+
<D.Interactive @icon="monitor" {{on "click" D.close}}>System</D.Interactive>
84+
<D.Interactive @icon="moon" {{on "click" D.close}}>Dark</D.Interactive>
85+
<D.Interactive @icon="sun" {{on "click" D.close}}>Light</D.Interactive>
8686
</Hds::Dropdown>
8787
</AF.ExtraBefore>
8888
<AF.StatusLink @status="operational" />

showcase/app/templates/components/app-header.hbs

+48-48
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@
5656
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
5757
<dd.ToggleIcon @icon="help" @text="help menu" />
5858
<dd.Title @text="Help & Support" />
59-
<dd.Interactive @text="Documentation" @href="#" />
60-
<dd.Interactive @text="Tutorials" @href="#" />
61-
<dd.Interactive @text="Terraform Provider" @href="#" />
62-
<dd.Interactive @text="Changelog" @href="#" />
59+
<dd.Interactive @href="#">Documentation</dd.Interactive>
60+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
61+
<dd.Interactive @href="#">Terraform Provider</dd.Interactive>
62+
<dd.Interactive @href="#">Changelog</dd.Interactive>
6363
<dd.Separator />
64-
<dd.Interactive @text="Create support ticket" @href="#" />
65-
<dd.Interactive @text="Give feedback" @href="#" />
64+
<dd.Interactive @href="#">Create support ticket</dd.Interactive>
65+
<dd.Interactive @href="#">Give feedback</dd.Interactive>
6666
</Hds::Dropdown>
6767

6868
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
6969
<dd.ToggleIcon @icon="user" @text="user menu" />
7070
<dd.Title @text="Signed In" />
7171
<dd.Description @text="email@domain.com" />
72-
<dd.Interactive @href="#" @text="Account Settings" />
72+
<dd.Interactive @href="#">Account Settings</dd.Interactive>
7373
</Hds::Dropdown>
7474
</:utilityActions>
7575
</Hds::AppHeader>
@@ -95,20 +95,20 @@
9595
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
9696
<dd.ToggleIcon @icon="help" @text="help menu" />
9797
<dd.Title @text="Help & Support" />
98-
<dd.Interactive @text="Documentation" @href="#" />
99-
<dd.Interactive @text="Tutorials" @href="#" />
100-
<dd.Interactive @text="Terraform Provider" @href="#" />
101-
<dd.Interactive @text="Changelog" @href="#" />
98+
<dd.Interactive @href="#">Documentation</dd.Interactive>
99+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
100+
<dd.Interactive @href="#">Terraform Provider</dd.Interactive>
101+
<dd.Interactive @href="#">Changelog</dd.Interactive>
102102
<dd.Separator />
103-
<dd.Interactive @text="Create support ticket" @href="#" />
104-
<dd.Interactive @text="Give feedback" @href="#" />
103+
<dd.Interactive @href="#">Create support ticket</dd.Interactive>
104+
<dd.Interactive @href="#">Give feedback</dd.Interactive>
105105
</Hds::Dropdown>
106106

107107
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
108108
<dd.ToggleIcon @icon="user" @text="user menu" />
109109
<dd.Title @text="Signed In" />
110110
<dd.Description @text="email@domain.com" />
111-
<dd.Interactive @href="#" @text="Account Settings" />
111+
<dd.Interactive @href="#">Account Settings</dd.Interactive>
112112
</Hds::Dropdown>
113113
</:utilityActions>
114114
</Hds::AppHeader>
@@ -141,20 +141,20 @@
141141
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
142142
<dd.ToggleIcon @icon="help" @text="help menu" />
143143
<dd.Title @text="Help & Support" />
144-
<dd.Interactive @text="Documentation" @href="#" />
145-
<dd.Interactive @text="Tutorials" @href="#" />
146-
<dd.Interactive @text="Terraform Provider" @href="#" />
147-
<dd.Interactive @text="Changelog" @href="#" />
144+
<dd.Interactive @href="#">Documentation</dd.Interactive>
145+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
146+
<dd.Interactive @href="#">Terraform Provider</dd.Interactive>
147+
<dd.Interactive @href="#">Changelog</dd.Interactive>
148148
<dd.Separator />
149-
<dd.Interactive @text="Create support ticket" @href="#" />
150-
<dd.Interactive @text="Give feedback" @href="#" />
149+
<dd.Interactive @href="#">Create support ticket</dd.Interactive>
150+
<dd.Interactive @href="#">Give feedback</dd.Interactive>
151151
</Hds::Dropdown>
152152

153153
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
154154
<dd.ToggleIcon @icon="user" @text="user menu" />
155155
<dd.Title @text="Signed In" />
156156
<dd.Description @text="email@domain.com" />
157-
<dd.Interactive @href="#" @text="Account Settings" />
157+
<dd.Interactive @href="#">Account Settings</dd.Interactive>
158158
</Hds::Dropdown>
159159
</:utilityActions>
160160
</Hds::AppHeader>
@@ -184,19 +184,19 @@
184184
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
185185
<dd.ToggleIcon @icon="help" @text="help menu" />
186186
<dd.Title @text="Help & Support" />
187-
<dd.Interactive @text="Documentation" @href="#" />
188-
<dd.Interactive @text="Tutorials" @href="#" />
189-
<dd.Interactive @text="Terraform Provider" @href="#" />
190-
<dd.Interactive @text="Changelog" @href="#" />
187+
<dd.Interactive @href="#">Documentation</dd.Interactive>
188+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
189+
<dd.Interactive @href="#">Terraform Provider</dd.Interactive>
190+
<dd.Interactive @href="#">Changelog</dd.Interactive>
191191
<dd.Separator />
192-
<dd.Interactive @text="Create support ticket" @href="#" />
193-
<dd.Interactive @text="Give feedback" @href="#" />
192+
<dd.Interactive @href="#">Create support ticket</dd.Interactive>
193+
<dd.Interactive @href="#">Give feedback</dd.Interactive>
194194
</Hds::Dropdown>
195195
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
196196
<dd.ToggleIcon @icon="user" @text="user menu" />
197197
<dd.Title @text="Signed In" />
198198
<dd.Description @text="email@domain.com" />
199-
<dd.Interactive @href="#" @text="Account Settings" />
199+
<dd.Interactive @href="#">Account Settings</dd.Interactive>
200200
</Hds::Dropdown>
201201
</:utilityActions>
202202
</Hds::AppHeader>
@@ -220,19 +220,19 @@
220220
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
221221
<dd.ToggleIcon @icon="help" @text="help menu" />
222222
<dd.Title @text="Help & Support" />
223-
<dd.Interactive @text="Documentation" @href="#" />
224-
<dd.Interactive @text="Tutorials" @href="#" />
225-
<dd.Interactive @text="Terraform Provider" @href="#" />
226-
<dd.Interactive @text="Changelog" @href="#" />
223+
<dd.Interactive @href="#">Documentation</dd.Interactive>
224+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
225+
<dd.Interactive @href="#">Terraform Provider</dd.Interactive>
226+
<dd.Interactive @href="#">Changelog</dd.Interactive>
227227
<dd.Separator />
228-
<dd.Interactive @text="Create support ticket" @href="#" />
229-
<dd.Interactive @text="Give feedback" @href="#" />
228+
<dd.Interactive @href="#">Create support ticket</dd.Interactive>
229+
<dd.Interactive @href="#">Give feedback</dd.Interactive>
230230
</Hds::Dropdown>
231231
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
232232
<dd.ToggleIcon @icon="user" @text="user menu" />
233233
<dd.Title @text="Signed In" />
234234
<dd.Description @text="email@domain.com" />
235-
<dd.Interactive @href="#" @text="Account Settings" />
235+
<dd.Interactive @href="#">Account Settings</dd.Interactive>
236236
</Hds::Dropdown>
237237
</:utilityActions>
238238
</Hds::AppHeader>
@@ -262,20 +262,20 @@
262262
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
263263
<dd.ToggleIcon @icon="help" @text="help menu" />
264264
<dd.Title @text="Help & Support" />
265-
<dd.Interactive @text="Documentation" @href="#" />
266-
<dd.Interactive @text="Tutorials" @href="#" />
267-
<dd.Interactive @text="Terraform Provider" @href="#" />
268-
<dd.Interactive @text="Changelog" @href="#" />
265+
<dd.Interactive @href="#">Documentation</dd.Interactive>
266+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
267+
<dd.Interactive @href="#">Terraform Provider</dd.Interactive>
268+
<dd.Interactive @href="#">Changelog</dd.Interactive>
269269
<dd.Separator />
270-
<dd.Interactive @text="Create support ticket" @href="#" />
271-
<dd.Interactive @text="Give feedback" @href="#" />
270+
<dd.Interactive @href="#">Create support ticket</dd.Interactive>
271+
<dd.Interactive @href="#">Give feedback</dd.Interactive>
272272
</Hds::Dropdown>
273273

274274
<Hds::Dropdown @enableCollisionDetection={{true}} as |dd|>
275275
<dd.ToggleIcon @icon="user" @text="user menu" />
276276
<dd.Title @text="Signed In" />
277277
<dd.Description @text="email@domain.com" />
278-
<dd.Interactive @href="#" @text="Account Settings" />
278+
<dd.Interactive @href="#">Account Settings</dd.Interactive>
279279
</Hds::Dropdown>
280280
</:utilityActions>
281281
</Hds::AppHeader>
@@ -548,9 +548,9 @@
548548
<D.Generic>
549549
<Hds::Dropdown as |D|>
550550
<D.ToggleButton @text="Menu" />
551-
<D.Interactive @href="#" @text="Add" />
552-
<D.Interactive @href="#" @text="Add More" />
553-
<D.Interactive @href="#" @text="Add Another Thing Too" />
551+
<D.Interactive @href="#">Add</D.Interactive>
552+
<D.Interactive @href="#">Add More</D.Interactive>
553+
<D.Interactive @href="#">Add Another Thing Too</D.Interactive>
554554
</Hds::Dropdown>
555555
</D.Generic>
556556
<D.Checkbox>access</D.Checkbox>
@@ -561,9 +561,9 @@
561561
<Hds::Button @text="Cancel" @color="secondary" @size="small" />
562562
<Hds::Dropdown as |D|>
563563
<D.ToggleButton @text="Menu" />
564-
<D.Interactive @href="#" @text="Add" />
565-
<D.Interactive @href="#" @text="Add More" />
566-
<D.Interactive @href="#" @text="Add Another Thing Too" />
564+
<D.Interactive @href="#">Add</D.Interactive>
565+
<D.Interactive @href="#">Add More</D.Interactive>
566+
<D.Interactive @href="#">Add Another Thing Too</D.Interactive>
567567
</Hds::Dropdown>
568568
</Hds::ButtonSet>
569569
</D.Footer>

showcase/app/templates/components/application-state.hbs

+15-15
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@
191191
<F.Dropdown @listPosition="bottom-right" as |dd|>
192192
<dd.ToggleButton @text="Choose an option" />
193193
<dd.Title @text="Categories" />
194-
<dd.Interactive @text="Documentation" @href="#" />
195-
<dd.Interactive @text="Tutorials" @href="#" />
196-
<dd.Interactive @text="Changelogs" @href="#" />
194+
<dd.Interactive @href="#">Documentation</dd.Interactive>
195+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
196+
<dd.Interactive @href="#">Changelogs</dd.Interactive>
197197
</F.Dropdown>
198198
</A.Footer>
199199
</Hds::ApplicationState>
@@ -208,9 +208,9 @@
208208
<F.Dropdown @listPosition="bottom-right" as |dd|>
209209
<dd.ToggleButton @text="Choose an option" />
210210
<dd.Title @text="Categories" />
211-
<dd.Interactive @text="Documentation" @href="#" />
212-
<dd.Interactive @text="Tutorials" @href="#" />
213-
<dd.Interactive @text="Changelogs" @href="#" />
211+
<dd.Interactive @href="#">Documentation</dd.Interactive>
212+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
213+
<dd.Interactive @href="#">Changelogs</dd.Interactive>
214214
</F.Dropdown>
215215
<F.Button @color="secondary" @text="Secondary action" />
216216
</A.Footer>
@@ -226,9 +226,9 @@
226226
<F.Dropdown @listPosition="bottom-right" as |dd|>
227227
<dd.ToggleButton @text="Choose an option" />
228228
<dd.Title @text="Categories" />
229-
<dd.Interactive @text="Documentation" @href="#" />
230-
<dd.Interactive @text="Tutorials" @href="#" />
231-
<dd.Interactive @text="Changelogs" @href="#" />
229+
<dd.Interactive @href="#">Documentation</dd.Interactive>
230+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
231+
<dd.Interactive @href="#">Changelogs</dd.Interactive>
232232
</F.Dropdown>
233233
<F.Button @color="secondary" @text="Secondary action" />
234234
<F.LinkStandalone @icon="docs-link" @text="Learn more" @iconPosition="trailing" @href="#" />
@@ -301,9 +301,9 @@
301301
<F.Dropdown @color="secondary" @listPosition="bottom-right" as |dd|>
302302
<dd.ToggleButton @text="Choose an option" />
303303
<dd.Title @text="Categories" />
304-
<dd.Interactive @text="Documentation" @href="#" />
305-
<dd.Interactive @text="Tutorials" @href="#" />
306-
<dd.Interactive @text="Changelogs" @href="#" />
304+
<dd.Interactive @href="#">Documentation</dd.Interactive>
305+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
306+
<dd.Interactive @href="#">Changelogs</dd.Interactive>
307307
</F.Dropdown>
308308
</A.Footer>
309309
</Hds::ApplicationState>
@@ -321,9 +321,9 @@
321321
<F.Dropdown @color="secondary" @listPosition="bottom-right" as |dd|>
322322
<dd.ToggleButton @text="Choose an option" />
323323
<dd.Title @text="Categories" />
324-
<dd.Interactive @text="Documentation" @href="#" />
325-
<dd.Interactive @text="Tutorials" @href="#" />
326-
<dd.Interactive @text="Changelogs" @href="#" />
324+
<dd.Interactive @href="#">Documentation</dd.Interactive>
325+
<dd.Interactive @href="#">Tutorials</dd.Interactive>
326+
<dd.Interactive @href="#">Changelogs</dd.Interactive>
327327
</F.Dropdown>
328328
<F.LinkStandalone @icon="docs-link" @text="Learn more" @iconPosition="trailing" @href="#" />
329329
</A.Footer>

0 commit comments

Comments
 (0)