@dhis2/analytics 26.0.8 → 26.0.9

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

@@ -15,7 +15,6 @@ import MathOperatorSelector from './MathOperatorSelector.js';
 import styles from './styles/CalculationModal.style.js';
 const FIRST_POSITION = 0;
 const LAST_POSITION = -1;
-
 const CalculationModal = _ref => {
   let {
     calculation,
@@ -54,8 +53,8 @@ const CalculationModal = _ref => {
           ids = []
         } = _ref2;
         return {
-          fields: "id,".concat(displayNameProp, "~rename(name)"),
-          filter: "id:in:[".concat(ids.join(','), "]"),
+          fields: `id,${displayNameProp}~rename(name)`,
+          filter: `id:in:[${ids.join(',')}]`,
           paging: false
         };
       }
@@ -67,8 +66,8 @@ const CalculationModal = _ref => {
           ids = []
         } = _ref3;
         return {
-          fields: "id,".concat(displayNameProp, "~rename(name)"),
-          filter: "id:in:[".concat(ids.join(','), "]"),
+          fields: `id,${displayNameProp}~rename(name)`,
+          filter: `id:in:[${ids.join(',')}]`,
           paging: false
         };
       }
@@ -81,25 +80,27 @@ const CalculationModal = _ref => {
     lazy: true
   });
   useEffect(() => {
-    const ids = getItemIdsFromExpression(calculation.expression); // only fetch data if there are ids
+    const ids = getItemIdsFromExpression(calculation.expression);
 
+    // only fetch data if there are ids
     if (ids !== null && ids !== void 0 && ids.length) {
       refetch({
         ids
       });
     } else {
-      setExpressionArray(parseExpressionToArray(calculation.expression).map((item, i) => ({ ...item,
-        id: "".concat(item.type, "-").concat(-i)
+      setExpressionArray(parseExpressionToArray(calculation.expression).map((item, i) => ({
+        ...item,
+        id: `${item.type}-${-i}`
       })));
     }
   }, [refetch, calculation.expression]);
   useEffect(() => {
     if (data) {
       var _data$dataElements, _data$dataElementOper;
-
       const metadata = [...(((_data$dataElements = data.dataElements) === null || _data$dataElements === void 0 ? void 0 : _data$dataElements.dataElements) || []), ...(((_data$dataElementOper = data.dataElementOperands) === null || _data$dataElementOper === void 0 ? void 0 : _data$dataElementOper.dataElementOperands) || [])];
-      setExpressionArray(parseExpressionToArray(calculation.expression, metadata).map((item, i) => ({ ...item,
-        id: "".concat(item.type, "-").concat(-i)
+      setExpressionArray(parseExpressionToArray(calculation.expression, metadata).map((item, i) => ({
+        ...item,
+        id: `${item.type}-${-i}`
       })));
     }
   }, [data, calculation.expression]);
@@ -112,11 +113,8 @@ const CalculationModal = _ref => {
   const [focusItemId, setFocusItemId] = useState(null);
   const [selectedItemId, setSelectedItemId] = useState(null);
   const expressionStatus = validationOutput === null || validationOutput === void 0 ? void 0 : validationOutput.status;
-
   const selectItem = itemId => setSelectedItemId(prevSelected => prevSelected !== itemId ? itemId : null);
-
   const isLoading = isCreatingCalculation || isUpdatingCalculation || isDeletingCalculation || isSavingCalculation || isValidating;
-
   const addItem = _ref4 => {
     let {
       label,
@@ -124,20 +122,17 @@ const CalculationModal = _ref => {
       type,
       destIndex = LAST_POSITION
     } = _ref4;
-
     if (isLoading) {
       return null;
     }
-
     setValidationOutput();
     const newItem = {
-      id: "".concat(type, "-").concat(newIdCount),
-      value: type === EXPRESSION_TYPE_DATA ? "#{".concat(value, "}") : value,
+      id: `${type}-${newIdCount}`,
+      value: type === EXPRESSION_TYPE_DATA ? `#{${value}}` : value,
       label,
       type
     };
     setNewIdCount(newIdCount + 1);
-
     if (destIndex === LAST_POSITION) {
       setExpressionArray(prevArray => prevArray.concat([newItem]));
     } else if (destIndex === FIRST_POSITION) {
@@ -147,29 +142,24 @@ const CalculationModal = _ref => {
       const newFormulaItems = [...items.slice(0, destIndex), newItem, ...items.slice(destIndex)];
       setExpressionArray(newFormulaItems);
     }
-
     if (newItem.type === EXPRESSION_TYPE_NUMBER) {
       setFocusItemId(newItem.id);
     }
   };
-
   const moveItem = _ref5 => {
     let {
       sourceIndex,
       destIndex
     } = _ref5;
-
     if (isLoading) {
       return null;
     }
-
     setValidationOutput();
     const sourceList = Array.from(expressionArray);
     const [moved] = sourceList.splice(sourceIndex, 1);
     sourceList.splice(destIndex, 0, moved);
     setExpressionArray(sourceList);
   };
-
   const setItemValue = _ref6 => {
     let {
       itemId,
@@ -180,7 +170,6 @@ const CalculationModal = _ref => {
     }) : item);
     setExpressionArray(updatedItems);
   };
-
   const removeItem = itemId => {
     if (!isLoading && itemId !== null) {
       setValidationOutput();
@@ -191,7 +180,6 @@ const CalculationModal = _ref => {
       setSelectedItemId(null);
     }
   };
-
   const addOrMoveDraggedItem = _ref7 => {
     let {
       item,
@@ -199,15 +187,14 @@ const CalculationModal = _ref => {
     } = _ref7;
     const destContainerId = destination.containerId;
     let destIndex = FIRST_POSITION;
-
     if (item.sourceContainerId === OPTIONS_PANEL) {
       if (destContainerId === LAST_DROPZONE_ID) {
         destIndex = LAST_POSITION;
       } else if (destContainerId === FORMULA_BOX_ID) {
         destIndex = destination.index + 1;
       }
-
-      addItem({ ...item.data,
+      addItem({
+        ...item.data,
         destIndex
       });
     } else {
@@ -216,45 +203,35 @@ const CalculationModal = _ref => {
       } else if (destContainerId === FORMULA_BOX_ID) {
         destIndex = destination.index;
       }
-
       moveItem({
         sourceIndex: item.sourceIndex,
         destIndex
       });
     }
   };
-
   const validate = async () => {
     var _result;
-
     setValidationOutput();
     const expression = parseArrayToExpression(expressionArray);
     let result = validateExpression(expression);
-
     if (!result) {
       result = await doBackendValidation({
         expression
       });
     }
-
     setValidationOutput(result);
     return (_result = result) === null || _result === void 0 ? void 0 : _result.status;
   };
-
   const onSaveClick = async () => {
     setIsSavingCalculation(true);
     let status = expressionStatus;
-
     if (status !== VALID_EXPRESSION) {
       status = await validate();
     }
-
     if (status === VALID_EXPRESSION) {
       var _response;
-
       let response;
       const expression = parseArrayToExpression(expressionArray);
-
       if (calculation.id) {
         response = await updateCalculation({
           id: calculation.id,
@@ -267,7 +244,6 @@ const CalculationModal = _ref => {
           expression
         });
       }
-
       onSave({
         id: calculation.id || ((_response = response) === null || _response === void 0 ? void 0 : _response.response.uid),
         name,
@@ -275,10 +251,8 @@ const CalculationModal = _ref => {
         expression
       });
     }
-
     setIsSavingCalculation(false);
   };
-
   const onDeleteClick = async () => {
     setShowDeletePrompt();
     await deleteCalculation({
@@ -288,7 +262,6 @@ const CalculationModal = _ref => {
       id: calculation.id
     });
   };
-
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Modal, {
     dataTest: "calculation-modal",
     position: "top",
@@ -301,16 +274,16 @@ const CalculationModal = _ref => {
     onDragStart: () => setFocusItemId(null),
     onDragEnd: addOrMoveDraggedItem
   }, /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "content"
+    className: `jsx-${styles.__hash}` + " " + "content"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "left-section"
+    className: `jsx-${styles.__hash}` + " " + "left-section"
   }, /*#__PURE__*/React.createElement(DataElementSelector, {
     displayNameProp: displayNameProp,
     onDoubleClick: addItem
   }), /*#__PURE__*/React.createElement(MathOperatorSelector, {
     onDoubleClick: addItem
   })), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "right-section"
+    className: `jsx-${styles.__hash}` + " " + "right-section"
   }, /*#__PURE__*/React.createElement(FormulaField, {
     items: expressionArray,
     selectedItemId: selectedItemId,
@@ -321,11 +294,11 @@ const CalculationModal = _ref => {
     loading: !expressionArray,
     disabled: isLoading
   }), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "actions-wrapper"
+    className: `jsx-${styles.__hash}` + " " + "actions-wrapper"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "button-container"
+    className: `jsx-${styles.__hash}` + " " + "button-container"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "remove-button"
+    className: `jsx-${styles.__hash}` + " " + "remove-button"
   }, /*#__PURE__*/React.createElement(Button, {
     small: true,
     secondary: true,
@@ -333,7 +306,7 @@ const CalculationModal = _ref => {
     dataTest: "remove-button",
     disabled: !selectedItemId
   }, i18n.t('Remove item'))), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "validate-button"
+    className: `jsx-${styles.__hash}` + " " + "validate-button"
   }, /*#__PURE__*/React.createElement(Button, {
     small: true,
     secondary: true,
@@ -343,12 +316,12 @@ const CalculationModal = _ref => {
     disabled: isLoading
   }, i18n.t('Check formula')))), /*#__PURE__*/React.createElement("span", {
     "data-test": "validation-message",
-    className: "jsx-".concat(styles.__hash) + " " + (cx('validation-message', {
+    className: `jsx-${styles.__hash}` + " " + (cx('validation-message', {
       'validation-error': expressionStatus === INVALID_EXPRESSION,
       'validation-success': expressionStatus === VALID_EXPRESSION
     }) || "")
   }, validationOutput === null || validationOutput === void 0 ? void 0 : validationOutput.message), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "name-input"
+    className: `jsx-${styles.__hash}` + " " + "name-input"
   }, /*#__PURE__*/React.createElement(InputField, {
     label: i18n.t('Calculation name'),
     helpText: i18n.t('Shown in table headers and chart axes/legends'),
@@ -364,7 +337,7 @@ const CalculationModal = _ref => {
   }))))))), /*#__PURE__*/React.createElement(ModalActions, {
     dataTest: "calculation-modal-actions"
   }, /*#__PURE__*/React.createElement(ButtonStrip, null, calculation.id && /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "delete-button"
+    className: `jsx-${styles.__hash}` + " " + "delete-button"
   }, /*#__PURE__*/React.createElement(Button, {
     secondary: true,
     onClick: () => setShowDeletePrompt(true),
@@ -401,7 +374,6 @@ const CalculationModal = _ref => {
     id: styles.__hash
   }, styles));
 };
-
 CalculationModal.propTypes = {
   displayNameProp: PropTypes.string.isRequired,
   onClose: PropTypes.func.isRequired,

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

@@ -1,7 +1,5 @@
 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); }
-
+function _extends() { _extends = Object.assign ? Object.assign.bind() : 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 PropTypes from 'prop-types';
@@ -10,7 +8,6 @@ import { DIMENSION_TYPE_DATA_ELEMENT } from '../../../modules/dataTypes.js';
 import { getIcon } from '../../../modules/dimensionListItem.js';
 import { EXPRESSION_TYPE_DATA } from '../../../modules/expressions.js';
 import styles from './styles/DataElementOption.style.js';
-
 const DataElementOption = _ref => {
   let {
     label,
@@ -35,24 +32,23 @@ const DataElementOption = _ref => {
     transform: CSS.Translate.toString(transform)
   };
   return /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "wrapper"
+    className: `jsx-${styles.__hash}` + " " + "wrapper"
   }, /*#__PURE__*/React.createElement("div", _extends({}, attributes, listeners, {
     ref: setNodeRef,
     style: style,
-    className: "jsx-".concat(styles.__hash) + " " + (listeners && listeners.className != null && listeners.className || attributes && attributes.className != null && attributes.className || "draggable-item")
+    className: `jsx-${styles.__hash}` + " " + (listeners && listeners.className != null && listeners.className || attributes && attributes.className != null && attributes.className || "draggable-item")
   }), /*#__PURE__*/React.createElement("div", {
     onDoubleClick: () => onDoubleClick(data),
     "data-test": "data-element-option",
-    className: "jsx-".concat(styles.__hash) + " " + "chip"
+    className: `jsx-${styles.__hash}` + " " + "chip"
   }, /*#__PURE__*/React.createElement("span", {
-    className: "jsx-".concat(styles.__hash) + " " + "icon"
+    className: `jsx-${styles.__hash}` + " " + "icon"
   }, getIcon(DIMENSION_TYPE_DATA_ELEMENT)), /*#__PURE__*/React.createElement("span", {
-    className: "jsx-".concat(styles.__hash) + " " + "label"
+    className: `jsx-${styles.__hash}` + " " + "label"
   }, label))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));
 };
-
 DataElementOption.propTypes = {
   label: PropTypes.string,
   value: PropTypes.string,

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

@@ -11,15 +11,12 @@ import i18n from '../../../locales/index.js';
 import { TOTALS, DETAIL, DIMENSION_TYPE_ALL, DIMENSION_TYPE_DATA_ELEMENT, dataTypeMap as dataTypes } from '../../../modules/dataTypes.js';
 import DataElementOption from './DataElementOption.js';
 import styles from './styles/DataElementSelector.style.js';
-
 const getOptions = () => ({
   [TOTALS]: i18n.t('Totals only'),
   [DETAIL]: i18n.t('Details only')
 });
-
 const GroupSelector = _ref => {
   var _dataTypes$DIMENSION_;
-
   let {
     currentValue,
     onChange,
@@ -36,11 +33,10 @@ const GroupSelector = _ref => {
       setGroups(result);
       setLoading(false);
     };
-
     fetchGroups();
   }, [dataEngine, displayNameProp]);
   return /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "group-select"
+    className: `jsx-${styles.__hash}` + " " + "group-select"
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     selected: currentValue,
     onChange: ref => onChange(ref.selected),
@@ -52,23 +48,21 @@ const GroupSelector = _ref => {
     value: defaultGroup.id,
     key: defaultGroup.id,
     label: defaultGroup.getName(),
-    dataTest: "data-element-group-select-option-".concat(defaultGroup.id)
+    dataTest: `data-element-group-select-option-${defaultGroup.id}`
   }) : null, !loading ? groups.map(group => /*#__PURE__*/React.createElement(SingleSelectOption, {
     value: group.id,
     key: group.id,
     label: group.name,
-    dataTest: "data-element-group-select-option-".concat(group.id)
+    dataTest: `data-element-group-select-option-${group.id}`
   })) : null), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));
 };
-
 GroupSelector.propTypes = {
   currentValue: PropTypes.string.isRequired,
   displayNameProp: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired
 };
-
 const DisaggregationSelector = _ref2 => {
   let {
     currentValue,
@@ -76,7 +70,7 @@ const DisaggregationSelector = _ref2 => {
   } = _ref2;
   const options = getOptions();
   return /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "group-select"
+    className: `jsx-${styles.__hash}` + " " + "group-select"
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     selected: currentValue,
     onChange: ref => onChange(ref.selected),
@@ -86,17 +80,15 @@ const DisaggregationSelector = _ref2 => {
     value: option[0],
     key: option[0],
     label: option[1],
-    dataTest: "data-element-disaggregation-select-option-".concat(option[0])
+    dataTest: `data-element-disaggregation-select-option-${option[0]}`
   }))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));
 };
-
 DisaggregationSelector.propTypes = {
   currentValue: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired
 };
-
 const DataElementSelector = _ref3 => {
   let {
     displayNameProp,
@@ -120,7 +112,6 @@ const DataElementSelector = _ref3 => {
     group,
     subGroup
   });
-
   const fetchData = async scrollToTop => {
     try {
       setLoading(true);
@@ -131,7 +122,6 @@ const DataElementSelector = _ref3 => {
         searchTerm: searchTermRef.current,
         page: pageRef.current
       });
-
       if (result !== null && result !== void 0 && result.dimensionItems) {
         const newOptions = result.dimensionItems.map(item => ({
           label: item.name,
@@ -142,7 +132,6 @@ const DataElementSelector = _ref3 => {
         setOptions(prevOptions => pageRef.current > 1 ? [...prevOptions, ...newOptions] : newOptions);
         setLoading(false);
       }
-
       hasNextPageRef.current = result !== null && result !== void 0 && result.nextPage ? true : false;
     } catch (error) {
       // TODO handle errors
@@ -155,45 +144,39 @@ const DataElementSelector = _ref3 => {
       }
     }
   };
-
   const debouncedFetchData = useDebounceCallback(newSearchTerm => {
     hasNextPageRef.current = false;
     pageRef.current = 1;
     searchTermRef.current = newSearchTerm;
     fetchData(true);
   }, 500);
-
   const onSearchChange = _ref4 => {
     let {
       value
     } = _ref4;
     const newSearchTerm = value;
-    setSearchTerm(newSearchTerm); // debounce the fetch
+    setSearchTerm(newSearchTerm);
 
+    // debounce the fetch
     debouncedFetchData(newSearchTerm);
   };
-
   const onFilterChange = newFilter => {
     if (newFilter.group) {
       setGroup(newFilter.group);
       filterRef.current.group = newFilter.group;
     }
-
     if (newFilter.subGroup) {
       setSubGroup(newFilter.subGroup);
       filterRef.current.subGroup = newFilter.subGroup;
     }
-
     hasNextPageRef.current = false;
     pageRef.current = 1;
     fetchData(true);
   };
-
   const onEndReached = _ref5 => {
     let {
       isIntersecting
     } = _ref5;
-
     if (isIntersecting) {
       // if hasNextPage is set it means at least 1 request already happened and there is
       // another page, fetch the next page
@@ -207,11 +190,10 @@ const DataElementSelector = _ref3 => {
       }
     }
   };
-
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "filter-wrapper"
+    className: `jsx-${styles.__hash}` + " " + "filter-wrapper"
   }, /*#__PURE__*/React.createElement("h4", {
-    className: "jsx-".concat(styles.__hash) + " " + "sub-header"
+    className: `jsx-${styles.__hash}` + " " + "sub-header"
   }, i18n.t('Data elements')), /*#__PURE__*/React.createElement(InputField, {
     value: searchTerm,
     onChange: onSearchChange,
@@ -220,7 +202,7 @@ const DataElementSelector = _ref3 => {
     type: 'search',
     dataTest: 'data-element-search'
   }), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "selector-wrapper"
+    className: `jsx-${styles.__hash}` + " " + "selector-wrapper"
   }, /*#__PURE__*/React.createElement(GroupSelector, {
     currentValue: group,
     onChange: group => onFilterChange({
@@ -233,9 +215,9 @@ const DataElementSelector = _ref3 => {
       subGroup
     })
   }))), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "dimension-list-container"
+    className: `jsx-${styles.__hash}` + " " + "dimension-list-container"
   }, loading && /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "dimension-list-overlay"
+    className: `jsx-${styles.__hash}` + " " + "dimension-list-overlay"
   }, /*#__PURE__*/React.createElement(CircularLoader, null)), /*#__PURE__*/React.createElement("div", {
     ref: rootRef,
     onScroll: () => {
@@ -245,10 +227,10 @@ const DataElementSelector = _ref3 => {
         });
       }
     },
-    className: "jsx-".concat(styles.__hash) + " " + "dimension-list-scrollbox"
+    className: `jsx-${styles.__hash}` + " " + "dimension-list-scrollbox"
   }, /*#__PURE__*/React.createElement("div", {
     "data-test": "dimension-list",
-    className: "jsx-".concat(styles.__hash) + " " + (cx('dimension-list-scroller', {
+    className: `jsx-${styles.__hash}` + " " + (cx('dimension-list-scroller', {
       loading
     }) || "")
   }, Boolean(options.length) && options.map(_ref6 => {
@@ -263,11 +245,11 @@ const DataElementSelector = _ref3 => {
       onDoubleClick: onDoubleClick
     });
   }), !loading && !options.length && /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "empty-list"
+    className: `jsx-${styles.__hash}` + " " + "empty-list"
   }, searchTermRef.current ? i18n.t('No data elements found for "{{- searchTerm}}"', {
     searchTerm: searchTermRef.current
   }) : i18n.t('No data elements found')), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "scroll-detector"
+    className: `jsx-${styles.__hash}` + " " + "scroll-detector"
   }, /*#__PURE__*/React.createElement(IntersectionDetector, {
     onChange: onEndReached,
     rootRef: rootRef
@@ -275,7 +257,6 @@ const DataElementSelector = _ref3 => {
     id: styles.__hash
   }, styles));
 };
-
 DataElementSelector.propTypes = {
   displayNameProp: PropTypes.string.isRequired,
   onDoubleClick: PropTypes.func.isRequired