@dhis2/analytics 24.10.0 → 25.0.0

package/build/cjs/components/DataDimension/DataDimension.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _appRuntime = require("@dhis2/app-runtime");
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -20,15 +22,21 @@ const DataDimension = _ref => {
     onSelect,
     selectedDimensions,
     displayNameProp,
-    infoBoxMessage
+    infoBoxMessage,
+    onCalculationSave
   } = _ref;
+  const {
+    serverVersion
+  } = (0, _appRuntime.useConfig)();
+  const supportsEDI = "".concat(serverVersion.major, ".").concat(serverVersion.minor, ".").concat(serverVersion.patch || 0) >= '2.40.0';
 
   const onSelectItems = selectedItem => onSelect({
     dimensionId: _predefinedDimensions.DIMENSION_ID_DATA,
     items: selectedItem.map(item => ({
       id: item.value,
       name: item.label,
-      type: item.type
+      type: item.type,
+      expression: item.expression
     }))
   });
 
@@ -37,23 +45,31 @@ const DataDimension = _ref => {
       value: item.id,
       label: item.name,
       isActive: item.isActive,
-      type: item.type
+      type: item.type,
+      expression: item.expression,
+      access: item.access
     })),
     onSelect: onSelectItems,
     displayNameProp: displayNameProp,
     infoBoxMessage: infoBoxMessage,
