diff --git a/ui/app/components/raft-storage-overview.hbs b/ui/app/components/raft-storage-overview.hbs index 09c42498ac..fed5f6ca62 100644 --- a/ui/app/components/raft-storage-overview.hbs +++ b/ui/app/components/raft-storage-overview.hbs @@ -3,9 +3,8 @@ SPDX-License-Identifier: BUSL-1.1 }} - - Raft Storage - + + <:actions> {{#if this.useServiceWorker}} @@ -19,8 +18,8 @@ {{/if}} Restore - - + + <:head as |H|> diff --git a/ui/app/components/secret-edit.hbs b/ui/app/components/secret-edit.hbs index 3c9946d66f..08022cdff7 100644 --- a/ui/app/components/secret-edit.hbs +++ b/ui/app/components/secret-edit.hbs @@ -4,8 +4,8 @@ }}
- - + + <:breadcrumbs> - - -

- {{#if (eq @mode "create")}} - Create Secret - {{else if (eq @mode "edit")}} - Edit Secret - {{else}} - {{@key.id}} - - {{/if}} -

- - + + + {{! tabs for show only }} {{#if (eq @mode "show")}}
diff --git a/ui/lib/core/addon/components/replication-header.hbs b/ui/lib/core/addon/components/replication-header.hbs index 00c56e76bc..0a7a0a8383 100644 --- a/ui/lib/core/addon/components/replication-header.hbs +++ b/ui/lib/core/addon/components/replication-header.hbs @@ -3,27 +3,26 @@ SPDX-License-Identifier: BUSL-1.1 }} - - + + <:breadcrumbs> {{#if (not (or @isSummaryDashboard @isSecondary))}} - - - - + {{/if}} - - -

- {{@title}} - {{#if @data.anyReplicationEnabled}} - - {{#if @secondaryId}} - - {{/if}} + + <:badges> + {{#if @data.anyReplicationEnabled}} + + {{#if @secondaryId}} + {{/if}} -

- - + {{/if}} + + {{#if @showTabs}}
diff --git a/ui/lib/core/addon/components/secret-list-header.hbs b/ui/lib/core/addon/components/secret-list-header.hbs index 0267ebc310..68212c0eb0 100644 --- a/ui/lib/core/addon/components/secret-list-header.hbs +++ b/ui/lib/core/addon/components/secret-list-header.hbs @@ -4,32 +4,16 @@ }} {{#let (options-for-backend this.effectiveEngineType) as |options|}} - - - - - - {{#if @isConfigure}} - - {{/if}} - - - -

- - {{@model.id}} - {{#if this.isKV}} - - {{/if}} -

- - - + + <:breadcrumbs> + + + <:badges> + {{#if this.isKV}} + + {{/if}} + + {{#if options.tabs}}
diff --git a/ui/lib/core/addon/components/secret-list-header.js b/ui/lib/core/addon/components/secret-list-header.js index 83385db071..3fc77cdde4 100644 --- a/ui/lib/core/addon/components/secret-list-header.js +++ b/ui/lib/core/addon/components/secret-list-header.js @@ -23,6 +23,26 @@ import { getEffectiveEngineType } from 'vault/utils/external-plugin-helpers'; */ export default class SecretListHeader extends Component { + get breadcrumbs() { + const breadcrumbs = [ + { label: 'Secrets', route: 'vault.cluster.secrets' }, + { + label: this.args.model.id, + route: 'vault.cluster.secrets.backend.list-root', + model: this.args.model.id, + current: !this.args.isConfigure, + }, + ]; + + if (this.args.isConfigure) { + breadcrumbs.push([{ label: 'Configure' }]); + + return breadcrumbs; + } + + return breadcrumbs; + } + get effectiveEngineType() { return getEffectiveEngineType(this.args.model.engineType); } diff --git a/ui/lib/core/addon/components/upgrade-page.hbs b/ui/lib/core/addon/components/upgrade-page.hbs index 3b621020d3..bf21c8f6c2 100644 --- a/ui/lib/core/addon/components/upgrade-page.hbs +++ b/ui/lib/core/addon/components/upgrade-page.hbs @@ -3,13 +3,7 @@ SPDX-License-Identifier: BUSL-1.1 }} - - -

- {{this.title}} -

- - + - + + <:breadcrumbs> - - -

- {{if this.credentials "Credentials" "Generate credentials"}} -

- - + + {{#if this.credentials}}
diff --git a/ui/lib/open-api-explorer/addon/components/swagger-ui.hbs b/ui/lib/open-api-explorer/addon/components/swagger-ui.hbs index de6efa1337..fe89e503df 100644 --- a/ui/lib/open-api-explorer/addon/components/swagger-ui.hbs +++ b/ui/lib/open-api-explorer/addon/components/swagger-ui.hbs @@ -3,13 +3,7 @@ SPDX-License-Identifier: BUSL-1.1 }} - - -

- API Explorer -

- - +
diff --git a/ui/lib/replication/addon/components/page/mode-index.hbs b/ui/lib/replication/addon/components/page/mode-index.hbs index 475d4c204b..1fac33d9ef 100644 --- a/ui/lib/replication/addon/components/page/mode-index.hbs +++ b/ui/lib/replication/addon/components/page/mode-index.hbs @@ -4,20 +4,8 @@ }} {{#if @replicationDisabled}} - - -

- {{#if (eq @replicationMode "dr")}} - Enable Disaster Recovery Replication - {{else if (eq @replicationMode "performance")}} - Enable Performance Replication - {{else}} - {{! should never get here, but have safe fallback just in case }} - Enable Replication - {{/if}} -

- - + +
{{#if (eq @replicationMode "dr")}}

diff --git a/ui/lib/replication/addon/components/page/mode-index.js b/ui/lib/replication/addon/components/page/mode-index.js index a1f1e2b0d5..baa5339618 100644 --- a/ui/lib/replication/addon/components/page/mode-index.js +++ b/ui/lib/replication/addon/components/page/mode-index.js @@ -22,6 +22,17 @@ import Component from '@glimmer/component'; * @param {string} replicationMode - should be "dr" or "performance" */ export default class PageModeIndex extends Component { + get title() { + if (this.args.replicationMode === 'dr') { + return 'Enable Disaster Recovery Replication'; + } + if (this.args.replicationMode === 'performance') { + return 'Enable Performance Replication'; + } + // should never get here, but have safe fallback just in case + return 'Enable Replication'; + } + canEnable = (type) => { const { cluster, replicationMode } = this.args; let perm; diff --git a/ui/lib/replication/addon/templates/index.hbs b/ui/lib/replication/addon/templates/index.hbs index dd565c56d6..c4be062011 100644 --- a/ui/lib/replication/addon/templates/index.hbs +++ b/ui/lib/replication/addon/templates/index.hbs @@ -7,24 +7,14 @@
{{#if (eq this.model.mode "unsupported")}} {{! Replication is unsupported in non-enterprise or when using non-transactional storage (eg inmem) }} - - -

- Replication unsupported -

- - + + {{else if this.model.replicationIsInitializing}} {{else if this.model.allReplicationDisabled}} - - -

- Enable Replication -

- - + +

- Replication -

- - +
{{else}} {{#if this.model.replicationAttrs.replicationEnabled}} - - - - - - - - -

- {{this.model.replicationModeForDisplay}} - -

- - + + <:breadcrumbs> + + + <:badges> + + + +