fix: skip duplicates reviews

dhis2 · May 2, 2024 · 696c20f · 696c20f
1 parent f727abb
commit 696c20f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 1 deletion.
diff --git a/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/geometry.js b/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/geometry.js
@@ -14,7 +14,7 @@ const standardGeoJson = (geometry: Array<number> | { longitude: number, latitude
 export const geometryType = (formValuesKey: Object) =>
     Object.values(FEATURETYPE).find(geometryKey => geometryKey === formValuesKey);
 
-export const getPossibleTetFeatureTypeKey = (serverValues: Object) =>
+export const getPossibleTetFeatureTypeKey = (serverValues: Object = {}) =>
     Object.keys(serverValues).find(key => key.startsWith('FEATURETYPE_'));
 
 export const buildGeometryProp = (key: string, serverValues: Object) => {

diff --git a/...p/RegisterTei/DataEntry/TrackedEntityInstance/DataEntryTrackedEntityInstance.component.js b/...p/RegisterTei/DataEntry/TrackedEntityInstance/DataEntryTrackedEntityInstance.component.js
@@ -41,6 +41,7 @@ const RelationshipTrackedEntityInstancePlain =
                 renderDuplicatesDialogActions={renderDuplicatesDialogActions}
                 renderDuplicatesCardActions={renderDuplicatesCardActions}
                 ExistingUniqueValueDialogActions={ExistingUniqueValueDialogActions}
+                orgUnit={{ id: orgUnitId }}
             />
         );
     };

diff --git a/...shipsWidget/RegisterTei/DataEntry/TrackedEntityInstance/DataEntryTrackedEntityInstance.js b/...shipsWidget/RegisterTei/DataEntry/TrackedEntityInstance/DataEntryTrackedEntityInstance.js
@@ -49,6 +49,7 @@ const RelationshipTrackedEntityInstancePlain =
                 renderDuplicatesDialogActions={renderDuplicatesDialogActions}
                 renderDuplicatesCardActions={renderDuplicatesCardActions}
                 ExistingUniqueValueDialogActions={ExistingUniqueValueDialogActions}
+                orgUnit={{ id: orgUnitId }}
             />
         );
     };

diff --git a/...ules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.actions.js b/...ules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.actions.js
@@ -6,6 +6,7 @@ export const actionTypes = {
     DUPLICATES_REVIEW: 'PossibleDuplicatesReview',
     DUPLICATES_REVIEW_RETRIEVAL_SUCCESS: 'PossibleDuplicatesReviewRetrievalSuccess',
     DUPLICATES_REVIEW_RETRIEVAL_FAILED: 'PossibleDuplicatesReviewRetrievalFailed',
+    DUPLICATES_REVIEW_SKIPPED: 'PossibleDuplicatesReview.Skipped',
     DUPLICATES_REVIEW_CHANGE_PAGE: 'PossibleDuplicatesChangePage',
     DUPLICATES_RESET: 'PossibleDuplicatesReset',
 };
@@ -30,6 +31,9 @@ export const reviewDuplicates = ({
 export const duplicatesForReviewRetrievalSuccess = (teis: Array<Object>, currentPage: number) =>
     actionCreator(actionTypes.DUPLICATES_REVIEW_RETRIEVAL_SUCCESS)({ teis, currentPage });
 
+export const duplicatesReviewSkipped = () =>
+    actionCreator(actionTypes.DUPLICATES_REVIEW_SKIPPED)();
+
 export const duplicatesForReviewRetrievalFailed = () =>
     actionCreator(actionTypes.DUPLICATES_REVIEW_RETRIEVAL_FAILED)();
 

diff --git a/...odules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js b/...odules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js
@@ -7,6 +7,7 @@ import {
     actionTypes,
     duplicatesForReviewRetrievalSuccess,
     duplicatesForReviewRetrievalFailed,
+    duplicatesReviewSkipped,
 } from './possibleDuplicatesDialog.actions';
 import {
     scopeTypes, getScopeFromScopeId, EventProgram, TrackerProgram, TrackedEntityType, dataElementTypes,
@@ -70,6 +71,10 @@ export const loadSearchGroupDuplicatesForReviewEpic = (
                     })
                     .filter(f => f);
 
+                if (filters.length === 0) {
+                    return Promise.resolve(duplicatesReviewSkipped());
+                }
+
                 const contextParam = scopeType === scopeTypes.TRACKER_PROGRAM ? { program: selectedScopeId } : { trackedEntityType: selectedScopeId };
                 const queryArgs = {
                     ouMode: 'ACCESSIBLE',

diff --git a/src/core_modules/capture-core/reducers/descriptions/possibleDuplicates.reducerDescription.js b/src/core_modules/capture-core/reducers/descriptions/possibleDuplicates.reducerDescription.js
@@ -23,6 +23,12 @@ export const possibleDuplicatesDesc = createReducerDescription({
         loadError: false,
         currentPage: action.payload.currentPage,
     }),
+    [searchGroupDuplicateActionTypes.DUPLICATES_REVIEW_SKIPPED]: state => ({
+        ...state,
+        isLoading: false,
+        isUpdating: false,
+        loadError: false,
+    }),
     [searchGroupDuplicateActionTypes.DUPLICATES_REVIEW_RETRIEVAL_FAILED]: state => ({
         ...state,
         isLoading: false,