-    dataTest: 'data-dimension'
+    dataTest: 'data-dimension',
+    supportsEDI: supportsEDI,
+    onEDISave: onCalculationSave
   });
 };
 
 DataDimension.propTypes = {
   displayNameProp: _propTypes.default.string.isRequired,
   selectedDimensions: _propTypes.default.arrayOf(_propTypes.default.shape({
+    expression: _propTypes.default.string,
     id: _propTypes.default.string,
-    name: _propTypes.default.string
+    isActive: _propTypes.default.bool,
+    name: _propTypes.default.string,
+    type: _propTypes.default.string
   })).isRequired,
   onSelect: _propTypes.default.func.isRequired,
-  infoBoxMessage: _propTypes.default.string
+  infoBoxMessage: _propTypes.default.string,
+  onCalculationSave: _propTypes.default.func
 };
 DataDimension.defaultProps = {
   selectedDimensions: [],

package/build/cjs/components/DataDimension/DataTypeSelector.js

@@ -27,7 +27,8 @@ const DataTypeSelector = _ref => {
   let {
     currentDataType,
     onChange,
-    dataTest
+    dataTest,
+    includeCalculations
   } = _ref;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-".concat(_DataTypeSelectorStyle.default.__hash) + " " + "container"
@@ -42,7 +43,7 @@ const DataTypeSelector = _ref => {
     key: _dataTypes.DIMENSION_TYPE_ALL,
     label: _index.default.t('All types'),
     dataTest: "".concat(dataTest, "-option-all")
-  }), Object.values(_dataTypes.dataTypeMap).map(type => /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
+  }), Object.values(_dataTypes.dataTypeMap).filter(type => type.id !== _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM || includeCalculations).map(type => /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
     value: type.id,
     key: type.id,
     label: type.getName(),
@@ -55,7 +56,8 @@ const DataTypeSelector = _ref => {
 DataTypeSelector.propTypes = {
   currentDataType: _propTypes.default.string.isRequired,
   onChange: _propTypes.default.func.isRequired,
-  dataTest: _propTypes.default.string
+  dataTest: _propTypes.default.string,
+  includeCalculations: _propTypes.default.bool
 };
 var _default = DataTypeSelector;
 exports.default = _default;

package/build/cjs/components/DataDimension/ItemSelector.js

@@ -17,16 +17,14 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _dimensions = require("../../api/dimensions.js");
 
-var _DataElementIcon = _interopRequireDefault(require("../../assets/DimensionItemIcons/DataElementIcon.js"));
-
-var _GenericIcon = _interopRequireDefault(require("../../assets/DimensionItemIcons/GenericIcon.js"));
-
 var _index = _interopRequireDefault(require("../../locales/index.js"));
 
 var _dataSets = require("../../modules/dataSets.js");
 
 var _dataTypes = require("../../modules/dataTypes.js");
 
+var _dimensionListItem = require("../../modules/dimensionListItem.js");
+
 var _dimensionSelectorHelper = require("../../modules/dimensionSelectorHelper.js");
 
 var _utils = require("../../modules/utils.js");
@@ -35,6 +33,8 @@ var _DimensionSelectorStyle = _interopRequireDefault(require("../styles/Dimensio
 
 var _TransferOption = require("../TransferOption.js");
 
+var _CalculationModal = _interopRequireDefault(require("./Calculation/CalculationModal.js"));
+
 var _DataTypeSelector = _interopRequireDefault(require("./DataTypeSelector.js"));
 
 var _GroupSelector = _interopRequireDefault(require("./GroupSelector.js"));
@@ -58,7 +58,8 @@ const LeftHeader = _ref => {
     subGroup,
     setSubGroup,
     displayNameProp,
-    dataTest
+    dataTest,
+    supportsEDI
   } = _ref;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-".concat(_DimensionSelectorStyle.default.__hash) + " " + "leftHeader"
@@ -78,8 +79,9 @@ const LeftHeader = _ref => {
   }), /*#__PURE__*/_react.default.createElement(_DataTypeSelector.default, {
     currentDataType: dataType,
     onChange: setDataType,
-    dataTest: "".concat(dataTest, "-data-types-select-field")
-  }), _dataTypes.dataTypeMap[dataType] && /*#__PURE__*/_react.default.createElement(_GroupSelector.default, {
+    dataTest: "".concat(dataTest, "-data-types-select-field"),
+    includeCalculations: supportsEDI
+  }), _dataTypes.dataTypeMap[dataType] && dataType !== _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM && /*#__PURE__*/_react.default.createElement(_GroupSelector.default, {
     dataType: dataType,
     displayNameProp: displayNameProp,
     currentGroup: group,
@@ -102,7 +104,8 @@ LeftHeader.propTypes = {
   setGroup: _propTypes.default.func,
   setSearchTerm: _propTypes.default.func,
   setSubGroup: _propTypes.default.func,
-  subGroup: _propTypes.default.string
+  subGroup: _propTypes.default.string,
+  supportsEDI: _propTypes.default.bool
 };
 
 const EmptySelection = () => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
@@ -238,7 +241,9 @@ const ItemSelector = _ref5 => {
     rightFooter,
     displayNameProp,
     infoBoxMessage,
-    dataTest
+    dataTest,
+    supportsEDI,
+    onEDISave
   } = _ref5;
   const [state, setState] = (0, _react.useState)({
     searchTerm: '',
@@ -249,6 +254,7 @@ const ItemSelector = _ref5 => {
     loading: true,
     nextPage: 1
   });
+  const [currentCalculation, setCurrentCalculation] = (0, _react.useState)();
   const dataEngine = (0, _appRuntime.useDataEngine)();
 
   const setSearchTerm = searchTerm => setState(state => ({ ...state,
@@ -259,7 +265,7 @@ const ItemSelector = _ref5 => {
     filter
   }));
 
-  const debouncedSearchTerm = (0, _utils.useDebounce)(state.searchTerm, 200);
+  const debouncedSearchTerm = (0, _utils.useDebounce)(state.searchTerm, 500);
 
   const fetchItems = async page => {
     var _result$dimensionItem;
@@ -284,7 +290,8 @@ const ItemSelector = _ref5 => {
             label: "".concat(item.name, " - ").concat(metric.getName()),
             value: "".concat(item.id, ".").concat(metric.id),
             disabled: item.disabled,
-            type: item.dimensionItemType
+            type: item.dimensionItemType,
+            expression: item.expression
           });
         } else {
           _dataSets.DATA_SETS_CONSTANTS.forEach(metric => {
@@ -292,7 +299,8 @@ const ItemSelector = _ref5 => {
               label: "".concat(item.name, " - ").concat(metric.getName()),
               value: "".concat(item.id, ".").concat(metric.id),
               disabled: item.disabled,
-              type: item.dimensionItemType
+              type: item.dimensionItemType,
+              expression: item.expression
             });
           });
         }
@@ -301,7 +309,8 @@ const ItemSelector = _ref5 => {
           label: item.name,
           value: item.id,
           disabled: item.disabled,
-          type: item.dimensionItemType
+          type: item.dimensionItemType,
+          expression: item.expression
         });
       }
     });
@@ -310,11 +319,11 @@ const ItemSelector = _ref5 => {
       options: page > 1 ? [...state.options, ...newOptions] : newOptions,
       nextPage: result.nextPage
     }));
