From d00ec06e5a8c741115d59f0c83155926f4764919 Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Mon, 8 Jun 2020 12:28:36 -0700
Subject: [PATCH 1/3] show secondaryId in table rows

---
 ui/lib/core/addon/components/replication-table-rows.js      | 5 ++++-
 .../addon/templates/components/replication-table-rows.hbs   | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/lib/core/addon/components/replication-table-rows.js b/ui/lib/core/addon/components/replication-table-rows.js
index 792c38763862..ba50d46c49c2 100644
--- a/ui/lib/core/addon/components/replication-table-rows.js
+++ b/ui/lib/core/addon/components/replication-table-rows.js
@@ -14,7 +14,7 @@ import layout from '../templates/components/replication-table-rows';
     />
  * ```
  * @param {Object} replicationDetails=null - An Ember data object pulled from the Ember Model. It contains details specific to the whether the replication is dr or performance.
- * @param {String} clusterMode=null - The cluster mode (e.g. primary or secondary) passed through to a table component. 
+ * @param {String} clusterMode=null - The cluster mode (e.g. primary or secondary) passed through to a table component.
  */
 
 export default Component.extend({
@@ -22,6 +22,9 @@ export default Component.extend({
   classNames: ['replication-table-rows'],
   replicationDetails: null,
   clusterMode: null,
+  secondaryId: computed('replicationDetails.{secondaryId}', function() {
+    return this.replicationDetails.secondaryId;
+  }),
   merkleRoot: computed('replicationDetails.{merkleRoot}', function() {
     return this.replicationDetails.merkleRoot || 'unknown';
   }),
diff --git a/ui/lib/core/addon/templates/components/replication-table-rows.hbs b/ui/lib/core/addon/templates/components/replication-table-rows.hbs
index 6a7d1453216b..0cceab620967 100644
--- a/ui/lib/core/addon/templates/components/replication-table-rows.hbs
+++ b/ui/lib/core/addon/templates/components/replication-table-rows.hbs
@@ -1,5 +1,11 @@
 <div class="has-top-margin-xl has-bottom-margin-s"
   data-test-table-rows>
+  {{#if (eq clusterMode 'secondary')}}
+    {{info-table-row
+      label='secondary_id'
+      helperText="The ID of the secondary activation token used to enable replication."
+      value=secondaryId}}
+  {{/if}}
   {{info-table-row
     label="Merkle root index"
     helperText="A snapshot in time of the merkle tree's root hash. Changes on every update to storage."

From d29c9d1526d0966eae5500ae70325ec6a93d14a5 Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Mon, 8 Jun 2020 12:53:03 -0700
Subject: [PATCH 2/3] show primary_cluster_addr in table rows

---
 ui/lib/core/addon/components/replication-table-rows.js        | 3 +++
 .../addon/templates/components/replication-table-rows.hbs     | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/ui/lib/core/addon/components/replication-table-rows.js b/ui/lib/core/addon/components/replication-table-rows.js
index ba50d46c49c2..897224c87124 100644
--- a/ui/lib/core/addon/components/replication-table-rows.js
+++ b/ui/lib/core/addon/components/replication-table-rows.js
@@ -25,6 +25,9 @@ export default Component.extend({
   secondaryId: computed('replicationDetails.{secondaryId}', function() {
     return this.replicationDetails.secondaryId;
   }),
+  primaryClusterAddr: computed('replcationDetails.{primaryClusterAddr}', function() {
+    return this.replicationDetails.primaryClusterAddr;
+  }),
   merkleRoot: computed('replicationDetails.{merkleRoot}', function() {
     return this.replicationDetails.merkleRoot || 'unknown';
   }),
diff --git a/ui/lib/core/addon/templates/components/replication-table-rows.hbs b/ui/lib/core/addon/templates/components/replication-table-rows.hbs
index 0cceab620967..595acf2b0f4c 100644
--- a/ui/lib/core/addon/templates/components/replication-table-rows.hbs
+++ b/ui/lib/core/addon/templates/components/replication-table-rows.hbs
@@ -6,6 +6,10 @@
       helperText="The ID of the secondary activation token used to enable replication."
       value=secondaryId}}
   {{/if}}
+  {{info-table-row
+      label='primary_cluster_addr'
+      helperText='The configuration of the cluster. This was set when replication was enabled.'
+      value=primaryClusterAddr}}
   {{info-table-row
     label="Merkle root index"
     helperText="A snapshot in time of the merkle tree's root hash. Changes on every update to storage."

From 9a5739ff4f386c369f0409c5344dc5f4b17bbd17 Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Mon, 8 Jun 2020 12:53:31 -0700
Subject: [PATCH 3/3] remove cluster Ids from replication headers

---
 .../templates/components/replication-header.hbs     |  3 ---
 ui/lib/replication/addon/templates/mode.hbs         | 13 -------------
 2 files changed, 16 deletions(-)

diff --git a/ui/lib/core/addon/templates/components/replication-header.hbs b/ui/lib/core/addon/templates/components/replication-header.hbs
index eaf596435e1f..7d6c80c194b1 100644
--- a/ui/lib/core/addon/templates/components/replication-header.hbs
+++ b/ui/lib/core/addon/templates/components/replication-header.hbs
@@ -38,9 +38,6 @@
       <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>
     </h1>
   </p.levelLeft>
 </PageHeader>
diff --git a/ui/lib/replication/addon/templates/mode.hbs b/ui/lib/replication/addon/templates/mode.hbs
index bc15de3accb9..9ca811ef34f7 100644
--- a/ui/lib/replication/addon/templates/mode.hbs
+++ b/ui/lib/replication/addon/templates/mode.hbs
@@ -24,19 +24,6 @@
               <span class="tag is-light has-text-grey-dark" data-test-replication-mode-display=true>
                 {{model.replicationAttrs.modeForHeader}}
               </span>
-              {{#if model.replicationAttrs.secondaryId}}
-                <span class="tag is-light has-text-grey-dark">
-                  <code>
-                    {{model.replicationAttrs.secondaryId}}
-                  </code>
-                </span>
-              {{else}}
-                <span class="tag is-light has-text-grey-dark">
-                  <code>
-                    {{model.replicationAttrs.clusterIdDisplay}}
-                  </code>
-                </span>
-              {{/if}}
             </h1>
         </p.levelLeft>
       </PageHeader>