@dhis2/analytics 26.9.6 → 26.10.1

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

@@ -18,6 +18,8 @@
     "About this map": "",
     "About this line list": "",
     "About this visualization": "",
+    "About this event chart": "",
+    "About this event report": "",
     "This app could not retrieve required data.": "",
     "Network error": "网络错误",
     "Data / Edit calculation": "",
@@ -43,9 +45,58 @@
     "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}}": "",
     "All types": "",
     "Disaggregation": "分解",
     "No data": "无数据",
+    "Expression description": "表达式描述",
+    "Error loading value": "",
+    "None": "无",
+    "Data set(s)": "",
+    "Zero is significant": "",
+    "True": "真",
+    "False": "假",
+    "Value type": "值类型",
+    "Aggregation type": "汇总类型",
+    "Category combo": "分类组合",
+    "Option set": "值域选项集",
+    "Group membership": "",
+    "Legend set(s)": "",
+    "Category option name": "",
+    "Category combo name": "",
+    "Categories name": "",
+    "Period type": "周期类型",
+    "Indicators": "指标",
+    "Expiry days": "过期满天数",
+    "Type": "类型",
+    "Data element": "数据元",
+    "Tracked entity attribute": "跟踪实体属性",
+    "Numerator description": "描述",
+    "Numerator expression": "",
+    "Denominator description": "分母描述",
+    "Denominator expression": "",
+    "Annualized": "年度",
+    "Yes": "是",
+    "No": "否",
+    "Indicator type": "指标类型",
+    "Decimals in output": "",
+    "There was a problem loading information for this data item.": "",
+    "Name": "名称",
+    "Description": "描述",
+    "Code": "代码",
+    "ID": "ID",
+    "Last updated date": "",
+    "Created date": "",
+    "Created by": "创建自",
+    "Custom": "定制",
+    "Program": "项目",
+    "Analytics type": "分析类型",
+    "Enrollment": "报名",
+    "Event": "事件",
+    "Analytics period boundaries": "分析期间边界",
+    "{{ offsetPeriodType }} × {{ offsetPeriods }}": "",
+    "Expression": "表达式",
+    "Filter": "过滤器",
     "Search by data item name": "",
     "No items selected": "",
     "Selected Items": "",
@@ -53,10 +104,12 @@
     "No data sets found": "",
     "No event data items found": "",
     "No program indicators found": "",
+    "No calculations found": "",
     "No indicators found for \"{{- searchTerm}}\"": "",
     "No data sets found for \"{{- searchTerm}}\"": "",
     "No event data items found for \"{{- searchTerm}}\"": "",
     "No program indicators found for \"{{- searchTerm}}\"": "",
+    "No calculations found for \"{{- searchTerm}}\"": "",
     "Nothing found for \"{{- searchTerm}}\"": "",
     "Calculation": "",
     "Metric type": "",
@@ -94,8 +147,6 @@
     "Open in this app": "",
     "Close": "关闭",
     "Rename {{fileType}}": "",
-    "Name": "名称",
-    "Description": "描述",
     "Rename": "重命名",
     "{{- objectName}} (copy)": "",
     "Save {{fileType}} as": "",
@@ -123,24 +174,13 @@
     "View replies": "",
     "Unlike": "",
     "Like": "Like",
-    "Share": "分享",
     "See interpretation": "",
+    "Open in app": "",
+    "Share": "分享",
     "Manage sharing": "",
     "Could not update interpretation": "",
     "Enter interpretation text": "",
-    "Bold text": "",
-    "Italic text": "",
-    "Link to a URL": "",
-    "Mention a user": "",
-    "Add emoji": "",
-    "Preview": "预览",
-    "Back to write mode": "",
-    "Too many results. Try refining the search.": "",
-    "Search for a user": "",
-    "Searching for \"{{- searchText}}\"": "",
-    "No results found": "没有结果",
     "Not available offline": "",
-    "Created by": "创建自",
     "Anyone": "任何人",
     "Only you": "",
     "Others": "其它",
@@ -148,7 +188,6 @@
     "Filter by name": "按名称过滤",
     "Created": "已创建",
     "Last updated": "上次更新",
