fix: remove orgUnit param if ouMode = ACCESSIBLE, CAPTURE or ALL

dhis2 · Aug 23, 2023 · 9b0cd40 · 9b0cd40
1 parent 8bed7fb
commit 9b0cd40
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 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,7 +34,7 @@ import { getSearchFormId } from '../getSearchFormId';
 import type { QuerySingleResource } from '../../../utils/api/api.types';
 
 const getOuQueryArgs = (orgUnit: ?Object, orgUnitScope: string) =>
-    (orgUnitScope !== 'ACCESSIBLE' ?
+    (orgUnitScope !== 'ACCESSIBLE' || 'CAPTURE' || 'ALL' ?
         { ou: orgUnit && orgUnit.id, ouMode: orgUnitScope } :
         { ouMode: orgUnitScope });