feat: [DHIS2-18325] Show orgunit selector in the new event form

cypress/e2e/ScopeSelector/ScopeSelector.feature

@@ -221,11 +221,6 @@ Feature: User uses the ScopeSelector to navigate
     When you reset the program selection
     Then you see message explaining you need to select a program
 
-  Scenario: Enrollment event new page > resetting the org unit
-    Given you land on a enrollment page domain by having typed /#/enrollmentEventNew?programId=IpHINAT79UW&orgUnitId=UgYg0YW7ZIh&teiId=fhFQhO0xILJ&enrollmentId=gPDueU02tn8&stageId=A03MvHHogjR
-    When you reset the org unit selection
-    Then you see the enrollment event New page but there is no org unit id in the url
-
   Scenario: Enrollment event new page > resetting the enrollment
     Given you land on a enrollment page domain by having typed /#/enrollmentEventNew?programId=IpHINAT79UW&orgUnitId=UgYg0YW7ZIh&teiId=fhFQhO0xILJ&enrollmentId=gPDueU02tn8&stageId=A03MvHHogjR
     When you reset the enrollment selection

cypress/e2e/ScopeSelector/ScopeSelector.js

@@ -290,11 +290,6 @@ And('you see the enrollment event Edit page but there is no org unit id in the u
     cy.get('[data-test="widget-enrollment-event-view"]').should('exist');
 });
 
