@dhis2/analytics 26.0.8 → 26.0.9

package/build/cjs/components/AboutAOUnit/AboutAOUnit.js

@@ -4,40 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _style = _interopRequireDefault(require("styled-jsx/style"));
-
 var _appRuntime = require("@dhis2/app-runtime");
-
 var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
-
 var _d2UiRichText = require("@dhis2/d2-ui-rich-text");
-
 var _ui = require("@dhis2/ui");
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _moment = _interopRequireDefault(require("moment"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _list = require("../../modules/list.js");
-
 var _AboutAOUnitStyle = _interopRequireDefault(require("./styles/AboutAOUnit.style.js"));
-
 var _utils = require("./utils.js");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const READ_ONLY = 'r';
 const READ_AND_WRITE = 'rw';
-
 const getQueries = type => ({
   ao: {
     resource: _utils.AOTypeMap[type].apiEndpoint,
@@ -61,20 +44,16 @@ const getQueries = type => ({
     }
   }
 });
-
 const getSubscribeMutation = (type, id) => ({
-  resource: "".concat(_utils.AOTypeMap[type].apiEndpoint, "/").concat(id, "/subscriber"),
+  resource: `${_utils.AOTypeMap[type].apiEndpoint}/${id}/subscriber`,
   type: 'create'
 });
-
 const getUnsubscribeMutation = (type, id) => ({
-  resource: "".concat(_utils.AOTypeMap[type].apiEndpoint, "/").concat(id, "/subscriber"),
+  resource: `${_utils.AOTypeMap[type].apiEndpoint}/${id}/subscriber`,
   type: 'delete'
 });
-
 const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
   var _data$ao$createdBy;
-
   let {
     type,
     id,
@@ -123,30 +102,24 @@ const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
   (0, _react.useImperativeHandle)(ref, () => ({
     refresh: refetch
   }), [refetch]);
-
   const getAccessLevelString = access => {
-    const re = new RegExp("(?<accessLevel>".concat(READ_AND_WRITE, "?)"));
+    const re = new RegExp(`(?<accessLevel>${READ_AND_WRITE}?)`);
     const accessMatch = re.exec(access);
-
     switch (accessMatch.groups.accessLevel) {
       case READ_ONLY:
         return _d2I18n.default.t('view only');
-
       case READ_AND_WRITE:
         return _d2I18n.default.t('view and edit');
     }
   };
-
   const getSharingSummary = ao => {
     const sharingTextParts = [];
-    const re = new RegExp("^".concat(READ_AND_WRITE, "?"));
-
+    const re = new RegExp(`^${READ_AND_WRITE}?`);
     if (re.test(ao.sharing.public)) {
       sharingTextParts.push(_d2I18n.default.t('all users ({{accessLevel}})', {
         accessLevel: getAccessLevelString(ao.sharing.public)
       }));
     }
-
     const userAccesses = ao.sharing.users;
     const groupAccesses = ao.sharing.userGroups;
     Object.values(userAccesses).concat(Object.values(groupAccesses)).forEach(accessRule => {
@@ -159,44 +132,43 @@ const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
       commaSeparatedListOfUsersAndGroups: (0, _list.formatList)(sharingTextParts)
     }) : _d2I18n.default.t('Not shared with any users or groups');
   };
-
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + ((0, _classnames.default)('container', {
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + ((0, _classnames.default)('container', {
       expanded: isExpanded
     }) || "")
   }, /*#__PURE__*/_react.default.createElement("div", {
     onClick: () => setIsExpanded(!isExpanded),
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "header"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "header"
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "title"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "title"
   }, (0, _utils.getTranslatedString)(type, 'unitTitle')), isExpanded ? /*#__PURE__*/_react.default.createElement(_ui.IconChevronUp24, {
     color: _ui.colors.grey700
   }) : /*#__PURE__*/_react.default.createElement(_ui.IconChevronDown24, {
     color: _ui.colors.grey700
   })), isExpanded && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, dataIsLoading && /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "loader"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "loader"
   }, /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, {
     small: true
   })), data && /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "content"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "content"
   }, /*#__PURE__*/_react.default.createElement("p", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + ((0, _classnames.default)('detailLine', {
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + ((0, _classnames.default)('detailLine', {
       noDescription: !data.ao.displayDescription
     }) || "")
   }, data.ao.displayDescription ? /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, data.ao.displayDescription) : _d2I18n.default.t('No description')), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash)
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}`
   }, /*#__PURE__*/_react.default.createElement("p", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "detailLine"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "detailLine"
   }, /*#__PURE__*/_react.default.createElement(_ui.IconShare16, {
     color: _ui.colors.grey700
   }), getSharingSummary(data.ao)), /*#__PURE__*/_react.default.createElement("p", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "detailLine"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "detailLine"
   }, /*#__PURE__*/_react.default.createElement(_ui.IconClock16, {
     color: _ui.colors.grey700
   }), _d2I18n.default.t('Last updated {{time}}', {
     time: (0, _moment.default)(data.ao.lastUpdated).fromNow()
   })), /*#__PURE__*/_react.default.createElement("p", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "detailLine"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "detailLine"
   }, /*#__PURE__*/_react.default.createElement(_ui.IconUser16, {
     color: _ui.colors.grey700
   }), (_data$ao$createdBy = data.ao.createdBy) !== null && _data$ao$createdBy !== void 0 && _data$ao$createdBy.displayName ? _d2I18n.default.t('Created {{time}} by {{author}}', {
@@ -205,7 +177,7 @@ const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
   }) : _d2I18n.default.t('Created {{time}}', {
     time: (0, _moment.default)(data.ao.created).fromNow()
   })), /*#__PURE__*/_react.default.createElement("p", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "detailLine"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "detailLine"
   }, /*#__PURE__*/_react.default.createElement(_ui.IconView16, {
     color: _ui.colors.grey700
   }), _d2I18n.default.t('Viewed {{count}} times', {
@@ -213,11 +185,11 @@ const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
     defaultValue: 'Viewed 1 time',
     defaultValue_plural: 'Viewed {{count}} times'
   }))), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "subsection"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "subsection"
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "subsectionTitle"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "subsectionTitle"
   }, _d2I18n.default.t('Notifications')), data.ao.subscribed ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "subscriptionLabel"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "subscriptionLabel"
   }, _d2I18n.default.t("You're subscribed and getting updates about new interpretations.")), /*#__PURE__*/_react.default.createElement(_ui.Button, {
     icon: /*#__PURE__*/_react.default.createElement(_ui.IconSubscribeOff24, {
       color: _ui.colors.grey700
@@ -227,7 +199,7 @@ const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
     loading: unsubscribeIsLoading,
     onClick: unsubscribe
   }, _d2I18n.default.t('Unsubscribe'))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
-    className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "subscriptionLabel"
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "subscriptionLabel"
   }, _d2I18n.default.t('Subscribe to get updates about new interpretations.')), /*#__PURE__*/_react.default.createElement(_ui.Button, {
     icon: /*#__PURE__*/_react.default.createElement(_ui.IconSubscribe24, {
       color: _ui.colors.grey700

package/build/cjs/components/AboutAOUnit/styles/AboutAOUnit.style.js

@@ -4,10 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _ui = require("@dhis2/ui");
-
-const _defaultExport = [".container.jsx-1596217846{position:relative;padding:".concat(_ui.spacers.dp16, ";border-bottom:1px solid ").concat(_ui.colors.grey400, ";background-color:").concat(_ui.colors.white, ";}"), ".expanded.jsx-1596217846{padding-bottom:".concat(_ui.spacers.dp32, ";}"), ".loader.jsx-1596217846{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".header.jsx-1596217846{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;}", ".title.jsx-1596217846{font-size:16px;font-weight:500;line-height:21px;color:".concat(_ui.colors.grey900, ";}"), ".content.jsx-1596217846{font-size:14px;line-height:18px;color:".concat(_ui.colors.grey900, ";}"), ".detailLine.jsx-1596217846{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin:0;padding:".concat(_ui.spacers.dp12, " 0 0 0;gap:").concat(_ui.spacers.dp8, ";}"), ".detailLine.jsx-1596217846 svg.jsx-1596217846{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;}", ".noDescription.jsx-1596217846{color:".concat(_ui.colors.grey600, ";}"), ".subsection.jsx-1596217846{margin-top:".concat(_ui.spacers.dp24, ";}"), ".subsectionTitle.jsx-1596217846{color:".concat(_ui.colors.grey700, ";font-weight:500;}"), ".subscriptionLabel.jsx-1596217846{margin:".concat(_ui.spacers.dp12, " 0 ").concat(_ui.spacers.dp8, " 0;}"), ".subsection.jsx-1596217846 button.jsx-1596217846{margin-top:".concat(_ui.spacers.dp8, ";}")];
+const _defaultExport = [`.container.jsx-1596217846{position:relative;padding:${_ui.spacers.dp16};border-bottom:1px solid ${_ui.colors.grey400};background-color:${_ui.colors.white};}`, `.expanded.jsx-1596217846{padding-bottom:${_ui.spacers.dp32};}`, ".loader.jsx-1596217846{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".header.jsx-1596217846{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;}", `.title.jsx-1596217846{font-size:16px;font-weight:500;line-height:21px;color:${_ui.colors.grey900};}`, `.content.jsx-1596217846{font-size:14px;line-height:18px;color:${_ui.colors.grey900};}`, `.detailLine.jsx-1596217846{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin:0;padding:${_ui.spacers.dp12} 0 0 0;gap:${_ui.spacers.dp8};}`, ".detailLine.jsx-1596217846 svg.jsx-1596217846{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;}", `.noDescription.jsx-1596217846{color:${_ui.colors.grey600};}`, `.subsection.jsx-1596217846{margin-top:${_ui.spacers.dp24};}`, `.subsectionTitle.jsx-1596217846{color:${_ui.colors.grey700};font-weight:500;}`, `.subscriptionLabel.jsx-1596217846{margin:${_ui.spacers.dp12} 0 ${_ui.spacers.dp8} 0;}`, `.subsection.jsx-1596217846 button.jsx-1596217846{margin-top:${_ui.spacers.dp8};}`];
 _defaultExport.__hash = "1596217846";
 var _default = _defaultExport;
 exports.default = _default;

package/build/cjs/components/AboutAOUnit/utils.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getTranslatedString = exports.AO_TYPE_VISUALIZATION = exports.AO_TYPE_MAP = exports.AO_TYPE_EVENT_VISUALIZATION = exports.AOTypeMap = void 0;
-
 var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const AO_TYPE_VISUALIZATION = 'visualization';
 exports.AO_TYPE_VISUALIZATION = AO_TYPE_VISUALIZATION;
 const AO_TYPE_MAP = 'map';
@@ -42,7 +39,5 @@ const texts = {
     unitTitle: _d2I18n.default.t('About this visualization')
   }
 };
-
 const getTranslatedString = (type, key) => (texts[type] || texts[NO_TYPE])[key];
-
 exports.getTranslatedString = getTranslatedString;

package/build/cjs/components/CachedDataQueryProvider.js

@@ -4,25 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useCachedDataQuery = exports.CachedDataQueryProvider = void 0;
-
 var _appRuntime = require("@dhis2/app-runtime");
-
 var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
-
 var _ui = require("@dhis2/ui");
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const CachedDataQueryCtx = /*#__PURE__*/(0, _react.createContext)({});
-
 const CachedDataQueryProvider = _ref => {
   let {
     query,
@@ -38,34 +28,27 @@ const CachedDataQueryProvider = _ref => {
     loading
   } = rest;
   const data = rawData && dataTransformation ? dataTransformation(rawData) : rawData;
-
   if (loading) {
     return /*#__PURE__*/_react.default.createElement(_ui.Layer, {
       translucent: true
     }, /*#__PURE__*/_react.default.createElement(_ui.CenteredContent, null, /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, null)));
   }
-
   if (error) {
     const fallbackMsg = _d2I18n.default.t('This app could not retrieve required data.');
-
     return /*#__PURE__*/_react.default.createElement(_ui.NoticeBox, {
       error: true,
       title: _d2I18n.default.t('Network error')
     }, error.message || fallbackMsg);
   }
-
   return /*#__PURE__*/_react.default.createElement(CachedDataQueryCtx.Provider, {
     value: data
   }, children);
 };
-
 exports.CachedDataQueryProvider = CachedDataQueryProvider;
 CachedDataQueryProvider.propTypes = {
   children: _propTypes.default.node.isRequired,
   query: _propTypes.default.object.isRequired,
   dataTransformation: _propTypes.default.func
 };
-
 const useCachedDataQuery = () => (0, _react.useContext)(CachedDataQueryCtx);
-
 exports.useCachedDataQuery = useCachedDataQuery;

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

@@ -4,46 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _style = _interopRequireDefault(require("styled-jsx/style"));
-
 var _appRuntime = require("@dhis2/app-runtime");
-
 var _ui = require("@dhis2/ui");
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _expression = require("../../../api/expression.js");
-
 var _index = _interopRequireDefault(require("../../../locales/index.js"));
-
 var _expressions = require("../../../modules/expressions.js");
-
 var _OfflineTooltip = require("../../OfflineTooltip.js");
-
 var _DataElementSelector = _interopRequireDefault(require("./DataElementSelector.js"));
-
 var _DndContext = _interopRequireWildcard(require("./DndContext.js"));
-
 var _FormulaField = _interopRequireWildcard(require("./FormulaField.js"));
-
 var _MathOperatorSelector = _interopRequireDefault(require("./MathOperatorSelector.js"));
-
 var _CalculationModalStyle = _interopRequireDefault(require("./styles/CalculationModal.style.js"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const FIRST_POSITION = 0;
 const LAST_POSITION = -1;
-
 const CalculationModal = _ref => {
   let {
     calculation,
@@ -82,8 +62,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
         };
       }
@@ -95,8 +75,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
         };
       }
@@ -109,25 +89,27 @@ const CalculationModal = _ref => {
     lazy: true
   });
   (0, _react.useEffect)(() => {
-    const ids = (0, _expressions.getItemIdsFromExpression)(calculation.expression); // only fetch data if there are ids
+    const ids = (0, _expressions.getItemIdsFromExpression)(calculation.expression);
 
+    // only fetch data if there are ids
     if (ids !== null && ids !== void 0 && ids.length) {
       refetch({
         ids
       });
     } else {
-      setExpressionArray((0, _expressions.parseExpressionToArray)(calculation.expression).map((item, i) => ({ ...item,
-        id: "".concat(item.type, "-").concat(-i)
+      setExpressionArray((0, _expressions.parseExpressionToArray)(calculation.expression).map((item, i) => ({
+        ...item,
+        id: `${item.type}-${-i}`
       })));
     }
   }, [refetch, calculation.expression]);
   (0, _react.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((0, _expressions.parseExpressionToArray)(calculation.expression, metadata).map((item, i) => ({ ...item,
-        id: "".concat(item.type, "-").concat(-i)
+      setExpressionArray((0, _expressions.parseExpressionToArray)(calculation.expression, metadata).map((item, i) => ({
+        ...item,
+        id: `${item.type}-${-i}`
       })));
     }
   }, [data, calculation.expression]);
@@ -140,11 +122,8 @@ const CalculationModal = _ref => {
   const [focusItemId, setFocusItemId] = (0, _react.useState)(null);
   const [selectedItemId, setSelectedItemId] = (0, _react.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,
@@ -152,20 +131,17 @@ const CalculationModal = _ref => {
       type,
       destIndex = LAST_POSITION
     } = _ref4;
-
     if (isLoading) {
       return null;
     }
-
     setValidationOutput();
     const newItem = {
-      id: "".concat(type, "-").concat(newIdCount),
-      value: type === _expressions.EXPRESSION_TYPE_DATA ? "#{".concat(value, "}") : value,
+      id: `${type}-${newIdCount}`,
+      value: type === _expressions.EXPRESSION_TYPE_DATA ? `#{${value}}` : value,
       label,
       type
     };
     setNewIdCount(newIdCount + 1);
