@dhis2/analytics 23.8.4 → 23.8.7

package/build/es/visualizations/config/generators/dhis/singleValue.js

@@ -3,14 +3,15 @@ import { FONT_STYLE_VISUALIZATION_TITLE, FONT_STYLE_VISUALIZATION_SUBTITLE, FONT
 import { getColorByValueFromLegendSet } from '../../../../modules/legends.js';
 const svgNS = 'http://www.w3.org/2000/svg';
 
-const generateValueSVG = ({
-  value,
-  formattedValue,
-  subText,
-  legendSet,
-  noData,
-  y
-}) => {
+const generateValueSVG = _ref => {
+  let {
+    value,
+    formattedValue,
+    subText,
+    legendSet,
+    noData,
+    y
+  } = _ref;
   const textSize = 300;
   const svgValue = document.createElementNS(svgNS, 'svg');
   svgValue.setAttribute('xmlns', svgNS);
@@ -62,10 +63,11 @@ const generateValueSVG = ({
   return svgValue;
 };
 
-const generateDashboardItem = (config, {
-  legendSet,
-  noData
-}) => {
+const generateDashboardItem = (config, _ref2) => {
+  let {
+    legendSet,
+    noData
+  } = _ref2;
   const container = document.createElement('div');
   container.setAttribute('style', 'display: flex; flex-direction: column; align-items: center; justify-content: center; width: 100%; height: 100%');
   const titleStyle = 'font-size: 12px; color: #666;';
@@ -124,12 +126,13 @@ const getXFromTextAlign = textAlign => {
   }
 };
 
-const generateDVItem = (config, {
-  legendSet,
-  parentEl,
-  fontStyle,
-  noData
-}) => {
+const generateDVItem = (config, _ref3) => {
+  let {
+    legendSet,
+    parentEl,
+    fontStyle,
+    noData
+  } = _ref3;
   const parentElBBox = parentEl.getBoundingClientRect();
   const width = parentElBBox.width;
   const height = parentElBBox.height;
@@ -184,12 +187,13 @@ const generateDVItem = (config, {
   return svg;
 };
 
-export default function (config, parentEl, {
-  dashboard,
-  legendSets,
-  fontStyle,
-  noData
-}) {
+export default function (config, parentEl, _ref4) {
+  let {
+    dashboard,
+    legendSets,
+    fontStyle,
+    noData
+  } = _ref4;
   const legendSet = legendSets[0];
   parentEl.style.overflow = 'hidden';
   parentEl.style.display = 'flex';

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

@@ -14,7 +14,11 @@ HPF(H);
 HB(H);
 export default function (config, el) {
   if (config) {
-    config.chart.renderTo = el || config.chart.renderTo;
+    config.chart.renderTo = el || config.chart.renderTo; // silence warning about accessibility
+
+    config.accessibility = {
+      enabled: false
+    };
 
     if (config.lang) {
       H.setOptions({

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

@@ -3,17 +3,19 @@ import { theme1 } from '../util/colors/index.js';
 import adapters from './adapters/index.js';
 import generators from './generators/index.js';
 import validators from './validators/index.js';
-export default function ({
-  store,
-  layout,
-  el,
-  inputFormat = 'dhis',
-  outputFormat = 'highcharts',
-  extraLayout,
-  extraOptions,
-  onError,
-  onWarning
-}) {
+export default function (_ref) {
+  let {
+    store,
+    layout,
+    el,
+    inputFormat = 'dhis',
+    outputFormat = 'highcharts',
+    extraLayout,
+    extraOptions,
+    onError,
+    onWarning
+  } = _ref;
+
   const _validator = validators[inputFormat] || validators.noValidation;
 
   const _adapter = adapters[inputFormat + '_' + outputFormat];

package/build/es/visualizations/config/validators/dhis/index.js

@@ -1,5 +1,6 @@
-export default function ({
-  layout
-}) {
+export default function (_ref) {
+  let {
+    layout
+  } = _ref;
   return layout;
 }

package/build/es/visualizations/index.js

@@ -10,7 +10,11 @@ const defaultWarning = warning => {
   console.log(warning);
 };
 
-function createVisualization(data, layout, el, extraOptions, error = defaultError, warning = defaultWarning, outputFormat) {
+function createVisualization(data, layout, el, extraOptions) {
+  let error = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : defaultError;
+  let warning = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : defaultWarning;
+  let outputFormat = arguments.length > 6 ? arguments[6] : undefined;
+
   const _data = isArray(data) ? data : [data];
 
   const store = new Store({

package/build/es/visualizations/store/adapters/dhis_dhis/index.js

@@ -55,12 +55,13 @@ function getValueFunction(type) {
   }
 }
 
-export default function ({
-  type,
-  data,
-  seriesId,
-  categoryId
-}) {
+export default function (_ref) {
+  let {
+    type,
+    data,
+    seriesId,
+    categoryId
+  } = _ref;
   const valueFunction = getValueFunction(type);
   return data.reduce((acc, res) => {
     const headers = res.headers;

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

@@ -83,13 +83,14 @@ function getSeriesFunction(type, categoryIds) {
   }
 }
 
-export default function ({
-  type,
-  data,
-  seriesId,
-  categoryIds,
-  extraOptions
-}) {
+export default function (_ref) {
+  let {
+    type,
+    data,
+    seriesId,
+    categoryIds,
+    extraOptions
+  } = _ref;
   categoryIds = categoryIds || [];
   const seriesFunction = getSeriesFunction(type, categoryIds);
   return data.reduce((acc, res) => {

package/build/es/visualizations/store/index.js

@@ -1,14 +1,16 @@
 import adapters from './adapters/index.js';
 import validators from './validators/index.js';
-export default function ({
-  data,
-  inputFormat = 'dhis',
-  outputFormat = 'highcharts',
-  seriesId: initialSeriesId,
-  categoryId: initialCategoryId,
-  error,
-  warning
-}) {
+export default function (_ref) {
+  let {
+    data,
+    inputFormat = 'dhis',
+    outputFormat = 'highcharts',
+    seriesId: initialSeriesId,
+    categoryId: initialCategoryId,
+    error,
+    warning
+  } = _ref;
+
   const _validator = validators[inputFormat] || validators.noValidation;
 
   const _adapter = adapters[inputFormat + '_' + outputFormat];
@@ -23,12 +25,13 @@ export default function ({
 
   this.data = data;
 
-  this.generateData = ({
-    type,
-    seriesId = initialSeriesId,
-    categoryIds = [initialCategoryId],
-    extraOptions = {}
-  }) => {
+  this.generateData = _ref2 => {
+    let {
+      type,
+      seriesId = initialSeriesId,
+      categoryIds = [initialCategoryId],
+      extraOptions = {}
+    } = _ref2;
     return _adapter({
       type,
       data: data.map(d => _validator({

package/build/es/visualizations/store/validators/dhis/index.js

@@ -37,11 +37,13 @@ function validateRow(row, headersLength, error) {
   row.forEach(rowValue => validateRowValue(rowValue, error));
 }
 
-export default function ({
-  data,
-  error,
-  warning
-}) {
+export default function (_ref) {
+  let {
+    data,
+    error,
+    warning
+  } = _ref;
+
   if (!isObject(data)) {
     error(getMessage('Data is not an object'));
   } // headers

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

@@ -14,9 +14,12 @@ export default function (filters, metaData) {
   filters.forEach(filter => {
     const items = dimensionGetItems(filter);
 
-    if (dimensionIs(filter, DIMENSION_ID_ORGUNIT) && items.some(({
-      id
-    }) => ouIdHelper.hasGroupPrefix(id) || ouIdHelper.hasLevelPrefix(id))) {
+    if (dimensionIs(filter, DIMENSION_ID_ORGUNIT) && items.some(_ref => {
+      let {
+        id
+      } = _ref;
+      return ouIdHelper.hasGroupPrefix(id) || ouIdHelper.hasLevelPrefix(id);
+    })) {
       titleFragments.push(getOuLevelAndGroupText(filter, metaData));
     } else {
       const filterItems = metaData.dimensions[filter.dimension];
@@ -34,9 +37,9 @@ export default function (filters, metaData) {
           } // otherwise use the values directly
           // this is a temporary fix to avoid app crashing when using filters with data items in EV
           else {
-              sectionParts.push(metaData.items[filter.dimension].name + ': ' + filterItems.join(', '));
-              break;
-            }
+            sectionParts.push(metaData.items[filter.dimension].name + ': ' + filterItems.join(', '));
+            break;
+          }
         }
 
         titleFragments.push(sectionParts.join(', '));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "23.8.4",
+    "version": "23.8.7",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -31,37 +31,37 @@
         "validate-push": "yarn test"
     },
     "devDependencies": {
-        "@dhis2/app-runtime": "^2.11.0",
-        "@dhis2/cli-app-scripts": "^6.2.0",
-        "@dhis2/cli-style": "^10.4.0",
+        "@dhis2/app-runtime": "^3.4.3",
+        "@dhis2/cli-app-scripts": "^9.0.0",
+        "@dhis2/cli-style": "^10.4.1",
         "@dhis2/d2-i18n": "^1.1.0",
-        "@dhis2/ui": "^7.16.1",
+        "@dhis2/ui": "^8.2.5",
         "@sambego/storybook-state": "^2.0.1",
         "@storybook/addons": "^6.1.14",
         "@storybook/preset-create-react-app": "^3.1.7",
         "@storybook/react": "^6.1.14",
         "enzyme": "^3.9.0",
         "enzyme-adapter-react-16": "^1.15.6",
-        "fs-extra": "^10.0.0",
+        "fs-extra": "^10.1.0",
         "jest-enzyme": "^7.0.2",
         "prop-types": "^15",
-        "styled-jsx": "3.3.2",
+        "styled-jsx": "^4.0.1",
         "typeface-roboto": "^0.0.75"
     },
     "peerDependencies": {
-        "@dhis2/app-runtime": "^2",
+        "@dhis2/app-runtime": "^3",
         "@dhis2/d2-i18n": "^1.1",
-        "@dhis2/ui": "^7.7.3",
+        "@dhis2/ui": "^8.2.5",
         "prop-types": "^15",
         "react": "^16.3",
         "react-dom": "^16.3",
-        "styled-jsx": "^3.3.2"
+        "styled-jsx": "^4.0.1"
     },
     "dependencies": {
         "classnames": "^2.3.1",
         "d2-utilizr": "^0.2.16",
         "d3-color": "^1.2.3",
-        "highcharts": "^9.1.2",
+        "highcharts": "^10.1.0",
         "lodash": "^4.17.21",
         "mathjs": "^9.4.2",
         "react-beautiful-dnd": "^10.1.1",