Skip to content

Commit 44e86e4

Browse files
hc-github-team-secure-vault-corehc-github-team-secure-vault-core
committed
Merge remote-tracking branch 'remotes/from/ce/main'
2 parents 1cdeb67 + a78fd4e commit 44e86e4

32 files changed

+198
-224
lines changed

‎ui/app/components/raft-storage-overview.hbs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
SPDX-License-Identifier: BUSL-1.1
44
}}
55

6-
<Hds::PageHeader class="has-top-margin-xl has-bottom-margin-m" as |PH|>
7-
<PH.Title>Raft Storage</PH.Title>
8-
<PH.Actions>
6+
<Page::Header @title="Raft Storage">
7+
<:actions>
98
<Hds::Dropdown as |dd|>
109
<dd.ToggleButton @text="Snapshots" @color="secondary" />
1110
{{#if this.useServiceWorker}}
@@ -19,8 +18,8 @@
1918
{{/if}}
2019
<dd.Interactive @route="vault.cluster.storage-restore">Restore</dd.Interactive>
2120
</Hds::Dropdown>
22-
</PH.Actions>
23-
</Hds::PageHeader>
21+
</:actions>
22+
</Page::Header>
2423

2524
<Hds::Table @caption="Raft servers">
2625
<:head as |H|>

‎ui/app/components/secret-edit.hbs‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,18 @@
44
}}
55

