@dhis2/analytics 28.0.1 → 28.0.2

package/build/cjs/index.js

@@ -215,6 +215,10 @@ var _exportNames = {
   LEGEND_DISPLAY_STYLE_FILL: true,
   LEGEND_DISPLAY_STYLE_TEXT: true,
   getColorByValueFromLegendSet: true,
+  HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST: true,
+  HIDE_EMPTY_ROW_ITEMS_AFTER_LAST: true,
+  HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST: true,
+  HIDE_EMPTY_ROW_ITEMS_ALL: true,
   formatValue: true,
   COLOR_SET_DEFAULT: true,
   COLOR_SET_BASIC: true,
@@ -713,6 +717,30 @@ Object.defineProperty(exports, "FixedPeriodSelect", {
     return _FixedPeriodSelect.default;
   }
 });
+Object.defineProperty(exports, "HIDE_EMPTY_ROW_ITEMS_AFTER_LAST", {
+  enumerable: true,
+  get: function () {
+    return _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_AFTER_LAST;
+  }
+});
+Object.defineProperty(exports, "HIDE_EMPTY_ROW_ITEMS_ALL", {
+  enumerable: true,
+  get: function () {
+    return _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_ALL;
+  }
+});
+Object.defineProperty(exports, "HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST", {
+  enumerable: true,
+  get: function () {
+    return _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST;
+  }
+});
+Object.defineProperty(exports, "HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST", {
+  enumerable: true,
+  get: function () {
+    return _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST;
+  }
+});
 Object.defineProperty(exports, "ITEM", {
   enumerable: true,
   get: function () {
@@ -1951,6 +1979,7 @@ var _index10 = require("./modules/layoutUiRules/index.js");
 var _index11 = require("./visualizations/index.js");
 var _fontStyle = require("./modules/fontStyle.js");
 var _legends = require("./modules/legends.js");
+var _hideEmptyRowItems = require("./modules/hideEmptyRowItems.js");
 var _renderValue = require("./modules/renderValue.js");
 var _colorSets = require("./visualizations/util/colors/colorSets.js");
 var _index12 = require("./components/PeriodDimension/utils/index.js");

package/build/cjs/modules/hideEmptyRowItems.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST = exports.HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST = exports.HIDE_EMPTY_ROW_ITEMS_ALL = exports.HIDE_EMPTY_ROW_ITEMS_AFTER_LAST = void 0;
+const HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST = exports.HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST = 'BEFORE_FIRST';
+const HIDE_EMPTY_ROW_ITEMS_AFTER_LAST = exports.HIDE_EMPTY_ROW_ITEMS_AFTER_LAST = 'AFTER_LAST';
+const HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST = exports.HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST = 'BEFORE_FIRST_AFTER_LAST';
+const HIDE_EMPTY_ROW_ITEMS_ALL = exports.HIDE_EMPTY_ROW_ITEMS_ALL = 'ALL';

package/build/cjs/visualizations/config/adapters/dhis_highcharts/getTrimmedConfig.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = _default;
 var _arrayContains = _interopRequireDefault(require("d2-utilizr/lib/arrayContains"));
 var _arrayUnique = _interopRequireDefault(require("d2-utilizr/lib/arrayUnique"));
+var _hideEmptyRowItems = require("../../../../modules/hideEmptyRowItems.js");
 var _visTypes = require("../../../../modules/visTypes.js");
 var _getTwoCategorySplitSerieData = _interopRequireDefault(require("./getTwoCategorySplitSerieData.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -60,16 +61,16 @@ function getFirstLastValueIndexes(series) {
 function cleanData(data, emptySeriesIndexes, firstValueIndex, lastValueIndex, hideEmptyRowItems) {
   let cleanedData;
   switch (hideEmptyRowItems) {
-    case 'ALL':
+    case _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_ALL:
       cleanedData = arrayCleanUndefined(data.map((value, index) => (0, _arrayContains.default)(emptySeriesIndexes, index) ? undefined : value));
       break;
-    case 'BEFORE_FIRST':
+    case _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST:
       cleanedData = data.slice(firstValueIndex);
       break;
-    case 'AFTER_LAST':
+    case _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_AFTER_LAST:
       cleanedData = data.slice(0, lastValueIndex + 1);
       break;
-    case 'BEFORE_FIRST_AFTER_LAST':
+    case _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST:
       cleanedData = data.slice(firstValueIndex, lastValueIndex + 1);
       break;
     default:

package/build/cjs/visualizations/config/adapters/dhis_highcharts/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = _default;
 var _isString = _interopRequireDefault(require("d2-utilizr/lib/isString"));
 var _objectClean = _interopRequireDefault(require("d2-utilizr/lib/objectClean"));
+var _hideEmptyRowItems = require("../../../../modules/hideEmptyRowItems.js");
 var _legends = require("../../../../modules/legends.js");
 var _index = require("../../../../modules/outliers/index.js");
 var _visTypes = require("../../../../modules/visTypes.js");
@@ -144,7 +145,7 @@ function _default(_ref) {
   }
 
   // hide empty categories
-  if (_layout.hideEmptyRowItems !== 'NONE') {
+  if (_layout.hideEmptyRowItems && [_hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST, _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_AFTER_LAST, _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST, _hideEmptyRowItems.HIDE_EMPTY_ROW_ITEMS_ALL].includes(_layout.hideEmptyRowItems)) {
     config = (0, _getTrimmedConfig.default)(config, _layout);
   }
 

package/build/es/index.js

@@ -121,6 +121,10 @@ export { FONT_STYLE_VISUALIZATION_TITLE, FONT_STYLE_VISUALIZATION_SUBTITLE, FONT
 
 export { LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM, LEGEND_DISPLAY_STRATEGY_FIXED, LEGEND_DISPLAY_STYLE_FILL, LEGEND_DISPLAY_STYLE_TEXT, getColorByValueFromLegendSet } from './modules/legends.js';
 
+// Modules: hideEmptyRowItems
+
+export { HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST, HIDE_EMPTY_ROW_ITEMS_AFTER_LAST, HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST, HIDE_EMPTY_ROW_ITEMS_ALL } from './modules/hideEmptyRowItems.js';
+
 // Modules: general
 
 export { renderValue as formatValue } from './modules/renderValue.js';

package/build/es/modules/hideEmptyRowItems.js

@@ -0,0 +1,4 @@
+export const HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST = 'BEFORE_FIRST';
+export const HIDE_EMPTY_ROW_ITEMS_AFTER_LAST = 'AFTER_LAST';
+export const HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST = 'BEFORE_FIRST_AFTER_LAST';
+export const HIDE_EMPTY_ROW_ITEMS_ALL = 'ALL';

package/build/es/visualizations/config/adapters/dhis_highcharts/getTrimmedConfig.js

@@ -1,5 +1,6 @@
 import arrayContains from 'd2-utilizr/lib/arrayContains';
 import arrayUnique from 'd2-utilizr/lib/arrayUnique';
+import { HIDE_EMPTY_ROW_ITEMS_AFTER_LAST, HIDE_EMPTY_ROW_ITEMS_ALL, HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST, HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST } from '../../../../modules/hideEmptyRowItems.js';
 import { isTwoCategoryChartType } from '../../../../modules/visTypes.js';
 import getTwoCategorySplitSerieData from './getTwoCategorySplitSerieData.js';
 function arrayCleanUndefined(array) {
@@ -53,16 +54,16 @@ function getFirstLastValueIndexes(series) {
 function cleanData(data, emptySeriesIndexes, firstValueIndex, lastValueIndex, hideEmptyRowItems) {
   let cleanedData;
   switch (hideEmptyRowItems) {
-    case 'ALL':
+    case HIDE_EMPTY_ROW_ITEMS_ALL:
       cleanedData = arrayCleanUndefined(data.map((value, index) => arrayContains(emptySeriesIndexes, index) ? undefined : value));
       break;
-    case 'BEFORE_FIRST':
+    case HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST:
       cleanedData = data.slice(firstValueIndex);
       break;
-    case 'AFTER_LAST':
+    case HIDE_EMPTY_ROW_ITEMS_AFTER_LAST:
       cleanedData = data.slice(0, lastValueIndex + 1);
       break;
-    case 'BEFORE_FIRST_AFTER_LAST':
+    case HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST:
       cleanedData = data.slice(firstValueIndex, lastValueIndex + 1);
       break;
     default:

package/build/es/visualizations/config/adapters/dhis_highcharts/index.js

@@ -1,5 +1,6 @@
 import isString from 'd2-utilizr/lib/isString';
 import objectClean from 'd2-utilizr/lib/objectClean';
+import { HIDE_EMPTY_ROW_ITEMS_AFTER_LAST, HIDE_EMPTY_ROW_ITEMS_ALL, HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST, HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST } from '../../../../modules/hideEmptyRowItems.js';
 import { LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM, LEGEND_DISPLAY_STRATEGY_FIXED } from '../../../../modules/legends.js';
 import { getOutlierHelper } from '../../../../modules/outliers/index.js';
 import { isStacked, isLegendSetType, VIS_TYPE_SCATTER, VIS_TYPE_GAUGE, VIS_TYPE_LINE } from '../../../../modules/visTypes.js';
@@ -135,7 +136,7 @@ export default function (_ref) {
   }
 
   // hide empty categories
-  if (_layout.hideEmptyRowItems !== 'NONE') {
+  if (_layout.hideEmptyRowItems && [HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST, HIDE_EMPTY_ROW_ITEMS_AFTER_LAST, HIDE_EMPTY_ROW_ITEMS_BEFORE_FIRST_AFTER_LAST, HIDE_EMPTY_ROW_ITEMS_ALL].includes(_layout.hideEmptyRowItems)) {
     config = getTrimmedConfig(config, _layout);
   }
 

package/package.json

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