@dhis2/analytics 26.9.0 → 26.9.3

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

@@ -18,6 +18,8 @@
     "About this map": "",
     "About this line list": "",
     "About this visualization": "",
+    "About this event chart": "",
+    "About this event report": "",
     "This app could not retrieve required data.": "",
     "Network error": "Lỗi mạng",
     "Data / Edit calculation": "",
@@ -132,17 +134,6 @@
     "Manage sharing": "Quản lý chia sẻ",
     "Could not update interpretation": "",
     "Enter interpretation text": "",
-    "Bold text": "",
-    "Italic text": "",
-    "Link to a URL": "",
-    "Mention a user": "",
-    "Add emoji": "",
-    "Preview": "Xem thử",
-    "Back to write mode": "",
-    "Too many results. Try refining the search.": "",
-    "Search for a user": "",
-    "Searching for \"{{- searchText}}\"": "",
-    "No results found": "Không tìm thấy kết quả nào",
     "Not available offline": "",
     "Created by": "Được tạo bởi",
     "Anyone": "Bất kỳ ai",
@@ -215,7 +206,7 @@
     "Quarterly": "Hàng quý",
     "Six-monthly": "Hàng 6 tháng",
     "Six-monthly April": "Hàng 6 tháng - tháng 4",
-    "Yearly": "Một năm",
+    "Yearly": "Hàng năm",
     "Financial year (Start November)": "Năm tài chính (Bắt đầu từ tháng 11)",
     "Financial year (Start October)": "Năm Tài Chính - Tháng 10",
     "Financial year (Start July)": "Năm Tài Chính - Tháng 7",
@@ -271,6 +262,14 @@
     "Six-months": "Sáu-tháng",
     "Financial Years": "Năm tài chính",
     "Years": "Năm",
+    "Value: {{value}}": "",
+    "Bold text": "",
+    "Italic text": "",
+    "Link to a URL": "",
+    "Mention a user": "",
+    "Add emoji": "",
+    "Preview": "Xem thử",
+    "Back to write mode": "",
     "Interpretations and details": "",
     "Translating to": "",
     "Choose a locale": "",
@@ -281,6 +280,10 @@
     "Cannot save while offline": "",
     "Could not load translations": "",
     "Retry": "",
+    "Too many results. Try refining the search.": "",
+    "Search for a user": "",
+    "Searching for \"{{- searchText}}\"": "",
+    "No results found": "Không tìm thấy kết quả nào",
     "Series": "Chuỗi Dữ Liệu",
     "Category": "Phân loại",
     "Filter": "Lọc",
@@ -350,6 +353,7 @@
     "{{thresholdFactor}} × Modified Z-score high": "",
     "{{thresholdFactor}} × Z-score low": "",
     "{{thresholdFactor}} × Z-score high": "",
+    "Not applicable": "",
     "Data": "Lấy dữ liệu",
     "Organisation unit": "Đơn vị",
     "Assigned Categories": "Phân loại được chỉ định",

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

@@ -262,6 +262,7 @@
     "Six-months": "六个月",
     "Financial Years": "财政年度",
     "Years": "年",
+    "Value: {{value}}": "值{{value}}",
     "Bold text": "粗体文字",
     "Italic text": "斜体文字",
     "Link to a URL": "链接到 URL",
@@ -352,6 +353,7 @@
     "{{thresholdFactor}} × Modified Z-score high": "{{thresholdFactor}}×修改后的Z分数高值",
     "{{thresholdFactor}} × Z-score low": "{{thresholdFactor}}×Z分数低",
     "{{thresholdFactor}} × Z-score high": "{{thresholdFactor}}×Z分数高",
+    "Not applicable": "不适用",
     "Data": "数据",
     "Organisation unit": "机构",
     "Assigned Categories": "指定的分类",

package/build/es/modules/__tests__/getOuLevelAndGroupText.spec.js

