@dhis2/analytics 23.7.7 → 23.7.10

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [23.7.10](https://github.com/dhis2/analytics/compare/v23.7.9...v23.7.10) (2022-04-28)
+
+
+### Bug Fixes
+
+* set repetition in filter ([#1212](https://github.com/dhis2/analytics/issues/1212)) ([8510cba](https://github.com/dhis2/analytics/commit/8510cbaa68eac3902215d6db8508478b046d59b2))
+
+## [23.7.9](https://github.com/dhis2/analytics/compare/v23.7.8...v23.7.9) (2022-04-26)
+
+
+### Bug Fixes
+
+* simplify code and fix double path issue DHIS2-12940 ([#1206](https://github.com/dhis2/analytics/issues/1206)) ([2097119](https://github.com/dhis2/analytics/commit/2097119c858790cb6f40e43abaeab1c2867ad578))
+
+## [23.7.8](https://github.com/dhis2/analytics/compare/v23.7.7...v23.7.8) (2022-04-22)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([f399dd7](https://github.com/dhis2/analytics/commit/f399dd7e484acf18f83317770a9dce2ca88046e3))
+
 ## [23.7.7](https://github.com/dhis2/analytics/compare/v23.7.6...v23.7.7) (2022-04-19)
 
 

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

@@ -92,7 +92,7 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
 
         request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
       } else {
-        var _f$programStage, _f$items2;
+        var _f$programStage, _f$repetition, _f$repetition$indexes;
 
         let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? "".concat(f.programStage.id, ".").concat(f.dimension) : f.dimension;
 
@@ -100,7 +100,15 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
           filterString += ":".concat(f.filter);
         }
 
-        request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+        if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition$indexes = _f$repetition.indexes) !== null && _f$repetition$indexes !== void 0 && _f$repetition$indexes.length) {
+          f.repetition.indexes.forEach(index => {
+            request = request.addFilter(filterString.replace(/\./, "[".concat(index, "].")));
+          });
+        } else {
+          var _f$items2;
+
+          request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+        }
       }
     });
     return request;

package/build/cjs/components/FileMenu/GetLinkDialog.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GetLinkDialog = void 0;
 
