diff --git a/src/components/Action/ActionBegin/__snapshots__/ActionBegin.spec.tsx.snap b/src/components/Action/ActionBegin/__snapshots__/ActionBegin.spec.tsx.snap index 8bf9c264ef663084bce0d1a421a4ecc092f8ae3b..46277c2bde3f99308a08a790b13ad643fe802199 100644 --- a/src/components/Action/ActionBegin/__snapshots__/ActionBegin.spec.tsx.snap +++ b/src/components/Action/ActionBegin/__snapshots__/ActionBegin.spec.tsx.snap @@ -21,7 +21,7 @@ exports[`ActionBegin component should render correctly 1`] = ` width="100" > <use - xlink:href="#test-file-stub" + xlink:href="#" /> </svg> </div> diff --git a/src/components/Consumption/ConsumptionView.tsx b/src/components/Consumption/ConsumptionView.tsx index 3358b870a313d80a337cc995e7809ed31a1246fe..9515f5921a086cc7bf188b2e15ebd8fef83dc3f1 100644 --- a/src/components/Consumption/ConsumptionView.tsx +++ b/src/components/Consumption/ConsumptionView.tsx @@ -247,6 +247,7 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => { {!showOfflineData && isMulti && <KonnectorViewerList />} </Content> + {/* MODALS */} {openReleaseNoteModal && ( <ReleaseNotesModal diff --git a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx index b3c3b46eaefb8309acf47d6d73350e92f672bf24..e0afcdfbd52fa876d4cb2a597f6d8055a1021657 100644 --- a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx +++ b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx @@ -51,7 +51,6 @@ describe('Dataload consumption visualizer component', () => { fluidType={FluidType.ELECTRICITY} dataload={baseDataLoad} compareDataload={baseDataLoad} - setActive={jest.fn()} /> </Provider> ) @@ -65,7 +64,6 @@ describe('Dataload consumption visualizer component', () => { fluidType={FluidType.ELECTRICITY} dataload={null as unknown as Dataload} compareDataload={baseDataLoad} - setActive={jest.fn()} /> </Provider> ) @@ -81,7 +79,6 @@ describe('Dataload consumption visualizer component', () => { fluidType={FluidType.ELECTRICITY} dataload={{ ...baseDataLoad, date: DateTime.local(9999, 1, 1) }} compareDataload={baseDataLoad} - setActive={jest.fn()} /> </Provider> ) @@ -99,7 +96,6 @@ describe('Dataload consumption visualizer component', () => { fluidType={FluidType.ELECTRICITY} dataload={{ ...baseDataLoad, state: DataloadState.MISSING }} compareDataload={baseDataLoad} - setActive={jest.fn()} /> </Provider> ) @@ -116,7 +112,6 @@ describe('Dataload consumption visualizer component', () => { fluidType={FluidType.MULTIFLUID} dataload={baseMultiFluidDataLoad} compareDataload={null} - setActive={jest.fn()} /> </BrowserRouter> </Provider> @@ -135,7 +130,6 @@ describe('Dataload consumption visualizer component', () => { fluidType={FluidType.WATER} dataload={baseDataLoad} compareDataload={emptyDataLoad} - setActive={jest.fn()} /> </Provider> ) @@ -154,7 +148,6 @@ describe('Dataload consumption visualizer component', () => { fluidType={FluidType.WATER} dataload={baseDataLoad} compareDataload={baseDataLoad} - setActive={jest.fn()} /> </Provider> ) @@ -168,7 +161,6 @@ describe('Dataload consumption visualizer component', () => { fluidType={FluidType.MULTIFLUID} dataload={dataLoadWithValueDetailEmpty} compareDataload={emptyDataLoad} - setActive={jest.fn()} /> </Provider> ) @@ -191,7 +183,6 @@ describe('Dataload consumption visualizer component', () => { fluidType={FluidType.MULTIFLUID} dataload={dataLoadWithValueDetail} compareDataload={emptyDataLoad} - setActive={jest.fn()} /> </BrowserRouter> </Provider> diff --git a/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx b/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx index 4045300323387423250a533581a554488d9d6b0a..4545f197f9362f8244edeadfec59a4beb8ad823a 100644 --- a/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx +++ b/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx @@ -2,17 +2,30 @@ import { render, screen } from '@testing-library/react' import { userEvent } from '@testing-library/user-event' import { DataloadState, FluidType } from 'enums' import React from 'react' +import { Provider } from 'react-redux' +import * as storeHooks from 'store/hooks' import { baseDataLoad } from 'tests/__mocks__/chartData.mock' +import { createMockEcolyoStore } from 'tests/__mocks__/store' import DataloadNoValue from './DataloadNoValue' +const mockDispatch = jest.fn() +jest.spyOn(storeHooks, 'useAppDispatch').mockImplementation(() => mockDispatch) + describe('DataloadNoValue component', () => { + const store = createMockEcolyoStore() + + beforeEach(() => { + jest.clearAllMocks() + }) + it('should render correctly', () => { const { container } = render( - <DataloadNoValue - dataload={baseDataLoad} - fluidType={FluidType.ELECTRICITY} - setActive={jest.fn()} - /> + <Provider store={store}> + <DataloadNoValue + dataload={baseDataLoad} + fluidType={FluidType.ELECTRICITY} + /> + </Provider> ) expect(container).toMatchSnapshot() }) @@ -21,11 +34,12 @@ describe('DataloadNoValue component', () => { it('case state EMPTY', () => { const mockDataLoad = { ...baseDataLoad, state: DataloadState.EMPTY } render( - <DataloadNoValue - dataload={mockDataLoad} - fluidType={FluidType.ELECTRICITY} - setActive={jest.fn()} - /> + <Provider store={store}> + <DataloadNoValue + dataload={mockDataLoad} + fluidType={FluidType.ELECTRICITY} + /> + </Provider> ) expect( screen.getByText('consumption_visualizer.no_data') @@ -34,11 +48,12 @@ describe('DataloadNoValue component', () => { it('case state HOLE', () => { const mockDataLoad = { ...baseDataLoad, state: DataloadState.HOLE } render( - <DataloadNoValue - dataload={mockDataLoad} - fluidType={FluidType.ELECTRICITY} - setActive={jest.fn()} - /> + <Provider store={store}> + <DataloadNoValue + dataload={mockDataLoad} + fluidType={FluidType.ELECTRICITY} + /> + </Provider> ) expect( screen.getByText('consumption_visualizer.no_data') @@ -50,11 +65,12 @@ describe('DataloadNoValue component', () => { state: DataloadState.AGGREGATED_EMPTY, } render( - <DataloadNoValue - dataload={mockDataLoad} - fluidType={FluidType.MULTIFLUID} - setActive={jest.fn()} - /> + <Provider store={store}> + <DataloadNoValue + dataload={mockDataLoad} + fluidType={FluidType.MULTIFLUID} + /> + </Provider> ) expect( screen.getByText('consumption_visualizer.no_data') @@ -66,11 +82,12 @@ describe('DataloadNoValue component', () => { it('case state MISSING', () => { const mockDataLoad = { ...baseDataLoad, state: DataloadState.MISSING } render( - <DataloadNoValue - dataload={mockDataLoad} - fluidType={FluidType.ELECTRICITY} - setActive={jest.fn()} - /> + <Provider store={store}> + <DataloadNoValue + dataload={mockDataLoad} + fluidType={FluidType.ELECTRICITY} + /> + </Provider> ) expect( screen.getByText('consumption_visualizer.missing_data') @@ -82,11 +99,12 @@ describe('DataloadNoValue component', () => { state: DataloadState.AGGREGATED_HOLE_OR_MISSING, } render( - <DataloadNoValue - dataload={mockDataLoad} - fluidType={FluidType.MULTIFLUID} - setActive={jest.fn()} - /> + <Provider store={store}> + <DataloadNoValue + dataload={mockDataLoad} + fluidType={FluidType.MULTIFLUID} + /> + </Provider> ) expect( screen.getByText('consumption_visualizer.missing_data') @@ -94,17 +112,19 @@ describe('DataloadNoValue component', () => { }) }) - it('should call setActive when missing message is clicked', async () => { - const mockSetActive = jest.fn() - const mockDataLoad = { ...baseDataLoad, state: DataloadState.MISSING } + it('should call dispatch to show konnector details when missing message is clicked', async () => { render( - <DataloadNoValue - dataload={mockDataLoad} - fluidType={FluidType.ELECTRICITY} - setActive={mockSetActive} - /> + <Provider store={store}> + <DataloadNoValue + dataload={{ ...baseDataLoad, state: DataloadState.MISSING }} + fluidType={FluidType.ELECTRICITY} + /> + </Provider> ) await userEvent.click(screen.getByRole('button')) - expect(mockSetActive).toHaveBeenCalledWith(true) + expect(mockDispatch).toHaveBeenCalledWith({ + type: 'chart/setShowConnectionDetails', + payload: true, + }) }) })