-
     if (destIndex === LAST_POSITION) {
       setExpressionArray(prevArray => prevArray.concat([newItem]));
     } else if (destIndex === FIRST_POSITION) {
@@ -175,29 +151,24 @@ const CalculationModal = _ref => {
       const newFormulaItems = [...items.slice(0, destIndex), newItem, ...items.slice(destIndex)];
       setExpressionArray(newFormulaItems);
     }
-
     if (newItem.type === _expressions.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,
@@ -208,7 +179,6 @@ const CalculationModal = _ref => {
     }) : item);
     setExpressionArray(updatedItems);
   };
-
   const removeItem = itemId => {
     if (!isLoading && itemId !== null) {
       setValidationOutput();
@@ -219,7 +189,6 @@ const CalculationModal = _ref => {
       setSelectedItemId(null);
     }
   };
-
   const addOrMoveDraggedItem = _ref7 => {
     let {
       item,
@@ -227,15 +196,14 @@ const CalculationModal = _ref => {
     } = _ref7;
     const destContainerId = destination.containerId;
     let destIndex = FIRST_POSITION;
-
     if (item.sourceContainerId === _DndContext.OPTIONS_PANEL) {
       if (destContainerId === _FormulaField.LAST_DROPZONE_ID) {
         destIndex = LAST_POSITION;
       } else if (destContainerId === _FormulaField.FORMULA_BOX_ID) {
         destIndex = destination.index + 1;
       }
-
-      addItem({ ...item.data,
+      addItem({
+        ...item.data,
         destIndex
       });
     } else {
@@ -244,45 +212,35 @@ const CalculationModal = _ref => {
       } else if (destContainerId === _FormulaField.FORMULA_BOX_ID) {
         destIndex = destination.index;
       }
-
       moveItem({
         sourceIndex: item.sourceIndex,
         destIndex
       });
     }
   };
-
   const validate = async () => {
     var _result;
-
     setValidationOutput();
     const expression = (0, _expressions.parseArrayToExpression)(expressionArray);
     let result = (0, _expressions.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 !== _expressions.VALID_EXPRESSION) {
       status = await validate();
     }
-
     if (status === _expressions.VALID_EXPRESSION) {
       var _response;
-
       let response;
       const expression = (0, _expressions.parseArrayToExpression)(expressionArray);
-
       if (calculation.id) {
         response = await updateCalculation({
           id: calculation.id,
@@ -295,7 +253,6 @@ const CalculationModal = _ref => {
           expression
         });
       }
-
       onSave({
         id: calculation.id || ((_response = response) === null || _response === void 0 ? void 0 : _response.response.uid),
         name,
@@ -303,10 +260,8 @@ const CalculationModal = _ref => {
         expression
       });
     }
-
     setIsSavingCalculation(false);
   };
-
   const onDeleteClick = async () => {
     setShowDeletePrompt();
     await deleteCalculation({
@@ -316,7 +271,6 @@ const CalculationModal = _ref => {
       id: calculation.id
     });
   };
-
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ui.Modal, {
     dataTest: "calculation-modal",
     position: "top",
@@ -329,16 +283,16 @@ const CalculationModal = _ref => {
     onDragStart: () => setFocusItemId(null),
     onDragEnd: addOrMoveDraggedItem
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_CalculationModalStyle.default.__hash) + " " + "content"
+    className: `jsx-${_CalculationModalStyle.default.__hash}` + " " + "content"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_CalculationModalStyle.default.__hash) + " " + "left-section"
+    className: `jsx-${_CalculationModalStyle.default.__hash}` + " " + "left-section"
   }, /*#__PURE__*/_react.default.createElement(_DataElementSelector.default, {
     displayNameProp: displayNameProp,
     onDoubleClick: addItem
   }), /*#__PURE__*/_react.default.createElement(_MathOperatorSelector.default, {
     onDoubleClick: addItem
   })), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_CalculationModalStyle.default.__hash) + " " + "right-section"
+    className: `jsx-${_CalculationModalStyle.default.__hash}` + " " + "right-section"
   }, /*#__PURE__*/_react.default.createElement(_FormulaField.default, {
     items: expressionArray,
     selectedItemId: selectedItemId,
@@ -349,11 +303,11 @@ const CalculationModal = _ref => {
     loading: !expressionArray,
     disabled: isLoading
   }), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_CalculationModalStyle.default.__hash) + " " + "actions-wrapper"
+    className: `jsx-${_CalculationModalStyle.default.__hash}` + " " + "actions-wrapper"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_CalculationModalStyle.default.__hash) + " " + "button-container"
+    className: `jsx-${_CalculationModalStyle.default.__hash}` + " " + "button-container"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_CalculationModalStyle.default.__hash) + " " + "remove-button"
+    className: `jsx-${_CalculationModalStyle.default.__hash}` + " " + "remove-button"
   }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     small: true,
     secondary: true,