-    "Type": "类型",
     "Clear filters": "清除过滤器",
     "{{firstItemIndex}}-{{lastItemIndex}} of {{totalNumberOfItems}}": "",
     "Open": "打开",
@@ -191,13 +230,12 @@
     "Select a level": "选择一个等级",
     "Select a group": "",
     "Deselect all": "去全选",
-    "Period type": "周期类型",
     "Year": "年",
     "Select year": "选择年份",
     "Period": "周期",
+    "Selected Periods": "",
     "Relative periods": "",
     "Fixed periods": "",
-    "Selected Periods": "",
     "No periods selected": "",
     "Daily": "每日",
     "Weekly": "每周",
@@ -267,6 +305,14 @@
     "Six-months": "",
     "Financial Years": "",
     "Years": "年",
+    "Value: {{value}}": "",
+    "Bold text": "",
+    "Italic text": "",
+    "Link to a URL": "",
+    "Mention a user": "",
+    "Add emoji": "",
+    "Preview": "预览",
+    "Back to write mode": "",
     "Interpretations and details": "",
     "Translating to": "",
     "Choose a locale": "",
@@ -277,9 +323,12 @@
     "Cannot save while offline": "",
     "Could not load translations": "",
     "Retry": "",
+    "Too many results. Try refining the search.": "",
+    "Search for a user": "",
+    "Searching for \"{{- searchText}}\"": "",
+    "No results found": "没有结果",
     "Series": "",
     "Category": "分类",
-    "Filter": "过滤器",
     "Columns": "",
     "Rows": "",
     "Points": "",
@@ -288,16 +337,13 @@
     "Actual reports": "实际上报",
     "Actual reports on time": "实际准时上报",
     "Expected reports": "预期上报",
-    "Program": "项目",
     "Select a program": "",
-    "Indicators": "指标",
     "Indicator group": "指标组",
     "All groups": "",
     "Indicator": "指标",
     "No indicator groups found": "",
     "Loading indicator groups": "",
     "Data element group": "数据元组",
-    "Data element": "数据元",
     "No data element groups found": "",
     "Loading data element groups": "",
     "Data sets": "数据集",
@@ -346,9 +392,35 @@
     "{{thresholdFactor}} × Modified Z-score high": "",
     "{{thresholdFactor}} × Z-score low": "",
     "{{thresholdFactor}} × Z-score high": "",
+    "Not applicable": "",
     "Data": "数据",
     "Organisation unit": "机构",
     "Assigned Categories": "",
+    "Text": "文本",
+    "Long text": "长文本",
+    "Multi text": "",
+    "Letter": "字符",
+    "Phone number": "电话号码",
+    "Email": "邮件",
+    "Yes/No": "是/否",
+    "Yes Only": "仅是",
+    "Date": "日期",
+    "Date & Time": "日期 &时间",
+    "Time": "时间",
+    "Unit interval": "单位间隔",
+    "Percentage": "百分比",
+    "Integer": "整型",
+    "Positive Integer": "正数",
+    "Negative Integer": "负整数",
+    "Positive or Zero Integer": "正整数或零",
+    "Tracker Associate": "随访相关",
+    "Username": "用户名",
+    "Coordinate": "坐标",
+    "Reference": "引用",
+    "Age": "年龄",
+    "URL": "URL",
+    "Image": "图片(PNG)",
+    "GeoJSON": "GeoJSON",
     "Pivot table": "",
     "Area": "面积",
     "Stacked area": "",
@@ -365,6 +437,7 @@
     "Radar": "",
     "Scatter": "",
     "Single value": "",
+    "Outlier table": "",
     "All charts": "",
     "{{seriesName}} (trend)": "",
     "Trend": "",

package/build/cjs/modules/dimensionListItem.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTooltipText = exports.getIcon = void 0;
+exports.getIcon = exports.getDimensionType = void 0;
 var _ui = require("@dhis2/ui");
 var _react = _interopRequireDefault(require("react"));
 var _DataElementIcon = _interopRequireDefault(require("../assets/DimensionItemIcons/DataElementIcon.js"));
