@dhis2/analytics 26.13.3 → 26.13.4

package/build/cjs/visualizations/util/__tests__/getFilterText.spec.js

@@ -114,24 +114,20 @@ describe('getFilterText', () => {
       filters.push({
         dimension: 'pe',
         items: [{
-          id: '_LAST_2_MONTHS_',
-          name: 'Last 2 months'
+          id: '201801'
+        }, {
+          id: 'LAST_3_MONTHS'
+        }, {
+          id: 'LAST_MONTH'
         }]
       });
-      metaData.dimensions.pe = ['_201801_', '_201802_'];
-      metaData.items._LAST_2_MONTHS_ = {
-        name: 'Last 2 months',
-        uid: '_LAST_2_MONTHS_'
-      };
-      metaData.items._201801_ = {
-        name: '01 of 2018',
-        uid: '_201801_'
+      metaData.dimensions.pe = ['202501', '202502', '202503', '202504', '201801'];
+      metaData.items['201801'] = {
+        name: 'January 2018'
       };
-      metaData.items._201802_ = {
-        name: '02 of 2018',
-        uid: '_201802_'
-      };
-      expect((0, _getFilterText.default)(filters, metaData)).toEqual('Clinics, Hospital - 01 of 2018, 02 of 2018');
+
+      // Relative period names come from relativePeriods.js
+      expect((0, _getFilterText.default)(filters, metaData)).toEqual('Clinics, Hospital - January 2018, Last 3 months, Last month');
     });
   });
 });

package/build/cjs/visualizations/util/getFilterText.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
+var _relativePeriods = require("../../components/PeriodDimension/utils/relativePeriods.js");
 var _getOuLevelAndGroupText = require("../../modules/getOuLevelAndGroupText.js");
+var _dimensionGetItemIds = require("../../modules/layout/dimensionGetItemIds.js");
 var _dimensionGetItems = require("../../modules/layout/dimensionGetItems.js");
 var _dimensionIs = require("../../modules/layout/dimensionIs.js");
 var _index = require("../../modules/ouIdHelper/index.js");
@@ -25,6 +27,12 @@ function _default(filters, metaData) {
       return _index.ouIdHelper.hasGroupPrefix(id) || _index.ouIdHelper.hasLevelPrefix(id);
     })) {
       titleFragments.push((0, _getOuLevelAndGroupText.getOuLevelAndGroupText)(filter, metaData));
+    } else if ((0, _dimensionIs.dimensionIs)(filter, _predefinedDimensions.DIMENSION_ID_PERIOD)) {
+      const relativePeriodNames = (0, _relativePeriods.getRelativePeriodsName)();
+      titleFragments.push((0, _dimensionGetItemIds.dimensionGetItemIds)(filter).map(id => {
+        var _metaData$items$id;
+        return relativePeriodNames[id] || ((_metaData$items$id = metaData.items[id]) === null || _metaData$items$id === void 0 ? void 0 : _metaData$items$id.name) || id;
+      }).join(', '));
     } else {
       const filterItems = metaData.dimensions[filter.dimension];
       if (Array.isArray(filterItems)) {

package/build/es/visualizations/util/__tests__/getFilterText.spec.js

@@ -111,24 +111,20 @@ describe('getFilterText', () => {
       filters.push({
         dimension: 'pe',
         items: [{
-          id: '_LAST_2_MONTHS_',
-          name: 'Last 2 months'
+          id: '201801'
+        }, {
+          id: 'LAST_3_MONTHS'
+        }, {
+          id: 'LAST_MONTH'
         }]
       });
-      metaData.dimensions.pe = ['_201801_', '_201802_'];
-      metaData.items._LAST_2_MONTHS_ = {
-        name: 'Last 2 months',
-        uid: '_LAST_2_MONTHS_'
-      };
-      metaData.items._201801_ = {
-        name: '01 of 2018',
-        uid: '_201801_'
-      };
-      metaData.items._201802_ = {
-        name: '02 of 2018',
-        uid: '_201802_'
+      metaData.dimensions.pe = ['202501', '202502', '202503', '202504', '201801'];
+      metaData.items['201801'] = {
+        name: 'January 2018'
       };
-      expect(getFilterText(filters, metaData)).toEqual('Clinics, Hospital - 01 of 2018, 02 of 2018');
+
+      // Relative period names come from relativePeriods.js
+      expect(getFilterText(filters, metaData)).toEqual('Clinics, Hospital - January 2018, Last 3 months, Last month');
     });
   });
 });

package/build/es/visualizations/util/getFilterText.js

@@ -1,8 +1,10 @@
+import { getRelativePeriodsName } from '../../components/PeriodDimension/utils/relativePeriods.js';
 import { getOuLevelAndGroupText } from '../../modules/getOuLevelAndGroupText.js';
+import { dimensionGetItemIds } from '../../modules/layout/dimensionGetItemIds.js';
 import { dimensionGetItems } from '../../modules/layout/dimensionGetItems.js';
 import { dimensionIs } from '../../modules/layout/dimensionIs.js';
 import { ouIdHelper } from '../../modules/ouIdHelper/index.js';
-import { DIMENSION_ID_ORGUNIT } from '../../modules/predefinedDimensions.js';
+import { DIMENSION_ID_ORGUNIT, DIMENSION_ID_PERIOD } from '../../modules/predefinedDimensions.js';
 export default function (filters, metaData) {
   if (!Array.isArray(filters) || !filters.length) {
     return '';
@@ -19,6 +21,12 @@ export default function (filters, metaData) {
       return ouIdHelper.hasGroupPrefix(id) || ouIdHelper.hasLevelPrefix(id);
     })) {
       titleFragments.push(getOuLevelAndGroupText(filter, metaData));
+    } else if (dimensionIs(filter, DIMENSION_ID_PERIOD)) {
+      const relativePeriodNames = getRelativePeriodsName();
+      titleFragments.push(dimensionGetItemIds(filter).map(id => {
+        var _metaData$items$id;
+        return relativePeriodNames[id] || ((_metaData$items$id = metaData.items[id]) === null || _metaData$items$id === void 0 ? void 0 : _metaData$items$id.name) || id;
+      }).join(', '));
     } else {
       const filterItems = metaData.dimensions[filter.dimension];
       if (Array.isArray(filterItems)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.13.3",
+    "version": "26.13.4",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {