@dhis2/analytics 24.10.0 → 25.0.0

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

@@ -3,19 +3,19 @@ import _JSXStyle from "styled-jsx/style";
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import { useDataEngine } from '@dhis2/app-runtime';
-import { Transfer, InputField, IconInfo16, IconDimensionDataSet16, IconDimensionIndicator16, IconDimensionEventDataItem16, IconDimensionProgramIndicator16 } from '@dhis2/ui';
+import { Transfer, InputField, IconInfo16, Button, IconAdd24 } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import { apiFetchOptions } from '../../api/dimensions.js';
-import DataElementIcon from '../../assets/DimensionItemIcons/DataElementIcon.js';
-import GenericIcon from '../../assets/DimensionItemIcons/GenericIcon.js';
 import i18n from '../../locales/index.js';
 import { DATA_SETS_CONSTANTS, REPORTING_RATE } from '../../modules/dataSets.js';
-import { dataTypeMap as dataTypes, DIMENSION_TYPE_ALL, DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_ELEMENT_OPERAND, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_INDICATOR, TOTALS, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, DIMENSION_TYPE_PROGRAM_ATTRIBUTE } from '../../modules/dataTypes.js';
+import { dataTypeMap as dataTypes, DIMENSION_TYPE_ALL, DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_INDICATOR, TOTALS, DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM } from '../../modules/dataTypes.js';
+import { getIcon, getTooltipText } from '../../modules/dimensionListItem.js';
 import { TRANSFER_HEIGHT, TRANSFER_OPTIONS_WIDTH, TRANSFER_SELECTED_WIDTH } from '../../modules/dimensionSelectorHelper.js';
 import { useDebounce, useDidUpdateEffect } from '../../modules/utils.js';
 import styles from '../styles/DimensionSelector.style.js';
 import { TransferOption } from '../TransferOption.js';
+import CalculationModal from './Calculation/CalculationModal.js';
 import DataTypeSelector from './DataTypeSelector.js';
 import GroupSelector from './GroupSelector.js';
 
@@ -30,7 +30,8 @@ const LeftHeader = _ref => {
     subGroup,
     setSubGroup,
     displayNameProp,
-    dataTest
+    dataTest,
+    supportsEDI
   } = _ref;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "jsx-".concat(styles.__hash) + " " + "leftHeader"
@@ -50,8 +51,9 @@ const LeftHeader = _ref => {
   }), /*#__PURE__*/React.createElement(DataTypeSelector, {
     currentDataType: dataType,
     onChange: setDataType,
-    dataTest: "".concat(dataTest, "-data-types-select-field")
-  }), dataTypes[dataType] && /*#__PURE__*/React.createElement(GroupSelector, {
+    dataTest: "".concat(dataTest, "-data-types-select-field"),
+    includeCalculations: supportsEDI
+  }), dataTypes[dataType] && dataType !== DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM && /*#__PURE__*/React.createElement(GroupSelector, {
     dataType: dataType,
     displayNameProp: displayNameProp,
     currentGroup: group,
@@ -74,7 +76,8 @@ LeftHeader.propTypes = {
   setGroup: PropTypes.func,
   setSearchTerm: PropTypes.func,
   setSubGroup: PropTypes.func,
-  subGroup: PropTypes.string
+  subGroup: PropTypes.string,
+  supportsEDI: PropTypes.bool
 };
 
 const EmptySelection = () => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
@@ -210,7 +213,9 @@ const ItemSelector = _ref5 => {
     rightFooter,
     displayNameProp,
     infoBoxMessage,
-    dataTest
+    dataTest,
+    supportsEDI,
+    onEDISave
   } = _ref5;
   const [state, setState] = useState({
     searchTerm: '',
@@ -221,6 +226,7 @@ const ItemSelector = _ref5 => {
     loading: true,
     nextPage: 1
   });
+  const [currentCalculation, setCurrentCalculation] = useState();
   const dataEngine = useDataEngine();
 
   const setSearchTerm = searchTerm => setState(state => ({ ...state,
@@ -231,7 +237,7 @@ const ItemSelector = _ref5 => {
     filter
   }));
 
-  const debouncedSearchTerm = useDebounce(state.searchTerm, 200);
+  const debouncedSearchTerm = useDebounce(state.searchTerm, 500);
 
   const fetchItems = async page => {
     var _result$dimensionItem;
@@ -255,7 +261,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 {
           DATA_SETS_CONSTANTS.forEach(metric => {
@@ -263,7 +270,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
             });
           });
         }
@@ -272,7 +280,8 @@ const ItemSelector = _ref5 => {
           label: item.name,
           value: item.id,
           disabled: item.disabled,
-          type: item.dimensionItemType
+          type: item.dimensionItemType,
+          expression: item.expression
         });
       }
     });
