@dhis2/analytics 26.2.0-alpha.2 → 26.2.0

package/build/es/api/analytics/AnalyticsRequest.js

@@ -4,7 +4,6 @@ import AnalyticsRequestBase from './AnalyticsRequestBase.js';
 import AnalyticsRequestDimensionsMixin from './AnalyticsRequestDimensionsMixin.js';
 import AnalyticsRequestFiltersMixin from './AnalyticsRequestFiltersMixin.js';
 import AnalyticsRequestPropertiesMixin from './AnalyticsRequestPropertiesMixin.js';
-import { formatDimension } from './utils.js';
 
 /**
  * @description
@@ -42,7 +41,6 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
   fromVisualization(visualization) {
     let passFilterAsDimension = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     let request = this;
-    const outputType = visualization.outputType;
 
     // extract dimensions from visualization
     const columns = visualization.columns || [];
@@ -53,28 +51,19 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
       if ((_d$legendSet = d.legendSet) !== null && _d$legendSet !== void 0 && _d$legendSet.id) {
         dimension += `-${d.legendSet.id}`;
       }
+      if ((_d$programStage = d.programStage) !== null && _d$programStage !== void 0 && _d$programStage.id) {
+        dimension = `${d.programStage.id}.${dimension}`;
+      }
       if (d.filter) {
         dimension += `:${d.filter}`;
       }
-      const programStageId = (_d$programStage = d.programStage) === null || _d$programStage === void 0 ? void 0 : _d$programStage.id;
       if ((_d$repetition = d.repetition) !== null && _d$repetition !== void 0 && (_d$repetition$indexes = _d$repetition.indexes) !== null && _d$repetition$indexes !== void 0 && _d$repetition$indexes.length) {
         d.repetition.indexes.forEach(index => {
-          var _d$program;
-          request = request.addDimension(formatDimension({
-            programId: (_d$program = d.program) === null || _d$program === void 0 ? void 0 : _d$program.id,
-            programStageId: `${programStageId}[${index}]`,
-            dimension,
-            outputType
-          }));
+          request = request.addDimension(dimension.replace(/\./, `[${index}].`));
         });
       } else {
-        var _d$program2, _d$items;
-        request = request.addDimension(formatDimension({
-          programId: (_d$program2 = d.program) === null || _d$program2 === void 0 ? void 0 : _d$program2.id,
-          programStageId,
-          dimension,
-          outputType
-        }), (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
+        var _d$items;
+        request = request.addDimension(dimension, (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
       }
     });
 
@@ -89,29 +78,17 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
         request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
       } else {
         var _f$programStage, _f$repetition, _f$repetition$indexes;
-        let filterString = f.dimension;
+        let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? `${f.programStage.id}.${f.dimension}` : f.dimension;
         if (f.filter) {
           filterString += `:${f.filter}`;
         }
-        const programStageId = (_f$programStage = f.programStage) === null || _f$programStage === void 0 ? void 0 : _f$programStage.id;
         if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition$indexes = _f$repetition.indexes) !== null && _f$repetition$indexes !== void 0 && _f$repetition$indexes.length) {
           f.repetition.indexes.forEach(index => {
-            var _f$program;
-            request = request.addFilter(formatDimension({
-              programId: (_f$program = f.program) === null || _f$program === void 0 ? void 0 : _f$program.id,
-              programStageId: `${programStageId}[${index}]`,
-              dimension: filterString,
-              outputType
-            }));
+            request = request.addFilter(filterString.replace(/\./, `[${index}].`));
           });
         } else {
-          var _f$program2, _f$items2;
-          request = request.addFilter(formatDimension({
-            programId: (_f$program2 = f.program) === null || _f$program2 === void 0 ? void 0 : _f$program2.id,
-            programStageId,
-            dimension: filterString,
-            outputType
-          }), (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+          var _f$items2;
+          request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
         }
       }
     });

package/build/es/api/analytics/AnalyticsRequestBase.js

@@ -18,7 +18,6 @@ class AnalyticsRequestBase {
       format = 'json',
       path,
       program,
-      trackedEntityType,
       dimensions = [],
       filters = [],
       parameters = {}
@@ -27,7 +26,6 @@ class AnalyticsRequestBase {
     this.format = format.toLowerCase();
     this.path = path;
     this.program = program;
-    this.trackedEntityType = trackedEntityType;
     this.dimensions = dimensions;
     this.filters = filters;
     this.parameters = {
@@ -66,7 +64,7 @@ class AnalyticsRequestBase {
       }
       return dimension;
     });
-    const endPoint = [this.endPoint, this.path, this.program, this.trackedEntityType].filter(Boolean).join('/');
+    const endPoint = [this.endPoint, this.path, this.program].filter(e => !!e).join('/');
     return `${endPoint}.${this.format}?dimension=${encodedDimensions.join('&dimension=')}`;
   }
 

package/build/es/api/analytics/AnalyticsRequestPropertiesMixin.js

@@ -491,25 +491,6 @@ class extends base {
     return new AnalyticsRequest(this);
   }
 
-  /**
-   * Sets the tracked entity type for the request.
-   * It appends the tracked entity type id to the request's path.
-   *
-   * @param {!String} trackedEntityType The tracked entity type id
-   *
-   * @returns {AnalyticsRequest} A new instance of the class for chaining purposes
-   *
-   * @example
-   * const req = new analytics.request()
-   *    .withTrackedEntityType('nEenWmSyUEp');
-   */
-  withTrackedEntityType(trackedEntityType) {
-    if (trackedEntityType) {
-      this.trackedEntityType = trackedEntityType;
-    }
-    return new AnalyticsRequest(this);
-  }
-
   /**
    * Sets the program for the request.
    * It appends the program id to the request's path.

package/build/es/api/analytics/utils.js

@@ -2,23 +2,4 @@
 const whitelistURI = ',&$=/;:';
 const whitelistURICodes = whitelistURI.split('').map(c => encodeURIComponent(c));
 const whitelistRegExp = new RegExp(`(?:${whitelistURICodes.join('|')})`, 'g');
-export const customEncodeURIComponent = uri => encodeURIComponent(uri).replace(whitelistRegExp, decodeURIComponent);
-export const formatRequestPath = _ref => {
-  let {
-    path,
-    program,
-    trackedEntityType
-  } = _ref;
-  return [path, program, trackedEntityType].filter(Boolean).join('/');
-};
-export const formatDimension = _ref2 => {
-  let {
-    outputType,
-    programId,
-    programStageId,
-    dimension
-  } = _ref2;
-  return [
-  // XXX it would be clearer to have this consistent with what is sent in the request as for EVENT/ENROLLMENT
-  outputType === 'TRACKED_ENTITY' ? programId : undefined, programStageId, dimension].filter(Boolean).join('.');
-};
+export const customEncodeURIComponent = uri => encodeURIComponent(uri).replace(whitelistRegExp, decodeURIComponent);

package/build/es/components/Options/VisualizationOptions.js

@@ -2,7 +2,7 @@ import i18n from '@dhis2/d2-i18n';
 import { ButtonStrip, Modal, ModalTitle, ModalContent, ModalActions, Button, FieldSet, Legend, TabBar, Tab, Help } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
-import { modalContent, tabSection, tabSectionTitle, tabSectionTitleMargin, tabSectionOption, tabSectionOptionItem, tabSectionOptionToggleable, tabSectionToggleableSubsection, tabSectionOptionComplexInline, tabSectionOptionText, tabBar, tabContent, tabSectionOptionIcon } from './styles/VisualizationOptions.style.js';
+import { modalContent, tabSection, tabSectionTitle, tabSectionTitleDisabled, tabSectionTitleMargin, tabSectionOption, tabSectionOptionItem, tabSectionOptionToggleable, tabSectionToggleableSubsection, tabSectionOptionComplexInline, tabSectionOptionText, tabBar, tabContent, tabSectionOptionIcon } from './styles/VisualizationOptions.style.js';
 const VisualizationOptions = _ref => {
   let {
     initiallyActiveTabKey,
@@ -59,7 +59,7 @@ const VisualizationOptions = _ref => {
       }, label);
     })), tabBar.styles), /*#__PURE__*/React.createElement("div", {
       className: tabContent.className
-    }, tabs[activeTabIndex].content, tabContent.styles, tabSection.styles, tabSectionTitle.styles, tabSectionTitleMargin.styles, tabSectionOption.styles, tabSectionOptionItem.styles, tabSectionOptionToggleable.styles, tabSectionToggleableSubsection.styles, tabSectionOptionComplexInline.styles, tabSectionOptionText.styles, tabSectionOptionIcon.styles));
+    }, tabs[activeTabIndex].content, tabContent.styles, tabSection.styles, tabSectionTitle.styles, tabSectionTitleDisabled.styles, tabSectionTitleMargin.styles, tabSectionOption.styles, tabSectionOptionItem.styles, tabSectionOptionToggleable.styles, tabSectionToggleableSubsection.styles, tabSectionOptionComplexInline.styles, tabSectionOptionText.styles, tabSectionOptionIcon.styles));
   };
   return /*#__PURE__*/React.createElement(Modal, {
     onClose: onClose,

package/build/es/components/Options/styles/VisualizationOptions.style.js

@@ -38,6 +38,12 @@ export const tabSectionTitle = {
   }, [`span.jsx-3115295887{display:inline-block;padding-bottom:${spacers.dp12};font-size:15px;color:${colors.grey900};font-weight:500;-webkit-letter-spacing:0.2px;-moz-letter-spacing:0.2px;-ms-letter-spacing:0.2px;letter-spacing:0.2px;}`]),
   className: "jsx-3115295887"
 };
