fix: fix a crash when row totals is enabled (DHIS2-17297) (#1660)

dhis2 · May 6, 2024 · be6ea56 · be6ea56
1 parent eef1caf
commit be6ea56
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/modules/pivotTable/PivotTableEngine.js b/src/modules/pivotTable/PivotTableEngine.js
@@ -515,9 +515,19 @@ export class PivotTableEngine {
         if (!this.data[row]) {
             return undefined
         }
+
         const cellValue = this.data[row][column]
 
-        if (cellValue && !Array.isArray(cellValue)) {
+        if (!cellValue) {
+            // Empty cell
+            // The cell still needs to get the valueType to render correctly 0 and cumulative values
+            return {
+                valueType: VALUE_TYPE_NUMBER,
+                totalAggregationType: AGGREGATE_TYPE_SUM,
+            }
+        }
+
+        if (!Array.isArray(cellValue)) {
             // This is a total cell
             return {
                 valueType: cellValue.valueType,
@@ -532,6 +542,7 @@ export class PivotTableEngine {
         const dxRowIndex = this.dimensionLookup.rows.findIndex(
             (dim) => dim.isDxDimension
         )
+
         if (rowHeaders.length && dxRowIndex !== -1) {
             return {
                 valueType: rowHeaders[dxRowIndex].valueType,
@@ -553,11 +564,6 @@ export class PivotTableEngine {
             }
         }
 
-        // Empty cell
-        // The cell still needs to get the valueType to render correctly 0 and cumulative values
-        //
-        // OR
-        //
         // Data is in Filter
         // TODO : This assumes the server ignores text types, we should confirm this is the case
         return {