@dhis2/analytics 26.12.2 → 26.13.0

package/build/es/components/DimensionsPanel/List/styles/DimensionItem.style.js

@@ -1,4 +1,4 @@
 import { colors } from '@dhis2/ui';
-const _defaultExport = [`.item.jsx-1684920521{color:${colors.grey900};background-color:transparent;fill:${colors.grey800};display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;outline:none;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:0 0 0 4px;margin:0;border-radius:2px;cursor:pointer;min-height:22px;border:1px solid transparent;}`, `.item.jsx-1684920521:not(.deactivated):not(.dragging):hover{background-color:${colors.grey100};border-color:${colors.grey400};}`, ".label.jsx-1684920521{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;}", ".labelWrapper.jsx-1684920521{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;}", ".labelText.jsx-1684920521{font-size:13px;line-height:15px;margin-top:1px;}", ".iconWrapper.jsx-1684920521{width:16px;height:16px;margin:2px 4px 0 0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto;-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start;}", ".item.deactivated.jsx-1684920521{opacity:0.5;cursor:not-allowed;}", `.item.selected.jsx-1684920521{background-color:${colors.teal100};border:1px solid ${colors.teal200};color:${colors.teal900};fill:${colors.teal800};font-weight:400;}`, ".item.selected.jsx-1684920521:not(.deactivated):hover{background:#cdeae8;border-color:#93c4bf;box-shadow:0 1px 2px 0 rgb(0 0 0 / 0.05);}", ".optionsWrapper.jsx-1684920521{width:20px;height:20px;}", `.lockWrapper.jsx-1684920521 svg.jsx-1684920521 path.jsx-1684920521{fill:${colors.grey800};}`, `.lockWrapper.jsx-1684920521{background:${colors.grey300};height:20px;padding:0 2px 0 3px;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;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}`, ".item.selected.jsx-1684920521 .lockWrapper.jsx-1684920521{background:#cbe7e5;}", `.item.selected.jsx-1684920521 .lockWrapper.jsx-1684920521 svg.jsx-1684920521 path.jsx-1684920521{fill:${colors.teal900};}`];
-_defaultExport.__hash = "1684920521";
+const _defaultExport = [`.item.jsx-3350116288{color:${colors.grey900};background-color:transparent;fill:${colors.grey800};display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:4px;outline:none;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:0 0 0 4px;margin:0;border-radius:2px;cursor:pointer;min-height:22px;border:1px solid transparent;}`, `.item.jsx-3350116288:not(.deactivated):not(.dragging):hover{background-color:${colors.grey100};border-color:${colors.grey400};}`, ".label.jsx-3350116288{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;}", ".labelWrapper.jsx-3350116288{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;padding:2px 0;}", ".labelText.jsx-3350116288{font-size:13px;line-height:15px;margin-top:1px;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center;}", ".iconWrapper.jsx-3350116288{width:16px;height:16px;margin:2px 4px 0 0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto;-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start;}", ".item.deactivated.jsx-3350116288{opacity:0.5;cursor:not-allowed;}", `.item.selected.jsx-3350116288{background-color:${colors.teal100};border:1px solid ${colors.teal200};color:${colors.teal900};fill:${colors.teal800};font-weight:400;}`, ".item.selected.jsx-3350116288:not(.deactivated):hover{background:#cdeae8;border-color:#93c4bf;box-shadow:0 1px 2px 0 rgb(0 0 0 / 0.05);}", ".optionsWrapper.jsx-3350116288{width:20px;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;}", `.lockWrapper.jsx-3350116288 svg.jsx-3350116288 path.jsx-3350116288{fill:${colors.grey800};}`, `.lockWrapper.jsx-3350116288{background:${colors.grey300};-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;padding:0 2px 0 3px;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;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}`, ".item.selected.jsx-3350116288 .lockWrapper.jsx-3350116288{background:#cbe7e5;}", `.item.selected.jsx-3350116288 .lockWrapper.jsx-3350116288 svg.jsx-3350116288 path.jsx-3350116288{fill:${colors.teal900};}`];
+_defaultExport.__hash = "3350116288";
 export default _defaultExport;

