fix: [DHIS2-20495] Org unit not retained after “Save and add another” event (#4406)

* fix: add org unit

* fix: typing

* fix: expect org unit first

* fix: review temp

* fix: add program category from index db

Author: henrikmv

src/core_modules/capture-core-utils/types/global.ts

@@ -8,6 +8,9 @@ export type ReduxStore = {
             programId: string;
             orgUnitId?: string;
             complete?: boolean;
+            trackedEntityTypeId?: string;
+            categories?: Record<string, string>;
+            categoriesMeta?: Record<string, { name: string; writeAccess: boolean }>;
         };
         possibleDuplicates: {
             isLoading: boolean;

src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/newEventDataEntry.epics.ts

@@ -45,10 +45,29 @@ type SelectionsCompletenessPayload = {
     triggeringActionType?: string;
 };
 
-export const resetDataEntryForNewEventEpic = (action$: EpicAction<any>) =>
+export const resetDataEntryForNewEventEpic = (action$: EpicAction<any>, store: ReduxStore) =>
     action$.pipe(
         ofType(newEventDataEntryBatchActionTypes.SAVE_NEW_EVENT_ADD_ANOTHER_BATCH),
-        map(() => (batchActions(getOpenDataEntryActions()))),
+        map(() => {
+            const state = store.value;
+            const selectedCategories = state.currentSelections.categories;
+            const orgUnitId = state.currentSelections.orgUnitId;
+            const orgUnits = state.organisationUnits;
+            const orgUnit = orgUnitId && orgUnits
+                ? orgUnits[orgUnitId]
+                : undefined;
+            const program = getEventProgramThrowIfNotFound(state.currentSelections.programId);
+            const categoryCombination = program.categoryCombination;
+            const programCategory = categoryCombination ? {
+                displayName: categoryCombination.name,
+                id: categoryCombination.id,
+                categories: Array.from(categoryCombination.categories.values()).map(category => ({
+                    id: category.id,
+                    displayName: category.name,
+                })),
+            } : null;
+            return batchActions(getOpenDataEntryActions(programCategory, selectedCategories, orgUnit));
+        }),
     );
 
 export const openNewEventInDataEntryEpic = (action$: EpicAction<SelectionsCompletenessPayload>, store: ReduxStore) =>

src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/helpers/getOpenDataEntryActions.ts

@@ -1,4 +1,4 @@
-import type { OrgUnit } from '@dhis2/rules-engine-javascript';
+import { CoreOrgUnit } from 'capture-core/metadataRetrieval/coreOrgUnit';
 import { loadNewDataEntry } from '../../../../../DataEntry/actions/dataEntryLoadNew.actions';
 import { getEventDateValidatorContainers, getOrgUnitValidatorContainers } from '../fieldValidators';
 import { convertGeometryOut, convertStatusIn, convertStatusOut } from '../../../../index';
@@ -51,7 +51,7 @@ const dataEntryPropsToInclude: Array<DataEntryPropToInclude> = [
 export const getOpenDataEntryActions = (
     programCategory?: ProgramCategory | null,
     selectedCategories?: { [key: string]: string } | null,
-    orgUnit?: OrgUnit & { path: string } | null,
+    orgUnit?: CoreOrgUnit | null,
 ) => {
     let defaultDataEntryValues = {
         orgUnit: orgUnit