@@ -12,7 +12,7 @@ var _CalculationIcon = _interopRequireDefault(require("./../assets/DimensionItem
 var _dataSets = require("./dataSets.js");
 var _dataTypes = require("./dataTypes.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const getTooltipText = _ref => {
+const getDimensionType = _ref => {
   var _dataTypes$type;
   let {
     type,
@@ -33,7 +33,7 @@ const getTooltipText = _ref => {
       return (_dataTypes$type = _dataTypes.dataTypeMap[type]) === null || _dataTypes$type === void 0 ? void 0 : _dataTypes$type.getItemName();
   }
 };
-exports.getTooltipText = getTooltipText;
+exports.getDimensionType = getDimensionType;
 const getIcon = type => {
   switch (type) {
     case _dataTypes.DIMENSION_TYPE_INDICATOR:

package/build/cjs/modules/dimensionSelectorHelper.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TRANSFER_SELECTED_WIDTH = exports.TRANSFER_OPTIONS_WIDTH = exports.TRANSFER_HEIGHT = void 0;
-const TRANSFER_OPTIONS_WIDTH = exports.TRANSFER_OPTIONS_WIDTH = '420px';
-const TRANSFER_SELECTED_WIDTH = exports.TRANSFER_SELECTED_WIDTH = '298px';
+const TRANSFER_OPTIONS_WIDTH = exports.TRANSFER_OPTIONS_WIDTH = '520px';
+const TRANSFER_SELECTED_WIDTH = exports.TRANSFER_SELECTED_WIDTH = '520px';
 const TRANSFER_HEIGHT = exports.TRANSFER_HEIGHT = '512px';

package/build/cjs/modules/valueTypes.js

@@ -3,32 +3,71 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isNumericValueType = exports.isCumulativeValueType = exports.isBooleanValueType = exports.VALUE_TYPE_USERNAME = exports.VALUE_TYPE_URL = exports.VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_TRUE_ONLY = exports.VALUE_TYPE_TIME = exports.VALUE_TYPE_TEXT = exports.VALUE_TYPE_PHONE_NUMBER = exports.VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_ORGANISATION_UNIT = exports.VALUE_TYPE_NUMBER = exports.VALUE_TYPE_LONG_TEXT = exports.VALUE_TYPE_LETTER = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER = exports.VALUE_TYPE_EMAIL = exports.VALUE_TYPE_DATETIME = exports.VALUE_TYPE_DATE = exports.VALUE_TYPE_BOOLEAN = exports.VALUE_TYPE_AGE = void 0;
+exports.valueTypeDisplayNames = exports.isNumericValueType = exports.isCumulativeValueType = exports.isBooleanValueType = exports.VALUE_TYPE_USERNAME = exports.VALUE_TYPE_URL = exports.VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_TRUE_ONLY = exports.VALUE_TYPE_TRACKER_ASSOCIATE = exports.VALUE_TYPE_TIME = exports.VALUE_TYPE_TEXT = exports.VALUE_TYPE_REFERENCE = exports.VALUE_TYPE_PHONE_NUMBER = exports.VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_ORGANISATION_UNIT = exports.VALUE_TYPE_NUMBER = exports.VALUE_TYPE_MULTI_TEXT = exports.VALUE_TYPE_LONG_TEXT = exports.VALUE_TYPE_LETTER = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER = exports.VALUE_TYPE_IMAGE = exports.VALUE_TYPE_GEOJSON = exports.VALUE_TYPE_FILE_RESOURCE = exports.VALUE_TYPE_EMAIL = exports.VALUE_TYPE_DATETIME = exports.VALUE_TYPE_DATE = exports.VALUE_TYPE_COORDINATE = exports.VALUE_TYPE_BOOLEAN = exports.VALUE_TYPE_AGE = void 0;
+var _index = _interopRequireDefault(require("../locales/index.js"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /* These types match the types in the backend
   https://github.com/dhis2/dhis2-core/blob/master/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java
 */
 
-const VALUE_TYPE_NUMBER = exports.VALUE_TYPE_NUMBER = 'NUMBER';
-const VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_UNIT_INTERVAL = 'UNIT_INTERVAL';
-const VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_PERCENTAGE = 'PERCENTAGE';
-const VALUE_TYPE_INTEGER = exports.VALUE_TYPE_INTEGER = 'INTEGER';
-const VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = 'INTEGER_POSITIVE';
-const VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = 'INTEGER_NEGATIVE';
-const VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = 'INTEGER_ZERO_OR_POSITIVE';
 const VALUE_TYPE_TEXT = exports.VALUE_TYPE_TEXT = 'TEXT';
 const VALUE_TYPE_LONG_TEXT = exports.VALUE_TYPE_LONG_TEXT = 'LONG_TEXT';
+const VALUE_TYPE_MULTI_TEXT = exports.VALUE_TYPE_MULTI_TEXT = 'MULTI_TEXT';
 const VALUE_TYPE_LETTER = exports.VALUE_TYPE_LETTER = 'LETTER';
 const VALUE_TYPE_PHONE_NUMBER = exports.VALUE_TYPE_PHONE_NUMBER = 'PHONE_NUMBER';
 const VALUE_TYPE_EMAIL = exports.VALUE_TYPE_EMAIL = 'EMAIL';
-const VALUE_TYPE_USERNAME = exports.VALUE_TYPE_USERNAME = 'USERNAME';
-const VALUE_TYPE_URL = exports.VALUE_TYPE_URL = 'URL';
 const VALUE_TYPE_BOOLEAN = exports.VALUE_TYPE_BOOLEAN = 'BOOLEAN';
 const VALUE_TYPE_TRUE_ONLY = exports.VALUE_TYPE_TRUE_ONLY = 'TRUE_ONLY';
 const VALUE_TYPE_DATE = exports.VALUE_TYPE_DATE = 'DATE';
-const VALUE_TYPE_TIME = exports.VALUE_TYPE_TIME = 'TIME';
 const VALUE_TYPE_DATETIME = exports.VALUE_TYPE_DATETIME = 'DATETIME';
+const VALUE_TYPE_TIME = exports.VALUE_TYPE_TIME = 'TIME';
+const VALUE_TYPE_NUMBER = exports.VALUE_TYPE_NUMBER = 'NUMBER';
+const VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_UNIT_INTERVAL = 'UNIT_INTERVAL';
+const VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_PERCENTAGE = 'PERCENTAGE';
+const VALUE_TYPE_INTEGER = exports.VALUE_TYPE_INTEGER = 'INTEGER';
+const VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = 'INTEGER_POSITIVE';
+const VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = 'INTEGER_NEGATIVE';
+const VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = 'INTEGER_ZERO_OR_POSITIVE';
+const VALUE_TYPE_TRACKER_ASSOCIATE = exports.VALUE_TYPE_TRACKER_ASSOCIATE = 'TRACKER_ASSOCIATE';
+const VALUE_TYPE_USERNAME = exports.VALUE_TYPE_USERNAME = 'USERNAME';
+const VALUE_TYPE_COORDINATE = exports.VALUE_TYPE_COORDINATE = 'COORDINATE';
 const VALUE_TYPE_ORGANISATION_UNIT = exports.VALUE_TYPE_ORGANISATION_UNIT = 'ORGANISATION_UNIT';
+const VALUE_TYPE_REFERENCE = exports.VALUE_TYPE_REFERENCE = 'REFERENCE';
 const VALUE_TYPE_AGE = exports.VALUE_TYPE_AGE = 'AGE';
+const VALUE_TYPE_URL = exports.VALUE_TYPE_URL = 'URL';
+const VALUE_TYPE_FILE_RESOURCE = exports.VALUE_TYPE_FILE_RESOURCE = 'FILE_RESOURCE';
+const VALUE_TYPE_IMAGE = exports.VALUE_TYPE_IMAGE = 'IMAGE';
+const VALUE_TYPE_GEOJSON = exports.VALUE_TYPE_GEOJSON = 'GEOJSON';
+const valueTypeDisplayNames = exports.valueTypeDisplayNames = {
+  [VALUE_TYPE_TEXT]: _index.default.t('Text'),
+  [VALUE_TYPE_LONG_TEXT]: _index.default.t('Long text'),
+  [VALUE_TYPE_MULTI_TEXT]: _index.default.t('Multi text'),
+  [VALUE_TYPE_LETTER]: _index.default.t('Letter'),
+  [VALUE_TYPE_PHONE_NUMBER]: _index.default.t('Phone number'),
+  [VALUE_TYPE_EMAIL]: _index.default.t('Email'),
+  [VALUE_TYPE_BOOLEAN]: _index.default.t('Yes/No'),
+  [VALUE_TYPE_TRUE_ONLY]: _index.default.t('Yes Only'),
+  [VALUE_TYPE_DATE]: _index.default.t('Date'),
+  [VALUE_TYPE_DATETIME]: _index.default.t('Date & Time'),
+  [VALUE_TYPE_TIME]: _index.default.t('Time'),
+  [VALUE_TYPE_NUMBER]: _index.default.t('Number'),
+  [VALUE_TYPE_UNIT_INTERVAL]: _index.default.t('Unit interval'),
+  [VALUE_TYPE_PERCENTAGE]: _index.default.t('Percentage'),
+  [VALUE_TYPE_INTEGER]: _index.default.t('Integer'),
+  [VALUE_TYPE_INTEGER_POSITIVE]: _index.default.t('Positive Integer'),
+  [VALUE_TYPE_INTEGER_NEGATIVE]: _index.default.t('Negative Integer'),
+  [VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE]: _index.default.t('Positive or Zero Integer'),
+  [VALUE_TYPE_TRACKER_ASSOCIATE]: _index.default.t('Tracker Associate'),
+  [VALUE_TYPE_USERNAME]: _index.default.t('Username'),
+  [VALUE_TYPE_COORDINATE]: _index.default.t('Coordinate'),
+  [VALUE_TYPE_ORGANISATION_UNIT]: _index.default.t('Organisation unit'),
+  [VALUE_TYPE_REFERENCE]: _index.default.t('Reference'),
+  [VALUE_TYPE_AGE]: _index.default.t('Age'),
+  [VALUE_TYPE_URL]: _index.default.t('URL'),
+  [VALUE_TYPE_FILE_RESOURCE]: _index.default.t('File'),
+  [VALUE_TYPE_IMAGE]: _index.default.t('Image'),
+  [VALUE_TYPE_GEOJSON]: _index.default.t('GeoJSON')
+};
 const NUMERIC_VALUE_TYPES = [VALUE_TYPE_NUMBER, VALUE_TYPE_UNIT_INTERVAL, VALUE_TYPE_PERCENTAGE, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE];
 const BOOLEAN_VALUE_TYPES = [VALUE_TYPE_BOOLEAN, VALUE_TYPE_TRUE_ONLY];
 const CUMULATIVE_VALUE_TYPES = [VALUE_TYPE_NUMBER, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE, ...BOOLEAN_VALUE_TYPES];

package/build/es/__demo__/DataDimension.stories.js

@@ -0,0 +1,42 @@
+import { DataProvider } from '@dhis2/app-runtime';
+import { ConfigProvider } from '@dhis2/app-service-config';
+import React, { useState } from 'react';
+import DataDimension from '../components/DataDimension/DataDimension.js';
+const Wrapper = story => /*#__PURE__*/React.createElement(ConfigProvider, {
+  config: {
+    serverVersion: {
+      major: 2,
+      minor: 41
+    }
+  }
+}, /*#__PURE__*/React.createElement(DataProvider, {
+  baseUrl: "https://test.e2e.dhis2.org/analytics-41dev",
+  apiVersion: "41"
+}, story()));
+export default {
+  title: 'DataDimension',
+  decorators: [Wrapper]
+};
+export const NoneSelected = () => {
+  const [selected, setSelected] = useState([]);
+  return /*#__PURE__*/React.createElement(DataDimension, {
+    displayNameProp: "displayName",
+    selectedDimensions: selected,
+    onSelect: response => setSelected(response.items)
+  });
+};
+NoneSelected.story = {
+  name: 'None selected'
+};
+export const WithInfoBoxMessage = () => {
+  const [selected, setSelected] = useState([]);
+  return /*#__PURE__*/React.createElement(DataDimension, {
+    displayNameProp: "displayName",
+    selectedDimensions: selected,
+    onSelect: response => setSelected(response.items),
+    infoBoxMessage: 'Test message showing in the info box'
+  });
+};
+WithInfoBoxMessage.story = {
+  name: 'With info box message'
+};

package/build/es/api/dimensions.js

@@ -182,7 +182,7 @@ export const dataElementOperandsQuery = {
       page
     } = _ref10;
     const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === DIMENSION_TYPE_ALL ? 'id' : 'dimensionItem~rename(id)';
-    const filters = [];
+    const filters = ['categoryOptionCombo.name:ne:default'];
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== DIMENSION_TYPE_ALL) {
       filters.push(`dataElement.dataElementGroups.id:eq:${filter.group}`);
     }

package/build/es/api/expression.js

@@ -1,4 +1,4 @@
-export const validateExpressionMutation = {
+export const validateIndicatorExpressionMutation = {
   type: 'create',
   resource: 'indicators/expression/description',
   data: _ref => {
@@ -8,14 +8,24 @@ export const validateExpressionMutation = {
     return expression;
   }
 };
+export const validateProgramIndicatorExpressionMutation = {
+  type: 'create',
+  resource: 'programIndicators/expression/description',
+  data: _ref2 => {
+    let {
+      expression
+    } = _ref2;
+    return expression;
+  }
+};
 export const createCalculationMutation = {
   type: 'create',
   resource: 'expressionDimensionItems',
-  data: _ref2 => {
+  data: _ref3 => {
     let {
       name,
       expression
-    } = _ref2;
+    } = _ref3;
     return {
       name,
       shortName: name,
@@ -26,17 +36,17 @@ export const createCalculationMutation = {
 export const updateCalculationMutation = {
   type: 'json-patch',
   resource: 'expressionDimensionItems',
-  id: _ref3 => {
+  id: _ref4 => {
     let {
       id
-    } = _ref3;
+    } = _ref4;
     return id;
   },
-  data: _ref4 => {
+  data: _ref5 => {
     let {
       name,
       expression
-    } = _ref4;
+    } = _ref5;
     return [{
       op: 'add',
       path: '/name',
@@ -55,10 +65,10 @@ export const updateCalculationMutation = {
 export const deleteCalculationMutation = {
   type: 'delete',
   resource: 'expressionDimensionItems',
-  id: _ref5 => {
+  id: _ref6 => {
     let {
       id
-    } = _ref5;
+    } = _ref6;
     return id;
   }
 };

package/build/es/components/DataDimension/Calculation/CalculationModal.js

@@ -4,7 +4,7 @@ import { Button, Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Inp
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React, { useEffect, useState } from 'react';
-import { createCalculationMutation, deleteCalculationMutation, updateCalculationMutation, validateExpressionMutation } from '../../../api/expression.js';
+import { createCalculationMutation, deleteCalculationMutation, updateCalculationMutation, validateIndicatorExpressionMutation } from '../../../api/expression.js';
 import i18n from '../../../locales/index.js';
 import { parseExpressionToArray, parseArrayToExpression, validateExpression, EXPRESSION_TYPE_DATA, EXPRESSION_TYPE_NUMBER, INVALID_EXPRESSION, VALID_EXPRESSION, getItemIdsFromExpression } from '../../../modules/expressions.js';
 import { OfflineTooltip as Tooltip } from '../../OfflineTooltip.js';
@@ -42,7 +42,7 @@ const CalculationModal = _ref => {
   }] = useDataMutation(deleteCalculationMutation, mutationParams);
   const [doBackendValidation, {
     loading: isValidating
-  }] = useDataMutation(validateExpressionMutation, {
+  }] = useDataMutation(validateIndicatorExpressionMutation, {
     onError: error => showError(error)
   });
   const query = {

package/build/es/components/DataDimension/DataDimension.js

@@ -7,6 +7,7 @@ import ItemSelector from './ItemSelector.js';
 const DataDimensionCtx = /*#__PURE__*/createContext({});
 const DataDimension = _ref => {
   let {
+    currentUser,
     onSelect,
     selectedDimensions,
     displayNameProp,
@@ -40,7 +41,8 @@ const DataDimension = _ref => {
   useEffect(() => enabledDataTypes && setDataTypes(filterDataTypesByVersion(enabledDataTypes)), [enabledDataTypes, filterDataTypesByVersion]);
   return /*#__PURE__*/React.createElement(DataDimensionCtx.Provider, {
     value: {
-      visType
+      visType,
+      currentUser
     }
   }, /*#__PURE__*/React.createElement(ItemSelector, {
     selectedItems: selectedDimensions.map(item => ({
@@ -69,6 +71,7 @@ DataDimension.propTypes = {
     type: PropTypes.string
   })).isRequired,
   onSelect: PropTypes.func.isRequired,
+  currentUser: PropTypes.object,
   enabledDataTypes: PropTypes.array,
   infoBoxMessage: PropTypes.string,
   visType: PropTypes.string,

package/build/es/components/DataDimension/Info/CalculationInfo.js

@@ -0,0 +1,96 @@
+import _JSXStyle from "styled-jsx/style";
+import { useConfig, useDataMutation, useDataEngine } from '@dhis2/app-runtime';
+import PropTypes from 'prop-types';
+import React, { useCallback, useEffect, useState } from 'react';
+import { validateIndicatorExpressionMutation } from '../../../api/expression.js';
+import i18n from '../../../locales/index.js';
+import { getCommonFields, renderHumanReadableExpression, InfoTable } from './InfoTable.js';
+import styles from './styles/InfoPopover.style.js';
+const calculationQuery = {
+  calculation: {
+    resource: 'expressionDimensionItems',
+    id: _ref => {
+      let {
+        id
+      } = _ref;
+      return id;
+    },
+    params: _ref2 => {
+      let {
+        displayNameProp
+      } = _ref2;
+      return {
+        fields: `${getCommonFields(displayNameProp)},expression`
+      };
+    }
+  }
+};
+export const CalculationInfo = _ref3 => {
+  let {
+    type,
+    id,
+    displayNameProp
+  } = _ref3;
+  const [data, setData] = useState();
+  const [error, setError] = useState();
+  const [expressionError, setExpressionError] = useState();
+  const [loading, setLoading] = useState(true);
+  const {
+    baseUrl,
+    apiVersion
+  } = useConfig();
+  const engine = useDataEngine();
+  const [getHumanReadableExpression] = useDataMutation(validateIndicatorExpressionMutation, {
+    onError: setExpressionError
+  });
+  const fetchData = useCallback(async () => {
+    const {
+      calculation
+    } = await engine.query(calculationQuery, {
+      variables: {
+        id,
+        displayNameProp
+      },
+      onError: setError
+    });
+    if (calculation.expression) {
+      const result = await getHumanReadableExpression({
+        expression: calculation.expression
+      });
+      if (result) {
+        calculation.humanReadableExpression = result;
+      }
+    }
+
+    // inject href as it is not returned from the API
+    calculation.href = new URL(`${calculationQuery.calculation.resource}/${id}`, new URL(`api/${apiVersion}/`, baseUrl === '..' ? window.location.href.split('dhis-web-data-visualizer/')[0] : `${baseUrl}/`)).href;
+    setData({
+      calculation
+    });
+    setLoading(false);
+  }, [displayNameProp, engine, getHumanReadableExpression, id, apiVersion, baseUrl]);
+  useEffect(() => {
+    fetchData();
+  }, [fetchData]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(InfoTable, {
+    dataType: type,
+    data: data === null || data === void 0 ? void 0 : data.calculation,
+    loading: loading,
+    error: error
+  }, /*#__PURE__*/React.createElement("tr", {
+    className: `jsx-${styles.__hash}`
+  }, /*#__PURE__*/React.createElement("th", {
+    className: `jsx-${styles.__hash}`
+  }, i18n.t('Expression description')), /*#__PURE__*/React.createElement("td", {
+    className: `jsx-${styles.__hash}`
+  }, data !== null && data !== void 0 && data.calculation.humanReadableExpression ? renderHumanReadableExpression(data.calculation.humanReadableExpression) : /*#__PURE__*/React.createElement("span", {
+    className: `jsx-${styles.__hash}` + " " + "none"
+  }, expressionError ? i18n.t('Error loading value') : i18n.t('None'))))), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: styles.__hash
+  }, styles));
+};
+CalculationInfo.propTypes = {
+  displayNameProp: PropTypes.string,
+  id: PropTypes.string,
+  type: PropTypes.string
+};