@dhis2/analytics 21.0.10 → 21.1.1

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [21.1.1](https://github.com/dhis2/analytics/compare/v21.1.0...v21.1.1) (2021-12-22)
+
+
+### Bug Fixes
+
+* do not fix headers if no dimension items are selected ([#1057](https://github.com/dhis2/analytics/issues/1057)) ([ae51967](https://github.com/dhis2/analytics/commit/ae51967ff35a17b8589f4959015b06c4913b7dae))
+
+# [21.1.0](https://github.com/dhis2/analytics/compare/v21.0.12...v21.1.0) (2021-12-20)
+
+
+### Features
+
+* export formatValue function ([#1080](https://github.com/dhis2/analytics/issues/1080)) ([20d0f5a](https://github.com/dhis2/analytics/commit/20d0f5a1b2eda14879f03a4c6d37337c80bb15ff))
+
+## [21.0.12](https://github.com/dhis2/analytics/compare/v21.0.11...v21.0.12) (2021-12-11)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([ac9ad8c](https://github.com/dhis2/analytics/commit/ac9ad8ca44fa56d976e11c554a894b6aafebb58c))
+
+## [21.0.11](https://github.com/dhis2/analytics/compare/v21.0.10...v21.0.11) (2021-12-10)
+
+
+### Bug Fixes
+
+* support legendset in dimension create ([#1107](https://github.com/dhis2/analytics/issues/1107)) ([4b4dbe7](https://github.com/dhis2/analytics/commit/4b4dbe74c0012419f12c6b2f9c297e1a3e256c05))
+
 ## [21.0.10](https://github.com/dhis2/analytics/compare/v21.0.9...v21.0.10) (2021-12-09)
 
 

package/build/cjs/index.js

@@ -969,6 +969,12 @@ Object.defineProperty(exports, "LEGEND_DISPLAY_STYLE_TEXT", {
     return _legends.LEGEND_DISPLAY_STYLE_TEXT;
   }
 });
+Object.defineProperty(exports, "formatValue", {
+  enumerable: true,
+  get: function () {
+    return _renderValue.renderValue;
+  }
+});
 Object.defineProperty(exports, "COLOR_SET_DEFAULT", {
   enumerable: true,
   get: function () {
@@ -1270,6 +1276,8 @@ var _fontStyle = require("./modules/fontStyle.js");
 
 var _legends = require("./modules/legends.js");
 
+var _renderValue = require("./modules/pivotTable/renderValue.js");
+
 var _colorSets = require("./visualizations/util/colors/colorSets.js");
 
 var _index7 = require("./components/PeriodDimension/utils/index.js");

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

@@ -281,7 +281,7 @@
     "Left": "الأيسر",
     "Center": "المركز",
     "Right": "الأيمن",
-    "Start": "بدء",
+    "Start": "البدء",
     "Middle": "الوسط",
     "End": "النهاية",
     "Top": "القمة",

package/build/cjs/modules/layout/dimension.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DIMENSION_PROPS = exports.DIMENSION_PROP_FILTER = exports.DIMENSION_PROP_ITEMS = exports.DIMENSION_PROP_ID = exports.DIMENSION = void 0;
+exports.DIMENSION_PROPS = exports.DIMENSION_PROP_LEGEND_SET = exports.DIMENSION_PROP_FILTER = exports.DIMENSION_PROP_ITEMS = exports.DIMENSION_PROP_ID = exports.DIMENSION = void 0;
 
 var _isObject = _interopRequireDefault(require("lodash/isObject"));
 
@@ -38,5 +38,12 @@ const DIMENSION_PROP_FILTER = {
   isValid: prop => (0, _isString.default)(prop)
 };
 exports.DIMENSION_PROP_FILTER = DIMENSION_PROP_FILTER;
-const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER];
+const DIMENSION_PROP_LEGEND_SET = {
+  name: 'legendSet',
+  defaultValue: [],
+  required: false,
+  isValid: prop => (0, _isString.default)(prop)
+};
+exports.DIMENSION_PROP_LEGEND_SET = DIMENSION_PROP_LEGEND_SET;
+const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET];
 exports.DIMENSION_PROPS = DIMENSION_PROPS;

package/build/cjs/modules/layout/dimensionCreate.js

@@ -17,6 +17,9 @@ const dimensionCreate = (dimensionId, itemIds = [], args = {}) => {
     }),
     ...(args.filter && {
       [_dimension.DIMENSION_PROP_FILTER.name]: args.filter
+    }),
+    ...(args.legendSet && {
+      [_dimension.DIMENSION_PROP_LEGEND_SET.name]: args.legendSet
     })
   };
   return dimension;

package/build/cjs/modules/pivotTable/PivotTableEngine.js

@@ -226,6 +226,7 @@ class PivotTableEngine {
       return sets;
     }, {});
     this.rawData = data;
+    this.dimensionLookup = buildDimensionLookup(this.visualization, this.rawData.metaData, this.rawData.headers);
     this.options = { ...defaultOptions,
       showColumnTotals: visualization.colTotals,
       showRowTotals: visualization.rowTotals,
@@ -235,10 +236,10 @@ class PivotTableEngine {
       hideEmptyRows: visualization.hideEmptyRows,
       title: visualization.hideTitle ? undefined : visualization.title,
       subtitle: visualization.hideSubtitle ? undefined : visualization.subtitle,
-      fixColumnHeaders: visualization.fixColumnHeaders,
-      fixRowHeaders: visualization.fixRowHeaders
+      // turn on fixed headers only when there are dimensions
+      fixColumnHeaders: this.dimensionLookup.columns.length ? visualization.fixColumnHeaders : false,
+      fixRowHeaders: this.dimensionLookup.rows.length ? visualization.fixRowHeaders : false
     };
-    this.dimensionLookup = buildDimensionLookup(this.visualization, this.rawData.metaData, this.rawData.headers);
     this.adaptiveClippingController = new _AdaptiveClippingController.AdaptiveClippingController(this);
     const doColumnSubtotals = this.options.showColumnSubtotals && this.dimensionLookup.rows.length > 1;
     const singularRow = this.dimensionLookup.rows.length === 1 && this.dimensionLookup.rows[0].count === 1;

package/build/es/index.js

@@ -78,7 +78,9 @@ export { createVisualization } from './visualizations/index.js'; // Modules: fon
 
 export { FONT_STYLE_VISUALIZATION_TITLE, FONT_STYLE_VISUALIZATION_SUBTITLE, FONT_STYLE_HORIZONTAL_AXIS_TITLE, FONT_STYLE_VERTICAL_AXIS_TITLE, FONT_STYLE_LEGEND, FONT_STYLE_AXIS_LABELS, FONT_STYLE_REGRESSION_LINE_LABEL, FONT_STYLE_OPTION_FONT, FONT_STYLE_OPTION_FONT_SIZE, FONT_STYLE_OPTION_BOLD, FONT_STYLE_OPTION_ITALIC, FONT_STYLE_OPTION_UNDERLINE, FONT_STYLE_OPTION_TEXT_COLOR, FONT_STYLE_OPTION_TEXT_ALIGN, TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT, defaultFontStyle, getFontSizeOptions, getTextAlignOptions, deleteFontStyleOption } from './modules/fontStyle.js'; // Modules: legend
 
-export { LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM, LEGEND_DISPLAY_STRATEGY_FIXED, LEGEND_DISPLAY_STYLE_FILL, LEGEND_DISPLAY_STYLE_TEXT } from './modules/legends.js'; // Utils: colorSets
+export { LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM, LEGEND_DISPLAY_STRATEGY_FIXED, LEGEND_DISPLAY_STYLE_FILL, LEGEND_DISPLAY_STYLE_TEXT } from './modules/legends.js'; // Modules: pivotTable
+
+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
 

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

@@ -281,7 +281,7 @@
     "Left": "الأيسر",
     "Center": "المركز",
     "Right": "الأيمن",
-    "Start": "بدء",
+    "Start": "البدء",
     "Middle": "الوسط",
     "End": "النهاية",
     "Top": "القمة",

package/build/es/modules/layout/dimension.js

@@ -23,4 +23,10 @@ export const DIMENSION_PROP_FILTER = {
   required: false,
   isValid: prop => isString(prop)
 };
-export const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER];
+export const DIMENSION_PROP_LEGEND_SET = {
+  name: 'legendSet',
+  defaultValue: [],
+  required: false,
+  isValid: prop => isString(prop)
+};
+export const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET];

package/build/es/modules/layout/dimensionCreate.js

@@ -1,4 +1,4 @@
-import { DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER } from './dimension.js';
+import { DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET } from './dimension.js';
 export const dimensionCreate = (dimensionId, itemIds = [], args = {}) => {
   const dimension = {
     [DIMENSION_PROP_ID.name]: dimensionId,
@@ -9,6 +9,9 @@ export const dimensionCreate = (dimensionId, itemIds = [], args = {}) => {
     }),
     ...(args.filter && {
       [DIMENSION_PROP_FILTER.name]: args.filter
+    }),
+    ...(args.legendSet && {
+      [DIMENSION_PROP_LEGEND_SET.name]: args.legendSet
     })
   };
   return dimension;

package/build/es/modules/pivotTable/PivotTableEngine.js

@@ -211,6 +211,7 @@ export class PivotTableEngine {
       return sets;
     }, {});
     this.rawData = data;
+    this.dimensionLookup = buildDimensionLookup(this.visualization, this.rawData.metaData, this.rawData.headers);
     this.options = { ...defaultOptions,
       showColumnTotals: visualization.colTotals,
       showRowTotals: visualization.rowTotals,
@@ -220,10 +221,10 @@ export class PivotTableEngine {
       hideEmptyRows: visualization.hideEmptyRows,
       title: visualization.hideTitle ? undefined : visualization.title,
       subtitle: visualization.hideSubtitle ? undefined : visualization.subtitle,
-      fixColumnHeaders: visualization.fixColumnHeaders,
-      fixRowHeaders: visualization.fixRowHeaders
+      // turn on fixed headers only when there are dimensions
+      fixColumnHeaders: this.dimensionLookup.columns.length ? visualization.fixColumnHeaders : false,
+      fixRowHeaders: this.dimensionLookup.rows.length ? visualization.fixRowHeaders : false
     };
-    this.dimensionLookup = buildDimensionLookup(this.visualization, this.rawData.metaData, this.rawData.headers);
     this.adaptiveClippingController = new AdaptiveClippingController(this);
     const doColumnSubtotals = this.options.showColumnSubtotals && this.dimensionLookup.rows.length > 1;
     const singularRow = this.dimensionLookup.rows.length === 1 && this.dimensionLookup.rows[0].count === 1;

package/package.json

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