@dhis2/analytics 24.10.0 → 25.0.0

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

@@ -0,0 +1,207 @@
+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 { Tooltip } from '@dhis2/ui';
+import { useSortable } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+import cx from 'classnames';
+import PropTypes from 'prop-types';
+import React, { useState, useRef, useEffect } from 'react';
+import { DIMENSION_TYPE_DATA_ELEMENT } from '../../../modules/dataTypes.js';
+import { getIcon } from '../../../modules/dimensionListItem.js';
+import { EXPRESSION_TYPE_NUMBER, EXPRESSION_TYPE_DATA } from '../../../modules/expressions.js';
+import DragHandleIcon from './DragHandleIcon.js';
+import styles from './styles/FormulaItem.style.js';
+const BEFORE = 'BEFORE';
+const AFTER = 'AFTER';
+const maxMsBetweenClicks = 300;
+const TAG_INPUT = 'INPUT';
+
+const FormulaItem = _ref => {
+  let {
+    id,
+    label,
+    value = '',
+    type,
+    isLast,
+    isHighlighted,
+    overLastDropZone,
+    onChange,
+    onClick,
+    onDoubleClick,
+    hasFocus
+  } = _ref;
+  const {
+    attributes,
+    listeners,
+    index,
+    isDragging,
+    over,
+    active,
+    setNodeRef,
+    transform,
+    transition
+  } = useSortable({
+    id,
+    data: {
+      label,
+      type,
+      value
+    }
+  });
+  const inputRef = useRef(null);
+  const [clickTimeoutId, setClickTimeoutId] = useState(null);
+  useEffect(() => {
+    if (hasFocus && inputRef.current) {
+      // setTimeout seems to be needed in order for the cursor
+      // to remain in the input. Without it, the cursor disappears
+      // even though the input still has the focus.
+      setTimeout(() => {
+        inputRef.current.focus();
+      }, 50);
+    }
+  }, [inputRef, hasFocus]);
+  const activeIndex = (active === null || active === void 0 ? void 0 : active.data.current.sortable.index) || -1;
+  const style = transform ? {
+    transform: active ? undefined : CSS.Translate.toString({
+      x: transform.x,
+      y: transform.y,
+      scaleX: 1,
+      scaleY: 1
+    }),
+    transition
+  } : undefined;
+  let insertPosition;
+
+  if ((over === null || over === void 0 ? void 0 : over.id) === id) {
+    // This item is being hovered over by the item being dragged
+    if (activeIndex === -1) {
+      //The item being dragged came from the expression options
+      // so we will insert after
+      insertPosition = AFTER;
+    } else {
+      // The item being dragged is being moved in the formula
+      // so if the item is before the item being dragged, use the
+      // BEFORE position. Otherwise use the AFTER position
+      insertPosition = index > activeIndex ? AFTER : BEFORE;
+    }
+  } else if (isLast && overLastDropZone) {
+    insertPosition = AFTER;
+  }
+
+  const handleClick = e => {
+    const tagname = e.target.tagName;
+    clearTimeout(clickTimeoutId);
+    const to = setTimeout(function () {
+      if (tagname !== TAG_INPUT) {
+        onClick(id);
+      } else {
+        inputRef.current && inputRef.current.focus();
+      }
+    }, maxMsBetweenClicks);
+    setClickTimeoutId(to);
+  };
+
+  const handleDoubleClick = e => {
+    clearTimeout(clickTimeoutId);
+    setClickTimeoutId(null);
+
+    if (e.target.tagName !== TAG_INPUT) {
+      onDoubleClick(id);
+    } else {
+      inputRef.current && inputRef.current.focus();
+    }
+  };
+
+  const handleChange = e => onChange({
+    itemId: id,
+    value: e.target.value
+  });
+
+  const getContent = () => {
+    if (type === EXPRESSION_TYPE_NUMBER) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "jsx-".concat(styles.__hash) + " " + (cx('content', 'number', {
+          highlighted: isHighlighted
+        }) || "")
+      }, DragHandleIcon, /*#__PURE__*/React.createElement("span", {
+        className: "jsx-".concat(styles.__hash) + " " + "number-positioner"
+      }, /*#__PURE__*/React.createElement("span", {
+        "aria-hidden": "true",
+        className: "jsx-".concat(styles.__hash) + " " + "number-width"
+      }, value), /*#__PURE__*/React.createElement("input", {
+        id: id,
+        name: label,
+        onChange: handleChange,
+        value: value,
+        type: "number",
+        ref: inputRef,
+        className: "jsx-".concat(styles.__hash) + " " + "input"
+      })), /*#__PURE__*/React.createElement(_JSXStyle, {
+        id: styles.__hash
+      }, styles));
+    }
+
+    if (type === EXPRESSION_TYPE_DATA) {
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        content: label,
+        placement: "bottom"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "jsx-".concat(styles.__hash) + " " + (cx('content', 'data', {
+          highlighted: isHighlighted
+        }) || "")
+      }, /*#__PURE__*/React.createElement("span", {
+        className: "jsx-".concat(styles.__hash) + " " + "icon"
+      }, getIcon(DIMENSION_TYPE_DATA_ELEMENT)), /*#__PURE__*/React.createElement("span", {
+        className: "jsx-".concat(styles.__hash) + " " + "label"
+      }, label), /*#__PURE__*/React.createElement(_JSXStyle, {
+        id: styles.__hash
+      }, styles)));
+    }
+
+    return /*#__PURE__*/React.createElement("div", {
+      className: "jsx-".concat(styles.__hash) + " " + (cx('content', 'operator', {
+        highlighted: isHighlighted
+      }) || "")
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "jsx-".concat(styles.__hash) + " " + "label"
+    }, label), /*#__PURE__*/React.createElement(_JSXStyle, {
+      id: styles.__hash
+    }, styles));
+  };
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    ref: setNodeRef,
+    style: style,
+    className: "jsx-".concat(styles.__hash) + " " + (cx({
+      'last-item': isLast
+    }) || "")
+  }, /*#__PURE__*/React.createElement("div", _extends({}, attributes, listeners, {
+    onClick: handleClick,
+    onDoubleClick: handleDoubleClick,
+    "data-test": "formula-item-".concat(id),
+    className: "jsx-".concat(styles.__hash) + " " + (cx('formula-item', {
+      inactive: !isDragging,
+      insertBefore: insertPosition === BEFORE,
+      insertAfter: insertPosition === AFTER
+    }) || "")
+  }), getContent())), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: styles.__hash
+  }, styles));
+};
+
+FormulaItem.propTypes = {
+  id: PropTypes.string.isRequired,
+  label: PropTypes.string.isRequired,
+  type: PropTypes.string.isRequired,
+  onChange: PropTypes.func.isRequired,
+  onClick: PropTypes.func.isRequired,
+  onDoubleClick: PropTypes.func.isRequired,
+  hasFocus: PropTypes.bool,
+  isHighlighted: PropTypes.bool,
+  isLast: PropTypes.bool,
+  overLastDropZone: PropTypes.bool,
+  value: PropTypes.string
+};
+export default FormulaItem;

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

