@dhis2/analytics 24.10.0 → 25.0.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [25.0.0](https://github.com/dhis2/analytics/compare/v24.10.1...v25.0.0) (2023-04-24)
+
+
+### Features
+
+* custom calculations (DHIS2-13871) ([#1370](https://github.com/dhis2/analytics/issues/1370)) ([d174e3e](https://github.com/dhis2/analytics/commit/d174e3e8a1dd1ea756cf42eaf7748b2135151e57))
+
+
+### BREAKING CHANGES
+
+* requires metadata to be provided for the new EDI dimension type
+
+## [24.10.1](https://github.com/dhis2/analytics/compare/v24.10.0...v24.10.1) (2023-04-24)
+
+
+### Bug Fixes
+
+* sv size when downloading is a small square (DHIS2-15178) ([245d799](https://github.com/dhis2/analytics/commit/245d799d9513e0407e4a6b6ba24c3da15754618d))
+
 # [24.10.0](https://github.com/dhis2/analytics/compare/v24.9.3...v24.10.0) (2023-04-19)
 
 

package/build/cjs/__demo__/CalculationModal.stories.js

@@ -0,0 +1,448 @@
+"use strict";
+
+var _appRuntime = require("@dhis2/app-runtime");
+
+var _react = require("@storybook/react");
+
+var _react2 = _interopRequireDefault(require("react"));
+
+var _CalculationModal = _interopRequireDefault(require("../components/DataDimension/Calculation/CalculationModal.js"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const DATA_ELEMENTS = {
+  pager: {
+    page: 1,
+    total: 622,
+    pageSize: 50,
+    nextPage: 'http://localhost:8080/api/39/dataElements?page=2&filter=domainType%3Aeq%3AAGGREGATE&paging=true&fields=dimensionItem%7Erename%28id%29%2CdisplayName%7Erename%28name%29%2CdimensionItemType&order=displayName%3Aasc',
+    pageCount: 13
+  },
+  dataElements: [{
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'fbfJHSPpUQD',
+    name: 'ANC 1st visit'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'cYeuwXTCPkU',
+    name: 'ANC 2nd visit'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'Jtf34kNZhzP',
+    name: 'ANC 3rd visit'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'hfdmMSPBgLG',
+    name: 'ANC 4th or more visits'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'FHD3wiSM7Sn',
+    name: 'ARI treated with antibiotics (pneumonia) follow-up'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'oLfWYAJhZb2',
+    name: 'ARI treated without antibiotics (cough) referrals'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'GMd99K8gVut',
+    name: 'ART No clients who stopped TRT due to TRT failure'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'wfKKFhBn0Q0',
+    name: 'ART No clients who stopped TRT due to adverse clinical status/event'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'aIJZ2d2QgVV',
+    name: 'ART defaulters'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'BOSZApCrBni',
+    name: 'ART enrollment stage 1'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'dGdeotKpRed',
+    name: 'ART enrollment stage 2'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'LVaUdM3CERi',
+    name: 'ART entry point: No old patients'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'M62VHgYT2n0',
+    name: 'Acute Flaccid Paralysis (AFP) referrals'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'uF1DLnZNlWe',
+    name: 'Additional notes related to facility'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'jmWyJFtE7Af',
+    name: 'Anaemia follow-up'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT',
+    id: 'HLPuaFB7Frw',
+    name: 'Anaemia new'
+  }]
+};
+const DATA_ELEMENT_OPERANDS = {
+  pager: {
+    page: 1,
+    pageCount: 43,
+    total: 2122,
+    pageSize: 50,
+    nextPage: 'https://debug.dhis2.org/dev/api/dataElementOperands.json?page=2'
+  },
+  dataElementOperands: [{
+    dimensionItemType: 'DATA_ELEMENT_OPERAND',
+    id: 'fbfJHSPpUQD.pq2XI5kz2BY',
+    name: 'ANC 1st visit Fixed'
+  }, {
+    dimensionItemType: 'DATA_ELEMENT_OPERAND',
+    id: 'fbfJHSPpUQD.PT59n8BQbqM',
+    name: 'ANC 1st visit Outreach'
+  }]
+};
+const DATA_ELEMENT_GROUPS = {
+  dataElementGroups: [{
+    id: 'qfxEYY9xAl6',
+    name: 'ANC'
+  }, {
+    id: 'yhg8oYU9ekY',
+    name: 'ARI Treated Without Antibiotics (Cough)'
+  }, {
+    id: 'M2cth8EmrlT',
+    name: 'ARI treated with antibiotics (Pneumonia)'
+  }, {
+    id: 'k1M0nuodfhN',
+    name: 'ART'
+  }, {
+    id: 'bdiyMm9qZl5',
+    name: 'ART enrollment'
+  }, {
+    id: 's8FiXqB2DhB',
+    name: 'ART entry points'
+  }, {
+    id: 'TcxHxMlYzpv',
+    name: 'ART pediatric 1st line'
+  }, {
+    id: 'vxIWSNeEcf7',
+    name: 'ART staging'
+  }, {
+    id: 'zz1lNBgRKWU',
+    name: 'ART treatment'
+  }, {
+    id: 'oDkJh5Ddh7d',
+    name: 'Acute Flaccid Paralysis (AFP) '
+  }, {
+    id: 'GBHN1a1Jddh',
+    name: 'All Others'
+  }, {
+    id: 'KmwPVkjp7yl',
+    name: 'Anaemia'
+  }, {
+    id: 'oGktdmYkRNo',
+    name: 'Burns'
+  }, {
+    id: 'KUSvwZQsMSN',
+    name: 'Cholera'
+  }, {
+    id: 'Euvh58hLl61',
+    name: 'Clinical Malnutrition'
+  }, {
+    id: 'Svac1cNQhRS',
+    name: 'Commodities'
+  }, {
+    id: 'KJKWrWBcJdf',
+    name: 'Commodities Child Health'
+  }, {
+    id: 'idD1wcvBISQ',
+    name: 'Commodities Maternal Health'
+  }, {
+    id: 'rioWDAi1S7z',
+    name: 'Commodities Newborn Health'
+  }, {
+    id: 'IyIa0h8CbCZ',
+    name: 'Commodities Reproductive Health'
+  }, {
+    id: 'PfJGQacYpjn',
+    name: 'Deaths'
+  }, {
+    id: 't5W0AAqvK5b',
+    name: 'Delivery'
+  }, {
+    id: 'mcjC3qZgIkO',
+    name: 'Diarrhoea With Blood (Dysentery)'
+  }, {
+    id: 'RSFc8ADyKTw',
+    name: 'Diarrhoea With Severe Dehydration'
+  }, {
+    id: 'kE8lP5t0b5R',
+    name: 'Diarrhoea Without Severe Dehydration'
+  }, {
+    id: 'qiF051Ue9Ei',
+    name: 'Emergency Response'
+  }, {
+    id: 'GbSz3TobZcc',
+    name: 'Expenditures'
+  }, {
+    id: 'lLKpwhjd1dM',
+    name: 'Eye Infection'
+  }, {
+    id: 'Sp1jJqzsiOi',
+    name: 'Facility infrastructure'
+  }, {
+    id: 'g50BzGAsrvu',
+    name: 'Follow-up'
+  }, {
+    id: 'URmi41e0SFH',
+    name: 'HIV Care'
+  }, {
+    id: 'ID4BbhF7Eli',
+    name: 'HIV Peadriatics'
+  }, {
+    id: 'HKU7L73im5r',
+    name: 'HIV/AIDS'
+  }, {
+    id: 'jWgEsdH87Jk',
+    name: 'Hypertension'
+  }, {
+    id: 'nb3rBNvVHtp',
+    name: 'ICS Children'
+  }, {
+    id: 'dMyLpSQn6hu',
+    name: 'ICS mother'
+  }, {
+    id: 'b3gDdvmrSFc',
+    name: 'IDSR'
+  }, {
+    id: 'h9cuJOkOwY2',
+    name: 'Immunization'
+  }, {
+    id: 'OP4dLqk0JTH',
+    name: 'Inpatient morbidity/mortality aggregates'
+  }, {
+    id: 'SriP0jBXMr6',
+    name: 'Lassa Fever'
+  }, {
+    id: 'U0uJG4kydwE',
+    name: 'Leprosy'
+  }, {
+    id: 'eeQCyjnMyGY',
+    name: 'Low birth'
+  }, {
+    id: 'LEet4tb49IP',
+    name: 'MNCH Aggregates'
+  }, {
+    id: 'TzwKbcw1nUK',
+    name: 'Malaria'
+  }, {
+    id: 'qk2KOBMX4Mf',
+    name: 'Measles'
+  }, {
+    id: 'lnLbEej0gwe',
+    name: 'Meningitis / Severe Bacterial Infection'
+  }, {
+    id: 'SLsJy3zqUbD',
+    name: 'Morbidity'
+  }, {
+    id: 'QAc5FhbeFwl',
+    name: 'Mortality'
+  }, {
+    id: 'rPGfUFYbcfJ',
+    name: 'Mortality < 5 years'
+  }, {
+    id: 'KU0wDurtWDM',
+    name: 'Mortality Narrative'
+  }, {
+    id: 'UAEhIWpoQFN',
+    name: 'Neonatal Tetanus'
+  }, {
+    id: 'weRMUzBs8T7',
+    name: 'New cases'
+  }, {
+    id: 'XGSHYf5uOlJ',
+    name: 'New on ART'
+  }, {
+    id: 'u1ilfnoYafG',
+    name: 'Nutrition'
+  }, {
+    id: 'HDdnX6XqxIn',
+    name: 'Onchocerciasis'
+  }, {
+    id: 'JZ3usxLEcc9',
+    name: 'Otitis Media'
+  }, {
+    id: 'WS3MniopkOQ',
+    name: 'PMTCT'
+  }, {
+    id: 'e5NGCRQR8Yo',
+    name: 'PMTCT ANC'
+  }, {
+    id: 'bXpe2ByvlFR',
+    name: 'PMTCT Maternity/Delivery'
+  }, {
+    id: 'sGLusXgmaOT',
+    name: 'PMTCT Postnatal'
+  }, {
+    id: 'sP7jTt3YGBb',
+    name: 'Population Estimates'
+  }, {
+    id: 'ubJrVb4v5xy',
+    name: 'Postnatal'
+  }, {
+    id: 'qkrZMU4Y2h5',
+    name: 'Pregnancy complications and deaths'
+  }, {
+    id: 'ZPtRFVLY40u',
+    name: 'Pregnancy-related (PHUF5)'
+  }, {
+    id: 'AiytigJkHP6',
+    name: 'Prev month on ART'
+  }, {
+    id: 'UWaMbg9h7vF',
+    name: 'Referrals'
+  }, {
+    id: 'OJxi4vkcTBS',
+    name: 'Reproductive health'
+  }, {
+    id: 'xNrDrDbJgnm',
+    name: 'STI - Genital Discharge'
+  }, {
+    id: 'UmyRWILcoed',
+    name: 'STI - Genital Ulcer'
+  }, {
+    id: 'LqG1FnAUhyb',
+    name: 'Schistosomiasis'
+  }, {
+    id: 'rwG73cCi66Z',
+    name: 'Shift from ART reg.'
+  }, {
+    id: 'rgTZ4mKjZza',
+    name: 'Shift to ART reg.'
+  }, {
+    id: 'VCoSeRRVS1n',
+    name: 'Skin Infection'
+  }, {
+    id: 'rVEe5QNBgDX',
+    name: 'Staffing'
+  }, {
+    id: 'pxWhf42tCIs',
+    name: 'Stock PHU'
+  }, {
+    id: 'OnAQ2lsilN9',
+    name: 'TB'
+  }, {
+    id: 'LgtuBcNaMB3',
+    name: 'Tetanus'
+  }, {
+    id: 'yHtsPZqpAxm',
+    name: 'Tuberculosis'
+  }, {
+    id: 'dUK38PhdUdV',
+    name: 'Typhoid Fever'
+  }, {
+    id: 'U9wcARyKSzx',
+    name: 'VCCT'
+  }, {
+    id: 'LzDaTmQYWcj',
+    name: 'Worm Infestation'
+  }, {
+    id: 'IUZ0GidX0jh',
+    name: 'Wounds/Trauma'
+  }, {
+    id: 'zmWJAEjfv59',
+    name: 'Yaws'
+  }, {
+    id: 'HAraPb0v7ex',
+    name: 'Yellow Fever'
+  }]
+};
+const calculation = {
+  id: 'calculationid',
+  name: 'My calculation',
+  expression: '#{fbfJHSPpUQD}/10*#{hfdmMSPBgLG}'
+};
+const calculationWithOperand = {
+  id: 'calcid2',
+  name: 'Calculation with operand',
+  expression: '#{cYeuwXTCPkU}*10-#{fbfJHSPpUQD.pq2XI5kz2BY}'
+};
+(0, _react.storiesOf)('CalculationModal', module).add('Default', () => {
+  return /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
+    data: {
+      dataElements: DATA_ELEMENTS,
+      dataElementGroups: DATA_ELEMENT_GROUPS,
+      dataElementOperands: DATA_ELEMENT_OPERANDS
+    }
+  }, /*#__PURE__*/_react2.default.createElement(_CalculationModal.default, {
+    displayNameProp: "name",
+    onClose: Function.prototype,
+    onDelete: Function.prototype,
+    onSave: Function.prototype
+  }));
+}).add('With calculation', () => {
+  return /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
+    data: {
+      dataElements: DATA_ELEMENTS,
+      dataElementGroups: DATA_ELEMENT_GROUPS,
+      dataElementOperands: DATA_ELEMENT_OPERANDS
+    }
+  }, /*#__PURE__*/_react2.default.createElement(_CalculationModal.default, {
+    calculation: calculation,
+    displayNameProp: "name",
+    onClose: Function.prototype,
+    onDelete: Function.prototype,
+    onSave: Function.prototype
+  }));
+}).add('With calculation containing operand', () => {
+  return /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
+    data: {
+      dataElements: DATA_ELEMENTS,
+      dataElementGroups: DATA_ELEMENT_GROUPS,
+      dataElementOperands: DATA_ELEMENT_OPERANDS
+    }
+  }, /*#__PURE__*/_react2.default.createElement(_CalculationModal.default, {
+    calculation: calculationWithOperand,
+    displayNameProp: "name",
+    onClose: Function.prototype,
+    onDelete: Function.prototype,
+    onSave: Function.prototype
+  }));
+}).add('No available data', () => {
+  return /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
+    data: {
+      dataElements: {
+        pager: {
+          page: 1,
+          total: 0,
+          pageSize: 50,
+          pageCount: 1
+        },
+        dataElements: []
+      },
+      dataElementGroups: {
+        pager: {
+          page: 1,
+          total: 0,
+          pageSize: 50,
+          pageCount: 1
+        },
+        dataElementGroups: []
+      },
+      dataElementOperands: {
+        pager: {
+          page: 1,
+          total: 0,
+          pageSize: 50,
+          pageCount: 1
+        },
+        dataElementOperands: []
+      }
+    }
+  }, /*#__PURE__*/_react2.default.createElement(_CalculationModal.default, {
+    displayNameProp: "name",
+    onClose: Function.prototype,
+    onDelete: Function.prototype,
+    onSave: Function.prototype
+  }));
+});