package/build/es/components/DynamicDimension/DynamicDimension.js

@@ -70,7 +70,7 @@ export const DynamicDimension = _ref => {
     checked: !allIsSelected,
     dataTest: 'dynamic-dimension-selection-type-manual'
   }))), !allIsSelected && /*#__PURE__*/React.createElement(ItemSelector, {
-    initialSelected: selectedItems.map(item => ({
+    selectedItems: selectedItems.map(item => ({
       value: item.id,
       label: item.name
     })),

package/build/es/components/DynamicDimension/ItemSelector.js

@@ -1,118 +1,50 @@
 import _JSXStyle from "styled-jsx/style";
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-import { Transfer, InputField } from '@dhis2/ui';
+import { Transfer } from '@dhis2/ui';
 import PropTypes from 'prop-types';
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useState } from 'react';
 import GenericIcon from '../../assets/DimensionItemIcons/GenericIcon.js';
 import i18n from '../../locales/index.js';
 import { TRANSFER_HEIGHT, TRANSFER_OPTIONS_WIDTH, TRANSFER_SELECTED_WIDTH } from '../../modules/dimensionSelectorHelper.js';
-import { useDebounce } from '../../modules/utils.js';
+import { useDebounce, useDidUpdateEffect } from '../../modules/utils.js';
+import { SelectedEmptyPlaceholder } from '../DataDimension/SelectedEmptyPlaceholder.js';
+import { SourceEmptyPlaceholder } from '../DataDimension/SourceEmptyPlaceholder.js';
 import styles from '../styles/DimensionSelector.style.js';
 import { TransferOption } from '../TransferOption.js';
-const LeftHeader = _ref => {
+const ItemSelector = _ref => {
   let {
-    filter,
-    setFilter
-  } = _ref;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: `jsx-${styles.__hash}` + " " + "leftHeader"
-  }, /*#__PURE__*/React.createElement(InputField, {
-    value: filter,
-    onChange: _ref2 => {
-      let {
-        value
-      } = _ref2;
-      return setFilter(value);
-    },
-    placeholder: i18n.t('Search'),
-    initialFocus: true,
-    type: 'search'
-  })), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: styles.__hash
-  }, styles));
-};
-LeftHeader.propTypes = {
-  filter: PropTypes.string,
-  setFilter: PropTypes.func
-};
-const EmptySelection = () => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
-  className: `jsx-${styles.__hash}` + " " + "emptyList"
-}, i18n.t('No items selected')), /*#__PURE__*/React.createElement(_JSXStyle, {
-  id: styles.__hash
-}, styles));
-const RightHeader = () => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
-  className: `jsx-${styles.__hash}` + " " + "rightHeader"
-}, i18n.t('Selected Items')), /*#__PURE__*/React.createElement(_JSXStyle, {
-  id: styles.__hash
-}, styles));
-const SourceEmptyPlaceholder = _ref3 => {
-  let {
-    loading,
-    filter,
-    options,
-    noItemsMessage
-  } = _ref3;
-  let message = '';
-  if (!loading && !options.length && !filter) {
-    message = noItemsMessage || i18n.t('No data');
-  } else if (!loading && !options.length && filter) {
-    message = i18n.t('Nothing found for {{- searchTerm}}', {
-      searchTerm: filter
-    });
-  }
-  return message && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
-    className: `jsx-${styles.__hash}` + " " + "emptyList"
-  }, message), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: styles.__hash
-  }, styles));
-};
-SourceEmptyPlaceholder.propTypes = {
-  filter: PropTypes.string,
-  loading: PropTypes.bool,
-  noItemsMessage: PropTypes.string,
-  options: PropTypes.array
-};
-const ItemSelector = _ref4 => {
-  let {
-    initialSelected,
+    selectedItems,
     noItemsMessage,
     onFetch,
     onSelect,
     rightFooter,
     dataTest
-  } = _ref4;
+  } = _ref;
   const [state, setState] = useState({
-    filter: '',
-    selected: initialSelected,
-    // FIXME: keeping selected in state is redundant, use the initialSelected prop directly instead
-    // The useCallback from onChange should be removed in favor of a regular fn as well
+    searchTerm: '',
     options: [],
     loading: true,
-    nextPage: null // FIXME: Selecting all 50 items from a page prevents the loading of more items.
-    // Implement the solution found in the DataDimension/ItemSelector.js
+    nextPage: 1
   });
