@dhis2/analytics 28.0.2 → 28.0.4

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

@@ -8,28 +8,21 @@ import styles from './styles/InfoPopover.style.js';
 const optionQuery = {
   option: {
     resource: 'options',
-    id: _ref => {
-      let {
-        id
-      } = _ref;
-      return id;
-    },
-    params: _ref2 => {
-      let {
-        displayNameProp
-      } = _ref2;
-      return {
-        fields: `${getCommonFields(displayNameProp)},optionSet[displayName]`
-      };
-    }
+    id: ({
+      id
+    }) => id,
+    params: ({
+      displayNameProp
+    }) => ({
+      fields: `${getCommonFields(displayNameProp)},optionSet[displayName]`
+    })
   }
 };
-export const OptionInfo = _ref3 => {
-  let {
-    type,
-    id,
-    displayNameProp
-  } = _ref3;
+export const OptionInfo = ({
+  type,
+  id,
+  displayNameProp
+}) => {
   const {
     loading,
     error,

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

@@ -9,28 +9,21 @@ import styles from './styles/InfoPopover.style.js';
 const programIndicatorQuery = {
   programIndicator: {
     resource: 'programIndicators',
-    id: _ref => {
-      let {
-        id
-      } = _ref;
-      return id;
-    },
-    params: _ref2 => {
-      let {
-        displayNameProp
-      } = _ref2;
-      return {
-        fields: `${getCommonFields(displayNameProp)},aggregationType,analyticsPeriodBoundaries[analyticsPeriodBoundaryType,boundaryTarget,id,offsetPeriodType,offsetPeriods],analyticsType,decimals,expression,filter,legendSets[id,displayName],program[displayName]`
-      };
-    }
+    id: ({
+      id
+    }) => id,
+    params: ({
+      displayNameProp
+    }) => ({
+      fields: `${getCommonFields(displayNameProp)},aggregationType,analyticsPeriodBoundaries[analyticsPeriodBoundaryType,boundaryTarget,id,offsetPeriodType,offsetPeriods],analyticsType,decimals,expression,filter,legendSets[id,displayName],program[displayName]`
+    })
   }
 };
-export const ProgramIndicatorInfo = _ref3 => {
-  let {
-    type,
-    id,
-    displayNameProp
-  } = _ref3;
+export const ProgramIndicatorInfo = ({
+  type,
+  id,
+  displayNameProp
+}) => {
   const [data, setData] = useState();
   const [error, setError] = useState();
   const [loading, setLoading] = useState(true);
@@ -67,10 +60,9 @@ export const ProgramIndicatorInfo = _ref3 => {
         programIndicator.humanReadableFilter = result;
       }
     }
-    programIndicator.analyticsPeriodBoundaries.forEach((_ref4, index) => {
-      let {
-        boundaryTarget
-      } = _ref4;
+    programIndicator.analyticsPeriodBoundaries.forEach(({
+      boundaryTarget
+    }, index) => {
       programIndicator.analyticsPeriodBoundaries[index].boundaryTarget = ['ENROLLMENT_DATE', 'EVENT_DATE', 'INCIDENT_DATE'].includes(boundaryTarget) ? sentenceCaseText(boundaryTarget) : i18n.t('Custom');
     });
     setData({
@@ -108,38 +100,35 @@ export const ProgramIndicatorInfo = _ref3 => {
     className: `jsx-${styles.__hash}` + " " + "content-wrap"
   }, /*#__PURE__*/React.createElement("ul", {
     className: `jsx-${styles.__hash}`
-  }, data === null || data === void 0 ? void 0 : data.programIndicator.analyticsPeriodBoundaries.map(_ref5 => {
-    let {
-      analyticsPeriodBoundaryType,
-      boundaryTarget,
-      id,
-      offsetPeriodType,
-      offsetPeriods
-    } = _ref5;
-    return /*#__PURE__*/React.createElement("li", {
-      key: id,
-      className: `jsx-${styles.__hash}`
-    }, /*#__PURE__*/React.createElement("span", {
-      className: `jsx-${styles.__hash}`
-    }, /*#__PURE__*/React.createElement("span", {
-      className: `jsx-${styles.__hash}` + " " + "label"
-    }, i18n.t('Type:'), "\xA0"), sentenceCaseText(analyticsPeriodBoundaryType)), /*#__PURE__*/React.createElement("br", {
-      className: `jsx-${styles.__hash}`
-    }), /*#__PURE__*/React.createElement("span", {
-      className: `jsx-${styles.__hash}`
-    }, /*#__PURE__*/React.createElement("span", {
-      className: `jsx-${styles.__hash}` + " " + "label"
-    }, i18n.t('Target:'), "\xA0"), boundaryTarget), Boolean(offsetPeriods) && Boolean(offsetPeriodType) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("br", {
-      className: `jsx-${styles.__hash}`
-    }), /*#__PURE__*/React.createElement("span", {
-      className: `jsx-${styles.__hash}`
-    }, /*#__PURE__*/React.createElement("span", {
-      className: `jsx-${styles.__hash}` + " " + "label"
-    }, i18n.t('Offset:'), "\xA0"), i18n.t('{{ offsetPeriodType }} × {{ offsetPeriods }}', {
-      offsetPeriodType,
-      offsetPeriods
-    }))));
-  }))))), /*#__PURE__*/React.createElement("tr", {
+  }, data === null || data === void 0 ? void 0 : data.programIndicator.analyticsPeriodBoundaries.map(({
+    analyticsPeriodBoundaryType,
+    boundaryTarget,
+    id,
+    offsetPeriodType,
+    offsetPeriods
+  }) => /*#__PURE__*/React.createElement("li", {
+    key: id,
+    className: `jsx-${styles.__hash}`
+  }, /*#__PURE__*/React.createElement("span", {
+    className: `jsx-${styles.__hash}`
+  }, /*#__PURE__*/React.createElement("span", {
+    className: `jsx-${styles.__hash}` + " " + "label"
+  }, i18n.t('Type:'), "\xA0"), sentenceCaseText(analyticsPeriodBoundaryType)), /*#__PURE__*/React.createElement("br", {
+    className: `jsx-${styles.__hash}`
+  }), /*#__PURE__*/React.createElement("span", {
+    className: `jsx-${styles.__hash}`
+  }, /*#__PURE__*/React.createElement("span", {
+    className: `jsx-${styles.__hash}` + " " + "label"
+  }, i18n.t('Target:'), "\xA0"), boundaryTarget), Boolean(offsetPeriods) && Boolean(offsetPeriodType) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("br", {
+    className: `jsx-${styles.__hash}`
+  }), /*#__PURE__*/React.createElement("span", {
+    className: `jsx-${styles.__hash}`
+  }, /*#__PURE__*/React.createElement("span", {
+    className: `jsx-${styles.__hash}` + " " + "label"
+  }, i18n.t('Offset:'), "\xA0"), i18n.t('{{ offsetPeriodType }} × {{ offsetPeriods }}', {
+    offsetPeriodType,
+    offsetPeriods
+  }))))))))), /*#__PURE__*/React.createElement("tr", {
     className: `jsx-${styles.__hash}`
   }, /*#__PURE__*/React.createElement("th", {
     className: `jsx-${styles.__hash}`

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

@@ -26,22 +26,22 @@ const formatOptionsFilters = (dataItemType, dataItemId) => {
   }
   return optionsFilters;
 };
-export const ItemOptionsSelector = _ref => {
+const SELECTED_ITEMS_PROP_DEFAULT = [];
+export const ItemOptionsSelector = ({
+  id: dataItemId,
+  name: dataItemName,
+  type: dataItemType,
+  selectedItems = SELECTED_ITEMS_PROP_DEFAULT,
+  infoDataItem,
+  setInfoDataItem,
+  displayNameProp,
+  itemsRef,
+  onEditClick,
+  onSelect,
+  onClose,
+  dataTest
+}) => {
   var _state$filter;
-  let {
-    id: dataItemId,
-    name: dataItemName,
-    type: dataItemType,
-    selectedItems,
-    infoDataItem,
-    setInfoDataItem,
-    displayNameProp,
-    itemsRef,
-    onEditClick,
-    onSelect,
-    onClose,
-    dataTest
-  } = _ref;
   const [state, setState] = useState({
     searchTerm: '',
     filter: formatOptionsFilters(dataItemType, dataItemId),
@@ -139,12 +139,9 @@ export const ItemOptionsSelector = _ref => {
   return /*#__PURE__*/React.createElement("div", {
     className: `jsx-${styles.__hash} jsx-${itemOptionSelectorStyles.__hash}` + " " + "transfer-container"
   }, /*#__PURE__*/React.createElement(Transfer, {
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
-      return onChange(selected);
-    },
+    onChange: ({
+      selected
+    }) => onChange(selected),
     selected: selectedItems.map(item => item.value),
     options: [...state.options,
     // remove items already in the options list
@@ -168,12 +165,9 @@ export const ItemOptionsSelector = _ref => {
     filterPlaceholder: i18n.t('Search by option name'),
     filterablePicked: false,
     searchTerm: state.searchTerm,
-    onFilterChange: _ref3 => {
-      let {
-        value
-      } = _ref3;
-      return setSearchTerm(value);
-    },
+    onFilterChange: ({
+      value
+    }) => setSearchTerm(value),
     leftHeader: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: `jsx-${styles.__hash} jsx-${itemOptionSelectorStyles.__hash}` + " " + "option-set-back-button"
     }, /*#__PURE__*/React.createElement(Button, {
@@ -241,7 +235,4 @@ ItemOptionsSelector.propTypes = {
   })),
   setInfoDataItem: PropTypes.func,
   onEditClick: PropTypes.func
-};
-ItemOptionsSelector.defaultProps = {
-  selectedItems: []
 };

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

@@ -7,13 +7,12 @@ import { DIMENSION_TYPE_ALL, dataTypeMap } from '../../../modules/dataTypes.js';
 import { getDisplayNameByVisType } from '../../../modules/visTypes.js';
 import { useDataDimensionContext } from '../DataDimension.js';
 import styles from './styles/DataTypeSelector.style.js';
-const DataTypeSelector = _ref => {
-  let {
-    currentDataType,
-    dataTypes,
-    onChange,
-    dataTest
-  } = _ref;
+const DataTypeSelector = ({
+  currentDataType,
+  dataTypes,
+  onChange,
+  dataTest
+}) => {
   const {
     visType
   } = useDataDimensionContext();

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

@@ -9,12 +9,11 @@ const getOptions = () => ({
   [TOTALS]: i18n.t('Totals only'),
   [DETAIL]: i18n.t('Details only')
 });
-export const DetailSelector = _ref => {
-  let {
-    currentValue,
-    onChange,
-    dataTest
-  } = _ref;
+export const DetailSelector = ({
+  currentValue,
+  onChange,
+  dataTest
+}) => {
   const options = getOptions();
   return /*#__PURE__*/React.createElement("div", {
     className: `jsx-${styles.__hash}` + " " + "detail-container"

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

@@ -9,17 +9,16 @@ import { dataTypeMap as dataTypes, SUB_GROUP_DETAIL, SUB_GROUP_METRIC } from '..
 import { DetailSelector } from './DetailSelector.js';
 import { MetricSelector } from './MetricSelector.js';
 import styles from './styles/GroupSelector.style.js';
-const GroupSelector = _ref => {
+const GroupSelector = ({
+  dataType,
+  currentGroup,
+  onGroupChange,
+  dataTest,
+  displayNameProp,
+  currentSubGroup,
+  onSubGroupChange
+}) => {
   var _dataTypes$dataType, _dataTypes$dataType2, _dataTypes$dataType3, _dataTypes$dataType4, _dataTypes$dataType5, _dataTypes$dataType6, _dataTypes$dataType7;
-  let {
-    dataType,
-    currentGroup,
-    onGroupChange,
-    dataTest,
-    displayNameProp,
-    currentSubGroup,
-    onSubGroupChange
-  } = _ref;
   const dataEngine = useDataEngine();
   const [groups, setGroups] = useState([]);
   const [isLoading, setIsLoading] = useState(true);

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

@@ -19,52 +19,46 @@ import { SourceEmptyPlaceholder } from '../SourceEmptyPlaceholder.js';
 import { TransferOption } from '../TransferOption.js';
 import DataTypeSelector from './DataTypeSelector.js';
 import GroupSelector from './GroupSelector.js';
-const LeftHeader = _ref => {
-  let {
-    searchTerm,
-    setSearchTerm,
-    dataType,
-    dataTypes,
-    setDataType,
-    group,
-    setGroup,
-    subGroup,
-    setSubGroup,
-    displayNameProp,
-    dataTest
-  } = _ref;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: `jsx-${styles.__hash}` + " " + "leftHeader"
-  }, /*#__PURE__*/React.createElement(InputField, {
-    value: searchTerm,
-    onChange: _ref2 => {
-      let {
-        value
-      } = _ref2;
-      return setSearchTerm(value);
-    },
-    placeholder: i18n.t('Search by data item name'),
-    dataTest: `${dataTest}-filter-input-field`,
-    dense: true,
-    initialFocus: true,
-    type: 'search'
-  }), /*#__PURE__*/React.createElement(DataTypeSelector, {
-    currentDataType: dataType,
-    onChange: setDataType,
-    dataTest: `${dataTest}-data-types-select-field`,
-    dataTypes: dataTypes
-  }), ![DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM, DIMENSION_TYPE_ALL].includes(dataType) && /*#__PURE__*/React.createElement(GroupSelector, {
-    dataType: dataType,
-    displayNameProp: displayNameProp,
-    currentGroup: group,
-    onGroupChange: setGroup,
-    currentSubGroup: subGroup,
-    onSubGroupChange: setSubGroup,
-    dataTest: dataTest
-  })), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: styles.__hash
-  }, styles));
-};
+const LeftHeader = ({
+  searchTerm,
+  setSearchTerm,
+  dataType,
+  dataTypes,
+  setDataType,
+  group,
+  setGroup,
+  subGroup,
+  setSubGroup,
+  displayNameProp,
+  dataTest
+}) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  className: `jsx-${styles.__hash}` + " " + "leftHeader"
+}, /*#__PURE__*/React.createElement(InputField, {
+  value: searchTerm,
+  onChange: ({
+    value
+  }) => setSearchTerm(value),
+  placeholder: i18n.t('Search by data item name'),
+  dataTest: `${dataTest}-filter-input-field`,
+  dense: true,
+  initialFocus: true,
+  type: 'search'
+}), /*#__PURE__*/React.createElement(DataTypeSelector, {
+  currentDataType: dataType,
+  onChange: setDataType,
+  dataTest: `${dataTest}-data-types-select-field`,
+  dataTypes: dataTypes
+}), ![DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM, DIMENSION_TYPE_ALL].includes(dataType) && /*#__PURE__*/React.createElement(GroupSelector, {
+  dataType: dataType,
+  displayNameProp: displayNameProp,
+  currentGroup: group,
+  onGroupChange: setGroup,
+  currentSubGroup: subGroup,
+  onSubGroupChange: setSubGroup,
+  dataTest: dataTest
+})), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: styles.__hash
+}, styles));
 LeftHeader.propTypes = {
   dataTest: PropTypes.string,
   dataType: PropTypes.string,
@@ -78,45 +72,42 @@ LeftHeader.propTypes = {
   setSubGroup: PropTypes.func,
   subGroup: PropTypes.string
 };
-const RightHeader = _ref3 => {
-  let {
-    infoBoxMessage
-  } = _ref3;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
-    className: `jsx-${styles.__hash}` + " " + "rightHeader"
-  }, i18n.t('Selected Items')), infoBoxMessage && /*#__PURE__*/React.createElement("div", {
-    className: `jsx-${styles.__hash}` + " " + "info-container"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: `jsx-${styles.__hash}`
-  }, /*#__PURE__*/React.createElement(IconInfo16, null)), /*#__PURE__*/React.createElement("span", {
-    className: `jsx-${styles.__hash}` + " " + "info-text"
-  }, infoBoxMessage)), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: styles.__hash
-  }, styles));
-};
+const RightHeader = ({
+  infoBoxMessage
+}) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
+  className: `jsx-${styles.__hash}` + " " + "rightHeader"
+}, i18n.t('Selected Items')), infoBoxMessage && /*#__PURE__*/React.createElement("div", {
+  className: `jsx-${styles.__hash}` + " " + "info-container"
+}, /*#__PURE__*/React.createElement("div", {
+  className: `jsx-${styles.__hash}`
+}, /*#__PURE__*/React.createElement(IconInfo16, null)), /*#__PURE__*/React.createElement("span", {
+  className: `jsx-${styles.__hash}` + " " + "info-text"
+}, infoBoxMessage)), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: styles.__hash
+}, styles));
 RightHeader.propTypes = {
   infoBoxMessage: PropTypes.string
 };