@@ -0,0 +1,41 @@
+import _JSXStyle from "styled-jsx/style";
+import PropTypes from 'prop-types';
+import React from 'react';
+import i18n from '../../../locales/index.js';
+import { getOperators } from '../../../modules/expressions.js';
+import DraggableOperator from './Operator.js';
+import styles from './styles/MathOperatorSelector.style.js';
+
+const MathOperatorSelector = _ref => {
+  let {
+    onDoubleClick
+  } = _ref;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "jsx-".concat(styles.__hash) + " " + "wrapper"
+  }, /*#__PURE__*/React.createElement("h4", {
+    className: "jsx-".concat(styles.__hash) + " " + "sub-header"
+  }, i18n.t('Math operators')), /*#__PURE__*/React.createElement("div", {
+    className: "jsx-".concat(styles.__hash) + " " + "operators"
+  }, getOperators().map((_ref2, index) => {
+    let {
+      label,
+      value,
+      type
+    } = _ref2;
+    return /*#__PURE__*/React.createElement(DraggableOperator, {
+      key: "".concat(label, "-").concat(index),
+      label: label,
+      value: value,
+      type: type,
+      index: index,
+      onDoubleClick: onDoubleClick
+    });
+  }))), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: styles.__hash
+  }, styles));
+};
+
+MathOperatorSelector.propTypes = {
+  onDoubleClick: PropTypes.func.isRequired
+};
+export default MathOperatorSelector;

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