@@ -361,7 +315,7 @@ const CalculationModal = _ref => {
     dataTest: "remove-button",
     disabled: !selectedItemId
   }, _index.default.t('Remove item'))), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_CalculationModalStyle.default.__hash) + " " + "validate-button"
+    className: `jsx-${_CalculationModalStyle.default.__hash}` + " " + "validate-button"
   }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     small: true,
     secondary: true,
@@ -371,12 +325,12 @@ const CalculationModal = _ref => {
     disabled: isLoading
   }, _index.default.t('Check formula')))), /*#__PURE__*/_react.default.createElement("span", {
     "data-test": "validation-message",
-    className: "jsx-".concat(_CalculationModalStyle.default.__hash) + " " + ((0, _classnames.default)('validation-message', {
+    className: `jsx-${_CalculationModalStyle.default.__hash}` + " " + ((0, _classnames.default)('validation-message', {
       'validation-error': expressionStatus === _expressions.INVALID_EXPRESSION,
       'validation-success': expressionStatus === _expressions.VALID_EXPRESSION
     }) || "")
   }, validationOutput === null || validationOutput === void 0 ? void 0 : validationOutput.message), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_CalculationModalStyle.default.__hash) + " " + "name-input"
+    className: `jsx-${_CalculationModalStyle.default.__hash}` + " " + "name-input"
   }, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
     label: _index.default.t('Calculation name'),
     helpText: _index.default.t('Shown in table headers and chart axes/legends'),
@@ -392,7 +346,7 @@ const CalculationModal = _ref => {
   }))))))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, {
     dataTest: "calculation-modal-actions"
   }, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, calculation.id && /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_CalculationModalStyle.default.__hash) + " " + "delete-button"
+    className: `jsx-${_CalculationModalStyle.default.__hash}` + " " + "delete-button"
   }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     secondary: true,
     onClick: () => setShowDeletePrompt(true),
@@ -429,7 +383,6 @@ const CalculationModal = _ref => {
     id: _CalculationModalStyle.default.__hash
   }, _CalculationModalStyle.default));
 };
-
 CalculationModal.propTypes = {
   displayNameProp: _propTypes.default.string.isRequired,
   onClose: _propTypes.default.func.isRequired,