@dhis2/analytics 28.0.3 → 28.0.5

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

@@ -65,16 +65,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 = getFullIdAxisMap(layout.series, series);
   const idColorMap = getIdColorMap(series, layout, extraOptions);
   const indexColorPatternMap = getIndexColorPatternMap(series, layout, extraOptions);
@@ -152,17 +151,16 @@ function getDefault(_ref) {
   }
   return series;
 }
-export default function (_ref2) {
+export default function ({
+  series,
+  metaData,
+  layout,
+  isStacked,
+  extraOptions,
+  legendSets,
+  displayStrategy
+}) {
   var _series;
-  let {
-    series,
-    metaData,
-    layout,
-    isStacked,
-    extraOptions,
-    legendSets,
-    displayStrategy
-  } = _ref2;
   switch (layout.type) {
     case VIS_TYPE_SINGLE_VALUE:
       series = [];

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

@@ -1,8 +1,5 @@
 import { separateDigitGroups } from '../../../../../modules/renderValue.js';
-export 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;
+export const formatDataLabel = (name = '', y, percentage) => {
   const value = 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/es/visualizations/config/adapters/dhis_highcharts/yAxis/gauge.js

@@ -23,10 +23,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 (!isNumber(value)) {
     return null;

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

@@ -3,18 +3,17 @@ 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 (_ref) {
-  let {
-    store,
-    layout,
-    el,
-    inputFormat = 'dhis',
-    outputFormat = 'highcharts',
-    extraLayout,
-    extraOptions,
-    onError,
-    onWarning
-  } = _ref;
+export default function ({
+  store,
+  layout,
+  el,
+  inputFormat = 'dhis',
+  outputFormat = 'highcharts',
+  extraLayout,
+  extraOptions,
+  onError,
+  onWarning
+}) {
   const _validator = validators[inputFormat] || validators.noValidation;
   const _adapter = adapters[inputFormat + '_' + outputFormat];
   const _generator = generators[outputFormat];

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

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

package/build/es/visualizations/index.js

@@ -7,10 +7,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 = isArray(data) ? data : [data];
   const store = new Store({
     data: _data,

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

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

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

@@ -1,15 +1,14 @@
 import adapters from './adapters/index.js';
 import validators from './validators/index.js';
-export default function (_ref) {
-  let {
-    data,
-    inputFormat = 'dhis',
-    outputFormat = 'highcharts',
-    seriesId: initialSeriesId,
-    categoryId: initialCategoryId,
-    error,
-    warning
-  } = _ref;
+export default function ({
+  data,
+  inputFormat = 'dhis',
+  outputFormat = 'highcharts',
+  seriesId: initialSeriesId,
+  categoryId: initialCategoryId,
+  error,
+  warning
+}) {
   const _validator = validators[inputFormat] || validators.noValidation;
   const _adapter = adapters[inputFormat + '_' + outputFormat];
   if (_validator === validators.noValidation) {
@@ -19,13 +18,12 @@ export default function (_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/es/visualizations/store/validators/dhis/index.js

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

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

@@ -14,12 +14,9 @@ export default function (filters, metaData) {
   let l;
   filters.forEach(filter => {
     const items = dimensionGetItems(filter);
-    if (dimensionIs(filter, DIMENSION_ID_ORGUNIT) && items.some(_ref => {
-      let {
-        id
-      } = _ref;
-      return ouIdHelper.hasGroupPrefix(id) || ouIdHelper.hasLevelPrefix(id);
-    })) {
+    if (dimensionIs(filter, DIMENSION_ID_ORGUNIT) && items.some(({
+      id
+    }) => ouIdHelper.hasGroupPrefix(id) || ouIdHelper.hasLevelPrefix(id))) {
       titleFragments.push(getOuLevelAndGroupText(filter, metaData));
     } else if (dimensionIs(filter, DIMENSION_ID_PERIOD)) {
       const relativePeriodNames = getRelativePeriodsName();

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

@@ -1,5 +1,4 @@
-export const shouldUseContrastColor = function () {
-  let inputColor = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+export 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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "28.0.3",
+    "version": "28.0.5",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -31,21 +31,23 @@
     },
     "devDependencies": {
         "@dhis2/app-runtime": "^3.14.1",
-        "@dhis2/cli-app-scripts": "^11.8.0",
-        "@dhis2/cli-style": "^10.7.4",
+        "@dhis2/cli-app-scripts": "^12.6.4",
+        "@dhis2/cli-style": "^10.7.9",
         "@dhis2/d2-i18n": "^1.1.0",
-        "@dhis2/ui": "^10.1.9",
+        "@dhis2/ui": "^10.7.7",
         "@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": "6.6.3",
-        "@testing-library/react": "^12",
-        "enzyme": "^3.9.0",
-        "enzyme-adapter-react-16": "^1.15.6",
+        "@testing-library/dom": "^10.4.0",
+        "@testing-library/jest-dom": "^6.6.3",
+        "@testing-library/react": "^16.3.0",
+        "@testing-library/user-event": "^14.6.1",
         "fs-extra": "^10.1.0",
-        "jest-enzyme": "^7.0.2",
         "prop-types": "^15",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "react-scripts": "^5.0.1",
         "storybook": "^8.3.6",
         "styled-jsx": "^4.0.1"
     },
@@ -54,8 +56,8 @@
         "@dhis2/d2-i18n": "^1.1",
         "@dhis2/ui": "^10",
         "prop-types": "^15",
-        "react": "^16.3",
-        "react-dom": "^16.3",
+        "react": "^16.3 || ^18",
+        "react-dom": "^16.3 || ^ 18",
         "styled-jsx": "^4.0.1"
     },
     "dependencies": {
@@ -75,10 +77,6 @@
         "react-beautiful-dnd": "^10.1.1",
         "resize-observer-polyfill": "^1.5.1"
     },
-    "resolutions": {
-        "@dhis2/ui": "^10.1.9",
-        "eslint": "^7.32.0"
-    },
     "files": [
         "build"
     ],

package/build/cjs/components/OrgUnitDimension/__tests__/__snapshots__/OrgUnitDimension.spec.js.snap

@@ -1,89 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`The OrgUnitDimension component matches the snapshot 1`] = `
-<div
-  className="container"
->
-  <div
-    className="userOrgUnitsWrapper"
-  >
-    <Checkbox
-      checked={false}
-      dataTest="dhis2-uicore-checkbox"
-      dense={true}
-      indeterminate={false}
-      label="User organisation unit"
-      onChange={[Function]}
-    />
-    <Checkbox
-      checked={false}
-      dataTest="dhis2-uicore-checkbox"
-      dense={true}
-      indeterminate={false}
-      label="User sub-units"
-      onChange={[Function]}
-    />
-    <Checkbox
-      checked={false}
-      dataTest="dhis2-uicore-checkbox"
-      dense={true}
-      indeterminate={false}
-      label="User sub-x2-units"
-      onChange={[Function]}
-    />
-  </div>
-  <div
-    className="orgUnitTreeWrapper"
-  >
-    <OrganisationUnitTree
-      dataTest="org-unit-tree"
-      initiallyExpanded={Array []}
-      onChange={[Function]}
-      roots={Array []}
-      selected={Array []}
-    />
-  </div>
-  <div
-    className="selectsWrapper"
-  >
-    <MultiSelect
-      dataTest="org-unit-level-select"
-      dense={true}
-      loading={true}
-      onChange={[Function]}
-      placeholder="Select a level"
-      selected={Array []}
-    />
-    <MultiSelect
-      dataTest="org-unit-group-select"
-      dense={true}
-      loading={true}
-      onChange={[Function]}
-      placeholder="Select a group"
-      selected={Array []}
-    />
-  </div>
-  <div
-    className="summaryWrapper"
-  >
-    <span
-      className="summaryText"
-    >
-      Nothing selected
-    </span>
-    <div
-      className="deselectButton"
-    >
-      <Button
-        disabled={true}
-        onClick={[Function]}
-        secondary={true}
-        small={true}
-      >
-        Deselect all
-      </Button>
-    </div>
-  </div>
-  <style />
-</div>
-`;

package/build/cjs/components/PeriodDimension/__tests__/PeriodSelector.spec.js

@@ -1,29 +0,0 @@
-"use strict";
-
-var _enzyme = require("enzyme");
-var _react = _interopRequireDefault(require("react"));
-var _PeriodTransfer = _interopRequireDefault(require("../PeriodTransfer.js"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-describe('The Period Selector component', () => {
-  let props;
-  let shallowPeriodTransfer;
-  const getWrapper = () => {
-    if (!shallowPeriodTransfer) {
-      shallowPeriodTransfer = (0, _enzyme.shallow)(/*#__PURE__*/_react.default.createElement(_PeriodTransfer.default, props));
-    }
-    return shallowPeriodTransfer;
-  };
-  beforeEach(() => {
-    props = {
-      initialSelectedPeriods: [],
-      onSelect: jest.fn(),
-      rightFooter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null),
-      dataTest: 'period-dimension'
-    };
-    shallowPeriodTransfer = undefined;
-  });
-  it('matches the snapshot', () => {
-    const wrapper = getWrapper();
-    expect(wrapper).toMatchSnapshot();
-  });
-});

package/build/cjs/components/PeriodDimension/__tests__/__snapshots__/FixedPeriodSingleSelect.spec.js.snap

@@ -1,93 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`The Fixed Period Single Select component matches the snapshot 1`] = `
-<div
-  data-test="dhis2-analytics-fixedperiodselect"
->
-  <div
-    className="row"
-  >
-    <FixedPeriodFilter
-      currentPeriodType="MONTHLY"
-      currentYear="2014"
-      excludedPeriodTypes={Array []}
-      onSelectPeriodType={[Function]}
-      onSelectYear={[Function]}
-    />
-  </div>
-  <SingleSelectField
-    clearText={[Function]}
-    dataTest="dhis2-uiwidgets-singleselectfield"
-    dense={true}
-    empty={[Function]}
-    filterPlaceholder={[Function]}
-    label="Period"
-    loadingText={[Function]}
-    noMatchText={[Function]}
-    onChange={[Function]}
-    selected="201405"
-  >
-    <SingleSelectOption
-      key="201401"
-      label="January 2014"
-      value="201401"
-    />
-    <SingleSelectOption
-      key="201402"
-      label="February 2014"
-      value="201402"
-    />
-    <SingleSelectOption
-      key="201403"
-      label="March 2014"
-      value="201403"
-    />
-    <SingleSelectOption
-      key="201404"
-      label="April 2014"
-      value="201404"
-    />
-    <SingleSelectOption
-      key="201405"
-      label="May 2014"
-      value="201405"
-    />
-    <SingleSelectOption
-      key="201406"
-      label="June 2014"
-      value="201406"
-    />
-    <SingleSelectOption
-      key="201407"
-      label="July 2014"
-      value="201407"
-    />
-    <SingleSelectOption
-      key="201408"
-      label="August 2014"
-      value="201408"
-    />
-    <SingleSelectOption
-      key="201409"
-      label="September 2014"
-      value="201409"
-    />
-    <SingleSelectOption
-      key="201410"
-      label="October 2014"
-      value="201410"
-    />
-    <SingleSelectOption
-      key="201411"
-      label="November 2014"
-      value="201411"
-    />
-    <SingleSelectOption
-      key="201412"
-      label="December 2014"
-      value="201412"
-    />
-  </SingleSelectField>
-  <style />
-</div>
-`;

package/build/cjs/components/PeriodDimension/__tests__/__snapshots__/PeriodDimension.spec.js.snap

@@ -1,17 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`The Period Dimension component matches the snapshot 1`] = `
-<PeriodTransfer
-  dataTest="period-dimension"
-  excludedPeriodTypes={Array []}
-  onSelect={[Function]}
-  periodsSettings={
-    Object {
-      "calendar": "gregory",
-      "locale": "en",
-    }
-  }
-  rightFooter={<React.Fragment />}
-  selectedItems={Array []}
-/>
-`;

package/build/cjs/components/PeriodDimension/__tests__/__snapshots__/PeriodSelector.spec.js.snap

@@ -1,89 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`The Period Selector component matches the snapshot 1`] = `
-<Transfer
-  dataTest="period-dimension-transfer"
-  enableOrderChange={true}
-  height="512px"
-  leftHeader={
-    <React.Fragment>
-      <TabBar>
-        <Tab
-          dataTest="period-dimension-relative-periods-button"
-          onClick={[Function]}
-          selected={true}
-        >
-          Relative periods
-        </Tab>
-        <Tab
-          dataTest="period-dimension-fixed-periods-button"
-          onClick={[Function]}
-          selected={false}
-        >
-          Fixed periods
-        </Tab>
-      </TabBar>
-      <div
-        className="filterContainer"
-      >
-        <RelativePeriodFilter
-          currentFilter="MONTHLY"
-          dataTest="period-dimension-relative-period-filter"
-          excludedPeriodTypes={Array []}
-          onSelectFilter={[Function]}
-        />
-      </div>
-      <style>
-        
-      </style>
-    </React.Fragment>
-  }
-  onChange={[Function]}
-  options={
-    Array [
-      Object {
-        "label": "This month",
-        "value": "THIS_MONTH",
-      },
-      Object {
-        "label": "Last month",
-        "value": "LAST_MONTH",
-      },
-      Object {
-        "label": "Last 3 months",
-        "value": "LAST_3_MONTHS",
-      },
-      Object {
-        "label": "Last 6 months",
-        "value": "LAST_6_MONTHS",
-      },
-      Object {
-        "label": "Last 12 months",
-        "value": "LAST_12_MONTHS",
-      },
-      Object {
-        "label": "Months this year",
-        "value": "MONTHS_THIS_YEAR",
-      },
-    ]
-  }
-  optionsWidth="520px"
-  renderOption={[Function]}
-  rightFooter={<React.Fragment />}
-  rightHeader={<RightHeader />}
-  selected={Array []}
-  selectedEmptyComponent={
-    <React.Fragment>
-      <p
-        className="emptyList"
-      >
-        No periods selected
-      </p>
-      <style>
-        
-      </style>
-    </React.Fragment>
-  }
-  selectedWidth="520px"
-/>
-`;