@dhis2/analytics 999.9.9-outlier-table.alpha.4 → 999.9.9-value-align-alpha.1

package/build/cjs/__demo__/DimensionsPanel.stories.js

@@ -65,6 +65,7 @@ const onDimensionClick = () => alert('click');
   return /*#__PURE__*/_react2.default.createElement(_DimensionsPanel.default, {
     dimensions: [...fixedDimensions, ...dynamicDimensions],
     onDimensionClick: onDimensionClick,
+    selectedIds: [_predefinedDimensions.DIMENSION_ID_DATA],
     lockedDimension: dimension => dimension === _predefinedDimensions.DIMENSION_ID_DATA
   });
 });

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

@@ -9,6 +9,7 @@ var _AnalyticsEnrollments = _interopRequireDefault(require("./AnalyticsEnrollmen
 var _AnalyticsEvents = _interopRequireDefault(require("./AnalyticsEvents.js"));
 var _AnalyticsRequest = _interopRequireDefault(require("./AnalyticsRequest.js"));
 var _AnalyticsResponse = _interopRequireDefault(require("./AnalyticsResponse.js"));
+var _AnalyticsTrackedEntities = _interopRequireDefault(require("./AnalyticsTrackedEntities.js"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * @module analytics
@@ -19,6 +20,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * Analytics class used to request analytics data from Web API.
  *
  * @requires analytics.AnalyticsAggregate
+ * @requires analytics.AnalyticsTrackedEntities
+ * @requires analytics.AnalyticsEnrollments
  * @requires analytics.AnalyticsEvents
  * @requires analytics.AnalyticsRequest
  * @requires analytics.AnalyticsResponse
@@ -38,6 +41,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 class Analytics {
   /**
    * @param {!module:analytics.AnalyticsAggregate} analyticsAggregate The AnalyticsAggregate instance
+   * @param {!module:analytics.AnalyticsTrackedEntities} analyticsTrackedEntities The AnalyticsTrackedEntities instance
    * @param {!module:analytics.AnalyticsEnrollments} analyticsEnrollments The AnalyticsEnrollments instance
    * @param {!module:analytics.AnalyticsEvents} analyticsEvents The AnalyticsEvents instance
    * @param {!module:analytics.AnalyticsRequest} analyticsRequest The AnalyticsRequest class
@@ -46,12 +50,14 @@ class Analytics {
   constructor(_ref) {
     let {
       aggregate,
+      trackedEntities,
       enrollments,
       events,
       request,
       response
     } = _ref;
     this.aggregate = aggregate;
+    this.trackedEntities = trackedEntities;
     this.enrollments = enrollments;
     this.events = events;
     this.request = request;
@@ -74,6 +80,7 @@ class Analytics {
     if (!Analytics.getAnalytics.analytics) {
       Analytics.getAnalytics.analytics = new Analytics({
         aggregate: new _AnalyticsAggregate.default(dataEngine),
+        trackedEntities: new _AnalyticsTrackedEntities.default(dataEngine),
         enrollments: new _AnalyticsEnrollments.default(dataEngine),
         events: new _AnalyticsEvents.default(dataEngine),
         request: _AnalyticsRequest.default,

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

@@ -6,15 +6,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.generateDimensionStrings = exports.default = void 0;
 var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 var _AnalyticsRequest = _interopRequireDefault(require("./AnalyticsRequest.js"));
+var _utils = require("./utils.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const analyticsQuery = {
   resource: 'analytics',
   id: _ref => {
     let {
       path,
-      program
+      program,
+      trackedEntityType
     } = _ref;
-    return [path, program].filter(Boolean).join('/');
+    return (0, _utils.formatRequestPath)({
+      path,
+      program,
+      trackedEntityType
+    });
   },
   params: _ref2 => {
     let {
@@ -34,9 +40,14 @@ const analyticsDataQuery = {
   id: _ref3 => {
     let {
       path,
-      program
+      program,
+      trackedEntityType
     } = _ref3;
-    return [path, program].filter(Boolean).join('/');
+    return (0, _utils.formatRequestPath)({
+      path,
+      program,
+      trackedEntityType
+    });
   },
   params: _ref4 => {
     let {
@@ -58,9 +69,14 @@ const analyticsMetaDataQuery = {
   id: _ref5 => {
     let {
       path,
-      program
+      program,
+      trackedEntityType
     } = _ref5;
-    return [path, program].filter(Boolean).join('/');
+    return (0, _utils.formatRequestPath)({
+      path,
+      program,
+      trackedEntityType
+    });
   },
   params: _ref6 => {
     let {
@@ -153,6 +169,7 @@ class AnalyticsBase {
       variables: {
         path: req.path,
         program: req.program,
+        trackedEntityType: req.trackedEntityType,
         dimensions: generateDimensionStrings(req.dimensions),
         filters: generateDimensionStrings(req.filters),
         parameters: req.parameters,
@@ -195,6 +212,7 @@ class AnalyticsBase {
       variables: {
         path: req.path,
         program: req.program,
+        trackedEntityType: req.trackedEntityType,
         dimensions: generateDimensionStrings(req.dimensions, options),
         filters: generateDimensionStrings(req.filters, options),
         parameters: req.parameters

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

@@ -10,6 +10,7 @@ var _AnalyticsRequestBase = _interopRequireDefault(require("./AnalyticsRequestBa
 var _AnalyticsRequestDimensionsMixin = _interopRequireDefault(require("./AnalyticsRequestDimensionsMixin.js"));
 var _AnalyticsRequestFiltersMixin = _interopRequireDefault(require("./AnalyticsRequestFiltersMixin.js"));
 var _AnalyticsRequestPropertiesMixin = _interopRequireDefault(require("./AnalyticsRequestPropertiesMixin.js"));
+var _utils = require("./utils.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * @description
@@ -47,6 +48,7 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
   fromVisualization(visualization) {
     let passFilterAsDimension = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     let request = this;
+    const outputType = visualization.outputType;
 
     // extract dimensions from visualization
     const columns = visualization.columns || [];
@@ -57,19 +59,28 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
       if ((_d$legendSet = d.legendSet) !== null && _d$legendSet !== void 0 && _d$legendSet.id) {
         dimension += `-${d.legendSet.id}`;
       }
-      if ((_d$programStage = d.programStage) !== null && _d$programStage !== void 0 && _d$programStage.id) {
-        dimension = `${d.programStage.id}.${dimension}`;
-      }
       if (d.filter) {
         dimension += `:${d.filter}`;
       }
+      const programStageId = (_d$programStage = d.programStage) === null || _d$programStage === void 0 ? void 0 : _d$programStage.id;
       if ((_d$repetition = d.repetition) !== null && _d$repetition !== void 0 && (_d$repetition$indexes = _d$repetition.indexes) !== null && _d$repetition$indexes !== void 0 && _d$repetition$indexes.length) {
         d.repetition.indexes.forEach(index => {
-          request = request.addDimension(dimension.replace(/\./, `[${index}].`));
+          var _d$program;
+          request = request.addDimension((0, _utils.formatDimension)({
+            programId: (_d$program = d.program) === null || _d$program === void 0 ? void 0 : _d$program.id,
+            programStageId: `${programStageId}[${index}]`,
+            dimension,
+            outputType
+          }));
         });
       } else {
-        var _d$items;
-        request = request.addDimension(dimension, (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
+        var _d$program2, _d$items;
+        request = request.addDimension((0, _utils.formatDimension)({
+          programId: (_d$program2 = d.program) === null || _d$program2 === void 0 ? void 0 : _d$program2.id,
+          programStageId,
+          dimension,
+          outputType
+        }), (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
       }
     });
 
@@ -84,17 +95,29 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
         request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
       } else {
         var _f$programStage, _f$repetition, _f$repetition$indexes;
-        let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? `${f.programStage.id}.${f.dimension}` : f.dimension;
+        let filterString = f.dimension;
         if (f.filter) {
           filterString += `:${f.filter}`;
         }
+        const programStageId = (_f$programStage = f.programStage) === null || _f$programStage === void 0 ? void 0 : _f$programStage.id;
         if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition$indexes = _f$repetition.indexes) !== null && _f$repetition$indexes !== void 0 && _f$repetition$indexes.length) {
           f.repetition.indexes.forEach(index => {
-            request = request.addFilter(filterString.replace(/\./, `[${index}].`));
+            var _f$program;
+            request = request.addFilter((0, _utils.formatDimension)({
+              programId: (_f$program = f.program) === null || _f$program === void 0 ? void 0 : _f$program.id,
+              programStageId: `${programStageId}[${index}]`,
+              dimension: filterString,
+              outputType
+            }));
           });
         } else {
-          var _f$items2;
-          request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+          var _f$program2, _f$items2;
+          request = request.addFilter((0, _utils.formatDimension)({
+            programId: (_f$program2 = f.program) === null || _f$program2 === void 0 ? void 0 : _f$program2.id,
+            programStageId,
+            dimension: filterString,
+            outputType
+          }), (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
         }
       }
     });

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

@@ -24,6 +24,7 @@ class AnalyticsRequestBase {
       format = 'json',
       path,
       program,
+      trackedEntityType,
       dimensions = [],
       filters = [],
       parameters = {}
@@ -32,6 +33,7 @@ class AnalyticsRequestBase {
     this.format = format.toLowerCase();
     this.path = path;
     this.program = program;
+    this.trackedEntityType = trackedEntityType;
     this.dimensions = dimensions;
     this.filters = filters;
     this.parameters = {
@@ -70,7 +72,7 @@ class AnalyticsRequestBase {
       }
       return dimension;
     });
-    const endPoint = [this.endPoint, this.path, this.program].filter(e => !!e).join('/');
+    const endPoint = [this.endPoint, this.path, this.program, this.trackedEntityType].filter(Boolean).join('/');
     let url = `${endPoint}.${this.format}`;
     if (encodedDimensions.length) {
       url += `?dimension=${encodedDimensions.join('&dimension=')}`;

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

@@ -497,6 +497,25 @@ class extends base {
     return new _AnalyticsRequest.default(this);
   }
 
+  /**
+   * Sets the tracked entity type for the request.
+   * It appends the tracked entity type id to the request's path.
+   *
+   * @param {!String} trackedEntityType The tracked entity type id
+   *
+   * @returns {AnalyticsRequest} A new instance of the class for chaining purposes
+   *
+   * @example
+   * const req = new analytics.request()
+   *    .withTrackedEntityType('nEenWmSyUEp');
+   */
+  withTrackedEntityType(trackedEntityType) {
+    if (trackedEntityType) {
+      this.trackedEntityType = trackedEntityType;
+    }
+    return new _AnalyticsRequest.default(this);
+  }
+
   /**
    * Sets the program for the request.
    * It appends the program id to the request's path.

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

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _AnalyticsBase = _interopRequireDefault(require("./AnalyticsBase.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * @extends module:analytics.AnalyticsBase
+ *
+ * @description
+ * Analytics tracked entities class used to request analytics tracked entities data from Web API.
+ *
+ * @memberof module:analytics
+ */
+class AnalyticsTrackedEntities extends _AnalyticsBase.default {
+  /**
+   * @param {!AnalyticsRequest} req Request object
+   *
+   * @returns {Promise} Promise that resolves with the analytics query data from the api.
+   *
+   * @example
+      // TODO: provide working example
+   */
+  getQuery(req) {
+    return this.fetch(req.withPath('trackedEntities/query'));
+  }
+}
+var _default = AnalyticsTrackedEntities;
+exports.default = _default;

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

@@ -3,10 +3,29 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.customEncodeURIComponent = void 0;
+exports.formatRequestPath = exports.formatDimension = exports.customEncodeURIComponent = void 0;
 // Define our very own special list of characters that we don't want to encode in the URI
 const whitelistURI = ',&$=/;:';
 const whitelistURICodes = whitelistURI.split('').map(c => encodeURIComponent(c));
 const whitelistRegExp = new RegExp(`(?:${whitelistURICodes.join('|')})`, 'g');
 const customEncodeURIComponent = uri => encodeURIComponent(uri).replace(whitelistRegExp, decodeURIComponent);
-exports.customEncodeURIComponent = customEncodeURIComponent;
+exports.customEncodeURIComponent = customEncodeURIComponent;
+const formatRequestPath = _ref => {
+  let {
+    path,
+    program,
+    trackedEntityType
+  } = _ref;
+  return [path, program, trackedEntityType].filter(Boolean).join('/');
+};
+exports.formatRequestPath = formatRequestPath;
+const formatDimension = _ref2 => {
+  let {
+    outputType,
+    programId,
+    programStageId,
+    dimension
+  } = _ref2;
+  return [outputType === 'TRACKED_ENTITY_INSTANCE' ? programId : undefined, programStageId, dimension].filter(Boolean).join('.');
+};
+exports.formatDimension = formatDimension;

package/build/cjs/assets/DynamicDimensionIcon.js

@@ -8,48 +8,22 @@ var _react = _interopRequireDefault(require("react"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const DynamicDimensionIcon = () => {
   return /*#__PURE__*/_react.default.createElement("svg", {
-    width: "16px",
-    height: "16px",
-    viewBox: "0 0 16 16",
-    version: "1.1",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/_react.default.createElement("g", {
-    id: "Exp",
-    stroke: "none",
-    strokeWidth: "1",
-    fill: "none",
-    fillRule: "evenodd"
-  }, /*#__PURE__*/_react.default.createElement("g", {
-    id: "Artboard",
-    transform: "translate(-80.000000, -9.000000)"
-  }, /*#__PURE__*/_react.default.createElement("g", {
-    id: "icon_dimension_new",
-    transform: "translate(80.000000, 9.000000)"
-  }, /*#__PURE__*/_react.default.createElement("rect", {
-    id: "frame",
-    x: "0",
-    y: "0",
     width: "16",
-    height: "16"
-  }), /*#__PURE__*/_react.default.createElement("g", {
-    id: "module",
-    transform: "translate(4.000000, 4.000000)",
-    stroke: "#000000",
+    height: "16",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, /*#__PURE__*/_react.default.createElement("path", {
+    clipRule: "evenodd",
+    d: "m4.832 5.674 2.831-1.11a.913.913 0 0 1 .673 0l2.83 1.11a.548.548 0 0 1 .334.517V9.81a.548.548 0 0 1-.332.517l-2.831 1.11a.92.92 0 0 1-.673 0l-2.83-1.11a.548.548 0 0 1-.334-.517V6.19a.548.548 0 0 1 .332-.517Z",
+    stroke: "#212934",
     strokeLinecap: "round",
     strokeLinejoin: "round"
-  }, /*#__PURE__*/_react.default.createElement("path", {
-    d: "M0.33209728,1.1742111 L3.16308174,0.0641666694 C3.37911767,-0.0213888898 3.61963794,-0.0213888898 3.83567387,0.0641666694 L6.66665833,1.1742111 C6.87300668,1.26220739 7.00497003,1.467 6.99984343,1.69127776 L6.99984343,5.30887771 C7.00517859,5.53285411 6.87376309,5.73756106 6.66790272,5.82594437 L3.83691826,6.93629991 C3.62076407,7.02123336 3.38048032,7.02123336 3.16432613,6.93629991 L0.333341668,5.82594437 C0.126993317,5.73794808 -0.00497002591,5.53315547 0.000156574133,5.30887771 L0.000156574133,1.69127776 C-0.00517858533,1.46730136 0.126236906,1.26259441 0.33209728,1.1742111 Z",
-    id: "Shape"
-  }), /*#__PURE__*/_react.default.createElement("path", {
-    d: "M3.5,2.72795833 L0.322,1.48195833",
-    id: "Shape"
-  }), /*#__PURE__*/_react.default.createElement("path", {
-    d: "M3.5,2.72795833 L6.678,1.48195833",
-    id: "Shape"
   }), /*#__PURE__*/_react.default.createElement("path", {
-    d: "M3.5,6.78125 L3.5,2.72795833",
-    id: "Shape"
-  }))))));
+    d: "M8 7.228 4.822 5.982M8 7.228l3.178-1.246M8 11.281V7.228",
+    stroke: "#212934",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  }));
 };
 var _default = DynamicDimensionIcon;
 exports.default = _default;

package/build/cjs/components/AboutAOUnit/AboutAOUnit.js

@@ -156,6 +156,7 @@ const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
     className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "content"
   }, /*#__PURE__*/_react.default.createElement("p", {
     className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + ((0, _classnames.default)('detailLine', {
+      description: true,
       noDescription: !data.ao.displayDescription
     }) || "")
   }, data.ao.displayDescription ? /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, data.ao.displayDescription) : _d2I18n.default.t('No description')), /*#__PURE__*/_react.default.createElement("div", {

package/build/cjs/components/AboutAOUnit/styles/AboutAOUnit.style.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _ui = require("@dhis2/ui");
-const _defaultExport = [`.container.jsx-1596217846{position:relative;padding:${_ui.spacers.dp16};border-bottom:1px solid ${_ui.colors.grey400};background-color:${_ui.colors.white};}`, `.expanded.jsx-1596217846{padding-bottom:${_ui.spacers.dp32};}`, ".loader.jsx-1596217846{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".header.jsx-1596217846{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;}", `.title.jsx-1596217846{font-size:16px;font-weight:500;line-height:21px;color:${_ui.colors.grey900};}`, `.content.jsx-1596217846{font-size:14px;line-height:18px;color:${_ui.colors.grey900};}`, `.detailLine.jsx-1596217846{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin:0;padding:${_ui.spacers.dp12} 0 0 0;gap:${_ui.spacers.dp8};}`, ".detailLine.jsx-1596217846 svg.jsx-1596217846{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;}", `.noDescription.jsx-1596217846{color:${_ui.colors.grey600};}`, `.subsection.jsx-1596217846{margin-top:${_ui.spacers.dp24};}`, `.subsectionTitle.jsx-1596217846{color:${_ui.colors.grey700};font-weight:500;}`, `.subscriptionLabel.jsx-1596217846{margin:${_ui.spacers.dp12} 0 ${_ui.spacers.dp8} 0;}`, `.subsection.jsx-1596217846 button.jsx-1596217846{margin-top:${_ui.spacers.dp8};}`];
-_defaultExport.__hash = "1596217846";
+const _defaultExport = [`.container.jsx-3095370592{position:relative;padding:${_ui.spacers.dp16};border-bottom:1px solid ${_ui.colors.grey400};background-color:${_ui.colors.white};}`, `.expanded.jsx-3095370592{padding-bottom:${_ui.spacers.dp32};}`, ".loader.jsx-3095370592{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".header.jsx-3095370592{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;}", `.title.jsx-3095370592{font-size:16px;font-weight:500;line-height:21px;color:${_ui.colors.grey900};}`, `.content.jsx-3095370592{font-size:14px;line-height:18px;color:${_ui.colors.grey900};}`, `.detailLine.jsx-3095370592{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin:0;padding:${_ui.spacers.dp12} 0 0 0;gap:${_ui.spacers.dp8};}`, ".detailLine.jsx-3095370592 svg.jsx-3095370592{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;}", ".description.jsx-3095370592{white-space:pre-line;}", `.noDescription.jsx-3095370592{color:${_ui.colors.grey600};}`, `.subsection.jsx-3095370592{margin-top:${_ui.spacers.dp24};}`, `.subsectionTitle.jsx-3095370592{color:${_ui.colors.grey700};font-weight:500;}`, `.subscriptionLabel.jsx-3095370592{margin:${_ui.spacers.dp12} 0 ${_ui.spacers.dp8} 0;}`, `.subsection.jsx-3095370592 button.jsx-3095370592{margin-top:${_ui.spacers.dp8};}`];
+_defaultExport.__hash = "3095370592";
 var _default = _defaultExport;
 exports.default = _default;

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

@@ -33,7 +33,7 @@ const DataDimension = _ref => {
     } = _ref2;
     return (
       // Calculations only available from 2.40
-      id === _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM ? serverVersion.minor >= 40 : true
+      id !== _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM || serverVersion.minor >= 40
     );
   }), [serverVersion.minor]);
   const [dataTypes, setDataTypes] = (0, _react.useState)(filterDataTypesByVersion(enabledDataTypes || Object.values(_dataTypes.dataTypeMap)));

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

@@ -24,20 +24,32 @@ const DataTypeSelector = _ref => {
   const {
     visType
   } = (0, _DataDimension.useDataDimensionContext)();
+  const label = _index.default.t('Data Type');
   return /*#__PURE__*/_react.default.createElement("div", {
     className: `jsx-${_DataTypeSelectorStyle.default.__hash}` + " " + "container"
-  }, /*#__PURE__*/_react.default.createElement(_ui.SingleSelectField, {
-    label: _index.default.t('Data Type'),
+  }, dataTypes.length === 1 ? /*#__PURE__*/_react.default.createElement(_ui.SingleSelectField, {
+    label: label,
     dataTest: dataTest,
-    selected: currentDataType || (dataTypes.length === 1 ? dataTypes[0].id : _dataTypes.DIMENSION_TYPE_ALL),
+    selected: dataTypes[0].id,
     onChange: ref => onChange(ref.selected),
     dense: true,
-    disabled: dataTypes.length === 1,
-    helpText: dataTypes.length === 1 && visType ? _index.default.t('Only {{dataType}} can be used in {{visType}}', {
+    disabled: true,
+    helpText: visType ? _index.default.t('Only {{dataType}} can be used in {{visType}}', {
       dataType: _dataTypes.dataTypeMap[dataTypes[0].id].getName(),
       visType: (0, _visTypes.getDisplayNameByVisType)(visType)
     }) : ''
-  }, dataTypes.length > 1 && /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
+  }, dataTypes.map(type => /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
+    value: type.id,
+    key: type.id,
+    label: type.getName(),
+    dataTest: `${dataTest}-option-${type.id}`
+  }))) : /*#__PURE__*/_react.default.createElement(_ui.SingleSelectField, {
+    label: label,
+    dataTest: dataTest,
+    selected: currentDataType || _dataTypes.DIMENSION_TYPE_ALL,
+    onChange: ref => onChange(ref.selected),
+    dense: true
+  }, /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
     value: _dataTypes.DIMENSION_TYPE_ALL,
     key: _dataTypes.DIMENSION_TYPE_ALL,
     label: _index.default.t('All types'),

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

@@ -91,22 +91,22 @@ const EmptySelection = () => /*#__PURE__*/_react.default.createElement(_react.de
 }, _DimensionSelectorStyle.default));
 const RightHeader = _ref3 => {
   let {
-    infoText
+    infoBoxMessage
   } = _ref3;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
     className: `jsx-${_DimensionSelectorStyle.default.__hash}` + " " + "rightHeader"
-  }, _index.default.t('Selected Items')), infoText && /*#__PURE__*/_react.default.createElement("div", {
+  }, _index.default.t('Selected Items')), infoBoxMessage && /*#__PURE__*/_react.default.createElement("div", {
     className: `jsx-${_DimensionSelectorStyle.default.__hash}` + " " + "info-container"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: `jsx-${_DimensionSelectorStyle.default.__hash}`
   }, /*#__PURE__*/_react.default.createElement(_ui.IconInfo16, null)), /*#__PURE__*/_react.default.createElement("span", {
     className: `jsx-${_DimensionSelectorStyle.default.__hash}` + " " + "info-text"
-  }, infoText)), /*#__PURE__*/_react.default.createElement(_style.default, {
+  }, infoBoxMessage)), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _DimensionSelectorStyle.default.__hash
   }, _DimensionSelectorStyle.default));
 };
 RightHeader.propTypes = {
-  infoText: _propTypes.default.string
+  infoBoxMessage: _propTypes.default.string
 };
 const SourceEmptyPlaceholder = _ref4 => {
   let {
@@ -446,7 +446,7 @@ const ItemSelector = _ref5 => {
     selectedWidth: _dimensionSelectorHelper.TRANSFER_SELECTED_WIDTH,
     selectedEmptyComponent: /*#__PURE__*/_react.default.createElement(EmptySelection, null),
     rightHeader: /*#__PURE__*/_react.default.createElement(RightHeader, {
-      infoText: infoBoxMessage
+      infoBoxMessage: infoBoxMessage
     }),
     rightFooter: rightFooter,
     renderOption: props => {