From bd5c3e88b33c2c5dde8fdbcfb4c221c6cd8c121b Mon Sep 17 00:00:00 2001 From: "guilhem.carron" <gcarron@grandlyon.com> Date: Thu, 28 Oct 2021 09:32:56 +0200 Subject: [PATCH] Add lastDatadate to FluidChart as key so it is refresh when konnector update --- src/components/FluidChart/FluidChart.tsx | 1 - src/components/Home/ConsumptionView.tsx | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/FluidChart/FluidChart.tsx b/src/components/FluidChart/FluidChart.tsx index c37b0668a..d25aa6efa 100644 --- a/src/components/FluidChart/FluidChart.tsx +++ b/src/components/FluidChart/FluidChart.tsx @@ -15,7 +15,6 @@ import StyledSwitch from 'components/CommonKit/Switch/StyledSwitch' import TimeStepSelector from 'components/TimeStepSelector/TimeStepSelector' import ActivateHalfHourLoad from 'components/ActivateHalfHourLoad/ActivateHalfHourLoad' import FluidChartSwipe from './FluidChartSwipe' -import ConsumptionVisualizer from 'components/ConsumptionVisualizer/ConsumptionVisualizer' import { UsageEventType } from 'enum/usageEvent.enum' import UsageEventService from 'services/usageEvent.service' diff --git a/src/components/Home/ConsumptionView.tsx b/src/components/Home/ConsumptionView.tsx index 8051b2cea..0de6fadf3 100644 --- a/src/components/Home/ConsumptionView.tsx +++ b/src/components/Home/ConsumptionView.tsx @@ -37,6 +37,12 @@ const ConsumptionView: React.FC<ConsumptionViewProps> = ({ ) const [active, setActive] = useState<boolean>(false) + /* eslint-disable @typescript-eslint/no-non-null-assertion */ + + const lastDataDate = fluidStatus[fluidType].lastDataDate + ? fluidStatus[fluidType].lastDataDate!.toLocaleString() + : '' + const defineHeaderHeight = useCallback((height: number) => { setHeaderHeight(height) }, []) @@ -74,7 +80,11 @@ const ConsumptionView: React.FC<ConsumptionViewProps> = ({ ['--hidden']: loading, })} > - <FluidChart fluidType={fluidType} setActive={setActive} /> + <FluidChart + fluidType={fluidType} + setActive={setActive} + key={lastDataDate} + /> <ConsumptionDetails fluidType={fluidType} /> </div> {!isMulti && ( -- GitLab