diff --git a/src/components/Analysis/TotalAnalysisChart.spec.tsx b/src/components/Analysis/TotalAnalysisChart.spec.tsx index b1620f97cefa7aa39f1704b29467043af316ff73..2e3fa93a967c1d8569ced08542f1b58444d0f20d 100644 --- a/src/components/Analysis/TotalAnalysisChart.spec.tsx +++ b/src/components/Analysis/TotalAnalysisChart.spec.tsx @@ -95,7 +95,7 @@ describe('TotalAnalysisChart component', () => { analysisDate={DateTime.fromISO('2021-07-01T00:00:00.000Z', { zone: 'utc', })} - fluidTypes={[FluidType.ELECTRICITY]} + fluidTypes={[FluidType.ELECTRICITY, FluidType.WATER]} /> </Provider> ) @@ -105,4 +105,38 @@ describe('TotalAnalysisChart component', () => { }) expect(wrapper.find('.fluidconso').text()).toBe('--- €') }) + it('should render empty price for one fluid', async () => { + const store = mockStore({ + ecolyo: { + global: globalStateData, + }, + }) + const emptyData = { + actualData: [ + { + date: DateTime.fromISO('2020-09-01T00:00:00.000Z', { + zone: 'utc', + }), + value: 69.18029999999999, + valueDetail: [-1], + }, + ], + } + mockgetGraphData.mockResolvedValueOnce(emptyData) + const wrapper = mount( + <Provider store={store}> + <TotalAnalysisChart + analysisDate={DateTime.fromISO('2021-07-01T00:00:00.000Z', { + zone: 'utc', + })} + fluidTypes={[FluidType.ELECTRICITY]} + /> + </Provider> + ) + await act(async () => { + await new Promise(resolve => setTimeout(resolve)) + wrapper.update() + }) + expect(wrapper.find('.fluidconso').exists()).toBe(false) + }) }) diff --git a/src/components/Analysis/TotalAnalysisChart.tsx b/src/components/Analysis/TotalAnalysisChart.tsx index 7b5c73ee1c7d9dceb7006d44eb2d0e67b87176c3..817670e0ef98f87eae654f8cb3575eee12fd9f38 100644 --- a/src/components/Analysis/TotalAnalysisChart.tsx +++ b/src/components/Analysis/TotalAnalysisChart.tsx @@ -66,9 +66,7 @@ const TotalAnalysisChart: React.FC<TotalAnalysisChartProps> = ({ minHeight: radius + 100, }} > - {fluidTypes.length >= 2 && ( - <div className="text-24-normal title">{t('analysis_pie.total')}</div> - )} + <div className="text-24-normal title">{t('analysis_pie.total')}</div> {dataLoadArray && ( <PieChart dataArray={dataLoadArray} @@ -82,7 +80,7 @@ const TotalAnalysisChart: React.FC<TotalAnalysisChartProps> = ({ .startOf('month')} /> )} - {dataLoadArray && ( + {dataLoadArray && fluidTypes.length > 1 && ( <div className="total-card-container"> {dataLoadArray.map((load, index) => { return ( diff --git a/src/components/Analysis/totalAnalysisChart.scss b/src/components/Analysis/totalAnalysisChart.scss index 85f18f5c0808f9d8405f7b298f580fff5050c694..520b08898791bcdba250b4002237188bdf1450ce 100644 --- a/src/components/Analysis/totalAnalysisChart.scss +++ b/src/components/Analysis/totalAnalysisChart.scss @@ -15,6 +15,7 @@ text-align: center; position: relative; margin: auto; + overflow: visible; } svg { margin: auto;