feat: use enrollment aggregate endpoint (DHIS2-15691) (#1324)

* feat: use new endpoint * distinguish des from attrs and pis * chore: remove logs * chore: formatting * chore: dev href
dhis2 · Oct 17, 2024 · 6bc287f · 6bc287f
1 parent 92b3302
commit 6bc287f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/src/api/Dimension.js b/src/api/Dimension.js
@@ -54,7 +54,8 @@ Dimension.prototype.isIgnoreDimension = function() {
 
 // dep 1
 
-const getFullId = dim => (dim.programStage ? dim.programStage.id + '.' : '') + dim.dimension;
+const getFullId = dim => (dim.programStage && dim.programStage.id ?
+    dim.programStage.id + '.' : '') + dim.dimension;
 
 Dimension.prototype.url = function(isSorted, response, isFilter) {
     if (this.isIgnoreDimension()) {

diff --git a/src/api/Layout.js b/src/api/Layout.js
@@ -6,7 +6,7 @@ import isNumeric from 'd2-utilizr/lib/isNumeric';
 import isObject from 'd2-utilizr/lib/isObject';
 import isString from 'd2-utilizr/lib/isString';
 
-import { Record, Layout as d2aLayout } from 'd2-analysis';
+import { Record, Layout as d2aLayout, dimensionsInit } from 'd2-analysis';
 
 export var Layout = function(refs, c, applyConfig, forceApplyConfig) {
     var t = this;
@@ -20,6 +20,22 @@ export var Layout = function(refs, c, applyConfig, forceApplyConfig) {
     // inherit
     Object.assign(t, new d2aLayout(refs, c, applyConfig));
 
+    // data element dimensions
+    if (c.dataElementDimensions) {
+        t.dataElementDimensions = c.dataElementDimensions;
+    }
+
+    // add isDataElement to distinguish from attributes and program indicators
+    if (t.dataElementDimensions) {
+        ([].concat(t.columns, t.rows, t.filters))
+            .filter(dimension => dimension)
+            .forEach(dimension => {
+            if (c.dataElementDimensions.find(de => de.dataElement.id === dimension.dimension)) {
+                dimension.isDataElement = true
+            }
+        })
+    }
+
     // program
     t.program = isObject(c.program) ? c.program : null;
     t.programStage = isObject(c.programStage) ? c.programStage : null;
@@ -122,11 +138,6 @@ export var Layout = function(refs, c, applyConfig, forceApplyConfig) {
             ? c.reportParams.paramParentOrganisationUnit
             : isBoolean(c.parentOrganisationUnit) ? c.parentOrganisationUnit : false;
 
-    // data element dimensions
-    if (c.dataElementDimensions) {
-        t.dataElementDimensions = c.dataElementDimensions;
-    }
-
     // force apply
     Object.assign(t, forceApplyConfig);
 
@@ -186,9 +197,18 @@ Layout.prototype.getDataTypeUrl = function() {
     var OUTPUT_TYPE_EVENT = optionConfig.getOutputType('event').id;
     var OUTPUT_TYPE_ENROLLMENT = optionConfig.getOutputType('enrollment').id;
 
-    var url = this.dataType === DATA_TYPE_AGG ? '/events/aggregate' :
-              this.outputType === OUTPUT_TYPE_EVENT ? '/events/query' :
-              '/enrollments/query';
+    var urlMap = {
+        [OUTPUT_TYPE_EVENT]: {
+            [DATA_TYPE_AGG]: '/events/aggregate',
+            [DATA_TYPE_EVENT]: '/events/query',
+        },
+        [OUTPUT_TYPE_ENROLLMENT]: {
+            [DATA_TYPE_AGG]: '/enrollments/aggregate',
+            [DATA_TYPE_EVENT]: '/enrollments/query',
+        }
+    }
+
+    var url = urlMap[this.outputType][this.dataType]
 
     return url || dimensionConfig.dataTypeUrl[dimensionConfig.getDefaultDataType()] || '';
 };