@@ -51,4 +51,13 @@ describe('getOuLevelAndGroupText', () => {
     }];
     expect(getOuLevelAndGroupText(filter, metaData)).toEqual('Fruit and Veggies groups - Second floor levels');
   });
+  it('grabs name for user orgunits from items when not present in metaData', () => {
+    filter.items = [{
+      id: 'USER_ORGUNIT',
+      name: 'User organisation unit'
+    }, {
+      id: 'LEVEL-2nd-floor'
+    }];
+    expect(getOuLevelAndGroupText(filter, metaData)).toEqual('Second floor levels in User organisation unit');
+  });
 });

package/build/es/modules/getOuLevelAndGroupText.js

@@ -20,7 +20,10 @@ export const getOuLevelAndGroupText = (filter, metaData) => {
   return filterFragments.join(' - ');
 };
 const getLevelAndGroupText = (items, metaData, isLevel) => {
-  const getNameFromMetadata = id => metaData.items[id] ? metaData.items[id].name : id;
+  const getNameFromMetadata = id => {
+    var _items$find;
+    return metaData.items[id] ? metaData.items[id].name : ((_items$find = items.find(item => item.id === id)) === null || _items$find === void 0 ? void 0 : _items$find.name) || id;
+  };
   const dynamicOuItems = items.filter(item => isLevel ? ouIdHelper.hasLevelPrefix(item.id) : ouIdHelper.hasGroupPrefix(item.id));
   const lastItem = dynamicOuItems.length > 1 ? dynamicOuItems.pop() : null;
   const dynamicOuNames = dynamicOuItems.map(item => getNameFromMetadata(ouIdHelper.removePrefix(item.id))).join(', ');

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

@@ -1,6 +1,6 @@
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { measureTextWithWrapping } from './measureText.js';
 import { CLIPPED_AXIS_PARTITION_SIZE_PX, CLIPPED_CELL_MIN_SIZE } from './pivotTableConstants.js';
 export class AdaptiveClippingController {

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

@@ -1,6 +1,6 @@
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import i18n from '@dhis2/d2-i18n';
 import times from 'lodash/times';
 import { DIMENSION_TYPE_DATA, DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET, DIMENSION_TYPE_ORGANISATION_UNIT, DIMENSION_TYPE_PERIOD } from '../dataTypes.js';

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

@@ -19,7 +19,6 @@ export const useSortableColumns = engine => {
       order
     }); // Force a re-render
   };
