fix: [TECH-1627] use only valid combinations of orgUnit and ouMode (#…

…3405)
dhis2 · Nov 10, 2023 · 20d05f1 · 20d05f1
1 parent 2bf12a6
commit 20d05f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...odules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js b/...odules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js
@@ -47,7 +47,6 @@ export const loadSearchGroupDuplicatesForReviewEpic = (
             payload: {
                 page,
                 pageSize,
-                orgUnitId,
                 selectedScopeId,
                 scopeType,
                 dataEntryId,
@@ -73,7 +72,6 @@ export const loadSearchGroupDuplicatesForReviewEpic = (
 
                 const contextParam = scopeType === scopeTypes.TRACKER_PROGRAM ? { program: selectedScopeId } : { trackedEntityType: selectedScopeId };
                 const queryArgs = {
-                    ou: orgUnitId,
                     ouMode: 'ACCESSIBLE',
                     pageSize,
                     page,

diff --git a/src/core_modules/capture-core/components/TeiSearch/epics/teiSearch.epics.js b/src/core_modules/capture-core/components/TeiSearch/epics/teiSearch.epics.js
@@ -34,9 +34,9 @@ import { getSearchFormId } from '../getSearchFormId';
 import type { QuerySingleResource } from '../../../utils/api/api.types';
 
 const getOuQueryArgs = (orgUnit: ?Object, orgUnitScope: string) =>
-    (orgUnitScope !== 'ACCESSIBLE' ?
-        { orgUnit: orgUnit && orgUnit.id, ouMode: orgUnitScope } :
-        { ouMode: orgUnitScope });
+    (['ACCESSIBLE', 'CAPTURE', 'ALL'].includes(orgUnitScope) ?
+        { ouMode: orgUnitScope } :
+        { orgUnit: orgUnit && orgUnit.id, ouMode: orgUnitScope });
 
 const getContextQueryArgs = (programId: ?string, trackedEntityTypeId: string) =>
     (programId ? { program: programId } : { trackedEntityType: trackedEntityTypeId });