From 91cf1353ea27f0e75756d0d38e487fa941f4844c Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Fri, 31 Jan 2025 16:59:13 +0100
Subject: [PATCH] feat: remove use of core org unit

---
 .../ScopeSelector/ScopeSelector.container.js           |  1 +
 .../WidgetEventEdit/WidgetEventEdit.container.js       | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.container.js b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.container.js
index dd32042503..6199295503 100644
--- a/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.container.js
+++ b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.container.js
@@ -6,6 +6,7 @@ import type { OwnProps } from './ScopeSelector.types';
 import { useOrgUnitNameWithAncestors } from '../../metadataRetrieval/orgUnitName';
 import { resetOrgUnitIdFromScopeSelector } from './ScopeSelector.actions';
 
+
 const deriveReadiness = (lockedSelectorLoads, selectedOrgUnitId, selectedOrgUnitName, displayName, ouNameError) => {
     // because we want the orgUnit to be fetched and stored
     // before allowing the user to view the locked selector
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 f945306c53..789c0fe0a7 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
@@ -9,7 +9,6 @@ import {
 } from '@dhis2/ui';
 import { withStyles } from '@material-ui/core';
 import { useEnrollmentEditEventPageMode, useAvailableProgramStages } from 'capture-core/hooks';
-import { useCoreOrgUnit } from 'capture-core/metadataRetrieval/coreOrgUnit';
 import type { PlainProps, ComponentProps } from './widgetEventEdit.types';
 import { Widget } from '../Widget';
 import { EditEventDataEntry } from './EditEventDataEntry/';
@@ -78,7 +77,6 @@ const WidgetEventEditPlain = ({
     onHandleScheduleSave,
     onSaveExternal,
     programId,
-    orgUnitId,
     enrollmentId,
     eventId,
     stageId,
@@ -96,13 +94,9 @@ const WidgetEventEditPlain = ({
     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 orgUnit = loadedValues?.orgUnit;
 
     const availableProgramStages = useAvailableProgramStages(stage, teiId, enrollmentId, programId);
-    if (error) {
-        return error.errorComponent;
-    }
 
     return orgUnit && loadedValues ? (
         <div className={classes.container}>
@@ -111,7 +105,7 @@ const WidgetEventEditPlain = ({
                 currentPage={currentPageMode}
                 eventId={eventId}
                 programId={programId}
-                orgUnitId={orgUnitId}
+                orgUnitId={orgUnit.id}
                 stageId={stageId}
                 stage={stage}
             />