From cb1873b336a1951fc34c6e2c5f7770ac2d80480c Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Tue, 2 Jun 2020 17:41:05 -0700
Subject: [PATCH 1/7] do not show replication mode or id when replication isn't
 enabled

---
 .../core/addon/components/replication-header.js   |  1 +
 ui/lib/core/addon/components/replication-page.js  |  7 +++++--
 .../templates/components/replication-header.hbs   | 14 ++++++++------
 .../components/replication-header-test.js         | 15 +++++++++++++++
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/ui/lib/core/addon/components/replication-header.js b/ui/lib/core/addon/components/replication-header.js
index 1c6b4aa44c46..f34a1ac4db54 100644
--- a/ui/lib/core/addon/components/replication-header.js
+++ b/ui/lib/core/addon/components/replication-header.js
@@ -22,6 +22,7 @@ import layout from '../templates/components/replication-header';
 
 export default Component.extend({
   layout,
+  data: null,
   classNames: ['replication-header'],
   isSecondary: null,
   secondaryId: null,
diff --git a/ui/lib/core/addon/components/replication-page.js b/ui/lib/core/addon/components/replication-page.js
index 5d5e3ad2de2a..10876f744cf3 100644
--- a/ui/lib/core/addon/components/replication-page.js
+++ b/ui/lib/core/addon/components/replication-page.js
@@ -131,9 +131,12 @@ export default Component.extend({
     return false;
   }),
   message: computed('model.{anyReplicationEnabled}', 'formattedReplicationMode', function() {
+    let msg;
     if (this.model.anyReplicationEnabled) {
-      return `This ${this.formattedReplicationMode} secondary has not been enabled.  You can do so from the ${this.formattedReplicationMode} Primary.`;
+      msg = `This ${this.formattedReplicationMode} secondary has not been enabled.  You can do so from the ${this.formattedReplicationMode} Primary.`;
+    } else {
+      msg = `This cluster has not been enabled as a ${this.formattedReplicationMode} Secondary. You can do so by enabling replication and adding a secondary from the ${this.formattedReplicationMode} Primary.`;
     }
-    return `This cluster has not been enabled as a ${this.formattedReplicationMode} Secondary. You can do so by enabling replication and adding a secondary from the ${this.formattedReplicationMode} Primary.`;
+    return msg;
   }),
 });
diff --git a/ui/lib/core/addon/templates/components/replication-header.hbs b/ui/lib/core/addon/templates/components/replication-header.hbs
index 70653fac34c1..a26f1a74098d 100644
--- a/ui/lib/core/addon/templates/components/replication-header.hbs
+++ b/ui/lib/core/addon/templates/components/replication-header.hbs
@@ -35,12 +35,14 @@
   <p.levelLeft>
     <h1 class="title is-3">
       {{title}}