-    /*  The following handles a very specific edge-case where the user can select all items from a 
-        page and then reopen the modal. Usually Transfer triggers the onEndReached when the end of 
-        the page is reached (scrolling down) or if too few items are on the left side (e.g. selecting 
-        49 items from page 1, leaving only 1 item on the left side). However, due to the way Transfer 
-        works, if 0 items are available, more items are fetched, but all items are already selected 
+    /*  The following handles a very specific edge-case where the user can select all items from a
+        page and then reopen the modal. Usually Transfer triggers the onEndReached when the end of
+        the page is reached (scrolling down) or if too few items are on the left side (e.g. selecting
+        49 items from page 1, leaving only 1 item on the left side). However, due to the way Transfer
+        works, if 0 items are available, more items are fetched, but all items are already selected
         (leaving 0 items on the left side still), the onReachedEnd won't trigger. Hence the code below:
         IF there is a next page AND some options were just fetched AND you have the same or more
         selected items than fetched items AND all fetched items are already selected -> fetch more!
@@ -339,7 +348,10 @@ const ItemSelector = _ref5 => {
       return {
         value,
         label: matchingItem.label,
-        type: matchingItem.type
+        type: matchingItem.type,
+        ...(matchingItem.expression ? {
+          expression: matchingItem.expression
+        } : {})
       };
     }));
   };
@@ -361,55 +373,52 @@ const ItemSelector = _ref5 => {
     return (_find = [...state.options, ...selectedItems].find(item => item.value === value)) === null || _find === void 0 ? void 0 : _find.type;
   };
 
-  const getTooltipText = itemType => {
-    var _dataTypes$itemType;
+  const onSaveCalculation = async _ref6 => {
+    let {
+      id,
+      name,
+      expression,
+      isNew
+    } = _ref6;
+    onEDISave({
+      id,
+      name,
+      expression,
+      type: _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM
+    }); // close the modal
+
+    setCurrentCalculation(); // reload the list of options
 
-    switch (itemType) {
-      case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT_OPERAND:
-        return _dataTypes.dataTypeMap[_dataTypes.DIMENSION_TYPE_DATA_ELEMENT].getItemName();
-
-      case _dataSets.REPORTING_RATE:
-        return _dataTypes.dataTypeMap[_dataTypes.DIMENSION_TYPE_DATA_SET].getItemName();
-
-      case _dataTypes.DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
-      case _dataTypes.DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
-        return _dataTypes.dataTypeMap[_dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM].getItemName();
+    fetchItems(1);
 
-      default:
-        return (_dataTypes$itemType = _dataTypes.dataTypeMap[itemType]) === null || _dataTypes$itemType === void 0 ? void 0 : _dataTypes$itemType.getItemName();
+    if (isNew) {
+      // select the new calculation
+      onSelect([...selectedItems, {
+        value: id,
+        label: name,
+        expression,
+        type: _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM
+      }]);
     }
   };
 
-  const getIcon = itemType => {
-    switch (itemType) {
-      case _dataTypes.DIMENSION_TYPE_INDICATOR:
-        return /*#__PURE__*/_react.default.createElement(_ui.IconDimensionIndicator16, null);
+  const onDeleteCalculation = _ref7 => {
+    let {
+      id
+    } = _ref7;
+    // close the modal
+    setCurrentCalculation(); // reload the list of options
 
-      case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT_OPERAND:
-      case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT:
-        return _DataElementIcon.default;
+    fetchItems(1); // unselect the deleted calculation
 
-      case _dataSets.REPORTING_RATE:
-        return /*#__PURE__*/_react.default.createElement(_ui.IconDimensionDataSet16, null);
-
-      case _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM:
-      case _dataTypes.DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
-      case _dataTypes.DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
-        return /*#__PURE__*/_react.default.createElement(_ui.IconDimensionEventDataItem16, null);
-
-      case _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR:
-        return /*#__PURE__*/_react.default.createElement(_ui.IconDimensionProgramIndicator16, null);
-
-      default:
-        return _GenericIcon.default;
-    }
+    onSelect([...selectedItems.filter(item => item.value !== id)]);
   };
 
