@dhis2/analytics 26.4.0 → 26.5.0

package/build/cjs/__fixtures__/fixtures.js

@@ -93,6 +93,7 @@ var _default = function x() {
   addFixture('/api/analytics/cluster', require('./json/api/analytics/cluster.json'));
   addFixture('/api/analytics/response', require('./json/api/analytics/response.json'));
   addFixture('/api/analytics/enrollments', require('./json/api/analytics/enrollments.json'));
+  addFixture('/api/analytics/outlierDetection', require('./json/api/analytics/outlierDetection.json'));
   return {
     get: getFixture,
     add: addFixture

package/build/cjs/__fixtures__/json/api/analytics/outlierDetection.json

@@ -0,0 +1,213 @@
+{
+  "headers": [
+    {
+      "name": "dxname",
+      "column": "Data name",
+      "valueType": "TEXT",
+      "type": "java.lang.String",
+      "hidden": false,
+      "meta": false
+    },
+    {
+      "name": "ouname",
+      "column": "Organisation unit name",
+      "valueType": "TEXT",
+      "type": "java.lang.String",
+      "hidden": false,
+      "meta": false
+    },
+    {
+      "name": "value",
+      "column": "Value",
+      "valueType": "NUMBER",
+      "type": "java.lang.Double",
+      "hidden": false,
+      "meta": false
+    },
+    {
+      "name": "absdev",
+      "column": "Absolute deviation",
+      "valueType": "NUMBER",
+      "type": "java.lang.Double",
+      "hidden": false,
+      "meta": false
+    },
+    {
+      "name": "modifiedzscore",
+      "column": "Modified zScore",
+      "valueType": "NUMBER",
+      "type": "java.lang.Double",
+      "hidden": false,
+      "meta": false
+    },
+    {
+      "name": "median",
+      "column": "Median",
+      "valueType": "NUMBER",
+      "type": "java.lang.Double",
+      "hidden": false,
+      "meta": false
+    },
+    {
+      "name": "lowerbound",
+      "column": "Lower boundary",
+      "valueType": "NUMBER",
+      "type": "java.lang.Double",
+      "hidden": false,
+      "meta": false
+    },
+    {
+      "name": "upperbound",
+      "column": "Upper boundary",
+      "valueType": "NUMBER",
+      "type": "java.lang.Double",
+      "hidden": false,
+      "meta": false
+    }
+  ],
+  "metaData": {
+    "maxResults": 100,
+    "count": 13,
+    "orderBy": "mean_abs_dev",
+    "threshold": 3.0,
+    "algorithm": "MOD_Z_SCORE"
+  },
+  "rowContext": {
+
+  },
+  "rows": [
+    [
+      "ANC 2nd visit",
+      "UMC (Urban Centre) Hospital",
+      "1669.0",
+      "920.0",
+      "3.902767295597484",
+      "749.0",
+      "-290.93013894085743",
+      "1788.9301389408574"
+    ],
+    [
+      "ANC 1st visit",
+      "Charlotte CHP",
+      "49.0",
+      "39.0",
+      "7.515857142857143",
+      "10.0",
+      "-23.948490393535913",
+      "43.94849039353591"
+    ],
+    [
+      "ANC 2nd visit",
+      "Charlotte CHP",
+      "40.0",
+      "33.0",
+      "22.258499999999998",
+      "7.0",
+      "-30.86489139031037",
+      "44.86489139031037"
+    ],
+    [
+      "ANC 2nd visit",
+      "Wilberforce CHC",
+      "56.0",
+      "24.5",
+      "3.004590909090909",
+      "31.5",
+      "-1.3890179239210454",
+      "64.38901792392105"
+    ],
+    [
+      "ANC 1st visit",
+      "Deep Eye water MCHP",
+      "40.0",
+      "16.0",
+      "3.5973333333333333",
+      "24.0",
+      "4.850913859925324",
+      "43.14908614007467"
+    ],
+    [
+      "ANC 2nd visit",
+      "Lion for Lion Clinic",
+      "30.0",
+      "16.0",
+      "3.5973333333333333",
+      "14.0",
+      "-5.620896815302167",
+      "33.62089681530217"
+    ],
+    [
+      "ANC 2nd visit",
+      "Deep Eye water MCHP",
+      "33.0",
+      "14.5",
+      "3.9121",
+      "18.5",
+      "-3.4245866551686603",
+      "40.42458665516866"
+    ],
+    [
+      "ANC 2nd visit",
+      "Blessed Mokaka East Clinic",
+      "2.0",
+      "13.0",
+      "4.38425",
+      "15.0",
+      "-3.417043736713012",
+      "33.41704373671301"
+    ],
+    [
+      "ANC 2nd visit",
+      "Malambay CHP",
+      "15.0",
+      "12.0",
+      "5.396",
+      "3.0",
+      "-13.770509831248425",
+      "19.770509831248425"
+    ],
+    [
+      "ANC 2nd visit",
+      "Wellbody MCHP",
+      "20.0",
+      "10.0",
+      "3.3725",
+      "10.0",
+      "-10.999999999999996",
+      "30.999999999999996"
+    ],
+    [
+      "ANC 1st visit",
+      "Blessed Mokaka East Clinic",
+      "26.0",
+      "10.0",
+      "4.496666666666667",
+      "16.0",
+      "1.6734512181055958",
+      "30.326548781894402"
+    ],
+    [
+      "ANC 1st visit",
+      "Murray Town CHC",
+      "18.0",
+      "9.0",
+      "6.0705",
+      "9.0",
+      "-2.43571205496543",
+      "20.43571205496543"
+    ],
+    [
+      "ANC 2nd visit",
+      "Thompson Bay MCHP",
+      "11.0",
+      "6.0",
+      "4.047",
+      "5.0",
+      "-2.038266127580332",
+      "12.038266127580332"
+    ]
+  ],
+  "headerWidth": 8,
+  "width": 8,
+  "height": 13
+}

package/build/cjs/api/analytics/AnalyticsAggregate.js

@@ -74,12 +74,38 @@ class AnalyticsAggregate extends _AnalyticsBase.default {
    *  .withStartDate('2017-10-01')
    *  .withEndDate('2017-10-31');
    *
-   *  analytics.aggregate.getDebugSql(req);
+   *  analytics.aggregate.getDebugSql(req)
    *  .then(console.log);
    */
   getDebugSql(req) {
     return this.fetch(req.withPath('debug/sql'));
   }
+
+  /**
+   * @param {!AnalyticsRequest} req Request object
+   *
+   * @returns {Promise} Promise that resolves with the SQL statement used to query the database.
+   *
+   * @example
+   * const req = new analytics.request()
+   *  .withParameters({
+   *    dx: 'fbfJHSPpUQD,cYeuwXTCPkU',
+   *    pe: 'THIS_YEAR',
+   *    ou: 'USER_ORGUNIT,USER_ORGUNIT_CHILDREN',
+   *    headers: 'dxname,pename,ouname,value,absdev,modifiedzscore,median,lowerbound,upperbound',
+   *    algorithm: 'MODIFIED_Z_SCORE',
+   *    maxResults: 100,
+   *    threshold: 3,
+        orderBy: 'value',
+        sortOrder: 'desc',
+   *  });
+   *
+   *  analytics.aggregate.getOutliersData(req)
+   *  .then(console.log);
+   */
+  getOutliersData(req) {
+    return this.fetch(req.withPath('outlierDetection'));
+  }
 }
 var _default = AnalyticsAggregate;
 exports.default = _default;

package/build/cjs/api/analytics/AnalyticsBase.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.generateDimensionStrings = exports.default = void 0;
 var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 var _AnalyticsRequest = _interopRequireDefault(require("./AnalyticsRequest.js"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -23,8 +23,8 @@ const analyticsQuery = {
       parameters
     } = _ref2;
     return {
-      dimension: dimensions,
-      filter: filters,
+      dimension: dimensions.length ? dimensions : undefined,
+      filter: filters.length ? filters : undefined,
       ...parameters
     };
   }
@@ -45,8 +45,8 @@ const analyticsDataQuery = {
       parameters
     } = _ref4;
     return {
-      dimension: dimensions,
-      filter: filters,
+      dimension: dimensions.length ? dimensions : undefined,
+      filter: filters.length ? filters : undefined,
       ...parameters,
       skipMeta: true,
       skipData: false
@@ -69,8 +69,8 @@ const analyticsMetaDataQuery = {
       parameters
     } = _ref6;
     return {
-      dimension: dimensions,
-      filter: filters,
+      dimension: dimensions.length ? dimensions : undefined,
+      filter: filters.length ? filters : undefined,
       ...parameters,
       skipMeta: false,
       skipData: true,
@@ -110,6 +110,7 @@ const generateDimensionStrings = function () {
  * @memberof module:analytics
  * @abstract
  */
+exports.generateDimensionStrings = generateDimensionStrings;
 class AnalyticsBase {
   constructor(dataEngine) {
     this.dataEngine = dataEngine;

package/build/cjs/api/analytics/AnalyticsRequestBase.js

@@ -53,7 +53,7 @@ class AnalyticsRequestBase {
   buildUrl(options) {
     // at least 1 dimension is required
     let dimensions = this.dimensions;
-    if (options && options.sorted) {
+    if (dimensions.length && options !== null && options !== void 0 && options.sorted) {
       dimensions = (0, _sortBy.default)(dimensions, 'dimension');
     }
     const encodedDimensions = dimensions.map(_ref => {
@@ -63,7 +63,7 @@ class AnalyticsRequestBase {
       } = _ref;
       if (Array.isArray(items) && items.length) {
         const encodedItems = items.map(_utils.customEncodeURIComponent);
-        if (options && options.sorted) {
+        if (options !== null && options !== void 0 && options.sorted) {
           encodedItems.sort();
         }
         return `${dimension}:${encodedItems.join(';')}`;
@@ -71,7 +71,11 @@ class AnalyticsRequestBase {
       return dimension;
     });
     const endPoint = [this.endPoint, this.path, this.program].filter(e => !!e).join('/');
-    return `${endPoint}.${this.format}?dimension=${encodedDimensions.join('&dimension=')}`;
+    let url = `${endPoint}.${this.format}`;
+    if (encodedDimensions.length) {
+      url += `?dimension=${encodedDimensions.join('&dimension=')}`;
+    }
+    return url;
   }
 
   /**
@@ -89,7 +93,7 @@ class AnalyticsRequestBase {
    */
   buildQuery(options) {
     let filters = this.filters;
-    if (options && options.sorted) {
+    if (filters.length && options !== null && options !== void 0 && options.sorted) {
       filters = (0, _sortBy.default)(filters, 'dimension');
     }
     const encodedFilters = filters.map(_ref2 => {
@@ -99,7 +103,7 @@ class AnalyticsRequestBase {
       } = _ref2;
       if (Array.isArray(items) && items.length) {
         const encodedItems = items.map(_utils.customEncodeURIComponent);
-        if (options && options.sorted) {
+        if (options !== null && options !== void 0 && options.sorted) {
           encodedItems.sort();
         }
         return `${dimension}:${encodedItems.join(';')}`;

package/build/cjs/api/analytics/AnalyticsResponse.js

@@ -58,7 +58,8 @@ class AnalyticsResponse {
     }
   }
   extractHeaders() {
-    const dimensions = this.response.metaData.dimensions;
+    // some endpoints (ie. outlierDetection) don't return dimensions in metaData
+    const dimensions = this.response.metaData.dimensions || {};
     const headers = this.response.headers || [];
     return headers.map((header, index) => new _AnalyticsResponseHeader.default(header, {
       isPrefix: isPrefixHeader(header, dimensions[header.name]),
@@ -94,48 +95,50 @@ class AnalyticsResponse {
       items
     } = metaData;
 
-    // populate metaData dimensions and items
-    this.headers.filter(header => !DEFAULT_COLLECT_IGNORE_HEADERS.includes(header.name)).forEach(header => {
-      let ids;
+    // some endpoints (ie. outlierDetection) don't return dimensions or items
+    if (dimensions && items) {
+      this.headers.filter(header => !DEFAULT_COLLECT_IGNORE_HEADERS.includes(header.name)).forEach(header => {
+        let ids;
 
-      // collect row values
-      if (header.isCollect) {
-        ids = this.getSortedUniqueRowIdStringsByHeader(header);
-        dimensions[header.name] = ids;
-      } else {
-        ids = dimensions[header.name];
-      }
-      if (header.isPrefix) {
-        // create prefixed dimensions array
-        dimensions[header.name] = ids.map(id => getPrefixedId(id, header.name));
-
-        // create items
-        dimensions[header.name].forEach((prefixedId, index) => {
-          const id = ids[index];
-          const valueType = header.valueType;
-          const name = getNameByIdsByValueType(id, valueType);
-          items[prefixedId] = {
-            name
-          };
-        });
-      }
-    });
+        // collect row values
+        if (header.isCollect) {
+          ids = this.getSortedUniqueRowIdStringsByHeader(header);
+          dimensions[header.name] = ids;
+        } else {
+          ids = dimensions[header.name];
+        }
+        if (header.isPrefix) {
+          // create prefixed dimensions array
+          dimensions[header.name] = ids.map(id => getPrefixedId(id, header.name));
 
-    // for events, add items from 'ouname'
-    if (this.hasHeader(OUNAME) && this.hasHeader(OU)) {
-      const ouNameHeaderIndex = this.getHeader(OUNAME).getIndex();
-      const ouHeaderIndex = this.getHeader(OU).getIndex();
-      let ouId;
-      let ouName;
-      this.rows.forEach(row => {
-        ouId = row[ouHeaderIndex];
-        if (items[ouId] === undefined) {
-          ouName = row[ouNameHeaderIndex];
-          items[ouId] = {
-            name: ouName
-          };
+          // create items
+          dimensions[header.name].forEach((prefixedId, index) => {
+            const id = ids[index];
+            const valueType = header.valueType;
+            const name = getNameByIdsByValueType(id, valueType);
+            items[prefixedId] = {
+              name
+            };
+          });
         }
       });
+
+      // for events, add items from 'ouname'
+      if (this.hasHeader(OUNAME) && this.hasHeader(OU)) {
+        const ouNameHeaderIndex = this.getHeader(OUNAME).getIndex();
+        const ouHeaderIndex = this.getHeader(OU).getIndex();
+        let ouId;
+        let ouName;
+        this.rows.forEach(row => {
+          ouId = row[ouHeaderIndex];
+          if (items[ouId] === undefined) {
+            ouName = row[ouNameHeaderIndex];
+            items[ouId] = {
+              name: ouName
+            };
+          }
+        });
+      }
     }
     return metaData;
   }

package/build/cjs/api/analytics/__tests__/Analytics.spec.js

@@ -2,6 +2,7 @@
 
 var _Analytics = _interopRequireDefault(require("../Analytics.js"));
 var _AnalyticsAggregate = _interopRequireDefault(require("../AnalyticsAggregate.js"));
+var _AnalyticsEnrollments = _interopRequireDefault(require("../AnalyticsEnrollments.js"));
 var _AnalyticsEvents = _interopRequireDefault(require("../AnalyticsEvents.js"));
 var _AnalyticsRequest = _interopRequireDefault(require("../AnalyticsRequest.js"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -10,6 +11,7 @@ describe('Analytics', () => {
   beforeEach(() => {
     analytics = new _Analytics.default({
       aggregate: new _AnalyticsAggregate.default(),
+      enrollments: new _AnalyticsEnrollments.default(),
       events: new _AnalyticsEvents.default(),
       request: _AnalyticsRequest.default
     });
@@ -23,6 +25,9 @@ describe('Analytics', () => {
   it('should contain an instance of AnalyticsAggregate', () => {
     expect(analytics.aggregate).toBeInstanceOf(_AnalyticsAggregate.default);
   });
+  it('should contain an instance of AnalyticsEnrollments', () => {
+    expect(analytics.enrollments).toBeInstanceOf(_AnalyticsEnrollments.default);
+  });
   it('should contain an instance of AnalyticsEvents', () => {
     expect(analytics.events).toBeInstanceOf(_AnalyticsEvents.default);
   });

package/build/cjs/api/analytics/__tests__/AnalyticsAggregate.spec.js

@@ -87,4 +87,33 @@ describe('Analytics.aggregate', () => {
       expect(data.height).toEqual(0);
     }));
   });
+  describe('.getOutliersData', () => {
+    beforeEach(() => {
+      aggregate = new _AnalyticsAggregate.default(new _DataEngine.default());
+      request = new _AnalyticsRequest.default();
+      request.withParameters({
+        dx: 'fbfJHSPpUQD,cYeuwXTCPkU',
+        pe: 'THIS_YEAR',
+        ou: 'at6UHUQatSo',
+        headers: 'dxname,pename,ouname,value,absdev,modifiedzscore,median,lowerbound,upperbound',
+        algorithm: 'MOD_Z_SCORE',
+        maxResults: 100,
+        threshold: 3
+      });
+      fixture = _fixtures.default.get('/api/analytics/outlierDetection');
+      dataEngineMock.query.mockReturnValue(Promise.resolve({
+        data: fixture
+      }));
+    });
+    it('should be a function', () => {
+      expect(aggregate.getOutliersData).toBeInstanceOf(Function);
+    });
+    it('should resolve a promise with data', () => aggregate.getOutliersData(request).then(data => {
+      expect(data.metaData.items).toEqual(fixture.metaData.items);
+      expect(data.metaData.dimensions).toEqual(fixture.metaData.dimensions);
+      expect(data.headers).toEqual(fixture.headers);
+      expect(data.width).toEqual(8);
+      expect(data.height).toEqual(13);
+    }));
+  });
 });

package/build/cjs/api/analytics/__tests__/AnalyticsBase.spec.js

@@ -1,7 +1,8 @@
 "use strict";
 
-var _AnalyticsBase = _interopRequireDefault(require("../AnalyticsBase.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _AnalyticsBase = _interopRequireWildcard(require("../AnalyticsBase.js"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 let base;
 describe('constructor', () => {
   beforeEach(() => {
@@ -15,4 +16,37 @@ describe('constructor', () => {
     base = new _AnalyticsBase.default(dataEngineMock);
     expect(base.dataEngine).toBe(dataEngineMock);
   });
+});
+describe('generateDimensionString', () => {
+  const tests = [{
+    input: [{
+      dimension: 'dim2',
+      items: ['item2', 'item1']
+    }, {
+      dimension: 'dim1',
+      items: ['item1']
+    }],
+    output: ['dim2:item2;item1', 'dim1:item1'],
+    outputSorted: ['dim1:item1', 'dim2:item1;item2']
+  }];
+  it('should return dimension strings correctly formatted', () => {
+    tests.forEach(_ref => {
+      let {
+        input,
+        output
+      } = _ref;
+      expect((0, _AnalyticsBase.generateDimensionStrings)(input)).toEqual(output);
+    });
+  });
+  it('should return dimension strings correctly formatted and sorted', () => {
+    tests.forEach(_ref2 => {
+      let {
+        input,
+        outputSorted
+      } = _ref2;
+      expect((0, _AnalyticsBase.generateDimensionStrings)(input, {
+        sorted: true
+      })).toEqual(outputSorted);
+    });
+  });
 });

package/build/cjs/components/DataDimension/DataDimension.js

@@ -3,25 +3,40 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.useDataDimensionContext = exports.default = void 0;
 var _appRuntime = require("@dhis2/app-runtime");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var _dataTypes = require("../../modules/dataTypes.js");
 var _predefinedDimensions = require("../../modules/predefinedDimensions.js");
 var _ItemSelector = _interopRequireDefault(require("./ItemSelector.js"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const DataDimensionCtx = /*#__PURE__*/(0, _react.createContext)({});
 const DataDimension = _ref => {
   let {
     onSelect,
     selectedDimensions,
     displayNameProp,
+    enabledDataTypes,
     infoBoxMessage,
-    onCalculationSave
+    onCalculationSave,
+    visType
   } = _ref;
   const {
     serverVersion
   } = (0, _appRuntime.useConfig)();
-  const supportsEDI = `${serverVersion.major}.${serverVersion.minor}.${serverVersion.patch || 0}` >= '2.40.0';
+  const filterDataTypesByVersion = (0, _react.useCallback)(dataTypes => dataTypes.filter(_ref2 => {
+    let {
+      id
+    } = _ref2;
+    return (
+      // Calculations only available from 2.40
+      id !== _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM || serverVersion.minor >= 40
+    );
+  }), [serverVersion.minor]);
+  const [dataTypes, setDataTypes] = (0, _react.useState)(filterDataTypesByVersion(enabledDataTypes || Object.values(_dataTypes.dataTypeMap)));
   const onSelectItems = selectedItem => onSelect({
     dimensionId: _predefinedDimensions.DIMENSION_ID_DATA,
     items: selectedItem.map(item => ({
@@ -31,7 +46,12 @@ const DataDimension = _ref => {
       expression: item.expression
     }))
   });
-  return /*#__PURE__*/_react.default.createElement(_ItemSelector.default, {
+  (0, _react.useEffect)(() => enabledDataTypes && setDataTypes(filterDataTypesByVersion(enabledDataTypes)), [enabledDataTypes, filterDataTypesByVersion]);
+  return /*#__PURE__*/_react.default.createElement(DataDimensionCtx.Provider, {
+    value: {
+      visType
+    }
+  }, /*#__PURE__*/_react.default.createElement(_ItemSelector.default, {
     selectedItems: selectedDimensions.map(item => ({
       value: item.id,
       label: item.name,
@@ -44,9 +64,9 @@ const DataDimension = _ref => {
     displayNameProp: displayNameProp,
     infoBoxMessage: infoBoxMessage,
     dataTest: 'data-dimension',
-    supportsEDI: supportsEDI,
+    dataTypes: dataTypes,
     onEDISave: onCalculationSave
-  });
+  }));
 };
 DataDimension.propTypes = {
   displayNameProp: _propTypes.default.string.isRequired,
@@ -58,12 +78,16 @@ DataDimension.propTypes = {
     type: _propTypes.default.string
   })).isRequired,
   onSelect: _propTypes.default.func.isRequired,
+  enabledDataTypes: _propTypes.default.array,
   infoBoxMessage: _propTypes.default.string,
+  visType: _propTypes.default.string,
   onCalculationSave: _propTypes.default.func
 };
 DataDimension.defaultProps = {
   selectedDimensions: [],
   onSelect: Function.prototype
 };
+const useDataDimensionContext = () => (0, _react.useContext)(DataDimensionCtx);
+exports.useDataDimensionContext = useDataDimensionContext;
 var _default = DataDimension;
 exports.default = _default;