@@ -281,11 +290,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!
@@ -310,7 +319,10 @@ const ItemSelector = _ref5 => {
       return {
         value,
         label: matchingItem.label,
-        type: matchingItem.type
+        type: matchingItem.type,
+        ...(matchingItem.expression ? {
+          expression: matchingItem.expression
+        } : {})
       };
     }));
   };
@@ -332,55 +344,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;
-
-    switch (itemType) {
-      case DIMENSION_TYPE_DATA_ELEMENT_OPERAND:
-        return dataTypes[DIMENSION_TYPE_DATA_ELEMENT].getItemName();
+  const onSaveCalculation = async _ref6 => {
+    let {
+      id,
+      name,
+      expression,
+      isNew
+    } = _ref6;
+    onEDISave({
+      id,
+      name,
+      expression,
+      type: DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM
+    }); // close the modal
+
+    setCurrentCalculation(); // reload the list of options
 
-      case REPORTING_RATE:
-        return dataTypes[DIMENSION_TYPE_DATA_SET].getItemName();
-
-      case DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
-      case DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
-        return dataTypes[DIMENSION_TYPE_EVENT_DATA_ITEM].getItemName();
+    fetchItems(1);
 
-      default:
-        return (_dataTypes$itemType = dataTypes[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: DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM
+      }]);
     }
   };
 