-      <span class="tag is-light has-text-grey-dark" data-test-mode>
-        {{if isSecondary 'secondary' 'primary'}}
-      </span>
-      <span class="tag is-light has-text-grey-dark" data-test-secondaryId>
-        {{secondaryId}}
-      </span>
+      {{#if data.anyReplicationEnabled}}
+        <span class="tag is-light has-text-grey-dark" data-test-mode>
+          {{if isSecondary 'secondary' 'primary'}}
+        </span>
+        <span class="tag is-light has-text-grey-dark" data-test-secondaryId>
+          {{secondaryId}}
+        </span>
+      {{/if}}
     </h1>
   </p.levelLeft>
 </PageHeader>
diff --git a/ui/tests/integration/components/replication-header-test.js b/ui/tests/integration/components/replication-header-test.js
index 7da66af93d33..356b67c01b8b 100644
--- a/ui/tests/integration/components/replication-header-test.js
+++ b/ui/tests/integration/components/replication-header-test.js
@@ -4,6 +4,7 @@ import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 const DATA = {
+  anyReplicationEnabled: true,
   dr: {
     mode: 'secondary',
     rm: {
@@ -41,6 +42,20 @@ module('Integration | Enterprise | Component | replication-header', function(hoo
     assert.dom('[data-test-mode]').includesText('secondary', `shows the correct mode value`);
   });
 
+  test('it does not render mode or secondaryId when replication is not enabled', async function(assert) {
+    const notEnabled = { anyReplicationEnabled: false };
+    const noId = null;
+    this.set('data', notEnabled);
+    this.set('secondaryId', noId);
+
+    await render(
+      hbs`<ReplicationHeader @data={{data}} @isSecondary={{isSecondary}} @title={{title}} @secondaryId={{secondaryId}}/>`
+    );
+
+    assert.dom('[data-test-secondaryId]').doesNotExist();
+    assert.dom('[data-test-mode]').doesNotExist();
+  });
+
   test('it does not show tabs when showTabs is not set', async function(assert) {
     await render(hbs`<ReplicationHeader @data={{data}} @isSecondary={{isSecondary}} @title={{title}}/>`);
 

From 6e935aca20cb54e65b3430a9771106ebc728a819 Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Wed, 3 Jun 2020 09:17:52 -0700
Subject: [PATCH 2/7] fix broken tag

---
 .../components/replication-header.hbs         | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/ui/lib/core/addon/templates/components/replication-header.hbs b/ui/lib/core/addon/templates/components/replication-header.hbs
index a26f1a74098d..baab9aa44596 100644
--- a/ui/lib/core/addon/templates/components/replication-header.hbs
+++ b/ui/lib/core/addon/templates/components/replication-header.hbs
@@ -51,24 +51,25 @@
   <div class="tabs-container box is-bottomless is-fullwidth is-paddingless" data-test-tabs>
     <nav class="tabs">
       {{#if (not isSummaryDashboard )}}
-      <ul>
-        {{#link-to
-          "vault.cluster.replication-dr-promote.details"
-          tagName="li"
-          activeClass="is-active"
-        }}
-          {{#link-to "vault.cluster.replication-dr-promote.details"}}
-            Details
+        <ul>
+          {{#link-to
+            "vault.cluster.replication-dr-promote.details"
+            tagName="li"
+            activeClass="is-active"
+          }}
+            {{#link-to "vault.cluster.replication-dr-promote.details"}}
+              Details
+            {{/link-to}}
           {{/link-to}}
-        {{/link-to}}
-        {{#link-to
-          "vault.cluster.replication-dr-promote"
-          tagName="li"
-          activeClass="is-active"
-          current-when="vault.cluster.replication-dr-promote.index"
-        }}
-          {{#link-to "vault.cluster.replication-dr-promote"}}
-            Manage
+          {{#link-to
+            "vault.cluster.replication-dr-promote"
+            tagName="li"
+            activeClass="is-active"
+            current-when="vault.cluster.replication-dr-promote.index"
+          }}
+            {{#link-to "vault.cluster.replication-dr-promote"}}
+              Manage
+            {{/link-to}}
           {{/link-to}}
         </ul>
       {{else}}

From a39c09162b39d6e1c9042c5292d9816316546002 Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Wed, 3 Jun 2020 09:32:17 -0700
Subject: [PATCH 3/7] fill in confirmation text when disabling replication in
 tests

---
 ui/tests/acceptance/enterprise-replication-test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/tests/acceptance/enterprise-replication-test.js b/ui/tests/acceptance/enterprise-replication-test.js
index c9ce93cff69c..f194e0a9e215 100644
--- a/ui/tests/acceptance/enterprise-replication-test.js
+++ b/ui/tests/acceptance/enterprise-replication-test.js
@@ -17,6 +17,9 @@ const disableReplication = async (type, assert) => {
   if (findAll('[data-test-replication-link="manage"]').length) {
     await click('[data-test-replication-link="manage"]');
     await click('[data-test-disable-replication] button');
+
+    const typeDisplay = type === 'dr' ? 'Disaster Recovery' : 'Performance';
+    await fillIn('[data-test-confirmation-modal-input]', typeDisplay);
     await click('[data-test-confirm-button]');
     if (assert) {
       assert.equal(currentURL(), `/vault/replication`, 'redirects to the replication page');

From 3d42c84853c1958a9f093adce15e274465f75abd Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Wed, 3 Jun 2020 09:33:43 -0700
Subject: [PATCH 4/7] fix typo

---
 ui/tests/acceptance/enterprise-replication-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/tests/acceptance/enterprise-replication-test.js b/ui/tests/acceptance/enterprise-replication-test.js
index f194e0a9e215..13457fbfe65c 100644
--- a/ui/tests/acceptance/enterprise-replication-test.js
+++ b/ui/tests/acceptance/enterprise-replication-test.js
@@ -124,7 +124,7 @@ module('Acceptance | Enterprise | replication', function(hooks) {
       `/vault/replication/performance/secondaries`,
       'redirects to the secondaries page'
     );
-    // nav back to details page and confirm secondary is in the know secondaries table
+    // nav back to details page and confirm secondary is in the known secondaries table
     await click('[data-test-replication-link="details"]');
     await settled();
     assert

From 4fec4db0c67c2c9eab3dfe9dbcdca3f0ea4fb8eb Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Wed, 3 Jun 2020 09:45:07 -0700
Subject: [PATCH 5/7] fix demote primary test selector

---
 ui/tests/acceptance/enterprise-replication-test.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/tests/acceptance/enterprise-replication-test.js b/ui/tests/acceptance/enterprise-replication-test.js
index 13457fbfe65c..be83772eb4cd 100644
--- a/ui/tests/acceptance/enterprise-replication-test.js
+++ b/ui/tests/acceptance/enterprise-replication-test.js
@@ -257,9 +257,10 @@ module('Acceptance | Enterprise | replication', function(hooks) {
     await click('[data-test-replication-enable]');
     await pollCluster(this.owner);
     await settled();
-    await click('[data-test-replication-link="manage"]');
 
-    let demote = document.querySelectorAll('[data-test-confirm-action-trigger="true"]')[1];
+    // demote perf primary to a secondary
+    await click('[data-test-replication-link="manage"]');
+    const demote = document.querySelector('[data-test-replication-demote]').firstElementChild;
     await click(demote);
     await click('[data-test-confirm-button="true"]');
     await click('[data-test-replication-link="details"]');

From b224ad8760a7649721fea48045d5a49fd81988cc Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Wed, 3 Jun 2020 12:50:27 -0700
Subject: [PATCH 6/7] add test selectors and update tests to match new format

---
 .../helpers/replication-action-for-mode.js    |   1 +
 .../components/replication-action-promote.hbs |   2 +-
 .../components/replication-action-recover.hbs |   3 +-
 .../components/replication-action-reindex.hbs |  15 +--
 .../components/replication-header.hbs         |   1 -
 .../components/replication-actions-test.js    | 102 +++++++++++-------
 6 files changed, 77 insertions(+), 47 deletions(-)

diff --git a/ui/lib/core/addon/helpers/replication-action-for-mode.js b/ui/lib/core/addon/helpers/replication-action-for-mode.js
index 82c198d24f90..83af1e481260 100644
--- a/ui/lib/core/addon/helpers/replication-action-for-mode.js
+++ b/ui/lib/core/addon/helpers/replication-action-for-mode.js
@@ -8,6 +8,7 @@ const ACTIONS = {
   },
   dr: {
     primary: ['disable', 'recover', 'reindex', 'demote'],
+    // TODO: add disable, recover, reindex and update-primary when API is ready
     secondary: ['promote'],
     bootstrapping: ['disable', 'recover', 'reindex'],
   },
diff --git a/ui/lib/core/addon/templates/components/replication-action-promote.hbs b/ui/lib/core/addon/templates/components/replication-action-promote.hbs
index fc8a211ad5a2..9cee74cf6118 100644
--- a/ui/lib/core/addon/templates/components/replication-action-promote.hbs
+++ b/ui/lib/core/addon/templates/components/replication-action-promote.hbs
@@ -1,4 +1,4 @@
-<div class="action-block is-rounded">
+<div class="action-block is-rounded" data-test-promote-replication>
   <div class="action-block-info">
     <h4 class="title is-5 is-marginless">
       Promote cluster
diff --git a/ui/lib/core/addon/templates/components/replication-action-recover.hbs b/ui/lib/core/addon/templates/components/replication-action-recover.hbs
index a6327961e068..a23cfc40b591 100644
--- a/ui/lib/core/addon/templates/components/replication-action-recover.hbs
+++ b/ui/lib/core/addon/templates/components/replication-action-recover.hbs
@@ -1,4 +1,4 @@
-<div class="action-block is-rounded">
+<div class="action-block is-rounded" data-test-recover-replication>
   <div class="action-block-info">
     <h4 class="title is-5 is-marginless">
       Recover
@@ -34,7 +34,6 @@
   <footer class="modal-card-foot modal-card-foot-outlined">
     <button
       class="button is-primary"
-      disabled={{if (and (eq replicationMode "dr") (not dr_operation_token)) true}}
       onclick={{action "onSubmit" "recover"}}
       data-test-recover-confirm-button
     >
diff --git a/ui/lib/core/addon/templates/components/replication-action-reindex.hbs b/ui/lib/core/addon/templates/components/replication-action-reindex.hbs
index bcaf6cda4df5..34388a740fb4 100644
--- a/ui/lib/core/addon/templates/components/replication-action-reindex.hbs
+++ b/ui/lib/core/addon/templates/components/replication-action-reindex.hbs
@@ -7,7 +7,6 @@
       Reindex the local data storage
     </p>
   </div>
-
   <div class="action-block-action">
     <button
       class="button is-secondary"
@@ -18,7 +17,6 @@
     </button>
   </div>
 </div>
-
 <Modal
   @title="Begin reindex?"
   @onClose={{action (mut isModalActive) false}}
@@ -28,17 +26,19 @@
 >
   <section class="modal-card-body">
     <p class="has-bottom-margin-m">
-      Reindexing can cause a very long delay on the number and size of objects in the data store. {{if model.replicationAttrs.isPrimary 'You should always re-index your secondary first.'}}
+      Reindexing can cause a very long delay depending on the number and size of objects in the data store.
+      {{if model.replicationAttrs.isPrimary 'You should always re-index your secondary first.'}}
     </p>
     <p>
-      Progress will be shown, and you will {{ if model.replicationAttrs.isPrimary 'not' }} be able to use Vault during this time.
+      Progress will be shown, and you will
+      {{if model.replicationAttrs.isPrimary 'not'}}
+      be able to use Vault during this time.
     </p>
   </section>
   <footer class="modal-card-foot modal-card-foot-outlined">
     <button
       class="button is-primary"
-      disabled={{if (and (eq replicationMode "dr") (not dr_operation_token)) true}}
-      onclick={{action "onSubmit" "reindex"}}
+      onclick={{action 'onSubmit' 'reindex'}}
       data-test-reindex-confirm-button
     >
       Reindex
@@ -46,7 +46,8 @@
     <button
       class="button is-secondary"
       onclick={{action (mut isModalActive) false}}
-      data-test-reindex-cancel-button>
+      data-test-reindex-cancel-button
+    >
       Cancel
     </button>
   </footer>
diff --git a/ui/lib/core/addon/templates/components/replication-header.hbs b/ui/lib/core/addon/templates/components/replication-header.hbs
index f38fa4617f06..47c28c5a4aab 100644
--- a/ui/lib/core/addon/templates/components/replication-header.hbs
+++ b/ui/lib/core/addon/templates/components/replication-header.hbs
@@ -70,7 +70,6 @@
             {{#link-to "vault.cluster.replication-dr-promote"}}
               Manage
             {{/link-to}}
-          {{/link-to}}
         {{/link-to}}
       </ul>
       {{else}}
diff --git a/ui/tests/integration/components/replication-actions-test.js b/ui/tests/integration/components/replication-actions-test.js
index fbe5eb176476..17e2c5c580cf 100644
--- a/ui/tests/integration/components/replication-actions-test.js
+++ b/ui/tests/integration/components/replication-actions-test.js
@@ -39,22 +39,54 @@ module('Integration | Component | replication actions', function(hooks) {
   });
 
   let testCases = [
-    ['dr', 'primary', 'disable', 'Disable Replication', null, ['disable', 'primary'], false],
-    ['performance', 'primary', 'disable', 'Disable Replication', null, ['disable', 'primary'], false],
-    ['dr', 'secondary', 'disable', 'Disable Replication', null, ['disable', 'secondary'], false],
-    ['performance', 'secondary', 'disable', 'Disable Replication', null, ['disable', 'secondary'], false],
-    ['dr', 'primary', 'recover', 'Recover', null, ['recover'], true],
-    ['performance', 'primary', 'recover', 'Recover', null, ['recover'], true],
-    ['performance', 'secondary', 'recover', 'Recover', null, ['recover'], true],
+    [
+      'dr',
+      'primary',
+      'disable',
+      'Disable Replication',
+      async function() {
+        fillIn('[data-test-confirmation-modal-input]', 'Disaster Recovery');
+      },
+      ['disable', 'primary'],
+      false,
+    ],
+    [
+      'performance',
+      'primary',
+      'disable',
+      'Disable Replication',
+      async function() {
+        fillIn('[data-test-confirmation-modal-input]', 'Performance');
+      },
+      ['disable', 'primary'],
+      false,
+    ],
+    [
+      'performance',
+      'secondary',
+      'disable',
+      'Disable Replication',
+      async function() {
+        fillIn('[data-test-confirmation-modal-input]', 'Disaster Recovery');
+      },
+      ['disable', 'secondary'],
+      false,
+    ],
+    ['dr', 'primary', 'recover', 'Recover', null, ['recover'], false],
+    ['performance', 'primary', 'recover', 'Recover', null, ['recover'], false],
+    ['performance', 'secondary', 'recover', 'Recover', null, ['recover'], false],
+
+    ['dr', 'primary', 'reindex', 'Reindex', null, ['reindex'], false],
+    ['performance', 'primary', 'reindex', 'Reindex', null, ['reindex'], false],
+    ['performance', 'secondary', 'reindex', 'Reindex', null, ['reindex'], false],
 
-    ['dr', 'primary', 'reindex', 'Reindex', null, ['reindex'], true],
-    ['performance', 'primary', 'reindex', 'Reindex', null, ['reindex'], true],
-    ['dr', 'secondary', 'reindex', 'Reindex', null, ['reindex'], true],
-    ['performance', 'secondary', 'reindex', 'Reindex', null, ['reindex'], true],
+    // ['dr', 'primary', 'demote', 'Demote cluster', null, ['demote', 'primary'], true],
+    // ['performance', 'primary', 'demote', 'Demote cluster', null, ['demote', 'primary'], true],
 
-    ['dr', 'primary', 'demote', 'Demote cluster', null, ['demote', 'primary'], true],
-    ['performance', 'primary', 'demote', 'Demote cluster', null, ['demote', 'primary'], true],
     // we don't do dr secondary promote in this component so just test perf
+    // re-enable this test when the DR secondary disable API endpoint is fixed
+    // ['dr', 'secondary', 'disable', 'Disable Replication', null, ['disable', 'secondary'], false],
+    // ['dr', 'secondary', 'reindex', 'Reindex', null, ['reindex'], false],
     [
       'performance',
       'secondary',
@@ -65,24 +97,24 @@ module('Integration | Component | replication actions', function(hooks) {
         await blur('[name="primary_cluster_addr"]');
       },
       ['promote', 'secondary', { primary_cluster_addr: 'cluster addr' }],
-      true,
+      false,
     ],
 
     // don't yet update-primary for dr
-    [
-      'performance',
-      'secondary',
-      'update-primary',
-      'Update primary',
-      async function() {
-        await fillIn('#secondary-token', 'token');
-        await blur('#secondary-token');
-        await fillIn('#primary_api_addr', 'addr');
-        await blur('#primary_api_addr');
-      },
-      ['update-primary', 'secondary', { token: 'token', primary_api_addr: 'addr' }],
-      true,
-    ],
+    // [
+    //   'performance',
+    //   'secondary',
+    //   'update-primary',
+    //   'Update primary',
+    //   async function() {
+    //     await fillIn('#secondary-token', 'token');
+    //     await blur('#secondary-token');
+    //     await fillIn('#primary_api_addr', 'addr');
+    //     await blur('#primary_api_addr');
+    //   },
+    //   ['update-primary', 'secondary', { token: 'token', primary_api_addr: 'addr' }],
+    //   true,
+    // ],
   ];
 
   for (let [
@@ -126,24 +158,22 @@ module('Integration | Component | replication actions', function(hooks) {
         {{replication-actions model=model replicationMode=replicationMode selectedAction=selectedAction onSubmit=(action onSubmit)}}
         `
       );
+
+      let selector = oldVersion ? 'h4' : `[data-test-${action}-replication] h4`;
       assert.equal(
-        find('h4').textContent.trim(),
+        find(selector).textContent.trim(),
         headerText,
         `${testKey}: renders the correct component header (${oldVersion})`
       );
 
-      if (typeof fillInFn === 'function') {
-        await fillInFn.call(this);
-      }
       if (oldVersion) {
         await click('[data-test-confirm-action-trigger]');
         await click('[data-test-confirm-button]');
       } else {
         await click('[data-test-replication-action-trigger]');
-        await fillIn(
-          '[data-test-confirmation-modal-input]',
-          replicationMode === 'dr' ? 'Disaster Recovery' : 'Performance'
-        );
+        if (typeof fillInFn === 'function') {
+          await fillInFn.call(this);
+        }
         await blur('[data-test-confirmation-modal-input]');
         await click('[data-test-confirm-button]');
       }

From 05bf1890fadd4b478145bb5225b58fbf61ef65db Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Wed, 3 Jun 2020 15:30:01 -0700
Subject: [PATCH 7/7] fill in Performance when disabling performance secondary

---
 ui/tests/integration/components/replication-actions-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/tests/integration/components/replication-actions-test.js b/ui/tests/integration/components/replication-actions-test.js
index 17e2c5c580cf..9b6cf6000f88 100644
--- a/ui/tests/integration/components/replication-actions-test.js
+++ b/ui/tests/integration/components/replication-actions-test.js
@@ -67,7 +67,7 @@ module('Integration | Component | replication actions', function(hooks) {
       'disable',
       'Disable Replication',
       async function() {
-        fillIn('[data-test-confirmation-modal-input]', 'Disaster Recovery');
+        fillIn('[data-test-confirmation-modal-input]', 'Performance');
       },
       ['disable', 'secondary'],
       false,