-  return /*#__PURE__*/_react.default.createElement(_ui.Transfer, {
-    onChange: _ref6 => {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ui.Transfer, {
+    onChange: _ref8 => {
       let {
         selected
-      } = _ref6;
+      } = _ref8;
       return onChange(selected);
     },
     selected: selectedItems.map(item => item.value),
@@ -449,8 +458,16 @@ const ItemSelector = _ref5 => {
       searchTerm: state.searchTerm,
       setSearchTerm: setSearchTerm,
       displayNameProp: displayNameProp,
-      dataTest: "".concat(dataTest, "-left-header")
+      dataTest: "".concat(dataTest, "-left-header"),
+      supportsEDI: supportsEDI
     }),
+    leftFooter: supportsEDI ? /*#__PURE__*/_react.default.createElement("div", {
+      className: "jsx-".concat(_DimensionSelectorStyle.default.__hash) + " " + "calculation-button"
+    }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
+      icon: /*#__PURE__*/_react.default.createElement(_ui.IconAdd24, null),
+      onClick: () => setCurrentCalculation({}),
+      small: true
+    }, _index.default.t('Calculation'))) : undefined,
     enableOrderChange: true,
     height: _dimensionSelectorHelper.TRANSFER_HEIGHT,
     optionsWidth: _dimensionSelectorHelper.TRANSFER_OPTIONS_WIDTH,
@@ -460,20 +477,38 @@ const ItemSelector = _ref5 => {
       infoText: infoBoxMessage
     }),
     rightFooter: rightFooter,
-    renderOption: props => /*#__PURE__*/_react.default.createElement(_TransferOption.TransferOption, _extends({}, props, {
-      active: isActive(props.value
-      /* eslint-disable-line react/prop-types */
-      ),
-      icon: getIcon(getItemType(props.value
-      /* eslint-disable-line react/prop-types */
-      )),
-      tooltipText: state.filter.dataType === _dataTypes.DIMENSION_TYPE_ALL ? getTooltipText(getItemType(props.value
-      /* eslint-disable-line react/prop-types */
-      )) : undefined,
-      dataTest: "".concat(dataTest, "-transfer-option")
-    })),
+    renderOption: props => {
+      var _props$access;
+
+      return /*#__PURE__*/_react.default.createElement(_TransferOption.TransferOption
+      /* eslint-disable react/prop-types */
+      , _extends({}, props, {
+        active: isActive(props.value),
+        icon: (0, _dimensionListItem.getIcon)(getItemType(props.value)),
+        tooltipText: (0, _dimensionListItem.getTooltipText)({
+          type: getItemType(props.value),
+          expression: props.expression
+        }),
+        dataTest: "".concat(dataTest, "-transfer-option"),
+        onEditClick: getItemType(props.value) === _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM && !(((_props$access = props.access) === null || _props$access === void 0 ? void 0 : _props$access.write) === false) && supportsEDI ? () => setCurrentCalculation({
+          id: props.value,
+          name: props.label,
+          expression: props.expression
+        }) : undefined
+        /* eslint-enable react/prop-types */
+
+      }));
+    },
     dataTest: "".concat(dataTest, "-transfer")
