@dhis2/analytics 26.8.7 → 26.9.3

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

@@ -1,8 +1,9 @@
 import arrayContains from 'd2-utilizr/lib/arrayContains';
 import arrayUnique from 'd2-utilizr/lib/arrayUnique';
-import { VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_PIE, VIS_TYPE_GAUGE, isTwoCategoryChartType } from '../../../../modules/visTypes.js';
+import { VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_PIE, VIS_TYPE_GAUGE, isTwoCategoryChartType, VIS_TYPE_SINGLE_VALUE } from '../../../../modules/visTypes.js';
 import getGauge from './gauge.js';
 import getPie from './pie.js';
+import getSingleValue from './singleValue.js';
 import getTwoCategory from './twoCategory.js';
 import getYearOnYear from './yearOnYear.js';
 const VALUE_ID = 'value';
@@ -63,6 +64,8 @@ function getSeriesFunction(type, categoryIds) {
     return getTwoCategory;
   }
   switch (type) {
+    case VIS_TYPE_SINGLE_VALUE:
+      return getSingleValue;
     case VIS_TYPE_PIE:
       return getPie;
     case VIS_TYPE_GAUGE:

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

@@ -0,0 +1,4 @@
+export default function getSingleValue(acc, seriesIds, categoryIds, idValueMap) {
+  const seriesId = seriesIds[0][0];
+  acc.push(idValueMap.get(seriesId));
+}

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

@@ -1,6 +1,4 @@
-import dhis_dhis from './dhis_dhis/index.js';
 import dhis_highcharts from './dhis_highcharts/index.js';
 export default {
-  dhis_highcharts,
-  dhis_dhis
+  dhis_highcharts
 };

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

@@ -0,0 +1,17 @@
+export const shouldUseContrastColor = function () {
+  let inputColor = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  // 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
+  var g = parseInt(color.substring(2, 4), 16); // hexToG
+  var b = parseInt(color.substring(4, 6), 16); // hexToB
+  var uicolors = [r / 255, g / 255, b / 255];
+  var c = uicolors.map(col => {
+    if (col <= 0.03928) {
+      return col / 12.92;
+    }
+    return Math.pow((col + 0.055) / 1.055, 2.4);
+  });
+  var L = 0.2126 * c[0] + 0.7152 * c[1] + 0.0722 * c[2];
+  return L <= 0.179;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.8.7",
+    "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/adapters/dhis_dhis/index.js

@@ -1,39 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.INDICATOR_FACTOR_100 = void 0;
-exports.default = _default;
-var _index = _interopRequireDefault(require("./subtitle/index.js"));
-var _index2 = _interopRequireDefault(require("./title/index.js"));
-var _index3 = _interopRequireDefault(require("./value/index.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const INDICATOR_FACTOR_100 = 100;
-exports.INDICATOR_FACTOR_100 = INDICATOR_FACTOR_100;
-function _default(_ref) {
-  let {
-    store,
-    layout,
-    extraOptions
-  } = _ref;
-  const data = store.generateData({
-    type: layout.type,
-    seriesId: layout.columns && layout.columns.length ? layout.columns[0].dimension : null,
-    categoryId: layout.rows && layout.rows.length ? layout.rows[0].dimension : null
-  });
-  const metaData = store.data[0].metaData;
-  const config = {
-    value: data[0],
-    formattedValue: data[0] === undefined ? extraOptions.noData.text : (0, _index3.default)(data[0], layout, metaData),
-    title: (0, _index2.default)(layout, metaData, extraOptions.dashboard),
-    subtitle: (0, _index.default)(layout, metaData, extraOptions.dashboard)
-  };
-  const indicatorType = metaData.items[metaData.dimensions.dx[0]].indicatorType;
-
-  // Use % symbol for factor 100 and the full string for others
-  if ((indicatorType === null || indicatorType === void 0 ? void 0 : indicatorType.factor) !== INDICATOR_FACTOR_100) {
-    config.subText = indicatorType === null || indicatorType === void 0 ? void 0 : indicatorType.displayName;
-  }
-  return config;
-}

package/build/cjs/visualizations/config/adapters/dhis_dhis/subtitle/__tests__/index.spec.js

@@ -1,49 +0,0 @@
-"use strict";
-
-var _visTypes = require("../../../../../../modules/visTypes.js");
-var _index = _interopRequireDefault(require("../index.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-jest.mock('../singleValue', () => () => 'The sv filter title');
-jest.mock('../../../../../util/getFilterText', () => () => 'The default filter text');
-describe('getSubtitle', () => {
-  it('returns empty subtitle when flag hideSubtitle exists', () => {
-    expect((0, _index.default)({
-      hideSubtitle: true
-    })).toEqual('');
-  });
-  it('returns the subtitle provided in the layout', () => {
-    const subtitle = 'The subtitle was already set';
-    expect((0, _index.default)({
-      subtitle
-    })).toEqual(subtitle);
-  });
-  it('returns subtitle for single value vis', () => {
-    expect((0, _index.default)({
-      type: _visTypes.VIS_TYPE_SINGLE_VALUE
-    })).toEqual('The sv filter title');
-  });
-  describe('not dashboard', () => {
-    describe('layout does not include title', () => {
-      it('returns empty subtitle', () => {
-        expect((0, _index.default)({
-          filters: {}
-        }, {}, false)).toEqual('');
-      });
-    });
-    describe('layout includes title', () => {
-      it('returns filter title as subtitle', () => {
-        expect((0, _index.default)({
-          filters: {},
-          title: 'Chart title'
-        }, {}, false)).toEqual('The default filter text');
-      });
-    });
-  });
-  describe('dashboard', () => {
-    it('returns filter title as subtitle', () => {
-      expect((0, _index.default)({
-        filters: {}
-      }, {}, true)).toEqual('The default filter text');
-    });
-  });
-});

package/build/cjs/visualizations/config/adapters/dhis_dhis/subtitle/__tests__/singleValue.spec.js

@@ -1,15 +0,0 @@
-"use strict";
-
-var _singleValue = _interopRequireDefault(require("../singleValue.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-jest.mock('../../../../../util/getFilterText', () => () => 'The filter text');
-describe('getSingleValueSubtitle', () => {
-  it('returns null when layout does not have filters', () => {
-    expect((0, _singleValue.default)({})).toEqual('');
-  });
-  it('returns the filter text', () => {
-    expect((0, _singleValue.default)({
-      filters: []
-    })).toEqual('The filter text');
-  });
-});

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

@@ -1,34 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var _visTypes = require("../../../../../modules/visTypes.js");
-var _getFilterText = _interopRequireDefault(require("../../../../util/getFilterText.js"));
-var _singleValue = _interopRequireDefault(require("./singleValue.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function getDefault(layout, dashboard, metaData) {
-  if (dashboard || typeof layout.title === 'string') {
-    return (0, _getFilterText.default)(layout.filters, metaData);
-  }
-  return '';
-}
-function _default(layout, metaData, dashboard) {
-  if (layout.hideSubtitle) {
-    return '';
-  }
-  if (typeof layout.subtitle === 'string' && layout.subtitle.length) {
-    return layout.subtitle;
-  } else {
-    let subtitle;
-    switch (layout.type) {
-      case _visTypes.VIS_TYPE_SINGLE_VALUE:
-        subtitle = (0, _singleValue.default)(layout, metaData);
-        break;
-      default:
-        subtitle = getDefault(layout, dashboard, metaData);
-    }
-    return subtitle;
-  }
-}

package/build/cjs/visualizations/config/adapters/dhis_dhis/subtitle/singleValue.js

@@ -1,11 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var _getFilterText = _interopRequireDefault(require("../../../../util/getFilterText.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _default(layout, metaData) {
-  return layout.filters ? (0, _getFilterText.default)(layout.filters, metaData) : '';
-}

package/build/cjs/visualizations/config/adapters/dhis_dhis/title/__tests__/index.spec.js

@@ -1,39 +0,0 @@
-"use strict";
-
-var _visTypes = require("../../../../../../modules/visTypes.js");
-var _index = _interopRequireDefault(require("../index.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-jest.mock('../singleValue', () => () => 'The sv filter title');
-jest.mock('../../../../../util/getFilterText', () => () => 'The filter text');
-describe('getTitle', () => {
-  it('returns empty title when flag hideTitle exists', () => {
-    expect((0, _index.default)({
-      hideTitle: true
-    })).toEqual('');
-  });
-  it('returns the title provided in the layout', () => {
-    const title = 'The title was already set';
-    expect((0, _index.default)({
-      title
-    })).toEqual(title);
-  });
-  it('returns title for single value vis', () => {
-    expect((0, _index.default)({
-      type: _visTypes.VIS_TYPE_SINGLE_VALUE
-    })).toEqual('The sv filter title');
-  });
-  describe('not dashboard', () => {
-    it('returns filter text as title', () => {
-      expect((0, _index.default)({
-        filters: {}
-      }, {}, false)).toEqual('The filter text');
-    });
-  });
-  describe('dashboard', () => {
-    it('returns empty string', () => {
-      expect((0, _index.default)({
-        filters: {}
-      }, {}, true)).toEqual('');
-    });
-  });
-});

package/build/cjs/visualizations/config/adapters/dhis_dhis/title/__tests__/singleValue.spec.js

@@ -1,17 +0,0 @@
-"use strict";
-
-var _singleValue = _interopRequireDefault(require("../singleValue.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-jest.mock('../../../../../util/getFilterText', () => () => 'The filter text');
-describe('getSingleValueTitle', () => {
-  it('returns null when layout does not have columns', () => {
-    expect((0, _singleValue.default)({})).toEqual('');
-  });
-  it('returns the filter text based on column items', () => {
-    expect((0, _singleValue.default)({
-      columns: [{
-        items: [{}]
-      }]
-    })).toEqual('The filter text');
-  });
-});

package/build/cjs/visualizations/config/adapters/dhis_dhis/title/index.js

@@ -1,31 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var _visTypes = require("../../../../../modules/visTypes.js");
-var _getFilterText = _interopRequireDefault(require("../../../../util/getFilterText.js"));
-var _singleValue = _interopRequireDefault(require("./singleValue.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function getDefault(layout, metaData, dashboard) {
-  return layout.filters && !dashboard ? (0, _getFilterText.default)(layout.filters, metaData) : '';
-}
-function _default(layout, metaData, dashboard) {
-  if (layout.hideTitle) {
-    return '';
-  }
-  if (typeof layout.title === 'string' && layout.title.length) {
-    return layout.title;
-  } else {
-    let title;
-    switch (layout.type) {
-      case _visTypes.VIS_TYPE_SINGLE_VALUE:
-        title = (0, _singleValue.default)(layout, metaData);
-        break;
-      default:
-        title = getDefault(layout, metaData, dashboard);
-    }
-    return title;
-  }
-}

package/build/cjs/visualizations/config/adapters/dhis_dhis/title/singleValue.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var _getFilterText = _interopRequireDefault(require("../../../../util/getFilterText.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _default(layout, metaData) {
-  if (layout.columns) {
-    const firstItem = layout.columns[0].items[0];
-    const column = Object.assign({}, layout.columns[0], {
-      items: [firstItem]
-    });
-    return (0, _getFilterText.default)([column], metaData);
-  }
-  return '';
-}

package/build/cjs/visualizations/config/adapters/dhis_dhis/type.js

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var _visTypes = require("../../../../modules/visTypes.js");
-function _default(type) {
-  switch (type) {
-    case _visTypes.VIS_TYPE_SINGLE_VALUE:
-      return {
-        type: _visTypes.VIS_TYPE_SINGLE_VALUE
-      };
-    default:
-      return {
-        type: _visTypes.VIS_TYPE_SINGLE_VALUE
-      };
-  }
-}

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

@@ -1,39 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var _type = _interopRequireDefault(require("./type.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const DEFAULT_CHART = {
-  spacingTop: 20,
-  style: {
-    fontFamily: 'Roboto,Helvetica Neue,Helvetica,Arial,sans-serif'
-  }
-};
-const DASHBOARD_CHART = {
-  spacingTop: 0,
-  spacingRight: 5,
-  spacingBottom: 2,
-  spacingLeft: 5
-};
-const getEvents = () => ({
-  events: {
-    load: function () {
-      // Align legend icon with legend text
-      this.legend.allItems.forEach(item => {
-        if (item.legendSymbol) {
-          item.legendSymbol.attr({
-            translateY: -(item.legendItem.label.getBBox().height * 0.75 / 4) + item.legendSymbol.r / 2
-          });
-        }
-      });
-    }
-  }
-});
-function _default(layout, el, dashboard) {
-  return Object.assign({}, (0, _type.default)(layout.type), {
-    renderTo: el || layout.el
-  }, DEFAULT_CHART, dashboard ? DASHBOARD_CHART : undefined, getEvents());
-}

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

@@ -1,28 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var _visTypes = require("../../../../modules/visTypes.js");
-var _singleValue = _interopRequireDefault(require("./singleValue.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _default(config, parentEl, extraOptions) {
-  if (config) {
-    const node = typeof parentEl === 'object' ? parentEl : typeof parentEl === 'string' ? document.querySelector(parentEl) : null;
-    if (node) {
-      if (node.lastChild) {
-        node.removeChild(node.lastChild);
-      }
-      let content;
-      switch (config.type) {
-        case _visTypes.VIS_TYPE_SINGLE_VALUE:
-        default:
-          content = (0, _singleValue.default)(config, node, extraOptions);
-          break;
-      }
-      node.appendChild(content);
-      return node.innerHTML;
-    }
-  }
-}