-var _appRuntime = require("@dhis2/app-runtime");
-
 var _ui = require("@dhis2/ui");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -24,11 +22,8 @@ const GetLinkDialog = ({
   id,
   onClose
 }) => {
-  const {
-    baseUrl
-  } = (0, _appRuntime.useConfig)(); // TODO simply use href from the visualization object?
-
-  const appUrl = new URL("".concat(baseUrl, "/").concat((0, _utils.appPathFor)(type, id)), "".concat(window.location.origin).concat(window.location.pathname));
+  // TODO simply use href from the visualization object?
+  const appUrl = new URL((0, _utils.appPathFor)(type, id), "".concat(window.location.origin).concat(window.location.pathname));
   return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
     onClose: onClose
   }, /*#__PURE__*/_react.default.createElement(_ui.ModalContent, null, /*#__PURE__*/_react.default.createElement("p", null, _index.default.t('Open in this app')), /*#__PURE__*/_react.default.createElement("a", {

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

@@ -54,8 +54,7 @@ const appPathFor = (fileType, id) => {
       return "dhis-web-maps/index.html?id=".concat(id);
 
     default:
-      // strip origin and the first /
-      return "".concat(window.location.pathname).concat(window.location.search).concat(window.location.hash).substring(1);
+      return "".concat(window.location.search).concat(window.location.hash);
   }
 };
 

package/build/cjs/locales/nl/translations.json

@@ -23,7 +23,7 @@
     "Totals only": "",
     "Details only": "",
     "Disaggregation": "",
-    "No data": "",
+    "No data": "Geen gegevens",
     "Loading": "",
     "Search by data item name": "",
     "No items selected": "",
@@ -60,12 +60,12 @@
     "Nothing found for {{searchTerm}}": "",
     "Delete {{fileType}}": "",
     "This {{fileType}} and related interpretations will be deleted. Continue?": "",
-    "Cancel": "",
+    "Cancel": "Annuleer",
     "Delete": "Verwijderen",
     "File": "",
     "New": "",
     "Open…": "",
-    "Save": "",
+    "Save": "Sla op",
     "Save…": "",
     "Save as…": "",
     "Rename…": "",
@@ -73,17 +73,17 @@
     "Share…": "",
     "Get link…": "",
     "Open in this app": "",
-    "Close": "",
+    "Close": "Sluit",
     "Rename {{fileType}}": "",
-    "Name": "",
-    "Description": "",
+    "Name": "Naam",
+    "Description": "Beschrijving",
     "Rename": "",
     "Save {{fileType}} as": "",
     "event report": "",
     "line list": "",
     "map": "",
     "visualization": "",
-    "Created by": "",
+    "Created by": "Gecreëerd door",
     "Anyone": "",
     "Only you": "",
     "Others": "",
@@ -91,7 +91,7 @@
     "Filter by name": "",
     "Created": "",
     "Last updated": "Laatst bijgewerkt",
-    "Type": "",
+    "Type": "Soort",
     "Clear filters": "",
     "{{firstItemIndex}}-{{lastItemIndex}} of {{totalNumberOfItems}}": "",
     "Open": "",
@@ -121,7 +121,7 @@
     "No line lists found. Click New line list to get started.": "",
     "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
     "New line list": "",
-    "Options": "",
+    "Options": "Opties",
     "Hide": "",
     "Update": "Bijwerken",
     "{{count}} org units": "",
@@ -138,8 +138,8 @@
     "Select a level": "",
     "Select a group": "",
     "Deselect all": "",
-    "Period type": "",
-    "Year": "",
+    "Period type": "Soort periode",
+    "Year": "Jaar",
     "Select year": "",
     "Period": "Periode",
     "Relative periods": "",
@@ -238,7 +238,7 @@
     "Retry": "",
     "Series": "",
     "Category": "",
-    "Filter": "",
+    "Filter": "Filter",
     "Columns": "",
     "Rows": "",
     "Points": "",
@@ -247,30 +247,30 @@
     "Actual reports": "",
     "Actual reports on time": "",
     "Expected reports": "",
-    "Program": "",
+    "Program": "Programma",
     "Select a program": "",
     "Indicators": "",
-    "Indicator group": "",
+    "Indicator group": "Indicatorgroep",
     "All groups": "",
-    "Indicator": "",
+    "Indicator": "Indicator",
     "No indicator groups found": "",
     "Loading indicator groups": "",
     "Data elements": "Gegevenselementen",
-    "Data element group": "",
+    "Data element group": "Gegevenselementengroep",
     "Data element": "informatie onderdeel",
     "No data element groups found": "",
     "Loading data element groups": "",
     "Data sets": "",
-    "Data set": "",
+    "Data set": "Gegevensreeks",
     "All data sets": "",
     "Loading data sets": "",
-    "Event data items": "",
+    "Event data items": "Gebeurtenisgegevensitems",
     "All programs": "",
-    "Event data item": "",
+    "Event data item": "Gebeurtenisgegevensitem",
     "No programs found": "",
     "Loading programs": "",
-    "Program indicators": "",
-    "Program indicator": "",
+    "Program indicators": "Programmaindicators",
+    "Program indicator": "Programmaindicator",
     "Extra Small": "",
     "Small": "",
     "Regular": "",
@@ -297,7 +297,7 @@
     "{{thresholdFactor}} × Modified Z-score high": "",
     "{{thresholdFactor}} × Z-score low": "",
     "{{thresholdFactor}} × Z-score high": "",
-    "Data": "",
+    "Data": "Gegevens",
     "Organisation Unit": "",
     "Assigned Categories": "",
     "Pivot table": "",

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

@@ -79,7 +79,7 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
 
         request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
       } else {
-        var _f$programStage, _f$items2;
+        var _f$programStage, _f$repetition, _f$repetition$indexes;
 
         let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? "".concat(f.programStage.id, ".").concat(f.dimension) : f.dimension;
 
@@ -87,7 +87,15 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
           filterString += ":".concat(f.filter);
         }
 
-        request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+        if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition$indexes = _f$repetition.indexes) !== null && _f$repetition$indexes !== void 0 && _f$repetition$indexes.length) {
+          f.repetition.indexes.forEach(index => {
+            request = request.addFilter(filterString.replace(/\./, "[".concat(index, "].")));
+          });
+        } else {
+          var _f$items2;
+
+          request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+        }
       }
     });
     return request;

package/build/es/components/FileMenu/GetLinkDialog.js

@@ -1,4 +1,3 @@
-import { useConfig } from '@dhis2/app-runtime';
 import { Modal, ModalContent, ModalActions, ButtonStrip, Button } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
