diff --git a/addons/rose/addon/styles/addon.scss b/addons/rose/addon/styles/addon.scss
index d9496c886..b7c296e7d 100644
--- a/addons/rose/addon/styles/addon.scss
+++ b/addons/rose/addon/styles/addon.scss
@@ -3,6 +3,6 @@
* SPDX-License-Identifier: BUSL-1.1
*/
-@import '@hashicorp/design-system-components';
+@import '@hashicorp/design-system-components.css';
@import 'hds/themes/dark-mode';
@import 'hds/overrides';
diff --git a/addons/rose/index.js b/addons/rose/index.js
index 649afba72..940d07259 100644
--- a/addons/rose/index.js
+++ b/addons/rose/index.js
@@ -13,13 +13,14 @@ module.exports = {
name: require('./package').name,
included(app) {
this._super.included.apply(this, arguments);
-
+ app.import(
+ 'node_modules/@hashicorp/design-system-components/dist/styles/@hashicorp/design-system-components.css',
+ );
app.import('node_modules/codemirror/lib/codemirror.css');
app.import('node_modules/codemirror/theme/monokai.css');
app.import('node_modules/codemirror/addon/lint/lint.css');
app.import('node_modules/jsonlint/lib/jsonlint.js');
- this.includeHDSStyles(app);
this.includeFlightIcons(app);
this.includePublic(app);
this.setupSVGO(app);
@@ -36,26 +37,6 @@ module.exports = {
.contentFor(type, config);
},
- /**
- * Finds the HDS styles folder and includes it into the running
- * application's `sassOptions.includePaths`.
- */
- includeHDSStyles(app) {
- const tokensPath =
- '../../node_modules/@hashicorp/design-system-tokens/dist/products/css';
- const hdsPath =
- '../../node_modules/@hashicorp/design-system-components/app/styles';
-
- // Setup default sassOptions on the running application
- app.options.sassOptions = app.options.sassOptions || {};
- app.options.sassOptions.includePaths =
- app.options.sassOptions.includePaths || [];
-
- // Include the addon styles
- app.options.sassOptions.includePaths.push(tokensPath);
- app.options.sassOptions.includePaths.push(hdsPath);
- },
-
/**
* Finds the structure-icons folder and includes it into the
* ember-inline-svg addon.
@@ -96,6 +77,9 @@ module.exports = {
/**
* Adjust SVG optimizer defaults (used by ember-inline-svg).
+ * Note: Currently, there is a svgo pre-release that disables removeViewBox
+ * by default. So, this extra setup can be discarded once ember-inline-svg
+ * is updated to svgo v4.
*/
setupSVGO(app) {
app.options.svg = app.options.svg || {};
diff --git a/addons/rose/package.json b/addons/rose/package.json
index e5558bb44..901f01832 100644
--- a/addons/rose/package.json
+++ b/addons/rose/package.json
@@ -30,7 +30,7 @@
},
"dependencies": {
"@embroider/test-setup": "^2.1.1",
- "@hashicorp/design-system-components": "^3.5.0",
+ "@hashicorp/design-system-components": "^4.4.1",
"codemirror": "5.65.7",
"ember-auto-import": "^2.6.3",
"ember-cli-babel": "^7.26.11",
diff --git a/package.json b/package.json
index df4254398..f0e959dfb 100755
--- a/package.json
+++ b/package.json
@@ -71,7 +71,8 @@
"**/ember-electron/**/got": "^11.8.6",
"**/ember-cli/**/ansi-html": "^0.0.9",
"**/ember-cli/testem/fireworm/async": "^2.6.4",
- "**/desktop/@doyensec/electronegativity/winston/async": "^2.6.4"
+ "**/desktop/@doyensec/electronegativity/winston/async": "^2.6.4",
+ "**/@hashicorp/design-system-components/ember-stargate": "^0.6.0"
},
"config": {
"commitizen": {
diff --git a/ui/admin/app/components/form/auth-method/oidc/index.hbs b/ui/admin/app/components/form/auth-method/oidc/index.hbs
index 8e65760d0..7f61daa81 100644
--- a/ui/admin/app/components/form/auth-method/oidc/index.hbs
+++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs
@@ -386,7 +386,7 @@
as |G|
>
{{#each this.prompts as |prompt|}}
-
{{t (concat 'resources.auth-method.form.' prompt '.help')}}
-
+
{{/each}}
{{/unless}}
diff --git a/ui/admin/app/components/form/credential-library/vault-generic/index.hbs b/ui/admin/app/components/form/credential-library/vault-generic/index.hbs
index c8e4d58c9..e2db8fc96 100644
--- a/ui/admin/app/components/form/credential-library/vault-generic/index.hbs
+++ b/ui/admin/app/components/form/credential-library/vault-generic/index.hbs
@@ -205,13 +205,13 @@
{{t 'resources.credential-library.form.http_method.help'}}
{{#each this.httpMethodOptions as |httpMethod|}}
-
{{httpMethod}}
-
+
{{/each}}
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
index e7caf11fe..c31a015f1 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
@@ -143,7 +143,7 @@
/>
{{#if (can 'create model' this.scope collection='credential-stores')}}
-
{{#if (can 'create model' this.scope collection='groups')}}
-
{{#if (can 'create model' this.scope collection='host-catalogs')}}
-
{{#if (can 'create model' this.scope collection='roles')}}
-
{{#if (can 'create model' @model.currentScope collection='scopes')}}
-
-
{{#if (can 'create model' this.scope collection='targets')}}
-
{{#if (can 'create model' this.scope collection='users')}}
-