refactor: replace useRulesEngineOrgUnit with useReduxOrgUnit

packages/rules-engine/src/rulesEngine.types.js

@@ -141,12 +141,12 @@ export type OrgUnitGroup = $ReadOnly<{|
     code: string,
 |}>;
 
-export type OrgUnit = $ReadOnly<{|
+export type OrgUnit = $ReadOnly<{
     id: string,
     name: string,
     code: string,
     groups: Array<OrgUnitGroup>,
-|}>;
+}>;
 
 export type RulesEngineInput = {|
     programRulesContainer: ProgramRulesContainer,

src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.container.js

@@ -6,7 +6,7 @@ import { EnrollmentRegistrationEntryComponent } from './EnrollmentRegistrationEn
 import type { OwnProps } from './EnrollmentRegistrationEntry.types';
 import { useLifecycle } from './hooks';
 import { useCurrentOrgUnitInfo } from '../../../hooks/useCurrentOrgUnitInfo';
-import { useRulesEngineOrgUnit } from '../../../hooks';
+import { useReduxOrgUnit } from '../../../redux/organisationUnits';
 import { dataEntryHasChanges } from '../../DataEntry/common/dataEntryHasChanges';
 import { useMetadataForRegistrationForm } from '../common/TEIAndEnrollment/useMetadataForRegistrationForm';
 
@@ -18,7 +18,7 @@ export const EnrollmentRegistrationEntry: ComponentType<OwnProps> = ({
     ...passOnProps
 }) => {
     const orgUnitId = useCurrentOrgUnitInfo().id;
-    const { orgUnit, error } = useRulesEngineOrgUnit(orgUnitId);
+    const { orgUnit, error } = useReduxOrgUnit(orgUnitId);
     const { teiId, ready, skipDuplicateCheck } = useLifecycle(selectedScopeId, id, trackedEntityInstanceAttributes, orgUnit);
     const {
         formId,

src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/NewEventDataEntryWrapper.component.js

@@ -7,7 +7,7 @@ import { DataEntry } from './DataEntry/DataEntry.container';
 import { EventsList } from './RecentlyAddedEventsList/RecentlyAddedEventsList.container';
 import { useScopeTitleText } from '../../../../hooks/useScopeTitleText';
 import { useCurrentProgramInfo } from '../../../../hooks/useCurrentProgramInfo';
-import { useRulesEngineOrgUnit } from '../../../../hooks/useRulesEngineOrgUnit';
+import { useReduxOrgUnit } from '../../../../redux/organisationUnits';
 import { useLocationQuery } from '../../../../utils/routing';
 import { useRulesEngine } from './useRulesEngine';
 import type { PlainProps } from './NewEventDataEntryWrapper.types';
@@ -48,7 +48,7 @@ const NewEventDataEntryWrapperPlain = ({
 }: PlainProps) => {
     const { id: programId } = useCurrentProgramInfo();
     const orgUnitId = useLocationQuery().orgUnitId;
-    const { orgUnit, error } = useRulesEngineOrgUnit(orgUnitId);
+    const { orgUnit, error } = useReduxOrgUnit(orgUnitId);
     const rulesReady = useRulesEngine({ programId, orgUnit, formFoundation });
     const titleText = useScopeTitleText(programId);
 

src/core_modules/capture-core/components/DataEntries/TeiRegistrationEntry/TeiRegistrationEntry.component.js

@@ -9,6 +9,7 @@ import { useScopeInfo } from '../../../hooks/useScopeInfo';
 import { scopeTypes } from '../../../metaData';
 import { TrackedEntityInstanceDataEntry } from '../TrackedEntityInstance';
 import { useCurrentOrgUnitInfo } from '../../../hooks/useCurrentOrgUnitInfo';
+import { useReduxOrgUnit } from '../../../redux/organisationUnits';
 import type { Props, PlainProps } from './TeiRegistrationEntry.types';
 import { DiscardDialog } from '../../Dialogs/DiscardDialog.component';
 import { withSaveHandler } from '../../DataEntry';
@@ -54,7 +55,9 @@ const TeiRegistrationEntryPlain =
       const [showWarning, setShowWarning] = useState(false);
       const { scopeType } = useScopeInfo(selectedScopeId);
       const { formId, formFoundation } = useMetadataForRegistrationForm({ selectedScopeId });
-      const orgUnit = useCurrentOrgUnitInfo();
+      const { id: orgUnitId } = useCurrentOrgUnitInfo();
+      const { orgUnit } = useReduxOrgUnit(id); // [DHIS2-15814] Change this to new hook
+      const orgUnitName = orgUnit ? orgUnit.name : '';
 
       const handleOnCancel = () => {
           if (!isUserInteractionInProgress) {
@@ -68,9 +71,9 @@ const TeiRegistrationEntryPlain =
           const url =
             scopeType === scopeTypes.TRACKER_PROGRAM
                 ?
-                buildUrlQueryString({ programId: selectedScopeId, orgUnitId: orgUnit.id })
+                buildUrlQueryString({ programId: selectedScopeId, orgUnitId })
                 :
-                buildUrlQueryString({ orgUnitId: orgUnit.id });
+                buildUrlQueryString({ orgUnitId });
           return push(`/?${url}`);
       };
 
@@ -114,7 +117,7 @@ const TeiRegistrationEntryPlain =
                           </Button>
                       </div>
                       <InfoIconText>
-                          {translatedTextWithStylesForTei(trackedEntityName.toLowerCase(), orgUnit.name)}
+                          {translatedTextWithStylesForTei(trackedEntityName.toLowerCase(), orgUnitName)}
                       </InfoIconText>
 
                       <DiscardDialog

src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.js

@@ -19,7 +19,7 @@ import {
     updateTeiDisplayName,
 } from '../EnrollmentPage.actions';
 import { useTrackerProgram } from '../../../../hooks/useTrackerProgram';
-import { useRulesEngineOrgUnit } from '../../../../hooks/useRulesEngineOrgUnit';
+import { useReduxOrgUnit } from '../../../../redux/organisationUnits';
 import { EnrollmentPageDefaultComponent } from './EnrollmentPageDefault.component';
 import {
     useProgramMetadata,
@@ -33,7 +33,7 @@ export const EnrollmentPageDefault = () => {
     const history = useHistory();
     const dispatch = useDispatch();
     const { enrollmentId, programId, teiId, orgUnitId } = useLocationQuery();
-    const { orgUnit, error } = useRulesEngineOrgUnit(orgUnitId);
+    const { orgUnit, error } = useReduxOrgUnit(orgUnitId);
 
     const program = useTrackerProgram(programId);
     const {

src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.container.js

@@ -10,7 +10,7 @@ import { useCommonEnrollmentDomainData, useRuleEffects } from '../../common/Enro
 import type { Props } from './ProgramStageSelector.types';
 import { useProgramFromIndexedDB } from '../../../../utils/cachedDataHooks/useProgramFromIndexedDB';
 import { useLocationQuery, buildUrlQueryString } from '../../../../utils/routing';
-import { useRulesEngineOrgUnit } from '../../../../hooks/useRulesEngineOrgUnit';
+import { useReduxOrgUnit } from '../../../../redux/organisationUnits';
 import { useTrackerProgram } from '../../../../hooks/useTrackerProgram';
 
 
@@ -24,7 +24,7 @@ export const ProgramStageSelector = ({ programId, orgUnitId, teiId, enrollmentId
         isError: programError,
     } = useProgramFromIndexedDB(programId);
 
-    const { orgUnit } = useRulesEngineOrgUnit(orgUnitId);
+    const { orgUnit } = useReduxOrgUnit(orgUnitId);
     const programRules = useTrackerProgram(programId);
 
     const ruleEffects = useRuleEffects({

src/core_modules/capture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.js

@@ -11,7 +11,7 @@ import { ViewEventSectionHeader } from '../Section/ViewEventSectionHeader.compon
 import { EditEventDataEntry } from '../../../WidgetEventEdit/EditEventDataEntry/EditEventDataEntry.container';
 import { ViewEventDataEntry } from '../../../WidgetEventEdit/ViewEventDataEntry/ViewEventDataEntry.container';
 import type { ProgramStage } from '../../../../metaData';
-import { useRulesEngineOrgUnit } from '../../../../hooks/useRulesEngineOrgUnit';
+import { useReduxOrgUnit } from '../../../../redux/organisationUnits';
 import { NoticeBox } from '../../../NoticeBox';
 
 const getStyles = () => ({
@@ -60,7 +60,7 @@ const EventDetailsSectionPlain = (props: Props) => {
         eventAccess,
         ...passOnProps } = props;
     const orgUnitId = useSelector(({ viewEventPage }) => viewEventPage.loadedValues?.orgUnit?.id);
-    const { orgUnit, error } = useRulesEngineOrgUnit(orgUnitId);
+    const { orgUnit, error } = useReduxOrgUnit(orgUnitId);
 
     if (error) {
         return error.errorComponent;

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

@@ -6,7 +6,8 @@ import { spacersNum, Button, colors, IconEdit24, IconArrowLeft24 } from '@dhis2/
 import { withStyles } from '@material-ui/core';
 import i18n from '@dhis2/d2-i18n';
 import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
-import { useEnrollmentEditEventPageMode, useRulesEngineOrgUnit, useAvailableProgramStages } from 'capture-core/hooks';
+import { useEnrollmentEditEventPageMode, useAvailableProgramStages } from 'capture-core/hooks';
+import { useReduxOrgUnit } from 'capture-core/redux/organisationUnits';
 import type { Props } from './widgetEventEdit.types';
 import { startShowEditEventDataEntry } from './WidgetEventEdit.actions';
 import { Widget } from '../Widget';
@@ -59,7 +60,7 @@ export const WidgetEventEditPlain = ({
 }: Props) => {
     const dispatch = useDispatch();
     const { currentPageMode } = useEnrollmentEditEventPageMode(eventStatus);
-    const { orgUnit, error } = useRulesEngineOrgUnit(orgUnitId);
+    const { orgUnit, error } = useReduxOrgUnit(orgUnitId);
 
     const eventAccess = getProgramEventAccess(programId, programStage.id);
     const availableProgramStages = useAvailableProgramStages(programStage, teiId, enrollmentId, programId);

src/core_modules/capture-core/hooks/index.js

@@ -3,7 +3,6 @@ export { useSearchOptions } from './useSearchOptions';
 export { useTrackedEntityTypesWithCorrelatedPrograms } from './useTrackedEntityTypesWithCorrelatedPrograms';
 export { useCurrentTrackedEntityTypeId } from './useCurrentTrackedEntityTypeId';
 export { useEnrollmentEditEventPageMode } from './useEnrollmentEditEventPageMode';
-export { useRulesEngineOrgUnit } from './useRulesEngineOrgUnit';
 export { useAvailableProgramStages } from './useAvailableProgramStages';
 export { useScopeInfo } from './useScopeInfo';
 export { useScopeTitleText } from './useScopeTitleText';