@dhis2/analytics 28.0.3 → 28.0.5

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

@@ -12,35 +12,29 @@ var _expressions = require("../../../modules/expressions.js");
 var _Operator = _interopRequireDefault(require("./Operator.js"));
 var _MathOperatorSelectorStyle = _interopRequireDefault(require("./styles/MathOperatorSelector.style.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const MathOperatorSelector = _ref => {
-  let {
-    onDoubleClick
-  } = _ref;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    className: `jsx-${_MathOperatorSelectorStyle.default.__hash}` + " " + "wrapper"
-  }, /*#__PURE__*/_react.default.createElement("h4", {
-    className: `jsx-${_MathOperatorSelectorStyle.default.__hash}` + " " + "sub-header"
-  }, _index.default.t('Math operators')), /*#__PURE__*/_react.default.createElement("div", {
-    "data-test": "operators-list",
-    className: `jsx-${_MathOperatorSelectorStyle.default.__hash}` + " " + "operators"
-  }, (0, _expressions.getOperators)().map((_ref2, index) => {
-    let {
-      label,
-      value,
-      type
-    } = _ref2;
-    return /*#__PURE__*/_react.default.createElement(_Operator.default, {
-      key: `${label}-${index}`,
-      label: label,
-      value: value,
-      type: type,
-      index: index,
-      onDoubleClick: onDoubleClick
-    });
-  }))), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: _MathOperatorSelectorStyle.default.__hash
-  }, _MathOperatorSelectorStyle.default));
-};
+const MathOperatorSelector = ({
+  onDoubleClick
+}) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+  className: `jsx-${_MathOperatorSelectorStyle.default.__hash}` + " " + "wrapper"
+}, /*#__PURE__*/_react.default.createElement("h4", {
+  className: `jsx-${_MathOperatorSelectorStyle.default.__hash}` + " " + "sub-header"
+}, _index.default.t('Math operators')), /*#__PURE__*/_react.default.createElement("div", {
+  "data-test": "operators-list",
+  className: `jsx-${_MathOperatorSelectorStyle.default.__hash}` + " " + "operators"
+}, (0, _expressions.getOperators)().map(({
+  label,
+  value,
+  type
+}, index) => /*#__PURE__*/_react.default.createElement(_Operator.default, {
+  key: `${label}-${index}`,
+  label: label,
+  value: value,
+  type: type,
+  index: index,
+  onDoubleClick: onDoubleClick
+})))), /*#__PURE__*/_react.default.createElement(_style.default, {
+  id: _MathOperatorSelectorStyle.default.__hash
+}, _MathOperatorSelectorStyle.default));
 MathOperatorSelector.propTypes = {
   onDoubleClick: _propTypes.default.func.isRequired
 };

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

