insert query from context only when this options is checked

eea · Nov 15, 2022 · a60693b · a60693b
1 parent 0fae132
commit a60693b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/helpers.js b/src/helpers.js
@@ -79,15 +79,15 @@ export function getDataQuery({
 
   const filters =
     Object.keys(byProviderPath).map((key) => byProviderPath[key]) || [];
-  // if (pagination.enabled) {
-  //   return [...(data?.data_query || []), ...byContextPath, ...filters];
-  // }
-  return [
+
+  const query = [
     ...(data?.data_query || []),
-    ...byContextPath,
+    ...(data?.has_data_query_by_context ? byContextPath : []),
     ...byRouteParameters,
     ...filters,
   ];
+
+  return query;
 }
 
 /*