From ffa446e8f6fd8a40ea46387c0b151cf390a8924e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Fri, 30 Nov 2018 23:22:16 +0000
Subject: [PATCH] chore(ui): update UI to consume cluster list as a dict

---
 .../Grid/AlertGrid/AlertGroup/Silence/index.test.js       | 2 +-
 ui/src/Components/Grid/AlertGrid/index.js                 | 2 +-
 ui/src/Components/Grid/AlertGrid/index.test.js            | 2 +-
 ui/src/Components/Grid/index.test.js                      | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/index.test.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/index.test.js
index 293aa7d9e..4e271c32f 100644
--- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/index.test.js
+++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/index.test.js
@@ -69,7 +69,7 @@ beforeEach(() => {
         clusterMembers: ["default"]
       }
     ],
-    clusters: [["default"]]
+    clusters: { default: ["default"] }
   };
   alertStore.data.silences = {
     default: {
diff --git a/ui/src/Components/Grid/AlertGrid/index.js b/ui/src/Components/Grid/AlertGrid/index.js
index 51b80c94e..abe63a535 100644
--- a/ui/src/Components/Grid/AlertGrid/index.js
+++ b/ui/src/Components/Grid/AlertGrid/index.js
@@ -102,7 +102,7 @@ const AlertGrid = observer(
                   key={id}
                   group={alertStore.data.groups[id]}
                   showAlertmanagers={
-                    alertStore.data.upstreams.clusters.length > 1
+                    Object.keys(alertStore.data.upstreams.clusters).length > 1
                   }
                   afterUpdate={this.masonryRepack}
                   settingsStore={settingsStore}
diff --git a/ui/src/Components/Grid/AlertGrid/index.test.js b/ui/src/Components/Grid/AlertGrid/index.test.js
index 2ce7457d7..29dbf4985 100644
--- a/ui/src/Components/Grid/AlertGrid/index.test.js
+++ b/ui/src/Components/Grid/AlertGrid/index.test.js
@@ -59,7 +59,7 @@ const MockGroupList = count => {
   alertStore.data.upstreams = {
     counters: { total: 0, healthy: 1, failed: 0 },
     instances: [{ name: "am", uri: "http://am", error: "" }],
-    clusters: [["am"]]
+    clusters: { am: ["am"] }
   };
   alertStore.data.groups = groups;
 };
diff --git a/ui/src/Components/Grid/index.test.js b/ui/src/Components/Grid/index.test.js
index 0ad096b26..b8ffb6109 100644
--- a/ui/src/Components/Grid/index.test.js
+++ b/ui/src/Components/Grid/index.test.js
@@ -37,7 +37,7 @@ describe("<Grid />", () => {
     alertStore.data.upstreams = {
       counters: { total: 1, healthy: 0, failed: 1 },
       instances: [{ name: "am1", uri: "http://am1", error: "error" }],
-      clusters: [["am1"]]
+      clusters: { am1: ["am1"] }
     };
     const tree = ShallowGrid();
     expect(tree.text()).toBe("<FatalError />");
@@ -47,7 +47,7 @@ describe("<Grid />", () => {
     alertStore.data.upstreams = {
       counters: { total: 1, healthy: 0, failed: 1 },
       instances: [{ name: "am1", uri: "http://am1", error: "" }],
-      clusters: [["am1"]]
+      clusters: { am1: ["am1"] }
     };
     const tree = ShallowGrid();
     expect(tree.text()).toBe("<AlertGrid />");
@@ -61,7 +61,7 @@ describe("<Grid />", () => {
         { name: "am2", uri: "file:///mock", error: "" },
         { name: "am3", uri: "http://am1", error: "error 2" }
       ],
-      clusters: [["am1"], ["am2"], ["am3"]]
+      clusters: { am1: ["am1"], am2: ["am2"], am3: ["am3"] }
     };
     const tree = ShallowGrid();
     expect(tree.text()).toBe("<UpstreamError /><UpstreamError /><AlertGrid />");
@@ -72,7 +72,7 @@ describe("<Grid />", () => {
     alertStore.data.upstreams = {
       counters: { total: 0, healthy: 0, failed: 1 },
       instances: [{ name: "am", uri: "http://am1", error: "error" }],
-      clusters: [["am"]]
+      clusters: { am1: ["am1"] }
     };
     const tree = ShallowGrid();
     expect(tree.text()).toBe("<FatalError />");