From 22be83e01a6bd1895b8ee9d822149200a629ca35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?= Date: Wed, 24 Feb 2021 17:58:46 +0100 Subject: [PATCH] feat: DHIS2-10326 open enrollment from working list - open enrollment in the old tracker capture app from the working lists --- .../TeiWorkingListsReduxProvider.container.js | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/core_modules/capture-core/components/Pages/MainPage/TeiWorkingLists/ReduxProvider/TeiWorkingListsReduxProvider.container.js b/src/core_modules/capture-core/components/Pages/MainPage/TeiWorkingLists/ReduxProvider/TeiWorkingListsReduxProvider.container.js index 42ee8d72b3..12c5c83243 100644 --- a/src/core_modules/capture-core/components/Pages/MainPage/TeiWorkingLists/ReduxProvider/TeiWorkingListsReduxProvider.container.js +++ b/src/core_modules/capture-core/components/Pages/MainPage/TeiWorkingLists/ReduxProvider/TeiWorkingListsReduxProvider.container.js @@ -1,6 +1,8 @@ // @flow import React, { useCallback } from 'react'; import { useSelector, useDispatch } from 'react-redux'; +import { useLocation } from 'react-router'; +import { navigateToTrackedEntityDashboard } from '../../../../../utils/navigateToTrackedEntityDashboard'; import { TeiWorkingListsSetup } from '../Setup'; import { useWorkingListsCommonStateManagement, fetchTemplatesSuccess, fetchTemplates } from '../../WorkingListsCommon'; import { useTrackerProgram } from '../../../../../hooks/useTrackerProgram'; @@ -12,7 +14,17 @@ export const TeiWorkingListsReduxProvider = ({ storeId }: Props) => { const program = useTrackerProgram(programId); // Being pragmatic here, disabling behavior we will implement later - const commonStateManagementProps: Object = useWorkingListsCommonStateManagement(storeId, TEI_WORKING_LISTS_TYPE, program); + const { + orgUnitId, + lastTransaction, + lastTransactionOnListDataRefresh, + listDataRefreshTimestamp, + onAddTemplate, + onUpdateTemplate, + onDeleteTemplate, + onSetTemplateSharingSettings, + ...commonStateManagementProps + } = useWorkingListsCommonStateManagement(storeId, TEI_WORKING_LISTS_TYPE, program); const dispatch = useDispatch(); @@ -20,16 +32,17 @@ export const TeiWorkingListsReduxProvider = ({ storeId }: Props) => { dispatch(fetchTemplates(programId, storeId, TEI_WORKING_LISTS_TYPE)); dispatch(fetchTemplatesSuccess([], 'default', storeId)); }, [dispatch, programId, storeId]); - const onSelectListRow = useCallback(() => {}, []); - // will be implemented later - delete commonStateManagementProps.lastTransaction; - delete commonStateManagementProps.lastTransactionOnListDataRefresh; - delete commonStateManagementProps.listDataRefreshTimestamp; - delete commonStateManagementProps.onAddTemplate; - delete commonStateManagementProps.onUpdateTemplate; - delete commonStateManagementProps.onDeleteTemplate; - // ---------------------------------------------------------------- + + const { pathname, search } = useLocation(); + const onSelectListRow = useCallback(({ id }) => { + navigateToTrackedEntityDashboard( + id, + orgUnitId, + `program=${programId}`, + `${pathname}${search}`, + ); + }, [orgUnitId, programId, pathname, search]); return ( { onSelectListRow={onSelectListRow} onLoadTemplates={onLoadTemplates} program={program} + orgUnitId={orgUnitId} /> ); };