diff --git a/ui/admin/app/components/form/account/oidc/index.hbs b/ui/admin/app/components/form/account/oidc/index.hbs
index 108272215..706858b92 100644
--- a/ui/admin/app/components/form/account/oidc/index.hbs
+++ b/ui/admin/app/components/form/account/oidc/index.hbs
@@ -63,25 +63,24 @@
{{/if}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if @model.isNew}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
-
- {{t 'form.certificate.label'}}
-
-
+ {{#if @model.errors.idp_ca_certs}}
+
+ {{#each @model.errors.idp_ca_certs as |error|}}
+ {{error.message}}
+ {{/each}}
+
+ {{/if}}
+
-
diff --git a/ui/admin/app/components/form/auth-method/password/index.hbs b/ui/admin/app/components/form/auth-method/password/index.hbs
index 62f0ec96c..8970d3541 100644
--- a/ui/admin/app/components/form/auth-method/password/index.hbs
+++ b/ui/admin/app/components/form/auth-method/password/index.hbs
@@ -36,25 +36,25 @@
{{/if}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
+
{{#if (can 'save model' @model)}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if (feature-flag 'static-credentials')}}
{{#if @model.isNew}}
diff --git a/ui/admin/app/components/form/credential-store/vault/index.hbs b/ui/admin/app/components/form/credential-store/vault/index.hbs
index a71880c6b..c1493a946 100644
--- a/ui/admin/app/components/form/credential-store/vault/index.hbs
+++ b/ui/admin/app/components/form/credential-store/vault/index.hbs
@@ -30,25 +30,24 @@
{{/if}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if (feature-flag 'static-credentials')}}
{{#if @model.isNew}}
@@ -220,47 +219,51 @@
{{/if}}
-
+ {{t
+ 'resources.credential-store.form.client_certificate.label'
+ }}
+ {{t
+ 'resources.credential-store.form.client_certificate.help'
+ }}
{{#if @model.errors.client_certificate}}
-
+
{{#each @model.errors.client_certificate as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
-
+ {{t
+ 'resources.credential-store.form.client_certificate_key.label'
+ }}
+ {{t
+ 'resources.credential-store.form.client_certificate_key.help'
+ }}
{{#if @model.errors.client_certificate_key}}
-
+
{{#each @model.errors.client_certificate_key as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#unless @model.isNew}}
{{/unless}}
-
+ {{t 'resources.credential-store.form.ca_cert.label'}}
+ {{t
+ 'resources.credential-store.form.ca_cert.help'
+ }}
{{#if @model.errors.ca_cert}}
-
+
{{#each @model.errors.ca_cert as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
+
{{#if (can 'save model' @model)}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if @model.isNew}}
diff --git a/ui/admin/app/components/form/credential/ssh_private_key/index.hbs b/ui/admin/app/components/form/credential/ssh_private_key/index.hbs
index dd12f33bd..6f06ef732 100644
--- a/ui/admin/app/components/form/credential/ssh_private_key/index.hbs
+++ b/ui/admin/app/components/form/credential/ssh_private_key/index.hbs
@@ -28,22 +28,24 @@
{{/if}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if @model.isNew}}
{{t 'form.type.label'}}
@@ -95,22 +97,26 @@
{{#if (or @model.isNew form.isEditable)}}
-
+ {{t 'resources.credential.form.private_key.label'}}
+ {{t
+ 'resources.credential.form.private_key.help'
+ }}
{{#if @model.errors.private_key}}
-
+
{{#each @model.errors.private_key as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{/if}}
-
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if @model.isNew}}
{{t 'form.type.label'}}
diff --git a/ui/admin/app/components/form/group/index.hbs b/ui/admin/app/components/form/group/index.hbs
index bc328317d..9dda5c39d 100644
--- a/ui/admin/app/components/form/group/index.hbs
+++ b/ui/admin/app/components/form/group/index.hbs
@@ -30,25 +30,24 @@
{{/if}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if (can 'save model' @model)}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if @model.isNew}}
diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs
index 238a3e334..697a7b385 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -29,24 +29,24 @@
{{/if}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if @model.isNew}}
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 23bed2624..e0a1dc1a8 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -30,25 +30,24 @@
{{/if}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if @model.isNew}}
diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs
index 28e99317b..52616e421 100644
--- a/ui/admin/app/components/form/host-set/aws/index.hbs
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -31,25 +31,24 @@
{{/if}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
-
+ {{t 'resources.host-set.form.filter.label'}}
+ {{t
+ 'resources.host-set.form.filter.azure.help'
+ }}
{{#if @model.errors.filter_string}}
-
+
{{#each @model.errors.filter_string as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
+
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if (can 'save model' @model)}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
{{#if (can 'save model' @model)}}
-
+ {{t 'form.description.label'}}
+ {{t 'form.description.help'}}
{{#if @model.errors.description}}
-
+
{{#each @model.errors.description as |error|}}
- {{error.message}}
+ {{error.message}}
{{/each}}
-
+
{{/if}}
-
+
<:title>{{t 'resources.worker.form.worker_tags.label'}}
<:description>{{t 'resources.worker.form.worker_tags.help'}}
diff --git a/ui/admin/tests/acceptance/credential-store/credentials/create-test.js b/ui/admin/tests/acceptance/credential-store/credentials/create-test.js
index 67133fb92..ff4529c69 100644
--- a/ui/admin/tests/acceptance/credential-store/credentials/create-test.js
+++ b/ui/admin/tests/acceptance/credential-store/credentials/create-test.js
@@ -280,7 +280,7 @@ module(
.dom('.rose-notification-body')
.hasText('Error in provided request.');
assert
- .dom('.rose-form-error-message')
+ .dom('.hds-form-error__message')
.hasText('Field required for creating a username-key-pair credential.');
});