@dhis2/analytics 28.0.3 → 28.0.5

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

@@ -4,37 +4,33 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getLegendSetTooltip = exports.applyLegendSet = void 0;
-var _isNumeric = _interopRequireDefault(require("d2-utilizr/lib/isNumeric"));
 var _index = _interopRequireDefault(require("../../../../locales/index.js"));
 var _legends = require("../../../../modules/legends.js");
+var _utils = require("../../../../modules/utils.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const OUT_OF_BOUNDS_COLOR = '#CCCCCC';
 const getLegend = (value, legendSet) => value && legendSet ? (0, _legends.getLegendByValueFromLegendSet)(legendSet, value) : {};
-const applyLegendSet = function () {
-  let seriesObj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  let legendSet = arguments.length > 1 ? arguments[1] : undefined;
-  return !seriesObj.type ? {
-    ...seriesObj,
-    data: seriesObj.data.map(value => {
-      var _getLegend, _getLegend2, _getLegend3, _getLegend4;
-      return (0, _isNumeric.default)(value) // Single category pass data as [value1, value2]
-      ? {
-        y: value,
-        color: ((_getLegend = getLegend(value, legendSet)) === null || _getLegend === void 0 ? void 0 : _getLegend.color) || OUT_OF_BOUNDS_COLOR,
-        legend: ((_getLegend2 = getLegend(value, legendSet)) === null || _getLegend2 === void 0 ? void 0 : _getLegend2.name) || '-',
-        legendSet: legendSet.name
-      } : Array.isArray(value) // Dual category pass data as [[position1, value1], [position2, value2]]
-      ? {
-        x: value[0],
-        y: value[1],
-        color: ((_getLegend3 = getLegend(value[1], legendSet)) === null || _getLegend3 === void 0 ? void 0 : _getLegend3.color) || OUT_OF_BOUNDS_COLOR,
-        legend: ((_getLegend4 = getLegend(value[1], legendSet)) === null || _getLegend4 === void 0 ? void 0 : _getLegend4.name) || '-',
-        legendSet: legendSet.name
-      } : value;
-    })
-  } : {
-    ...seriesObj
-  };
+const applyLegendSet = (seriesObj = {}, legendSet) => !seriesObj.type ? {
+  ...seriesObj,
+  data: seriesObj.data.map(value => {
+    var _getLegend, _getLegend2, _getLegend3, _getLegend4;
+    return (0, _utils.isNumeric)(value) // Single category pass data as [value1, value2]
+    ? {
+      y: value,
+      color: ((_getLegend = getLegend(value, legendSet)) === null || _getLegend === void 0 ? void 0 : _getLegend.color) || OUT_OF_BOUNDS_COLOR,
+      legend: ((_getLegend2 = getLegend(value, legendSet)) === null || _getLegend2 === void 0 ? void 0 : _getLegend2.name) || '-',
+      legendSet: legendSet.name
+    } : Array.isArray(value) // Dual category pass data as [[position1, value1], [position2, value2]]
+    ? {
+      x: value[0],
+      y: value[1],
+      color: ((_getLegend3 = getLegend(value[1], legendSet)) === null || _getLegend3 === void 0 ? void 0 : _getLegend3.color) || OUT_OF_BOUNDS_COLOR,
+      legend: ((_getLegend4 = getLegend(value[1], legendSet)) === null || _getLegend4 === void 0 ? void 0 : _getLegend4.name) || '-',
+      legendSet: legendSet.name
+    } : value;
+  })
+} : {
+  ...seriesObj
 };
 exports.applyLegendSet = applyLegendSet;
 const getLegendSetTooltip = () => ({

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

@@ -8,15 +8,14 @@ var _index = _interopRequireDefault(require("../../../../locales/index.js"));
 var _visTypes = require("../../../../modules/visTypes.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const MAX_LABELS = 10;
-var _default = _ref => {
-  let {
-    visType,
-    xAxisName,
-    yAxisName,
-    showLabels,
-    tooltipData,
-    onClick
-  } = _ref;
+var _default = ({
+  visType,
+  xAxisName,
+  yAxisName,
+  showLabels,
+  tooltipData,
+  onClick
+}) => {
   const series = {
     dataLabels: {
       enabled: showLabels,

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

@@ -72,16 +72,15 @@ function getIdColorMap(series, layout, extraOptions) {
     }, {});
   }
 }
-function getDefault(_ref) {
-  let {
-    series,
-    metaData,
-    layout,
-    isStacked,
-    extraOptions,
-    legendSets,
-    displayStrategy
-  } = _ref;
+function getDefault({
+  series,
+  metaData,
+  layout,
+  isStacked,
+  extraOptions,
+  legendSets,
+  displayStrategy
+}) {
   const fullIdAxisMap = (0, _customAxes.getFullIdAxisMap)(layout.series, series);
   const idColorMap = getIdColorMap(series, layout, extraOptions);
   const indexColorPatternMap = getIndexColorPatternMap(series, layout, extraOptions);
@@ -159,17 +158,16 @@ function getDefault(_ref) {
   }
   return series;
 }
-function _default(_ref2) {
+function _default({
+  series,
+  metaData,
+  layout,
+  isStacked,
+  extraOptions,
+  legendSets,
+  displayStrategy
+}) {
   var _series;
-  let {
-    series,
-    metaData,
-    layout,
-    isStacked,
-    extraOptions,
-    legendSets,
-    displayStrategy
-  } = _ref2;
   switch (layout.type) {
     case _visTypes.VIS_TYPE_SINGLE_VALUE:
       series = [];

package/build/cjs/visualizations/config/adapters/dhis_highcharts/series/pie.js

@@ -6,10 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = _default;
 exports.formatDataLabel = void 0;
 var _renderValue = require("../../../../../modules/renderValue.js");
-const formatDataLabel = function () {
-  let name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  let y = arguments.length > 1 ? arguments[1] : undefined;
-  let percentage = arguments.length > 2 ? arguments[2] : undefined;
+const formatDataLabel = (name = '', y, percentage) => {
   const value = (0, _renderValue.separateDigitGroups)(y.toString()).join(' ');
   return '<span style="font-weight:normal">' + name + '</span><br/>' + value + '<span style="font-weight:normal"> (' + parseFloat(percentage.toFixed(1)) + '%)</span>';
 };

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

@@ -11,8 +11,7 @@ var _getFilterText = _interopRequireDefault(require("../../../../util/getFilterT
 var _getTextAlignOption = require("../getTextAlignOption.js");
 var _yearOverYear = _interopRequireDefault(require("../title/yearOverYear.js"));
 var _singleValue = _interopRequireWildcard(require("./singleValue.js"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const DASHBOARD_SUBTITLE = {
   style: {

package/build/cjs/visualizations/config/adapters/dhis_highcharts/yAxis/gauge.js

@@ -30,10 +30,8 @@ const getLabelOffsetFromTextAlign = textAlign => {
       return 0;
   }
 };
-function getPlotLine() {
+function getPlotLine(regressionLine = {}, defaultLabel) {
   var _regressionLine$title, _regressionLine$title2;
-  let regressionLine = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  let defaultLabel = arguments.length > 1 ? arguments[1] : undefined;
   const value = regressionLine.value;
   if (!(0, _isNumber.default)(value)) {
     return null;

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

@@ -10,18 +10,17 @@ var _index3 = _interopRequireDefault(require("./adapters/index.js"));
 var _index4 = _interopRequireDefault(require("./generators/index.js"));
 var _index5 = _interopRequireDefault(require("./validators/index.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _default(_ref) {
-  let {
-    store,
-    layout,
-    el,
-    inputFormat = 'dhis',
-    outputFormat = 'highcharts',
-    extraLayout,
-    extraOptions,
-    onError,
-    onWarning
-  } = _ref;
+function _default({
+  store,
+  layout,
+  el,
+  inputFormat = 'dhis',
+  outputFormat = 'highcharts',
+  extraLayout,
+  extraOptions,
+  onError,
+  onWarning
+}) {
   const _validator = _index5.default[inputFormat] || _index5.default.noValidation;
   const _adapter = _index3.default[inputFormat + '_' + outputFormat];
   const _generator = _index4.default[outputFormat];

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

@@ -4,9 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-function _default(_ref) {
-  let {
-    layout
-  } = _ref;
+function _default({
+  layout
+}) {
   return layout;
 }

package/build/cjs/visualizations/index.js

@@ -27,10 +27,7 @@ const defaultError = error => {
 const defaultWarning = warning => {
   console.log(warning);
 };
-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;
+function createVisualization(data, layout, el, extraOptions, error = defaultError, warning = defaultWarning, outputFormat) {
   const _data = (0, _isArray.default)(data) ? data : [data];
   const store = new _index2.default({
     data: _data,

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

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

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

@@ -7,16 +7,15 @@ exports.default = _default;
 var _index = _interopRequireDefault(require("./adapters/index.js"));
 var _index2 = _interopRequireDefault(require("./validators/index.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _default(_ref) {
-  let {
-    data,
-    inputFormat = 'dhis',
-    outputFormat = 'highcharts',
-    seriesId: initialSeriesId,
-    categoryId: initialCategoryId,
-    error,
-    warning
-  } = _ref;
+function _default({
+  data,
+  inputFormat = 'dhis',
+  outputFormat = 'highcharts',
+  seriesId: initialSeriesId,
+  categoryId: initialCategoryId,
+  error,
+  warning
+}) {
   const _validator = _index2.default[inputFormat] || _index2.default.noValidation;
   const _adapter = _index.default[inputFormat + '_' + outputFormat];
   if (_validator === _index2.default.noValidation) {
@@ -26,13 +25,12 @@ function _default(_ref) {
     error(`Data tranformation from "${inputFormat}" to "${outputFormat}" is not supported`);
   }
   this.data = data;
-  this.generateData = _ref2 => {
-    let {
-      type,
-      seriesId = initialSeriesId,
-      categoryIds = [initialCategoryId],
-      extraOptions = {}
-    } = _ref2;
+  this.generateData = ({
+    type,
+    seriesId = initialSeriesId,
+    categoryIds = [initialCategoryId],
+    extraOptions = {}
+  }) => {
     return _adapter({
       type,
       data: data.map(d => _validator({

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

@@ -36,12 +36,11 @@ function validateRow(row, headersLength, error) {
   }
   row.forEach(rowValue => validateRowValue(rowValue, error));
 }
-function _default(_ref) {
-  let {
-    data,
-    error,
-    warning
-  } = _ref;
+function _default({
+  data,
+  error,
+  warning
+}) {
   if (!(0, _isObject.default)(data)) {
     error(getMessage('Data is not an object'));
   }

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

@@ -20,12 +20,9 @@ function _default(filters, metaData) {
   let l;
   filters.forEach(filter => {
     const items = (0, _dimensionGetItems.dimensionGetItems)(filter);
-    if ((0, _dimensionIs.dimensionIs)(filter, _predefinedDimensions.DIMENSION_ID_ORGUNIT) && items.some(_ref => {
-      let {
-        id
-      } = _ref;
-      return _index.ouIdHelper.hasGroupPrefix(id) || _index.ouIdHelper.hasLevelPrefix(id);
-    })) {
+    if ((0, _dimensionIs.dimensionIs)(filter, _predefinedDimensions.DIMENSION_ID_ORGUNIT) && items.some(({
+      id
+    }) => _index.ouIdHelper.hasGroupPrefix(id) || _index.ouIdHelper.hasLevelPrefix(id))) {
       titleFragments.push((0, _getOuLevelAndGroupText.getOuLevelAndGroupText)(filter, metaData));
     } else if ((0, _dimensionIs.dimensionIs)(filter, _predefinedDimensions.DIMENSION_ID_PERIOD)) {
       const relativePeriodNames = (0, _relativePeriods.getRelativePeriodsName)();

package/build/cjs/visualizations/util/shouldUseContrastColor.js

@@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.shouldUseContrastColor = void 0;
-const shouldUseContrastColor = function () {
-  let inputColor = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+const shouldUseContrastColor = (inputColor = '') => {
   // based on https://stackoverflow.com/questions/3942878/how-to-decide-font-color-in-white-or-black-depending-on-background-color
   var color = inputColor.charAt(0) === '#' ? inputColor.substring(1, 7) : inputColor;
   var r = parseInt(color.substring(0, 2), 16); // hexToR

package/build/es/__demo__/OpenFileDialog.stories.js

@@ -40,6 +40,23 @@ export const ListOfVisualizationsWithVisTypeFilterAndDividerNoDefaultVisType = (
 ListOfVisualizationsWithVisTypeFilterAndDividerNoDefaultVisType.story = {
   name: 'List of visualizations with vis type filter and divider (no default vis type)'
 };
+const filterVisTypesWithGroups = [{
+  type: VIS_TYPE_GROUP_ALL
+}, {
+  type: VIS_TYPE_GROUP_CHARTS
+}];
+export const ListOfVisualizationsWithVisTypeGroupFilterNoDefaultVisType = () => /*#__PURE__*/React.createElement(OpenFileDialog, {
+  type: "visualization",
+  filterVisTypes: filterVisTypesWithGroups,
+  onClose: Function.prototype,
+  onFileSelect: onFileSelect,
+  onNew: Function.prototype,
+  open: true,
+  currentUser: user
+});
+ListOfVisualizationsWithVisTypeGroupFilterNoDefaultVisType.story = {
+  name: 'List of visualizations with only vis type group filter (no default vis type)'
+};
 export const ListOfMapsNoVisTypeFilter = () => /*#__PURE__*/React.createElement(OpenFileDialog, {
   type: "map",
   onClose: Function.prototype,