fix: [DHIS2-21708] Org unit selector is expanded when form open if no org unit in top bar

cypress/e2e/RelatedStages/RelatedStages.js

@@ -126,19 +126,19 @@ And('you open the Birth new event page and fill in the required data in the form
 
 When('you fill in the required values for the Baby postnatal event when scheduling', () => {
     cy.get('[data-test="related-stages-section"]')
-        .within(() => {
-            cy.get('input[type="text"]')
-                .eq(0)
-                .type(`${getCurrentYear()}-08-01`)
-                .blur();
-
-            cy.get('input[type="text"]')
-                .eq(1)
-                .type('Barmoi CH');
+        .find('input[type="text"]')
+        .eq(0)
+        .type(`${getCurrentYear()}-08-01`)
+        .blur();
 
-            cy.contains('Barmoi CHP')
-                .click();
-        });
+    cy.get('[data-test="related-stages-section"]')
+        .find('[data-test="org-unit-selector-trigger"]')
+        .click();
+    cy.get('input[placeholder="Search for an organisation unit"]').type('Barmoi CH', { force: true });
+    cy.get('[data-test="dhis2-uicore-popover"]').last().within(() => {
+        cy.get('[data-test="dhis2-uicore-circularloader"]').should('not.exist');
+        cy.contains('Barmoi CHP').click();
+    });
 });
 
 And('you click the Schedule action button', () => {
@@ -148,14 +148,13 @@ And('you click the Schedule action button', () => {
 
 When('you fill in the required values for the Baby postnatal event when entering details', () => {
     cy.get('[data-test="related-stages-section"]')
-        .within(() => {
-            cy.get('input[type="text"]')
-                .eq(0)
-                .type('Barmoi CH');
-
-            cy.contains('Barmoi CHP')
-                .click();
-        });
+        .find('[data-test="org-unit-selector-trigger"]')
+        .click();
+    cy.get('input[placeholder="Search for an organisation unit"]').type('Barmoi CH', { force: true });
+    cy.get('[data-test="dhis2-uicore-popover"]').last().within(() => {
+        cy.get('[data-test="dhis2-uicore-circularloader"]').should('not.exist');
+        cy.contains('Barmoi CHP').click();
+    });
 });
 
 And('you click the Enter details action button', () => {

cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/EventWorkingListsUser.js

@@ -521,8 +521,9 @@ When('you set the date filter', () => {
 When('you set the organisation unit filter', () => {
     cy.get('[data-test="event-working-lists"]').within(() => cy.contains('More filters').click());
     cy.get('[data-test="more-filters-menu"]').within(() => cy.contains('Place of Infection').click());
-    cy.get('[data-test="list-view-filter-contents"]').within(() => {
-        cy.get('input[placeholder="Search"]').type('Ngelehun');
+    cy.get('[data-test="org-unit-selector-trigger"]').click();
+    cy.get('input[placeholder="Search for an organisation unit"]').type('Ngelehun', { force: true });
+    cy.get('[data-test="dhis2-uicore-popover"]').last().within(() => {
         cy.get('[data-test="dhis2-uicore-circularloader"]').should('not.exist');
         cy.contains('Ngelehun').click();
     });

cypress/e2e/WorkingLists/TrackerWorkingLists/TrackerWorkingListsUser/TrackerWorkingListsUser.js

@@ -692,8 +692,9 @@ When(/^you set the option filter "([^"]+)" to (Yes|No)$/, (filterName, value) =>
 When(/^you set the program stage organisation unit filter "([^"]+)" to "([^"]+)"$/, (filterName, searchTerm) => {
     cy.get('[data-test="tracker-working-lists"]').within(() => cy.get('[data-test="more-filters"]').eq(1).click());
     cy.get('[data-test="more-filters-menu"]').within(() => cy.contains(filterName).click());
-    cy.get('[data-test="list-view-filter-contents"]').within(() => {
-        cy.get('input[placeholder="Search"]').type(searchTerm);
+    cy.get('[data-test="org-unit-selector-trigger"]').click();
+    cy.get('input[placeholder="Search for an organisation unit"]').type(searchTerm, { force: true });
+    cy.get('[data-test="dhis2-uicore-popover"]').last().within(() => {
         cy.get('[data-test="dhis2-uicore-circularloader"]').should('not.exist');
         cy.contains(searchTerm).click();
     });

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: 2026-07-02T15:31:30.388Z\n"
-"PO-Revision-Date: 2026-07-02T15:31:30.388Z\n"
+"POT-Creation-Date: 2026-07-03T11:46:01.593Z\n"
+"PO-Revision-Date: 2026-07-03T11:46:01.594Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
@@ -593,6 +593,9 @@ msgstr "Type to filter options"
 msgid "No match found"
 msgstr "No match found"
 
+msgid "Search for an organisation unit"
+msgstr "Search for an organisation unit"
+
 msgid "Clear"
 msgstr "Clear"
 

src/core_modules/capture-core/components/D2Form/FormBuilder/FormBuilder.component.tsx

@@ -243,6 +243,7 @@ export class FormBuilder extends React.Component<Props> {
             .promise
             .then((validationContainerArray) => {
                 const validationContainers = validationContainerArray
+                    .filter(container => !this.commitUpdateTriggeredForFields[container.id])
                     .reduce((accFieldsUI, container) => {
                         accFieldsUI[container.id] = container.validationData;
                         return accFieldsUI;

src/core_modules/capture-core/components/D2Form/field/configs/orgUnitField/getOrgUnitFieldConfig.ts

@@ -10,6 +10,7 @@ export const getOrgUnitFieldConfig = (metaData: MetaDataElement, options: any, q
         formHorizontal: options.formHorizontal,
         fieldLabelMediaBasedClass: options.fieldLabelMediaBasedClass,
         maxTreeHeight: 200,
+        autoSelectSingleOrgUnit: options.autoSelectSingleOrgUnit ?? !!metaData.compulsory,
     }, options, metaData);
 
     return createFieldConfig({

src/core_modules/capture-core/components/DataEntry/DataEntry.component.tsx

@@ -143,6 +143,7 @@ export type DataEntryOutputProps = {
     orgUnitId?: string,
     pluginContext?: PluginContext,
     viewMode?: boolean,
+    fieldOptions?: Record<string, any>,
 };
 
 type OwnProps = DataEntryOutputProps & {

src/core_modules/capture-core/components/FiltersForTypes/OrgUnit/OrgUnitFilter.component.tsx

@@ -34,6 +34,7 @@ export class OrgUnitFilter extends Component<OrgUnitFilterProps> implements Upda
                         value={filteredValue != null && typeof filteredValue === 'object' ? filteredValue : undefined}
                         onBlur={this.handleOrgUnitChange}
                         maxTreeHeight={280}
+                        autoSelectSingleOrgUnit={false}
                     />
                 )}
             </WithEmptyValueFilter>

src/core_modules/capture-core/components/FiltersForTypes/OrgUnit/OrgUnitFilterManager.component.tsx

@@ -1,40 +1,35 @@
-import * as React from 'react';
+import React, { useState } from 'react';
 import { OrgUnitFilter as OrgUnitFilterInput } from './OrgUnitFilter.component';
 import { getEmptyValueFilterValue, isEmptyFilterData } from '../EmptyValue';
 import type { OrgUnitFilter, OrgUnitFilterManagerProps, Value } from './orgUnit.types';
 
-type State = {
-    value: Value;
-};
-
-export class OrgUnitFilterManager extends React.Component<OrgUnitFilterManagerProps, State> {
-    static calculateDefaultState(filter: OrgUnitFilter | null | undefined): State {
-        if (!filter) return { value: undefined };
-        if (isEmptyFilterData(filter)) return { value: getEmptyValueFilterValue(filter) };
+const calculateInitialValue = (filter: OrgUnitFilter | null | undefined): Value => {
+    if (!filter) return undefined;
+    if (isEmptyFilterData(filter)) return getEmptyValueFilterValue(filter);
 
-        const { value, name } = filter;
-        return { value: { id: value, name: name ?? value, path: '' } };
-    }
+    const { value, name } = filter;
+    return { id: value, name: name ?? value, path: '' };
+};
 
-    constructor(props: OrgUnitFilterManagerProps) {
-        super(props);
-        this.state = OrgUnitFilterManager.calculateDefaultState(this.props.filter);
-    }
+export const OrgUnitFilterManager = ({
+    filter,
+    filterTypeRef,
+    handleCommitValue,
+    ...passOnProps
+}: OrgUnitFilterManagerProps) => {
+    const [value, setValue] = useState<Value>(() => calculateInitialValue(filter));
 
-    handleCommitValue = (value: Value) => {
-        this.setState({ value });
-        this.props.handleCommitValue?.();
+    const onCommitValue = (newValue: Value) => {
+        setValue(newValue);
+        handleCommitValue?.();
     };
 
-    render() {
-        const { filter, filterTypeRef, ...passOnProps } = this.props;
-        return (
-            <OrgUnitFilterInput
-                value={this.state.value}
-                ref={filterTypeRef}
-                onCommitValue={this.handleCommitValue}
-                {...passOnProps}
-            />
-        );
-    }
-}
+    return (
+        <OrgUnitFilterInput
+            value={value}
+            ref={filterTypeRef}
+            onCommitValue={onCommitValue}
+            {...passOnProps}
+        />
+    );
+};

src/core_modules/capture-core/components/FormFields/New/Fields/OrgUnitField/OrgUnitField.component.tsx

@@ -46,6 +46,8 @@ type OrgUnitFieldProps = {
     disabled?: boolean;
     previousOrgUnitId?: string;
     dataTest?: string;
+    hideSearchField?: boolean;
+    searchText?: string;
 };
 
 type Props = OrgUnitFieldProps & WithStyles<typeof getStyles>;
@@ -60,8 +62,11 @@ const OrgUnitFieldPlain = (props: Props) => {
         disabled,
         previousOrgUnitId,
         dataTest,
+        hideSearchField,
+        searchText: externalSearchText,
     } = props;
-    const [searchText, setSearchText] = React.useState<string | undefined>(undefined);
+    const [internalSearchText, setInternalSearchText] = React.useState<string | undefined>(undefined);
+    const searchText = hideSearchField ? externalSearchText : internalSearchText;
     const [key, setKey] = React.useState<string | undefined>(undefined);
 
     const initialRoots = React.useMemo(() => CurrentUser.get().organisationUnits, []);
@@ -117,7 +122,7 @@ const OrgUnitFieldPlain = (props: Props) => {
     };
 
     const handleFilterChange = (event: React.SyntheticEvent<HTMLInputElement>) => {
-        setSearchText(event.currentTarget.value);
+        setInternalSearchText(event.currentTarget.value);
     };
 
     const handleBlur = () => {
@@ -131,6 +136,7 @@ const OrgUnitFieldPlain = (props: Props) => {
             className={classes.container}
             onBlur={handleBlur}
         >
+            {!hideSearchField &&
             <div className={classes.debounceFieldContainer}>
                 <DebounceField
                     onDebounced={handleFilterChange}
@@ -141,6 +147,7 @@ const OrgUnitFieldPlain = (props: Props) => {
                     dataTest={dataTest}
                 />
             </div>
+            }
             {!disabled &&
             <div className={classes.orgUnitTreeContainer} style={styles}>
                 {renderOrgUnitTree()}