- {error}
-
+ {error}
+
);
}
diff --git a/src/core_modules/capture-core/actions/navigateToEnrollmentOverview/navigateToEnrollmentOverview.constants.js b/src/core_modules/capture-core/actions/navigateToEnrollmentOverview/navigateToEnrollmentOverview.constants.js
deleted file mode 100644
index 435c2824ac..0000000000
--- a/src/core_modules/capture-core/actions/navigateToEnrollmentOverview/navigateToEnrollmentOverview.constants.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// @flow
-
-export const scopeHierarchyTypes = {
- PROGRAM: 'PROGRAM',
- TRACKED_ENTITY_TYPE: 'TRACKED_ENTITY_TYPE',
-};
diff --git a/src/core_modules/capture-core/actions/navigateToEnrollmentOverview/navigateToEnrollmentOverview.epics.js b/src/core_modules/capture-core/actions/navigateToEnrollmentOverview/navigateToEnrollmentOverview.epics.js
index 32f7d066e2..8b413b70a4 100644
--- a/src/core_modules/capture-core/actions/navigateToEnrollmentOverview/navigateToEnrollmentOverview.epics.js
+++ b/src/core_modules/capture-core/actions/navigateToEnrollmentOverview/navigateToEnrollmentOverview.epics.js
@@ -4,58 +4,22 @@ import { ofType } from 'redux-observable';
import { switchMap } from 'rxjs/operators';
import { EMPTY } from 'rxjs';
import { actionTypes as NavigateToEnrollmentOverviewActionTypes } from './navigateToEnrollmentOverview.actions';
-import { buildUrlQueryString, getLocationQuery, shouldUseNewDashboard } from '../../utils/routing';
-import { scopeHierarchyTypes } from './navigateToEnrollmentOverview.constants';
+import { buildUrlQueryString } from '../../utils/routing';
-// TODO This will be removed when the link between capture and tracker capture is not relevant
-const redirectToTracker = ({ teiId, orgUnitId, dependencies }) => {
- const baseUrl = dependencies.absoluteApiPath;
- const { search, pathname } = dependencies.history.location;
- const { programId: queryProgramId, trackedEntityTypeId: queryTrackedEntityTypeId } = getLocationQuery();
-
- const instanceBaseUrl = baseUrl.split('/api')[0];
- const scopeHierarchy = queryProgramId ? scopeHierarchyTypes.PROGRAM : scopeHierarchyTypes.TRACKED_ENTITY_TYPE;
- const selectedScopeId = queryTrackedEntityTypeId || queryProgramId;
- const scopeSearchParam = `${scopeHierarchy.toLowerCase()}=${selectedScopeId}`;
- const base64Url = btoa(`/dhis-web-capture/#${pathname}${search}`);
- setTimeout(() => {
- window.location.href = `${instanceBaseUrl}/dhis-web-tracker-capture/#/dashboard?tei=${teiId}&ou=${orgUnitId}&${scopeSearchParam}&returnUrl=${base64Url}`;
- }, 50);
-};
-
-const redirectToEnrollmentDashboard = ({ dependencies, teiId, programId, orgUnitId, enrollmentId }) => {
- dependencies.history.push(
- `/enrollment?${buildUrlQueryString({
- teiId,
- programId,
- orgUnitId,
- enrollmentId,
- })}`,
- );
-};
-
-export const navigateToEnrollmentOverviewEpic = (action$: InputObservable, store: ReduxStore, dependencies: any) =>
+export const navigateToEnrollmentOverviewEpic = (action$: InputObservable, store: ReduxStore, { history }: ApiUtils) =>
action$.pipe(
ofType(NavigateToEnrollmentOverviewActionTypes.NAVIGATE_TO_ENROLLMENT_OVERVIEW),
switchMap((action) => {
const { teiId, programId, orgUnitId } = action.payload;
const enrollmentId = programId && (action.payload?.enrollmentId || 'AUTO');
- const { dataStore, userDataStore } = store.value.useNewDashboard;
-
- if (dataStore || userDataStore) {
- const shouldRedirectToEnrollmentDashboard = shouldUseNewDashboard({
- userDataStore,
- dataStore,
- programId,
+ history.push(
+ `/enrollment?${buildUrlQueryString({
teiId,
- });
- if (shouldRedirectToEnrollmentDashboard) {
- redirectToEnrollmentDashboard({ dependencies, teiId, programId, orgUnitId, enrollmentId });
- return EMPTY;
- }
- }
-
- redirectToTracker({ dependencies, store, teiId, orgUnitId });
+ programId,
+ orgUnitId,
+ enrollmentId,
+ })}`,
+ );
return EMPTY;
}),
);
diff --git a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/getSubValueForTei.js b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/getSubValueForTei.js
index b8df8130ed..eab8d88a89 100644
--- a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/getSubValueForTei.js
+++ b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/getSubValueForTei.js
@@ -1,6 +1,8 @@
// @flow
import type { QuerySingleResource } from 'capture-core/utils/api';
import { dataElementTypes } from '../../../../metaData';
+import { getOrgUnitNames } from '../../../../metadataRetrieval/orgUnitName';
+
const getImageOrFileResourceSubvalue = async (key: string, querySingleResource: QuerySingleResource) => {
const { id, displayName: name } = await querySingleResource({ resource: 'fileResources', id: key });
@@ -11,14 +13,8 @@ const getImageOrFileResourceSubvalue = async (key: string, querySingleResource:
};
const getOrganisationUnitSubvalue = async (key: string, querySingleResource: QuerySingleResource) => {
- const organisationUnit = await querySingleResource({
- resource: 'organisationUnits',
- id: key,
- params: {
- fields: 'id,name',
- },
- });
- return { ...organisationUnit };
+ const organisationUnit = await getOrgUnitNames([key], querySingleResource);
+ return organisationUnit[key];
};
export const subValueGetterByElementType = {
diff --git a/src/core_modules/capture-core/components/DataStore/DataStore.actions.js b/src/core_modules/capture-core/components/DataStore/DataStore.actions.js
deleted file mode 100644
index a06c83561d..0000000000
--- a/src/core_modules/capture-core/components/DataStore/DataStore.actions.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// @flow
-import { actionCreator } from '../../actions/actions.utils';
-import { type UseNewDashboard, actionTypes as dataStoreActionTypes } from './DataStore.types';
-
-export const saveDataStore = ({ dataStore, userDataStore }: UseNewDashboard) =>
- actionCreator(dataStoreActionTypes.SAVE_DATA_STORE)({ dataStore, userDataStore });
diff --git a/src/core_modules/capture-core/components/DataStore/DataStore.epics.js b/src/core_modules/capture-core/components/DataStore/DataStore.epics.js
deleted file mode 100644
index 71c1cee90c..0000000000
--- a/src/core_modules/capture-core/components/DataStore/DataStore.epics.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// @flow
-import { ofType } from 'redux-observable';
-import { flatMap, catchError } from 'rxjs/operators';
-import { EMPTY } from 'rxjs';
-import { saveDataStore } from './DataStore.actions';
-import { type UseNewDashboard } from './DataStore.types';
-import { appStartActionTypes } from '../../../../components/AppStart';
-import { programCollection } from '../../metaDataMemoryStores';
-
-const setNewDashboardByDefault = (key: string, dataStoreValues) => {
- if (!dataStoreValues) {
- return {};
- }
- const programs = [...programCollection.keys()];
- const valuesWithDefault = programs.reduce((acc, program) => {
- const dataStoreValue = dataStoreValues[program];
- acc[program] = dataStoreValue === undefined ? true : dataStoreValue;
- return acc;
- }, {});
-
- return { [key]: valuesWithDefault };
-};
-
-const getDataStoreFromApi = async querySingleResource =>
- querySingleResource({
- resource: 'dataStore/capture/useNewDashboard',
- });
-
-const getUserDataStoreFromApi = async querySingleResource =>
- querySingleResource({
- resource: 'userDataStore/capture/useNewDashboard',
- });
-
-export const fetchDataStoreEpic = (action$: InputObservable, _: ReduxStore, { querySingleResource }: ApiUtils) =>
- action$.pipe(
- ofType(appStartActionTypes.APP_LOAD_SUCESS),
- flatMap(async () => {
- const apiDataStore: ?UseNewDashboard = await getDataStoreFromApi(querySingleResource)
- .catch((error) => {
- if (error.details.httpStatusCode === 404) {
- return {};
- }
- return undefined;
- });
-
- return saveDataStore(setNewDashboardByDefault('dataStore', apiDataStore));
- }),
- catchError(() => EMPTY),
- );
-
-export const fetchUserDataStoreEpic = (action$: InputObservable, _: ReduxStore, { querySingleResource }: ApiUtils) =>
- action$.pipe(
- ofType(appStartActionTypes.APP_LOAD_SUCESS),
- flatMap(async () => {
- const apiUserDataStore: UseNewDashboard = await getUserDataStoreFromApi(querySingleResource);
- // $FlowFixMe
- return saveDataStore(setNewDashboardByDefault('userDataStore', apiUserDataStore));
- }),
- catchError(() => EMPTY),
- );
-
diff --git a/src/core_modules/capture-core/components/DataStore/DataStore.types.js b/src/core_modules/capture-core/components/DataStore/DataStore.types.js
deleted file mode 100644
index ffa2641abb..0000000000
--- a/src/core_modules/capture-core/components/DataStore/DataStore.types.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @flow
-
-export const actionTypes = {
- SAVE_DATA_STORE: 'useNewDashboard.SaveDataStore',
-};
-
-export type UseNewDashboard = {|
- [key: string]: string,
-|}
diff --git a/src/core_modules/capture-core/components/DataStore/index.js b/src/core_modules/capture-core/components/DataStore/index.js
deleted file mode 100644
index e6359f21f1..0000000000
--- a/src/core_modules/capture-core/components/DataStore/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { saveDataStore } from './DataStore.actions';
diff --git a/src/core_modules/capture-core/components/FormFields/New/Fields/OrgUnitField/SingleOrgUnitSelectField.component.js b/src/core_modules/capture-core/components/FormFields/New/Fields/OrgUnitField/SingleOrgUnitSelectField.component.js
index 6c252f087b..48c8bb1a99 100644
--- a/src/core_modules/capture-core/components/FormFields/New/Fields/OrgUnitField/SingleOrgUnitSelectField.component.js
+++ b/src/core_modules/capture-core/components/FormFields/New/Fields/OrgUnitField/SingleOrgUnitSelectField.component.js
@@ -1,14 +1,21 @@
// @flow
import * as React from 'react';
import { withStyles } from '@material-ui/core';
-import { Chip } from '@dhis2/ui';
+import { Chip, colors } from '@dhis2/ui';
import { OrgUnitField } from './OrgUnitField.component';
+import { TooltipOrgUnit } from '../../../../Tooltips/TooltipOrgUnit/TooltipOrgUnit.component';
const getStyles = () => ({
selectedOrgUnitContainer: {
display: 'flex',
alignItems: 'center',
},
+ chip: {
+ cursor: 'text !important',
+ '&:hover': {
+ backgroundColor: `${colors.grey200} !important`,
+ },
+ },
});
type OrgUnitValue = {
@@ -27,9 +34,7 @@ type Props = {
disabled?: ?boolean,
classes: {
selectedOrgUnitContainer: string,
- clearSelectedOrgUnitButton: string,
- clearSelectedOrgUnitButtonDisabled: string,
- selectedOrgUnitText: string,
+ chip: string,
}
}
@@ -44,7 +49,12 @@ class SingleOrgUnitSelectFieldPlain extends React.Component
- {selectedOrgUnit.name}
+
+
);
}
diff --git a/src/core_modules/capture-core/components/MetadataAutoSelectInitializer/hooks/useMetadataAutoSelect.js b/src/core_modules/capture-core/components/MetadataAutoSelectInitializer/hooks/useMetadataAutoSelect.js
index 90be846e65..e85322f939 100644
--- a/src/core_modules/capture-core/components/MetadataAutoSelectInitializer/hooks/useMetadataAutoSelect.js
+++ b/src/core_modules/capture-core/components/MetadataAutoSelectInitializer/hooks/useMetadataAutoSelect.js
@@ -1,9 +1,10 @@
// @flow
import { useCallback, useEffect, useState } from 'react';
import { useHistory } from 'react-router-dom';
-import { useApiMetadataQuery, useIndexedDBQuery } from '../../../utils/reactQueryHelpers';
+import { useIndexedDBQuery } from '../../../utils/reactQueryHelpers';
import { getUserStorageController, userStores } from '../../../storageControllers';
import { buildUrlQueryString, useLocationQuery } from '../../../utils/routing';
+import { useOrgUnitAutoSelect } from '../../../dataQueries';
const getAllPrograms = () => {
const userStorageController = getUserStorageController();
@@ -28,21 +29,8 @@ export const useMetadataAutoSelect = () => {
},
);
- const { data: searchOrgUnits, isLoading: loadingOrgUnits } = useApiMetadataQuery(
- ['searchOrgUnitsForAutoSelect'],
- {
- resource: 'organisationUnits',
- params: {
- fields: 'id',
- withinUserSearchHierarchy: true,
- pageSize: 2,
- },
- },
- {
- enabled: Object.keys(urlParams).length === 0 && !mounted,
- select: ({ organisationUnits }) => organisationUnits,
- },
- );
+ const queryOptions = { enabled: Object.keys(urlParams).length === 0 && !mounted };
+ const { isLoading: loadingOrgUnits, data: searchOrgUnits } = useOrgUnitAutoSelect(queryOptions);
const updateUrlIfApplicable = useCallback(() => {
const paramsToAdd = {
diff --git a/src/core_modules/capture-core/components/OptInOut/OptIn/OptIn.component.js b/src/core_modules/capture-core/components/OptInOut/OptIn/OptIn.component.js
deleted file mode 100644
index 81a541bf82..0000000000
--- a/src/core_modules/capture-core/components/OptInOut/OptIn/OptIn.component.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// @flow
-import React, { useState, type ComponentType } from 'react';
-import { NoticeBox, Button, Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip } from '@dhis2/ui';
-import i18n from '@dhis2/d2-i18n';
-import { withStyles } from '@material-ui/core';
-import type { PlainProps } from './optIn.types';
-
-const styles = {
- container: {
- width: '80%',
- margin: '0 auto',
- },
-};
-
-export const OptInPlain = ({ classes, programName, handleOptIn, loading }: PlainProps) => {
- const [toggle, setToggle] = useState(false);
-
- const title = i18n.t('Use new Enrollment dashboard for {{programName}}', {
- programName,
- interpolation: { escapeValue: false },
- });
- const button = i18n.t('Opt in for {{programName}}', {
- programName,
- interpolation: { escapeValue: false },
- });
-
- const modalContent = i18n.t('By clicking opt-in below, you will start using the new enrollment dashboard in the Capture app for this Tracker program. At the moment, there is certain functionality from Tracker Capture that has not yet been added, including relationship and referral functionality. The work on including this Tracker functionality in Capture is ongoing and will be added in upcoming app releases.');
-
- const modalContentFeedback = i18n.t('The core team appreciates any feedback on this new functionality which is currently being beta tested, please report any issues and feedback in the DHIS2 JIRA project.');
-
- return (
-
-
-
-
- {toggle && ( - setToggle(false)} dataTest="opt-in-modal">
- {title}
-
-
-
-
-
-
-
-
-
- )}
-
- );
-};
-
-export const OptIn: ComponentType<$Diff- {i18n.t('Click the button below to opt-in to the new enrollment dashboard functionality in the Capture app (beta) for this Tracker program for all users.')} -
- -- {toggle && ( -
{modalContent}
-{modalContentFeedback}
-
-
-
-
-
- );
-};
-
-export const OptOut: ComponentType<$Diff-
- {i18n.t( - 'This program uses the new enrollment dashboard functionality ' + - 'in the Capture app (beta). Click this button to opt-out and direct ' + - 'all users to the Tracker capture app for this program.', - )} -
- -
- {enrollmentPageStatus === enrollmentPageStatuses.MISSING_SELECTIONS &&
);
export const EnrollmentPageComponent: ComponentType<$Diff
+ {enrollmentPageStatus === enrollmentPageStatuses.MISSING_SELECTIONS &&
-
+ {enrollmentPageStatus === enrollmentPageStatuses.LOADING && (
+
-
- )}
-
+
+ )}
+
-
- )}
-
- ) : (
-
-
- )}
-
-));
-
-const MainPage = ({
+const MainPagePlain = ({
programId,
orgUnitId,
trackedEntityTypeId,
displayFrontPageList,
selectedTemplateId,
- selectedCategories,
- ...passOnProps
+ MainPageStatus,
+ setShowAccessible,
+ classes,
+ onChangeTemplate,
}: Props) => {
- const showMainPage = useShowMainPage({
- programId,
- orgUnitId,
- trackedEntityTypeId,
- displayFrontPageList,
- selectedTemplateId,
- });
+ const showMainPage = useMemo(() => {
+ const noProgramSelected = !programId;
+ const noOrgUnitSelected = !orgUnitId;
+ const isEventProgram = !trackedEntityTypeId;
+ return noProgramSelected || noOrgUnitSelected || isEventProgram || displayFrontPageList || selectedTemplateId;
+ }, [programId, orgUnitId, trackedEntityTypeId, displayFrontPageList, selectedTemplateId]);
return (
<>
-
-
-
-
-
+
+ )}
+
+ ) : (
+
+
+ )}
);
};
-export const MainPageComponent = withLoadingIndicator()(MainPage);
+
+export const MainPageComponent: ComponentType
+
+
+
+ {
@@ -15,14 +14,12 @@ export const WorkingListsType = ({ programId, orgUnitId, selectedTemplateId, onC
if (programType === programTypes.TRACKER_PROGRAM) {
return (
<>
- =
diff --git a/src/core_modules/capture-core/components/Pages/New/NewPage.container.js b/src/core_modules/capture-core/components/Pages/New/NewPage.container.js
index 8ea87c19e2..4286ee2c70 100644
--- a/src/core_modules/capture-core/components/Pages/New/NewPage.container.js
+++ b/src/core_modules/capture-core/components/Pages/New/NewPage.container.js
@@ -9,7 +9,7 @@ import {
showDefaultViewOnNewPage,
showMessageToSelectProgramCategoryOnNewPage, showMessageThatCategoryOptionIsInvalidForOrgUnit,
} from './NewPage.actions';
-import { typeof newPageStatuses } from './NewPage.constants';
+import { newPageStatuses } from './NewPage.constants';
import { buildUrlQueryString, useLocationQuery } from '../../../utils/routing';
import { getScopeFromScopeId, TrackerProgram, TrackedEntityType } from '../../../metaData';
import { useMissingCategoriesInProgramSelection } from '../../../hooks/useMissingCategoriesInProgramSelection';
@@ -18,6 +18,7 @@ import { useTrackedEntityInstances } from './hooks';
import { deriveTeiName } from '../common/EnrollmentOverviewDomain/useTeiDisplayName';
import { programCollection } from '../../../metaDataMemoryStores/programCollection/programCollection';
import { useCategoryOptionIsValidForOrgUnit } from '../../../hooks/useCategoryComboIsValidForOrgUnit';
+import { TopBar } from './TopBar.container';
const useUserWriteAccess = (scopeId) => {
const scope = getScopeFromScopeId(scopeId);
@@ -89,7 +90,7 @@ export const NewPage: ComponentType<{||}> = () => {
({ currentSelections }) => !currentSelections.orgUnitId && !currentSelections.complete,
);
- const newPageStatus: $Keys =
+ const newPageStatus: $Keys =
useSelector(({ newPage }) => newPage.newPageStatus);
const handleMainPageNavigation = () => {
@@ -108,26 +109,34 @@ export const NewPage: ComponentType<{||}> = () => {
);
return (
- ,
useFirstStageDuringRegistration: boolean,
- shouldRedirect: boolean,
) => {
const stagesArray = [...stages.values()];
const [firstStageWithOpenAfterEnrollment] = stagesArray.filter(({ openAfterEnrollment }) => openAfterEnrollment);
const redirectTo = (() => {
- if (shouldRedirect && firstStageWithOpenAfterEnrollment) {
+ if (firstStageWithOpenAfterEnrollment) {
// event will be created during first stage registration
if (
useFirstStageDuringRegistration
diff --git a/src/core_modules/capture-core/components/Pages/NewRelationship/RegisterTei/RegistrationSection/RegUnitSelector/RegUnitSelector.component.js b/src/core_modules/capture-core/components/Pages/NewRelationship/RegisterTei/RegistrationSection/RegUnitSelector/RegUnitSelector.component.js
index ea39476d43..fc4f52cfa5 100644
--- a/src/core_modules/capture-core/components/Pages/NewRelationship/RegisterTei/RegistrationSection/RegUnitSelector/RegUnitSelector.component.js
+++ b/src/core_modules/capture-core/components/Pages/NewRelationship/RegisterTei/RegistrationSection/RegUnitSelector/RegUnitSelector.component.js
@@ -47,7 +47,7 @@ class RegUnitSelectorPlain extends React.Component {
return;
}
- onUpdateSelectedOrgUnit(orgUnit, program.organisationUnits ? !program.organisationUnits[orgUnit.id] : false);
+ onUpdateSelectedOrgUnit(orgUnit, program?.organisationUnits ? !program.organisationUnits[orgUnit.id] : false);
}
render() {
diff --git a/src/core_modules/capture-core/components/Pages/NewRelationship/TeiRelationship/SearchResults/TeiRelationshipSearchResults.component.js b/src/core_modules/capture-core/components/Pages/NewRelationship/TeiRelationship/SearchResults/TeiRelationshipSearchResults.component.js
index 3cced06ccf..461424f302 100644
--- a/src/core_modules/capture-core/components/Pages/NewRelationship/TeiRelationship/SearchResults/TeiRelationshipSearchResults.component.js
+++ b/src/core_modules/capture-core/components/Pages/NewRelationship/TeiRelationship/SearchResults/TeiRelationshipSearchResults.component.js
@@ -10,7 +10,11 @@ import { makeAttributesSelector } from './teiRelationshipSearchResults.selectors
import { CardList } from '../../../../CardList';
import type { CurrentSearchTerms } from '../../../../SearchBox';
import { SearchResultsHeader } from '../../../../SearchResultsHeader';
-import { type SearchGroup } from '../../../../../metaData';
+import {
+ type SearchGroup,
+ getTrackerProgramThrowIfNotFound,
+ getTrackedEntityTypeThrowIfNotFound,
+} from '../../../../../metaData';
import { ResultsPageSizeContext } from '../../../shared-contexts';
import type { ListItem } from '../../../../CardList/CardList.types';
import { convertClientValuesToServer } from '../../../../../converters/helpers/clientToServer';
@@ -25,7 +29,8 @@ type Props = {|
currentPage: number,
searchGroup: SearchGroup,
searchValues: any,
- selectedProgramId: string,
+ selectedProgramId?: string,
+ selectedTrackedEntityTypeId: string,
teis: Array,
trackedEntityTypeName: string,
...CssClasses
@@ -60,6 +65,15 @@ const getStyles = (theme: Theme) => ({
},
});
+const getLinkedEntityFormFoundation = (selectedProgramId, selectedTrackedEntityTypeId) => {
+ if (selectedProgramId) {
+ const program = getTrackerProgramThrowIfNotFound(selectedProgramId);
+ return program.enrollment.enrollmentForm;
+ }
+ const trackedEntityType = getTrackedEntityTypeThrowIfNotFound(selectedTrackedEntityTypeId);
+ return trackedEntityType.teiRegistration.form;
+};
+
const CardListButton = ({ handleOnClick, teiId }) => (
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js
index 061f7a5fe4..07832fe83f 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js
@@ -47,7 +47,6 @@ const getEventDetailsByLinkMode = ({
}),
);
}
-
return ({
linkedEvent: {
...baseEventDetails,
@@ -56,23 +55,34 @@ const getEventDetailsByLinkMode = ({
},
linkedEventId: baseEventDetails.event,
});
- } else if (linkMode === RelatedStageModes.ENTER_DATA) {
+ }
+
+ if (linkMode === RelatedStageModes.ENTER_DATA) {
+ const { orgUnit: linkedEventOrgUnit } = relatedStageDataValues;
+ if (!linkedEventOrgUnit) {
+ throw new Error(
+ errorCreator('Missing required data for creating related stage event')({
+ linkedEventOrgUnit,
+ }),
+ );
+ }
return ({
linkedEvent: {
...baseEventDetails,
scheduledAt: convertFn(clientRequestEvent.scheduledAt, dataElementTypes.DATE),
- orgUnit: convertFn(clientRequestEvent.orgUnit, dataElementTypes.ORGANISATION_UNIT),
+ orgUnit: convertFn(linkedEventOrgUnit, dataElementTypes.ORGANISATION_UNIT),
},
linkedEventId: baseEventDetails.event,
});
- } else if (linkMode === RelatedStageModes.LINK_EXISTING_RESPONSE) {
+ }
+
+ if (linkMode === RelatedStageModes.LINK_EXISTING_RESPONSE) {
const { linkedEventId } = relatedStageDataValues;
return {
linkedEvent: null,
linkedEventId,
};
}
-
log.error(errorCreator(`Referral mode ${linkMode} is not supported`)());
return {
linkedEvent: null,
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js
index 69d7a4ab24..05515b4bcc 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js
@@ -65,14 +65,21 @@ const runRulesForEditSingleEvent = ({
if (program instanceof TrackerProgram) {
const { enrollment, attributeValues } = state.enrollmentDomain;
+ const { apiOtherEvents, apiCurrentEventOriginal } = enrollment.events.reduce((acc, apiEvent) => {
+ if (apiEvent.event === currentEvent.eventId) {
+ acc.apiCurrentEventOriginal = apiEvent;
+ } else {
+ acc.apiOtherEvents.push(apiEvent);
+ }
+ return acc;
+ }, { apiOtherEvents: [] });
+
effects = getApplicableRuleEffectsForTrackerProgram({
program,
stage,
orgUnit,
- currentEvent,
- otherEvents: prepareEnrollmentEventsForRulesEngine(
- enrollment?.events.filter(enrollmentEvent => enrollmentEvent.event !== currentEvent.eventId),
- ),
+ currentEvent: { ...currentEvent, createdAt: apiCurrentEventOriginal.createdAt },
+ otherEvents: prepareEnrollmentEventsForRulesEngine(apiOtherEvents),
enrollmentData: getEnrollmentForRulesEngine(enrollment),
attributeValues: getAttributeValuesForRulesEngine(attributeValues, program.attributes),
});
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
index f953852223..b39bb89c7c 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
@@ -32,7 +32,7 @@ import { EventChangelogWrapper } from './EventChangelogWrapper';
import { FEATURES, useFeature } from '../../../capture-core-utils';
import { inMemoryFileStore } from '../DataEntry/file/inMemoryFileStore';
import { eventStatuses } from './constants/status.const';
-import { useAuthorities } from './hooks';
+import { useAuthorities } from '../../utils/authority/useAuthorities';
const styles = {
header: {
@@ -101,8 +101,8 @@ export const WidgetEventEditPlain = ({
const loadedValues = useSelector(({ viewEventPage }) => viewEventPage.loadedValues);
const eventAccess = getProgramEventAccess(programId, stageId);
- const { canEditCompletedEvent } = useAuthorities();
- const blockEntryForm = stage.blockEntryForm && !canEditCompletedEvent && eventStatus === eventStatuses.COMPLETED;
+ const { hasAuthority } = useAuthorities({ authorities: ['F_UNCOMPLETE_EVENT'] });
+ const blockEntryForm = stage.blockEntryForm && !hasAuthority && eventStatus === eventStatuses.COMPLETED;
const disableEdit = !eventAccess?.write || blockEntryForm;
const tooltipContent = blockEntryForm ?
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js b/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js
deleted file mode 100644
index edcfc4f241..0000000000
--- a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// @flow
-export { useAuthorities } from './useAuthorities';
diff --git a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js b/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js
index f2b4fca631..031f7fd462 100644
--- a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js
+++ b/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js
@@ -1,8 +1,8 @@
// @flow
import React from 'react';
+import { useAuthorities } from 'capture-core/utils/authority/useAuthorities';
import type { Props } from './OverflowMenu.types';
import { OverflowMenuComponent } from './OverflowMenu.component';
-import { useAuthorities } from './hooks';
export const OverflowMenu = ({
trackedEntityTypeName,
@@ -13,13 +13,13 @@ export const OverflowMenu = ({
teiId,
programAPI,
}: Props) => {
- const { canCascadeDeleteTei } = useAuthorities();
+ const { hasAuthority } = useAuthorities({ authorities: ['F_TEI_CASCADE_DELETE'] });
return (
{
!writeAccess ?
@@ -154,7 +141,7 @@ const NewPagePlain = ({
}
- );
+ );
};
export const NewPageComponent: ComponentType
+
+ );
+};
+
+export const EnterDataInOrgUnit: ComponentType<$Diff
+
+
+
+
-
+
- {previousValue}
-
);
const Created = ({ currentValue, classes }) => (
- {i18n.t('Created')}
{currentValue}
);
@@ -50,8 +63,6 @@ const Created = ({ currentValue, classes }) => (
const Deleted = ({ previousValue, classes }) => (
{previousValue}
- {i18n.t('Deleted')}
);
@@ -61,7 +72,7 @@ const ChangelogComponentsByType = {
[CHANGE_TYPES.DELETED]: Deleted,
};
-const ChangelogChangeCellPlain = ({ changeType, currentValue, previousValue, classes }: Props) => {
+const ChangelogValueCellPlain = ({ changeType, currentValue, previousValue, classes }: Props) => {
const ChangelogComponent = ChangelogComponentsByType[changeType];
if (!ChangelogComponent) {
@@ -78,4 +89,4 @@ const ChangelogChangeCellPlain = ({ changeType, currentValue, previousValue, cla
);
};
-export const ChangelogChangeCell = withStyles(styles)(ChangelogChangeCellPlain);
+export const ChangelogValueCell = withStyles(styles)(ChangelogValueCellPlain);
diff --git a/src/core_modules/capture-core/components/WidgetsChangelog/common/ChangelogTable/ChangelogCells/index.js b/src/core_modules/capture-core/components/WidgetsChangelog/common/ChangelogTable/ChangelogCells/index.js
new file mode 100644
index 0000000000..d5f9ff3167
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetsChangelog/common/ChangelogTable/ChangelogCells/index.js
@@ -0,0 +1,4 @@
+// @flow
+
+export { ChangelogChangeCell } from './ChangelogChangeCell';
+export { ChangelogValueCell } from './ChangelogValueCell';
diff --git a/src/core_modules/capture-core/components/WidgetsChangelog/common/ChangelogTable/ChangelogTableHeader.js b/src/core_modules/capture-core/components/WidgetsChangelog/common/ChangelogTable/ChangelogTableHeader.js
index 9c3ebd671a..26dc592540 100644
--- a/src/core_modules/capture-core/components/WidgetsChangelog/common/ChangelogTable/ChangelogTableHeader.js
+++ b/src/core_modules/capture-core/components/WidgetsChangelog/common/ChangelogTable/ChangelogTableHeader.js
@@ -9,27 +9,30 @@ type Props = {
setSortDirection: SetSortDirection,
};
-export const ChangelogTableHeader = ({
- sortDirection,
- setSortDirection,
-}: Props) => (
+export const ChangelogTableHeader = ({ sortDirection, setSortDirection }: Props) => (