diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx index e93d9fc31cbed610adf8676d93330ae83340ccc7..3103495adc6741030fbe8755bca0c85e119020ea 100644 --- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx +++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx @@ -63,6 +63,24 @@ const ElecHalfHourMonthlyAnalysis: React.FC<ElecHalfHourMonthlyAnalysisProps> = const toggleOpenModal = useCallback(() => { setOpenInfoModal(prev => !prev) }, []) + const getPowerChart = useCallback((): JSX.Element => { + if ( + monthDataloads && + monthDataloads.weekend && + monthDataloads.week && + monthDataloads.weekend[0] !== null && + monthDataloads.week[0] !== null + ) { + return ( + <ElecHalfHourChart + dataLoad={isWeekend ? monthDataloads.weekend : monthDataloads.week} + isWeekend={isWeekend} + /> + ) + } else { + return <p className={`text-20-bold no_data`}>{t('analysis.no_data')}</p> + } + }, [isWeekend, monthDataloads, t]) useEffect(() => { let subscribed = true @@ -160,18 +178,7 @@ const ElecHalfHourMonthlyAnalysis: React.FC<ElecHalfHourMonthlyAnalysisProps> = </div> {!isLoading ? ( <> - {monthDataloads ? ( - <ElecHalfHourChart - dataLoad={ - isWeekend ? monthDataloads.weekend : monthDataloads.week - } - isWeekend={isWeekend} - /> - ) : ( - <p className={`text-20-bold no_data`}> - {t('analysis.no_data')} - </p> - )} + {getPowerChart()} {enedisAnalysisValues && ( <div className="min-max"> <div className="container"> @@ -215,7 +222,7 @@ const ElecHalfHourMonthlyAnalysis: React.FC<ElecHalfHourMonthlyAnalysisProps> = <span className="text-18-normal"> %</span> </div> <div className="text-18-bold"> - {elecPrice + {elecPrice && elecPrice.price ? ( enedisAnalysisValues.minimumLoad * elecPrice.price diff --git a/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap b/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap index 3e66e5b70ea8e852ea46c8d5b18f7bdf2b35e28b..d572a409238bdc29634c6bed866aade83458e69a 100644 --- a/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap +++ b/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap @@ -557,9 +557,11 @@ exports[`ElecHalfHourMonthlyAnalysis component should be rendered correctly when </ForwardRef(IconButton)> </WithStyles(ForwardRef(IconButton))> </div> - <mock-elechalfhourchart - isWeekend={true} - /> + <p + className="text-20-bold no_data" + > + analysis.no_data + </p> <div className="min-max" >