@@ -0,0 +1,64 @@
+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 { useSortable } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+import cx from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { EXPRESSION_TYPE_NUMBER, EXPRESSION_TYPE_OPERATOR } from '../../../modules/expressions.js';
+import formulaItemStyles from './styles/FormulaItem.style.js';
+import styles from './styles/Operator.style.js';
+
+const Operator = _ref => {
+  let {
+    label,
+    value,
+    type,
+    onDoubleClick
+  } = _ref;
+  const data = {
+    label,
+    value,
+    type
+  };
+  const {
+    attributes,
+    listeners,
+    setNodeRef,
+    transform
+  } = useSortable({
+    id: "operator-".concat(label),
+    data
+  });
+  const style = {
+    transform: CSS.Translate.toString(transform)
+  };
+  return /*#__PURE__*/React.createElement("div", _extends({}, attributes, listeners, {
+    ref: setNodeRef,
+    style: style,
+    className: "jsx-".concat(formulaItemStyles.__hash, " jsx-").concat(styles.__hash) + " " + (listeners && listeners.className != null && listeners.className || attributes && attributes.className != null && attributes.className || "")
+  }), /*#__PURE__*/React.createElement("div", {
+    "data-test": "operator",
+    onDoubleClick: () => onDoubleClick(data),
+    className: "jsx-".concat(formulaItemStyles.__hash, " jsx-").concat(styles.__hash) + " " + (cx('content', {
+      operator: type === EXPRESSION_TYPE_OPERATOR,
+      number: type === EXPRESSION_TYPE_NUMBER
+    }) || "")
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "jsx-".concat(formulaItemStyles.__hash, " jsx-").concat(styles.__hash)
+  }, label)), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: formulaItemStyles.__hash
+  }, formulaItemStyles), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: styles.__hash
+  }, styles));
+};
+
+Operator.propTypes = {
+  label: PropTypes.string.isRequired,
+  type: PropTypes.string.isRequired,
+  value: PropTypes.string.isRequired,
+  onDoubleClick: PropTypes.func.isRequired
+};
+export default Operator;

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

@@ -0,0 +1,4 @@
+import { colors, spacers } from '@dhis2/ui';
+const _defaultExport = [".header.jsx-1005744271{background:".concat(colors.grey200, ";padding:").concat(spacers.dp16, ";font-weight:normal;}"), ".header-icon.jsx-1005744271{padding:0 ".concat(spacers.dp8, ";vertical-align:text-bottom;line-height:14px;}"), ".actions-wrapper.jsx-1005744271{margin-top:".concat(spacers.dp16, ";margin-bottom:").concat(spacers.dp16, ";margin-left:").concat(spacers.dp4, ";}"), ".button-container.jsx-1005744271{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;}", ".validate-button.jsx-1005744271{margin-bottom:".concat(spacers.dp4, ";}"), ".remove-button.jsx-1005744271{margin-right:".concat(spacers.dp8, ";}"), ".delete-button.jsx-1005744271{margin-right:".concat(spacers.dp8, ";}"), ".content.jsx-1005744271{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}", ".left-section.jsx-1005744271{width:45%;}", ".right-section.jsx-1005744271{width:55%;padding-left:".concat(spacers.dp8, ";font-size:14px;}"), ".validation-message.jsx-1005744271{margin-left:".concat(spacers.dp8, ";}"), ".validation-error.jsx-1005744271{color:".concat(colors.red500, ";}"), ".validation-success.jsx-1005744271{color:".concat(colors.green500, ";}"), ".name-input.jsx-1005744271{margin-top:".concat(spacers.dp12, ";}")];
+_defaultExport.__hash = "1005744271";
+export default _defaultExport;

package/build/es/components/DataDimension/Calculation/styles/DataElementOption.style.js

@@ -0,0 +1,4 @@
+import { spacers, colors } from '@dhis2/ui';
+const _defaultExport = [".wrapper.jsx-2286537164{margin-top:".concat(spacers.dp4, ";}"), ".wrapper.jsx-2286537164:last-child{margin-bottom:".concat(spacers.dp4, ";}"), ".draggable-item.jsx-2286537164{cursor:pointer;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;}", ".chip.jsx-2286537164{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;background:".concat(colors.grey200, ";font-size:14px;padding:2px ").concat(spacers.dp8, " 2px 2px;border-radius:3px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}"), ".chip.jsx-2286537164:hover{background:".concat(colors.grey300, ";}"), ".icon.jsx-2286537164,.label.jsx-2286537164{line-height:18px;}", ".icon.jsx-2286537164{margin-right:2px;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;vertical-align:text-bottom;padding-top:1px;}"];
+_defaultExport.__hash = "2286537164";
+export default _defaultExport;

