@dhis2/analytics 28.0.2 → 28.0.4

package/build/es/api/dimensions.js

@@ -5,24 +5,20 @@ import { onError } from './index.js';
 // Query definitions
 export const 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(';')}`);
@@ -38,13 +34,12 @@ const recommendedDimensionsQuery = {
 };
 export const 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 = [];
 
@@ -80,13 +75,12 @@ export const dataItemsQuery = {
 };
 export const 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 !== DIMENSION_TYPE_ALL) {
       filters.push(`indicatorGroups.id:eq:${filter.group}`);
@@ -105,26 +99,22 @@ export const indicatorsQuery = {
 };
 export const 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
+  })
 };
 export const 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) === DIMENSION_TYPE_ALL ? 'id' : 'dimensionItem~rename(id)';
     const filters = ['domainType:eq:AGGREGATE'];
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== DIMENSION_TYPE_ALL) {
@@ -144,31 +134,24 @@ export const dataElementsQuery = {
 };
 export const 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
+  })
 };
 export const 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}`);
@@ -184,13 +167,12 @@ export const itemsByDimensionQuery = {
 };
 export const 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) === DIMENSION_TYPE_ALL ? 'id' : 'dimensionItem~rename(id)';
     const filters = ['categoryOptionCombo.name:ne:default'];
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== DIMENSION_TYPE_ALL) {
@@ -210,13 +192,12 @@ export const dataElementOperandsQuery = {
 };
 export const 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}`);
@@ -239,16 +220,13 @@ export const dataSetsQuery = {
 };
 export const 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
@@ -275,14 +253,13 @@ export const apiFetchRecommendedIds = async (dataEngine, dxIds, ouIds) => {
   });
   return recommendedDimensionsData.recommendedDimensions.dimensions.map(item => item.id);
 };
-export const apiFetchOptions = _ref13 => {
-  let {
-    dataEngine,
-    nameProp,
-    filter,
-    searchTerm,
-    page
-  } = _ref13;
+export const apiFetchOptions = ({
+  dataEngine,
+  nameProp,
+  filter,
+  searchTerm,
+  page
+}) => {
   switch (filter === null || filter === void 0 ? void 0 : filter.dataType) {
     case DIMENSION_TYPE_INDICATOR:
       {
@@ -391,14 +368,13 @@ export const apiFetchGroups = async (dataEngine, dataType, nameProp) => {
       return null;
   }
 };
-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
   }, {
@@ -413,14 +389,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
   }, {
@@ -439,14 +414,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
   }, {
@@ -461,14 +435,13 @@ const fetchDataElements = async _ref16 => {
   const response = dataElementsData.dataElements;
   return formatResponse(response.dataElements, response.pager);
 };
-export const apiFetchItemsByDimension = async _ref17 => {
-  let {
-    dataEngine,
-    dimensionId,
-    searchTerm,
-    page,
-    nameProp
-  } = _ref17;
+export const apiFetchItemsByDimension = async ({
+  dataEngine,
+  dimensionId,
+  searchTerm,
+  page,
+  nameProp
+}) => {
   const itemsByDimensionData = await dataEngine.query({
     itemsByDimensions: itemsByDimensionQuery
   }, {
@@ -483,14 +456,13 @@ export const apiFetchItemsByDimension = async _ref17 => {
   const response = itemsByDimensionData.itemsByDimensions;
   return formatResponse(response.items, response.pager);
 };
-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
   }, {
@@ -505,14 +477,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/es/api/expression.js

@@ -1,84 +1,63 @@
 export const validateIndicatorExpressionMutation = {
   type: 'create',
   resource: 'indicators/expression/description',
-  data: _ref => {
-    let {
-      expression
-    } = _ref;
-    return expression;
-  }
+  data: ({
+    expression
+  }) => expression
 };
 export const validateProgramIndicatorExpressionMutation = {
   type: 'create',
   resource: 'programIndicators/expression/description',
-  data: _ref2 => {
-    let {
-      expression
-    } = _ref2;
-    return expression;
-  }
+  data: ({
+    expression
+  }) => expression
 };
 export const validateProgramIndicatorFilterMutation = {
   type: 'create',
   resource: 'programIndicators/filter/description',
-  data: _ref3 => {
-    let {
-      filter
-    } = _ref3;
-    return filter;
-  }
+  data: ({
+    filter
+  }) => filter
 };
 export const createCalculationMutation = {
   type: 'create',
   resource: 'expressionDimensionItems',
-  data: _ref4 => {
-    let {
-      name,
-      expression
-    } = _ref4;
-    return {
-      name,
-      shortName: name,
-      expression
-    };
-  }
+  data: ({
+    name,
+    expression
+  }) => ({
+    name,
+    shortName: name,
+    expression
+  })
 };
 export const 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
+  }]
 };
 export const deleteCalculationMutation = {
   type: 'delete',
   resource: 'expressionDimensionItems',
-  id: _ref7 => {
-    let {
-      id
-    } = _ref7;
-    return id;
-  }
+  id: ({
+    id
+  }) => id
 };

package/build/es/api/organisationUnits.js

@@ -1,27 +1,21 @@
 import { onError } from './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',
@@ -33,26 +27,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/es/components/AboutAOUnit/AboutAOUnit.js

@@ -15,24 +15,18 @@ const READ_AND_WRITE = 'rw';
 const getQueries = type => ({
   ao: {
     resource: 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) => ({
@@ -43,13 +37,12 @@ const getUnsubscribeMutation = (type, id) => ({
   resource: `${AOTypeMap[type].apiEndpoint}/${id}/subscriber`,
   type: 'delete'
 });
-const AboutAOUnit = /*#__PURE__*/forwardRef((_ref3, ref) => {
+const AboutAOUnit = /*#__PURE__*/forwardRef(({
+  type,
+  id,
+  renderId
+}, ref) => {
   var _data$ao$createdBy;
-  let {
-    type,
-    id,
-    renderId
-  } = _ref3;
   const [isExpanded, setIsExpanded] = useState(true);
   const {
     fromServerDate

package/build/es/components/CachedDataQueryProvider.js

@@ -4,13 +4,12 @@ import { Layer, CenteredContent, CircularLoader, NoticeBox } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { createContext, useContext } from 'react';
 const CachedDataQueryCtx = /*#__PURE__*/createContext({});
-const CachedDataQueryProvider = _ref => {
-  let {
-    query,
-    dataTransformation,
-    children,
-    translucent = true
-  } = _ref;
+const CachedDataQueryProvider = ({
+  query,
+  dataTransformation,
+  children,
+  translucent = true
+}) => {
   const {
     data: rawData,
     ...rest