66
<div {{did-insert this.createKvData @model}}>
7-
<PageHeader as |p|>
8-
<p.top>
7+
<Page::Header @title={{if (eq @mode "create") "Create Secret" (if (eq @mode "edit") "Edit Secret" @key.id)}}>
8+
<:breadcrumbs>
99
<KeyValueHeader
1010
@baseKey={{@baseKey}}
1111
@path="vault.cluster.secrets.backend.list"
1212
@mode={{@mode}}
1313
@root={{@root}}
1414
@showCurrent={{true}}
1515
/>
16-
</p.top>
17-
<p.levelLeft>
18-
<h1 class="title is-3">
19-
{{#if (eq @mode "create")}}
20-
Create Secret
21-
{{else if (eq @mode "edit")}}
22-
Edit Secret
23-
{{else}}
24-
{{@key.id}}
25-
<Hds::Copy::Button @isIconOnly={{true}} @text="Copy your secret path" @textToCopy={{@key.id}} />
26-
{{/if}}
27-
</h1>
28-
</p.levelLeft>
29-
</PageHeader>
16+
</:breadcrumbs>
17+
</Page::Header>
18+
3019
{{! tabs for show only }}
3120
{{#if (eq @mode "show")}}
3221
<div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless">

‎ui/lib/core/addon/components/replication-header.hbs‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,26 @@
33
SPDX-License-Identifier: BUSL-1.1
44
}}
55

6-
<PageHeader data-test-replication-header as |p|>
7-
<p.top>
6+
<Page::Header @title={{@title}}>
7+
<:breadcrumbs>
88
{{#if (not (or @isSummaryDashboard @isSecondary))}}
9-
<Hds::Breadcrumb>
10-
<Hds::Breadcrumb::Item @text="Replication" @route="vault.cluster.replication.index" />
11-
<Hds::Breadcrumb::Item @text={{@title}} @current={{true}} />
12-
</Hds::Breadcrumb>
9+
<Page::Breadcrumbs
10+
@breadcrumbs={{array (hash label="Replication" route="vault.cluster.replication.index") (hash label=@title)}}
11+
/>
1312
{{/if}}
14-
</p.top>
15-
<p.levelLeft>
16-
<h1 class="title is-3" data-test-replication-title={{@title}}>
17-
{{@title}}
18-
{{#if @data.anyReplicationEnabled}}
19-
<Hds::Badge @text={{if @isSecondary "secondary" "primary"}} data-test-mode />
20-
{{#if @secondaryId}}
21-
<Hds::Badge @text={{@secondaryId}} data-test-secondaryId />
22-
{{/if}}
13+
</:breadcrumbs>
14+
<:badges>
15+
{{#if @data.anyReplicationEnabled}}
16+
<Hds::Badge
17+
@text={{if @isSecondary "secondary" "primary"}}
18+
data-test-badge={{if @isSecondary "secondary" "primary"}}
19+
/>
20+
{{#if @secondaryId}}
21+
<Hds::Badge @text={{@secondaryId}} data-test-badge={{@secondaryId}} />
2322
{{/if}}
24-
</h1>
25-
</p.levelLeft>
26-
</PageHeader>
23+
{{/if}}
24+
</:badges>
25+
</Page::Header>
2726

2827
{{#if @showTabs}}
2928
<div class="tabs-container box is-bottomless is-fullwidth is-paddingless has-bottom-margin-l" data-test-tabs>

‎ui/lib/core/addon/components/secret-list-header.hbs‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,16 @@
44
}}
55

66
{{#let (options-for-backend this.effectiveEngineType) as |options|}}
7-
<PageHeader as |p|>
8-
<p.top>
9-
<Hds::Breadcrumb>
10-
<Hds::Breadcrumb::Item @text="Secrets" @route="vault.cluster.secrets" data-test-breadcrumb="Secrets" />
11-
<Hds::Breadcrumb::Item
12-
@text={{@model.id}}
13-
@current={{not @isConfigure}}
14-
@route="vault.cluster.secrets.backend.list-root"
15-
@model={{@model.id}}
16-
/>
17-
{{#if @isConfigure}}
18-
<Hds::Breadcrumb::Item @text="Configure" @current={{true}} />
19-
{{/if}}
20-
</Hds::Breadcrumb>
21-
</p.top>
22-
<p.levelLeft>
23-
<h1 class="title is-3">
24-
<Icon @name={{@model.icon}} @size="24" class="has-text-grey-light" />
25-
{{@model.id}}
26-
{{#if this.isKV}}
27-
<Hds::Badge @text="version {{or @model.version '1'}}" data-test-kv-version-badge />
28-
{{/if}}
29-
</h1>
30-
31-
</p.levelLeft>
32-
</PageHeader>
7+
<Page::Header @title={{@model.id}} @icon={{@model.icon}}>
8+
<:breadcrumbs>
9+
<Page::Breadcrumbs @breadcrumbs={{this.breadcrumbs}} />
10+
</:breadcrumbs>
11+
<:badges>
12+
{{#if this.isKV}}
13+
<Hds::Badge @text="version {{or @model.version '1'}}" data-test-badge="kv version" />
14+
{{/if}}
15+
</:badges>
16+
</Page::Header>
3317

3418
{{#if options.tabs}}
3519
<div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless">

‎ui/lib/core/addon/components/secret-list-header.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,26 @@ import { getEffectiveEngineType } from 'vault/utils/external-plugin-helpers';
2323
*/
2424

2525
export default class SecretListHeader extends Component {
26+
get breadcrumbs() {
27+
const breadcrumbs = [
28+
{ label: 'Secrets', route: 'vault.cluster.secrets' },
29+
{
30+
label: this.args.model.id,
31+
route: 'vault.cluster.secrets.backend.list-root',
32+
model: this.args.model.id,
33+
current: !this.args.isConfigure,
34+
},
35+
];
36+
37+
if (this.args.isConfigure) {
38+
breadcrumbs.push([{ label: 'Configure' }]);
39+
40+
return breadcrumbs;
41+
}
42+
43+
return breadcrumbs;
44+
}
45+
2646
get effectiveEngineType() {
2747
return getEffectiveEngineType(this.args.model.engineType);
2848
}

‎ui/lib/core/addon/components/upgrade-page.hbs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
SPDX-License-Identifier: BUSL-1.1
44
}}
55

6-
<PageHeader as |p|>
7-
<p.levelLeft>
8-
<h1 class="title is-3">
9-
{{this.title}}
10-
</h1>
11-
</p.levelLeft>
12-
</PageHeader>
6+
<Page::Header @title={{this.title}} />
137

148
<EmptyState
159
@title="Upgrade to use {{this.featureName}}"

‎ui/lib/kubernetes/addon/components/page/credentials.hbs‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,11 @@
33
SPDX-License-Identifier: BUSL-1.1
44
}}
55

6-
<PageHeader as |p|>
7-
<p.top>
6+
<Page::Header @title={{if this.credentials "Credentials" "Generate credentials"}}>
7+
<:breadcrumbs>
88
<Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
9-
</p.top>
10-
<p.levelLeft>
11-
<h1 class="title is-3 has-bottom-margin-2" data-test-credentials-header>
12-
{{if this.credentials "Credentials" "Generate credentials"}}
13-
</h1>
14-
</p.levelLeft>
15-
</PageHeader>
9+
</:breadcrumbs>
10+
</Page::Header>
1611

1712
{{#if this.credentials}}
1813
<div class="box is-sideless is-fullwidth is-marginless has-bottom-padding-l" data-test-credentials-details>

‎ui/lib/open-api-explorer/addon/components/swagger-ui.hbs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
SPDX-License-Identifier: BUSL-1.1
44
}}
55

6-
<PageHeader as |p|>
7-
<p.levelLeft>
8-
<h1 class="title is-3">
9-
API Explorer
10-
</h1>
11-
</p.levelLeft>
12-
</PageHeader>
6+
<Page::Header @title="API Explorer" />
137

148
<div class="box is-fullwidth is-sideless is-marginless">
159
<NamespaceReminder as |R|>

‎ui/lib/replication/addon/components/page/mode-index.hbs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,8 @@
44
}}
55

66
{{#if @replicationDisabled}}
7-
<PageHeader as |p|>
8-
<p.levelLeft>
9-
<h1 class="title is-3" data-test-replication-title={{@replicationMode}}>
10-
{{#if (eq @replicationMode "dr")}}
11-
Enable Disaster Recovery Replication
12-
{{else if (eq @replicationMode "performance")}}
13-
Enable Performance Replication
14-
{{else}}
15-
{{! should never get here, but have safe fallback just in case }}
16-
Enable Replication
17-
{{/if}}
18-
</h1>
19-
</p.levelLeft>
20-
</PageHeader>
7+
<Page::Header @title={{this.title}} />
8+
219
<div class="box is-sideless is-fullwidth is-marginless">
2210
{{#if (eq @replicationMode "dr")}}
2311
<h2 class="title is-flex-center is-5 is-marginless">

‎ui/lib/replication/addon/components/page/mode-index.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,17 @@ import Component from '@glimmer/component';
2222
* @param {string} replicationMode - should be "dr" or "performance"
2323
*/
2424
export default class PageModeIndex extends Component {
25+
get title() {
26+
if (this.args.replicationMode === 'dr') {
27+
return 'Enable Disaster Recovery Replication';
28+
}
29+
if (this.args.replicationMode === 'performance') {
30+
return 'Enable Performance Replication';
31+
}
32+
// should never get here, but have safe fallback just in case
33+
return 'Enable Replication';
34+
}
35+
2536
canEnable = (type) => {
2637
const { cluster, replicationMode } = this.args;
2738
let perm;

0 commit comments

Comments
 (0)