package/build/es/components/DataDimension/Calculation/styles/DataElementSelector.style.js

@@ -0,0 +1,4 @@
+import { colors, spacers } from '@dhis2/ui';
+const _defaultExport = [".dimension-list-container.jsx-4262244129{position:relative;}", ".dimension-list-scrollbox.jsx-4262244129{position:relative;width:100%;height:337px;overflow:hidden;overflow-y:auto;border:1px solid ".concat(colors.grey400, ";}"), ".dimension-list-scroller.jsx-4262244129{position:relative;min-height:1px;padding:0 ".concat(spacers.dp4, ";}"), ".dimension-list-scroller.loading.jsx-4262244129{-webkit-filter:blur(2px);filter:blur(2px);}", ".scroll-detector.jsx-4262244129{boxsizing:border-box;width:100%;height:100px;position:absolute;bottom:0;left:0;z-index:-1;}", ".dimension-list-overlay.jsx-4262244129{position:absolute;width:100%;height:100%;z-index:2;top:0;left:0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".filter-wrapper.jsx-4262244129{padding:".concat(spacers.dp8, ";border:1px solid ").concat(colors.grey400, ";border-bottom:0;}"), ".selector-wrapper.jsx-4262244129{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:".concat(spacers.dp4, ";}"), ".sub-header.jsx-4262244129{font-size:14px;font-weight:normal;margin:0 0 ".concat(spacers.dp4, ";}"), ".group-select.jsx-4262244129{width:50%;margin-top:".concat(spacers.dp4, ";}"), ".empty-list.jsx-4262244129{text-align:center;font-size:14px;line-height:16px;margin:".concat(spacers.dp24, " 0 0;color:").concat(colors.grey700, ";}")];
+_defaultExport.__hash = "4262244129";
+export default _defaultExport;

package/build/es/components/DataDimension/Calculation/styles/DraggingItem.style.js

@@ -0,0 +1,4 @@
+import { colors, spacers } from '@dhis2/ui';
+const _defaultExport = [".dragging.jsx-2818590818{border:2px solid ".concat(colors.blue500, ";cursor:-webkit-grab;cursor:-moz-grab;cursor:grab;}"), ".number.jsx-2818590818{padding:0 ".concat(spacers.dp8, ";}")];
+_defaultExport.__hash = "2818590818";
+export default _defaultExport;

package/build/es/components/DataDimension/Calculation/styles/DropZone.style.js

@@ -0,0 +1,4 @@
+import { colors } from '@dhis2/ui';
+const _defaultExport = [".first-dropzone.jsx-3773517794{position:absolute;top:0;left:0;z-index:-1;width:24px;height:28px;background-color:transparent;}", ".dragging-over.jsx-3773517794{z-index:100;}", ".empty.jsx-3773517794{position:relative;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;z-index:100;margin-left:-10px;margin-top:-4px;}", ".dragging-over.jsx-3773517794::before,.dragging-over.jsx-3773517794::after{content:'';position:absolute;}", ".dragging-over.jsx-3773517794::before{top:10px;width:4px;left:4px;height:18px;background-color:".concat(colors.blue500, ";}"), ".dragging-over.jsx-3773517794::after{top:0;left:0;width:12px;height:12px;border:4px solid ".concat(colors.blue500, ";background:transparent;border-radius:12px;}")];
+_defaultExport.__hash = "3773517794";
+export default _defaultExport;

package/build/es/components/DataDimension/Calculation/styles/FormulaField.style.js

@@ -0,0 +1,4 @@
+import { colors, spacers } from '@dhis2/ui';
+const _defaultExport = [".formula-field.jsx-926760428{border-right:2px solid ".concat(colors.grey200, ";height:180px;overflow:auto;padding:6px 12px;position:relative;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;-webkit-align-content:flex-start;-ms-flex-line-pack:start;align-content:flex-start;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;gap:").concat(spacers.dp4, " ").concat(spacers.dp8, ";width:100%;}"), ".container.jsx-926760428{position:relative;}", ".border.jsx-926760428{position:absolute;top:0;left:6px;height:180px;width:calc(100% - 6px);border-left:2px solid ".concat(colors.grey200, ";border-top:2px solid ").concat(colors.grey200, ";border-bottom:2px solid ").concat(colors.grey200, ";}"), ".placeholder.jsx-926760428{height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;gap:".concat(spacers.dp8, ";-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;margin-top:-28px;padding:0 ").concat(spacers.dp32, ";}"), ".help-text.jsx-926760428{color:".concat(colors.grey600, ";font-size:14px;line-height:19px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}")];
+_defaultExport.__hash = "926760428";
+export default _defaultExport;

package/build/es/components/DataDimension/Calculation/styles/FormulaItem.style.js

@@ -0,0 +1,4 @@
+import { colors, spacers, theme } from '@dhis2/ui';
+const _defaultExport = [".formula-item.jsx-255634210{position:relative;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:-webkit-fit-content;width:-moz-fit-content;width:fit-content;}", ".formula-item.jsx-255634210:not(.inactive){opacity:0.5;}", ".content.jsx-255634210{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;height:24px;font-size:14px;border-radius:3px;background:".concat(colors.grey200, ";}"), ".icon.jsx-255634210{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;margin-right:2px;}", ".operator.jsx-255634210{padding:0;width:24px;}", ".data.jsx-255634210,.number.jsx-255634210{padding:0 ".concat(spacers.dp8, " 0 2px;}"), ".operator.jsx-255634210 .label.jsx-255634210{margin-bottom:1px;}", ".data.jsx-255634210 .label.jsx-255634210{max-width:280px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;}", ".number-positioner.jsx-255634210{position:relative;line-height:18px;}", ".number-width.jsx-255634210{padding:0 24px 0 0;visibility:hidden;}", ".input.jsx-255634210{position:absolute;width:100%;left:0;background-color:transparent;border:1px dashed #a0adba;padding:0 0 0 2px;}", ".input.jsx-255634210:hover,.input.jsx-255634210:focus{background:white;border:1px solid rgba(0,0,0,0.2);}", ".highlighted.jsx-255634210{background:".concat(theme.secondary800, ";color:").concat(colors.white, ";}"), ".highlighted.jsx-255634210 .input.jsx-255634210{color:".concat(colors.white, ";}"), ".highlighted.jsx-255634210 .input.jsx-255634210:hover,.highlighted.jsx-255634210 .input.jsx-255634210:active,.highlighted.jsx-255634210 .input.jsx-255634210:focus{color:".concat(colors.grey900, ";}"), ".highlighted.jsx-255634210 .icon path{fill:".concat(colors.white, ";}"), ".inactive.insertBefore.jsx-255634210 .content.jsx-255634210::before,.inactive.insertAfter.jsx-255634210 .content.jsx-255634210::before,.inactive.insertBefore.jsx-255634210 .content.jsx-255634210::after,.inactive.insertAfter.jsx-255634210 .content.jsx-255634210::after{content:'';position:absolute;z-index:100;}", ".content.jsx-255634210::before{top:6px;bottom:0;width:4px;background-color:".concat(colors.blue500, ";}"), ".content.jsx-255634210::after{top:-4px;width:12px;height:12px;border:4px solid ".concat(colors.blue500, ";background:transparent;border-radius:12px;}"), ".last-item.jsx-255634210{-webkit-flex:1;-ms-flex:1;flex:1;}", ".insertBefore.jsx-255634210 .content.jsx-255634210::before{left:-6px;}", ".insertBefore.jsx-255634210 .content.jsx-255634210::after{left:-10px;}", ".insertAfter.jsx-255634210 .content.jsx-255634210::before{right:-6px;}", ".insertAfter.jsx-255634210 .content.jsx-255634210::after{right:-10px;}"];
+_defaultExport.__hash = "255634210";
+export default _defaultExport;

package/build/es/components/DataDimension/Calculation/styles/MathOperatorSelector.style.js

@@ -0,0 +1,4 @@
+import { colors, spacers } from '@dhis2/ui';
+const _defaultExport = [".wrapper.jsx-1314592703{border:1px solid ".concat(colors.grey400, ";margin-top:").concat(spacers.dp8, ";}"), ".operators.jsx-1314592703{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;gap:".concat(spacers.dp4, ";padding:").concat(spacers.dp4, ";border-top:1px solid ").concat(colors.grey400, ";}"), ".sub-header.jsx-1314592703{font-size:14px;font-weight:normal;margin:".concat(spacers.dp4, " ").concat(spacers.dp8, ";}")];
+_defaultExport.__hash = "1314592703";
+export default _defaultExport;

package/build/es/components/DataDimension/Calculation/styles/Operator.style.js

@@ -0,0 +1,4 @@
+import { colors, spacers } from '@dhis2/ui';
+const _defaultExport = [".number.jsx-2117397001{padding:0 ".concat(spacers.dp8, ";}"), ".operator.jsx-2117397001:hover,.number.jsx-2117397001:hover{background:".concat(colors.grey300, ";}")];
+_defaultExport.__hash = "2117397001";
+export default _defaultExport;

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

@@ -1,3 +1,4 @@
+import { useConfig } from '@dhis2/app-runtime';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { DIMENSION_ID_DATA } from '../../modules/predefinedDimensions.js';
@@ -8,15 +9,21 @@ const DataDimension = _ref => {
     onSelect,
     selectedDimensions,
     displayNameProp,
-    infoBoxMessage
+    infoBoxMessage,
+    onCalculationSave
   } = _ref;
+  const {
+    serverVersion
+  } = useConfig();
+  const supportsEDI = "".concat(serverVersion.major, ".").concat(serverVersion.minor, ".").concat(serverVersion.patch || 0) >= '2.40.0';
 
   const onSelectItems = selectedItem => onSelect({
     dimensionId: DIMENSION_ID_DATA,
     items: selectedItem.map(item => ({
       id: item.value,
       name: item.label,
-      type: item.type
+      type: item.type,
+      expression: item.expression
     }))
   });
 
@@ -25,23 +32,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.string.isRequired,
   selectedDimensions: PropTypes.arrayOf(PropTypes.shape({
+    expression: PropTypes.string,
     id: PropTypes.string,
-    name: PropTypes.string
+    isActive: PropTypes.bool,
+    name: PropTypes.string,
+    type: PropTypes.string
   })).isRequired,
   onSelect: PropTypes.func.isRequired,
-  infoBoxMessage: PropTypes.string
+  infoBoxMessage: PropTypes.string,
+  onCalculationSave: PropTypes.func
 };
 DataDimension.defaultProps = {
   selectedDimensions: [],

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

@@ -3,7 +3,7 @@ import { SingleSelectField, SingleSelectOption } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
 import i18n from '../../locales/index.js';
-import { DIMENSION_TYPE_ALL, dataTypeMap as dataTypes } from '../../modules/dataTypes.js';
+import { DIMENSION_TYPE_ALL, dataTypeMap as dataTypes, DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM } from '../../modules/dataTypes.js';
 import styles from './styles/DataTypeSelector.style.js';
 
 const DataTypeSelector = _ref => {
@@ -12,7 +12,8 @@ const DataTypeSelector = _ref => {
   let {
     currentDataType,
     onChange,
-    dataTest
+    dataTest,
+    includeCalculations
   } = _ref;
   return /*#__PURE__*/React.createElement("div", {
     className: "jsx-".concat(styles.__hash) + " " + "container"
@@ -27,7 +28,7 @@ const DataTypeSelector = _ref => {
     key: DIMENSION_TYPE_ALL,
     label: i18n.t('All types'),
     dataTest: "".concat(dataTest, "-option-all")
-  }), Object.values(dataTypes).map(type => /*#__PURE__*/React.createElement(SingleSelectOption, {
+  }), Object.values(dataTypes).filter(type => type.id !== DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM || includeCalculations).map(type => /*#__PURE__*/React.createElement(SingleSelectOption, {
     value: type.id,
     key: type.id,
     label: type.getName(),
@@ -40,6 +41,7 @@ const DataTypeSelector = _ref => {
 DataTypeSelector.propTypes = {
   currentDataType: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired,
-  dataTest: PropTypes.string
+  dataTest: PropTypes.string,
+  includeCalculations: PropTypes.bool
 };
 export default DataTypeSelector;