-  const getIcon = itemType => {
-    switch (itemType) {
-      case DIMENSION_TYPE_INDICATOR:
-        return /*#__PURE__*/React.createElement(IconDimensionIndicator16, null);
+  const onDeleteCalculation = _ref7 => {
+    let {
+      id
+    } = _ref7;
+    // close the modal
+    setCurrentCalculation(); // reload the list of options
 
-      case DIMENSION_TYPE_DATA_ELEMENT_OPERAND:
-      case DIMENSION_TYPE_DATA_ELEMENT:
-        return DataElementIcon;
+    fetchItems(1); // unselect the deleted calculation
 
-      case REPORTING_RATE:
-        return /*#__PURE__*/React.createElement(IconDimensionDataSet16, null);
-
-      case DIMENSION_TYPE_EVENT_DATA_ITEM:
-      case DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
-      case DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
-        return /*#__PURE__*/React.createElement(IconDimensionEventDataItem16, null);
-
-      case DIMENSION_TYPE_PROGRAM_INDICATOR:
-        return /*#__PURE__*/React.createElement(IconDimensionProgramIndicator16, null);
-
-      default:
-        return GenericIcon;
-    }
+    onSelect([...selectedItems.filter(item => item.value !== id)]);
   };
 
-  return /*#__PURE__*/React.createElement(Transfer, {
-    onChange: _ref6 => {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Transfer, {
+    onChange: _ref8 => {
       let {
         selected
-      } = _ref6;
+      } = _ref8;
       return onChange(selected);
     },
     selected: selectedItems.map(item => item.value),
@@ -420,8 +429,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.createElement("div", {
+      className: "jsx-".concat(styles.__hash) + " " + "calculation-button"
+    }, /*#__PURE__*/React.createElement(Button, {
+      icon: /*#__PURE__*/React.createElement(IconAdd24, null),
+      onClick: () => setCurrentCalculation({}),
+      small: true
+    }, i18n.t('Calculation'))) : undefined,
     enableOrderChange: true,
     height: TRANSFER_HEIGHT,
     optionsWidth: TRANSFER_OPTIONS_WIDTH,
@@ -431,20 +448,38 @@ const ItemSelector = _ref5 => {
       infoText: infoBoxMessage
     }),
     rightFooter: rightFooter,
-    renderOption: props => /*#__PURE__*/React.createElement(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 === 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.createElement(TransferOption
+      /* eslint-disable react/prop-types */
+      , _extends({}, props, {
+        active: isActive(props.value),
+        icon: getIcon(getItemType(props.value)),
+        tooltipText: getTooltipText({
+          type: getItemType(props.value),
+          expression: props.expression
+        }),
+        dataTest: "".concat(dataTest, "-transfer-option"),
+        onEditClick: getItemType(props.value) === 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.createElement(CalculationModal, {
+    calculation: currentCalculation,
+    onSave: onSaveCalculation,
+    onClose: () => setCurrentCalculation(),
+    onDelete: onDeleteCalculation,
+    displayNameProp: displayNameProp
+  }), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: styles.__hash
+  }, styles));
 };
 
 ItemSelector.propTypes = {
@@ -458,8 +493,11 @@ ItemSelector.propTypes = {
     label: PropTypes.string.isRequired,
     value: PropTypes.string.isRequired,
     isActive: PropTypes.bool,
-    type: PropTypes.string
-  }))
+    type: PropTypes.string,
+    expression: PropTypes.string
+  })),
+  supportsEDI: PropTypes.bool,
+  onEDISave: PropTypes.func
 };
 ItemSelector.defaultProps = {
   selectedItems: []

package/build/es/components/TransferOption.js

@@ -1,5 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
-import { Tooltip } from '@dhis2/ui';
+import { Tooltip, IconEdit16 } from '@dhis2/ui';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
@@ -16,10 +16,12 @@ export const TransferOption = _ref => {
     icon,
     active,
     tooltipText,
-    dataTest
+    dataTest,
+    onEditClick
   } = _ref;
 
   const renderContent = () => /*#__PURE__*/React.createElement("div", {
+    "data-test": "".concat(dataTest, "-content"),
     onClick: event => {
       if (disabled) {
         return;
@@ -40,7 +42,6 @@ export const TransferOption = _ref => {
         value
       }, event);
     },
-    "data-test": "".concat(dataTest, "-content"),
     className: "jsx-".concat(styles.__hash) + " " + (cx('chip', {
       highlighted,
       disabled,
@@ -51,7 +52,14 @@ export const TransferOption = _ref => {
     className: "jsx-".concat(styles.__hash) + " " + "icon"
   }, icon), /*#__PURE__*/React.createElement("span", {
     className: "jsx-".concat(styles.__hash) + " " + "label"
-  }, label), /*#__PURE__*/React.createElement(_JSXStyle, {
+  }, label), onEditClick && /*#__PURE__*/React.createElement("span", {
+    onClick: e => {
+      e.stopPropagation();
+      onEditClick();
+    },
+    "data-test": "".concat(dataTest, "-edit-button"),
+    className: "jsx-".concat(styles.__hash) + " " + "edit"
+  }, /*#__PURE__*/React.createElement(IconEdit16, null)), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));
 
@@ -78,5 +86,6 @@ TransferOption.propTypes = {
   selected: PropTypes.bool,
   tooltipText: PropTypes.string,
   onClick: PropTypes.func,
-  onDoubleClick: PropTypes.func
+  onDoubleClick: PropTypes.func,
+  onEditClick: PropTypes.func
 };

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

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

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

@@ -1,4 +1,4 @@
 import { colors, spacers, theme } from '@dhis2/ui';
-const _defaultExport = [".wrapper.jsx-3199850788:last-child{margin-bottom:".concat(spacers.dp4, ";}"), ".chip.jsx-3199850788{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;background:".concat(colors.grey200, ";font-size:14px;line-height:16px;padding:2px ").concat(spacers.dp8, " 2px ").concat(spacers.dp4, ";margin:").concat(spacers.dp4, " ").concat(spacers.dp8, " 0 ").concat(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(colors.grey300, ";}"), ".selected.jsx-3199850788{background:".concat(theme.secondary100, ";color:").concat(theme.secondary900, ";}"), ".selected.jsx-3199850788 .icon path{fill:".concat(theme.secondary700, ";}"), ".selected.jsx-3199850788:hover{background:#c9edeb;}", ".highlighted.jsx-3199850788,.highlighted.jsx-3199850788:hover{background:".concat(theme.secondary800, ";color:").concat(colors.white, ";}"), ".highlighted.jsx-3199850788 .icon path{fill:".concat(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(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(spacers.dp4, ";}"), ".chip.jsx-1302852599{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;background:".concat(colors.grey200, ";font-size:14px;line-height:16px;padding:2px ").concat(spacers.dp8, " 2px ").concat(spacers.dp4, ";margin:").concat(spacers.dp4, " ").concat(spacers.dp8, " 0 ").concat(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(colors.grey300, ";}"), ".selected.jsx-1302852599{background:".concat(theme.secondary100, ";color:").concat(theme.secondary900, ";}"), ".selected.jsx-1302852599 .icon path{fill:".concat(theme.secondary700, ";}"), ".selected.jsx-1302852599:hover{background:#c9edeb;}", ".highlighted.jsx-1302852599,.highlighted.jsx-1302852599:hover{background:".concat(theme.secondary800, ";color:").concat(colors.white, ";}"), ".highlighted.jsx-1302852599 .icon path{fill:".concat(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(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(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";
 export default _defaultExport;

package/build/es/index.js

@@ -95,4 +95,4 @@ export { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYSAT, WEEKLYSUN, WEEKS_THIS_Y
 export { getRelativePeriodsOptionsById } from './components/PeriodDimension/utils/relativePeriods.js';
 export { getFixedPeriodsOptionsById } from './components/PeriodDimension/utils/fixedPeriods.js';
 export { default as VisualizationOptions } from './components/Options/VisualizationOptions.js';
-export { DIMENSION_TYPE_INDICATOR, DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, DIMENSION_TYPE_PROGRAM_ATTRIBUTE, DIMENSION_TYPE_DATA_ELEMENT_OPERAND, DIMENSION_TYPE_CATEGORY, DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET, DIMENSION_TYPE_ALL, DIMENSION_TYPE_DATA, DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET, DIMENSION_TYPE_ORGANISATION_UNIT, DIMENSION_TYPE_PERIOD, DIMENSION_TYPE_ORGANISATION_UNIT_GROUP_SET } from './modules/dataTypes.js';
+export { DIMENSION_TYPE_INDICATOR, DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, DIMENSION_TYPE_PROGRAM_ATTRIBUTE, DIMENSION_TYPE_DATA_ELEMENT_OPERAND, DIMENSION_TYPE_CATEGORY, DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET, DIMENSION_TYPE_ALL, DIMENSION_TYPE_DATA, DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET, DIMENSION_TYPE_ORGANISATION_UNIT, DIMENSION_TYPE_PERIOD, DIMENSION_TYPE_ORGANISATION_UNIT_GROUP_SET, DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM } from './modules/dataTypes.js';

package/build/es/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",

package/build/es/modules/__tests__/expressions.spec.js

@@ -0,0 +1,136 @@
+import { validateExpression, parseArrayToExpression, parseExpressionToArray, EXPRESSION_TYPE_DATA, EXPRESSION_TYPE_NUMBER, EXPRESSION_TYPE_OPERATOR, INVALID_EXPRESSION, getItemIdsFromExpression } from '../expressions.js';
+const invalidTestExpressions = [{
+  message: 'Formula is empty. Add items to the formula from the lists on the left.',
+  expressions: ['']
+}, // {
+//     message: 'Consecutive math operators',
+//     expressions: ['5+-', '5+++', '4+9-*', '5++9'],
+// },
+{
+  message: 'Consecutive data elements',
+  expressions: ['#{cYeuwXTCPkU}#{Jtf34kNZhzP}']
+}, {
+  message: 'Starts or ends with a math operator',
+  expressions: ['+', '+1', '1-2/', '*((#{cYeuwXTCPkU}*#{Jtf34kNZhzP})))']
+}, {
+  message: 'Empty parentheses',
+  expressions: ['#{cYeuwXTCPkU}*()']
+}, {
+  message: 'Missing left parenthesis (',
+  expressions: [')', '5)', '((#{cYeuwXTCPkU}*#{P3jJH5Tu5VC.S34ULMcHMca})))']
+}, {
+  message: 'Missing right parenthesis )',
+  expressions: ['(', '(5', '((#{cYeuwXTCPkU}*#{Jtf34kNZhzP})']
+}];
+const validTestExpressions = ['5+9', '((#{cYeuwXTCPkU}*#{Jtf34kNZhzP}))#{iKGjnOOaPlE}', '#{P3jJH5Tu5VC.S34ULMcHMca}*#{Jtf34kNZhzP}', '(5)+9', '(5+9)', '10/-5'];
+describe('validateExpression', () => {
+  invalidTestExpressions.forEach(_ref => {
+    let {
+      expressions,
+      message
+    } = _ref;
+    expressions.forEach(exp => {
+      test("Fails: ".concat(message), () => {
+        expect(validateExpression(exp)).toEqual({
+          status: INVALID_EXPRESSION,
+          message
+        });
+      });
+    });
+  });
+  validTestExpressions.forEach(exp => {
+    test("Passes validation: ".concat(exp), () => {
+      expect(validateExpression(exp)).toEqual(undefined);
+    });
+  });
+});
+describe('parseArrayToExpression', () => {
+  test('exp 1', () => {
+    const expressionArray = [{
+      label: 'abc123',
+      value: '#{abc123}',
+      type: EXPRESSION_TYPE_DATA
+    }, {
+      label: '+',
+      value: '+',
+      type: EXPRESSION_TYPE_OPERATOR
+    }, {
+      label: 'def456.xyz999',
+      value: '#{def456.xyz999}',
+      type: EXPRESSION_TYPE_DATA
+    }, {
+      label: '/',
+      value: '/',
+      type: EXPRESSION_TYPE_OPERATOR
+    }, {
+      label: '10',
+      value: '10',
+      type: EXPRESSION_TYPE_NUMBER
+    }];
+    const expected = '#{abc123}+#{def456.xyz999}/10';
+    expect(parseArrayToExpression(expressionArray)).toEqual(expected);
+  });
+});
+describe('parseExpressionToArray', () => {
+  test('exp 1', () => {
+    const expression = '#{abc123}/10*99';
+    const expected = [{
+      label: 'abc123',
+      value: '#{abc123}',
+      type: EXPRESSION_TYPE_DATA
+    }, {
+      label: '/',
+      value: '/',
+      type: EXPRESSION_TYPE_OPERATOR
+    }, {
+      label: '10',
+      value: '10',
+      type: EXPRESSION_TYPE_NUMBER
+    }, {
+      label: '×',
+      value: '*',
+      type: EXPRESSION_TYPE_OPERATOR
+    }, {
+      label: '99',
+      value: '99',
+      type: EXPRESSION_TYPE_NUMBER
+    }];
+    expect(parseExpressionToArray(expression)).toEqual(expected);
+  });
+});
+describe('getItemIdsFromExpression', () => {
+  test('exp 1', () => {
+    const expression = '#{abc123}/10*99';
+    const expected = ['abc123'];
+    expect(getItemIdsFromExpression(expression)).toEqual(expected);
+  });
+  test('exp 2', () => {
+    const expression = '#{abc123}/10*#{def456}';
+    const expected = ['abc123', 'def456'];
+    expect(getItemIdsFromExpression(expression)).toEqual(expected);
+  });
+  test('exp 3', () => {
+    const expression = '#{abc123}/10*#{def456.xyz999}';
+    const expected = ['abc123', 'def456.xyz999'];
+    expect(getItemIdsFromExpression(expression)).toEqual(expected);
+  });
+  test('exp 4', () => {
+    const expression = '#{abc123}/10*#{def456.xyz999}+#{ghi789}';
+    const expected = ['abc123', 'def456.xyz999', 'ghi789'];
+    expect(getItemIdsFromExpression(expression)).toEqual(expected);
+  });
+  test('exp 5', () => {
+    const expression = '#{abc123}/10*#{def456.xyz999}+#{ghi789}+#{jkl000}';
+    const expected = ['abc123', 'def456.xyz999', 'ghi789', 'jkl000'];
+    expect(getItemIdsFromExpression(expression)).toEqual(expected);
+  });
+  test('exp 6', () => {
+    const expression = '5/10';
+    const expected = [];
+    expect(getItemIdsFromExpression(expression)).toEqual(expected);
+  });
+  test('exp 6', () => {
+    const expected = [];
+    expect(getItemIdsFromExpression()).toEqual(expected);
+  });
+});