fix: [DHIS2-18569] Relationship widget limited to 50 entries (#3927)

* fix: set paging to false * fix: paging parameter based on version
dhis2 · Jan 9, 2025 · a1e493d · a1e493d
1 parent 5da6126
commit a1e493d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/src/core_modules/capture-core-utils/featuresSupport/support.js b/src/core_modules/capture-core-utils/featuresSupport/support.js
@@ -11,6 +11,7 @@ export const FEATURES = Object.freeze({
     trackedEntitiesCSV: 'trackedEntitiesCSV',
     newAocApiSeparator: 'newAocApiSeparator',
     newEntityFilterQueryParam: 'newEntityFilterQueryParam',
+    newRelationshipQueryParam: 'newRelationshipQueryParam',
 });
 
 // The first minor version that supports the feature
@@ -26,6 +27,7 @@ const MINOR_VERSION_SUPPORT = Object.freeze({
     [FEATURES.trackedEntitiesCSV]: 40,
     [FEATURES.newAocApiSeparator]: 41,
     [FEATURES.newEntityFilterQueryParam]: 41,
+    [FEATURES.newRelationshipQueryParam]: 41,
 });
 
 export const hasAPISupportForFeature = (minorVersion: string | number, featureName: string) =>

diff --git a/...s/capture-core/components/WidgetsRelationship/common/useRelationships/useRelationships.js b/...s/capture-core/components/WidgetsRelationship/common/useRelationships/useRelationships.js
@@ -1,6 +1,7 @@
 // @flow
 import { useMemo } from 'react';
 import { handleAPIResponse, REQUESTED_ENTITIES } from 'capture-core/utils/api';
+import { featureAvailable, FEATURES } from 'capture-core-utils';
 import { useApiDataQuery } from '../../../../utils/reactQueryHelpers';
 import type { InputRelationshipData, RelationshipTypes } from '../Types';
 import { determineLinkedEntity } from '../RelationshipsWidget/useGroupedLinkedEntities';
@@ -20,14 +21,21 @@ type Props = {|
 type ReturnData = Array<InputRelationshipData>;
 
 export const useRelationships = ({ entityId, searchMode, relationshipTypes }: Props) => {
-    const query = useMemo(() => ({
-        resource: 'tracker/relationships',
-        params: {
-            // $FlowFixMe - searchMode should be a valid key of RelationshipSearchEntities
-            [searchMode]: entityId,
-            fields: 'relationship,relationshipType,createdAt,from[trackedEntity[trackedEntity,attributes,program,orgUnit,trackedEntityType],event[event,dataValues,program,orgUnit,orgUnitName,status,createdAt]],to[trackedEntity[trackedEntity,attributes,program,orgUnit,trackedEntityType],event[event,dataValues,program,orgUnit,orgUnitName,status,createdAt]]',
-        },
-    }), [entityId, searchMode]);
+    const query = useMemo(() => {
+        const supportForFeature = featureAvailable(FEATURES.newRelationshipQueryParam);
+
+        return {
+            resource: 'tracker/relationships',
+            params: {
+                // $FlowFixMe - searchMode should be a valid key of RelationshipSearchEntities
+                [searchMode]: entityId,
+                fields: 'relationship,relationshipType,createdAt,from[trackedEntity[trackedEntity,attributes,program,orgUnit,trackedEntityType],event[event,dataValues,program,orgUnit,orgUnitName,status,createdAt]],to[trackedEntity[trackedEntity,attributes,program,orgUnit,trackedEntityType],event[event,dataValues,program,orgUnit,orgUnitName,status,createdAt]]',
+                ...(supportForFeature
+                    ? { paging: false }
+                    : { skipPaging: true }),
+            },
+        };
+    }, [entityId, searchMode]);
 
     return useApiDataQuery<ReturnData>(
         ['relationships', entityId],