From 0efd3a9d3ce4682b1d65272d993728eca09dc3fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Mon, 30 Mar 2020 18:34:29 +0100
Subject: [PATCH] fix(ui): correctly pass UI defaults from config

---
 ui/src/Stores/Settings.js    | 8 ++++----
 ui/src/__mocks__/Defaults.js | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ui/src/Stores/Settings.js b/ui/src/Stores/Settings.js
index 179c020a5..2a6a623bc 100644
--- a/ui/src/Stores/Settings.js
+++ b/ui/src/Stores/Settings.js
@@ -159,8 +159,8 @@ class Settings {
         MinimalGroupWidth: 420,
         AlertsPerGroup: 5,
         CollapseGroups: "collapsedOnMobile",
-        GridLabel: "",
-        GridSortReverse: false,
+        MultiGridLabel: "",
+        MultiGridSortReverse: false,
       };
     } else {
       defaultSettings = defaults;
@@ -182,8 +182,8 @@ class Settings {
     );
     this.themeConfig = new ThemeConfig(defaultSettings.Theme);
     this.multiGridConfig = new MultiGridConfig(
-      defaultSettings.GridLabel,
-      defaultSettings.GridSortReverse
+      defaultSettings.MultiGridLabel,
+      defaultSettings.MultiGridSortReverse
     );
   }
 }
diff --git a/ui/src/__mocks__/Defaults.js b/ui/src/__mocks__/Defaults.js
index e663a35c5..a0b826950 100644
--- a/ui/src/__mocks__/Defaults.js
+++ b/ui/src/__mocks__/Defaults.js
@@ -1,5 +1,5 @@
 const DefaultsBase64 =
-  "eyJSZWZyZXNoIjo0NTAwMDAwMDAwMCwiSGlkZUZpbHRlcnNXaGVuSWRsZSI6ZmFsc2UsIkNvbG9yVGl0bGViYXIiOmZhbHNlLCJUaGVtZSI6ImxpZ2h0IiwiTWluaW1hbEdyb3VwV2lkdGgiOjU1NSwiQWxlcnRzUGVyR3JvdXAiOjE1LCJDb2xsYXBzZUdyb3VwcyI6ImV4cGFuZGVkIn0K==";
+  "eyJSZWZyZXNoIjo0NTAwMDAwMDAwMCwiSGlkZUZpbHRlcnNXaGVuSWRsZSI6ZmFsc2UsIkNvbG9yVGl0bGViYXIiOmZhbHNlLCJUaGVtZSI6ImxpZ2h0IiwiTWluaW1hbEdyb3VwV2lkdGgiOjU1NSwiQWxlcnRzUGVyR3JvdXAiOjE1LCJDb2xsYXBzZUdyb3VwcyI6ImV4cGFuZGVkIiwiTXVsdGlHcmlkTGFiZWwiOiIiLCJNdWx0aUdyaWRTb3J0UmV2ZXJzZSI6ZmFsc2V9Cg==";
 const DefaultsObject = {
   Refresh: 45000000000,
   HideFiltersWhenIdle: false,
@@ -8,6 +8,8 @@ const DefaultsObject = {
   MinimalGroupWidth: 555,
   AlertsPerGroup: 15,
   CollapseGroups: "expanded",
+  MultiGridLabel: "",
+  MultiGridSortReverse: false,
 };
 
 export { DefaultsBase64, DefaultsObject };