@@ -15,13 +15,12 @@ var _FormulaItemStyle = _interopRequireDefault(require("./styles/FormulaItem.sty
 var _OperatorStyle = _interopRequireDefault(require("./styles/Operator.style.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-const Operator = _ref => {
-  let {
-    label,
-    value,
-    type,
-    onDoubleClick
-  } = _ref;
+const Operator = ({
+  label,
+  value,
+  type,
+  onDoubleClick
+}) => {
   const data = {
     label,
     value,

package/build/cjs/components/DataDimension/DataDimension.js

@@ -12,42 +12,34 @@ var _predefinedDimensions = require("../../modules/predefinedDimensions.js");
 var _InfoPopover = require("./Info/InfoPopover.js");
 var _ItemOptionsSelector = require("./ItemOptionsSelector/ItemOptionsSelector.js");
 var _ItemSelector = _interopRequireDefault(require("./ItemSelector/ItemSelector.js"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 const DataDimensionCtx = /*#__PURE__*/(0, _react.createContext)({});
-const DataDimension = _ref => {
-  let {
-    currentUser,
-    onSelect,
-    selectedDimensions,
-    displayNameProp,
-    enabledDataTypes,
-    infoBoxMessage,
-    onCalculationSave,
-    visType
-  } = _ref;
+const SELECTED_DIMENSIONS_PROP_DEFAULT = [];
+const DataDimension = ({
+  currentUser,
+  onSelect = Function.prototype,
+  selectedDimensions = SELECTED_DIMENSIONS_PROP_DEFAULT,
+  displayNameProp,
+  enabledDataTypes,
+  infoBoxMessage,
+  onCalculationSave,
+  visType
+}) => {
   const {
     serverVersion
   } = (0, _appRuntime.useConfig)();
   const itemsRef = (0, _react.useRef)(new Map());
-  const filterDataTypesByVersion = (0, _react.useCallback)(dataTypes => dataTypes.filter(_ref2 => {
-    let {
-      id
-    } = _ref2;
-    return (
-      // Calculations only available from 2.40
-      id !== _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM || serverVersion.minor >= 40
-    );
-  }), [serverVersion.minor]);
+  const filterDataTypesByVersion = (0, _react.useCallback)(dataTypes => dataTypes.filter(({
+    id
+  }) =>
+  // Calculations only available from 2.40
+  id !== _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM || serverVersion.minor >= 40), [serverVersion.minor]);
   const [dataTypes, setDataTypes] = (0, _react.useState)(filterDataTypesByVersion(enabledDataTypes || Object.values(_dataTypes.dataTypeMap)));
-  const supportsEDI = dataTypes.map(_ref3 => {
-    let {
-      id
-    } = _ref3;
-    return id;
-  }).includes(_dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM);
+  const supportsEDI = dataTypes.map(({
+    id
+  }) => id).includes(_dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM);
   const [currentCalculation, setCurrentCalculation] = (0, _react.useState)();
   const [currentDataItem, setCurrentDataItem] = (0, _react.useState)();
   const [infoDataItem, setInfoDataItem] = (0, _react.useState)();
@@ -144,10 +136,6 @@ DataDimension.propTypes = {
   visType: _propTypes.default.string,
   onCalculationSave: _propTypes.default.func
 };
-DataDimension.defaultProps = {
-  selectedDimensions: [],
-  onSelect: Function.prototype
-};
 const useDataDimensionContext = () => (0, _react.useContext)(DataDimensionCtx);
 exports.useDataDimensionContext = useDataDimensionContext;
 var _default = exports.default = DataDimension;

package/build/cjs/components/DataDimension/Info/CalculationInfo.js

@@ -12,34 +12,26 @@ var _expression = require("../../../api/expression.js");
 var _index = _interopRequireDefault(require("../../../locales/index.js"));
 var _InfoTable = require("./InfoTable.js");
 var _InfoPopoverStyle = _interopRequireDefault(require("./styles/InfoPopover.style.js"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const calculationQuery = {
   calculation: {
     resource: 'expressionDimensionItems',
-    id: _ref => {
-      let {
-        id
-      } = _ref;
-      return id;
-    },
-    params: _ref2 => {
-      let {
-        displayNameProp
-      } = _ref2;
-      return {
-        fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},expression`
-      };
-    }
+    id: ({
+      id
+    }) => id,
+    params: ({
+      displayNameProp
+    }) => ({
+      fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},expression`
+    })
   }
 };
-const CalculationInfo = _ref3 => {
-  let {
-    type,
-    id,
-    displayNameProp
-  } = _ref3;
+const CalculationInfo = ({
+  type,
+  id,
+  displayNameProp
+}) => {
   const [data, setData] = (0, _react.useState)();
   const [error, setError] = (0, _react.useState)();
   const [expressionError, setExpressionError] = (0, _react.useState)();

package/build/cjs/components/DataDimension/Info/DataElementInfo.js

@@ -16,28 +16,21 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const dataElementQuery = {
   dataElement: {
     resource: 'dataElements',
-    id: _ref => {
-      let {
-        id
-      } = _ref;
-      return id;
-    },
-    params: _ref2 => {
-      let {
-        displayNameProp
-      } = _ref2;
-      return {
-        fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},aggregationType,categoryCombo[displayName,categories[id,displayName]],dataElementGroups[id,displayName],dataSetElements[dataSet[id,displayName]],legendSets[id,displayName],optionSet[displayName],valueType,zeroIsSignificant`
-      };
-    }
+    id: ({
+      id
+    }) => id,
+    params: ({
+      displayNameProp
+    }) => ({
+      fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},aggregationType,categoryCombo[displayName,categories[id,displayName]],dataElementGroups[id,displayName],dataSetElements[dataSet[id,displayName]],legendSets[id,displayName],optionSet[displayName],valueType,zeroIsSignificant`
+    })
   }
 };
-const DataElementInfo = _ref3 => {
-  let {
-    type,
-    id,
-    displayNameProp
-  } = _ref3;
+const DataElementInfo = ({
+  type,
+  id,
+  displayNameProp
+}) => {
   const {
     loading,
     error,
@@ -59,12 +52,9 @@ const DataElementInfo = _ref3 => {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, _index.default.t('Data set(s)')), /*#__PURE__*/_react.default.createElement("td", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
-  }, (data === null || data === void 0 ? void 0 : data.dataElement.dataSetElements) && (0, _InfoTable.renderDataSets)(data.dataElement.dataSetElements.map(_ref4 => {
-    let {
-      dataSet
-    } = _ref4;
-    return dataSet;
-  })))), /*#__PURE__*/_react.default.createElement("tr", {
+  }, (data === null || data === void 0 ? void 0 : data.dataElement.dataSetElements) && (0, _InfoTable.renderDataSets)(data.dataElement.dataSetElements.map(({
+    dataSet
+  }) => dataSet)))), /*#__PURE__*/_react.default.createElement("tr", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, /*#__PURE__*/_react.default.createElement("th", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
@@ -96,16 +86,13 @@ const DataElementInfo = _ref3 => {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, data === null || data === void 0 ? void 0 : data.dataElement.categoryCombo.displayName), /*#__PURE__*/_react.default.createElement("ul", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
-  }, data === null || data === void 0 ? void 0 : data.dataElement.categoryCombo.categories.map(_ref5 => {
-    let {
-      id,
-      displayName
-    } = _ref5;
-    return /*#__PURE__*/_react.default.createElement("li", {
-      key: id,
-      className: `jsx-${_InfoPopoverStyle.default.__hash}`
-    }, displayName);
-  }))))), (data === null || data === void 0 ? void 0 : data.dataElement.optionSet) && /*#__PURE__*/_react.default.createElement("tr", {
+  }, data === null || data === void 0 ? void 0 : data.dataElement.categoryCombo.categories.map(({
+    id,
+    displayName
+  }) => /*#__PURE__*/_react.default.createElement("li", {
+    key: id,
+    className: `jsx-${_InfoPopoverStyle.default.__hash}`
+  }, displayName)))))), (data === null || data === void 0 ? void 0 : data.dataElement.optionSet) && /*#__PURE__*/_react.default.createElement("tr", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, /*#__PURE__*/_react.default.createElement("th", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`

package/build/cjs/components/DataDimension/Info/DataElementOperandInfo.js

@@ -12,30 +12,25 @@ var _index = _interopRequireDefault(require("../../../locales/index.js"));
 var _valueTypes = require("../../../modules/valueTypes.js");
 var _InfoTable = require("./InfoTable.js");
 var _InfoPopoverStyle = _interopRequireDefault(require("./styles/InfoPopover.style.js"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const dataElementOperandsQuery = {
   dataElementOperands: {
     resource: 'dataElementOperands',
-    params: _ref => {
-      let {
-        displayNameProp,
-        id
-      } = _ref;
-      return {
-        filter: `id:eq:${id}`,
-        fields: [`${(0, _InfoTable.getCommonFields)(displayNameProp)}`, 'categoryOptionCombo[categoryCombo[categories[displayName,id],displayName],displayName]', `dataElement[${(0, _InfoTable.getCommonFields)(displayNameProp)},aggregationType,categoryCombo[displayName,categories[id,displayName]],dataElementGroups[id,displayName],dataSetElements[dataSet[id,displayName]],legendSets[id,displayName],optionSet[displayName],valueType,zeroIsSignificant]`, 'displayName,id']
-      };
-    }
+    params: ({
+      displayNameProp,
+      id
+    }) => ({
+      filter: `id:eq:${id}`,
+      fields: [`${(0, _InfoTable.getCommonFields)(displayNameProp)}`, 'categoryOptionCombo[categoryCombo[categories[displayName,id],displayName],displayName]', `dataElement[${(0, _InfoTable.getCommonFields)(displayNameProp)},aggregationType,categoryCombo[displayName,categories[id,displayName]],dataElementGroups[id,displayName],dataSetElements[dataSet[id,displayName]],legendSets[id,displayName],optionSet[displayName],valueType,zeroIsSignificant]`, 'displayName,id']
+    })
   }
 };
-const DataElementOperandInfo = _ref2 => {
-  let {
-    type,
-    id,
-    displayNameProp
-  } = _ref2;
+const DataElementOperandInfo = ({
+  type,
+  id,
+  displayNameProp
+}) => {
   const [data, setData] = (0, _react.useState)();
   const [error, setError] = (0, _react.useState)();
   const [loading, setLoading] = (0, _react.useState)(true);
@@ -83,12 +78,9 @@ const DataElementOperandInfo = _ref2 => {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, _index.default.t('Data set(s)')), /*#__PURE__*/_react.default.createElement("td", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
-  }, (data === null || data === void 0 ? void 0 : data.dataElementOperand.dataElement.dataSetElements) && (0, _InfoTable.renderDataSets)(data.dataElementOperand.dataElement.dataSetElements.map(_ref3 => {
-    let {
-      dataSet
-    } = _ref3;
-    return dataSet;
-  })))), /*#__PURE__*/_react.default.createElement("tr", {
+  }, (data === null || data === void 0 ? void 0 : data.dataElementOperand.dataElement.dataSetElements) && (0, _InfoTable.renderDataSets)(data.dataElementOperand.dataElement.dataSetElements.map(({
+    dataSet
+  }) => dataSet)))), /*#__PURE__*/_react.default.createElement("tr", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, /*#__PURE__*/_react.default.createElement("th", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
@@ -120,16 +112,13 @@ const DataElementOperandInfo = _ref2 => {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, data === null || data === void 0 ? void 0 : data.dataElementOperand.dataElement.categoryCombo.displayName), /*#__PURE__*/_react.default.createElement("ul", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
-  }, data === null || data === void 0 ? void 0 : data.dataElementOperand.dataElement.categoryCombo.categories.map(_ref4 => {
-    let {
-      id,
-      displayName
-    } = _ref4;
-    return /*#__PURE__*/_react.default.createElement("li", {
-      key: id,
-      className: `jsx-${_InfoPopoverStyle.default.__hash}`
-    }, displayName);
-  }))))), (data === null || data === void 0 ? void 0 : data.dataElementOperand.dataElement.optionSet) && /*#__PURE__*/_react.default.createElement("tr", {
+  }, data === null || data === void 0 ? void 0 : data.dataElementOperand.dataElement.categoryCombo.categories.map(({
+    id,
+    displayName
+  }) => /*#__PURE__*/_react.default.createElement("li", {
+    key: id,
+    className: `jsx-${_InfoPopoverStyle.default.__hash}`
+  }, displayName)))))), (data === null || data === void 0 ? void 0 : data.dataElementOperand.dataElement.optionSet) && /*#__PURE__*/_react.default.createElement("tr", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, /*#__PURE__*/_react.default.createElement("th", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
@@ -167,16 +156,13 @@ const DataElementOperandInfo = _ref2 => {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, /*#__PURE__*/_react.default.createElement("ul", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
-  }, data === null || data === void 0 ? void 0 : data.dataElementOperand.categoryOptionCombo.categoryCombo.categories.map(_ref5 => {
-    let {
-      id,
-      displayName
-    } = _ref5;
-    return /*#__PURE__*/_react.default.createElement("li", {
-      key: id,
-      className: `jsx-${_InfoPopoverStyle.default.__hash}`
-    }, displayName);
-  }))))), /*#__PURE__*/_react.default.createElement(_style.default, {
+  }, data === null || data === void 0 ? void 0 : data.dataElementOperand.categoryOptionCombo.categoryCombo.categories.map(({
+    id,
+    displayName
+  }) => /*#__PURE__*/_react.default.createElement("li", {
+    key: id,
+    className: `jsx-${_InfoPopoverStyle.default.__hash}`
+  }, displayName)))))), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _InfoPopoverStyle.default.__hash
   }, _InfoPopoverStyle.default));
 };

package/build/cjs/components/DataDimension/Info/DataSetInfo.js

@@ -15,28 +15,21 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const dataSetQuery = {
   dataSet: {
     resource: 'dataSets',
-    id: _ref => {
-      let {
-        id
-      } = _ref;
-      return id;
-    },
-    params: _ref2 => {
-      let {
-        displayNameProp
-      } = _ref2;
-      return {
-        fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},dataSetElements[dataElement[id,displayName]],expiryDays,indicators[id,displayName],periodType,`
-      };
-    }
+    id: ({
+      id
+    }) => id,
+    params: ({
+      displayNameProp
+    }) => ({
+      fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},dataSetElements[dataElement[id,displayName]],expiryDays,indicators[id,displayName],periodType,`
+    })
   }
 };
-const DataSetInfo = _ref3 => {
-  let {
-    type,
-    id,
-    displayNameProp
-  } = _ref3;
+const DataSetInfo = ({
+  type,
+  id,
+  displayNameProp
+}) => {
   const {
     loading,
     error,
@@ -68,15 +61,12 @@ const DataSetInfo = _ref3 => {
     className: `jsx-${_InfoPopoverStyle.default.__hash}` + " " + "content-wrap"
   }, /*#__PURE__*/_react.default.createElement("ul", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
-  }, data === null || data === void 0 ? void 0 : data.dataSet.dataSetElements.map(_ref4 => {
-    let {
-      dataElement
-    } = _ref4;
-    return /*#__PURE__*/_react.default.createElement("li", {
-      key: dataElement.id,
-      className: `jsx-${_InfoPopoverStyle.default.__hash}`
-    }, dataElement.displayName);
-  }))))), /*#__PURE__*/_react.default.createElement("tr", {
+  }, data === null || data === void 0 ? void 0 : data.dataSet.dataSetElements.map(({
+    dataElement
+  }) => /*#__PURE__*/_react.default.createElement("li", {
+    key: dataElement.id,
+    className: `jsx-${_InfoPopoverStyle.default.__hash}`
+  }, dataElement.displayName)))))), /*#__PURE__*/_react.default.createElement("tr", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, /*#__PURE__*/_react.default.createElement("th", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
@@ -86,16 +76,13 @@ const DataSetInfo = _ref3 => {
     className: `jsx-${_InfoPopoverStyle.default.__hash}` + " " + "content-wrap"
   }, /*#__PURE__*/_react.default.createElement("ul", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
-  }, data.dataSet.indicators.map(_ref5 => {
-    let {
-      id,
-      displayName
-    } = _ref5;
-    return /*#__PURE__*/_react.default.createElement("li", {
-      key: id,
-      className: `jsx-${_InfoPopoverStyle.default.__hash}`
-    }, displayName);
-  }))) : /*#__PURE__*/_react.default.createElement("span", {
+  }, data.dataSet.indicators.map(({
+    id,
+    displayName
+  }) => /*#__PURE__*/_react.default.createElement("li", {
+    key: id,
+    className: `jsx-${_InfoPopoverStyle.default.__hash}`
+  }, displayName)))) : /*#__PURE__*/_react.default.createElement("span", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}` + " " + "none"
   }, _index.default.t('None')))), /*#__PURE__*/_react.default.createElement("tr", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`

package/build/cjs/components/DataDimension/Info/EventDataItemInfo.js

@@ -17,47 +17,34 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const programDataElementQuery = {
   programDataElement: {
     resource: 'dataElements',
-    id: _ref => {
-      let {
-        id
-      } = _ref;
-      return id;
-    },
-    params: _ref2 => {
-      let {
-        displayNameProp
-      } = _ref2;
-      return {
-        fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},aggregationType,dimensionItemType,legendSets[id,displayName],optionSet[displayName],valueType,zeroIsSignificant`
-      };
-    }
+    id: ({
+      id
+    }) => id,
+    params: ({
+      displayNameProp
+    }) => ({
+      fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},aggregationType,dimensionItemType,legendSets[id,displayName],optionSet[displayName],valueType,zeroIsSignificant`
+    })
   }
 };
 const programAttributeQuery = {
   programAttribute: {
     resource: 'trackedEntityAttributes',
-    id: _ref3 => {
-      let {
-        id
-      } = _ref3;
-      return id;
-    },
-    params: _ref4 => {
-      let {
-        displayNameProp
-      } = _ref4;
-      return {
-        fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},aggregationType,dimensionItemType,legendSets[id,displayName],optionSet[displayName],valueType,zeroIsSignificant`
-      };
-    }
+    id: ({
+      id
+    }) => id,
+    params: ({
+      displayNameProp
+    }) => ({
+      fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},aggregationType,dimensionItemType,legendSets[id,displayName],optionSet[displayName],valueType,zeroIsSignificant`
+    })
   }
 };
-const EventDataItemInfo = _ref5 => {
-  let {
-    type,
-    id,
-    displayNameProp
-  } = _ref5;
+const EventDataItemInfo = ({
+  type,
+  id,
+  displayNameProp
+}) => {
   const {
     loading,
     error,

package/build/cjs/components/DataDimension/Info/IndicatorInfo.js

@@ -12,34 +12,26 @@ var _expression = require("../../../api/expression.js");
 var _index = _interopRequireDefault(require("../../../locales/index.js"));
 var _InfoTable = require("./InfoTable.js");
 var _InfoPopoverStyle = _interopRequireDefault(require("./styles/InfoPopover.style.js"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const indicatorQuery = {
   indicator: {
     resource: 'indicators',
-    id: _ref => {
-      let {
-        id
-      } = _ref;
-      return id;
-    },
-    params: _ref2 => {
-      let {
-        displayNameProp
-      } = _ref2;
-      return {
-        fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},annualized,dataSets[id,displayName],decimals,denominator,displayDenominatorDescription,displayNumeratorDescription,indicatorGroups[id,displayName],indicatorType[displayName,factor],legendSets[id,displayName],numerator`
-      };
-    }
+    id: ({
+      id
+    }) => id,
+    params: ({
+      displayNameProp
+    }) => ({
+      fields: `${(0, _InfoTable.getCommonFields)(displayNameProp)},annualized,dataSets[id,displayName],decimals,denominator,displayDenominatorDescription,displayNumeratorDescription,indicatorGroups[id,displayName],indicatorType[displayName,factor],legendSets[id,displayName],numerator`
+    })
   }
 };
