@dhis2/analytics 26.12.3 → 26.13.1

package/build/cjs/components/DataDimension/{ItemSelector.js → ItemSelector/ItemSelector.js}

@@ -7,21 +7,23 @@ exports.default = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 var _appRuntime = require("@dhis2/app-runtime");
 var _ui = require("@dhis2/ui");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
-var _dimensions = require("../../api/dimensions.js");
-var _index = _interopRequireDefault(require("../../locales/index.js"));
-var _dataSets = require("../../modules/dataSets.js");
-var _dataTypes = require("../../modules/dataTypes.js");
-var _dimensionListItem = require("../../modules/dimensionListItem.js");
-var _dimensionSelectorHelper = require("../../modules/dimensionSelectorHelper.js");
-var _utils = require("../../modules/utils.js");
-var _DimensionSelectorStyle = _interopRequireDefault(require("../styles/DimensionSelector.style.js"));
-var _CalculationModal = _interopRequireDefault(require("./Calculation/CalculationModal.js"));
+var _dimensions = require("../../../api/dimensions.js");
+var _index = _interopRequireDefault(require("../../../locales/index.js"));
+var _dataSets = require("../../../modules/dataSets.js");
+var _dataTypes = require("../../../modules/dataTypes.js");
+var _dimensionListItem = require("../../../modules/dimensionListItem.js");
+var _dimensionSelectorHelper = require("../../../modules/dimensionSelectorHelper.js");
+var _utils = require("../../../modules/utils.js");
+var _DimensionSelectorStyle = _interopRequireDefault(require("../../styles/DimensionSelector.style.js"));
+var _CalculationModal = _interopRequireDefault(require("../Calculation/CalculationModal.js"));
+var _SelectedEmptyPlaceholder = require("../SelectedEmptyPlaceholder.js");
+var _SourceEmptyPlaceholder = require("../SourceEmptyPlaceholder.js");
+var _TransferOption = require("../TransferOption.js");
 var _DataTypeSelector = _interopRequireDefault(require("./DataTypeSelector.js"));
 var _GroupSelector = _interopRequireDefault(require("./GroupSelector.js"));
-var _InfoPopover = require("./Info/InfoPopover.js");
-var _TransferOption = require("./TransferOption.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 _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -85,11 +87,6 @@ LeftHeader.propTypes = {
   setSubGroup: _propTypes.default.func,
   subGroup: _propTypes.default.string
 };