-  });
+  }), currentCalculation && supportsEDI && /*#__PURE__*/_react.default.createElement(_CalculationModal.default, {
+    calculation: currentCalculation,
+    onSave: onSaveCalculation,
+    onClose: () => setCurrentCalculation(),
+    onDelete: onDeleteCalculation,
+    displayNameProp: displayNameProp
+  }), /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: _DimensionSelectorStyle.default.__hash
+  }, _DimensionSelectorStyle.default));
 };
 
 ItemSelector.propTypes = {
@@ -487,8 +522,11 @@ ItemSelector.propTypes = {
     label: _propTypes.default.string.isRequired,
     value: _propTypes.default.string.isRequired,
     isActive: _propTypes.default.bool,
-    type: _propTypes.default.string
-  }))
+    type: _propTypes.default.string,
+    expression: _propTypes.default.string
+  })),
+  supportsEDI: _propTypes.default.bool,
+  onEDISave: _propTypes.default.func
 };
 ItemSelector.defaultProps = {
   selectedItems: []

package/build/cjs/components/TransferOption.js

@@ -31,10 +31,12 @@ const TransferOption = _ref => {
     icon,
     active,
     tooltipText,
-    dataTest
+    dataTest,
+    onEditClick
   } = _ref;
 
   const renderContent = () => /*#__PURE__*/_react.default.createElement("div", {
+    "data-test": "".concat(dataTest, "-content"),
     onClick: event => {
       if (disabled) {
         return;
@@ -55,7 +57,6 @@ const TransferOption = _ref => {
         value
       }, event);
     },
-    "data-test": "".concat(dataTest, "-content"),
     className: "jsx-".concat(_TransferOptionStyle.default.__hash) + " " + ((0, _classnames.default)('chip', {
       highlighted,
       disabled,
@@ -66,7 +67,14 @@ const TransferOption = _ref => {
     className: "jsx-".concat(_TransferOptionStyle.default.__hash) + " " + "icon"
   }, icon), /*#__PURE__*/_react.default.createElement("span", {
     className: "jsx-".concat(_TransferOptionStyle.default.__hash) + " " + "label"
-  }, label), /*#__PURE__*/_react.default.createElement(_style.default, {
+  }, label), onEditClick && /*#__PURE__*/_react.default.createElement("span", {
+    onClick: e => {
+      e.stopPropagation();
+      onEditClick();
+    },
+    "data-test": "".concat(dataTest, "-edit-button"),
+    className: "jsx-".concat(_TransferOptionStyle.default.__hash) + " " + "edit"
+  }, /*#__PURE__*/_react.default.createElement(_ui.IconEdit16, null)), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _TransferOptionStyle.default.__hash
   }, _TransferOptionStyle.default));
 
@@ -95,5 +103,6 @@ TransferOption.propTypes = {
   selected: _propTypes.default.bool,
   tooltipText: _propTypes.default.string,
   onClick: _propTypes.default.func,
-  onDoubleClick: _propTypes.default.func
+  onDoubleClick: _propTypes.default.func,
+  onEditClick: _propTypes.default.func
 };

package/build/cjs/components/styles/DimensionSelector.style.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _ui = require("@dhis2/ui");
 
-const _defaultExport = [".filterContainer.jsx-2057111968{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:".concat(_ui.spacers.dp12, ";margin-top:").concat(_ui.spacers.dp8, ";}"), ".emptyList.jsx-2057111968{text-align:center;font-size:14px;line-height:16px;margin:".concat(_ui.spacers.dp24, " 0 0;color:").concat(_ui.colors.grey700, ";}"), ".rightHeader.jsx-2057111968{font-size:14px;font-weight:400;}", ".leftHeader.jsx-2057111968{padding:".concat(_ui.spacers.dp12, " ").concat(_ui.spacers.dp4, ";}"), ".info-container.jsx-2057111968{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:".concat(_ui.spacers.dp8, ";padding:").concat(_ui.spacers.dp8, ";background-color:").concat(_ui.colors.grey200, ";border-radius:3px;}"), ".info-text.jsx-2057111968{padding-left:".concat(_ui.spacers.dp8, ";color:").concat(_ui.colors.grey900, ";font-size:12px;line-height:16px;}")];
-_defaultExport.__hash = "2057111968";
+const _defaultExport = [".filterContainer.jsx-336728173{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:".concat(_ui.spacers.dp12, ";margin-top:").concat(_ui.spacers.dp8, ";}"), ".emptyList.jsx-336728173{text-align:center;font-size:14px;line-height:16px;margin:".concat(_ui.spacers.dp24, " 0 0;color:").concat(_ui.colors.grey700, ";}"), ".rightHeader.jsx-336728173{font-size:14px;font-weight:400;}", ".leftHeader.jsx-336728173{padding:".concat(_ui.spacers.dp12, " ").concat(_ui.spacers.dp4, ";}"), ".info-container.jsx-336728173{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:".concat(_ui.spacers.dp8, ";padding:").concat(_ui.spacers.dp8, ";background-color:").concat(_ui.colors.grey200, ";border-radius:3px;}"), ".info-text.jsx-336728173{padding-left:".concat(_ui.spacers.dp8, ";color:").concat(_ui.colors.grey900, ";font-size:12px;line-height:16px;}"), ".calculation-button.jsx-336728173{margin:".concat(_ui.spacers.dp8, " 0;}")];
+_defaultExport.__hash = "336728173";
 var _default = _defaultExport;
 exports.default = _default;

package/build/cjs/components/styles/TransferOption.style.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _ui = require("@dhis2/ui");
 
-const _defaultExport = [".wrapper.jsx-3199850788:last-child{margin-bottom:".concat(_ui.spacers.dp4, ";}"), ".chip.jsx-3199850788{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;background:".concat(_ui.colors.grey200, ";font-size:14px;line-height:16px;padding:2px ").concat(_ui.spacers.dp8, " 2px ").concat(_ui.spacers.dp4, ";margin:").concat(_ui.spacers.dp4, " ").concat(_ui.spacers.dp8, " 0 ").concat(_ui.spacers.dp8, ";border-radius:3px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}"), ".chip.jsx-3199850788:hover{background:".concat(_ui.colors.grey300, ";}"), ".selected.jsx-3199850788{background:".concat(_ui.theme.secondary100, ";color:").concat(_ui.theme.secondary900, ";}"), ".selected.jsx-3199850788 .icon path{fill:".concat(_ui.theme.secondary700, ";}"), ".selected.jsx-3199850788:hover{background:#c9edeb;}", ".highlighted.jsx-3199850788,.highlighted.jsx-3199850788:hover{background:".concat(_ui.theme.secondary800, ";color:").concat(_ui.colors.white, ";}"), ".highlighted.jsx-3199850788 .icon path{fill:".concat(_ui.colors.white, ";}"), ".disabled.jsx-3199850788{opacity:0.3;cursor:not-allowed;}", ".inactive.jsx-3199850788{opacity:0.3;}", ".icon.jsx-3199850788,.label.jsx-3199850788{line-height:18px;}", ".icon.jsx-3199850788{margin-right:".concat(_ui.spacers.dp4, ";display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;vertical-align:text-bottom;padding-top:1px;}"), ".label.jsx-3199850788{font-size:14px;}"];
-_defaultExport.__hash = "3199850788";
+const _defaultExport = [".wrapper.jsx-1302852599:last-child{margin-bottom:".concat(_ui.spacers.dp4, ";}"), ".chip.jsx-1302852599{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;background:".concat(_ui.colors.grey200, ";font-size:14px;line-height:16px;padding:2px ").concat(_ui.spacers.dp8, " 2px ").concat(_ui.spacers.dp4, ";margin:").concat(_ui.spacers.dp4, " ").concat(_ui.spacers.dp8, " 0 ").concat(_ui.spacers.dp8, ";border-radius:3px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}"), ".chip.jsx-1302852599:hover{background:".concat(_ui.colors.grey300, ";}"), ".selected.jsx-1302852599{background:".concat(_ui.theme.secondary100, ";color:").concat(_ui.theme.secondary900, ";}"), ".selected.jsx-1302852599 .icon path{fill:".concat(_ui.theme.secondary700, ";}"), ".selected.jsx-1302852599:hover{background:#c9edeb;}", ".highlighted.jsx-1302852599,.highlighted.jsx-1302852599:hover{background:".concat(_ui.theme.secondary800, ";color:").concat(_ui.colors.white, ";}"), ".highlighted.jsx-1302852599 .icon path{fill:".concat(_ui.colors.white, ";}"), ".disabled.jsx-1302852599{opacity:0.3;cursor:not-allowed;}", ".inactive.jsx-1302852599{opacity:0.3;}", ".icon.jsx-1302852599,.label.jsx-1302852599{line-height:18px;}", ".icon.jsx-1302852599{margin-right:".concat(_ui.spacers.dp4, ";display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;vertical-align:text-bottom;padding-top:1px;}"), ".label.jsx-1302852599{font-size:14px;}", ".edit.jsx-1302852599{height:16px;margin-top:1px;margin-left:".concat(_ui.spacers.dp8, ";cursor:pointer;}"), ".edit.jsx-1302852599:hover{background-color:rgba(0,0,0,0.12);outline:1px solid rgba(0,0,0,0.12);border-radius:3px;}", ".highlighted.jsx-1302852599 .edit.jsx-1302852599:hover{background-color:rgba(255,255,255,0.12);outline:1px solid rgba(255,255,255,0.12);}"];
+_defaultExport.__hash = "1302852599";
 var _default = _defaultExport;
 exports.default = _default;

package/build/cjs/index.js

@@ -231,6 +231,12 @@ Object.defineProperty(exports, "DIMENSION_TYPE_EVENT_DATA_ITEM", {
     return _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM;
   }
 });
+Object.defineProperty(exports, "DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM;
+  }
+});
 Object.defineProperty(exports, "DIMENSION_TYPE_INDICATOR", {
   enumerable: true,
   get: function () {

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

@@ -21,27 +21,45 @@
     "About this visualization": "About this visualization",
     "This app could not retrieve required data.": "This app could not retrieve required data.",
     "Network error": "Network error",
-    "Data Type": "Data Type",
-    "All types": "All types",
+    "Data / Edit calculation": "Data / Edit calculation",
+    "Data / New calculation": "Data / New calculation",
+    "Remove item": "Remove item",
+    "Check formula": "Check formula",
+    "Calculation name": "Calculation name",
+    "Shown in table headers and chart axes/legends": "Shown in table headers and chart axes/legends",
+    "Delete calculation": "Delete calculation",
+    "Cancel": "Cancel",
+    "The calculation can only be saved with a valid formula": "The calculation can only be saved with a valid formula",
+    "Add a name to save this calculation": "Add a name to save this calculation",
+    "Save calculation": "Save calculation",
+    "Are you sure you want to delete this calculation? It may be used by other visualizations.": "Are you sure you want to delete this calculation? It may be used by other visualizations.",
+    "Yes, delete": "Yes, delete",
     "Totals only": "Totals only",
     "Details only": "Details only",
+    "Loading": "Loading",
+    "Data elements": "Data elements",
+    "Search by data element name": "Search by data element name",
+    "No data elements found for \"{{- searchTerm}}\"": "No data elements found for \"{{- searchTerm}}\"",
+    "No data elements found": "No data elements found",
+    "Drag items here, or double click in the list, to start building a calculation formula": "Drag items here, or double click in the list, to start building a calculation formula",
+    "Math operators": "Math operators",
+    "Data Type": "Data Type",
+    "All types": "All types",
     "Disaggregation": "Disaggregation",
     "No data": "No data",
-    "Loading": "Loading",
     "Search by data item name": "Search by data item name",
     "No items selected": "No items selected",
     "Selected Items": "Selected Items",
     "No indicators found": "No indicators found",
-    "No data elements found": "No data elements found",
     "No data sets found": "No data sets found",
     "No event data items found": "No event data items found",
     "No program indicators found": "No program indicators found",
     "No indicators found for \"{{- searchTerm}}\"": "No indicators found for \"{{- searchTerm}}\"",
-    "No data elements found for \"{{- searchTerm}}\"": "No data elements found for \"{{- searchTerm}}\"",
     "No data sets found for \"{{- searchTerm}}\"": "No data sets found for \"{{- searchTerm}}\"",
     "No event data items found for \"{{- searchTerm}}\"": "No event data items found for \"{{- searchTerm}}\"",
     "No program indicators found for \"{{- searchTerm}}\"": "No program indicators found for \"{{- searchTerm}}\"",
     "Nothing found for \"{{- searchTerm}}\"": "Nothing found for \"{{- searchTerm}}\"",
+    "Calculation": "Calculation",
     "Metric type": "Metric type",
     "All metrics": "All metrics",
     "Move to {{axisName}}": "Move to {{axisName}}",
@@ -63,7 +81,6 @@
     "Nothing found for {{- searchTerm}}": "Nothing found for {{- searchTerm}}",
     "Delete {{fileType}}": "Delete {{fileType}}",
     "This {{fileType}} and related interpretations will be deleted. Continue?": "This {{fileType}} and related interpretations will be deleted. Continue?",
-    "Cancel": "Cancel",
     "Delete": "Delete",
     "File": "File",
     "New": "New",
@@ -278,7 +295,6 @@
     "Indicator": "Indicator",
     "No indicator groups found": "No indicator groups found",
     "Loading indicator groups": "Loading indicator groups",
-    "Data elements": "Data elements",
     "Data element group": "Data element group",
     "Data element": "Data element",
     "No data element groups found": "No data element groups found",
@@ -294,6 +310,15 @@
     "Loading programs": "Loading programs",
     "Program indicators": "Program indicators",
     "Program indicator": "Program indicator",
+    "Calculations": "Calculations",
+    "Number": "Number",
+    "Formula is empty. Add items to the formula from the lists on the left.": "Formula is empty. Add items to the formula from the lists on the left.",
+    "Consecutive math operators": "Consecutive math operators",
+    "Consecutive data elements": "Consecutive data elements",
+    "Starts or ends with a math operator": "Starts or ends with a math operator",
+    "Empty parentheses": "Empty parentheses",
+    "Missing right parenthesis )": "Missing right parenthesis )",
+    "Missing left parenthesis (": "Missing left parenthesis (",
     "Extra Small": "Extra Small",
     "Small": "Small",
     "Regular": "Regular",