From 20956aaf680e7d1a90ddcea1d4c876187463bcfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Fri, 5 Jun 2020 22:38:31 +0100
Subject: [PATCH] fix(ui): drop useLocalStore from AlertGrid

---
 ui/src/Components/Grid/AlertGrid/index.js     | 61 +++++++++----------
 .../Components/Grid/AlertGrid/index.test.js   | 12 +++-
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/ui/src/Components/Grid/AlertGrid/index.js b/ui/src/Components/Grid/AlertGrid/index.js
index 8310eca4a..d63f4ccf9 100644
--- a/ui/src/Components/Grid/AlertGrid/index.js
+++ b/ui/src/Components/Grid/AlertGrid/index.js
@@ -1,7 +1,7 @@
-import React, { useEffect, useCallback } from "react";
+import React, { useEffect, useCallback, useState } from "react";
 import PropTypes from "prop-types";
 
-import { useLocalStore, useObserver } from "mobx-react";
+import { useObserver } from "mobx-react";
 
 import debounce from "lodash.debounce";
 
@@ -16,39 +16,34 @@ import { GridSizesConfig, GetGridElementWidth } from "./GridSize";
 const GridPadding = 5;
 
 const AlertGrid = ({ alertStore, settingsStore, silenceFormStore }) => {
-  // this is used to track viewport width, when browser window is resized
-  // we need to recreate the entire grid object to apply new column count
-  // and group size
-  const viewport = useLocalStore(() => ({
-    canvasWidth: document.body.clientWidth,
-    windowWidth: window.innerWidth,
-    updateWidths(canvasWidth, windowWidth) {
-      this.canvasWidth = canvasWidth;
-      this.windowWidth = windowWidth;
-    },
-    get gridSizesConfig() {
-      return GridSizesConfig(
-        this.windowWidth,
-        settingsStore.gridConfig.config.groupWidth
-      );
-    },
-    get groupWidth() {
-      return GetGridElementWidth(
-        this.canvasWidth,
-        this.windowWidth,
-        alertStore.data.grids.filter((g) => g.labelName !== "").length > 0
-          ? GridPadding * 2
-          : 0,
-        settingsStore.gridConfig.config.groupWidth
-      );
-    },
-  }));
+  const getGridSizesConfig = (windowWidth) =>
+    GridSizesConfig(windowWidth, settingsStore.gridConfig.config.groupWidth);
+
+  const getGroupWidth = (canvasWidth, windowWidth) =>
+    GetGridElementWidth(
+      canvasWidth,
+      windowWidth,
+      alertStore.data.grids.filter((g) => g.labelName !== "").length > 0
+        ? GridPadding * 2
+        : 0,
+      settingsStore.gridConfig.config.groupWidth
+    );
+
+  const [gridSizesConfig, setGridSizesConfig] = useState(
+    getGridSizesConfig(window.innerWidth)
+  );
+  const [groupWidth, setGroupWidth] = useState(
+    getGroupWidth(document.body.clientWidth, window.innerWidth)
+  );
 
   const handleResize = useCallback(
     debounce(() => {
-      viewport.updateWidths(document.body.clientWidth, window.innerWidth);
+      setGridSizesConfig(getGridSizesConfig(window.innerWidth));
+      setGroupWidth(
+        getGroupWidth(document.body.clientWidth, window.innerWidth)
+      );
     }, 100),
-    [viewport]
+    []
   );
 
   useEffect(() => {
@@ -67,8 +62,8 @@ const AlertGrid = ({ alertStore, settingsStore, silenceFormStore }) => {
           alertStore={alertStore}
           silenceFormStore={silenceFormStore}
           settingsStore={settingsStore}
-          gridSizesConfig={viewport.gridSizesConfig}
-          groupWidth={viewport.groupWidth}
+          gridSizesConfig={gridSizesConfig}
+          groupWidth={groupWidth}
           grid={grid}
           outerPadding={grid.labelName !== "" ? GridPadding : 0}
         />
diff --git a/ui/src/Components/Grid/AlertGrid/index.test.js b/ui/src/Components/Grid/AlertGrid/index.test.js
index 458b072f3..f35467121 100644
--- a/ui/src/Components/Grid/AlertGrid/index.test.js
+++ b/ui/src/Components/Grid/AlertGrid/index.test.js
@@ -438,7 +438,9 @@ describe("<AlertGrid />", () => {
     // then resize and verify if column count was changed
     document.body.clientWidth = 1000;
     window.innerWidth = 1000;
-    window.dispatchEvent(new Event("resize"));
+    act(() => {
+      window.dispatchEvent(new Event("resize"));
+    });
     wrapper.update();
     expect(wrapper.find("Grid").props().groupWidth).toBe(1000 / 2);
 
@@ -469,7 +471,9 @@ describe("<AlertGrid />", () => {
     // then resize and verify if column count was changed
     document.body.clientWidth = 1584;
     window.innerWidth = 1600;
-    window.dispatchEvent(new Event("resize"));
+    act(() => {
+      window.dispatchEvent(new Event("resize"));
+    });
     wrapper.update();
     tree.setProps({
       gridSizesConfig: wrapper.find("Grid").props().gridSizesConfig,
@@ -493,7 +497,9 @@ describe("<AlertGrid />", () => {
     for (var index = 0; index < 14; index++) {
       document.body.clientWidth = index % 2 === 0 ? 1600 : 1584;
       window.innerWidth = 1600;
-      window.dispatchEvent(new Event("resize"));
+      act(() => {
+        window.dispatchEvent(new Event("resize"));
+      });
       wrapper.update();
       tree.setProps({
         gridSizesConfig: wrapper.find("Grid").props().gridSizesConfig,