@dhis2/analytics 21.5.2 → 21.8.0

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+# [21.8.0](https://github.com/dhis2/analytics/compare/v21.7.0...v21.8.0) (2022-08-12)
+
+
+### Features
+
+* search by tokens across identifiable properties (DHIS2-13475) ([#1293](https://github.com/dhis2/analytics/issues/1293)) ([58cf534](https://github.com/dhis2/analytics/commit/58cf534a0836d41093cdd0777e4efbd38871d7fd))
+
+# [21.7.0](https://github.com/dhis2/analytics/compare/v21.6.0...v21.7.0) (2022-06-02)
+
+
+### Features
+
+* export WEEKS_THIS_YEAR constant DHIS2-12580 ([#1247](https://github.com/dhis2/analytics/issues/1247)) ([8ee0a0c](https://github.com/dhis2/analytics/commit/8ee0a0c7eeb15f6f91a29a9e49c72c948c536869))
+
+# [21.6.0](https://github.com/dhis2/analytics/compare/v21.5.2...v21.6.0) (2022-06-01)
+
+
+### Bug Fixes
+
+* export color set consts ([#1248](https://github.com/dhis2/analytics/issues/1248)) ([7b384c0](https://github.com/dhis2/analytics/commit/7b384c0f8119a1dac2c3e006c7d5d4c74afe23ad))
+
+
+### Features
+
+* add basic and extended color sets ([#1242](https://github.com/dhis2/analytics/issues/1242)) ([58bdb21](https://github.com/dhis2/analytics/commit/58bdb211704523b59825d2585e01ad516ba88d7b))
+
 ## [21.5.2](https://github.com/dhis2/analytics/compare/v21.5.1...v21.5.2) (2022-04-04)
 
 

package/build/cjs/components/OpenFileDialog/OpenFileDialog.js

@@ -122,7 +122,7 @@ const OpenFileDialog = ({
     }
 
     if (filters.searchTerm) {
-      queryFilters.push("displayName:ilike:".concat(filters.searchTerm));
+      queryFilters.push("identifiable:token:".concat(filters.searchTerm));
     } // for ER 2.38 only show line list ER types
 
 

package/build/cjs/components/PeriodDimension/utils/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.filterPeriodTypesById = exports.FYAPR = exports.FYJUL = exports.FYOCT = exports.FYNOV = exports.FINANCIAL = exports.YEARLY = exports.SIXMONTHLYAPR = exports.SIXMONTHLY = exports.QUARTERLY = exports.BIMONTHLY = exports.MONTHLY = exports.BIWEEKLY = exports.WEEKLYSUN = exports.WEEKLYSAT = exports.WEEKLYTHU = exports.WEEKLYWED = exports.WEEKLY = exports.DAILY = void 0;
+exports.filterPeriodTypesById = exports.FYAPR = exports.FYJUL = exports.FYOCT = exports.FYNOV = exports.FINANCIAL = exports.YEARLY = exports.SIXMONTHLYAPR = exports.SIXMONTHLY = exports.QUARTERLY = exports.BIMONTHLY = exports.MONTHLY = exports.BIWEEKLY = exports.WEEKS_THIS_YEAR = exports.WEEKLYSUN = exports.WEEKLYSAT = exports.WEEKLYTHU = exports.WEEKLYWED = exports.WEEKLY = exports.DAILY = void 0;
 const DAILY = 'DAILY';
 exports.DAILY = DAILY;
 const WEEKLY = 'WEEKLY';
@@ -16,6 +16,8 @@ const WEEKLYSAT = 'WEEKLYSAT';
 exports.WEEKLYSAT = WEEKLYSAT;
 const WEEKLYSUN = 'WEEKLYSUN';
 exports.WEEKLYSUN = WEEKLYSUN;
+const WEEKS_THIS_YEAR = 'WEEKS_THIS_YEAR';
+exports.WEEKS_THIS_YEAR = WEEKS_THIS_YEAR;
 const BIWEEKLY = 'BIWEEKLY';
 exports.BIWEEKLY = BIWEEKLY;
 const MONTHLY = 'MONTHLY';

package/build/cjs/components/PeriodDimension/utils/relativePeriods.js

@@ -56,7 +56,7 @@ const getWeeksPeriodType = () => [{
   id: 'LAST_52_WEEKS',
   name: _index.default.t('Last 52 weeks')
 }, {
-  id: 'WEEKS_THIS_YEAR',
+  id: _index2.WEEKS_THIS_YEAR,
   name: _index.default.t('Weeks this year')
 }];
 

package/build/cjs/index.js

@@ -981,6 +981,18 @@ Object.defineProperty(exports, "COLOR_SET_DEFAULT", {
     return _colorSets.COLOR_SET_DEFAULT;
   }
 });
+Object.defineProperty(exports, "COLOR_SET_BASIC", {
+  enumerable: true,
+  get: function () {
+    return _colorSets.COLOR_SET_BASIC;
+  }
+});
+Object.defineProperty(exports, "COLOR_SET_EXTENDED", {
+  enumerable: true,
+  get: function () {
+    return _colorSets.COLOR_SET_EXTENDED;
+  }
+});
 Object.defineProperty(exports, "COLOR_SET_BRIGHT", {
   enumerable: true,
   get: function () {
@@ -1053,6 +1065,12 @@ Object.defineProperty(exports, "WEEKLYSUN", {
     return _index7.WEEKLYSUN;
   }
 });
+Object.defineProperty(exports, "WEEKS_THIS_YEAR", {
+  enumerable: true,
+  get: function () {
+    return _index7.WEEKS_THIS_YEAR;
+  }
+});
 Object.defineProperty(exports, "BIWEEKLY", {
   enumerable: true,
   get: function () {

package/build/cjs/visualizations/util/colors/colorSets.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.colorSets = exports.COLOR_SET_PATTERNS = exports.COLOR_SET_COLOR_BLIND = exports.COLOR_SET_GRAY = exports.COLOR_SET_DARK = exports.COLOR_SET_BRIGHT = exports.COLOR_SET_DEFAULT = void 0;
+exports.colorSets = exports.COLOR_SET_PATTERNS = exports.COLOR_SET_COLOR_BLIND = exports.COLOR_SET_GRAY = exports.COLOR_SET_DARK = exports.COLOR_SET_BRIGHT = exports.COLOR_SET_EXTENDED = exports.COLOR_SET_BASIC = exports.COLOR_SET_DEFAULT = void 0;
 
 var _highcharts = _interopRequireDefault(require("highcharts"));
 
@@ -14,6 +14,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 (0, _patternFill.default)(_highcharts.default);
 const COLOR_SET_DEFAULT = 'DEFAULT';
 exports.COLOR_SET_DEFAULT = COLOR_SET_DEFAULT;
+const COLOR_SET_BASIC = 'BASIC';
+exports.COLOR_SET_BASIC = COLOR_SET_BASIC;
+const COLOR_SET_EXTENDED = 'EXTENDED';
+exports.COLOR_SET_EXTENDED = COLOR_SET_EXTENDED;
 const COLOR_SET_BRIGHT = 'BRIGHT';
 exports.COLOR_SET_BRIGHT = COLOR_SET_BRIGHT;
 const COLOR_SET_DARK = 'DARK';
@@ -28,6 +32,12 @@ const colorSets = {
   [COLOR_SET_DEFAULT]: {
     colors: ['#a8bf24', '#518cc3', '#d74554', '#ff9e21', '#968f8f', '#ba3ba1', '#ffda54', '#45beae', '#b98037', '#676767', '#6b2dd4', '#47792c', '#fcbdbd', '#830000', '#a5ffc0', '#000078', '#817c00', '#bdf023', '#fffac4']
   },
+  [COLOR_SET_BASIC]: {
+    colors: ['#348F41', '#9F2241', '#DDDDDD', '#B4A269']
+  },
+  [COLOR_SET_EXTENDED]: {
+    colors: ['#194F90', '#AE1857', '#5B7E96', '#FFB71B', '#1DCAD3', '#FF5C35', '#8F4899', '#DAE343', '#385CAD', '#E81F76', '#009383', '#522B39']
+  },
   [COLOR_SET_BRIGHT]: {
     colors: ['#fd7f6f', '#8bd3c7', '#beb9db', '#7eb0d5', '#ffb55a', '#fdcce5', '#ffffaf', '#d9d9d9', '#bd7ebe', '#cbecc4', '#9fe778', '#ffef65']
   },

package/build/es/components/OpenFileDialog/OpenFileDialog.js

@@ -96,7 +96,7 @@ export const OpenFileDialog = ({
     }
 
     if (filters.searchTerm) {
-      queryFilters.push("displayName:ilike:".concat(filters.searchTerm));
+      queryFilters.push("identifiable:token:".concat(filters.searchTerm));
     } // for ER 2.38 only show line list ER types
 
 

package/build/es/components/PeriodDimension/utils/index.js

@@ -4,6 +4,7 @@ export const WEEKLYWED = 'WEEKLYWED';
 export const WEEKLYTHU = 'WEEKLYTHU';
 export const WEEKLYSAT = 'WEEKLYSAT';
 export const WEEKLYSUN = 'WEEKLYSUN';
+export const WEEKS_THIS_YEAR = 'WEEKS_THIS_YEAR';
 export const BIWEEKLY = 'BIWEEKLY';
 export const MONTHLY = 'MONTHLY';
 export const BIMONTHLY = 'BIMONTHLY';

package/build/es/components/PeriodDimension/utils/relativePeriods.js

@@ -1,5 +1,5 @@
 import i18n from '../../../locales/index.js';
-import { DAILY, WEEKLY, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, FINANCIAL, YEARLY } from './index.js';
+import { DAILY, WEEKLY, BIWEEKLY, WEEKS_THIS_YEAR, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, FINANCIAL, YEARLY } from './index.js';
 
 const getDaysPeriodType = () => [{
   id: 'TODAY',
@@ -46,7 +46,7 @@ const getWeeksPeriodType = () => [{
   id: 'LAST_52_WEEKS',
   name: i18n.t('Last 52 weeks')
 }, {
-  id: 'WEEKS_THIS_YEAR',
+  id: WEEKS_THIS_YEAR,
   name: i18n.t('Weeks this year')
 }];
 

package/build/es/index.js

@@ -82,9 +82,9 @@ export { LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM, LEGEND_DISPLAY_STRATEGY_FIXED, LE
 
 export { renderValue as formatValue } from './modules/pivotTable/renderValue.js'; // Utils: colorSets
 
-export { COLOR_SET_DEFAULT, COLOR_SET_BRIGHT, COLOR_SET_DARK, COLOR_SET_GRAY, COLOR_SET_COLOR_BLIND, COLOR_SET_PATTERNS, colorSets } from './visualizations/util/colors/colorSets.js'; // Utils: periods
+export { COLOR_SET_DEFAULT, COLOR_SET_BASIC, COLOR_SET_EXTENDED, COLOR_SET_BRIGHT, COLOR_SET_DARK, COLOR_SET_GRAY, COLOR_SET_COLOR_BLIND, COLOR_SET_PATTERNS, colorSets } from './visualizations/util/colors/colorSets.js'; // Utils: periods
 
-export { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYSAT, WEEKLYSUN, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, SIXMONTHLYAPR, YEARLY, FINANCIAL, FYNOV, FYOCT, FYJUL, FYAPR } from './components/PeriodDimension/utils/index.js';
+export { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYSAT, WEEKLYSUN, WEEKS_THIS_YEAR, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, SIXMONTHLYAPR, YEARLY, FINANCIAL, FYNOV, FYOCT, FYJUL, FYAPR } from './components/PeriodDimension/utils/index.js';
 export { getRelativePeriodsOptionsById } from './components/PeriodDimension/utils/relativePeriods.js';
 export { getFixedPeriodsOptionsById } from './components/PeriodDimension/utils/fixedPeriods.js';
 export { default as VisualizationOptions } from './components/Options/VisualizationOptions.js';

package/build/es/visualizations/util/colors/colorSets.js

@@ -2,6 +2,8 @@ import H from 'highcharts';
 import HPF from 'highcharts/modules/pattern-fill';
 HPF(H);
 export const COLOR_SET_DEFAULT = 'DEFAULT';
+export const COLOR_SET_BASIC = 'BASIC';
+export const COLOR_SET_EXTENDED = 'EXTENDED';
 export const COLOR_SET_BRIGHT = 'BRIGHT';
 export const COLOR_SET_DARK = 'DARK';
 export const COLOR_SET_GRAY = 'GRAY';
@@ -11,6 +13,12 @@ export const colorSets = {
   [COLOR_SET_DEFAULT]: {
     colors: ['#a8bf24', '#518cc3', '#d74554', '#ff9e21', '#968f8f', '#ba3ba1', '#ffda54', '#45beae', '#b98037', '#676767', '#6b2dd4', '#47792c', '#fcbdbd', '#830000', '#a5ffc0', '#000078', '#817c00', '#bdf023', '#fffac4']
   },
+  [COLOR_SET_BASIC]: {
+    colors: ['#348F41', '#9F2241', '#DDDDDD', '#B4A269']
+  },
+  [COLOR_SET_EXTENDED]: {
+    colors: ['#194F90', '#AE1857', '#5B7E96', '#FFB71B', '#1DCAD3', '#FF5C35', '#8F4899', '#DAE343', '#385CAD', '#E81F76', '#009383', '#522B39']
+  },
   [COLOR_SET_BRIGHT]: {
     colors: ['#fd7f6f', '#8bd3c7', '#beb9db', '#7eb0d5', '#ffb55a', '#fdcce5', '#ffffaf', '#d9d9d9', '#bd7ebe', '#cbecc4', '#9fe778', '#ffef65']
   },

package/package.json

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