@dhis2/analytics 28.0.3 → 28.0.4

package/build/es/components/DashboardPluginWrapper/DashboardPluginWrapper.js

@@ -6,23 +6,25 @@ import { getPWAInstallationStatus } from '../../modules/getPWAInstallationStatus
 const LoadingMask = () => {
   return /*#__PURE__*/React.createElement(Layer, null, /*#__PURE__*/React.createElement(CenteredContent, null, /*#__PURE__*/React.createElement(CircularLoader, null)));
 };
-const CacheableSectionWrapper = _ref => {
-  let {
-    id,
-    children,
-    isParentCached
-  } = _ref;
+const CacheableSectionWrapper = ({
+  id,
+  children,
+  isParentCached = false
+}) => {
   const {
     startRecording,
     isCached,
     remove
   } = useCacheableSection(id);
   useEffect(() => {
-    if (isParentCached && !isCached) {
+    const shouldStartRecording = isParentCached && !isCached;
+    const shouldRemove = !isParentCached && isCached;
+    if (shouldStartRecording) {
       startRecording({
         onError: console.error
       });
-    } else if (!isParentCached && isCached) {
+    }
+    if (shouldRemove) {
       // Synchronize cache state on load or prop update
       // -- a back-up to imperative `removeCachedData`
       remove();
@@ -38,14 +40,13 @@ CacheableSectionWrapper.propTypes = {
   id: PropTypes.string,
   isParentCached: PropTypes.bool
 };
-export const DashboardPluginWrapper = _ref2 => {
-  let {
-    onInstallationStatusChange,
-    children,
-    cacheId,
-    isParentCached,
-    ...props
-  } = _ref2;
+export const DashboardPluginWrapper = ({
+  onInstallationStatusChange = Function.prototype,
+  children,
+  cacheId,
+  isParentCached = false,
+  ...props
+}) => {
   const {
     pwaEnabled
   } = useConfig();
@@ -70,10 +71,6 @@ export const DashboardPluginWrapper = _ref2 => {
     elevations: true
   })) : null;
 };
-DashboardPluginWrapper.defaultProps = {
-  isParentCached: false,
-  onInstallationStatusChange: Function.prototype
-};
 DashboardPluginWrapper.propTypes = {
   cacheId: PropTypes.string,
   children: PropTypes.func,

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

@@ -15,14 +15,14 @@ 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,
-    onSave,
-    onClose,
-    onDelete,
-    displayNameProp
-  } = _ref;
+const CALCULATION_PROP_DEFAULT = {};
+const CalculationModal = ({
+  calculation = CALCULATION_PROP_DEFAULT,
+  onSave,
+  onClose,
+  onDelete,
+  displayNameProp
+}) => {
   const {
     show: showError
   } = useAlert(error => error, {
@@ -48,29 +48,23 @@ const CalculationModal = _ref => {
   const query = {
     dataElements: {
       resource: 'dataElements',
-      params: _ref2 => {
-        let {
-          ids = []
-        } = _ref2;
-        return {
-          fields: `id,${displayNameProp}~rename(name)`,
-          filter: `id:in:[${ids.join(',')}]`,
-          paging: false
-        };
-      }
+      params: ({
+        ids = []
+      }) => ({
+        fields: `id,${displayNameProp}~rename(name)`,
+        filter: `id:in:[${ids.join(',')}]`,
+        paging: false
+      })
     },
     dataElementOperands: {
       resource: 'dataElementOperands',
-      params: _ref3 => {
-        let {
-          ids = []
-        } = _ref3;
-        return {
-          fields: `id,${displayNameProp}~rename(name)`,
-          filter: `id:in:[${ids.join(',')}]`,
-          paging: false
-        };
-      }
+      params: ({
+        ids = []
+      }) => ({
+        fields: `id,${displayNameProp}~rename(name)`,
+        filter: `id:in:[${ids.join(',')}]`,
+        paging: false
+      })
     }
   };
   const {
@@ -115,13 +109,12 @@ const CalculationModal = _ref => {
   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,
-      value,
-      type,
-      destIndex = LAST_POSITION
-    } = _ref4;
+  const addItem = ({
+    label,
+    value,
+    type,
+    destIndex = LAST_POSITION
+  }) => {
     if (isLoading) {
       return null;
     }
@@ -146,11 +139,10 @@ const CalculationModal = _ref => {
       setFocusItemId(newItem.id);
     }
   };
-  const moveItem = _ref5 => {
-    let {
-      sourceIndex,
-      destIndex
-    } = _ref5;
+  const moveItem = ({
+    sourceIndex,
+    destIndex
+  }) => {
     if (isLoading) {
       return null;
     }
@@ -160,11 +152,10 @@ const CalculationModal = _ref => {
     sourceList.splice(destIndex, 0, moved);
     setExpressionArray(sourceList);
   };
-  const setItemValue = _ref6 => {
-    let {
-      itemId,
-      value
-    } = _ref6;
+  const setItemValue = ({
+    itemId,
+    value
+  }) => {
     const updatedItems = expressionArray.map(item => item.id === itemId ? Object.assign({}, item, {
       value
     }) : item);
@@ -180,11 +171,10 @@ const CalculationModal = _ref => {
       setSelectedItemId(null);
     }
   };
-  const addOrMoveDraggedItem = _ref7 => {
-    let {
-      item,
-      destination
-    } = _ref7;
+  const addOrMoveDraggedItem = ({
+    item,
+    destination
+  }) => {
     const destContainerId = destination.containerId;
     let destIndex = FIRST_POSITION;
     if (item.sourceContainerId === OPTIONS_PANEL) {
@@ -325,12 +315,9 @@ const CalculationModal = _ref => {
   }, /*#__PURE__*/React.createElement(InputField, {
     label: i18n.t('Calculation name'),
     helpText: i18n.t('Shown in table headers and chart axes/legends'),
-    onChange: _ref8 => {
-      let {
-        value
-      } = _ref8;
-      return setName(value.substr(0, 50));
-    },
+    onChange: ({
+      value
+    }) => setName(value.substr(0, 50)),
     value: name,
     dataTest: "calculation-label",
     dense: true
@@ -385,7 +372,4 @@ CalculationModal.propTypes = {
     name: PropTypes.string
   })
 };
-CalculationModal.defaultProps = {
-  calculation: {}
-};
 export default CalculationModal;

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

@@ -8,12 +8,11 @@ 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,
-    value,
-    onDoubleClick
-  } = _ref;
+const DataElementOption = ({
+  label,
+  value,
+  onDoubleClick
+}) => {
   const data = {
     label,
     value,

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

@@ -15,13 +15,12 @@ const getOptions = () => ({
   [TOTALS]: i18n.t('Totals only'),
   [DETAIL]: i18n.t('Details only')
 });
-const GroupSelector = _ref => {
+const GroupSelector = ({
+  currentValue,
+  onChange,
+  displayNameProp
+}) => {
   var _dataTypes$DIMENSION_;
-  let {
-    currentValue,
-    onChange,
-    displayNameProp
-  } = _ref;
   const dataEngine = useDataEngine();
   const [loading, setLoading] = useState(true);
   const [groups, setGroups] = useState([]);
@@ -63,11 +62,10 @@ GroupSelector.propTypes = {
   displayNameProp: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired
 };
-const DisaggregationSelector = _ref2 => {
-  let {
-    currentValue,
-    onChange
-  } = _ref2;
+const DisaggregationSelector = ({
+  currentValue,
+  onChange
+}) => {
   const options = getOptions();
   return /*#__PURE__*/React.createElement("div", {
     className: `jsx-${styles.__hash}` + " " + "group-select"
@@ -89,11 +87,10 @@ DisaggregationSelector.propTypes = {
   currentValue: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired
 };
-const DataElementSelector = _ref3 => {
-  let {
-    displayNameProp,
-    onDoubleClick
-  } = _ref3;
+const DataElementSelector = ({
+  displayNameProp,
+  onDoubleClick
+}) => {
   const dataEngine = useDataEngine();
   const [searchTerm, setSearchTerm] = useState('');
   const [group, setGroup] = useState(DIMENSION_TYPE_ALL);
@@ -150,10 +147,9 @@ const DataElementSelector = _ref3 => {
     searchTermRef.current = newSearchTerm;
     fetchData(true);
   }, 500);
-  const onSearchChange = _ref4 => {
-    let {
-      value
-    } = _ref4;
+  const onSearchChange = ({
+    value
+  }) => {
     const newSearchTerm = value;
     setSearchTerm(newSearchTerm);
 
@@ -173,10 +169,9 @@ const DataElementSelector = _ref3 => {
     pageRef.current = 1;
     fetchData(true);
   };
-  const onEndReached = _ref5 => {
-    let {
-      isIntersecting
-    } = _ref5;
+  const onEndReached = ({
+    isIntersecting
+  }) => {
     if (isIntersecting) {
       // if hasNextPage is set it means at least 1 request already happened and there is
       // another page, fetch the next page
@@ -233,18 +228,15 @@ const DataElementSelector = _ref3 => {
     className: `jsx-${styles.__hash}` + " " + (cx('dimension-list-scroller', {
       loading
     }) || "")
-  }, Boolean(options.length) && options.map(_ref6 => {
-    let {
-      label,
-      value
-    } = _ref6;
-    return /*#__PURE__*/React.createElement(DataElementOption, {
-      key: value,
-      label: label,
-      value: value,
-      onDoubleClick: onDoubleClick
-    });
-  }), !loading && !options.length && /*#__PURE__*/React.createElement("div", {
+  }, Boolean(options.length) && options.map(({
+    label,
+    value
+  }) => /*#__PURE__*/React.createElement(DataElementOption, {
+    key: value,
+    label: label,
+    value: value,
+    onDoubleClick: onDoubleClick
+  })), !loading && !options.length && /*#__PURE__*/React.createElement("div", {
     className: `jsx-${styles.__hash}` + " " + "empty-list"
   }, searchTermRef.current ? i18n.t('No data elements found for "{{- searchTerm}}"', {
     searchTerm: searchTermRef.current

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

@@ -23,24 +23,21 @@ const getIntersectionRatio = (entry, target) => {
 
   return 0;
 };
-const sortCollisionsDesc = (_ref, _ref2) => {
-  let {
-    data: {
-      value: a
-    }
-  } = _ref;
-  let {
-    data: {
-      value: b
-    }
-  } = _ref2;
+const sortCollisionsDesc = ({
+  data: {
+    value: a
+  }
+}, {
+  data: {
+    value: b
+  }
+}) => {
   return b - a;
 };
-const rectIntersectionCustom = _ref3 => {
-  let {
-    pointerCoordinates,
-    droppableContainers
-  } = _ref3;
+const rectIntersectionCustom = ({
+  pointerCoordinates,
+  droppableContainers
+}) => {
   // create a rect around the pointerCoords for calculating the intersection
 
   const pointerRectWidth = 40;
@@ -88,22 +85,20 @@ const isInteractiveElement = el => {
 class PointerSensor extends DndKitPointerSensor {}
 _defineProperty(PointerSensor, "activators", [{
   eventName: 'onPointerDown',
-  handler: _ref7 => {
-    let {
-      nativeEvent: event
-    } = _ref7;
+  handler: ({
+    nativeEvent: event
+  }) => {
     if (!event.isPrimary || event.button !== 0 || isInteractiveElement(event.target)) {
       return false;
     }
     return true;
   }
 }]);
-const OuterDndContext = _ref4 => {
-  let {
-    children,
-    onDragEnd,
-    onDragStart
-  } = _ref4;
+const OuterDndContext = ({
+  children,
+  onDragEnd,
+  onDragStart
+}) => {
   const [draggingItem, setDraggingItem] = useState(null);
   const sensor = useSensor(PointerSensor, {
     activationConstraint: {
@@ -111,22 +106,20 @@ const OuterDndContext = _ref4 => {
     }
   });
   const sensors = useSensors(sensor);
-  const handleDragStart = _ref5 => {
-    let {
-      active
-    } = _ref5;
+  const handleDragStart = ({
+    active
+  }) => {
     setDraggingItem(active.data.current);
     onDragStart && onDragStart();
   };
   const handleDragCancel = () => {
     setDraggingItem(null);
   };
-  const handleDragEnd = _ref6 => {
+  const handleDragEnd = ({
+    active,
+    over
+  }) => {
     var _over$data, _over$data$current, _over$data$current$so, _over$data$current2, _over$data$current3;
-    let {
-      active,
-      over
-    } = _ref6;
     if (!(over !== null && over !== void 0 && over.id) || (over === null || over === void 0 ? void 0 : (_over$data = over.data) === null || _over$data === void 0 ? void 0 : (_over$data$current = _over$data.current) === null || _over$data$current === void 0 ? void 0 : (_over$data$current$so = _over$data$current.sortable) === null || _over$data$current$so === void 0 ? void 0 : _over$data$current$so.containerId) === OPTIONS_PANEL || !active.data.current) {
       // dropped over non-droppable or over options panel
       handleDragCancel();

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

@@ -7,12 +7,11 @@ import { getIcon } from '../../../modules/dimensionListItem.js';
 import { EXPRESSION_TYPE_DATA, EXPRESSION_TYPE_NUMBER, EXPRESSION_TYPE_OPERATOR } from '../../../modules/expressions.js';
 import styles from './styles/DraggingItem.style.js';
 import formulaItemStyles from './styles/FormulaItem.style.js';
-const DraggingItem = _ref => {
-  let {
-    label,
-    type,
-    value
-  } = _ref;
+const DraggingItem = ({
+  label,
+  type,
+  value
+}) => {
   const displayLabel = type === EXPRESSION_TYPE_NUMBER ? value || label : label;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: `jsx-${styles.__hash} jsx-${formulaItemStyles.__hash}` + " " + (cx('dragging', 'content', {

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

@@ -4,11 +4,10 @@ import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 import styles from './styles/DropZone.style.js';
-const DropZone = _ref => {
-  let {
-    firstElementId,
-    overLastDropZone
-  } = _ref;
+const DropZone = ({
+  firstElementId,
+  overLastDropZone
+}) => {
   const {
     isOver,
     setNodeRef,

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

@@ -19,16 +19,16 @@ const Placeholder = () => /*#__PURE__*/React.createElement("div", {
 }, i18n.t('Drag items here, or double click in the list, to start building a calculation formula')), /*#__PURE__*/React.createElement(_JSXStyle, {
   id: styles.__hash
 }, styles));
-const FormulaField = _ref => {
-  let {
-    items = [],
-    selectedItemId,
-    focusItemId,
-    onChange,
-    onClick,
-    onDoubleClick,
-    loading
-  } = _ref;
+const ITEMS_PROP_DEFAULT = [];
+const FormulaField = ({
+  items = ITEMS_PROP_DEFAULT,
+  selectedItemId,
+  focusItemId,
+  onChange,
+  onClick,
+  onDoubleClick,
+  loading
+}) => {
   const {
     over,
     setNodeRef: setLastDropzoneRef
@@ -53,28 +53,25 @@ const FormulaField = _ref => {
   }, /*#__PURE__*/React.createElement(DropZone, {
     firstElementId: itemIds[0],
     overLastDropZone: overLastDropZone
-  }), !items.length && /*#__PURE__*/React.createElement(Placeholder, null), Boolean(items.length) && items.map((_ref2, index) => {
-    let {
-      id,
-      label,
-      type,
-      value
-    } = _ref2;
-    return /*#__PURE__*/React.createElement(FormulaItem, {
-      key: id,
-      id: id,
-      label: label,
-      type: type,
-      value: value,
-      hasFocus: focusItemId === id,
-      isHighlighted: selectedItemId === id,
-      isLast: index === items.length - 1,
-      onChange: onChange,
-      onClick: onClick,
-      onDoubleClick: onDoubleClick,
-      overLastDropZone: overLastDropZone
-    });
-  }))), /*#__PURE__*/React.createElement(_JSXStyle, {
+  }), !items.length && /*#__PURE__*/React.createElement(Placeholder, null), Boolean(items.length) && items.map(({
+    id,
+    label,
+    type,
+    value
+  }, index) => /*#__PURE__*/React.createElement(FormulaItem, {
+    key: id,
+    id: id,
+    label: label,
+    type: type,
+    value: value,
+    hasFocus: focusItemId === id,
+    isHighlighted: selectedItemId === id,
+    isLast: index === items.length - 1,
+    onChange: onChange,
+    onClick: onClick,
+    onDoubleClick: onDoubleClick,
+    overLastDropZone: overLastDropZone
+  })))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));
 };

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

@@ -15,20 +15,19 @@ 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 FormulaItem = ({
+  id,
+  label,
+  value = '',
+  type,
+  isLast,
+  isHighlighted,
+  overLastDropZone,
+  onChange,
+  onClick,
+  onDoubleClick,
+  hasFocus
+}) => {
   const {
     attributes,
     listeners,

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

@@ -5,35 +5,29 @@ 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-${styles.__hash}` + " " + "wrapper"
-  }, /*#__PURE__*/React.createElement("h4", {
-    className: `jsx-${styles.__hash}` + " " + "sub-header"
-  }, i18n.t('Math operators')), /*#__PURE__*/React.createElement("div", {
-    "data-test": "operators-list",
-    className: `jsx-${styles.__hash}` + " " + "operators"
-  }, getOperators().map((_ref2, index) => {
-    let {
-      label,
-      value,
-      type
-    } = _ref2;
-    return /*#__PURE__*/React.createElement(DraggableOperator, {
-      key: `${label}-${index}`,
-      label: label,
-      value: value,
-      type: type,
-      index: index,
-      onDoubleClick: onDoubleClick
-    });
-  }))), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: styles.__hash
-  }, styles));
-};
+const MathOperatorSelector = ({
+  onDoubleClick
+}) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  className: `jsx-${styles.__hash}` + " " + "wrapper"
+}, /*#__PURE__*/React.createElement("h4", {
+  className: `jsx-${styles.__hash}` + " " + "sub-header"
+}, i18n.t('Math operators')), /*#__PURE__*/React.createElement("div", {
+  "data-test": "operators-list",
+  className: `jsx-${styles.__hash}` + " " + "operators"
+}, getOperators().map(({
+  label,
+  value,
+  type
+}, index) => /*#__PURE__*/React.createElement(DraggableOperator, {
+  key: `${label}-${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
 };

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

@@ -8,13 +8,12 @@ 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 Operator = ({
+  label,
+  value,
+  type,
+  onDoubleClick
+}) => {
   const data = {
     label,
     value,