package/build/cjs/api/analytics/AnalyticsRequest.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _hash = require("../../modules/hash.js");
+
 var _predefinedDimensions = require("../../modules/predefinedDimensions.js");
 
 var _AnalyticsRequestBase = _interopRequireDefault(require("./AnalyticsRequestBase.js"));
@@ -111,7 +113,16 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
           request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
         }
       }
-    });
+    }); // add cache param for expression dimension items
+
+    const expressionHash = (0, _hash.getExpressionHashFromVisualization)(visualization);
+
+    if (expressionHash) {
+      request.withParameters({
+        edi_cache: expressionHash
+      });
+    }
+
     return request;
   }
 

package/build/cjs/api/dimensions.js

@@ -77,7 +77,7 @@ const dataItemsQuery = {
     }
 
     return (0, _objectClean.default)({
-      fields: "id,".concat(nameProp, "~rename(name),dimensionItemType"),
+      fields: "id,".concat(nameProp, "~rename(name),dimensionItemType,expression"),
       order: "".concat(nameProp, ":asc"),
       filter: filters,
       paging: true,

package/build/cjs/api/expression.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.validateExpressionMutation = exports.updateCalculationMutation = exports.deleteCalculationMutation = exports.createCalculationMutation = void 0;
+const validateExpressionMutation = {
+  type: 'create',
+  resource: 'indicators/expression/description',
+  data: _ref => {
+    let {
+      expression
+    } = _ref;
+    return expression;
+  }
+};
+exports.validateExpressionMutation = validateExpressionMutation;
+const createCalculationMutation = {
+  type: 'create',
+  resource: 'expressionDimensionItems',
+  data: _ref2 => {
+    let {
+      name,
+      expression
+    } = _ref2;
+    return {
+      name,
+      shortName: name,
+      expression
+    };
+  }
+};
+exports.createCalculationMutation = createCalculationMutation;
+const updateCalculationMutation = {
+  type: 'update',
+  resource: 'expressionDimensionItems',
+  partial: true,
+  id: _ref3 => {
+    let {
+      id
+    } = _ref3;
+    return id;
+  },
+  data: _ref4 => {
+    let {
+      name,
+      expression
+    } = _ref4;
+    return {
+      name,
+      shortName: name,
+      expression
+    };
+  }
+};
+exports.updateCalculationMutation = updateCalculationMutation;
+const deleteCalculationMutation = {
+  type: 'delete',
+  resource: 'expressionDimensionItems',
+  id: _ref5 => {
+    let {
+      id
+    } = _ref5;
+    return id;
+  }
+};
+exports.deleteCalculationMutation = deleteCalculationMutation;

package/build/cjs/assets/DimensionItemIcons/CalculationIcon.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = /*#__PURE__*/_react.default.createElement("svg", {
+  height: "16",
+  viewBox: "0 0 16 16",
+  width: "16",
+  fill: "none",
+  xmlns: "http://www.w3.org/2000/svg"
+}, /*#__PURE__*/_react.default.createElement("path", {
+  fillRule: "evenodd",
+  clipRule: "evenodd",
+  d: "M7 4H5V2H4V4H2V5H4V7H5V5H7V4ZM7 9.5H2V10.5H7V9.5ZM2 12H7V13H2V12ZM14 4H9V5H14V4ZM14 9.205L12.205 11L14 12.795L13.295 13.5L11.5 11.705L9.705 13.5L9 12.795L10.795 11L9 9.205L9.705 8.5L11.5 10.295L13.295 8.5L14 9.205Z",
+  fill: "#404B5A"
+}));
+
+exports.default = _default;

package/build/cjs/assets/FormulaIcon.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const FormulaIcon = () => {
+  return /*#__PURE__*/_react.default.createElement("svg", {
+    width: "32",
+    height: "32",
+    viewBox: "0 0 32 32",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, /*#__PURE__*/_react.default.createElement("g", {
+    clipPath: "url(#clip0_927_2130)"
+  }, /*#__PURE__*/_react.default.createElement("rect", {
+    width: "32",
+    height: "32",
+    fill: "white"
+  }), /*#__PURE__*/_react.default.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M14 8H10V4H8V8H4V10H8V14H10V10H14V8ZM14 19H4V21H14V19ZM4 24H14V26H4V24ZM28 8H18V10H28V8ZM28 18.41L24.41 22L28 25.59L26.59 27L23 23.41L19.41 27L18 25.59L21.59 22L18 18.41L19.41 17L23 20.59L26.59 17L28 18.41Z",
+    fill: "#A0ADBA"
+  })), /*#__PURE__*/_react.default.createElement("defs", null, /*#__PURE__*/_react.default.createElement("clipPath", {
+    id: "clip0_927_2130"
+  }, /*#__PURE__*/_react.default.createElement("rect", {
+    width: "32",
+    height: "32",
+    fill: "white"
+  }))));
+};
+
+var _default = FormulaIcon;
+exports.default = _default;