From 46bbd8ef1e55ec1f15ebc46828a4288c64565286 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Mon, 29 Jun 2020 10:08:14 -0600 Subject: [PATCH 01/15] fix issue where if dr is not enabled, the breadcrumb link did not work. Now if DR not enabled, the breadcrumb says replication and links back to rep index. --- .../templates/components/replication-header.hbs | 12 +++++++++--- .../addon/templates/components/replication-page.hbs | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ui/lib/core/addon/templates/components/replication-header.hbs b/ui/lib/core/addon/templates/components/replication-header.hbs index 47c28c5a4aa..ebf3edce5b8 100644 --- a/ui/lib/core/addon/templates/components/replication-header.hbs +++ b/ui/lib/core/addon/templates/components/replication-header.hbs @@ -25,9 +25,15 @@ / - {{#link-to "vault.cluster.replication-dr-promote"}} - Disaster Recovery - {{/link-to}} + {{#if isDisabled}} + {{#link-to "vault.cluster.replication.index"}} + Replication + {{/link-to}} + {{else}} + {{#link-to "vault.cluster.replication-dr-promote"}} + Disaster Recovery + {{/link-to}} + {{/if}} {{/key-value-header}} {{/if}} diff --git a/ui/lib/core/addon/templates/components/replication-page.hbs b/ui/lib/core/addon/templates/components/replication-page.hbs index 4a07bcd12bf..b3beefa11ad 100644 --- a/ui/lib/core/addon/templates/components/replication-page.hbs +++ b/ui/lib/core/addon/templates/components/replication-page.hbs @@ -10,6 +10,7 @@ isSecondary=isSecondary secondaryId=replicationDetails.secondaryId isSummaryDashboard=isSummaryDashboard + isDisabled=isDisabled ) dashboard=(component 'replication-dashboard' From 787a40da35b8a60553cd63fcaecd81eb2e59fccb Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Mon, 29 Jun 2020 12:34:12 -0600 Subject: [PATCH 02/15] show black nav when cluster is not initialized and is loading, no need for menu items and because NavHeader component and the icon live in the app and not addons I cannot access them without moving them. I figured the black bar was enough, and it wasn't worth moving just for that --- ui/lib/replication/addon/templates/index.hbs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/lib/replication/addon/templates/index.hbs b/ui/lib/replication/addon/templates/index.hbs index f4e55538193..d008b72c9c7 100644 --- a/ui/lib/replication/addon/templates/index.hbs +++ b/ui/lib/replication/addon/templates/index.hbs @@ -1,7 +1,11 @@
{{#if model.replicationIsInitializing }} - +
+ + +
{{else}} {{#if (eq model.mode 'unsupported')}} From 77122151aac06d41e4d20a7fda82c7540866c18f Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 30 Jun 2020 09:16:49 -0600 Subject: [PATCH 03/15] conditional change the breadcrumb link in Disaster Recovery based on what page they are currently on (details or manage). Before the breadcrumb link didn't do anything if they were on the manage page --- .../templates/components/replication-header.hbs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ui/lib/core/addon/templates/components/replication-header.hbs b/ui/lib/core/addon/templates/components/replication-header.hbs index ebf3edce5b8..c8a1d65e1af 100644 --- a/ui/lib/core/addon/templates/components/replication-header.hbs +++ b/ui/lib/core/addon/templates/components/replication-header.hbs @@ -30,9 +30,15 @@ Replication {{/link-to}} {{else}} - {{#link-to "vault.cluster.replication-dr-promote"}} - Disaster Recovery - {{/link-to}} + {{#if (eq pageType "manage")}} + {{#link-to "vault.cluster.replication-dr-promote.details"}} + Disaster Recovery + {{/link-to}} + {{else}} + {{#link-to "vault.cluster.replication-dr-promote"}} + Disaster Recovery + {{/link-to}} + {{/if}} {{/if}} {{/key-value-header}} From b58b5c3485bd98d73e8ff57dbf565782c8f464ac Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 30 Jun 2020 12:11:16 -0600 Subject: [PATCH 04/15] fix slow modal loading after demoting a dr secondary. due to shamir modal not being in the addon engine and erroring out. --- .../cluster/replication-dr-promote/index.hbs | 1 + .../core/addon}/components/shamir-flow.js | 29 ++++++++++--------- .../addon}/components/shamir-modal-flow.js | 0 .../templates/components/shamir-flow.hbs | 4 +-- .../components/shamir-modal-flow.hbs | 4 +-- ui/lib/core/app/components/shamir-flow.js | 1 + .../core/app/components/shamir-modal-flow.js | 1 + 7 files changed, 22 insertions(+), 18 deletions(-) rename ui/{app => lib/core/addon}/components/shamir-flow.js (90%) rename ui/{app => lib/core/addon}/components/shamir-modal-flow.js (100%) rename ui/{app => lib/core/addon}/templates/components/shamir-flow.hbs (97%) rename ui/{app => lib/core/addon}/templates/components/shamir-modal-flow.hbs (97%) create mode 100644 ui/lib/core/app/components/shamir-flow.js create mode 100644 ui/lib/core/app/components/shamir-modal-flow.js diff --git a/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs b/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs index da24814d600..4d3ee3ad2af 100644 --- a/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs +++ b/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs @@ -3,6 +3,7 @@ {{#if Page.isDisabled}} this.actionSuccess(resp), (...args) => this.actionError(...args)); }, + startGenerate: task(function*(data) { + if (this.generateAction) { + data.attempt = true; + } + this.attemptProgress(this.extractData(data)); + }).drop(), + + onSubmit: task(function*(data) { + if (!data.key) { + return; + } + this.attemptProgress(this.extractData(data)); + }).drop(), + actions: { reset() { this.reset(); @@ -148,20 +163,6 @@ export default Component.extend(DEFAULTS, { this.set('otp', null); }, - onSubmit(data) { - if (!data.key) { - return; - } - this.attemptProgress(this.extractData(data)); - }, - - startGenerate(data) { - if (this.generateAction) { - data.attempt = true; - } - this.attemptProgress(this.extractData(data)); - }, - setKey(_, keyFile) { this.set('pgp_key', keyFile.value); this.set('pgpKeyFile', keyFile); diff --git a/ui/app/components/shamir-modal-flow.js b/ui/lib/core/addon/components/shamir-modal-flow.js similarity index 100% rename from ui/app/components/shamir-modal-flow.js rename to ui/lib/core/addon/components/shamir-modal-flow.js diff --git a/ui/app/templates/components/shamir-flow.hbs b/ui/lib/core/addon/templates/components/shamir-flow.hbs similarity index 97% rename from ui/app/templates/components/shamir-flow.hbs rename to ui/lib/core/addon/templates/components/shamir-flow.hbs index ace02e1d89a..a6a1057086c 100644 --- a/ui/app/templates/components/shamir-flow.hbs +++ b/ui/lib/core/addon/templates/components/shamir-flow.hbs @@ -39,7 +39,7 @@
{{else if (and generateAction (not started))}} -
+ {{message-error errors=errors}} {{#if (eq generateStep 'chooseMethod')}}
@@ -118,7 +118,7 @@ {{/if}} {{else}} -
+
{{#if errors}}
diff --git a/ui/app/templates/components/shamir-modal-flow.hbs b/ui/lib/core/addon/templates/components/shamir-modal-flow.hbs similarity index 97% rename from ui/app/templates/components/shamir-modal-flow.hbs rename to ui/lib/core/addon/templates/components/shamir-modal-flow.hbs index 954a9e20dbf..ff5be91c2a8 100644 --- a/ui/app/templates/components/shamir-modal-flow.hbs +++ b/ui/lib/core/addon/templates/components/shamir-modal-flow.hbs @@ -48,7 +48,7 @@
{{else if (and generateAction (not started))}} - + {{message-error errors=errors}} {{#if (eq generateStep 'chooseMethod')}}
@@ -122,7 +122,7 @@ {{/if}} {{else}} -
+
{{#if errors}}
diff --git a/ui/lib/core/app/components/shamir-flow.js b/ui/lib/core/app/components/shamir-flow.js new file mode 100644 index 00000000000..e7ef071bb7f --- /dev/null +++ b/ui/lib/core/app/components/shamir-flow.js @@ -0,0 +1 @@ +export { default } from 'core/components/shamir-flow'; diff --git a/ui/lib/core/app/components/shamir-modal-flow.js b/ui/lib/core/app/components/shamir-modal-flow.js new file mode 100644 index 00000000000..16669241c46 --- /dev/null +++ b/ui/lib/core/app/components/shamir-modal-flow.js @@ -0,0 +1 @@ +export { default } from 'core/components/shamir-modal-flow'; From ca90536e13f1682782b941e68878be94d1075062 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Thu, 2 Jul 2020 10:29:17 -0600 Subject: [PATCH 05/15] to prevent confusing transition state during dr demotion, set new property on cluster and compare the mode of the dr which changes from primary to secondary during demotion. If dr mode changes, showing loading status --- ui/app/models/cluster.js | 1 + ui/lib/replication/addon/routes/mode.js | 13 +++ ui/lib/replication/addon/templates/mode.hbs | 94 +++++++++++---------- 3 files changed, 63 insertions(+), 45 deletions(-) diff --git a/ui/app/models/cluster.js b/ui/app/models/cluster.js index dea9ae2317d..6090d149fc3 100644 --- a/ui/app/models/cluster.js +++ b/ui/app/models/cluster.js @@ -53,6 +53,7 @@ export default DS.Model.extend({ // this service exposes what mode the UI is currently viewing // replicationAttrs will then return the relevant `replication-attributes` fragment rm: service('replication-mode'), + drMode: alias('dr.mode'), replicationMode: alias('rm.mode'), replicationModeForDisplay: computed('replicationMode', function() { return this.replicationMode === 'dr' ? 'Disaster Recovery' : 'Performance'; diff --git a/ui/lib/replication/addon/routes/mode.js b/ui/lib/replication/addon/routes/mode.js index c996ec97ae4..abf970c1a4c 100644 --- a/ui/lib/replication/addon/routes/mode.js +++ b/ui/lib/replication/addon/routes/mode.js @@ -1,4 +1,6 @@ import { inject as service } from '@ember/service'; +import { hash } from 'rsvp'; +import { setProperties } from '@ember/object'; import Route from '@ember/routing/route'; const SUPPORTED_REPLICATION_MODES = ['dr', 'performance']; @@ -17,4 +19,15 @@ export default Route.extend({ this.replicationMode.setMode(replicationMode); return this.modelFor('application'); }, + afterModel(model) { + return hash({ + // set new property on model to compare if the drMode changes when you are demoting the cluster + drModeInit: model.drMode, + }).then(({ drModeInit }) => { + setProperties(model, { + drModeInit, + }); + return model; + }); + }, }); diff --git a/ui/lib/replication/addon/templates/mode.hbs b/ui/lib/replication/addon/templates/mode.hbs index 9ca811ef34f..9a5af1c5959 100644 --- a/ui/lib/replication/addon/templates/mode.hbs +++ b/ui/lib/replication/addon/templates/mode.hbs @@ -1,57 +1,61 @@
- {{#if model.replicationAttrs.replicationEnabled}} - - -
From ae0d2afcfb8128fc73cc164f86180d5852632185 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Thu, 2 Jul 2020 11:15:30 -0600 Subject: [PATCH 06/15] get more specific about conditional so loader does not some on disabling, but only on demote --- ui/lib/core/addon/components/shamir-flow.js | 6 +++--- ui/lib/replication/addon/templates/mode.hbs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/lib/core/addon/components/shamir-flow.js b/ui/lib/core/addon/components/shamir-flow.js index d5e92d17d8d..c885e07ce76 100644 --- a/ui/lib/core/addon/components/shamir-flow.js +++ b/ui/lib/core/addon/components/shamir-flow.js @@ -3,7 +3,7 @@ import { gt } from '@ember/object/computed'; import { camelize } from '@ember/string'; import Component from '@ember/component'; import { get, computed } from '@ember/object'; -import { timeout, task } from 'ember-concurrency'; +import { task } from 'ember-concurrency'; const DEFAULTS = { key: null, @@ -146,14 +146,14 @@ export default Component.extend(DEFAULTS, { if (this.generateAction) { data.attempt = true; } - this.attemptProgress(this.extractData(data)); + yield this.attemptProgress(this.extractData(data)); }).drop(), onSubmit: task(function*(data) { if (!data.key) { return; } - this.attemptProgress(this.extractData(data)); + yield this.attemptProgress(this.extractData(data)); }).drop(), actions: { diff --git a/ui/lib/replication/addon/templates/mode.hbs b/ui/lib/replication/addon/templates/mode.hbs index 9a5af1c5959..221e9f8f115 100644 --- a/ui/lib/replication/addon/templates/mode.hbs +++ b/ui/lib/replication/addon/templates/mode.hbs @@ -1,6 +1,6 @@
- {{#if (not-eq model.drMode model.drModeInit)}} + {{#if (and (eq model.drMode "secondary") (eq model.drModeInit "primary"))}} {{else}} {{#if model.replicationAttrs.replicationEnabled}} From ba130430ae4bd61b78a269094326160b262dcb4d Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Thu, 2 Jul 2020 11:19:49 -0600 Subject: [PATCH 07/15] remove concurrency from onSubmit --- ui/lib/core/addon/components/shamir-flow.js | 14 +++++++------- .../addon/templates/components/shamir-flow.hbs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/lib/core/addon/components/shamir-flow.js b/ui/lib/core/addon/components/shamir-flow.js index c885e07ce76..793c25486ab 100644 --- a/ui/lib/core/addon/components/shamir-flow.js +++ b/ui/lib/core/addon/components/shamir-flow.js @@ -149,13 +149,6 @@ export default Component.extend(DEFAULTS, { yield this.attemptProgress(this.extractData(data)); }).drop(), - onSubmit: task(function*(data) { - if (!data.key) { - return; - } - yield this.attemptProgress(this.extractData(data)); - }).drop(), - actions: { reset() { this.reset(); @@ -163,6 +156,13 @@ export default Component.extend(DEFAULTS, { this.set('otp', null); }, + onSubmit(data) { + if (!data.key) { + return; + } + this.attemptProgress(this.extractData(data)); + }, + setKey(_, keyFile) { this.set('pgp_key', keyFile.value); this.set('pgpKeyFile', keyFile); diff --git a/ui/lib/core/addon/templates/components/shamir-flow.hbs b/ui/lib/core/addon/templates/components/shamir-flow.hbs index a6a1057086c..003bd67f413 100644 --- a/ui/lib/core/addon/templates/components/shamir-flow.hbs +++ b/ui/lib/core/addon/templates/components/shamir-flow.hbs @@ -118,7 +118,7 @@ {{/if}} {{else}} -
+
{{#if errors}}
From 5797ec8e8811d670c1886eb14a590bcc1f4d3d0b Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Thu, 2 Jul 2020 11:25:50 -0600 Subject: [PATCH 08/15] revert all concurency, I think this is solved by the removal of shamir in the dom --- ui/lib/core/addon/components/shamir-flow.js | 15 +++++++-------- .../addon/templates/components/shamir-flow.hbs | 2 +- .../templates/components/shamir-modal-flow.hbs | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ui/lib/core/addon/components/shamir-flow.js b/ui/lib/core/addon/components/shamir-flow.js index 793c25486ab..3a32c4c2740 100644 --- a/ui/lib/core/addon/components/shamir-flow.js +++ b/ui/lib/core/addon/components/shamir-flow.js @@ -3,7 +3,6 @@ import { gt } from '@ember/object/computed'; import { camelize } from '@ember/string'; import Component from '@ember/component'; import { get, computed } from '@ember/object'; -import { task } from 'ember-concurrency'; const DEFAULTS = { key: null, @@ -142,13 +141,6 @@ export default Component.extend(DEFAULTS, { .then(resp => this.actionSuccess(resp), (...args) => this.actionError(...args)); }, - startGenerate: task(function*(data) { - if (this.generateAction) { - data.attempt = true; - } - yield this.attemptProgress(this.extractData(data)); - }).drop(), - actions: { reset() { this.reset(); @@ -156,6 +148,13 @@ export default Component.extend(DEFAULTS, { this.set('otp', null); }, + startGenerate(data) { + if (this.generateAction) { + data.attempt = true; + } + this.attemptProgress(this.extractData(data)); + }, + onSubmit(data) { if (!data.key) { return; diff --git a/ui/lib/core/addon/templates/components/shamir-flow.hbs b/ui/lib/core/addon/templates/components/shamir-flow.hbs index 003bd67f413..dbca751c5ad 100644 --- a/ui/lib/core/addon/templates/components/shamir-flow.hbs +++ b/ui/lib/core/addon/templates/components/shamir-flow.hbs @@ -39,7 +39,7 @@
{{else if (and generateAction (not started))}} - + {{message-error errors=errors}} {{#if (eq generateStep 'chooseMethod')}}
diff --git a/ui/lib/core/addon/templates/components/shamir-modal-flow.hbs b/ui/lib/core/addon/templates/components/shamir-modal-flow.hbs index ff5be91c2a8..954a9e20dbf 100644 --- a/ui/lib/core/addon/templates/components/shamir-modal-flow.hbs +++ b/ui/lib/core/addon/templates/components/shamir-modal-flow.hbs @@ -48,7 +48,7 @@
{{else if (and generateAction (not started))}} - + {{message-error errors=errors}} {{#if (eq generateStep 'chooseMethod')}}
@@ -122,7 +122,7 @@ {{/if}} {{else}} -
+
{{#if errors}}
From 7c0a69154d3e14e62abc1108a946117f24e077c7 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Thu, 2 Jul 2020 11:27:36 -0600 Subject: [PATCH 09/15] reverse order --- ui/lib/core/addon/components/shamir-flow.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/lib/core/addon/components/shamir-flow.js b/ui/lib/core/addon/components/shamir-flow.js index 3a32c4c2740..8e89f4db95a 100644 --- a/ui/lib/core/addon/components/shamir-flow.js +++ b/ui/lib/core/addon/components/shamir-flow.js @@ -148,16 +148,16 @@ export default Component.extend(DEFAULTS, { this.set('otp', null); }, - startGenerate(data) { - if (this.generateAction) { - data.attempt = true; + onSubmit(data) { + if (!data.key) { + return; } this.attemptProgress(this.extractData(data)); }, - onSubmit(data) { - if (!data.key) { - return; + startGenerate(data) { + if (this.generateAction) { + data.attempt = true; } this.attemptProgress(this.extractData(data)); }, From e0f054638ef3e2658237f1d47bb1c213e6acf5a3 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Thu, 2 Jul 2020 12:38:32 -0600 Subject: [PATCH 10/15] cleanup --- ui/lib/core/addon/templates/components/shamir-flow.hbs | 2 +- ui/lib/replication/addon/templates/index.hbs | 3 +-- ui/lib/replication/addon/templates/mode.hbs | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/lib/core/addon/templates/components/shamir-flow.hbs b/ui/lib/core/addon/templates/components/shamir-flow.hbs index dbca751c5ad..ace02e1d89a 100644 --- a/ui/lib/core/addon/templates/components/shamir-flow.hbs +++ b/ui/lib/core/addon/templates/components/shamir-flow.hbs @@ -39,7 +39,7 @@
{{else if (and generateAction (not started))}} - + {{message-error errors=errors}} {{#if (eq generateStep 'chooseMethod')}}
diff --git a/ui/lib/replication/addon/templates/index.hbs b/ui/lib/replication/addon/templates/index.hbs index d008b72c9c7..a945ccc1fb7 100644 --- a/ui/lib/replication/addon/templates/index.hbs +++ b/ui/lib/replication/addon/templates/index.hbs @@ -2,8 +2,7 @@
{{#if model.replicationIsInitializing }}
- +
{{else}} diff --git a/ui/lib/replication/addon/templates/mode.hbs b/ui/lib/replication/addon/templates/mode.hbs index 221e9f8f115..75901bb3a5e 100644 --- a/ui/lib/replication/addon/templates/mode.hbs +++ b/ui/lib/replication/addon/templates/mode.hbs @@ -1,6 +1,7 @@
{{#if (and (eq model.drMode "secondary") (eq model.drModeInit "primary"))}} + {{else}} {{#if model.replicationAttrs.replicationEnabled}} From d201b5280c6eeca7c38d59aff79e86d62aaed51f Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Thu, 2 Jul 2020 13:14:22 -0600 Subject: [PATCH 11/15] forgot that tricky layout, hopefull this will fix test --- ui/lib/core/addon/components/shamir-flow.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/lib/core/addon/components/shamir-flow.js b/ui/lib/core/addon/components/shamir-flow.js index 8e89f4db95a..11ff4f787c5 100644 --- a/ui/lib/core/addon/components/shamir-flow.js +++ b/ui/lib/core/addon/components/shamir-flow.js @@ -3,6 +3,7 @@ import { gt } from '@ember/object/computed'; import { camelize } from '@ember/string'; import Component from '@ember/component'; import { get, computed } from '@ember/object'; +import layout from '../templates/components/shamir-flow'; const DEFAULTS = { key: null, @@ -26,6 +27,7 @@ export default Component.extend(DEFAULTS, { buttonText: 'Submit', thresholdPath: 'required', generateAction: false, + layout, init() { this._super(...arguments); From 3e6e998e49b6f1e0a867060c56155632d22f585b Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Thu, 2 Jul 2020 13:32:08 -0600 Subject: [PATCH 12/15] remove page container, it's not needed --- ui/lib/replication/addon/templates/index.hbs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ui/lib/replication/addon/templates/index.hbs b/ui/lib/replication/addon/templates/index.hbs index a945ccc1fb7..a8b208a2247 100644 --- a/ui/lib/replication/addon/templates/index.hbs +++ b/ui/lib/replication/addon/templates/index.hbs @@ -1,10 +1,8 @@
{{#if model.replicationIsInitializing }} -
- - -
+ + {{else}} {{#if (eq model.mode 'unsupported')}} From bd9d44f6cc0c59efc4785c95ed4526638aca0eb2 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Mon, 6 Jul 2020 10:56:31 -0600 Subject: [PATCH 13/15] remove breadcrumbs if DR secondary --- .../templates/components/replication-header.hbs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/ui/lib/core/addon/templates/components/replication-header.hbs b/ui/lib/core/addon/templates/components/replication-header.hbs index c8a1d65e1af..8c3b1174ae0 100644 --- a/ui/lib/core/addon/templates/components/replication-header.hbs +++ b/ui/lib/core/addon/templates/components/replication-header.hbs @@ -15,7 +15,7 @@ {{/if}} - {{#if (not isSummaryDashboard) }} + {{#if (not (or isSummaryDashboard isSecondary)) }} {{#key-value-header baseKey=baseKey path="vault.cluster.replication-dr-promote" @@ -30,15 +30,9 @@ Replication {{/link-to}} {{else}} - {{#if (eq pageType "manage")}} - {{#link-to "vault.cluster.replication-dr-promote.details"}} - Disaster Recovery - {{/link-to}} - {{else}} - {{#link-to "vault.cluster.replication-dr-promote"}} - Disaster Recovery - {{/link-to}} - {{/if}} + {{#link-to "vault.cluster.replication-dr-promote"}} + Disaster Recovery + {{/link-to}} {{/if}} {{/key-value-header}} From 5906c8bf4c0b657b636f909d992dd5901760fce4 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Mon, 6 Jul 2020 10:58:28 -0600 Subject: [PATCH 14/15] remove pageType no now longer using --- ui/app/templates/vault/cluster/replication-dr-promote/index.hbs | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs b/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs index 4d3ee3ad2af..da24814d600 100644 --- a/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs +++ b/ui/app/templates/vault/cluster/replication-dr-promote/index.hbs @@ -3,7 +3,6 @@ {{#if Page.isDisabled}} Date: Mon, 6 Jul 2020 11:04:15 -0600 Subject: [PATCH 15/15] remove conditional that is no longer hit --- .../templates/components/replication-header.hbs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ui/lib/core/addon/templates/components/replication-header.hbs b/ui/lib/core/addon/templates/components/replication-header.hbs index 8c3b1174ae0..bd03a24218b 100644 --- a/ui/lib/core/addon/templates/components/replication-header.hbs +++ b/ui/lib/core/addon/templates/components/replication-header.hbs @@ -25,15 +25,9 @@ / - {{#if isDisabled}} - {{#link-to "vault.cluster.replication.index"}} - Replication - {{/link-to}} - {{else}} - {{#link-to "vault.cluster.replication-dr-promote"}} - Disaster Recovery - {{/link-to}} - {{/if}} + {{#link-to "vault.cluster.replication.index"}} + Replication + {{/link-to}} {{/key-value-header}} {{/if}}