-const IndicatorInfo = _ref3 => {
-  let {
-    type,
-    id,
-    displayNameProp
-  } = _ref3;
+const IndicatorInfo = ({
+  type,
+  id,
+  displayNameProp
+}) => {
   const [data, setData] = (0, _react.useState)();
   const [error, setError] = (0, _react.useState)();
   const [loading, setLoading] = (0, _react.useState)(true);
@@ -146,16 +138,13 @@ const IndicatorInfo = _ref3 => {
     className: `jsx-${_InfoPopoverStyle.default.__hash}` + " " + "content-wrap"
   }, /*#__PURE__*/_react.default.createElement("ul", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
-  }, data.indicator.dataSets.map(_ref4 => {
-    let {
-      id,
-      displayName
-    } = _ref4;
-    return /*#__PURE__*/_react.default.createElement("li", {
-      key: id,
-      className: `jsx-${_InfoPopoverStyle.default.__hash}`
-    }, displayName);
-  }))))), /*#__PURE__*/_react.default.createElement("tr", {
+  }, data.indicator.dataSets.map(({
+    id,
+    displayName
+  }) => /*#__PURE__*/_react.default.createElement("li", {
+    key: id,
+    className: `jsx-${_InfoPopoverStyle.default.__hash}`
+  }, displayName)))))), /*#__PURE__*/_react.default.createElement("tr", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`
   }, /*#__PURE__*/_react.default.createElement("th", {
     className: `jsx-${_InfoPopoverStyle.default.__hash}`