From 590179c98c057608c1f7c7dc9eff75fb2e056f77 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 17 Aug 2023 12:29:47 -0700 Subject: [PATCH 01/12] Initial ordering of cards --- .../helper-classes/flexbox-and-grid.scss | 12 ++ ui/app/templates/vault/cluster/dashboard.hbs | 118 ++++++++++++------ 2 files changed, 92 insertions(+), 38 deletions(-) diff --git a/ui/app/styles/helper-classes/flexbox-and-grid.scss b/ui/app/styles/helper-classes/flexbox-and-grid.scss index 39ca8fc09cf0..7561505f32c4 100644 --- a/ui/app/styles/helper-classes/flexbox-and-grid.scss +++ b/ui/app/styles/helper-classes/flexbox-and-grid.scss @@ -24,6 +24,10 @@ gap: $spacing-m; } +.has-gap-l { + gap: $spacing-l; +} + // Alignment of the items .is-flex-v-centered { display: flex; @@ -72,6 +76,10 @@ flex-basis: 100%; } +.is-flex-half-column { + flex: 1; +} + .is-flex-1 { flex-grow: 1; &.basis-0 { @@ -91,6 +99,10 @@ flex: 50%; } +.is-flex-column-wrap { + flex-flow: column wrap; +} + /* Flex Responsive */ @media screen and (min-width: 769px), print { .is-flex-v-centered-tablet { diff --git a/ui/app/templates/vault/cluster/dashboard.hbs b/ui/app/templates/vault/cluster/dashboard.hbs index 31f93c4747fa..f3550f072f7d 100644 --- a/ui/app/templates/vault/cluster/dashboard.hbs +++ b/ui/app/templates/vault/cluster/dashboard.hbs @@ -1,49 +1,91 @@ -
- {{#if (and @model.version.isEnterprise @model.license)}} - - - - {{/if}} - - {{#if (and @model.version.isEnterprise @model.isRootNamespace)}} - - - - {{/if}} +{{#if @model.version.isEnterprise}} +
+
+
+ {{#if (and @model.version.isEnterprise @model.license)}} + + + + {{/if}} - - - + {{#if (and @model.version.isEnterprise @model.isRootNamespace)}} + + + + {{/if}} - - - + + + +
+
-
- - - + + + -
- - Don't see what you're looking for on this page? Let us know via our - - feedback form - - + {{#if @model.vaultConfiguration}} + + + + {{/if}} + +
+ + + + +
+ + Don't see what you're looking for on this page? Let us know via our + + feedback form + + +
+
+
+{{else}} +
+ + + - {{#if @model.vaultConfiguration}} - + - {{/if}} -
\ No newline at end of file + +
+ + + + +
+ + Don't see what you're looking for on this page? Let us know via our + + feedback form + + +
+
+ + {{#if @model.vaultConfiguration}} + + + + {{/if}} +
+{{/if}} \ No newline at end of file From df1a645b80be8839f094a34c7f02c0fc03cc9405 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 17 Aug 2023 14:33:23 -0700 Subject: [PATCH 02/12] Update css class name from is-flex-1 to is-flex-grow-1 since the style is just updating flex-grow: 1 --- ui/app/styles/helper-classes/flexbox-and-grid.scss | 10 +++++----- ui/app/templates/components/auth-button-google.hbs | 2 +- ui/app/templates/components/logo-splash.hbs | 2 +- .../components/mfa/mfa-login-enforcement-form.hbs | 4 ++-- ui/app/templates/components/oidc-callback-splash.hbs | 2 +- ui/app/templates/components/splash-page.hbs | 2 +- .../templates/components/transit-key-action/verify.hbs | 8 ++++---- ui/app/templates/vault/cluster/oidc-provider-ns.hbs | 2 +- ui/app/templates/vault/cluster/oidc-provider.hbs | 2 +- .../vault/cluster/secrets/backend/versions.hbs | 2 +- ui/app/templates/vault/cluster/unseal.hbs | 2 +- ui/app/templates/vault/error.hbs | 2 +- ui/lib/core/addon/components/certificate-card.hbs | 2 +- ui/lib/core/addon/components/layout-loading.hbs | 2 +- ui/lib/core/addon/templates/components/list-item.hbs | 6 +++--- .../templates/components/replication-mode-summary.hbs | 2 +- ui/lib/kubernetes/addon/components/page/overview.hbs | 2 +- ui/lib/pki/addon/components/page/pki-overview.hbs | 6 +++--- ui/lib/pki/addon/components/pki-import-pem-bundle.hbs | 8 ++++---- ui/lib/pki/addon/components/pki-issuer-cross-sign.hbs | 4 ++-- 20 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ui/app/styles/helper-classes/flexbox-and-grid.scss b/ui/app/styles/helper-classes/flexbox-and-grid.scss index 7561505f32c4..a938d5312a07 100644 --- a/ui/app/styles/helper-classes/flexbox-and-grid.scss +++ b/ui/app/styles/helper-classes/flexbox-and-grid.scss @@ -76,17 +76,17 @@ flex-basis: 100%; } -.is-flex-half-column { - flex: 1; -} - -.is-flex-1 { +.is-flex-grow-1 { flex-grow: 1; &.basis-0 { flex-basis: 0; } } +.is-flex-1 { + flex: 1; +} + .is-no-flex-grow { flex-grow: 0 !important; } diff --git a/ui/app/templates/components/auth-button-google.hbs b/ui/app/templates/components/auth-button-google.hbs index 984957270c2d..c8c96ad81742 100644 --- a/ui/app/templates/components/auth-button-google.hbs +++ b/ui/app/templates/components/auth-button-google.hbs @@ -69,7 +69,7 @@ -
+
Sign in with Google
\ No newline at end of file diff --git a/ui/app/templates/components/logo-splash.hbs b/ui/app/templates/components/logo-splash.hbs index ca68711456c2..633a4c31a3e7 100644 --- a/ui/app/templates/components/logo-splash.hbs +++ b/ui/app/templates/components/logo-splash.hbs @@ -3,7 +3,7 @@ SPDX-License-Identifier: BUSL-1.1 ~}} -
+
diff --git a/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs b/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs index 00ef7a50f18f..a827c3392108 100644 --- a/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs +++ b/ui/app/templates/components/mfa/mfa-login-enforcement-form.hbs @@ -58,7 +58,7 @@ /> {{#each this.targets as |target|}}
- + {{#if target.value.id}} {{target.value.name}} {{target.value.id}} @@ -85,7 +85,7 @@ @onChange={{this.onTargetSelect}} data-test-mlef-select="target-type" /> -
+
{{#if (eq this.selectedTargetType "accessor")}} +
diff --git a/ui/app/templates/components/splash-page.hbs b/ui/app/templates/components/splash-page.hbs index 53bee45936ed..844c2740f6bc 100644 --- a/ui/app/templates/components/splash-page.hbs +++ b/ui/app/templates/components/splash-page.hbs @@ -7,7 +7,7 @@ {{#if @hasAltContent}} {{yield (hash altContent=(component "splash-page/splash-content"))}} {{else}} -
+
diff --git a/ui/app/templates/components/transit-key-action/verify.hbs b/ui/app/templates/components/transit-key-action/verify.hbs index 9d71a404c69d..2f6d8809f79b 100644 --- a/ui/app/templates/components/transit-key-action/verify.hbs +++ b/ui/app/templates/components/transit-key-action/verify.hbs @@ -143,14 +143,14 @@
{{#if (or (and @verification (eq @verification "HMAC")) @hmac)}} -
-
+
+
{{else}} -
-
+
+
+
{{#if this.model.error}} diff --git a/ui/app/templates/vault/cluster/oidc-provider.hbs b/ui/app/templates/vault/cluster/oidc-provider.hbs index 29745a876e99..24f57426bdc0 100644 --- a/ui/app/templates/vault/cluster/oidc-provider.hbs +++ b/ui/app/templates/vault/cluster/oidc-provider.hbs @@ -3,7 +3,7 @@ SPDX-License-Identifier: BUSL-1.1 ~}} -
+
{{#if this.model.error}} diff --git a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs index 3f891921248c..06a297fd6e99 100644 --- a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs +++ b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs @@ -32,7 +32,7 @@ as |Item| > -
+
Version diff --git a/ui/app/templates/vault/cluster/unseal.hbs b/ui/app/templates/vault/cluster/unseal.hbs index 92178b5c161f..ed9a02983d4b 100644 --- a/ui/app/templates/vault/cluster/unseal.hbs +++ b/ui/app/templates/vault/cluster/unseal.hbs @@ -4,7 +4,7 @@ ~}} {{#if this.showLicenseError}} -
+
+
diff --git a/ui/lib/core/addon/components/certificate-card.hbs b/ui/lib/core/addon/components/certificate-card.hbs index d667e80ef925..8834e96b9b89 100644 --- a/ui/lib/core/addon/components/certificate-card.hbs +++ b/ui/lib/core/addon/components/certificate-card.hbs @@ -12,7 +12,7 @@ -
+

{{this.format}}

diff --git a/ui/lib/core/addon/components/layout-loading.hbs b/ui/lib/core/addon/components/layout-loading.hbs index 33527c9fc6d2..5f4a19406980 100644 --- a/ui/lib/core/addon/components/layout-loading.hbs +++ b/ui/lib/core/addon/components/layout-loading.hbs @@ -3,7 +3,7 @@ SPDX-License-Identifier: BUSL-1.1 ~}} -
+
diff --git a/ui/lib/core/addon/templates/components/list-item.hbs b/ui/lib/core/addon/templates/components/list-item.hbs index e3c4434d103a..b9e98d9a75f2 100644 --- a/ui/lib/core/addon/templates/components/list-item.hbs +++ b/ui/lib/core/addon/templates/components/list-item.hbs @@ -14,11 +14,11 @@ data-test-list-item-link >
-
+
{{yield (hash content=(component "list-item/content"))}} @@ -35,7 +35,7 @@ {{else}}
-
+
{{yield (hash content=(component "list-item/content"))}}
diff --git a/ui/lib/core/addon/templates/components/replication-mode-summary.hbs b/ui/lib/core/addon/templates/components/replication-mode-summary.hbs index 427e8fe9d65e..ae94e978e086 100644 --- a/ui/lib/core/addon/templates/components/replication-mode-summary.hbs +++ b/ui/lib/core/addon/templates/components/replication-mode-summary.hbs @@ -6,7 +6,7 @@ {{#if this.isMenu}} {{! this is the status menu }}
-
+
{{#if this.replicationUnsupported}} Unsupported {{else if this.replicationEnabled}} diff --git a/ui/lib/kubernetes/addon/components/page/overview.hbs b/ui/lib/kubernetes/addon/components/page/overview.hbs index 3812c955b326..8bf1d365b580 100644 --- a/ui/lib/kubernetes/addon/components/page/overview.hbs +++ b/ui/lib/kubernetes/addon/components/page/overview.hbs @@ -25,7 +25,7 @@
-
+

Imported Issuer

-
+

Imported Key

@@ -23,7 +23,7 @@ data-test-import-pair={{concat imported.issuer "_" imported.key}} >
-
+
{{#if imported.issuer}} {{imported.issuer}} @@ -32,7 +32,7 @@ None {{/if}}
-
+
{{#if imported.key}} {{imported.key}} diff --git a/ui/lib/pki/addon/components/pki-issuer-cross-sign.hbs b/ui/lib/pki/addon/components/pki-issuer-cross-sign.hbs index bc6af6105a45..10b67f0f291c 100644 --- a/ui/lib/pki/addon/components/pki-issuer-cross-sign.hbs +++ b/ui/lib/pki/addon/components/pki-issuer-cross-sign.hbs @@ -20,7 +20,7 @@

{{#each this.inputFields as |column|}} -
+

{{column.label}} {{#if column.helpText}} @@ -40,7 +40,7 @@ /> {{#each (map-by "key" this.inputFields) as |columnAttr|}} {{#let (get crossSignRow columnAttr) as |data|}} -
+
{{#if (eq columnAttr "intermediateMount")}} {{data}} From 113279442c5d21c26884e9a2abd4a5b5ac3bc0a8 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 17 Aug 2023 14:34:25 -0700 Subject: [PATCH 03/12] Clean up cards in dashboard route template so that the card lives in the respective cards --- .../helper-classes/flexbox-and-grid.scss | 6 + .../dashboard/client-count-card.hbs | 108 ++++++------ .../components/dashboard/learn-more-card.hbs | 32 ++-- .../dashboard/quick-actions-card.hbs | 112 ++++++------ .../components/dashboard/replication-card.hbs | 164 +++++++++--------- .../dashboard/secrets-engines-card.hbs | 123 ++++++------- .../components/dashboard/survey-link-text.hbs | 8 + .../vault-configuration-details-card.hbs | 72 ++++---- ui/app/templates/vault/cluster/dashboard.hbs | 110 +++++------- 9 files changed, 364 insertions(+), 371 deletions(-) create mode 100644 ui/app/templates/components/dashboard/survey-link-text.hbs diff --git a/ui/app/styles/helper-classes/flexbox-and-grid.scss b/ui/app/styles/helper-classes/flexbox-and-grid.scss index a938d5312a07..6a54bdbe976f 100644 --- a/ui/app/styles/helper-classes/flexbox-and-grid.scss +++ b/ui/app/styles/helper-classes/flexbox-and-grid.scss @@ -113,6 +113,12 @@ } } +@include until($mobile) { + .is-flex-row { + flex-flow: column wrap; + } +} + /* CSS GRID */ .is-grid { display: grid; diff --git a/ui/app/templates/components/dashboard/client-count-card.hbs b/ui/app/templates/components/dashboard/client-count-card.hbs index 2291c4f8930d..1dc918653494 100644 --- a/ui/app/templates/components/dashboard/client-count-card.hbs +++ b/ui/app/templates/components/dashboard/client-count-card.hbs @@ -1,60 +1,60 @@ -
-

- Client count -

+ +
+

+ Client count +

-
- Details + Details
-
-
+
-{{#if this.noActivityData}} - {{! This will likely not be show since the client activity api was changed to always return data. In the past it + {{#if this.noActivityData}} + {{! This will likely not be show since the client activity api was changed to always return data. In the past it would return no activity data. Adding this empty state here to match the current client count behavior }} - -{{else}} -
- {{#if this.fetchClientActivity.isRunning}} - - {{else}} - - - {{/if}} -
- - {{#unless this.fetchClientActivity.isRunning}} -
- - - Updated - {{date-format this.updatedAt "MMM dd, yyyy HH:mm:SS"}} - + + {{else}} +
+ {{#if this.fetchClientActivity.isRunning}} + + {{else}} + + + {{/if}}
- {{/unless}} -{{/if}} \ No newline at end of file + + {{#unless this.fetchClientActivity.isRunning}} +
+ + + Updated + {{date-format this.updatedAt "MMM dd, yyyy HH:mm:SS"}} + +
+ {{/unless}} + {{/if}} + \ No newline at end of file diff --git a/ui/app/templates/components/dashboard/learn-more-card.hbs b/ui/app/templates/components/dashboard/learn-more-card.hbs index c809dbcb6ce1..8a480b50c263 100644 --- a/ui/app/templates/components/dashboard/learn-more-card.hbs +++ b/ui/app/templates/components/dashboard/learn-more-card.hbs @@ -1,15 +1,17 @@ -

Learn more

-
- Explore the features of Vault and learn advance practices with the following tutorials and documentation. -
-
- {{#each this.learnMoreLinks as |learnMoreLink|}} - - {{/each}} -
\ No newline at end of file + +

Learn more

+
+ Explore the features of Vault and learn advance practices with the following tutorials and documentation. +
+
+ {{#each this.learnMoreLinks as |learnMoreLink|}} + + {{/each}} +
+ \ No newline at end of file diff --git a/ui/app/templates/components/dashboard/quick-actions-card.hbs b/ui/app/templates/components/dashboard/quick-actions-card.hbs index d019a71c79a3..315921cd8b74 100644 --- a/ui/app/templates/components/dashboard/quick-actions-card.hbs +++ b/ui/app/templates/components/dashboard/quick-actions-card.hbs @@ -1,63 +1,65 @@ -

Quick actions

- -
-

Secrets engines

- -
- -{{#if this.selectedEngine}} -

Action

- + + {{#if this.searchSelectParams.model}} +

{{this.searchSelectParams.title}}

+ + -
- -
+
+ +
+ {{/if}} + {{else}} + {{/if}} -{{else}} - -{{/if}} \ No newline at end of file + \ No newline at end of file diff --git a/ui/app/templates/components/dashboard/replication-card.hbs b/ui/app/templates/components/dashboard/replication-card.hbs index b5e8b0dadba2..a8a80ebac8ad 100644 --- a/ui/app/templates/components/dashboard/replication-card.hbs +++ b/ui/app/templates/components/dashboard/replication-card.hbs @@ -2,91 +2,93 @@ Copyright (c) HashiCorp, Inc. SPDX-License-Identifier: BUSL-1.1 ~}} + -
-

- Replication -

+
+

+ Replication +

- - Details - -
- -{{! check if dr replication and performance replication exists }} -{{#if (or @replication.dr.clusterId @replication.performance.clusterId)}} -
- {{! check if user has access to both perf replication and dr replication }} - {{#if (and @version.hasPerfReplication @version.hasDRReplication)}} -
- - -
- {{! if user only has access to dr replication }} - {{else if @version.hasDRReplication}} - - DR Primary + + Details +
-
- - + {{! check if user has access to both perf replication and dr replication }} + {{#if (and @version.hasPerfReplication @version.hasDRReplication)}} +
+ + +
+ {{! if user only has access to dr replication }} + {{else if @version.hasDRReplication}} + + DR Primary + + +
+ + +
+ {{/if}} +
+ + + Updated + {{date-format @updatedAt "MMM dd, yyyy HH:mm:SS"}} +
+ {{else}} + +
+ Enable replication +
+ {{/if}} -
- - - Updated - {{date-format @updatedAt "MMM dd, yyyy HH:mm:SS"}} - -
-{{else}} - -
- Enable replication -
- -{{/if}} \ No newline at end of file + \ No newline at end of file diff --git a/ui/app/templates/components/dashboard/secrets-engines-card.hbs b/ui/app/templates/components/dashboard/secrets-engines-card.hbs index 09925a501326..cfedd84ec63d 100644 --- a/ui/app/templates/components/dashboard/secrets-engines-card.hbs +++ b/ui/app/templates/components/dashboard/secrets-engines-card.hbs @@ -1,72 +1,73 @@ -

Secrets engines

- - <:body as |B|> - {{#each this.filteredSecretsEngines as |backend|}} - - -
-
- {{#if backend.icon}} - - - - - -
- {{or backend.engineType backend.path}} -
- - - {{/if}} - {{#if backend.path}} - {{#if backend.isSupportedBackend}} - - {{backend.path}} - - {{else}} - {{backend.path}} + + +

Secrets engines

+ + <:body as |B|> + {{#each this.filteredSecretsEngines as |backend|}} + + +
+
+ {{#if backend.icon}} + + + + + +
+ {{or backend.engineType backend.path}} +
+ + + {{/if}} + {{#if backend.path}} + {{#if backend.isSupportedBackend}} + + {{backend.path}} + + {{else}} + {{backend.path}} + {{/if}} {{/if}} +
+ {{#if backend.accessor}} + + {{backend.accessor}} + + {{/if}} + {{#if backend.description}} +
+ {{backend.description}} +
{{/if}}
- {{#if backend.accessor}} - - {{backend.accessor}} - - {{/if}} - {{#if backend.description}} -
- {{backend.description}} -
- {{/if}} -
-
{{#if backend.isSupportedBackend}} - View - + {{/if}} -
- - - {{/each}} - - -
- -
\ No newline at end of file + + + {{/each}} + + +
+ +
+ \ No newline at end of file diff --git a/ui/app/templates/components/dashboard/survey-link-text.hbs b/ui/app/templates/components/dashboard/survey-link-text.hbs new file mode 100644 index 000000000000..ebab812e2fc1 --- /dev/null +++ b/ui/app/templates/components/dashboard/survey-link-text.hbs @@ -0,0 +1,8 @@ +
+ + Don't see what you're looking for on this page? Let us know via our + + feedback form + + +
\ No newline at end of file diff --git a/ui/app/templates/components/dashboard/vault-configuration-details-card.hbs b/ui/app/templates/components/dashboard/vault-configuration-details-card.hbs index c59f504ad703..ca21d9e5d6fb 100644 --- a/ui/app/templates/components/dashboard/vault-configuration-details-card.hbs +++ b/ui/app/templates/components/dashboard/vault-configuration-details-card.hbs @@ -1,36 +1,38 @@ -

Configuration details

+ +

Configuration details

- - <:body as |B|> - - API_ADDR - {{or @vaultConfiguration.api_addr "None"}} - - - Default lease TTL - {{format-duration - @vaultConfiguration.default_lease_ttl - }} - - - Max lease TTL - {{format-duration @vaultConfiguration.max_lease_ttl}} - - - TLS - {{this.tlsDisabled}} - - - Log format - {{or @vaultConfiguration.log_format "None"}} - - - Log level - {{@vaultConfiguration.log_level}} - - - Storage type - {{@vaultConfiguration.storage.type}} - - - \ No newline at end of file + + <:body as |B|> + + API_ADDR + {{or @vaultConfiguration.api_addr "None"}} + + + Default lease TTL + {{format-duration + @vaultConfiguration.default_lease_ttl + }} + + + Max lease TTL + {{format-duration @vaultConfiguration.max_lease_ttl}} + + + TLS + {{this.tlsDisabled}} + + + Log format + {{or @vaultConfiguration.log_format "None"}} + + + Log level + {{@vaultConfiguration.log_level}} + + + Storage type + {{@vaultConfiguration.storage.type}} + + + + \ No newline at end of file diff --git a/ui/app/templates/vault/cluster/dashboard.hbs b/ui/app/templates/vault/cluster/dashboard.hbs index f3550f072f7d..9e27d7053388 100644 --- a/ui/app/templates/vault/cluster/dashboard.hbs +++ b/ui/app/templates/vault/cluster/dashboard.hbs @@ -3,89 +3,59 @@ {{#if @model.version.isEnterprise}}
-
- {{#if (and @model.version.isEnterprise @model.license)}} - - - +
+ {{! Client count card }} + {{#if @model.license}} + {{/if}} - - {{#if (and @model.version.isEnterprise @model.isRootNamespace)}} - - - + {{! Replication card }} + {{#if @model.isRootNamespace}} + {{/if}} - - - - + {{! Secrets engines card }} +
-
- - - - +
+ {{! Quick actions card }} + + {{! Vault configuration card }} {{#if @model.vaultConfiguration}} - - - + {{/if}} - + {{! Learn more card w/ survey link }}
- - - - -
- - Don't see what you're looking for on this page? Let us know via our - - feedback form - - -
+ +
{{else}} -
- - - - - - - - -
- - - - -
- - Don't see what you're looking for on this page? Let us know via our - - feedback form - - +
+
+
+ {{! Secrets engines card }} + + {{! Learn more card w/ survey link }} +
+ + +
+
+
+ {{! Quick actions card }} + + {{! Vault configuration card }} + {{#if @model.vaultConfiguration}} + + {{/if}}
- - {{#if @model.vaultConfiguration}} - - - - {{/if}}
{{/if}} \ No newline at end of file From ff2158d723edbee1fa194afd5a2ecd99d53eff3a Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 17 Aug 2023 15:00:12 -0700 Subject: [PATCH 04/12] Add secrets-engines-card stylesheet to put a height on card --- ui/app/styles/components/secrets-engines-card.scss | 3 +++ ui/app/styles/core.scss | 1 + ui/app/templates/components/dashboard/secrets-engines-card.hbs | 3 +-- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 ui/app/styles/components/secrets-engines-card.scss diff --git a/ui/app/styles/components/secrets-engines-card.scss b/ui/app/styles/components/secrets-engines-card.scss new file mode 100644 index 000000000000..017f49759da8 --- /dev/null +++ b/ui/app/styles/components/secrets-engines-card.scss @@ -0,0 +1,3 @@ +.secrets-engines-card { + min-height: 480px; +} diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss index 045e0fe2116b..1eae551a5b9c 100644 --- a/ui/app/styles/core.scss +++ b/ui/app/styles/core.scss @@ -103,6 +103,7 @@ @import './components/search-select'; @import './components/selectable-card'; @import './components/selectable-card-container'; +@import './components/secrets-engines-card'; // action-block extends selectable-card @import './components/action-block'; @import './components/shamir-modal-flow'; diff --git a/ui/app/templates/components/dashboard/secrets-engines-card.hbs b/ui/app/templates/components/dashboard/secrets-engines-card.hbs index cfedd84ec63d..b8ac3f444e29 100644 --- a/ui/app/templates/components/dashboard/secrets-engines-card.hbs +++ b/ui/app/templates/components/dashboard/secrets-engines-card.hbs @@ -1,5 +1,4 @@ - - +

Secrets engines

<:body as |B|> From 49c880fce17335f079f1676df1accce014b8b7ca Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 17 Aug 2023 15:04:11 -0700 Subject: [PATCH 05/12] Update form label capitialization --- ui/app/components/dashboard/quick-actions-card.js | 2 +- .../integration/components/dashboard/quick-actions-card-test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/app/components/dashboard/quick-actions-card.js b/ui/app/components/dashboard/quick-actions-card.js index 6652c98d532b..8c34780a62e4 100644 --- a/ui/app/components/dashboard/quick-actions-card.js +++ b/ui/app/components/dashboard/quick-actions-card.js @@ -46,7 +46,7 @@ export default class DashboardQuickActionsCard extends Component { switch (this.selectedAction) { case 'Find KV secrets': return { - title: 'Secret Path', + title: 'Secret path', subText: 'Path of the secret you want to read, including the mount. E.g., secret/data/foo.', buttonText: 'Read secrets', model: 'secret-v2', diff --git a/ui/tests/integration/components/dashboard/quick-actions-card-test.js b/ui/tests/integration/components/dashboard/quick-actions-card-test.js index b0fee22cf7f1..1f95e610480d 100644 --- a/ui/tests/integration/components/dashboard/quick-actions-card-test.js +++ b/ui/tests/integration/components/dashboard/quick-actions-card-test.js @@ -126,7 +126,7 @@ module('Integration | Component | dashboard/quick-actions-card', function (hooks await selectChoose('.search-select', 'secrets-1-test'); assert.dom('[data-test-component="empty-state"]').doesNotExist(); await fillIn('[data-test-select="action-select"]', 'Find KV secrets'); - assert.dom('[data-test-search-select-params-title]').hasText('Secret Path'); + assert.dom('[data-test-search-select-params-title]').hasText('Secret path'); assert.dom('[data-test-button="Read secrets"]').exists({ count: 1 }); }); }); From c7cfbdeabe97d6ec22b0bb4648f055a9cbfccfdb Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 17 Aug 2023 15:38:44 -0700 Subject: [PATCH 06/12] VAULT-19159 Use PageHeader component so the margin matches other pages --- ui/app/styles/helper-classes/spacing.scss | 4 ++++ .../dashboard/vault-version-title.hbs | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ui/app/styles/helper-classes/spacing.scss b/ui/app/styles/helper-classes/spacing.scss index 22aa94b3f268..b3a0780ebd96 100644 --- a/ui/app/styles/helper-classes/spacing.scss +++ b/ui/app/styles/helper-classes/spacing.scss @@ -95,6 +95,10 @@ margin-bottom: -$spacing-m; } +.has-top-margin-xxs { + margin: $spacing-xxs 0; +} + .has-bottom-margin-xxs { margin-bottom: $spacing-xxs !important; } diff --git a/ui/app/templates/components/dashboard/vault-version-title.hbs b/ui/app/templates/components/dashboard/vault-version-title.hbs index add28e8bb702..de98dc9e5e37 100644 --- a/ui/app/templates/components/dashboard/vault-version-title.hbs +++ b/ui/app/templates/components/dashboard/vault-version-title.hbs @@ -1,8 +1,9 @@ -
-

- {{this.versionHeader}} -

- - - -
\ No newline at end of file + + +

+ {{this.versionHeader}} + +

+ + +
\ No newline at end of file From fa9e9e0a255f69a522ccfff61eb04d3c98288368 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 17 Aug 2023 15:51:58 -0700 Subject: [PATCH 07/12] Fix page header test --- ui/app/templates/components/dashboard/vault-version-title.hbs | 2 +- ui/tests/acceptance/dashboard-test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/app/templates/components/dashboard/vault-version-title.hbs b/ui/app/templates/components/dashboard/vault-version-title.hbs index de98dc9e5e37..339a64602619 100644 --- a/ui/app/templates/components/dashboard/vault-version-title.hbs +++ b/ui/app/templates/components/dashboard/vault-version-title.hbs @@ -1,6 +1,6 @@ -

+

{{this.versionHeader}}

diff --git a/ui/tests/acceptance/dashboard-test.js b/ui/tests/acceptance/dashboard-test.js index 2d214c126569..4de46d268839 100644 --- a/ui/tests/acceptance/dashboard-test.js +++ b/ui/tests/acceptance/dashboard-test.js @@ -114,7 +114,7 @@ module('Acceptance | landing page dashboard', function (hooks) { test('display the version number for the title', async function (assert) { await visit('/vault/dashboard'); - assert.dom('[data-test-dashboard-version-header]').hasText('Vault v1.9.0'); + assert.dom('[data-test-dashboard-version-header]').hasText('Vault v1.9.0 root'); }); module('secrets engines card', function () { From 49efe4e6fda7291fb04ffe3299719fababf9392b Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 17 Aug 2023 15:59:23 -0700 Subject: [PATCH 08/12] Remove comments from hbs file --- ui/app/templates/vault/cluster/dashboard.hbs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ui/app/templates/vault/cluster/dashboard.hbs b/ui/app/templates/vault/cluster/dashboard.hbs index 9e27d7053388..085283a4d6db 100644 --- a/ui/app/templates/vault/cluster/dashboard.hbs +++ b/ui/app/templates/vault/cluster/dashboard.hbs @@ -4,11 +4,9 @@
- {{! Client count card }} {{#if @model.license}} {{/if}} - {{! Replication card }} {{#if @model.isRootNamespace}} {{/if}} - {{! Secrets engines card }}
- {{! Quick actions card }} - {{! Vault configuration card }} {{#if @model.vaultConfiguration}} {{/if}} - {{! Learn more card w/ survey link }}
@@ -40,18 +34,14 @@
- {{! Secrets engines card }} - {{! Learn more card w/ survey link }}
- {{! Quick actions card }} - {{! Vault configuration card }} {{#if @model.vaultConfiguration}} {{/if}} From 180595469b1463ee6b8d73b5b12c0eefafac0d86 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 17 Aug 2023 16:00:40 -0700 Subject: [PATCH 09/12] Move div outside since both use it --- ui/app/templates/vault/cluster/dashboard.hbs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ui/app/templates/vault/cluster/dashboard.hbs b/ui/app/templates/vault/cluster/dashboard.hbs index 085283a4d6db..fa0e209c1c92 100644 --- a/ui/app/templates/vault/cluster/dashboard.hbs +++ b/ui/app/templates/vault/cluster/dashboard.hbs @@ -1,8 +1,9 @@ -{{#if @model.version.isEnterprise}} -
-
+
+
+ {{#if @model.version.isEnterprise}} +
{{#if @model.license}} @@ -28,11 +29,8 @@
-
-
-{{else}} -
-
+ + {{else}}
@@ -46,6 +44,6 @@ {{/if}}
-
+ {{/if}}
-{{/if}} \ No newline at end of file +
\ No newline at end of file From 2678193f943f57977539fc20b0240a9720ee270d Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 17 Aug 2023 16:02:33 -0700 Subject: [PATCH 10/12] Remove unused added styles --- ui/app/styles/helper-classes/flexbox-and-grid.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ui/app/styles/helper-classes/flexbox-and-grid.scss b/ui/app/styles/helper-classes/flexbox-and-grid.scss index 6a54bdbe976f..668efff1a580 100644 --- a/ui/app/styles/helper-classes/flexbox-and-grid.scss +++ b/ui/app/styles/helper-classes/flexbox-and-grid.scss @@ -99,10 +99,6 @@ flex: 50%; } -.is-flex-column-wrap { - flex-flow: column wrap; -} - /* Flex Responsive */ @media screen and (min-width: 769px), print { .is-flex-v-centered-tablet { From 691639a5818c21a26ceb74fa69ea8a3bbb47bca2 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Fri, 18 Aug 2023 07:28:31 -0700 Subject: [PATCH 11/12] Address feedback --- ui/app/styles/helper-classes/spacing.scss | 7 ++++++- ui/app/templates/components/dashboard/survey-link-text.hbs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/app/styles/helper-classes/spacing.scss b/ui/app/styles/helper-classes/spacing.scss index b3a0780ebd96..66581cd96359 100644 --- a/ui/app/styles/helper-classes/spacing.scss +++ b/ui/app/styles/helper-classes/spacing.scss @@ -98,7 +98,12 @@ .has-top-margin-xxs { margin: $spacing-xxs 0; } - +.has-right-margin-xxs { + margin-right: $spacing-xxs; +} +.has-left-margin-xxs { + margin-left: $spacing-xxs; +} .has-bottom-margin-xxs { margin-bottom: $spacing-xxs !important; } diff --git a/ui/app/templates/components/dashboard/survey-link-text.hbs b/ui/app/templates/components/dashboard/survey-link-text.hbs index ebab812e2fc1..43b4dbf30e56 100644 --- a/ui/app/templates/components/dashboard/survey-link-text.hbs +++ b/ui/app/templates/components/dashboard/survey-link-text.hbs @@ -2,7 +2,7 @@ Don't see what you're looking for on this page? Let us know via our - feedback form + feedback form.
\ No newline at end of file From eed3b0ba2dbd20055697e75a070ae020213e3d00 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Fri, 18 Aug 2023 09:23:44 -0700 Subject: [PATCH 12/12] Fix tests --- ui/tests/acceptance/dashboard-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/tests/acceptance/dashboard-test.js b/ui/tests/acceptance/dashboard-test.js index 4de46d268839..6161b84e3cb2 100644 --- a/ui/tests/acceptance/dashboard-test.js +++ b/ui/tests/acceptance/dashboard-test.js @@ -144,7 +144,7 @@ module('Acceptance | landing page dashboard', function (hooks) { assert.dom('[data-test-learn-more-links] a').exists({ count: 4 }); assert .dom('[data-test-feedback-form]') - .hasText("Don't see what you're looking for on this page? Let us know via our feedback form "); + .hasText("Don't see what you're looking for on this page? Let us know via our feedback form. "); }); });