fix: sort analytics params and items

dhis2 · Aug 7, 2024 · 8fe2bf6 · 8fe2bf6
1 parent c3acdff
commit 8fe2bf6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -20,7 +20,6 @@
     },
     "scripts": {
         "build": "d2-app-scripts build",
-        "postbuild": "yarn build-storybook",
         "build-storybook": "build-storybook",
         "start-storybook": "start-storybook --port 5000",
         "start": "yarn start-storybook",

diff --git a/src/api/analytics/AnalyticsBase.js b/src/api/analytics/AnalyticsBase.js
@@ -27,8 +27,12 @@ const analyticsDataQuery = {
         }),
     params: ({ dimensions, filters, parameters }) => {
         return {
-            dimension: dimensions.length ? dimensions : undefined,
-            filter: filters.length ? filters : undefined,
+            dimension: dimensions.length
+                ? generateDimensionStrings(dimensions, { sorted: true })
+                : undefined,
+            filter: filters.length
+                ? generateDimensionStrings(filters, { sorted: true })
+                : undefined,
             ...parameters,
             skipMeta: true,
             skipData: false,
@@ -45,8 +49,10 @@ const analyticsMetaDataQuery = {
             trackedEntityType,
         }),
     params: ({ dimensions, filters, parameters }) => ({
-        dimension: dimensions.length ? dimensions : undefined,
-        filter: filters.length ? filters : undefined,
+        dimension: dimensions.length
+            ? generateDimensionStrings(dimensions)
+            : undefined,
+        filter: filters.length ? generateDimensionStrings(filters) : undefined,
         ...parameters,
         skipMeta: false,
         skipData: true,
@@ -55,11 +61,9 @@ const analyticsMetaDataQuery = {
 }
 
 export const generateDimensionStrings = (dimensions = [], options) => {
-    if (options && options.sorted) {
-        dimensions = sortBy(dimensions, 'dimension')
-    }
-
-    return dimensions.map(({ dimension, items }) => {
+    const sortedDimensions = sortBy(dimensions, 'dimension')
+    console.log('arrays the same?', sortedDimensions === dimensions)
+    return sortedDimensions.map(({ dimension, items }) => {
         if (Array.isArray(items) && items.length) {
             if (options && options.sorted) {
                 items.sort()
@@ -131,8 +135,8 @@ class AnalyticsBase {
                     path: req.path,
                     program: req.program,
                     trackedEntityType: req.trackedEntityType,
-                    dimensions: generateDimensionStrings(req.dimensions),
-                    filters: generateDimensionStrings(req.filters),
+                    dimensions: req.dimensions,
+                    filters: req.filters,
                     parameters: req.parameters,
                     dataParams: dataReq.parameters,
                     metaDataParams: metaDataReq.parameters,