-
   return {
     sortBy,
     onSortByColumn

package/build/es/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/index.js

@@ -4,14 +4,13 @@ import { getAvailableSpace } from './getAvailableSpace.js';
 import { positionElements } from './positionElements.js';
 import { DynamicStyles } from './styles.js';
 export default function loadSingleValueSVG() {
-  var _this$userOptions;
   const {
     formattedValue,
     icon,
     subText,
     fontColor
   } = this.userOptions.customSVGOptions;
-  const dynamicStyles = new DynamicStyles((_this$userOptions = this.userOptions) === null || _this$userOptions === void 0 ? void 0 : _this$userOptions.isPdfExport);
+  const dynamicStyles = new DynamicStyles();
   const valueElement = this.renderer.text(formattedValue).attr('data-test', 'visualization-primary-value').css({
     color: fontColor,
     visibility: 'hidden'

package/build/es/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/styles.js

@@ -69,15 +69,14 @@ const spacings = [{
 }];
 export const MIN_SIDE_WHITESPACE = 4;
 export class DynamicStyles {
-  constructor(isPdfExport) {
+  constructor() {
     this.currentIndex = 0;
-    this.isPdfExport = isPdfExport;
   }
   getStyle() {
     return {
       value: {
         ...valueStyles[this.currentIndex],
-        'font-weight': this.isPdfExport ? 'normal' : '300'
+        'font-weight': '300'
       },
       subText: subTextStyles[this.currentIndex],
       spacing: spacings[this.currentIndex]

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

@@ -1,7 +1,7 @@
 import i18n from '../../../../locales/index.js';
 import { VIS_TYPE_COLUMN, VIS_TYPE_SCATTER, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR } from '../../../../modules/visTypes.js';
 const MAX_LABELS = 10;
-export default (_ref => {
+export default _ref => {
   let {
     visType,
     xAxisName,
@@ -66,4 +66,4 @@ export default (_ref => {
     default:
       return null;
   }
-});
+};

package/build/es/visualizations/config/adapters/dhis_highcharts/series/scatter.js

@@ -2,7 +2,7 @@ import i18n from '../../../../../locales/index.js';
 const DEFAULT_COLOR = '#a8bf24';
 const OUTLIER_COLOR = 'red';
 const POINT_MARKER_SYMBOL = 'circle';
-export default (extraOptions => {
+export default extraOptions => {
   const series = [];
   if (extraOptions.outlierHelper) {
     var _helper$vars$normaliz;
@@ -78,4 +78,4 @@ export default (extraOptions => {
     });
   }
   return series;
-});
+};

package/build/es/visualizations/config/adapters/dhis_highcharts/subtitle/__tests__/singleValue.spec.js

@@ -48,7 +48,6 @@ describe('getSingleValueSubtitle', () => {
     //     })
     // })
   });
-
   describe('dashboard', () => {
     it('returns filter title as subtitle', () => {
       expect(getSingleValueSubtitle({

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

@@ -19,7 +19,7 @@ const DASHBOARD_SUBTITLE = {
 function getDefault(layout, dashboard, filterTitle) {
   return dashboard || isString(layout.title) ? filterTitle : undefined;
 }
-export default function (series, layout, metaData, extraOptions) {
+export default function subtitle(series, layout, metaData, extraOptions) {
   if (layout.hideSubtitle) {
     return null;
   }

package/build/es/visualizations/config/adapters/dhis_highcharts/title/yearOverYear.js

@@ -1,5 +1,5 @@
 import getFilterText from '../../../../util/getFilterText.js';
-export default function (layout, metaData, dashboard) {
+export default function yearOverYear(layout, metaData, dashboard) {
   const titleFragments = [];
   if (layout.columns && layout.columns.length && !dashboard) {
     titleFragments.push(getFilterText(layout.columns, metaData));

package/build/es/visualizations/config/adapters/dhis_highcharts/xAxis/radar.js

@@ -3,11 +3,11 @@ import { FONT_STYLE_HORIZONTAL_AXIS_TITLE, TEXT_ALIGN_CENTER } from '../../../..
 import { isVerticalType, VIS_TYPE_RADAR } from '../../../../../modules/visTypes.js';
 import { getTextAlignOption } from '../getTextAlignOption.js';
 import { getDefault } from './index.js';
-export default ((store, layout) => {
+export default (store, layout) => {
   var _config$title;
   const config = getDefault(store, layout);
   if (isString((_config$title = config.title) === null || _config$title === void 0 ? void 0 : _config$title.text) && config.title.align === getTextAlignOption(TEXT_ALIGN_CENTER, FONT_STYLE_HORIZONTAL_AXIS_TITLE, isVerticalType(VIS_TYPE_RADAR))) {
     config.title.textAlign = 'right';
   }
   return config;
-});
+};

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

@@ -99,7 +99,7 @@ function getDefault(layout, series, extraOptions) {
   });
   return axes;
 }
-export default function (layout, series, extraOptions) {
+export default function yAxis(layout, series, extraOptions) {
   switch (layout.type) {
     case VIS_TYPE_SINGLE_VALUE:
       return null;

package/build/es/visualizations/config/generators/highcharts/index.js

@@ -3,20 +3,16 @@ import HM from 'highcharts/highcharts-more';
 import HB from 'highcharts/modules/boost';
 import HE from 'highcharts/modules/exporting';
 import HNDTD from 'highcharts/modules/no-data-to-display';
-import HOE from 'highcharts/modules/offline-exporting';
 import HPF from 'highcharts/modules/pattern-fill';
 import HSG from 'highcharts/modules/solid-gauge';
-import PEBFP from './pdfExportBugFixPlugin/index.js';
 
 // apply
 HM(H);
 HSG(H);
 HNDTD(H);
 HE(H);
-HOE(H);
 HPF(H);
 HB(H);
-PEBFP(H);
 
 /* Whitelist some additional SVG attributes here. Without this,
  * the PDF export for the SingleValue visualization breaks. */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.9.0",
+    "version": "26.9.3",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -20,8 +20,8 @@
     },
     "scripts": {
         "build": "d2-app-scripts build",
-        "build-storybook": "build-storybook",
-        "start-storybook": "start-storybook --port 5000",
+        "build-storybook": "storybook build",
+        "start-storybook": "storybook dev --port 5000",
         "start": "yarn start-storybook",
         "test": "d2-app-scripts test",
         "lint": "d2-style check",
@@ -31,14 +31,14 @@
     },
     "devDependencies": {
         "@dhis2/app-runtime": "^3.9.0",
-        "@dhis2/cli-app-scripts": "^9.0.1",
-        "@dhis2/cli-style": "^10.4.1",
+        "@dhis2/cli-app-scripts": "^11.7.4",
+        "@dhis2/cli-style": "^10.7.4",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/ui": "^9.4.4",
-        "@sambego/storybook-state": "^2.0.1",
-        "@storybook/addons": "^6.5.16",
-        "@storybook/preset-create-react-app": "^3.1.7",
-        "@storybook/react": "^6.5.16",
+        "@mihkeleidast/storybook-addon-source": "^1.0.1",
+        "@storybook/preset-create-react-app": "^8.3.6",
+        "@storybook/react": "^8.3.6",
+        "@storybook/react-webpack5": "^8.3.6",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^12.1.5",
         "enzyme": "^3.9.0",
@@ -46,6 +46,7 @@
         "fs-extra": "^10.1.0",
         "jest-enzyme": "^7.0.2",
         "prop-types": "^15",
+        "storybook": "^8.3.6",
         "styled-jsx": "^4.0.1"
     },
     "peerDependencies": {
@@ -64,7 +65,7 @@
         "@dnd-kit/utilities": "^3.2.1",
         "@react-hook/debounce": "^4.0.0",
         "classnames": "^2.3.1",
-        "crypto-js": "^4.1.1",
+        "crypto-js": "^4.2.0",
         "d2-utilizr": "^0.2.16",
         "d3-color": "^1.2.3",
         "highcharts": "^10.3.3",
@@ -75,7 +76,8 @@
         "resize-observer-polyfill": "^1.5.1"
     },
     "resolutions": {
-        "@dhis2/ui": "^9.2.0"
+        "@dhis2/ui": "^9.2.0",
+        "eslint": "^7.32.0"
     },
     "files": [
         "build"

package/build/cjs/visualizations/config/generators/highcharts/pdfExportBugFixPlugin/index.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var _nonASCIIFont = _interopRequireDefault(require("./nonASCIIFont.js"));
-var _textShadow = _interopRequireDefault(require("./textShadow.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _default(H) {
-  (0, _textShadow.default)(H);
-  (0, _nonASCIIFont.default)(H);
-}

package/build/cjs/visualizations/config/generators/highcharts/pdfExportBugFixPlugin/nonASCIIFont.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-/* This is a workaround for https://github.com/highcharts/highcharts/issues/22008
- * We add some transparent text in a non-ASCII script to the chart to prevent
- * the chart from being exported in a serif font */
-
-function _default(H) {
-  H.addEvent(H.Chart, 'load', function () {
-    this.renderer.text('모', 20, 20).attr({
-      opacity: 0
-    }).add();
-  });
-}