+export const tabSectionTitleDisabled = {
+  styles: /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: "3352433486"
+  }, [`span.jsx-3352433486{color:${colors.grey600};}`]),
+  className: "jsx-3352433486"
+};
 export const tabSectionTitleMargin = {
   styles: /*#__PURE__*/React.createElement(_JSXStyle, {
     id: "642558349"

package/build/es/modules/layout/dimension.js

@@ -33,12 +33,6 @@ export const DIMENSION_PROP_LEGEND_SET = {
   required: false,
   isValid: prop => isString(prop)
 };
-export const DIMENSION_PROP_PROGRAM = {
-  name: 'program',
-  defaultValue: {},
-  required: false,
-  isValid: prop => isObject(prop)
-};
 export const DIMENSION_PROP_PROGRAM_STAGE = {
   name: 'programStage',
   defaultValue: {},
@@ -51,4 +45,4 @@ export const DIMENSION_PROP_REPETITION = {
   required: false,
   isValid: prop => Array.isArray(prop)
 };
-export const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET, DIMENSION_PROP_PROGRAM, DIMENSION_PROP_PROGRAM_STAGE, DIMENSION_PROP_REPETITION];
+export const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET, DIMENSION_PROP_PROGRAM_STAGE, DIMENSION_PROP_REPETITION];

package/build/es/modules/layout/dimensionCreate.js

@@ -1,4 +1,4 @@
-import { DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET, DIMENSION_PROP_PROGRAM, DIMENSION_PROP_PROGRAM_STAGE, DIMENSION_PROP_REPETITION } from './dimension.js';
+import { DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET, DIMENSION_PROP_PROGRAM_STAGE, DIMENSION_PROP_REPETITION } from './dimension.js';
 export const dimensionCreate = function (dimensionId) {
   let itemIds = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   let args = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -15,9 +15,6 @@ export const dimensionCreate = function (dimensionId) {
     ...(args.legendSet && {
       [DIMENSION_PROP_LEGEND_SET.name]: args.legendSet
     }),
-    ...(args.program && {
-      [DIMENSION_PROP_PROGRAM.name]: args.program
-    }),
     ...(args.programStage && {
       [DIMENSION_PROP_PROGRAM_STAGE.name]: args.programStage
     }),

package/build/es/modules/pivotTable/PivotTableEngine.js

@@ -20,7 +20,8 @@ const defaultOptions = {
   showRowSubtotals: false,
   showColumnSubtotals: false,
   fixColumnHeaders: false,
-  fixRowHeaders: false
+  fixRowHeaders: false,
+  cumulativeValues: false
 };
 const defaultVisualizationProps = {
   fontSize: FONT_SIZE_OPTION_NORMAL,
@@ -175,6 +176,9 @@ export class PivotTableEngine {
     _defineProperty(this, "data", []);
     _defineProperty(this, "rowMap", []);
     _defineProperty(this, "columnMap", []);
+    _defineProperty(this, "accumulators", {
+      rows: {}
+    });
     this.visualization = Object.assign({}, defaultVisualizationProps, visualization);
     this.legendSets = (legendSets || []).reduce((sets, set) => {
       sets[set.id] = set;
@@ -194,7 +198,8 @@ export class PivotTableEngine {
       subtitle: visualization.hideSubtitle ? undefined : visualization.subtitle,
       // turn on fixed headers only when there are dimensions
       fixColumnHeaders: this.dimensionLookup.columns.length ? visualization.fixColumnHeaders : false,
-      fixRowHeaders: this.dimensionLookup.rows.length ? visualization.fixRowHeaders : false
+      fixRowHeaders: this.dimensionLookup.rows.length ? visualization.fixRowHeaders : false,
+      cumulativeValues: visualization.cumulativeValues
     };
     this.adaptiveClippingController = new AdaptiveClippingController(this);
     const doColumnSubtotals = this.options.showColumnSubtotals && this.dimensionLookup.rows.length > 1;
@@ -218,51 +223,68 @@ export class PivotTableEngine {
       row,
       column
     });
+    const valueType = (dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || VALUE_TYPE_TEXT;
     const headers = [...this.getRawRowHeader(row), ...this.getRawColumnHeader(column)];
     const peId = (_headers$find = headers.find(header => (header === null || header === void 0 ? void 0 : header.dimensionItemType) === DIMENSION_TYPE_PERIOD)) === null || _headers$find === void 0 ? void 0 : _headers$find.uid;
     const ouId = (_headers$find2 = headers.find(header => (header === null || header === void 0 ? void 0 : header.dimensionItemType) === DIMENSION_TYPE_ORGANISATION_UNIT)) === null || _headers$find2 === void 0 ? void 0 : _headers$find2.uid;
-    if (!this.data[row] || !this.data[row][column]) {
-      return {
-        cellType,
-        empty: true,
-        ouId,
-        peId
-      };
-    }
-    const dataRow = this.data[row][column];
-    let rawValue = cellType === CELL_TYPE_VALUE ? dataRow[this.dimensionLookup.dataHeaders.value] : dataRow.value;
-    let renderedValue = rawValue;
-    const valueType = (dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || VALUE_TYPE_TEXT;
-    if (valueType === VALUE_TYPE_NUMBER) {
-      rawValue = parseValue(rawValue);
-      switch (this.visualization.numberType) {
-        case NUMBER_TYPE_ROW_PERCENTAGE:
-          renderedValue = rawValue / this.percentageTotals[row].value;
-          break;
-        case NUMBER_TYPE_COLUMN_PERCENTAGE:
-          renderedValue = rawValue / this.percentageTotals[column].value;
-          break;
-        default:
-          break;
-      }
-    }
-    renderedValue = renderValue(renderedValue, valueType, this.visualization);
-    return {
+    const rawCell = {
       cellType,
-      empty: false,
       valueType,
-      rawValue,
-      renderedValue,
-      dxDimension,
       ouId,
       peId
     };
+    if (!this.data[row] || !this.data[row][column]) {
+      rawCell.empty = true;
+    } else {
+      const dataRow = this.data[row][column];
+      let rawValue = cellType === CELL_TYPE_VALUE ? dataRow[this.dimensionLookup.dataHeaders.value] : dataRow.value;
+      let renderedValue = rawValue;
+      if (valueType === VALUE_TYPE_NUMBER) {
+        rawValue = parseValue(rawValue);
+        switch (this.visualization.numberType) {
+          case NUMBER_TYPE_ROW_PERCENTAGE:
+            renderedValue = rawValue / this.percentageTotals[row].value;
+            break;
+          case NUMBER_TYPE_COLUMN_PERCENTAGE:
+            renderedValue = rawValue / this.percentageTotals[column].value;
+            break;
+          default:
+            break;
+        }
+      }
+      renderedValue = renderValue(renderedValue, valueType, this.visualization);
+      rawCell.dxDimension = dxDimension;
+      rawCell.empty = false;
+      rawCell.rawValue = rawValue;
+      rawCell.renderedValue = renderedValue;
+    }
+    if (this.options.cumulativeValues) {
+      const cumulativeValue = this.getCumulative({
+        row,
+        column
+      });
+      if (cumulativeValue !== undefined && cumulativeValue !== null) {
+        // force to NUMBER for accumulated values
+        rawCell.valueType = valueType === undefined || valueType === null ? VALUE_TYPE_NUMBER : valueType;
+        rawCell.empty = false;
+        rawCell.rawValue = cumulativeValue;
+        rawCell.renderedValue = renderValue(cumulativeValue, valueType, this.visualization);
+      }
+    }
+    return rawCell;
   }
-  get(_ref4) {
+  getCumulative(_ref4) {
     let {
       row,
       column
     } = _ref4;
+    return this.accumulators.rows[row][column];
+  }
+  get(_ref5) {
+    let {
+      row,
+      column
+    } = _ref5;
     const mappedRow = this.rowMap[row],
       mappedColumn = this.columnMap[column];
     if (!mappedRow && mappedRow !== 0 || !mappedColumn && mappedColumn !== 0) {
@@ -273,11 +295,11 @@ export class PivotTableEngine {
       column: mappedColumn
     });
   }
-  getRawCellType(_ref5) {
+  getRawCellType(_ref6) {
     let {
       row,
       column
-    } = _ref5;
+    } = _ref6;
     const isRowTotal = this.doRowTotals && column === this.dataWidth - 1;
     const isColumnTotal = this.doColumnTotals && row === this.dataHeight - 1;
     if (isRowTotal || isColumnTotal) {
@@ -290,11 +312,11 @@ export class PivotTableEngine {
     }
     return CELL_TYPE_VALUE;
   }
-  getCellType(_ref6) {
+  getCellType(_ref7) {
     let {
       row,
       column
-    } = _ref6;
+    } = _ref7;
     row = this.rowMap[row];
     column = this.columnMap[column];
     return this.getRawCellType({
@@ -324,29 +346,26 @@ export class PivotTableEngine {
       return i18n.t(this.dimensionLookup.rows[rowLevel].meta.name);
     }
   }
-  getCellDxDimension(_ref7) {
+  getCellDxDimension(_ref8) {
     let {
       row,
       column
-    } = _ref7;
+    } = _ref8;
     return this.getRawCellDxDimension({
       row: this.rowMap[row],
       column: this.columnMap[column]
     });
   }
-  getRawCellDxDimension(_ref8) {
+  getRawCellDxDimension(_ref9) {
     let {
       row,
       column
-    } = _ref8;
+    } = _ref9;
     if (!this.data[row]) {
       return undefined;
     }
     const cellValue = this.data[row][column];
-    if (!cellValue) {
-      return undefined;
-    }
-    if (!Array.isArray(cellValue)) {
+    if (cellValue && !Array.isArray(cellValue)) {
       // This is a total cell
       return {
         valueType: cellValue.valueType,
@@ -373,6 +392,11 @@ 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 {
@@ -384,7 +408,7 @@ export class PivotTableEngine {
     return !this.data[row] || this.data[row].length === 0;
   }
   columnIsEmpty(column) {
-    return !this.adaptiveClippingController.columns.sizes[column];
+    return !this.rowMap.some(row => this.data[row][column]);
   }
   getRawColumnHeader(column) {
     if (this.doRowTotals && column === this.dataWidth - 1) {
@@ -430,12 +454,12 @@ export class PivotTableEngine {
   getRowHeader(row) {
     return this.getRawRowHeader(this.rowMap[row]);
   }
-  getDependantTotalCells(_ref9) {
+  getDependantTotalCells(_ref10) {
     var _this$dimensionLookup, _this$dimensionLookup2;
     let {
       row,
       column
-    } = _ref9;
+    } = _ref10;
     const rowSubtotalSize = ((_this$dimensionLookup = this.dimensionLookup.columns[0]) === null || _this$dimensionLookup === void 0 ? void 0 : _this$dimensionLookup.size) + 1;
     const rowSubtotal = rowSubtotalSize && this.doRowSubtotals && {
       row,
@@ -610,11 +634,11 @@ export class PivotTableEngine {
       }
     }
   }
-  finalizeTotal(_ref10) {
+  finalizeTotal(_ref11) {
     let {
       row,
       column
-    } = _ref10;
+    } = _ref11;
     if (!this.data[row]) {
       return;
     }
@@ -710,6 +734,40 @@ export class PivotTableEngine {
   resetColumnMap() {
     this.columnMap = this.options.hideEmptyColumns ? times(this.dataWidth, n => n).filter(idx => !this.columnIsEmpty(idx)) : times(this.dataWidth, n => n);
   }
+  resetAccumulators() {
+    if (this.options.cumulativeValues) {
+      this.rowMap.forEach(row => {
+        this.accumulators.rows[row] = {};
+        this.columnMap.reduce((acc, column) => {
+          const cellType = this.getRawCellType({
+            row,
+            column
+          });
+          const dxDimension = this.getRawCellDxDimension({
+            row,
+            column
+          });
+          const valueType = (dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || VALUE_TYPE_TEXT;
+
+          // only accumulate numeric values
+          // accumulating text values does not make sense
+          if (valueType === VALUE_TYPE_NUMBER) {
+            if (this.data[row] && this.data[row][column]) {
+              const dataRow = this.data[row][column];
+              const rawValue = cellType === CELL_TYPE_VALUE ? dataRow[this.dimensionLookup.dataHeaders.value] : dataRow.value;
+              acc += parseValue(rawValue);
+            }
+            this.accumulators.rows[row][column] = acc;
+          }
+          return acc;
+        }, 0);
+      });
+    } else {
+      this.accumulators = {
+        rows: {}
+      };
+    }
+  }
   get cellPadding() {
     switch (this.visualization.displayDensity) {
       case DISPLAY_DENSITY_OPTION_COMPACT:
@@ -780,14 +838,18 @@ export class PivotTableEngine {
       }
     });
     this.finalizeTotals();
-    this.rawData.rows.forEach(dataRow => {
-      const pos = lookup(dataRow, this.dimensionLookup, this);
-      if (pos) {
-        this.adaptiveClippingController.add(pos, this.getRaw(pos).renderedValue);
-      }
-    });
     this.resetRowMap();
     this.resetColumnMap();
+    this.resetAccumulators();
+    this.rowMap.forEach(row => {
+      this.columnMap.forEach(column => {
+        const pos = {
+          row,
+          column
+        };
+        this.adaptiveClippingController.add(pos, this.getRaw(pos).renderedValue);
+      });
+    });
     this.height = this.rowMap.length;
     this.width = this.columnMap.length;
     this.adaptiveClippingController.finalize();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.2.0-alpha.2",
+    "version": "26.2.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {

package/build/cjs/api/analytics/AnalyticsTrackedEntities.js

@@ -1,31 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _AnalyticsBase = _interopRequireDefault(require("./AnalyticsBase.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * @extends module:analytics.AnalyticsBase
- *
- * @description
- * Analytics tracked entities class used to request analytics tracked entities data from Web API.
- *
- * @memberof module:analytics
- */
-class AnalyticsTrackedEntities extends _AnalyticsBase.default {
-  /**
-   * @param {!AnalyticsRequest} req Request object
-   *
-   * @returns {Promise} Promise that resolves with the analytics query data from the api.
-   *
-   * @example
-      // TODO: provide working example
-   */
-  getQuery(req) {
-    return this.fetch(req.withPath('trackedEntities/query'));
-  }
-}
-var _default = AnalyticsTrackedEntities;
-exports.default = _default;

package/build/es/api/analytics/AnalyticsTrackedEntities.js

@@ -1,24 +0,0 @@
-import AnalyticsBase from './AnalyticsBase.js';
-
-/**
- * @extends module:analytics.AnalyticsBase
- *
- * @description
- * Analytics tracked entities class used to request analytics tracked entities data from Web API.
- *
- * @memberof module:analytics
- */
-class AnalyticsTrackedEntities extends AnalyticsBase {
-  /**
-   * @param {!AnalyticsRequest} req Request object
-   *
-   * @returns {Promise} Promise that resolves with the analytics query data from the api.
-   *
-   * @example
-      // TODO: provide working example
-   */
-  getQuery(req) {
-    return this.fetch(req.withPath('trackedEntities/query'));
-  }
-}
-export default AnalyticsTrackedEntities;