@dhis2/analytics 28.0.3 → 28.0.4

package/build/cjs/api/dimensions.js

@@ -11,24 +11,20 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 // Query definitions
 const dimensionsQuery = exports.dimensionsQuery = {
   resource: 'dimensions',
-  params: _ref => {
-    let {
-      nameProp
-    } = _ref;
-    return {
-      fields: `id,${nameProp}~rename(name),dimensionType,dataDimensionType`,
-      order: `${nameProp}:asc`,
-      paging: false
-    };
-  }
+  params: ({
+    nameProp
+  }) => ({
+    fields: `id,${nameProp}~rename(name),dimensionType,dataDimensionType`,
+    order: `${nameProp}:asc`,
+    paging: false
+  })
 };
 const recommendedDimensionsQuery = {
   resource: 'dimensions/recommendations',
-  params: _ref2 => {
-    let {
-      dxIds,
-      ouIds
-    } = _ref2;
+  params: ({
+    dxIds,
+    ouIds
+  }) => {
     const dimensions = [];
     if (dxIds.length) {
       dimensions.push(`dx:${dxIds.join(';')}`);
@@ -44,13 +40,12 @@ const recommendedDimensionsQuery = {
 };
 const dataItemsQuery = exports.dataItemsQuery = {
   resource: 'dataItems',
-  params: _ref3 => {
-    let {
-      nameProp,
-      filter,
-      searchTerm,
-      page
-    } = _ref3;
+  params: ({
+    nameProp,
+    filter,
+    searchTerm,
+    page
+  }) => {
     let fields = `id,${nameProp}~rename(name),dimensionItemType,expression,optionSetId`;
     const filters = [];
 
@@ -86,13 +81,12 @@ const dataItemsQuery = exports.dataItemsQuery = {
 };
 const indicatorsQuery = exports.indicatorsQuery = {
   resource: 'indicators',
-  params: _ref4 => {
-    let {
-      nameProp,
-      filter,
-      searchTerm,
-      page
-    } = _ref4;
+  params: ({
+    nameProp,
+    filter,
+    searchTerm,
+    page
+  }) => {
     const filters = [];
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.DIMENSION_TYPE_ALL) {
       filters.push(`indicatorGroups.id:eq:${filter.group}`);
@@ -111,26 +105,22 @@ const indicatorsQuery = exports.indicatorsQuery = {
 };
 const indicatorGroupsQuery = exports.indicatorGroupsQuery = {
   resource: 'indicatorGroups',
-  params: _ref5 => {
-    let {
-      nameProp
-    } = _ref5;
-    return {
-      fields: `id,${nameProp}~rename(name)`,
-      order: `${nameProp}:asc`,
-      paging: false
-    };
-  }
+  params: ({
+    nameProp
+  }) => ({
+    fields: `id,${nameProp}~rename(name)`,
+    order: `${nameProp}:asc`,
+    paging: false
+  })
 };
 const dataElementsQuery = exports.dataElementsQuery = {
   resource: 'dataElements',
-  params: _ref6 => {
-    let {
-      nameProp,
-      filter,
-      searchTerm,
-      page
-    } = _ref6;
+  params: ({
+    nameProp,
+    filter,
+    searchTerm,
+    page
+  }) => {
     const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === _dataTypes.DIMENSION_TYPE_ALL ? 'id' : 'dimensionItem~rename(id)';
     const filters = ['domainType:eq:AGGREGATE'];
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.DIMENSION_TYPE_ALL) {
@@ -150,31 +140,24 @@ const dataElementsQuery = exports.dataElementsQuery = {
 };
 const dataElementGroupsQuery = exports.dataElementGroupsQuery = {
   resource: 'dataElementGroups',
-  params: _ref7 => {
-    let {
-      nameProp
-    } = _ref7;
-    return {
-      fields: `id,${nameProp}~rename(name)`,
-      order: `${nameProp}:asc`,
-      paging: false
-    };
-  }
+  params: ({
+    nameProp
+  }) => ({
+    fields: `id,${nameProp}~rename(name)`,
+    order: `${nameProp}:asc`,
+    paging: false
+  })
 };
 const itemsByDimensionQuery = exports.itemsByDimensionQuery = {
   resource: `dimensions`,
-  id: _ref8 => {
-    let {
-      id
-    } = _ref8;
-    return `${id}/items`;
-  },
-  params: _ref9 => {
-    let {
-      searchTerm,
-      page,
-      nameProp
-    } = _ref9;
+  id: ({
+    id
+  }) => `${id}/items`,
+  params: ({
+    searchTerm,
+    page,
+    nameProp
+  }) => {
     const filters = [];
     if (searchTerm) {
       filters.push(`${nameProp}:ilike:${searchTerm}`);
@@ -190,13 +173,12 @@ const itemsByDimensionQuery = exports.itemsByDimensionQuery = {
 };
 const dataElementOperandsQuery = exports.dataElementOperandsQuery = {
   resource: 'dataElementOperands',
-  params: _ref10 => {
-    let {
-      nameProp,
-      filter,
-      searchTerm,
-      page
-    } = _ref10;
+  params: ({
+    nameProp,
+    filter,
+    searchTerm,
+    page
+  }) => {
     const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === _dataTypes.DIMENSION_TYPE_ALL ? 'id' : 'dimensionItem~rename(id)';
     const filters = ['categoryOptionCombo.name:ne:default'];
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.DIMENSION_TYPE_ALL) {
@@ -216,13 +198,12 @@ const dataElementOperandsQuery = exports.dataElementOperandsQuery = {
 };
 const dataSetsQuery = exports.dataSetsQuery = {
   resource: 'dataSets',
-  params: _ref11 => {
-    let {
-      nameProp,
-      searchTerm,
-      filter,
-      page
-    } = _ref11;
+  params: ({
+    nameProp,
+    searchTerm,
+    filter,
+    page
+  }) => {
     const filters = [];
     if (searchTerm) {
       filters.push(`${nameProp}:ilike:${searchTerm}`);
@@ -245,16 +226,13 @@ const dataSetsQuery = exports.dataSetsQuery = {
 };
 const programsQuery = exports.programsQuery = {
   resource: 'programs',
-  params: _ref12 => {
-    let {
-      nameProp
-    } = _ref12;
-    return {
-      fields: `id,${nameProp}~rename(name)`,
-      order: `${nameProp}:asc`,
-      paging: false
-    };
-  }
+  params: ({
+    nameProp
+  }) => ({
+    fields: `id,${nameProp}~rename(name)`,
+    order: `${nameProp}:asc`,
+    paging: false
+  })
 };
 
 // Fetch functions
@@ -283,14 +261,13 @@ const apiFetchRecommendedIds = async (dataEngine, dxIds, ouIds) => {
   return recommendedDimensionsData.recommendedDimensions.dimensions.map(item => item.id);
 };
 exports.apiFetchRecommendedIds = apiFetchRecommendedIds;
-const apiFetchOptions = _ref13 => {
-  let {
-    dataEngine,
-    nameProp,
-    filter,
-    searchTerm,
-    page
-  } = _ref13;
+const apiFetchOptions = ({
+  dataEngine,
+  nameProp,
+  filter,
+  searchTerm,
+  page
+}) => {
   switch (filter === null || filter === void 0 ? void 0 : filter.dataType) {
     case _dataTypes.DIMENSION_TYPE_INDICATOR:
       {
@@ -401,14 +378,13 @@ const apiFetchGroups = async (dataEngine, dataType, nameProp) => {
   }
 };
 exports.apiFetchGroups = apiFetchGroups;
-const fetchIndicators = async _ref14 => {
-  let {
-    dataEngine,
-    nameProp,
-    filter,
-    searchTerm,
-    page
-  } = _ref14;
+const fetchIndicators = async ({
+  dataEngine,
+  nameProp,
+  filter,
+  searchTerm,
+  page
+}) => {
   const indicatorsData = await dataEngine.query({
     indicators: indicatorsQuery
   }, {
@@ -423,14 +399,13 @@ const fetchIndicators = async _ref14 => {
   const response = indicatorsData.indicators;
   return formatResponse(response.indicators, response.pager);
 };
-const fetchDataItems = async _ref15 => {
-  let {
-    dataEngine,
-    nameProp,
-    filter,
-    searchTerm,
-    page
-  } = _ref15;
+const fetchDataItems = async ({
+  dataEngine,
+  nameProp,
+  filter,
+  searchTerm,
+  page
+}) => {
   const dataItemsData = await dataEngine.query({
     dataItems: dataItemsQuery
   }, {
@@ -449,14 +424,13 @@ const formatResponse = (dimensionItems, pager) => ({
   dimensionItems,
   nextPage: pager.nextPage ? pager.page + 1 : null
 });
-const fetchDataElements = async _ref16 => {
-  let {
-    dataEngine,
-    nameProp,
-    filter,
-    searchTerm,
-    page
-  } = _ref16;
+const fetchDataElements = async ({
+  dataEngine,
+  nameProp,
+  filter,
+  searchTerm,
+  page
+}) => {
   const dataElementsData = await dataEngine.query({
     dataElements: dataElementsQuery
   }, {
@@ -471,14 +445,13 @@ const fetchDataElements = async _ref16 => {
   const response = dataElementsData.dataElements;
   return formatResponse(response.dataElements, response.pager);
 };
-const apiFetchItemsByDimension = async _ref17 => {
-  let {
-    dataEngine,
-    dimensionId,
-    searchTerm,
-    page,
-    nameProp
-  } = _ref17;
+const apiFetchItemsByDimension = async ({
+  dataEngine,
+  dimensionId,
+  searchTerm,
+  page,
+  nameProp
+}) => {
   const itemsByDimensionData = await dataEngine.query({
     itemsByDimensions: itemsByDimensionQuery
   }, {
@@ -494,14 +467,13 @@ const apiFetchItemsByDimension = async _ref17 => {
   return formatResponse(response.items, response.pager);
 };
 exports.apiFetchItemsByDimension = apiFetchItemsByDimension;
-const fetchDataElementOperands = async _ref18 => {
-  let {
-    dataEngine,
-    nameProp,
-    filter,
-    searchTerm,
-    page
-  } = _ref18;
+const fetchDataElementOperands = async ({
+  dataEngine,
+  nameProp,
+  filter,
+  searchTerm,
+  page
+}) => {
   const dataElementOperandsData = await dataEngine.query({
     dataElementOperands: dataElementOperandsQuery
   }, {
@@ -516,14 +488,13 @@ const fetchDataElementOperands = async _ref18 => {
   const response = dataElementOperandsData.dataElementOperands;
   return formatResponse(response.dataElementOperands, response.pager);
 };
-const fetchDataSets = async _ref19 => {
-  let {
-    dataEngine,
-    nameProp,
-    searchTerm,
-    filter,
-    page
-  } = _ref19;
+const fetchDataSets = async ({
+  dataEngine,
+  nameProp,
+  searchTerm,
+  filter,
+  page
+}) => {
   const dataSetsData = await dataEngine.query({
     dataSets: dataSetsQuery
   }, {

package/build/cjs/api/expression.js

@@ -7,84 +7,63 @@ exports.validateProgramIndicatorFilterMutation = exports.validateProgramIndicato
 const validateIndicatorExpressionMutation = exports.validateIndicatorExpressionMutation = {
   type: 'create',
   resource: 'indicators/expression/description',
-  data: _ref => {
-    let {
-      expression
-    } = _ref;
-    return expression;
-  }
+  data: ({
+    expression
+  }) => expression
 };
 const validateProgramIndicatorExpressionMutation = exports.validateProgramIndicatorExpressionMutation = {
   type: 'create',
   resource: 'programIndicators/expression/description',
-  data: _ref2 => {
-    let {
-      expression
-    } = _ref2;
-    return expression;
-  }
+  data: ({
+    expression
+  }) => expression
 };
 const validateProgramIndicatorFilterMutation = exports.validateProgramIndicatorFilterMutation = {
   type: 'create',
   resource: 'programIndicators/filter/description',
-  data: _ref3 => {
-    let {
-      filter
-    } = _ref3;
-    return filter;
-  }
+  data: ({
+    filter
+  }) => filter
 };
 const createCalculationMutation = exports.createCalculationMutation = {
   type: 'create',
   resource: 'expressionDimensionItems',
-  data: _ref4 => {
-    let {
-      name,
-      expression
-    } = _ref4;
-    return {
-      name,
-      shortName: name,
-      expression
-    };
-  }
+  data: ({
+    name,
+    expression
+  }) => ({
+    name,
+    shortName: name,
+    expression
+  })
 };
 const updateCalculationMutation = exports.updateCalculationMutation = {
   type: 'json-patch',
   resource: 'expressionDimensionItems',
-  id: _ref5 => {
-    let {
-      id
-    } = _ref5;
-    return id;
-  },
-  data: _ref6 => {
-    let {
-      name,
-      expression
-    } = _ref6;
-    return [{
-      op: 'add',
-      path: '/name',
-      value: name
-    }, {
-      op: 'add',
-      path: '/shortName',
-      value: name
-    }, {
-      op: 'add',
-      path: '/expression',
-      value: expression
-    }];
-  }
+  id: ({
+    id
+  }) => id,
+  data: ({
+    name,
+    expression
+  }) => [{
+    op: 'add',
+    path: '/name',
+    value: name
+  }, {
+    op: 'add',
+    path: '/shortName',
+    value: name
+  }, {
+    op: 'add',
+    path: '/expression',
+    value: expression
+  }]
 };
 const deleteCalculationMutation = exports.deleteCalculationMutation = {
   type: 'delete',
   resource: 'expressionDimensionItems',
-  id: _ref7 => {
-    let {
-      id
-    } = _ref7;
-    return id;
-  }
+  id: ({
+    id
+  }) => id
 };

package/build/cjs/api/organisationUnits.js

@@ -7,27 +7,21 @@ exports.apiFetchOrganisationUnits = exports.apiFetchOrganisationUnitRoots = expo
 var _index = require("./index.js");
 const orgUnitLevelsQuery = {
   resource: 'organisationUnitLevels',
-  params: function () {
-    let {
-      displayNameProp = 'displayName'
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    return {
-      fields: `id,level,${displayNameProp}~rename(displayName),name`,
-      paging: false
-    };
-  }
+  params: ({
+    displayNameProp = 'displayName'
+  } = {}) => ({
+    fields: `id,level,${displayNameProp}~rename(displayName),name`,
+    paging: false
+  })
 };
 const orgUnitGroupsQuery = {
   resource: 'organisationUnitGroups',
-  params: function () {
-    let {
-      displayNameProp = 'displayName'
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    return {
-      fields: `id,${displayNameProp}~rename(displayName),name`,
-      paging: false
-    };
-  }
+  params: ({
+    displayNameProp = 'displayName'
+  } = {}) => ({
+    fields: `id,${displayNameProp}~rename(displayName),name`,
+    paging: false
+  })
 };
 const orgUnitRootsQuery = {
   resource: 'organisationUnits',
@@ -39,26 +33,20 @@ const orgUnitRootsQuery = {
 };
 const orgUnitsQuery = {
   resource: 'organisationUnits',
-  params: _ref => {
-    let {
-      displayNameProp
-    } = _ref;
-    return {
-      fields: `id,path,${displayNameProp}~rename(displayName),children::isNotEmpty`,
-      level: 1,
-      userDataViewFallback: true,
-      paging: false
-    };
-  }
+  params: ({
+    displayNameProp
+  }) => ({
+    fields: `id,path,${displayNameProp}~rename(displayName),children::isNotEmpty`,
+    level: 1,
+    userDataViewFallback: true,
+    paging: false
+  })
 };
 const orgUnitQuery = {
   resource: 'organisationUnits',
-  id: _ref2 => {
-    let {
-      id
-    } = _ref2;
-    return id;
-  },
+  id: ({
+    id
+  }) => id,
   params: {
     fields: 'id,level,displayName~rename(name),path,parent[id,displayName~rename(name)],children[level]',
     userDataViewFallback: true,

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

@@ -16,32 +16,25 @@ var _list = require("../../modules/list.js");
 var _index = require("../RichText/index.js");
 var _AboutAOUnitStyle = _interopRequireDefault(require("./styles/AboutAOUnit.style.js"));
 var _utils = require("./utils.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 READ_ONLY = 'r';
 const READ_AND_WRITE = 'rw';
 const getQueries = type => ({
   ao: {
     resource: _utils.AOTypeMap[type].apiEndpoint,
-    id: _ref => {
-      let {
-        id
-      } = _ref;
-      return id;
-    },
+    id: ({
+      id
+    }) => id,
     params: {
       fields: 'id,displayDescription,created,createdBy[displayName],lastUpdated,subscribed,sharing'
     }
   },
   dataStatistics: {
     resource: 'dataStatistics/favorites',
-    id: _ref2 => {
-      let {
-        id
-      } = _ref2;
-      return id;
-    }
+    id: ({
+      id
+    }) => id
   }
 });
 const getSubscribeMutation = (type, id) => ({
@@ -52,13 +45,12 @@ const getUnsubscribeMutation = (type, id) => ({
   resource: `${_utils.AOTypeMap[type].apiEndpoint}/${id}/subscriber`,
   type: 'delete'
 });
-const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
+const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)(({
+  type,
+  id,
+  renderId
+}, ref) => {
   var _data$ao$createdBy;
-  let {
-    type,
-    id,
-    renderId
-  } = _ref3;
   const [isExpanded, setIsExpanded] = (0, _react.useState)(true);
   const {
     fromServerDate

package/build/cjs/components/CachedDataQueryProvider.js

@@ -9,17 +9,15 @@ 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(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 CachedDataQueryCtx = /*#__PURE__*/(0, _react.createContext)({});
-const CachedDataQueryProvider = _ref => {
-  let {
-    query,
-    dataTransformation,
-    children,
-    translucent = true
-  } = _ref;
+const CachedDataQueryProvider = ({
+  query,
+  dataTransformation,
+  children,
+  translucent = true
+}) => {
   const {
     data: rawData,
     ...rest