From 94217754d3a4c4ce99807cebe057296284745b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Mon, 8 Jun 2020 18:57:00 +0100 Subject: [PATCH] fix(ui): always use defaults for alert render count When default alert render count is changed all groups should reflect it --- .../Components/Grid/AlertGrid/AlertGroup/index.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/index.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/index.js index 5aeb04ae8..156f2e213 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/index.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/index.js @@ -1,7 +1,6 @@ import React, { useEffect, useCallback, useRef, useState } from "react"; import PropTypes from "prop-types"; -import { toJS } from "mobx"; import { useObserver } from "mobx-react"; import { Fade } from "react-reveal"; @@ -57,13 +56,14 @@ const AlertGroup = ({ gridLabelValue, initialAlertsToRender, }) => { - const defaultRenderCount = toJS( - settingsStore.alertGroupConfig.config.defaultRenderCount + const defaultRenderCount = + settingsStore.alertGroupConfig.config.defaultRenderCount; + + const [alertsToRenderInternal, setAlertsToRender] = useState( + initialAlertsToRender || null ); - const [alertsToRender, setAlertsToRender] = useState( - initialAlertsToRender || defaultRenderCount - ); + const alertsToRender = alertsToRenderInternal || defaultRenderCount; const [isMenuOpen, setIsMenuOpen] = useState(false); @@ -168,6 +168,9 @@ const AlertGroup = ({ width: groupWidth, zIndex: isMenuOpen ? 100 : null, }} + data-defaultrendercount={ + settingsStore.alertGroupConfig.config.defaultRenderCount + } >