-And('you see the enrollment event New page but there is no org unit id in the url', () => {
-    cy.url().should('eq', `${Cypress.config().baseUrl}/#/enrollmentEventNew?enrollmentId=gPDueU02tn8&programId=IpHINAT79UW&stageId=A03MvHHogjR&teiId=fhFQhO0xILJ`);
-    cy.contains('Choose an organisation unit to start reporting');
-});
-
 And('you see the enrollment event New page but there is no stage id in the url', () => {
     cy.url().should('eq', `${Cypress.config().baseUrl}/#/enrollmentEventNew?enrollmentId=gPDueU02tn8&orgUnitId=UgYg0YW7ZIh&programId=IpHINAT79UW&teiId=fhFQhO0xILJ`);
     cy.contains('Choose a stage for a new event');

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-12-15T15:25:38.375Z\n"
-"PO-Revision-Date: 2024-12-15T15:25:38.375Z\n"
+"POT-Creation-Date: 2025-01-02T13:08:32.303Z\n"
+"PO-Revision-Date: 2025-01-02T13:08:32.303Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -709,9 +709,6 @@ msgstr "There was an error opening the Page"
 msgid "There was an error loading the page"
 msgstr "There was an error loading the page"
 
-msgid "Choose an organisation unit to start reporting"
-msgstr "Choose an organisation unit to start reporting"
-
 msgid "Program stage is invalid"
 msgstr "Program stage is invalid"
 
@@ -768,6 +765,9 @@ msgstr ""
 "You don't have access to create a {{trackedEntityName}} in the current "
 "selections"
 
+msgid "Choose an organisation unit to start reporting"
+msgstr "Choose an organisation unit to start reporting"
+
 msgid "Choose the {{missingCategories}} to start reporting"
 msgstr "Choose the {{missingCategories}} to start reporting"
 
@@ -1231,12 +1231,18 @@ msgstr "Add area"
 msgid "Please add or cancel the note before saving the event"
 msgstr "Please add or cancel the note before saving the event"
 
+msgid "Please provide an valid organisation unit"
+msgstr "Please provide an valid organisation unit"
+
 msgid "organisation unit could not be retrieved. Please try again later."
 msgstr "organisation unit could not be retrieved. Please try again later."
 
 msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}"
 msgstr "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}"
 
+msgid "Saving to {{stageName}} for {{programName}}"
+msgstr "Saving to {{stageName}} for {{programName}}"
+
 msgid "program or stage is invalid"
 msgstr "program or stage is invalid"
 
@@ -1258,9 +1264,6 @@ msgstr "Warning"
 msgid "stage not found in rules execution"
 msgstr "stage not found in rules execution"
 
-msgid "Please provide an valid organisation unit"
-msgstr "Please provide an valid organisation unit"
-
 msgid "Delete event"
 msgstr "Delete event"
 
@@ -1313,9 +1316,6 @@ msgid_plural "There are {{count}} scheduled event in {{orgUnitName}} on this day
 msgstr[0] "There are {{count}} scheduled event in {{orgUnitName}} on this day."
 msgstr[1] "There are {{count}} scheduled events in {{orgUnitName}} on this day."
 
-msgid "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}"
-msgstr "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}"
-
 msgid "Schedule info"
 msgstr "Schedule info"
 

src/core_modules/capture-core/components/FormFields/New/HOC/withCenterPoint.js

@@ -17,6 +17,9 @@ const convertToClientCoordinates = ({ coordinates, type }: { coordinates: any[],
 
 const getCenterPoint = (InnerComponent: ComponentType<any>) => (props: Object) => {
     const { orgUnit, ...passOnProps } = props;
+    if (!orgUnit || !orgUnit.id) {
+        return <InnerComponent {...passOnProps} center={DEFAULT_CENTER} onOpenMap={() => {}} />;
+    }
     const [orgUnitKey, setOrgUnitKey] = useState(orgUnit.id);
     const [shouldFetch, setShouldFetch] = useState(false);
     const queryKey = ['organisationUnit', 'geometry', orgUnitKey];

src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.component.js

@@ -4,7 +4,6 @@ import i18n from '@dhis2/d2-i18n';
 import { spacersNum } from '@dhis2/ui';
 import withStyles from '@material-ui/core/styles/withStyles';
 import type { Props } from './EnrollmentAddEventPageDefault.types';
-import { IncompleteSelectionsMessage } from '../../../IncompleteSelectionsMessage';
 import { EnrollmentPageLayout } from '../../common/EnrollmentOverviewDomain/EnrollmentPageLayout';
 import {
     EnrollmentPageKeys,
@@ -65,14 +64,6 @@ const EnrollmentAddEventPagePain = ({
         );
     }
 
-    if (!orgUnitId) {
-        return (
-            <IncompleteSelectionsMessage>
-                {i18n.t('Choose an organisation unit to start reporting')}
-            </IncompleteSelectionsMessage>
-        );
-    }
-
     if (!ready) {
         return null;
     }

src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/TopBar/TopBar.component.js

@@ -34,6 +34,7 @@ export const EnrollmentAddEventTopBar = ({
             onResetOrgUnitId={() => onResetOrgUnitId()}
             isUserInteractionInProgress={userInteractionInProgress}
             onStartAgain={() => reset()}
+            isReadOnly
         >
             <SingleLockedSelect
                 displayOnly

src/core_modules/capture-core/components/ScopeSelector/QuickSelector/OrgUnitSelector.component.js

@@ -21,6 +21,7 @@ type Props = {
         name: string
     },
     previousOrgUnitId?: string,
+    isReadOnly?: boolean,
     classes: Object,
 };
 
@@ -48,16 +49,17 @@ class OrgUnitSelectorPlain extends Component<Props, State> {
     }
 
     render() {
-        const { selectedOrgUnitId, selectedOrgUnit, previousOrgUnitId, onReset, classes } = this.props;
+        const { selectedOrgUnitId, selectedOrgUnit, previousOrgUnitId, onReset, isReadOnly, classes } = this.props;
 
         return (
             <SelectorBarItem
                 label={i18n.t('Organisation unit')}
                 noValueMessage={i18n.t('Choose an organisation unit')}
                 value={selectedOrgUnitId ? selectedOrgUnit?.name : ''}
-                open={this.state.open}
+                open={!isReadOnly && this.state.open}
                 setOpen={open => this.setState({ open })}
-                onClearSelectionClick={() => onReset()}
+                onClearSelectionClick={!isReadOnly ? () => onReset() : undefined}
+                displayOnly={isReadOnly}
                 dataTest="org-unit-selector-container"
             >
                 <div className={classes.selectBarMenu}>

src/core_modules/capture-core/components/ScopeSelector/QuickSelector/QuickSelector.component.js

@@ -22,6 +22,7 @@ export const QuickSelector = ({
     formIsOpen,
     children,
     onStartAgain,
+    isReadOnly,
 }: Props) => (
     <SelectorBar
         disableClearSelections={!selectedProgramId && !selectedOrgUnitId}
@@ -46,6 +47,7 @@ export const QuickSelector = ({
             handleClickOrgUnit={onSetOrgUnit}
             selectedOrgUnit={selectedOrgUnit}
             onReset={onResetOrgUnitId}
+            isReadOnly={isReadOnly}
         />
         {children}
     </SelectorBar>

src/core_modules/capture-core/components/ScopeSelector/QuickSelector/QuickSelector.types.js

@@ -17,4 +17,5 @@ export type Props = {
     onStartAgain: () => void,
     formIsOpen: boolean,
     children: Node,
+    isReadOnly?: boolean,
 };

src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.component.js

@@ -119,6 +119,7 @@ class ScopeSelectorClass extends Component<Props, State> {
                     selectedCategories={this.props.selectedCategories}
                     isUserInteractionInProgress={this.props.isUserInteractionInProgress}
                     formIsOpen={this.props.formIsOpen}
+                    isReadOnly={this.props.isReadOnly}
                 >
                     {this.props.children}
                 </QuickSelector>

src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.container.js

@@ -31,6 +31,7 @@ export const ScopeSelector: ComponentType<OwnProps> = ({
     onStartAgain,
     formIsOpen = false,
     children,
+    isReadOnly,
 }) => {
     const dispatch = useDispatch();
     const [selectedOrgUnit, setSelectedOrgUnit] = useState({ name: undefined, id: selectedOrgUnitId });
@@ -81,6 +82,7 @@ export const ScopeSelector: ComponentType<OwnProps> = ({
             isUserInteractionInProgress={isUserInteractionInProgress}
             formIsOpen={formIsOpen}
             onStartAgain={onStartAgain}
+            isReadOnly={isReadOnly}
             ready={ready}
         >
             {children}

src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.types.js

@@ -18,6 +18,7 @@ export type OwnProps = $ReadOnly<{|
   onStartAgain: () => void,
   formIsOpen?: boolean,
   children: Node,
+  isReadOnly?: boolean,
 |}>
 
 export type PropsFromRedux = $ReadOnly<{|

src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/DataEntry.component.js

@@ -7,9 +7,12 @@ import { DataEntry as DataEntryContainer } from '../../DataEntry/DataEntry.conta
 import { withDataEntryField } from '../../DataEntry/dataEntryField/withDataEntryField';
 import { withDataEntryNotesHandler } from '../../DataEntry/dataEntryNotes/withDataEntryNotesHandler';
 import { Notes } from '../../Notes/Notes.component';
-import { getEventDateValidatorContainers } from './fieldValidators/eventDate.validatorContainersGetter';
+import {
+    getEventDateValidatorContainers,
+    getOrgUnitValidatorContainers,
+    getNoteValidatorContainers,
+} from './fieldValidators';
 import { type RenderFoundation, type ProgramStage } from '../../../metaData';
-import { getNoteValidatorContainers } from './fieldValidators/note.validatorContainersGetter';
 import {
     placements,
     withCleanUp,
@@ -28,6 +31,7 @@ import {
     withDefaultShouldUpdateInterface,
     orientations,
     VirtualizedSelectField,
+    SingleOrgUnitSelectField,
 } from '../../FormFields/New';
 import { Assignee } from './Assignee';
 import { inMemoryFileStore } from '../../DataEntry/file/inMemoryFileStore';
@@ -102,7 +106,6 @@ const baseComponentStylesVertical = {
     },
 };
 
-
 function defaultFilterProps(props: Object) {
     const { formHorizontal, fieldOptions, validationError, modified, ...passOnProps } = props;
     return passOnProps;
@@ -161,6 +164,46 @@ const buildReportDateSettingsFn = () => {
     return reportDateSettings;
 };
 
+const buildOrgUnitSettingsFn = () => {
+    const orgUnitComponent =
+        withCalculateMessages(overrideMessagePropNames)(
+            withFocusSaver()(
+                withDefaultFieldContainer()(
+                    withDefaultShouldUpdateInterface()(
+                        withLabel({
+                            onGetUseVerticalOrientation: (props: Object) => props.formHorizontal,
+                            onGetCustomFieldLabeClass: (props: Object) => `${props.fieldOptions.fieldLabelMediaBasedClass} ${labelTypeClasses.orgUnitLabel}`,
+                        })(
+                            withDisplayMessages()(
+                                withInternalChangeHandler()(
+                                    withFilterProps(defaultFilterProps)(SingleOrgUnitSelectField),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+        );
+
+    const orgUnitSettings = {
+        getComponent: () => orgUnitComponent,
+        getComponentProps: (props: Object) => createComponentProps(props, {
+            width: props && props.formHorizontal ? 150 : 350,
+            label: i18n.t('Organisation unit'),
+            required: true,
+        }),
+        getPropName: () => 'orgUnit',
+        getValidatorContainers: () => getOrgUnitValidatorContainers(),
+        getMeta: () => ({
+            placement: placements.TOP,
+            section: dataEntrySectionNames.BASICINFO,
+        }),
+    };
+
+    return orgUnitSettings;
+};
+
+
 const pointComponent = withCalculateMessages(overrideMessagePropNames)(
     withFocusSaver()(
         withDefaultFieldContainer()(
@@ -284,8 +327,8 @@ const buildAssigneeSettingsFn = () => {
         withTransformPropName(['onBlur', 'onSet'])(
             withFocusSaver()(
                 withFilterProps((props: Object) => {
-                    const defaultFiltred = defaultFilterProps(props);
-                    const { validationAttempted, touched, ...passOnProps } = defaultFiltred;
+                    const defaultfiltered = defaultFilterProps(props);
+                    const { validationAttempted, touched, ...passOnProps } = defaultfiltered;
                     return passOnProps;
                 })(Assignee),
             ),
@@ -358,6 +401,7 @@ const WrappedDataEntry = compose(
     withAOCFieldBuilder({}),
     withDataEntryFields(getCategoryOptionsSettingsFn()),
     withDataEntryField(buildReportDateSettingsFn()),
+    withDataEntryField(buildOrgUnitSettingsFn()),
     withDataEntryFieldIfApplicable(buildGeometrySettingsFn()),
     withDataEntryField(buildNotesSettingsFn()),
     withDataEntryFieldIfApplicable(buildAssigneeSettingsFn()),

src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/dataEntry.types.js

@@ -6,7 +6,7 @@ import type { RulesExecutionDependenciesClientFormatted } from '../common.types'
 export type ContainerProps = {|
     stage: ProgramStage,
     formFoundation: RenderFoundation,
-    orgUnit: OrgUnit,
+    orgUnit?: OrgUnit,
     id: string,
     itemId: string,
     formRef: (formInstance: any) => void,

src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/fieldValidators/index.js

@@ -0,0 +1,5 @@
+// @flow
+export { getCategoryOptionsValidatorContainers } from './categoryOptions.validatorContainersGetter';
+export { getEventDateValidatorContainers } from './eventDate.validatorContainersGetter';
+export { getNoteValidatorContainers } from './note.validatorContainersGetter';
+export { getOrgUnitValidatorContainers } from './orgUnit.validatorContainersGetter';

src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/fieldValidators/orgUnit.validatorContainersGetter.js

@@ -0,0 +1,15 @@
+// @flow
+import { isValidOrgUnit } from 'capture-core-utils/validators/form';
+import i18n from '@dhis2/d2-i18n';
+
+const validateOrgUnit = (value?: ?Object) => isValidOrgUnit(value);
+
+export const getOrgUnitValidatorContainers = () => {
+    const validatorContainers = [
+        {
+            validator: validateOrgUnit,
+            message: i18n.t('Please provide an valid organisation unit'),
+        },
+    ];
+    return validatorContainers;
+};

src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/helpers/getOpenDataEntryActions.js

@@ -1,8 +1,7 @@
 // @flow
-
 import { convertGeometryOut } from 'capture-core/components/DataEntries/converters';
 import { loadNewDataEntry } from '../../../DataEntry/actions/dataEntryLoadNew.actions';
-import { getEventDateValidatorContainers } from '../fieldValidators/eventDate.validatorContainersGetter';
+import { getEventDateValidatorContainers, getOrgUnitValidatorContainers } from '../fieldValidators';
 import { getNoteValidatorContainers } from '../fieldValidators/note.validatorContainersGetter';
 import type { ProgramCategory } from '../../../WidgetEventSchedule/CategoryOptions/CategoryOptions.types';
 import { getCategoryOptionsValidatorContainers } from '../fieldValidators/categoryOptions.validatorContainersGetter';
@@ -15,6 +14,11 @@ const dataEntryPropsToInclude: DataEntryPropsToInclude = [
         type: 'DATE',
         validatorContainers: getEventDateValidatorContainers(),
     },
+    {
+        id: 'orgUnit',
+        type: 'ORGANISATION_UNIT',
+        validatorContainers: getOrgUnitValidatorContainers(),
+    },
     {
         id: 'scheduledAt',
         type: 'DATE',
@@ -37,14 +41,19 @@ const dataEntryPropsToInclude: DataEntryPropsToInclude = [
 ];
 
 export const getOpenDataEntryActions =
-    (dataEntryId: string, itemId: string, programCategory?: ProgramCategory) => {
+    (dataEntryId: string, itemId: string, programCategory?: ProgramCategory, orgUnit: Object) => {
+        const defaultDataEntryValues = {
+            orgUnit: orgUnit
+                ? { id: orgUnit.id, name: orgUnit.name, path: orgUnit.path }
+                : undefined,
+        };
         if (programCategory && programCategory.categories) {
             dataEntryPropsToInclude.push(...programCategory.categories.map(category => ({
                 id: `attributeCategoryOptions-${category.id}`,
                 type: 'TEXT',
                 validatorContainers: getCategoryOptionsValidatorContainers({ categories: programCategory.categories }, category.id),
             })));
         }
-        return loadNewDataEntry(dataEntryId, itemId, dataEntryPropsToInclude);
+        return loadNewDataEntry(dataEntryId, itemId, dataEntryPropsToInclude, defaultDataEntryValues);
     };