-const EmptySelection = () => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
-  className: `jsx-${_DimensionSelectorStyle.default.__hash}` + " " + "emptyList"
-}, _index.default.t('No items selected')), /*#__PURE__*/_react.default.createElement(_style.default, {
-  id: _DimensionSelectorStyle.default.__hash
-}, _DimensionSelectorStyle.default));
 const RightHeader = _ref3 => {
   let {
     infoBoxMessage
@@ -109,99 +106,7 @@ const RightHeader = _ref3 => {
 RightHeader.propTypes = {
   infoBoxMessage: _propTypes.default.string
 };
-const SourceEmptyPlaceholder = _ref4 => {
-  let {
-    loading,
-    searchTerm,
-    options,
-    noItemsMessage,
-    dataType,
-    dataTest
-  } = _ref4;
-  let message = '';
-  if (!loading && !options.length && !searchTerm) {
-    if (noItemsMessage) {
-      message = noItemsMessage;
-    } else {
-      switch (dataType) {
-        case _dataTypes.DIMENSION_TYPE_INDICATOR:
-          message = _index.default.t('No indicators found');
-          break;
-        case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT:
-          message = _index.default.t('No data elements found');
-          break;
-        case _dataTypes.DIMENSION_TYPE_DATA_SET:
-          message = _index.default.t('No data sets found');
-          break;
-        case _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM:
-          message = _index.default.t('No event data items found');
-          break;
-        case _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR:
-          message = _index.default.t('No program indicators found');
-          break;
-        case _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM:
-          message = _index.default.t('No calculations found');
-          break;
-        default:
-          message = _index.default.t('No data');
-          break;
-      }
-    }
-  } else if (!loading && !options.length && searchTerm) {
-    switch (dataType) {
-      case _dataTypes.DIMENSION_TYPE_INDICATOR:
-        message = _index.default.t('No indicators found for "{{- searchTerm}}"', {
-          searchTerm
-        });
-        break;
-      case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT:
-        message = _index.default.t('No data elements found for "{{- searchTerm}}"', {
-          searchTerm
-        });
-        break;
-      case _dataTypes.DIMENSION_TYPE_DATA_SET:
-        message = _index.default.t('No data sets found for "{{- searchTerm}}"', {
-          searchTerm
-        });
-        break;
-      case _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM:
-        message = _index.default.t('No event data items found for "{{- searchTerm}}"', {
-          searchTerm
-        });
-        break;
-      case _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR:
-        message = _index.default.t('No program indicators found for "{{- searchTerm}}"', {
-          searchTerm
-        });
-        break;
-      case _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM:
-        message = _index.default.t('No calculations found for "{{- searchTerm}}"', {
-          searchTerm
-        });
-        break;
-      default:
-        message = _index.default.t('Nothing found for "{{- searchTerm}}"', {
-          searchTerm
-        });
-        break;
-    }
-  }
-  return message && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
-    "data-test": dataTest,
-    className: `jsx-${_DimensionSelectorStyle.default.__hash}` + " " + "emptyList"
-  }, message), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: _DimensionSelectorStyle.default.__hash
-  }, _DimensionSelectorStyle.default));
-};
-SourceEmptyPlaceholder.propTypes = {
-  dataTest: _propTypes.default.string,
-  dataType: _propTypes.default.string,
-  loading: _propTypes.default.bool,
-  noItemsMessage: _propTypes.default.string,
-  options: _propTypes.default.array,
-  searchTerm: _propTypes.default.string
-};
-const ItemSelector = _ref5 => {
+const ItemSelector = _ref4 => {
   let {
     selectedItems,
     noItemsMessage,
@@ -209,11 +114,18 @@ const ItemSelector = _ref5 => {
     rightFooter,
     displayNameProp,
     infoBoxMessage,
+    itemsRef,
+    currentCalculation,
+    setCurrentCalculation,
+    infoDataItem,
+    setInfoDataItem,
     dataTypes,
     dataTest,
-    onEDISave
-  } = _ref5;
-  const itemsRef = (0, _react.useRef)(new Map());
+    onEDISave,
+    onEditClick,
+    isOptionViewMode,
+    supportsEDI
+  } = _ref4;
   const [state, setState] = (0, _react.useState)({
     searchTerm: '',
     dataTypes,
@@ -224,16 +136,8 @@ const ItemSelector = _ref5 => {
     },
     options: [],
     loading: true,
-    nextPage: 1,
-    supportsEDI: dataTypes.map(_ref6 => {
-      let {
-        id
-      } = _ref6;
-      return id;
-    }).includes(_dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM)
+    nextPage: 1
   });
-  const [currentCalculation, setCurrentCalculation] = (0, _react.useState)();
-  const [currentDataItem, setCurrentDataItem] = (0, _react.useState)();
   const debouncedSearchTerm = (0, _utils.useDebounce)(state.searchTerm, 500);
   const dataEngine = (0, _appRuntime.useDataEngine)();
   const setSearchTerm = searchTerm => setState(state => ({
@@ -283,7 +187,8 @@ const ItemSelector = _ref5 => {
           value: item.id,
           disabled: item.disabled,
           type: item.dimensionItemType,
-          expression: item.expression
+          expression: item.expression,
+          optionSetId: item.optionSetId
         });
       }
     });
@@ -308,19 +213,22 @@ const ItemSelector = _ref5 => {
   };
   (0, _utils.useDidUpdateEffect)(() => {
     fetchItems(1);
-  }, [debouncedSearchTerm, state.filter]);
-  const onChange = newSelected => {
-    onSelect(newSelected.map(value => {
-      const matchingItem = [...state.options, ...selectedItems].find(item => item.value === value);
+  }, [debouncedSearchTerm, state.filter]); // does this effect dep work?
+
+  const onChange = selectedIds => {
+    const newSelectedItems = selectedIds.map(id => {
+      const matchingItem = [...state.options, ...selectedItems].find(item => item.value === id);
       return {
-        value,
+        value: id,
         label: matchingItem.label,
         type: matchingItem.type,
+        optionSetId: matchingItem.optionSetId,
         ...(matchingItem.expression ? {
           expression: matchingItem.expression
         } : {})
       };
-    }));
+    });
+    onSelect(newSelectedItems);
   };
   const onEndReached = () => {
     if (state.nextPage) {
@@ -331,17 +239,13 @@ const ItemSelector = _ref5 => {
     const item = selectedItems.find(item => item.value === value);
     return !item || item.isActive;
   };
-  const getItemType = value => {
-    var _find;
-    return (_find = [...state.options, ...selectedItems].find(item => item.value === value)) === null || _find === void 0 ? void 0 : _find.type;
-  };
-  const onSaveCalculation = async _ref7 => {
+  const onSaveCalculation = async _ref5 => {
     let {
       id,
       name,
       expression,
       isNew
-    } = _ref7;
+    } = _ref5;
     onEDISave({
       id,
       name,
@@ -364,10 +268,10 @@ const ItemSelector = _ref5 => {
       }]);
     }
   };
-  const onDeleteCalculation = _ref8 => {
+  const onDeleteCalculation = _ref6 => {
     let {
       id
-    } = _ref8;
+    } = _ref6;
     // close the modal
     setCurrentCalculation();
 
@@ -404,22 +308,30 @@ const ItemSelector = _ref5 => {
     }
   }));
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: `jsx-${_DimensionSelectorStyle.default.__hash}` + " " + "transfer-container"
+    className: `jsx-${_DimensionSelectorStyle.default.__hash}` + " " + ((0, _classnames.default)('transfer-container', {
+      hidden: isOptionViewMode
+    }) || "")
   }, /*#__PURE__*/_react.default.createElement(_ui.Transfer, {
-    onChange: _ref9 => {
+    onChange: _ref7 => {
       let {
         selected
-      } = _ref9;
+      } = _ref7;
       return onChange(selected);
     },
     selected: selectedItems.map(item => item.value),
-    options: [...state.options, ...selectedItems],
+    options: [...state.options,
+    // remove items already in the options list
+    ...selectedItems.filter(selectedItem => {
+      var _state$options;
+      return !((_state$options = state.options) !== null && _state$options !== void 0 && _state$options.find(option => option.value === selectedItem.value));
+    })],
     loading: state.loading,
     loadingPicked: state.loading,
-    sourceEmptyPlaceholder: /*#__PURE__*/_react.default.createElement(SourceEmptyPlaceholder, {
+    sourceEmptyPlaceholder: /*#__PURE__*/_react.default.createElement(_SourceEmptyPlaceholder.SourceEmptyPlaceholder, {
       loading: state.loading,
       searchTerm: debouncedSearchTerm,
       options: state.options,
+      allItemsSelectedMessage: state.options.length === selectedItems.length && !state.nextPage ? _index.default.t('All available items are already selected') : '',
       noItemsMessage: noItemsMessage,
       dataType: state.filter.dataType,
       dataTest: `${dataTest}-empty-source`
@@ -438,7 +350,7 @@ const ItemSelector = _ref5 => {
       displayNameProp: displayNameProp,
       dataTest: `${dataTest}-left-header`
     }),
-    leftFooter: state.supportsEDI ? /*#__PURE__*/_react.default.createElement("div", {
+    leftFooter: supportsEDI ? /*#__PURE__*/_react.default.createElement("div", {
       className: `jsx-${_DimensionSelectorStyle.default.__hash}` + " " + "calculation-button"
     }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
       icon: /*#__PURE__*/_react.default.createElement(_ui.IconAdd24, null),
@@ -449,49 +361,40 @@ const ItemSelector = _ref5 => {
     height: _dimensionSelectorHelper.TRANSFER_HEIGHT,
     optionsWidth: _dimensionSelectorHelper.TRANSFER_OPTIONS_WIDTH,
     selectedWidth: _dimensionSelectorHelper.TRANSFER_SELECTED_WIDTH,
-    selectedEmptyComponent: /*#__PURE__*/_react.default.createElement(EmptySelection, null),
+    selectedEmptyComponent: /*#__PURE__*/_react.default.createElement(_SelectedEmptyPlaceholder.SelectedEmptyPlaceholder, null),
     rightHeader: /*#__PURE__*/_react.default.createElement(RightHeader, {
       infoBoxMessage: infoBoxMessage
     }),
     rightFooter: rightFooter,
     renderOption: props => {
-      var _props$access;
+      // console.log('renderOption', props)
       return /*#__PURE__*/_react.default.createElement(_TransferOption.TransferOption
       /* eslint-disable react/prop-types */, _extends({}, props, {
         active: isActive(props.value),
-        showingInfo: (currentDataItem === null || currentDataItem === void 0 ? void 0 : currentDataItem.id) === props.value,
-        icon: (0, _dimensionListItem.getIcon)(getItemType(props.value)),
+        showingInfo: (infoDataItem === null || infoDataItem === void 0 ? void 0 : infoDataItem.id) === props.value,
+        icon: (0, _dimensionListItem.getIcon)(props.type),
+        dataItemType: props.type,
         dimensionType: (0, _dimensionListItem.getDimensionType)({
-          type: getItemType(props.value),
+          type: props.type,
           expression: props.expression
         }),
         dataTest: `${dataTest}-transfer-option`,
         itemsRef: itemsRef,
-        onEditClick: getItemType(props.value) === _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM && !(((_props$access = props.access) === null || _props$access === void 0 ? void 0 : _props$access.write) === false) && state.supportsEDI ? () => setCurrentCalculation({
-          id: props.value,
-          name: props.label,
-          expression: props.expression
-        }) : undefined,
-        onInfoClick: () => setCurrentDataItem({
+        onEditClick: () => onEditClick(props),
+        onInfoClick: () => setInfoDataItem({
           id: props.value,
-          type: getItemType(props.value)
+          type: props.type
         })
         /* eslint-enable react/prop-types */
       }));
     },
     dataTest: `${dataTest}-transfer`
-  }), currentCalculation && state.supportsEDI && /*#__PURE__*/_react.default.createElement(_CalculationModal.default, {
+  }), currentCalculation && supportsEDI && /*#__PURE__*/_react.default.createElement(_CalculationModal.default, {
     calculation: currentCalculation,
     onSave: onSaveCalculation,
     onClose: () => setCurrentCalculation(),
     onDelete: onDeleteCalculation,
     displayNameProp: displayNameProp
-  }), currentDataItem && /*#__PURE__*/_react.default.createElement(_InfoPopover.InfoPopover, {
-    dataTest: `${dataTest}-info`,
-    item: currentDataItem,
-    reference: itemsRef.current.get(currentDataItem.id),
-    onClose: () => setCurrentDataItem(),
-    displayNameProp: displayNameProp
   }), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _DimensionSelectorStyle.default.__hash
   }, _DimensionSelectorStyle.default));
@@ -499,19 +402,29 @@ const ItemSelector = _ref5 => {
 ItemSelector.propTypes = {
   displayNameProp: _propTypes.default.string.isRequired,
   onSelect: _propTypes.default.func.isRequired,
+  currentCalculation: _propTypes.default.object,
   dataTest: _propTypes.default.string,
   dataTypes: _propTypes.default.array,
   infoBoxMessage: _propTypes.default.string,
+  infoDataItem: _propTypes.default.object,
+  isOptionViewMode: _propTypes.default.bool,
+  itemsRef: _propTypes.default.object,
   noItemsMessage: _propTypes.default.string,
   rightFooter: _propTypes.default.node,
   selectedItems: _propTypes.default.arrayOf(_propTypes.default.exact({
     label: _propTypes.default.string.isRequired,
     value: _propTypes.default.string.isRequired,
+    access: _propTypes.default.object,
     isActive: _propTypes.default.bool,
     type: _propTypes.default.string,
-    expression: _propTypes.default.string
+    expression: _propTypes.default.string,
+    optionSetId: _propTypes.default.string
   })),
-  onEDISave: _propTypes.default.func
+  setCurrentCalculation: _propTypes.default.func,
+  setInfoDataItem: _propTypes.default.func,
+  supportsEDI: _propTypes.default.bool,
+  onEDISave: _propTypes.default.func,
+  onEditClick: _propTypes.default.func
 };
 ItemSelector.defaultProps = {
   selectedItems: []

package/build/cjs/components/DataDimension/{MetricSelector.js → ItemSelector/MetricSelector.js}

@@ -8,9 +8,9 @@ var _style = _interopRequireDefault(require("styled-jsx/style"));
 var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
-var _index = _interopRequireDefault(require("../../locales/index.js"));
-var _dataSets = require("../../modules/dataSets.js");
-var _dataTypes = require("../../modules/dataTypes.js");
+var _index = _interopRequireDefault(require("../../../locales/index.js"));
+var _dataSets = require("../../../modules/dataSets.js");
+var _dataTypes = require("../../../modules/dataTypes.js");
 var _MetricSelectorStyle = _interopRequireDefault(require("./styles/MetricSelector.style.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const MetricSelector = _ref => {

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

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SelectedEmptyPlaceholder = void 0;
+var _style = _interopRequireDefault(require("styled-jsx/style"));
+var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
+var _react = _interopRequireDefault(require("react"));
+var _EmptyPlaceholderStyle = _interopRequireDefault(require("./styles/EmptyPlaceholder.style.js"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const SelectedEmptyPlaceholder = () => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
+  className: `jsx-${_EmptyPlaceholderStyle.default.__hash}` + " " + "empty-list"
+}, _d2I18n.default.t('No items selected')), /*#__PURE__*/_react.default.createElement(_style.default, {
+  id: _EmptyPlaceholderStyle.default.__hash
+}, _EmptyPlaceholderStyle.default));
+exports.SelectedEmptyPlaceholder = SelectedEmptyPlaceholder;

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

@@ -0,0 +1,113 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SourceEmptyPlaceholder = void 0;
+var _style = _interopRequireDefault(require("styled-jsx/style"));
+var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = _interopRequireDefault(require("react"));
+var _dataTypes = require("../../modules/dataTypes.js");
+var _EmptyPlaceholderStyle = _interopRequireDefault(require("./styles/EmptyPlaceholder.style.js"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const SourceEmptyPlaceholder = _ref => {
+  let {
+    loading,
+    searchTerm,
+    options,
+    allItemsSelectedMessage,
+    noItemsMessage,
+    dataType,
+    dataTest
+  } = _ref;
+  let message = '';
+  if (allItemsSelectedMessage && !loading && options.length && !searchTerm) {
+    message = allItemsSelectedMessage;
+  } else if (!loading && !options.length && !searchTerm) {
+    if (noItemsMessage) {
+      message = noItemsMessage;
+    } else {
+      switch (dataType) {
+        case _dataTypes.DIMENSION_TYPE_INDICATOR:
+          message = _d2I18n.default.t('No indicators found');
+          break;
+        case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT:
+          message = _d2I18n.default.t('No data elements found');
+          break;
+        case _dataTypes.DIMENSION_TYPE_DATA_SET:
+          message = _d2I18n.default.t('No data sets found');
+          break;
+        case _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM:
+          message = _d2I18n.default.t('No event data items found');
+          break;
+        case _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR:
+          message = _d2I18n.default.t('No program indicators found');
+          break;
+        case _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM:
+          message = _d2I18n.default.t('No calculations found');
+          break;
+        default:
+          message = _d2I18n.default.t('No data');
+          break;
+      }
+    }
+  } else if (!loading && !options.length && searchTerm) {
+    switch (dataType) {
+      case _dataTypes.DIMENSION_TYPE_INDICATOR:
+        message = _d2I18n.default.t('No indicators found for "{{- searchTerm}}"', {
+          searchTerm
+        });
+        break;
+      case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT:
+        message = _d2I18n.default.t('No data elements found for "{{- searchTerm}}"', {
+          searchTerm
+        });
+        break;
+      case _dataTypes.DIMENSION_TYPE_DATA_SET:
+        message = _d2I18n.default.t('No data sets found for "{{- searchTerm}}"', {
+          searchTerm
+        });
+        break;
+      case _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM:
+        message = _d2I18n.default.t('No event data items found for "{{- searchTerm}}"', {
+          searchTerm
+        });
+        break;
+      case _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR:
+        message = _d2I18n.default.t('No program indicators found for "{{- searchTerm}}"', {
+          searchTerm
+        });
+        break;
+      case _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM:
+        message = _d2I18n.default.t('No calculations found for "{{- searchTerm}}"', {
+          searchTerm
+        });
+        break;
+      default:
+        message = _d2I18n.default.t('Nothing found for "{{- searchTerm}}"', {
+          searchTerm
+        });
+        break;
+    }
+  }
+  return message && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
+    "data-test": dataTest,
+    className: `jsx-${_EmptyPlaceholderStyle.default.__hash}` + " " + "empty-list"
+  }, message), /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: _EmptyPlaceholderStyle.default.__hash
+  }, _EmptyPlaceholderStyle.default));
+};
+exports.SourceEmptyPlaceholder = SourceEmptyPlaceholder;
+SourceEmptyPlaceholder.defaultProps = {
+  options: []
+};
+SourceEmptyPlaceholder.propTypes = {
+  allItemsSelectedMessage: _propTypes.default.string,
+  dataTest: _propTypes.default.string,
+  dataType: _propTypes.default.string,
+  loading: _propTypes.default.bool,
+  noItemsMessage: _propTypes.default.string,
+  options: _propTypes.default.array,
+  searchTerm: _propTypes.default.string
+};

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

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TransferOption = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
+var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 var _ui = require("@dhis2/ui");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
+var _dataTypes = require("../../modules/dataTypes.js");
 var _TransferOptionStyle = _interopRequireDefault(require("./styles/TransferOption.style.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const TransferOption = _ref => {
@@ -22,8 +24,10 @@ const TransferOption = _ref => {
     value,
     icon,
     active,
+    dataItemType,
     dimensionType,
     dataTest,
+    optionSetId,
     itemsRef,
     showingInfo,
     onEditClick,
@@ -61,14 +65,39 @@ const TransferOption = _ref => {
     className: `jsx-${_TransferOptionStyle.default.__hash}` + " " + "icon"
   }, icon), /*#__PURE__*/_react.default.createElement("span", {
     className: `jsx-${_TransferOptionStyle.default.__hash}` + " " + "label"
-  }, label), onEditClick && /*#__PURE__*/_react.default.createElement("span", {
+  }, label), dataItemType === _dataTypes.DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM &&
+  // XXX check needed?!
+  onEditClick && /*#__PURE__*/_react.default.createElement("span", {
     onClick: e => {
       e.stopPropagation();
       onEditClick();
     },
-    "data-test": `${dataTest}-edit-button`,
+    "data-test": `${dataTest}-edit-calculation-button`,
     className: `jsx-${_TransferOptionStyle.default.__hash}` + " " + "edit"
-  }, /*#__PURE__*/_react.default.createElement(_ui.IconEdit16, null))), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(_ui.IconEdit16, null)), [_dataTypes.DIMENSION_TYPE_PROGRAM_ATTRIBUTE, _dataTypes.DIMENSION_TYPE_PROGRAM_DATA_ELEMENT].includes(dataItemType) && optionSetId && /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
+    "aria-label": "disabled",
+    content: _d2I18n.default.t('Click to choose from available options'),
+    openDelay: 500,
+    closeDelay: 0
+  }, _ref2 => {
+    let {
+      ref,
+      onMouseOver,
+      onMouseOut
+    } = _ref2;
+    return /*#__PURE__*/_react.default.createElement("span", {
+      ref: ref,
+      onMouseOver: onMouseOver,
+      onMouseOut: onMouseOut,
+      onClick: e => {
+        e.stopPropagation();
+        onMouseOut();
+        onEditClick();
+      },
+      "data-test": `${dataTest}-option-set-button`,
+      className: `jsx-${_TransferOptionStyle.default.__hash}` + " " + "option-set-button"
+    }, /*#__PURE__*/_react.default.createElement(_ui.IconList16, null));
+  })), /*#__PURE__*/_react.default.createElement("div", {
     className: `jsx-${_TransferOptionStyle.default.__hash}` + " " + ((0, _classnames.default)('group', 'nowrap', 'typeGroup') || "")
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: `jsx-${_TransferOptionStyle.default.__hash}` + " " + "type"
@@ -102,12 +131,14 @@ TransferOption.propTypes = {
   label: _propTypes.default.string.isRequired,
   value: _propTypes.default.string.isRequired,
   active: _propTypes.default.bool,
+  dataItemType: _propTypes.default.string,
   dataTest: _propTypes.default.string,
   dimensionType: _propTypes.default.string,
   disabled: _propTypes.default.bool,
   highlighted: _propTypes.default.bool,
   icon: _propTypes.default.node,
   itemsRef: _propTypes.default.object,
+  optionSetId: _propTypes.default.string,
   selected: _propTypes.default.bool,
   showingInfo: _propTypes.default.bool,
   onClick: _propTypes.default.func,

package/build/cjs/components/DataDimension/styles/EmptyPlaceholder.style.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _ui = require("@dhis2/ui");
+const _defaultExport = [`.empty-list.jsx-3468764855{text-align:center;font-size:14px;line-height:16px;margin:${_ui.spacers.dp24} 0 0;color:${_ui.colors.grey700};}`];
+_defaultExport.__hash = "3468764855";
+var _default = exports.default = _defaultExport;

package/build/cjs/components/DataDimension/styles/TransferOption.style.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _ui = require("@dhis2/ui");
-const _defaultExport = [`.wrapper.jsx-2953719875:last-child{margin-bottom:${_ui.spacers.dp4};}`, `.item.jsx-2953719875{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;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:${_ui.colors.white};font-size:14px;line-height:16px;border-bottom:1px solid ${_ui.colors.grey300};-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}`, `.item.jsx-2953719875:hover{background:${_ui.colors.grey100};}`, ".disabled.jsx-2953719875{opacity:0.3;cursor:not-allowed;}", ".inactive.jsx-2953719875{opacity:0.3;}", ".labelGroup.jsx-2953719875{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;margin:6px 4px;}", ".typeGroup.jsx-2953719875{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;margin:0;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}", ".nowrap.jsx-2953719875{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;}", ".icon.jsx-2953719875,.label.jsx-2953719875{line-height:18px;}", `.icon.jsx-2953719875{margin-right:${_ui.spacers.dp4};display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;vertical-align:text-bottom;}`, `.label.jsx-2953719875{font-size:14px;color:${_ui.colors.grey900};}`, `.type.jsx-2953719875{font-size:10px;-webkit-letter-spacing:-0.2px;-moz-letter-spacing:-0.2px;-ms-letter-spacing:-0.2px;letter-spacing:-0.2px;color:${_ui.colors.grey600};font-family:ui-monospace,'Cascadia Code','Source Code Pro',Menlo, Consolas,'DejaVu Sans Mono',monospace;font-weight:normal;}`, `.edit.jsx-2953719875,.info.jsx-2953719875{height:16px;margin-top:1px;margin-left:${_ui.spacers.dp8};cursor:pointer;color:${_ui.colors.grey600};}`, `.info.jsx-2953719875{margin:0 0 0 ${_ui.spacers.dp4};height:100%;padding:0 6px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}`, `.info.active.jsx-2953719875{background-color:${_ui.colors.grey300};color:${_ui.colors.grey900};}`, `.highlighted.jsx-2953719875{background:${_ui.theme.secondary700};}`, `.highlighted.jsx-2953719875:hover{background:${_ui.theme.secondary800};}`, `.highlighted.jsx-2953719875 .label.jsx-2953719875{color:${_ui.colors.white};}`, `.highlighted.jsx-2953719875 .type.jsx-2953719875{color:${_ui.theme.secondary050};}`, `.highlighted.jsx-2953719875 .info.jsx-2953719875{color:${_ui.theme.secondary050};}`, `.highlighted.jsx-2953719875 .icon path{fill:${_ui.colors.teal050};}`, `.highlighted.jsx-2953719875 .type.jsx-2953719875{color:${_ui.colors.teal050};}`, `.edit.jsx-2953719875:hover,.info.jsx-2953719875:hover{background-color:${_ui.colors.grey200};border-radius:0px;}`, `.highlighted.jsx-2953719875 .info.active.jsx-2953719875{background-color:${_ui.theme.secondary900};}`, `.highlighted.jsx-2953719875 .edit.jsx-2953719875:hover,.highlighted.jsx-2953719875 .info.jsx-2953719875:hover{background-color:${_ui.theme.secondary900};}`];
-_defaultExport.__hash = "2953719875";
+const _defaultExport = [`.wrapper.jsx-1354743119:last-child{margin-bottom:${_ui.spacers.dp4};}`, `.item.jsx-1354743119{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;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;background:${_ui.colors.white};font-size:14px;line-height:16px;border-bottom:1px solid ${_ui.colors.grey300};-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}`, `.item.jsx-1354743119:hover{background:${_ui.colors.grey100};}`, ".disabled.jsx-1354743119{opacity:0.3;cursor:not-allowed;}", ".inactive.jsx-1354743119{opacity:0.3;}", ".labelGroup.jsx-1354743119{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;margin:5px 4px;}", ".typeGroup.jsx-1354743119{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;margin:0;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;}", ".nowrap.jsx-1354743119{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;}", ".icon.jsx-1354743119,.label.jsx-1354743119{line-height:16px;margin:2px 0;}", `.icon.jsx-1354743119{margin-right:${_ui.spacers.dp4};display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;vertical-align:text-bottom;}`, `.label.jsx-1354743119{font-size:14px;color:${_ui.colors.grey900};}`, `.type.jsx-1354743119{font-size:10px;-webkit-letter-spacing:-0.2px;-moz-letter-spacing:-0.2px;-ms-letter-spacing:-0.2px;letter-spacing:-0.2px;color:${_ui.colors.grey600};font-family:ui-monospace,'Cascadia Code','Source Code Pro',Menlo, Consolas,'DejaVu Sans Mono',monospace;font-weight:normal;margin:9px 0 0 0;}`, `.edit.jsx-1354743119,.option-set-button.jsx-1354743119{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-left:${_ui.spacers.dp8};cursor:pointer;color:${_ui.colors.grey600};background-color:${_ui.colors.white};border:1px solid ${_ui.colors.grey300};border-radius:3px;padding:0 2px;height:20px;}`, `.option-set-button.jsx-1354743119:hover,.edit.jsx-1354743119:hover{background-color:${_ui.colors.grey050};border-color:#c7cbd0;color:${_ui.colors.grey900};}`, `.info.jsx-1354743119{margin:0 0 0 2px;padding:${_ui.spacers.dp8} ${_ui.spacers.dp4} 0 ${_ui.spacers.dp4};-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;cursor:pointer;color:${_ui.colors.grey600};}`, `.info.active.jsx-1354743119{background-color:${_ui.colors.grey300};color:${_ui.colors.grey900};}`, `.highlighted.jsx-1354743119{background:${_ui.theme.secondary700};}`, `.highlighted.jsx-1354743119:hover{background:${_ui.theme.secondary800};}`, `.highlighted.jsx-1354743119 .edit.jsx-1354743119,.highlighted.jsx-1354743119 .label.jsx-1354743119{color:${_ui.colors.white};}`, `.highlighted.jsx-1354743119 .icon.jsx-1354743119,.highlighted.jsx-1354743119 .option-set-button.jsx-1354743119,.highlighted.jsx-1354743119 .type.jsx-1354743119,.highlighted.jsx-1354743119 .info.jsx-1354743119{color:${_ui.theme.secondary050};}`, `.info.jsx-1354743119:hover{background-color:${_ui.colors.grey200};border-radius:0px;}`, `.highlighted.jsx-1354743119 .option-set-button.jsx-1354743119,.highlighted.jsx-1354743119 .edit.jsx-1354743119{background-color:transparent;border-color:${_ui.theme.secondary900};}`, `.highlighted.jsx-1354743119 .edit.jsx-1354743119:hover,.highlighted.jsx-1354743119 .info.jsx-1354743119:hover,.highlighted.jsx-1354743119 .info.active.jsx-1354743119,.highlighted.jsx-1354743119 .option-set-button.jsx-1354743119:hover{background-color:${_ui.theme.secondary900};}`];
+_defaultExport.__hash = "1354743119";
 var _default = exports.default = _defaultExport;