fix: view event without org unit

dhis2 · Jan 2, 2025 · 5f2ce88 · 5f2ce88
1 parent 8665d75
commit 5f2ce88
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
@@ -69,7 +69,7 @@ const styles = {
     tooltip: { display: 'inline-flex' },
 };
 
-export const WidgetEventEditPlain = ({
+const WidgetEventEditPlain = ({
     eventStatus,
     initialScheduleDate,
     stage,
@@ -93,10 +93,12 @@ export const WidgetEventEditPlain = ({
 
     const supportsChangelog = useFeature(FEATURES.changelogs);
     const { currentPageMode } = useEnrollmentEditEventPageMode(eventStatus);
-    const { orgUnit, error } = useCoreOrgUnit(orgUnitId);
     const [changeLogIsOpen, setChangeLogIsOpen] = useState(false);
     // "Edit event"-button depends on loadedValues. Delay rendering component until loadedValues has been initialized.
     const loadedValues = useSelector(({ viewEventPage }) => viewEventPage.loadedValues);
+
+    const { orgUnit: coreOrgUnit, error } = useCoreOrgUnit(orgUnitId);
+    const orgUnit = coreOrgUnit || loadedValues?.orgUnit;
 
     const availableProgramStages = useAvailableProgramStages(stage, teiId, enrollmentId, programId);
     if (error) {