@@ -9,11 +8,8 @@ export const GetLinkDialog = ({
   id,
   onClose
 }) => {
-  const {
-    baseUrl
-  } = useConfig(); // TODO simply use href from the visualization object?
-
-  const appUrl = new URL("".concat(baseUrl, "/").concat(appPathFor(type, id)), "".concat(window.location.origin).concat(window.location.pathname));
+  // TODO simply use href from the visualization object?
+  const appUrl = new URL(appPathFor(type, id), "".concat(window.location.origin).concat(window.location.pathname));
   return /*#__PURE__*/React.createElement(Modal, {
     onClose: onClose
   }, /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement("p", null, i18n.t('Open in this app')), /*#__PURE__*/React.createElement("a", {

package/build/es/components/FileMenu/utils.js

@@ -32,7 +32,6 @@ export const appPathFor = (fileType, id) => {
       return "dhis-web-maps/index.html?id=".concat(id);
 
     default:
-      // strip origin and the first /
-      return "".concat(window.location.pathname).concat(window.location.search).concat(window.location.hash).substring(1);
+      return "".concat(window.location.search).concat(window.location.hash);
   }
 };

package/build/es/locales/nl/translations.json

@@ -23,7 +23,7 @@
     "Totals only": "",
     "Details only": "",
     "Disaggregation": "",
-    "No data": "",
+    "No data": "Geen gegevens",
     "Loading": "",
     "Search by data item name": "",
     "No items selected": "",
@@ -60,12 +60,12 @@
     "Nothing found for {{searchTerm}}": "",
     "Delete {{fileType}}": "",
     "This {{fileType}} and related interpretations will be deleted. Continue?": "",
-    "Cancel": "",
+    "Cancel": "Annuleer",
     "Delete": "Verwijderen",
     "File": "",
     "New": "",
     "Open…": "",
-    "Save": "",
+    "Save": "Sla op",
     "Save…": "",
     "Save as…": "",
     "Rename…": "",
@@ -73,17 +73,17 @@
     "Share…": "",
     "Get link…": "",
     "Open in this app": "",
-    "Close": "",
+    "Close": "Sluit",
     "Rename {{fileType}}": "",
-    "Name": "",
-    "Description": "",
+    "Name": "Naam",
+    "Description": "Beschrijving",
     "Rename": "",
     "Save {{fileType}} as": "",
     "event report": "",
     "line list": "",
     "map": "",
     "visualization": "",
-    "Created by": "",
+    "Created by": "Gecreëerd door",
     "Anyone": "",
     "Only you": "",
     "Others": "",
@@ -91,7 +91,7 @@
     "Filter by name": "",
     "Created": "",
     "Last updated": "Laatst bijgewerkt",
-    "Type": "",
+    "Type": "Soort",
     "Clear filters": "",
     "{{firstItemIndex}}-{{lastItemIndex}} of {{totalNumberOfItems}}": "",
     "Open": "",
@@ -121,7 +121,7 @@
     "No line lists found. Click New line list to get started.": "",
     "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
     "New line list": "",
-    "Options": "",
+    "Options": "Opties",
     "Hide": "",
     "Update": "Bijwerken",
     "{{count}} org units": "",
@@ -138,8 +138,8 @@
     "Select a level": "",
     "Select a group": "",
     "Deselect all": "",
-    "Period type": "",
-    "Year": "",
+    "Period type": "Soort periode",
+    "Year": "Jaar",
     "Select year": "",
     "Period": "Periode",
     "Relative periods": "",
@@ -238,7 +238,7 @@
     "Retry": "",
     "Series": "",
     "Category": "",
-    "Filter": "",
+    "Filter": "Filter",
     "Columns": "",
     "Rows": "",
     "Points": "",
@@ -247,30 +247,30 @@
     "Actual reports": "",
     "Actual reports on time": "",
     "Expected reports": "",
-    "Program": "",
+    "Program": "Programma",
     "Select a program": "",
     "Indicators": "",
-    "Indicator group": "",
+    "Indicator group": "Indicatorgroep",
     "All groups": "",
-    "Indicator": "",
+    "Indicator": "Indicator",
     "No indicator groups found": "",
     "Loading indicator groups": "",
     "Data elements": "Gegevenselementen",
-    "Data element group": "",
+    "Data element group": "Gegevenselementengroep",
     "Data element": "informatie onderdeel",
     "No data element groups found": "",
     "Loading data element groups": "",
     "Data sets": "",
-    "Data set": "",
+    "Data set": "Gegevensreeks",
     "All data sets": "",
     "Loading data sets": "",
-    "Event data items": "",
+    "Event data items": "Gebeurtenisgegevensitems",
     "All programs": "",
-    "Event data item": "",
+    "Event data item": "Gebeurtenisgegevensitem",
     "No programs found": "",
     "Loading programs": "",
-    "Program indicators": "",
-    "Program indicator": "",
+    "Program indicators": "Programmaindicators",
+    "Program indicator": "Programmaindicator",
     "Extra Small": "",
     "Small": "",
     "Regular": "",
@@ -297,7 +297,7 @@
     "{{thresholdFactor}} × Modified Z-score high": "",
     "{{thresholdFactor}} × Z-score low": "",
     "{{thresholdFactor}} × Z-score high": "",
-    "Data": "",
+    "Data": "Gegevens",
     "Organisation Unit": "",
     "Assigned Categories": "",
     "Pivot table": "",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "23.7.7",
+    "version": "23.7.10",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -33,7 +33,7 @@
     "devDependencies": {
         "@dhis2/app-runtime": "^2.11.0",
         "@dhis2/cli-app-scripts": "^6.2.0",
-        "@dhis2/cli-style": "^10.1.1",
+        "@dhis2/cli-style": "^10.4.0",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/ui": "^7.16.1",
         "@sambego/storybook-state": "^2.0.1",