fix discovery batch loading (#1632)

* fix discovery batch loading * fix return as needed
uc-cdis · Nov 8, 2024 · 31e2bd8 · 31e2bd8
1 parent 54a2b0a
commit 31e2bd8
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Discovery/index.tsx b/src/Discovery/index.tsx
@@ -86,20 +86,25 @@ const DiscoveryWithMDSBackend: React.FC<{
 
   useEffect(() => {
     // Update the numberOfBatchesLoaded to enable calling of different batch sizes with different parameters
-    if (numberOfBatchesLoaded < expectedNumberOfTotalBatches) setNumberOfBatchesLoaded(numberOfBatchesLoaded + 1);
+    if (numberOfBatchesLoaded < expectedNumberOfTotalBatches) {
+      setNumberOfBatchesLoaded(numberOfBatchesLoaded + 1);
+    } else {
+      return;
+    }
 
     const studyRegistrationValidationField = studyRegistrationConfig?.studyRegistrationValidationField;
     async function fetchRawStudies() {
       let loadStudiesFunction: Function;
       let loadStudiesParameters: any[] = [];
       if (isEnabled('discoveryUseAggMDS')) {
         loadStudiesFunction = loadStudiesFromAggMDS;
-        loadStudiesParameters.push(numberOfBatchesLoaded === 1
+        loadStudiesParameters.push(numberOfBatchesLoaded === 0
           ? numberOfStudiesForSmallerBatch
           : numberOfStudiesForAllStudiesBatch);
       } else {
         loadStudiesFunction = loadStudiesFromMDS;
-        loadStudiesParameters = [props.config?.features?.guidType, 10, false];
+        loadStudiesParameters = (numberOfBatchesLoaded === 0
+          ? [props.config?.features?.guidType, 10, false] : [props.config?.features?.guidType, 2000, true]);
       }
       const rawStudiesRegistered = await loadStudiesFunction(
         ...loadStudiesParameters,
@@ -109,7 +114,7 @@ const DiscoveryWithMDSBackend: React.FC<{
       if (isEnabled('studyRegistration')) {
         // Load fewer raw studies if on the first studies batch
         // Otherwise load them all
-        rawStudiesUnregistered = numberOfBatchesLoaded === 1
+        rawStudiesUnregistered = numberOfBatchesLoaded === 0
           ? (rawStudiesUnregistered = await loadStudiesFromMDS(
             'unregistered_discovery_metadata',
             numberOfStudiesForSmallerBatch,