-const ItemSelector = _ref4 => {
-  let {
-    selectedItems,
-    noItemsMessage,
-    onSelect,
-    rightFooter,
-    displayNameProp,
-    infoBoxMessage,
-    itemsRef,
-    currentCalculation,
-    setCurrentCalculation,
-    infoDataItem,
-    setInfoDataItem,
-    dataTypes,
-    dataTest,
-    onEDISave,
-    onEditClick,
-    isOptionViewMode,
-    supportsEDI
-  } = _ref4;
+const SELECTED_ITEMS_PROP_DEFAULT = [];
+const ItemSelector = ({
+  selectedItems = SELECTED_ITEMS_PROP_DEFAULT,
+  noItemsMessage,
+  onSelect,
+  rightFooter,
+  displayNameProp,
+  infoBoxMessage,
+  itemsRef,
+  currentCalculation,
+  setCurrentCalculation,
+  infoDataItem,
+  setInfoDataItem,
+  dataTypes,
+  dataTest,
+  onEDISave,
+  onEditClick,
+  isOptionViewMode,
+  supportsEDI
+}) => {
   const [state, setState] = useState({
     searchTerm: '',
     dataTypes,
@@ -230,13 +221,12 @@ const ItemSelector = _ref4 => {
     const item = selectedItems.find(item => item.value === value);
     return !item || item.isActive;
   };
-  const onSaveCalculation = async _ref5 => {
-    let {
-      id,
-      name,
-      expression,
-      isNew
-    } = _ref5;
+  const onSaveCalculation = async ({
+    id,
+    name,
+    expression,
+    isNew
+  }) => {
     onEDISave({
       id,
       name,
@@ -259,10 +249,9 @@ const ItemSelector = _ref4 => {
       }]);
     }
   };
-  const onDeleteCalculation = _ref6 => {
-    let {
-      id
-    } = _ref6;
+  const onDeleteCalculation = ({
+    id
+  }) => {
     // close the modal
     setCurrentCalculation();
 
@@ -303,12 +292,9 @@ const ItemSelector = _ref4 => {
       hidden: isOptionViewMode
     }) || "")
   }, /*#__PURE__*/React.createElement(Transfer, {
-    onChange: _ref7 => {
-      let {
-        selected
-      } = _ref7;
-      return onChange(selected);
-    },
+    onChange: ({
+      selected
+    }) => onChange(selected),
     selected: selectedItems.map(item => item.value),
     options: [...state.options,
     // remove items already in the options list
@@ -417,7 +403,4 @@ ItemSelector.propTypes = {
   onEDISave: PropTypes.func,
   onEditClick: PropTypes.func
 };
-ItemSelector.defaultProps = {
-  selectedItems: []
-};
 export default ItemSelector;

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

@@ -6,12 +6,11 @@ import i18n from '../../../locales/index.js';
 import { DATA_SETS_CONSTANTS } from '../../../modules/dataSets.js';
 import { DIMENSION_TYPE_ALL } from '../../../modules/dataTypes.js';
 import styles from './styles/MetricSelector.style.js';
-export const MetricSelector = _ref => {
-  let {
-    currentValue,
-    onChange,
-    dataTest
-  } = _ref;
+export const MetricSelector = ({
+  currentValue,
+  onChange,
+  dataTest
+}) => {
   return /*#__PURE__*/React.createElement("div", {
     className: `jsx-${styles.__hash}` + " " + "metric-container"
   }, /*#__PURE__*/React.createElement(SingleSelectField, {

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

@@ -4,16 +4,16 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_INDICATOR, DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM } from '../../modules/dataTypes.js';
 import styles from './styles/EmptyPlaceholder.style.js';
-export const SourceEmptyPlaceholder = _ref => {
-  let {
-    loading,
-    searchTerm,
-    options,
-    allItemsSelectedMessage,
-    noItemsMessage,
-    dataType,
-    dataTest
-  } = _ref;
+const OPTIONS_PROP_DEFAULT = [];
+export const SourceEmptyPlaceholder = ({
+  loading,
+  searchTerm,
+  options = OPTIONS_PROP_DEFAULT,
+  allItemsSelectedMessage,
+  noItemsMessage,
+  dataType,
+  dataTest
+}) => {
   let message = '';
   if (allItemsSelectedMessage && !loading && options.length && !searchTerm) {
     message = allItemsSelectedMessage;
@@ -91,9 +91,6 @@ export const SourceEmptyPlaceholder = _ref => {
     id: styles.__hash
   }, styles));
 };
-SourceEmptyPlaceholder.defaultProps = {
-  options: []
-};
 SourceEmptyPlaceholder.propTypes = {
   allItemsSelectedMessage: PropTypes.string,
   dataTest: PropTypes.string,