@dhis2/analytics 26.5.0 → 26.6.1

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

@@ -9,6 +9,7 @@ var _AnalyticsEnrollments = _interopRequireDefault(require("./AnalyticsEnrollmen
 var _AnalyticsEvents = _interopRequireDefault(require("./AnalyticsEvents.js"));
 var _AnalyticsRequest = _interopRequireDefault(require("./AnalyticsRequest.js"));
 var _AnalyticsResponse = _interopRequireDefault(require("./AnalyticsResponse.js"));
+var _AnalyticsTrackedEntities = _interopRequireDefault(require("./AnalyticsTrackedEntities.js"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * @module analytics
@@ -19,6 +20,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * Analytics class used to request analytics data from Web API.
  *
  * @requires analytics.AnalyticsAggregate
+ * @requires analytics.AnalyticsTrackedEntities
+ * @requires analytics.AnalyticsEnrollments
  * @requires analytics.AnalyticsEvents
  * @requires analytics.AnalyticsRequest
  * @requires analytics.AnalyticsResponse
@@ -38,6 +41,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 class Analytics {
   /**
    * @param {!module:analytics.AnalyticsAggregate} analyticsAggregate The AnalyticsAggregate instance
+   * @param {!module:analytics.AnalyticsTrackedEntities} analyticsTrackedEntities The AnalyticsTrackedEntities instance
    * @param {!module:analytics.AnalyticsEnrollments} analyticsEnrollments The AnalyticsEnrollments instance
    * @param {!module:analytics.AnalyticsEvents} analyticsEvents The AnalyticsEvents instance
    * @param {!module:analytics.AnalyticsRequest} analyticsRequest The AnalyticsRequest class
@@ -46,12 +50,14 @@ class Analytics {
   constructor(_ref) {
     let {
       aggregate,
+      trackedEntities,
       enrollments,
       events,
       request,
       response
     } = _ref;
     this.aggregate = aggregate;
+    this.trackedEntities = trackedEntities;
     this.enrollments = enrollments;
     this.events = events;
     this.request = request;
@@ -74,6 +80,7 @@ class Analytics {
     if (!Analytics.getAnalytics.analytics) {
       Analytics.getAnalytics.analytics = new Analytics({
         aggregate: new _AnalyticsAggregate.default(dataEngine),
+        trackedEntities: new _AnalyticsTrackedEntities.default(dataEngine),
         enrollments: new _AnalyticsEnrollments.default(dataEngine),
         events: new _AnalyticsEvents.default(dataEngine),
         request: _AnalyticsRequest.default,

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

@@ -6,15 +6,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.generateDimensionStrings = exports.default = void 0;
 var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 var _AnalyticsRequest = _interopRequireDefault(require("./AnalyticsRequest.js"));
+var _utils = require("./utils.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const analyticsQuery = {
   resource: 'analytics',
   id: _ref => {
     let {
       path,
-      program
+      program,
+      trackedEntityType
     } = _ref;
-    return [path, program].filter(Boolean).join('/');
+    return (0, _utils.formatRequestPath)({
+      path,
+      program,
+      trackedEntityType
+    });
   },
   params: _ref2 => {
     let {
@@ -34,9 +40,14 @@ const analyticsDataQuery = {
   id: _ref3 => {
     let {
       path,
-      program
+      program,
+      trackedEntityType
     } = _ref3;
-    return [path, program].filter(Boolean).join('/');
+    return (0, _utils.formatRequestPath)({
+      path,
+      program,
+      trackedEntityType
+    });
   },
   params: _ref4 => {
     let {
@@ -58,9 +69,14 @@ const analyticsMetaDataQuery = {
   id: _ref5 => {
     let {
       path,
-      program
+      program,
+      trackedEntityType
     } = _ref5;
-    return [path, program].filter(Boolean).join('/');
+    return (0, _utils.formatRequestPath)({
+      path,
+      program,
+      trackedEntityType
+    });
   },
   params: _ref6 => {
     let {
@@ -153,6 +169,7 @@ class AnalyticsBase {
       variables: {
         path: req.path,
         program: req.program,
+        trackedEntityType: req.trackedEntityType,
         dimensions: generateDimensionStrings(req.dimensions),
         filters: generateDimensionStrings(req.filters),
         parameters: req.parameters,
@@ -195,6 +212,7 @@ class AnalyticsBase {
       variables: {
         path: req.path,
         program: req.program,
+        trackedEntityType: req.trackedEntityType,
         dimensions: generateDimensionStrings(req.dimensions, options),
         filters: generateDimensionStrings(req.filters, options),
         parameters: req.parameters

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

@@ -10,6 +10,7 @@ var _AnalyticsRequestBase = _interopRequireDefault(require("./AnalyticsRequestBa
 var _AnalyticsRequestDimensionsMixin = _interopRequireDefault(require("./AnalyticsRequestDimensionsMixin.js"));
 var _AnalyticsRequestFiltersMixin = _interopRequireDefault(require("./AnalyticsRequestFiltersMixin.js"));
 var _AnalyticsRequestPropertiesMixin = _interopRequireDefault(require("./AnalyticsRequestPropertiesMixin.js"));
+var _utils = require("./utils.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * @description
@@ -47,6 +48,7 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
   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 || [];
@@ -57,19 +59,28 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
       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 => {
-          request = request.addDimension(dimension.replace(/\./, `[${index}].`));
+          var _d$program;
+          request = request.addDimension((0, _utils.formatDimension)({
+            programId: (_d$program = d.program) === null || _d$program === void 0 ? void 0 : _d$program.id,
+            programStageId: `${programStageId}[${index}]`,
+            dimension,
+            outputType
+          }));
         });
       } else {
-        var _d$items;
-        request = request.addDimension(dimension, (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
+        var _d$program2, _d$items;
+        request = request.addDimension((0, _utils.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));
       }
     });
 
@@ -84,17 +95,29 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
         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$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? `${f.programStage.id}.${f.dimension}` : f.dimension;
+        let filterString = 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 => {
-            request = request.addFilter(filterString.replace(/\./, `[${index}].`));
+            var _f$program;
+            request = request.addFilter((0, _utils.formatDimension)({
+              programId: (_f$program = f.program) === null || _f$program === void 0 ? void 0 : _f$program.id,
+              programStageId: `${programStageId}[${index}]`,
+              dimension: filterString,
+              outputType
+            }));
           });
         } else {
-          var _f$items2;
-          request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+          var _f$program2, _f$items2;
+          request = request.addFilter((0, _utils.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));
         }
       }
     });

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

@@ -24,6 +24,7 @@ class AnalyticsRequestBase {
       format = 'json',
       path,
       program,
+      trackedEntityType,
       dimensions = [],
       filters = [],
       parameters = {}
@@ -32,6 +33,7 @@ class AnalyticsRequestBase {
     this.format = format.toLowerCase();
     this.path = path;
     this.program = program;
+    this.trackedEntityType = trackedEntityType;
     this.dimensions = dimensions;
     this.filters = filters;
     this.parameters = {
@@ -70,7 +72,7 @@ class AnalyticsRequestBase {
       }
       return dimension;
     });
-    const endPoint = [this.endPoint, this.path, this.program].filter(e => !!e).join('/');
+    const endPoint = [this.endPoint, this.path, this.program, this.trackedEntityType].filter(Boolean).join('/');
     let url = `${endPoint}.${this.format}`;
     if (encodedDimensions.length) {
       url += `?dimension=${encodedDimensions.join('&dimension=')}`;

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

@@ -497,6 +497,25 @@ class extends base {
     return new _AnalyticsRequest.default(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.default(this);
+  }
+
   /**
    * Sets the program for the request.
    * It appends the program id to the request's path.

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

@@ -0,0 +1,31 @@
+"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/cjs/api/analytics/utils.js

@@ -3,10 +3,29 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.customEncodeURIComponent = void 0;
+exports.formatRequestPath = exports.formatDimension = exports.customEncodeURIComponent = void 0;
 // Define our very own special list of characters that we don't want to encode in the URI
 const whitelistURI = ',&$=/;:';
 const whitelistURICodes = whitelistURI.split('').map(c => encodeURIComponent(c));
 const whitelistRegExp = new RegExp(`(?:${whitelistURICodes.join('|')})`, 'g');
 const customEncodeURIComponent = uri => encodeURIComponent(uri).replace(whitelistRegExp, decodeURIComponent);
-exports.customEncodeURIComponent = customEncodeURIComponent;
+exports.customEncodeURIComponent = customEncodeURIComponent;
+const formatRequestPath = _ref => {
+  let {
+    path,
+    program,
+    trackedEntityType
+  } = _ref;
+  return [path, program, trackedEntityType].filter(Boolean).join('/');
+};
+exports.formatRequestPath = formatRequestPath;
+const formatDimension = _ref2 => {
+  let {
+    outputType,
+    programId,
+    programStageId,
+    dimension
+  } = _ref2;
+  return [outputType === 'TRACKED_ENTITY_INSTANCE' ? programId : undefined, programStageId, dimension].filter(Boolean).join('.');
+};
+exports.formatDimension = formatDimension;

package/build/cjs/locales/cs/translations.json

@@ -46,6 +46,7 @@
     "Drag items here, or double click in the list, to start building a calculation formula": "Přetáhněte položky sem nebo dvakrát klikněte na seznam a začněte vytvářet vzorec výpočtu",
     "Math operators": "Matematické operátory",
     "Data Type": "Typ dat",
+    "Only {{dataType}} can be used in {{visType}}": "",
     "All types": "Všechny typy",
     "Disaggregation": "Rozčlenění",
     "No data": "Nejsou data",
@@ -56,10 +57,12 @@
     "No data sets found": "Nebyly nalezeny žádné datové soubory",
     "No event data items found": "Nebyly nalezeny žádné datové položky události",
     "No program indicators found": "Nebyly nalezeny žádné programové indikátory",
+    "No calculations found": "Nenalezeny žádné výpočty",
     "No indicators found for \"{{- searchTerm}}\"": "Nebyly nalezeny žádné indikátory pro „{{- searchTerm}}“",
     "No data sets found for \"{{- searchTerm}}\"": "Nebyly nalezeny žádné soubory dat pro „{{- searchTerm}}“",
     "No event data items found for \"{{- searchTerm}}\"": "Pro „{{- searchTerm}}“ nebyly nalezeny žádné datové položky události",
     "No program indicators found for \"{{- searchTerm}}\"": "Nebyly nalezeny žádné programové indikátory pro „{{- searchTerm}}“",
+    "No calculations found for \"{{- searchTerm}}\"": "",
     "Nothing found for \"{{- searchTerm}}\"": "Pro dotaz „{{- searchTerm}}“ nebylo nic nalezeno",
     "Calculation": "Výpočet",
     "Metric type": "Metrický typ",
@@ -129,8 +132,9 @@
     "View replies": "",
     "Unlike": "Na rozdíl od",
     "Like": "Jako",
-    "Share": "Sdílet",
     "See interpretation": "Zobrazit interpretaci",
+    "Open in app": "",
+    "Share": "Sdílet",
     "Manage sharing": "Spravovat sdílení",
     "Could not update interpretation": "Interpretaci nelze aktualizovat",
     "Enter interpretation text": "Zadejte text interpretace",
@@ -210,9 +214,9 @@
     "Year": "Rok",
     "Select year": "Vybrat rok",
     "Period": "Období",
+    "Selected Periods": "Vybraná období",
     "Relative periods": "Relativní období",
     "Fixed periods": "Pevné období",
-    "Selected Periods": "Vybraná období",
     "No periods selected": "Nejsou vybrána žádná období",
     "Daily": "Denně",
     "Weekly": "Týdně",
@@ -380,6 +384,7 @@
     "Radar": "Radar",
     "Scatter": "Rozptyl",
     "Single value": "Jedna hodnota",
+    "Outlier table": "",
     "All charts": "Všechny grafy",
     "{{seriesName}} (trend)": "{{seriesName}} (trend)",
     "Trend": "Trend",

package/build/cjs/locales/zh/translations.json

@@ -43,6 +43,7 @@
     "Drag items here, or double click in the list, to start building a calculation formula": "将项目拖到此处，或在列表中双击，开始构建计算公式",
     "Math operators": "数学运算符",
     "Data Type": "数据类型",
+    "Only {{dataType}} can be used in {{visType}}": "{{dataType}} 只能在 {{visType}} 中使用",
     "All types": "所有类型",
     "Disaggregation": "分解",
     "No data": "无数据",
@@ -53,10 +54,12 @@
     "No data sets found": "找不到数据集",
     "No event data items found": "找不到事件数据项",
     "No program indicators found": "找不到项目指标",
+    "No calculations found": "没有找到计算结果",
     "No indicators found for \"{{- searchTerm}}\"": "找不到“ {{- searchTerm}}”的指标",
     "No data sets found for \"{{- searchTerm}}\"": "找不到“ {{- searchTerm}}”的数据集",
     "No event data items found for \"{{- searchTerm}}\"": "找不到“ {{- searchTerm}}”的事件数据项",
     "No program indicators found for \"{{- searchTerm}}\"": "找不到“ {{- searchTerm}}”的计划指标",
+    "No calculations found for \"{{- searchTerm}}\"": "找不到“{{- searchTerm}}”的计算",
     "Nothing found for \"{{- searchTerm}}\"": "找不到“ {{- searchTerm}}”",
     "Calculation": "计算",
     "Metric type": "尺度类型",
@@ -123,8 +126,9 @@
     "View replies": "查看回复",
     "Unlike": "不喜欢",
     "Like": "喜欢",
-    "Share": "分享",
     "See interpretation": "见解释",
+    "Open in app": "在应用程序中打开",
+    "Share": "分享",
     "Manage sharing": "管理共享",
     "Could not update interpretation": "无法更新解释",
     "Enter interpretation text": "输入解释文本",
@@ -195,9 +199,9 @@
     "Year": "年",
     "Select year": "选择年份",
     "Period": "期间",
+    "Selected Periods": "选择的期间",
     "Relative periods": "相对期间",
     "Fixed periods": "固定期间",
-    "Selected Periods": "选择的期间",
     "No periods selected": "未选择期间",
     "Daily": "每日",
     "Weekly": "每周",
@@ -365,6 +369,7 @@
     "Radar": "雷达图",
     "Scatter": "分散",
     "Single value": "单个值",
+    "Outlier table": "异常值表",
     "All charts": "所有图表",
     "{{seriesName}} (trend)": "{{seriesName}}（趋势）",
     "Trend": "趋势",

package/build/cjs/modules/layout/axisGetDimensionIds.js

@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
 exports.axisGetDimensionIds = void 0;
 var _axis = require("./axis.js");
 var _dimensionGetId = require("./dimensionGetId.js");
-const axisGetDimensionIds = axis => _axis.AXIS.isValid(axis) ? axis.map(dimension => (0, _dimensionGetId.dimensionGetId)(dimension)) : _axis.AXIS.defaultValue;
+const axisGetDimensionIds = (axis, outputType) => _axis.AXIS.isValid(axis) ? axis.map(dimension => (0, _dimensionGetId.dimensionGetId)(dimension, outputType)) : _axis.AXIS.defaultValue;
 exports.axisGetDimensionIds = axisGetDimensionIds;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DIMENSION_PROP_REPETITION = exports.DIMENSION_PROP_PROGRAM_STAGE = exports.DIMENSION_PROP_LEGEND_SET = exports.DIMENSION_PROP_ITEMS = exports.DIMENSION_PROP_ID = exports.DIMENSION_PROP_FILTER = exports.DIMENSION_PROPS = exports.DIMENSION = void 0;
+exports.DIMENSION_PROP_REPETITION = exports.DIMENSION_PROP_PROGRAM_STAGE = exports.DIMENSION_PROP_PROGRAM = exports.DIMENSION_PROP_LEGEND_SET = exports.DIMENSION_PROP_ITEMS = exports.DIMENSION_PROP_ID = exports.DIMENSION_PROP_FILTER = exports.DIMENSION_PROPS = exports.DIMENSION = void 0;
 var _isObject = _interopRequireDefault(require("lodash/isObject"));
 var _isString = _interopRequireDefault(require("lodash/isString"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -43,6 +43,13 @@ const DIMENSION_PROP_LEGEND_SET = {
   isValid: prop => (0, _isString.default)(prop)
 };
 exports.DIMENSION_PROP_LEGEND_SET = DIMENSION_PROP_LEGEND_SET;
+const DIMENSION_PROP_PROGRAM = {
+  name: 'program',
+  defaultValue: {},
+  required: false,
+  isValid: prop => (0, _isObject.default)(prop)
+};
+exports.DIMENSION_PROP_PROGRAM = DIMENSION_PROP_PROGRAM;
 const DIMENSION_PROP_PROGRAM_STAGE = {
   name: 'programStage',
   defaultValue: {},
@@ -57,5 +64,5 @@ const DIMENSION_PROP_REPETITION = {
   isValid: prop => Array.isArray(prop)
 };
 exports.DIMENSION_PROP_REPETITION = DIMENSION_PROP_REPETITION;
-const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET, DIMENSION_PROP_PROGRAM_STAGE, DIMENSION_PROP_REPETITION];
+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];
 exports.DIMENSION_PROPS = DIMENSION_PROPS;

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

@@ -21,6 +21,9 @@ const dimensionCreate = function (dimensionId) {
     ...(args.legendSet && {
       [_dimension.DIMENSION_PROP_LEGEND_SET.name]: args.legendSet
     }),
+    ...(args.program && {
+      [_dimension.DIMENSION_PROP_PROGRAM.name]: args.program
+    }),
     ...(args.programStage && {
       [_dimension.DIMENSION_PROP_PROGRAM_STAGE.name]: args.programStage
     }),

package/build/cjs/modules/layout/dimensionGetId.js

@@ -4,9 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.dimensionGetId = void 0;
+var _utils = require("../../api/analytics/utils.js");
 var _dimension = require("./dimension.js");
-const dimensionGetId = dimension => {
-  var _dimension$DIMENSION_;
-  return (_dimension$DIMENSION_ = dimension[_dimension.DIMENSION_PROP_PROGRAM_STAGE.name]) !== null && _dimension$DIMENSION_ !== void 0 && _dimension$DIMENSION_.id ? `${dimension[_dimension.DIMENSION_PROP_PROGRAM_STAGE.name].id}.${dimension[_dimension.DIMENSION_PROP_ID.name]}` : dimension[_dimension.DIMENSION_PROP_ID.name];
+const dimensionGetId = (dimension, outputType) => {
+  var _dimension$DIMENSION_, _dimension$DIMENSION_2;
+  return (0, _utils.formatDimension)({
+    dimension: dimension[_dimension.DIMENSION_PROP_ID.name],
+    programId: (_dimension$DIMENSION_ = dimension[_dimension.DIMENSION_PROP_PROGRAM.name]) === null || _dimension$DIMENSION_ === void 0 ? void 0 : _dimension$DIMENSION_.id,
+    programStageId: (_dimension$DIMENSION_2 = dimension[_dimension.DIMENSION_PROP_PROGRAM_STAGE.name]) === null || _dimension$DIMENSION_2 === void 0 ? void 0 : _dimension$DIMENSION_2.id,
+    outputType
+  });
 };
 exports.dimensionGetId = dimensionGetId;

package/build/cjs/modules/layout/layoutFilterDimensions.js

@@ -11,7 +11,7 @@ const layoutFilterDimensions = (layout, dimensionIds) => {
   const filteredLayout = Object.assign({}, layout);
   _axis.DEFAULT_AXIS_IDS.forEach(axisId => {
     if (_axis.AXIS.isValid(filteredLayout[axisId])) {
-      filteredLayout[axisId] = filteredLayout[axisId].filter(dimension => !idArray.includes((0, _dimensionGetId.dimensionGetId)(dimension)));
+      filteredLayout[axisId] = filteredLayout[axisId].filter(dimension => !idArray.includes((0, _dimensionGetId.dimensionGetId)(dimension, layout.outputType)));
     }
   });
   return filteredLayout;

package/build/cjs/modules/layout/layoutGetAxisIdDimensionIdsObject.js

@@ -8,7 +8,7 @@ var _axis = require("./axis.js");
 var _axisGetDimensionIds = require("./axisGetDimensionIds.js");
 const layoutGetAxisIdDimensionIdsObject = layout => _axis.DEFAULT_AXIS_IDS.reduce((obj, axisId) => {
   if (_axis.AXIS.isValid(layout[axisId])) {
-    obj[axisId] = (0, _axisGetDimensionIds.axisGetDimensionIds)(layout[axisId]);
+    obj[axisId] = (0, _axisGetDimensionIds.axisGetDimensionIds)(layout[axisId], layout.outputType);
   }
   return obj;
 }, {});

package/build/cjs/modules/layout/layoutGetDimensionIdItemIdsObject.js

@@ -8,7 +8,7 @@ var _dimensionGetId = require("./dimensionGetId.js");
 var _dimensionGetItemIds = require("./dimensionGetItemIds.js");
 var _layoutGetAllDimensions = require("./layoutGetAllDimensions.js");
 const layoutGetDimensionIdItemIdsObject = layout => (0, _layoutGetAllDimensions.layoutGetAllDimensions)(layout).reduce((obj, dimension) => {
-  obj[(0, _dimensionGetId.dimensionGetId)(dimension)] = (0, _dimensionGetItemIds.dimensionGetItemIds)(dimension);
+  obj[(0, _dimensionGetId.dimensionGetId)(dimension, layout.outputType)] = (0, _dimensionGetItemIds.dimensionGetItemIds)(dimension);
   return obj;
 }, {});
 exports.layoutGetDimensionIdItemIdsObject = layoutGetDimensionIdItemIdsObject;

package/build/cjs/modules/layout/layoutHasDynamicDimension.js

@@ -9,6 +9,6 @@ var _dimensionGetId = require("./dimensionGetId.js");
 var _layoutGetAllDimensions = require("./layoutGetAllDimensions.js");
 const layoutHasDynamicDimension = layout => {
   const fixedIds = Object.keys((0, _predefinedDimensions.getPredefinedDimensions)());
-  return Boolean((0, _layoutGetAllDimensions.layoutGetAllDimensions)(layout).find(dimension => !fixedIds.includes((0, _dimensionGetId.dimensionGetId)(dimension))));
+  return Boolean((0, _layoutGetAllDimensions.layoutGetAllDimensions)(layout).find(dimension => !fixedIds.includes((0, _dimensionGetId.dimensionGetId)(dimension, layout.outputType))));
 };
 exports.layoutHasDynamicDimension = layoutHasDynamicDimension;

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

@@ -6,12 +6,15 @@ import AnalyticsEnrollments from './AnalyticsEnrollments.js';
 import AnalyticsEvents from './AnalyticsEvents.js';
 import AnalyticsRequest from './AnalyticsRequest.js';
 import AnalyticsResponse from './AnalyticsResponse.js';
+import AnalyticsTrackedEntities from './AnalyticsTrackedEntities.js';
 
 /**
  * @description
  * Analytics class used to request analytics data from Web API.
  *
  * @requires analytics.AnalyticsAggregate
+ * @requires analytics.AnalyticsTrackedEntities
+ * @requires analytics.AnalyticsEnrollments
  * @requires analytics.AnalyticsEvents
  * @requires analytics.AnalyticsRequest
  * @requires analytics.AnalyticsResponse
@@ -31,6 +34,7 @@ import AnalyticsResponse from './AnalyticsResponse.js';
 class Analytics {
   /**
    * @param {!module:analytics.AnalyticsAggregate} analyticsAggregate The AnalyticsAggregate instance
+   * @param {!module:analytics.AnalyticsTrackedEntities} analyticsTrackedEntities The AnalyticsTrackedEntities instance
    * @param {!module:analytics.AnalyticsEnrollments} analyticsEnrollments The AnalyticsEnrollments instance
    * @param {!module:analytics.AnalyticsEvents} analyticsEvents The AnalyticsEvents instance
    * @param {!module:analytics.AnalyticsRequest} analyticsRequest The AnalyticsRequest class
@@ -39,12 +43,14 @@ class Analytics {
   constructor(_ref) {
     let {
       aggregate,
+      trackedEntities,
       enrollments,
       events,
       request,
       response
     } = _ref;
     this.aggregate = aggregate;
+    this.trackedEntities = trackedEntities;
     this.enrollments = enrollments;
     this.events = events;
     this.request = request;
@@ -67,6 +73,7 @@ class Analytics {
     if (!Analytics.getAnalytics.analytics) {
       Analytics.getAnalytics.analytics = new Analytics({
         aggregate: new AnalyticsAggregate(dataEngine),
+        trackedEntities: new AnalyticsTrackedEntities(dataEngine),
         enrollments: new AnalyticsEnrollments(dataEngine),
         events: new AnalyticsEvents(dataEngine),
         request: AnalyticsRequest,

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

@@ -1,13 +1,19 @@
 import sortBy from 'lodash/sortBy';
 import AnalyticsRequest from './AnalyticsRequest.js';
+import { formatRequestPath } from './utils.js';
 const analyticsQuery = {
   resource: 'analytics',
   id: _ref => {
     let {
       path,
-      program
+      program,
+      trackedEntityType
     } = _ref;
-    return [path, program].filter(Boolean).join('/');
+    return formatRequestPath({
+      path,
+      program,
+      trackedEntityType
+    });
   },
   params: _ref2 => {
     let {
@@ -27,9 +33,14 @@ const analyticsDataQuery = {
   id: _ref3 => {
     let {
       path,
-      program
+      program,
+      trackedEntityType
     } = _ref3;
-    return [path, program].filter(Boolean).join('/');
+    return formatRequestPath({
+      path,
+      program,
+      trackedEntityType
+    });
   },
   params: _ref4 => {
     let {
@@ -51,9 +62,14 @@ const analyticsMetaDataQuery = {
   id: _ref5 => {
     let {
       path,
-      program
+      program,
+      trackedEntityType
     } = _ref5;
-    return [path, program].filter(Boolean).join('/');
+    return formatRequestPath({
+      path,
+      program,
+      trackedEntityType
+    });
   },
   params: _ref6 => {
     let {
@@ -145,6 +161,7 @@ class AnalyticsBase {
       variables: {
         path: req.path,
         program: req.program,
+        trackedEntityType: req.trackedEntityType,
         dimensions: generateDimensionStrings(req.dimensions),
         filters: generateDimensionStrings(req.filters),
         parameters: req.parameters,
@@ -187,6 +204,7 @@ class AnalyticsBase {
       variables: {
         path: req.path,
         program: req.program,
+        trackedEntityType: req.trackedEntityType,
         dimensions: generateDimensionStrings(req.dimensions, options),
         filters: generateDimensionStrings(req.filters, options),
         parameters: req.parameters

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

@@ -4,6 +4,7 @@ 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
@@ -41,6 +42,7 @@ 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 || [];
@@ -51,19 +53,28 @@ 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 => {
-          request = request.addDimension(dimension.replace(/\./, `[${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
+          }));
         });
       } else {
-        var _d$items;
-        request = request.addDimension(dimension, (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
+        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));
       }
     });
 
@@ -78,17 +89,29 @@ 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$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? `${f.programStage.id}.${f.dimension}` : f.dimension;
+        let filterString = 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 => {
-            request = request.addFilter(filterString.replace(/\./, `[${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
+            }));
           });
         } else {
-          var _f$items2;
-          request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+          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));
         }
       }
     });

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

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

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

@@ -491,6 +491,25 @@ 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/AnalyticsTrackedEntities.js

@@ -0,0 +1,24 @@
+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;

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

@@ -2,4 +2,21 @@
 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 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 [outputType === 'TRACKED_ENTITY_INSTANCE' ? programId : undefined, programStageId, dimension].filter(Boolean).join('.');
+};

package/build/es/locales/cs/translations.json

@@ -46,6 +46,7 @@
     "Drag items here, or double click in the list, to start building a calculation formula": "Přetáhněte položky sem nebo dvakrát klikněte na seznam a začněte vytvářet vzorec výpočtu",
     "Math operators": "Matematické operátory",
     "Data Type": "Typ dat",
+    "Only {{dataType}} can be used in {{visType}}": "",
     "All types": "Všechny typy",
     "Disaggregation": "Rozčlenění",
     "No data": "Nejsou data",
@@ -56,10 +57,12 @@
     "No data sets found": "Nebyly nalezeny žádné datové soubory",
     "No event data items found": "Nebyly nalezeny žádné datové položky události",
     "No program indicators found": "Nebyly nalezeny žádné programové indikátory",
+    "No calculations found": "Nenalezeny žádné výpočty",
     "No indicators found for \"{{- searchTerm}}\"": "Nebyly nalezeny žádné indikátory pro „{{- searchTerm}}“",
     "No data sets found for \"{{- searchTerm}}\"": "Nebyly nalezeny žádné soubory dat pro „{{- searchTerm}}“",
     "No event data items found for \"{{- searchTerm}}\"": "Pro „{{- searchTerm}}“ nebyly nalezeny žádné datové položky události",
     "No program indicators found for \"{{- searchTerm}}\"": "Nebyly nalezeny žádné programové indikátory pro „{{- searchTerm}}“",
+    "No calculations found for \"{{- searchTerm}}\"": "",
     "Nothing found for \"{{- searchTerm}}\"": "Pro dotaz „{{- searchTerm}}“ nebylo nic nalezeno",
     "Calculation": "Výpočet",
     "Metric type": "Metrický typ",
@@ -129,8 +132,9 @@
     "View replies": "",
     "Unlike": "Na rozdíl od",
     "Like": "Jako",
-    "Share": "Sdílet",
     "See interpretation": "Zobrazit interpretaci",
+    "Open in app": "",
+    "Share": "Sdílet",
     "Manage sharing": "Spravovat sdílení",
     "Could not update interpretation": "Interpretaci nelze aktualizovat",
     "Enter interpretation text": "Zadejte text interpretace",
@@ -210,9 +214,9 @@
     "Year": "Rok",
     "Select year": "Vybrat rok",
     "Period": "Období",
+    "Selected Periods": "Vybraná období",
     "Relative periods": "Relativní období",
     "Fixed periods": "Pevné období",
-    "Selected Periods": "Vybraná období",
     "No periods selected": "Nejsou vybrána žádná období",
     "Daily": "Denně",
     "Weekly": "Týdně",
@@ -380,6 +384,7 @@
     "Radar": "Radar",
     "Scatter": "Rozptyl",
     "Single value": "Jedna hodnota",
+    "Outlier table": "",
     "All charts": "Všechny grafy",
     "{{seriesName}} (trend)": "{{seriesName}} (trend)",
     "Trend": "Trend",

package/build/es/locales/zh/translations.json

@@ -43,6 +43,7 @@
     "Drag items here, or double click in the list, to start building a calculation formula": "将项目拖到此处，或在列表中双击，开始构建计算公式",
     "Math operators": "数学运算符",
     "Data Type": "数据类型",
+    "Only {{dataType}} can be used in {{visType}}": "{{dataType}} 只能在 {{visType}} 中使用",
     "All types": "所有类型",
     "Disaggregation": "分解",
     "No data": "无数据",
@@ -53,10 +54,12 @@
     "No data sets found": "找不到数据集",
     "No event data items found": "找不到事件数据项",
     "No program indicators found": "找不到项目指标",
+    "No calculations found": "没有找到计算结果",
     "No indicators found for \"{{- searchTerm}}\"": "找不到“ {{- searchTerm}}”的指标",
     "No data sets found for \"{{- searchTerm}}\"": "找不到“ {{- searchTerm}}”的数据集",
     "No event data items found for \"{{- searchTerm}}\"": "找不到“ {{- searchTerm}}”的事件数据项",
     "No program indicators found for \"{{- searchTerm}}\"": "找不到“ {{- searchTerm}}”的计划指标",
+    "No calculations found for \"{{- searchTerm}}\"": "找不到“{{- searchTerm}}”的计算",
     "Nothing found for \"{{- searchTerm}}\"": "找不到“ {{- searchTerm}}”",
     "Calculation": "计算",
     "Metric type": "尺度类型",
@@ -123,8 +126,9 @@
     "View replies": "查看回复",
     "Unlike": "不喜欢",
     "Like": "喜欢",
-    "Share": "分享",
     "See interpretation": "见解释",
+    "Open in app": "在应用程序中打开",
+    "Share": "分享",
     "Manage sharing": "管理共享",
     "Could not update interpretation": "无法更新解释",
     "Enter interpretation text": "输入解释文本",
@@ -195,9 +199,9 @@
     "Year": "年",
     "Select year": "选择年份",
     "Period": "期间",
+    "Selected Periods": "选择的期间",
     "Relative periods": "相对期间",
     "Fixed periods": "固定期间",
-    "Selected Periods": "选择的期间",
     "No periods selected": "未选择期间",
     "Daily": "每日",
     "Weekly": "每周",
@@ -365,6 +369,7 @@
     "Radar": "雷达图",
     "Scatter": "分散",
     "Single value": "单个值",
+    "Outlier table": "异常值表",
     "All charts": "所有图表",
     "{{seriesName}} (trend)": "{{seriesName}}（趋势）",
     "Trend": "趋势",

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

@@ -1,3 +1,3 @@
 import { AXIS } from './axis.js';
 import { dimensionGetId } from './dimensionGetId.js';
-export const axisGetDimensionIds = axis => AXIS.isValid(axis) ? axis.map(dimension => dimensionGetId(dimension)) : AXIS.defaultValue;
+export const axisGetDimensionIds = (axis, outputType) => AXIS.isValid(axis) ? axis.map(dimension => dimensionGetId(dimension, outputType)) : AXIS.defaultValue;

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

@@ -33,6 +33,12 @@ 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: {},
@@ -45,4 +51,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_STAGE, DIMENSION_PROP_REPETITION];
+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];

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_STAGE, DIMENSION_PROP_REPETITION } from './dimension.js';
+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';
 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,6 +15,9 @@ 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/layout/dimensionGetId.js

@@ -1,5 +1,11 @@
-import { DIMENSION_PROP_ID, DIMENSION_PROP_PROGRAM_STAGE } from './dimension.js';
-export const dimensionGetId = dimension => {
-  var _dimension$DIMENSION_;
-  return (_dimension$DIMENSION_ = dimension[DIMENSION_PROP_PROGRAM_STAGE.name]) !== null && _dimension$DIMENSION_ !== void 0 && _dimension$DIMENSION_.id ? `${dimension[DIMENSION_PROP_PROGRAM_STAGE.name].id}.${dimension[DIMENSION_PROP_ID.name]}` : dimension[DIMENSION_PROP_ID.name];
+import { formatDimension } from '../../api/analytics/utils.js';
+import { DIMENSION_PROP_ID, DIMENSION_PROP_PROGRAM_STAGE, DIMENSION_PROP_PROGRAM } from './dimension.js';
+export const dimensionGetId = (dimension, outputType) => {
+  var _dimension$DIMENSION_, _dimension$DIMENSION_2;
+  return formatDimension({
+    dimension: dimension[DIMENSION_PROP_ID.name],
+    programId: (_dimension$DIMENSION_ = dimension[DIMENSION_PROP_PROGRAM.name]) === null || _dimension$DIMENSION_ === void 0 ? void 0 : _dimension$DIMENSION_.id,
+    programStageId: (_dimension$DIMENSION_2 = dimension[DIMENSION_PROP_PROGRAM_STAGE.name]) === null || _dimension$DIMENSION_2 === void 0 ? void 0 : _dimension$DIMENSION_2.id,
+    outputType
+  });
 };

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

@@ -5,7 +5,7 @@ export const layoutFilterDimensions = (layout, dimensionIds) => {
   const filteredLayout = Object.assign({}, layout);
   DEFAULT_AXIS_IDS.forEach(axisId => {
     if (AXIS.isValid(filteredLayout[axisId])) {
-      filteredLayout[axisId] = filteredLayout[axisId].filter(dimension => !idArray.includes(dimensionGetId(dimension)));
+      filteredLayout[axisId] = filteredLayout[axisId].filter(dimension => !idArray.includes(dimensionGetId(dimension, layout.outputType)));
     }
   });
   return filteredLayout;

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

@@ -2,7 +2,7 @@ import { AXIS, DEFAULT_AXIS_IDS } from './axis.js';
 import { axisGetDimensionIds } from './axisGetDimensionIds.js';
 export const layoutGetAxisIdDimensionIdsObject = layout => DEFAULT_AXIS_IDS.reduce((obj, axisId) => {
   if (AXIS.isValid(layout[axisId])) {
-    obj[axisId] = axisGetDimensionIds(layout[axisId]);
+    obj[axisId] = axisGetDimensionIds(layout[axisId], layout.outputType);
   }
   return obj;
 }, {});

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

@@ -2,6 +2,6 @@ import { dimensionGetId } from './dimensionGetId.js';
 import { dimensionGetItemIds } from './dimensionGetItemIds.js';
 import { layoutGetAllDimensions } from './layoutGetAllDimensions.js';
 export const layoutGetDimensionIdItemIdsObject = layout => layoutGetAllDimensions(layout).reduce((obj, dimension) => {
-  obj[dimensionGetId(dimension)] = dimensionGetItemIds(dimension);
+  obj[dimensionGetId(dimension, layout.outputType)] = dimensionGetItemIds(dimension);
   return obj;
 }, {});

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

@@ -3,5 +3,5 @@ import { dimensionGetId } from './dimensionGetId.js';
 import { layoutGetAllDimensions } from './layoutGetAllDimensions.js';
 export const layoutHasDynamicDimension = layout => {
   const fixedIds = Object.keys(getPredefinedDimensions());
-  return Boolean(layoutGetAllDimensions(layout).find(dimension => !fixedIds.includes(dimensionGetId(dimension))));
+  return Boolean(layoutGetAllDimensions(layout).find(dimension => !fixedIds.includes(dimensionGetId(dimension, layout.outputType))));
 };

package/package.json

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