-  const setFilter = filter => setState(state => ({
-    ...state,
-    filter
-  }));
-  const setSelected = selected => setState(state => ({
+  const debouncedSearchTerm = useDebounce(state.searchTerm, 500);
+  const setSearchTerm = searchTerm => setState(state => ({
     ...state,
-    selected
+    searchTerm
   }));
-  const debouncedFilter = useDebounce(state.filter, 200);
   const fetchItems = async page => {
     var _result$dimensionItem;
     setState(state => ({
       ...state,
+      nextPage: page === 1 ? 1 : state.nextPage,
       loading: true
     }));
-    const result = await onFetch(page, state.filter);
-    const newOptions = (_result$dimensionItem = result.dimensionItems) === null || _result$dimensionItem === void 0 ? void 0 : _result$dimensionItem.map(_ref5 => {
+    const result = await onFetch(page, state.searchTerm);
+    const newOptions = (_result$dimensionItem = result.dimensionItems) === null || _result$dimensionItem === void 0 ? void 0 : _result$dimensionItem.map(_ref2 => {
       let {
         id,
         name,
         disabled
-      } = _ref5;
+      } = _ref2;
       return {
         label: name,
         value: id,
@@ -125,71 +57,92 @@ const ItemSelector = _ref4 => {
       options: page > 1 ? [...state.options, ...newOptions] : newOptions,
       nextPage: result.nextPage
     }));
+    /*  The following handles a very specific edge-case where the user can select all items from a
+        page and then reopen the modal. Usually Transfer triggers the onEndReached when the end of
+        the page is reached (scrolling down) or if too few items are on the left side (e.g. selecting
+        49 items from page 1, leaving only 1 item on the left side). However, due to the way Transfer
+        works, if 0 items are available, more items are fetched, but all items are already selected
+        (leaving 0 items on the left side still), the onReachedEnd won't trigger. Hence the code below:
+        IF there is a next page AND some options were just fetched AND you have the same or more
+        selected items than fetched items AND all fetched items are already selected -> fetch more!
+    */
+    if (result.nextPage && newOptions.length && selectedItems.length >= newOptions.length && newOptions.every(newOption => selectedItems.find(selectedItem => selectedItem.value === newOption.value))) {
+      fetchItems(result.nextPage);
+    }
   };
-  useEffect(() => {
+  useDidUpdateEffect(() => {
     fetchItems(1);
-  }, [debouncedFilter]);
-  const onChange = useCallback(newSelected => {
-    const newSelectedWithLabel = newSelected.map(value => ({
-      value,
-      label: [...state.options, ...state.selected].find(item => item.value === value).label
+  }, [debouncedSearchTerm]);
+  const onChange = selectedIds => {
+    const newSelectedWithLabel = selectedIds.map(id => ({
+      value: id,
+      label: [...state.options, ...selectedItems].find(item => item.value === id).label
     }));
-    setSelected(newSelectedWithLabel);
     onSelect(newSelectedWithLabel);
-  }, [state.options, state.selected]);
-  const onEndReached = useCallback(() => {
+  };
+  const onEndReached = () => {
     if (state.nextPage) {
       fetchItems(state.nextPage);
     }
-  }, [state.nextPage]);
-  return /*#__PURE__*/React.createElement(Transfer, {
-    onChange: _ref6 => {
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Transfer, {
+    onChange: _ref3 => {
       let {
         selected
-      } = _ref6;
+      } = _ref3;
       return onChange(selected);
     },
-    selected: state.selected.map(item => item.value),
-    options: [...state.options, ...state.selected],
+    selected: selectedItems.map(item => item.value),
+    options: [...state.options, ...selectedItems],
     loading: state.loading,
     loadingPicked: state.loading,
     sourceEmptyPlaceholder: /*#__PURE__*/React.createElement(SourceEmptyPlaceholder, {
       loading: state.loading,
-      filter: debouncedFilter,
+      searchTerm: debouncedSearchTerm,
       options: state.options,
       noItemsMessage: noItemsMessage
     }),
     onEndReached: onEndReached,
-    leftHeader: /*#__PURE__*/React.createElement(LeftHeader, {
-      filter: state.filter,
-      setFilter: setFilter
-    }),
+    filterable: true,
+    filterPlaceholder: i18n.t('Search'),
+    filterablePicked: false,
+    searchTerm: state.searchTerm,
+    onFilterChange: _ref4 => {
+      let {
+        value
+      } = _ref4;
+      return setSearchTerm(value);
+    },
     enableOrderChange: true,
     height: TRANSFER_HEIGHT,
     optionsWidth: TRANSFER_OPTIONS_WIDTH,
     selectedWidth: TRANSFER_SELECTED_WIDTH,
-    selectedEmptyComponent: /*#__PURE__*/React.createElement(EmptySelection, null),
-    rightHeader: /*#__PURE__*/React.createElement(RightHeader, null),
+    selectedEmptyComponent: /*#__PURE__*/React.createElement(SelectedEmptyPlaceholder, null),
+    rightHeader: /*#__PURE__*/React.createElement("p", {
+      className: `jsx-${styles.__hash}` + " " + "rightHeader"
+    }, i18n.t('Selected Items')),
     rightFooter: rightFooter,
     renderOption: props => /*#__PURE__*/React.createElement(TransferOption, _extends({}, props, {
       icon: GenericIcon,
       dataTest: `${dataTest}-transfer-option`
     })),
     dataTest: `${dataTest}-transfer`
-  });
+  }), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: styles.__hash
+  }, styles));
 };
 ItemSelector.propTypes = {
   onFetch: PropTypes.func.isRequired,
   onSelect: PropTypes.func.isRequired,
   dataTest: PropTypes.string,
-  initialSelected: PropTypes.arrayOf(PropTypes.exact({
+  noItemsMessage: PropTypes.string,
+  rightFooter: PropTypes.node,
+  selectedItems: PropTypes.arrayOf(PropTypes.exact({
     label: PropTypes.string.isRequired,
     value: PropTypes.string.isRequired
-  })),
-  noItemsMessage: PropTypes.string,
-  rightFooter: PropTypes.node
+  }))
 };
 ItemSelector.defaultProps = {
-  initialSelected: []
+  selectedItems: []
 };
 export default ItemSelector;

package/build/es/components/styles/DimensionSelector.style.js

@@ -1,4 +1,4 @@
 import { spacers, colors } from '@dhis2/ui';
-const _defaultExport = [".transfer-container.jsx-1438110436{min-width:800px;}", `.filterContainer.jsx-1438110436{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:${spacers.dp12};margin-top:${spacers.dp8};}`, `.emptyList.jsx-1438110436{text-align:center;font-size:14px;line-height:16px;margin:${spacers.dp24} 0 0;color:${colors.grey700};}`, ".rightHeader.jsx-1438110436{font-size:14px;font-weight:400;}", `.leftHeader.jsx-1438110436{padding:${spacers.dp12} ${spacers.dp4};}`, `.info-container.jsx-1438110436{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:${spacers.dp8};padding:${spacers.dp8};background-color:${colors.grey200};border-radius:3px;}`, `.info-text.jsx-1438110436{padding-left:${spacers.dp8};color:${colors.grey900};font-size:12px;line-height:16px;}`, `.calculation-button.jsx-1438110436{margin:${spacers.dp8} 0;}`];
-_defaultExport.__hash = "1438110436";
+const _defaultExport = [".transfer-container.jsx-1883578365{min-width:800px;}", ".transfer-container.hidden.jsx-1883578365{position:absolute;visibility:hidden;pointer-events:none;}", `.filterContainer.jsx-1883578365{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:${spacers.dp12};margin-top:${spacers.dp8};}`, `.emptyList.jsx-1883578365{text-align:center;font-size:14px;line-height:16px;margin:${spacers.dp24} 0 0;color:${colors.grey700};}`, ".rightHeader.jsx-1883578365{font-size:14px;font-weight:500;}", `.leftHeader.jsx-1883578365{padding:${spacers.dp8} 0;}`, `.info-container.jsx-1883578365{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:${spacers.dp8};padding:${spacers.dp8};background-color:${colors.grey200};border-radius:3px;}`, `.info-text.jsx-1883578365{padding-left:${spacers.dp8};color:${colors.grey900};font-size:12px;line-height:16px;}`, `.calculation-button.jsx-1883578365{margin:${spacers.dp8} 0;}`];
+_defaultExport.__hash = "1883578365";
 export default _defaultExport;

package/build/es/locales/en/translations.json

@@ -45,11 +45,6 @@
     "No data elements found": "No data elements found",
     "Drag items here, or double click in the list, to start building a calculation formula": "Drag items here, or double click in the list, to start building a calculation formula",
     "Math operators": "Math operators",
-    "Data Type": "Data Type",
-    "Only {{dataType}} can be used in {{visType}}": "Only {{dataType}} can be used in {{visType}}",
-    "All types": "All types",
-    "Disaggregation": "Disaggregation",
-    "No data": "No data",
     "Expression description": "Expression description",
     "Error loading value": "Error loading value",
     "None": "None",
@@ -98,9 +93,24 @@
     "{{ offsetPeriodType }} × {{ offsetPeriods }}": "{{ offsetPeriodType }} × {{ offsetPeriods }}",
     "Expression": "Expression",
     "Filter": "Filter",
+    "All available options are already selected": "All available options are already selected",
+    "No available options for this item": "No available options for this item",
+    "Search by option name": "Search by option name",
+    "Back to all items": "Back to all items",
+    "Options": "Options",
+    "Selected items": "Selected items",
+    "Data Type": "Data Type",
+    "Only {{dataType}} can be used in {{visType}}": "Only {{dataType}} can be used in {{visType}}",
+    "All types": "All types",
+    "Disaggregation": "Disaggregation",
+    "No data": "No data",
     "Search by data item name": "Search by data item name",
-    "No items selected": "No items selected",
     "Selected Items": "Selected Items",
+    "All available items are already selected": "All available items are already selected",
+    "Calculation": "Calculation",
+    "Metric type": "Metric type",
+    "All metrics": "All metrics",
+    "No items selected": "No items selected",
     "No indicators found": "No indicators found",
     "No data sets found": "No data sets found",
     "No event data items found": "No event data items found",
@@ -112,9 +122,7 @@
     "No program indicators found for \"{{- searchTerm}}\"": "No program indicators found for \"{{- searchTerm}}\"",
     "No calculations found for \"{{- searchTerm}}\"": "No calculations found for \"{{- searchTerm}}\"",
     "Nothing found for \"{{- searchTerm}}\"": "Nothing found for \"{{- searchTerm}}\"",
-    "Calculation": "Calculation",
-    "Metric type": "Metric type",
-    "All metrics": "All metrics",
+    "Click to choose from available options": "Click to choose from available options",
     "Move to {{axisName}}": "Move to {{axisName}}",
     "Add to {{axisName}}": "Add to {{axisName}}",
     "Not available for {{visualizationType}}": "Not available for {{visualizationType}}",
@@ -131,7 +139,6 @@
     "Manually select items...": "Manually select items...",
     "Nothing found in {{- dimensionTitle}}": "Nothing found in {{- dimensionTitle}}",
     "Search": "Search",
-    "Nothing found for {{- searchTerm}}": "Nothing found for {{- searchTerm}}",
     "Delete {{fileType}}": "Delete {{fileType}}",
     "This {{fileType}} and related interpretations will be deleted. Continue?": "This {{fileType}} and related interpretations will be deleted. Continue?",
     "Delete": "Delete",
@@ -219,7 +226,6 @@
     "No line lists found. Click New line list to get started.": "No line lists found. Click New line list to get started.",
     "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "No line lists found. Try adjusting your search or filter options to find what you're looking for.",
     "New line list": "New line list",
-    "Options": "Options",
     "Hide": "Hide",
     "{{count}} org units": "{{count}} org unit",
     "{{count}} org units_plural": "{{count}} org units",
@@ -363,6 +369,7 @@
     "Program indicators": "Program indicators",
     "Program indicator": "Program indicator",
     "Calculations": "Calculations",
+    "Option": "Option",
     "Number": "Number",
     "Formula is empty. Add items to the formula from the lists on the left.": "Formula is empty. Add items to the formula from the lists on the left.",
     "Consecutive math operators": "Consecutive math operators",

package/build/es/modules/dataTypes.js

@@ -6,7 +6,9 @@ export const DIMENSION_TYPE_DATA_SET = 'DATA_SET';
 export const DIMENSION_TYPE_EVENT_DATA_ITEM = 'EVENT_DATA_ITEM';
 export const DIMENSION_TYPE_PROGRAM_INDICATOR = 'PROGRAM_INDICATOR';
 export const DIMENSION_TYPE_PROGRAM_DATA_ELEMENT = 'PROGRAM_DATA_ELEMENT';
+export const DIMENSION_TYPE_PROGRAM_DATA_ELEMENT_OPTION = 'PROGRAM_DATA_ELEMENT_OPTION';
 export const DIMENSION_TYPE_PROGRAM_ATTRIBUTE = 'PROGRAM_ATTRIBUTE';
+export const DIMENSION_TYPE_PROGRAM_ATTRIBUTE_OPTION = 'PROGRAM_ATTRIBUTE_OPTION';
 export const DIMENSION_TYPE_DATA_ELEMENT_OPERAND = 'DATA_ELEMENT_OPERAND';
 export const DIMENSION_TYPE_CATEGORY = 'CATEGORY';
 export const DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET = 'CATEGORY_OPTION_GROUP_SET';

package/build/es/modules/dimensionListItem.js

@@ -1,10 +1,11 @@
+import i18n from '@dhis2/d2-i18n';
 import { IconDimensionDataSet16, IconDimensionIndicator16, IconDimensionEventDataItem16, IconDimensionProgramIndicator16 } from '@dhis2/ui';
 import React from 'react';
 import DataElementIcon from '../assets/DimensionItemIcons/DataElementIcon.js';
 import GenericIcon from '../assets/DimensionItemIcons/GenericIcon.js';
 import CalculationIcon from './../assets/DimensionItemIcons/CalculationIcon.js';
 import { REPORTING_RATE } from './dataSets.js';
-import { DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_ELEMENT_OPERAND, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM, DIMENSION_TYPE_PROGRAM_ATTRIBUTE, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, dataTypeMap as dataTypes, DIMENSION_TYPE_INDICATOR, DIMENSION_TYPE_PROGRAM_INDICATOR } from './dataTypes.js';
+import { DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_ELEMENT_OPERAND, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM, DIMENSION_TYPE_PROGRAM_ATTRIBUTE, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, dataTypeMap as dataTypes, DIMENSION_TYPE_INDICATOR, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_PROGRAM_ATTRIBUTE_OPTION, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT_OPTION } from './dataTypes.js';
 export const getDimensionType = _ref => {
   var _dataTypes$type;
   let {
@@ -22,6 +23,9 @@ export const getDimensionType = _ref => {
     case DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
     case DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
       return dataTypes[DIMENSION_TYPE_EVENT_DATA_ITEM].getItemName();
+    case DIMENSION_TYPE_PROGRAM_ATTRIBUTE_OPTION:
+    case DIMENSION_TYPE_PROGRAM_DATA_ELEMENT_OPTION:
+      return i18n.t('Option');
     default:
       return (_dataTypes$type = dataTypes[type]) === null || _dataTypes$type === void 0 ? void 0 : _dataTypes$type.getItemName();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.12.2",
+    "version": "26.13.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -30,7 +30,7 @@
         "validate-push": "yarn test"
     },
     "devDependencies": {
-        "@dhis2/app-runtime": "^3.13.2",
+        "@dhis2/app-runtime": "^3.14.1",
         "@dhis2/cli-app-scripts": "^11.8.0",
         "@dhis2/cli-style": "^10.7.4",
         "@dhis2/d2-i18n": "^1.1.0",