From 011910b69adb5623268ea3cc33ac6ccc8b0252b3 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 26 Mar 2024 17:36:38 +0100
Subject: [PATCH] use value from store
---
.../Consumption/ConsumptionView.tsx | 33 +++++++++----------
.../Konnector/KonnectorViewerCard.tsx | 13 ++------
2 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/src/components/Consumption/ConsumptionView.tsx b/src/components/Consumption/ConsumptionView.tsx
index 9515f5921..44767d0bc 100644
--- a/src/components/Consumption/ConsumptionView.tsx
+++ b/src/components/Consumption/ConsumptionView.tsx
@@ -210,6 +210,9 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
dispatch(setCurrentIndex(updatedIndex))
}
+ const isGRDFWaitingForConsent =
+ fluidType === FluidType.GAS &&
+ currentFluidStatus.status === FluidState.CHALLENGE_ASKED
return (
<>
<CozyBar titleKey="common.title_consumption" />
@@ -226,26 +229,20 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
<Content>
<FluidButtons activeFluid={fluidType} key={updateKey} />
- {fluidType === FluidType.GAS &&
- currentFluidStatus.status === FluidState.CHALLENGE_ASKED && (
- <GrdfWaitConsent />
- )}
-
- {showOfflineData && (
- <>
- <FluidChart fluidType={fluidType} key={lastDataDateKey} />
- <ConsumptionDetails fluidType={fluidType} />
- </>
- )}
-
- {!isMulti && (
- <KonnectorViewerCard
- fluidType={fluidType}
- showOfflineData={showOfflineData}
- />
+ {isGRDFWaitingForConsent ? (
+ <GrdfWaitConsent />
+ ) : (
+ showOfflineData && (
+ <>
+ <FluidChart fluidType={fluidType} key={lastDataDateKey} />
+ <ConsumptionDetails fluidType={fluidType} />
+ </>
+ )
)}
+ {/* TODO maybe move this inside block above */}
+ {!isMulti && <KonnectorViewerCard fluidType={fluidType} />}
- {!showOfflineData && isMulti && <KonnectorViewerList />}
+ {isMulti && !showOfflineData && <KonnectorViewerList />}
</Content>
{/* MODALS */}
diff --git a/src/components/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx
index 518f66338..6210f63c7 100644
--- a/src/components/Konnector/KonnectorViewerCard.tsx
+++ b/src/components/Konnector/KonnectorViewerCard.tsx
@@ -59,22 +59,13 @@ import ConnectionNotFound from './ConnectionNotFound/ConnectionNotFound'
import ConnectionResult from './ConnectionResult/ConnectionResult'
import './konnectorViewerCard.scss'
-interface KonnectorViewerCardProps {
- /** TODO Get this from store ? */
- showOfflineData: boolean
- fluidType: FluidType
-}
-
-const KonnectorViewerCard = ({
- showOfflineData,
- fluidType,
-}: KonnectorViewerCardProps) => {
+const KonnectorViewerCard = ({ fluidType }: { fluidType: FluidType }) => {
const { t } = useI18n()
const client = useClient()
const navigate = useNavigate()
const dispatch = useAppDispatch()
const {
- chart: { showConnectionDetails },
+ chart: { showConnectionDetails, showOfflineData },
challenge: { currentChallenge },
global: { fluidStatus, shouldRefreshConsent, partnersInfo },
} = useAppSelector(state => state.ecolyo)
--
GitLab