@dhis2/analytics 11.0.15 → 11.0.20

package/CHANGELOG.md

@@ -1,3 +1,38 @@
+## [11.0.20](https://github.com/dhis2/analytics/compare/v11.0.19...v11.0.20) (2021-09-15)
+
+
+### Bug Fixes
+
+* add convertOuLevelsToUids (DHIS2-11016) ([#908](https://github.com/dhis2/analytics/issues/908)) ([#1045](https://github.com/dhis2/analytics/issues/1045)) ([7366f26](https://github.com/dhis2/analytics/commit/7366f26d88d467f3d70afdaf82958ffa6df43006))
+
+## [11.0.19](https://github.com/dhis2/analytics/compare/v11.0.18...v11.0.19) (2021-07-14)
+
+
+### Bug Fixes
+
+* yoy x axis title and labels (DHIS2-11411) v35 ([#991](https://github.com/dhis2/analytics/issues/991)) ([5434289](https://github.com/dhis2/analytics/commit/54342894e05afa04e972584b946596231749f940))
+
+## [11.0.18](https://github.com/dhis2/analytics/compare/v11.0.17...v11.0.18) (2021-04-22)
+
+
+### Bug Fixes
+
+* paging of dynamic dimension items (DHIS2-10988) ([#903](https://github.com/dhis2/analytics/issues/903)) ([6f3295d](https://github.com/dhis2/analytics/commit/6f3295db7f76f21ba7b21cef67d185f7eb85f4b3))
+
+## [11.0.17](https://github.com/dhis2/analytics/compare/v11.0.16...v11.0.17) (2021-03-23)
+
+
+### Bug Fixes
+
+* backport DHIS2-9829 ([#874](https://github.com/dhis2/analytics/issues/874)) ([6588b1d](https://github.com/dhis2/analytics/commit/6588b1d476725b6fb91b7e5eca8b2220f6701d45))
+
+## [11.0.16](https://github.com/dhis2/analytics/compare/v11.0.15...v11.0.16) (2020-10-20)
+
+
+### Bug Fixes
+
+* dynamic min/max based on content of data values ([#635](https://github.com/dhis2/analytics/issues/635)) ([000cd18](https://github.com/dhis2/analytics/commit/000cd1896b90da5cda9fe3ff477f3d3a7a2ec799))
+
 ## [11.0.15](https://github.com/dhis2/analytics/compare/v11.0.14...v11.0.15) (2020-10-19)
 
 

package/build/cjs/lib.js

@@ -23,6 +23,7 @@ var DeselectIcon = _interopDefault(require('@material-ui/icons/Close'));
 var sortBy = _interopDefault(require('lodash/sortBy'));
 var propTypes = _interopDefault(require('@dhis2/prop-types'));
 var d2UiOrgUnitDialog = require('@dhis2/d2-ui-org-unit-dialog');
+var appRuntime = require('@dhis2/app-runtime');
 var styles$5 = require('@material-ui/core/styles');
 var LockIcon = _interopDefault(require('@material-ui/icons/Lock'));
 var Paper = _interopDefault(require('@material-ui/core/Paper'));
@@ -1353,9 +1354,11 @@ var enTranslations = {
 	"Main dimensions": "",
 	"Your dimensions": "",
 	"Dimension recommended with selected data": "",
+	"Nothing found": "",
+	Search: Search$5,
 	"No items selected": "",
 	"Selected Items": "",
-	Search: Search$5,
+	"Nothing found for {{searchTerm}}": "",
 	"Selected Data": "",
 	"Deselect All": "",
 	"Select all": "",
@@ -7844,11 +7847,48 @@ const apiFetchRecommendedIds = (d2, dxIds, ouIds) => {
   const url = "/dimensions/recommendations?".concat(dimensions, "&fields=id");
   return d2.Api.getApi().get(url).then(response => response.dimensions.map(item => item.id)).catch(onError);
 };
-const apiFetchItemsByDimension = (d2, dimensionId) => {
-  const fields = "fields=id,displayName~rename(name)";
-  const order = "order=displayName:asc";
-  const url = "dimensions/".concat(dimensionId, "/items?").concat(fields, "&").concat(order);
-  return d2.Api.getApi().get(url).then(response => response.items);
+const itemsByDimensionQuery = {
+  resource: "dimensions",
+  id: ({
+    id: _id
+  }) => "".concat(_id, "/items"),
+  params: ({
+    searchTerm,
+    page
+  }) => {
+    const filters = [];
+
+    if (searchTerm) {
+      filters.push("name:ilike:".concat(searchTerm));
+    }
+
+    return {
+      fields: 'id,displayName~rename(name)',
+      order: 'displayName:asc',
+      filter: filters,
+      paging: true,
+      page
+    };
+  }
+};
+const apiFetchItemsByDimension = async ({
+  dataEngine,
+  dimensionId,
+  searchTerm,
+  page
+}) => {
+  const itemsByDimensionData = await dataEngine.query({
+    itemsByDimensions: itemsByDimensionQuery
+  }, {
+    variables: {
+      id: dimensionId,
+      searchTerm,
+      page
+    },
+    onError
+  });
+  const response = itemsByDimensionData.itemsByDimensions;
+  return formatResponse(response.items, response.pager);
 };
 const apiFetchGroups = (d2, dataType, nameProp) => {
   // indicatorGroups does not support shortName
@@ -8107,6 +8147,11 @@ const fetchProgramIndicators = ({
   });
 };
 
+const formatResponse = (dimensionItems, pager) => ({
+  dimensionItems,
+  nextPage: pager.nextPage ? pager.page + 1 : null
+});
+
 const DataIcon = () => {
   return /*#__PURE__*/React__default.createElement("svg", {
     width: "16px",
@@ -9422,8 +9467,8 @@ RelativePeriodFilter.propTypes = {
   onSelectFilter: PropTypes.func.isRequired
 };
 
-const _defaultExport$c = [".filterContainer.jsx-1252227294{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:".concat(ui.spacers.dp12, ";margin-top:").concat(ui.spacers.dp8, ";}"), ".emptySelection.jsx-1252227294{text-align:center;font-size:14px;line-height:16px;margin:".concat(ui.spacers.dp24, " 0 0;color:").concat(ui.colors.grey700, ";}"), ".rightHeader.jsx-1252227294{font-size:14px;font-weight:400;}"];
-_defaultExport$c.__hash = "1252227294";
+const _defaultExport$c = [".filterContainer.jsx-2645272461{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:".concat(ui.spacers.dp12, ";margin-top:").concat(ui.spacers.dp8, ";}"), ".emptyList.jsx-2645272461{text-align:center;font-size:14px;line-height:16px;margin:".concat(ui.spacers.dp24, " 0 0;color:").concat(ui.colors.grey700, ";}"), ".rightHeader.jsx-2645272461{font-size:14px;font-weight:400;}", ".leftHeader.jsx-2645272461{padding:".concat(ui.spacers.dp8, " 0;}")];
+_defaultExport$c.__hash = "2645272461";
 
 const _defaultExport$d = [".wrapper.jsx-1613747048:last-child{margin-bottom:".concat(ui.spacers.dp4, ";}"), ".chip.jsx-1613747048{display:inline-block;background:".concat(ui.colors.grey200, ";font-size:14px;line-height:16px;padding:2px ").concat(ui.spacers.dp8, " 2px ").concat(ui.spacers.dp4, ";margin-top:").concat(ui.spacers.dp4, ";margin-left:").concat(ui.spacers.dp8, ";border-radius:3px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}"), ".chip.jsx-1613747048:hover{background:".concat(ui.colors.grey300, ";}"), ".selected.jsx-1613747048{background:".concat(ui.theme.secondary100, ";color:").concat(ui.theme.secondary900, ";}"), ".selected.jsx-1613747048 .icon path{fill:".concat(ui.theme.secondary700, ";}"), ".selected.jsx-1613747048:hover{background:#c9edeb;}", ".highlighted.jsx-1613747048,.highlighted.jsx-1613747048:hover{background:".concat(ui.theme.secondary800, ";color:").concat(ui.colors.white, ";}"), ".highlighted.jsx-1613747048 .icon path{fill:".concat(ui.colors.white, ";}"), ".disabled.jsx-1613747048{opacity:0.3;cursor:not-allowed;}", ".icon.jsx-1613747048,.label.jsx-1613747048{line-height:18px;}", ".icon.jsx-1613747048{margin-right:".concat(ui.spacers.dp4, ";display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;vertical-align:text-bottom;}"), ".label.jsx-1613747048{font-size:14px;}"];
 _defaultExport$d.__hash = "1613747048";
@@ -9587,7 +9632,7 @@ class PeriodTransfer extends React.Component {
     });
 
     _defineProperty(this, "renderEmptySelection", () => /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("p", {
-      className: "jsx-".concat(_defaultExport$c.__hash) + " " + "emptySelection"
+      className: "jsx-".concat(_defaultExport$c.__hash) + " " + "emptyList"
     }, i18n.t('No periods selected')), /*#__PURE__*/React__default.createElement(_JSXStyle, {
       id: _defaultExport$c.__hash
     }, _defaultExport$c)));
@@ -10055,54 +10100,173 @@ var GenericIcon = /*#__PURE__*/React__default.createElement("svg", {
   d: "M11,5 L11,11 L5,11 L5,5 L11,5 Z M10,6 L6,6 L6,10 L10,10 L10,6 Z"
 }));
 
+const useDebounce = (value, delay) => {
+  const [debouncedValue, setDebouncedValue] = React.useState(value);
+  React.useEffect(() => {
+    const handler = setTimeout(() => {
+      setDebouncedValue(value);
+    }, delay);
+    return () => {
+      clearTimeout(handler);
+    };
+  }, [value, delay]);
+  return debouncedValue;
+};
+
+const LeftHeader = ({
+  filter,
+  setFilter
+}) => /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
+  className: "jsx-".concat(_defaultExport$c.__hash) + " " + "leftHeader"
+}, /*#__PURE__*/React__default.createElement(ui.InputField, {
+  value: filter,
+  onChange: ({
+    value
+  }) => setFilter(value),
+  placeholder: i18n.t('Search')
+})), /*#__PURE__*/React__default.createElement(_JSXStyle, {
+  id: _defaultExport$c.__hash
+}, _defaultExport$c));
+
+LeftHeader.propTypes = {
+  filter: PropTypes.string,
+  setFilter: PropTypes.func
+};
+
+const EmptySelection = () => /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("p", {
+  className: "jsx-".concat(_defaultExport$c.__hash) + " " + "emptyList"
+}, i18n.t('No items selected')), /*#__PURE__*/React__default.createElement(_JSXStyle, {
+  id: _defaultExport$c.__hash
+}, _defaultExport$c));
+
+const RightHeader = () => /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("p", {
+  className: "jsx-".concat(_defaultExport$c.__hash) + " " + "rightHeader"
+}, i18n.t('Selected Items')), /*#__PURE__*/React__default.createElement(_JSXStyle, {
+  id: _defaultExport$c.__hash
+}, _defaultExport$c));
+
+const SourceEmptyPlaceholder = ({
+  loading,
+  filter,
+  options,
+  noItemsMessage
+}) => {
+  let message = '';
+
+  if (!loading && !options.length && !filter) {
+    message = noItemsMessage;
+  } else if (!loading && !options.length && filter) {
+    message = i18n.t('Nothing found for {{searchTerm}}', {
+      searchTerm: filter
+    });
+  }
+
+  return message && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("p", {
+    className: "jsx-".concat(_defaultExport$c.__hash) + " " + "emptyList"
+  }, message), /*#__PURE__*/React__default.createElement(_JSXStyle, {
+    id: _defaultExport$c.__hash
+  }, _defaultExport$c));
+};
+
+SourceEmptyPlaceholder.propTypes = {
+  filter: PropTypes.string,
+  loading: PropTypes.bool,
+  noItemsMessage: PropTypes.string,
+  options: PropTypes.array
+};
+
 const ItemSelector$1 = ({
-  allItems,
+  initialSelected,
+  noItemsMessage,
+  onFetch,
   onSelect,
-  initialSelectedItemIds,
-  leftHeader,
   rightFooter
 }) => {
-  const [selectedItemIds, setSelectedItemIds] = React.useState(initialSelectedItemIds);
+  const [state, setState] = React.useState({
+    filter: '',
+    selected: initialSelected,
+    options: [],
+    loading: true,
+    nextPage: null
+  });
 
-  const renderEmptySelection = () => /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("p", {
-    className: "jsx-".concat(_defaultExport$c.__hash) + " " + "emptySelection"
-  }, i18n.t('No items selected')), /*#__PURE__*/React__default.createElement(_JSXStyle, {
-    id: _defaultExport$c.__hash
-  }, _defaultExport$c));
+  const setFilter = filter => setState(state => _objectSpread2(_objectSpread2({}, state), {}, {
+    filter
+  }));
 
-  const renderRightHeader = () => /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("p", {
-    className: "jsx-".concat(_defaultExport$c.__hash) + " " + "rightHeader"
-  }, i18n.t('Selected Items')), /*#__PURE__*/React__default.createElement(_JSXStyle, {
-    id: _defaultExport$c.__hash
-  }, _defaultExport$c));
+  const setSelected = selected => setState(state => _objectSpread2(_objectSpread2({}, state), {}, {
+    selected
+  }));
+
+  const debouncedFilter = useDebounce(state.filter, 500);
+
+  const fetchItems = async page => {
+    var _result$dimensionItem;
 
+    setState(state => _objectSpread2(_objectSpread2({}, state), {}, {
+      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(({
+      id,
+      name,
+      disabled
+    }) => ({
+      label: name,
+      value: id,
+      disabled
+    }));
+    setState(state => _objectSpread2(_objectSpread2({}, state), {}, {
+      loading: false,
+      options: page > 1 ? [...state.options, ...newOptions] : newOptions,
+      nextPage: result.nextPage
+    }));
+  };
+
+  React.useEffect(() => {
+    fetchItems(1);
+  }, [debouncedFilter]);
+
+  const _onChange = React.useCallback(newSelected => {
+    const newSelectedWithLabel = newSelected.map(value => ({
+      value,
+      label: [...state.options, ...state.selected].find(item => item.value === value).label
+    }));
+    setSelected(newSelectedWithLabel);
+    onSelect(newSelectedWithLabel);
+  }, [state.options, state.selected]);
+
+  const onEndReached = React.useCallback(() => {
+    if (state.nextPage) {
+      fetchItems(state.nextPage);
+    }
+  }, [state.nextPage]);
   return /*#__PURE__*/React__default.createElement(ui.Transfer, {
     onChange: ({
       selected
-    }) => {
-      setSelectedItemIds(selected);
-      onSelect(selected);
-    },
-    selected: selectedItemIds,
-    leftHeader: leftHeader,
-    filterable: true,
-    filterPlaceholder: i18n.t('Search'),
+    }) => _onChange(selected),
+    selected: state.selected.map(item => item.value),
+    options: [...state.options, ...state.selected],
+    loading: state.loading,
+    loadingPicked: state.loading,
+    sourceEmptyPlaceholder: /*#__PURE__*/React__default.createElement(SourceEmptyPlaceholder, {
+      loading: state.loading,
+      filter: debouncedFilter,
+      options: state.options,
+      noItemsMessage: noItemsMessage
+    }),
+    onEndReached: onEndReached,
+    leftHeader: /*#__PURE__*/React__default.createElement(LeftHeader, {
+      filter: state.filter,
+      setFilter: setFilter
+    }),
     enableOrderChange: true,
     height: TRANSFER_HEIGHT,
     optionsWidth: TRANSFER_OPTIONS_WIDTH,
     selectedWidth: TRANSFER_SELECTED_WIDTH,
-    selectedEmptyComponent: renderEmptySelection(),
-    rightHeader: renderRightHeader(),
+    selectedEmptyComponent: /*#__PURE__*/React__default.createElement(EmptySelection, null),
+    rightHeader: /*#__PURE__*/React__default.createElement(RightHeader, null),
     rightFooter: rightFooter,
-    options: allItems.map(({
-      id,
-      name,
-      disabled
-    }) => ({
-      label: name,
-      value: id,
-      disabled
-    })),
     renderOption: props => /*#__PURE__*/React__default.createElement(TransferOption, _extends({}, props, {
       icon: GenericIcon
     }))
@@ -10110,61 +10274,54 @@ const ItemSelector$1 = ({
 };
 
 ItemSelector$1.propTypes = {
-  allItems: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.string,
-    name: PropTypes.string
-  })).isRequired,
+  onFetch: PropTypes.func.isRequired,
   onSelect: PropTypes.func.isRequired,
-  initialSelectedItemIds: PropTypes.arrayOf(PropTypes.string),
-  leftHeader: PropTypes.node,
+  initialSelected: PropTypes.arrayOf(PropTypes.exact({
+    label: PropTypes.string.isRequired,
+    value: PropTypes.string.isRequired
+  })),
+  noItemsMessage: PropTypes.string,
   rightFooter: PropTypes.node
 };
 ItemSelector$1.defaultProps = {
-  initialSelectedItemIds: []
+  initialSelected: []
 };
 
 const DynamicDimension = ({
-  context,
   dimensionId,
   onSelect,
   selectedItems,
   rightFooter
 }) => {
-  const [items, setItems] = React.useState([]);
-  React.useEffect(() => {
-    if (!items || !items.length) {
-      getItems();
-    }
-  }, []);
+  const dataEngine = appRuntime.useDataEngine();
 
-  const getItems = async () => setItems(await apiFetchItemsByDimension(context, dimensionId)); // TODO: refactor to use the data engine instead
-  // TODO: *** Once pagination is in use, check if there are items that are in selectedItems that needs to be added to the items list
-  // TODO: This needs to be refactored to use a loading spinner once Transfer supports it: https://jira.dhis2.org/browse/TECH-379
-
-
-  const onSelectItems = selectedItemIds => {
-    const formattedItems = selectedItemIds.map(id => ({
-      id,
-      name: items.find(item => item.id === id).name // TODO: Re: *** above, this won't work with pagination
-
-    })); // TODO: fetch the name from somewhere else, as not all content in selectedItems might be present in the items list
+  const fetchItems = (page, searchTerm) => apiFetchItemsByDimension({
+    dataEngine,
+    dimensionId,
+    searchTerm,
+    page
+  });
 
-    onSelect({
-      dimensionId: dimensionId,
-      items: formattedItems
-    });
-  };
+  const onSelectItems = selectedItem => onSelect({
+    dimensionId: dimensionId,
+    items: selectedItem.map(item => ({
+      id: item.value,
+      name: item.label
+    }))
+  });
 
   return /*#__PURE__*/React__default.createElement(ItemSelector$1, {
+    initialSelected: selectedItems.map(item => ({
+      value: item.id,
+      label: item.name
+    })),
+    noItemsMessage: i18n.t('Nothing found'),
+    onFetch: fetchItems,
     onSelect: onSelectItems,
-    allItems: items,
-    initialSelectedItemIds: selectedItems.map(item => item.id),
-    rightFooter: rightFooter // TODO: Pass in a func prop to fetch items, instead of fetching them on this level, to enable the loading spinner?
-
+    rightFooter: rightFooter
   });
 };
 DynamicDimension.propTypes = {
-  context: PropTypes.object.isRequired,
   dimensionId: PropTypes.string.isRequired,
   selectedItems: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.string,
@@ -14008,6 +14165,67 @@ PivotTable.propTypes = {
   onToggleContextualMenu: PropTypes.func
 };
 
+const axisGetDimension = (axis, dimensionId) => AXIS.isValid(axis) && axis.find(dimension => dimensionIs(dimension, dimensionId));
+
+const axisHasDimension = (axis, dimensionId) => Boolean(axisGetDimension(axis, dimensionId));
+
+const layoutReplaceDimension = (layout, dimensionId, items) => {
+  const axisId = DEFAULT_AXIS_IDS.find(a => axisHasDimension(layout[a], dimensionId));
+
+  if (!axisId) {
+    return Object.assign({}, layout);
+  }
+
+  const newAxisDimensions = layout[axisId].map(dimension => {
+    if (dimensionIs(dimension, dimensionId)) {
+      return Object.assign({}, dimension, {
+        items
+      });
+    }
+
+    return dimension;
+  });
+  return Object.assign({}, layout, {
+    [axisId]: newAxisDimensions
+  });
+};
+
+const layoutGetAllAxes = layout => [layout[AXIS_ID_COLUMNS], layout[AXIS_ID_ROWS], layout[AXIS_ID_FILTERS]];
+
+const layoutGetAllDimensions = layout => layoutGetAllAxes(layout).reduce((allDimensions, axis) => {
+  allDimensions.push(...axis);
+  return allDimensions;
+}, []);
+
+const layoutGetDimension = (layout, dimensionId) => layoutGetAllDimensions(layout).find(dimension => dimensionIs(dimension, dimensionId));
+
+const isOuLevelIntId = id => ouIdHelper.hasLevelPrefix(id) ? Number.isInteger(parseInt(ouIdHelper.removePrefix(id), 10)) : false;
+
+const replaceNumericOuLevelWithUid = ouLevels => item => {
+  if (!isOuLevelIntId(item.id)) {
+    return item;
+  }
+
+  const ouIntId = parseInt(ouIdHelper.removePrefix(item.id), 10);
+  const ouUid = ouLevels.find(l => parseInt(l.level, 10) === ouIntId).id;
+  return Object.assign({}, item, {
+    id: ouIdHelper.addLevelPrefix(ouUid)
+  });
+};
+
+const convertOuLevelsToUids = (ouLevels, layout) => {
+  const ouDimension = layoutGetDimension(layout, DIMENSION_ID_ORGUNIT);
+  const hasNumericOuLevels = ouDimension && dimensionGetItems(ouDimension).some(item => isOuLevelIntId(item.id));
+
+  if (hasNumericOuLevels) {
+    const replaceNumericOuLevel = replaceNumericOuLevelWithUid(ouLevels);
+    const updatedOuItems = dimensionGetItems(ouDimension).map(replaceNumericOuLevel);
+    return layoutReplaceDimension(layout, DIMENSION_ID_ORGUNIT, updatedOuItems);
+  }
+
+  return layout;
+};
+
 const hasRelativeItems = (dimension, itemIds = []) => dimension === DIMENSION_ID_ASSIGNED_CATEGORIES || dimension === DIMENSION_ID_ORGUNIT && Array.isArray(itemIds) && itemIds.some(id => ouIdHelper.hasLevelPrefix(id) || ouIdHelper.hasGroupPrefix(id) || ['USER_ORGUNIT', 'USER_ORGUNIT_CHILDREN', 'USER_ORGUNIT_GRAND_CHILDREN'].includes(id)) || dimension === DIMENSION_ID_PERIOD && Array.isArray(itemIds) && itemIds.some(id => getRelativePeriodIds().includes(id));
 
 const LAYOUT = {
@@ -14027,13 +14245,6 @@ const layoutFilterDimensions = (layout, dimensionIds) => {
   return filteredLayout;
 };
 
-const layoutGetAllAxes = layout => [layout[AXIS_ID_COLUMNS], layout[AXIS_ID_ROWS], layout[AXIS_ID_FILTERS]];
-
-const layoutGetAllDimensions = layout => layoutGetAllAxes(layout).reduce((allDimensions, axis) => {
-  allDimensions.push(...axis);
-  return allDimensions;
-}, []);
-
 const axisGetAllItems = axis => axis.reduce((allItems, dimension) => {
   allItems.push(...dimensionGetItems(dimension));
   return allItems;
@@ -14070,35 +14281,8 @@ const layoutGetAxisIdDimensionIdsObject = layout => DEFAULT_AXIS_IDS.reduce((obj
   return obj;
 }, {});
 
-const layoutGetDimension = (layout, dimensionId) => layoutGetAllDimensions(layout).find(dimension => dimensionIs(dimension, dimensionId));
-
 const layoutGetDimensionItems = (layout, dimensionId) => dimensionGetItems(layoutGetDimension(layout, dimensionId));
 
-const axisGetDimension = (axis, dimensionId) => AXIS.isValid(axis) && axis.find(dimension => dimensionIs(dimension, dimensionId));
-
-const axisHasDimension = (axis, dimensionId) => Boolean(axisGetDimension(axis, dimensionId));
-
-const layoutReplaceDimension = (layout, dimensionId, items) => {
-  const axisId = DEFAULT_AXIS_IDS.find(a => axisHasDimension(layout[a], dimensionId));
-
-  if (!axisId) {
-    return Object.assign({}, layout);
-  }
-
-  const newAxisDimensions = layout[axisId].map(dimension => {
-    if (dimensionIs(dimension, dimensionId)) {
-      return Object.assign({}, dimension, {
-        items
-      });
-    }
-
-    return dimension;
-  });
-  return Object.assign({}, layout, {
-    [axisId]: newAxisDimensions
-  });
-};
-
 const dimensionGetItemIds = dimension => dimensionGetItems(dimension).map(item => itemGetId(item));
 
 const layoutGetDimensionIdItemIdsObject = layout => layoutGetAllDimensions(layout).reduce((obj, dimension) => {
@@ -14957,9 +15141,19 @@ function getYearOnYear$1 (store, layout, extraOptions) {
     }, []);
   }
 
-  return {
-    categories
-  };
+  const labelFontStyle = layout.fontStyle[FONT_STYLE_CATEGORY_AXIS_LABELS];
+  return objectClean({
+    categories,
+    title: getAxisTitle(layout.domainAxisLabel, layout.fontStyle[FONT_STYLE_HORIZONTAL_AXIS_TITLE], FONT_STYLE_HORIZONTAL_AXIS_TITLE, layout.type),
+    labels: labelFontStyle ? {
+      style: {
+        color: labelFontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
+        fontSize: "".concat(labelFontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px"),
+        fontWeight: labelFontStyle[FONT_STYLE_OPTION_BOLD] ? FONT_STYLE_OPTION_BOLD : 'normal',
+        fontStyle: labelFontStyle[FONT_STYLE_OPTION_ITALIC] ? FONT_STYLE_OPTION_ITALIC : 'normal'
+      }
+    } : {}
+  });
 }
 
 function getTwoCategory$1 (store, layout) {
@@ -15184,13 +15378,9 @@ function getPlotLineLabelStyle(fontStyle) {
   };
 }
 
-function getMinValue(layout) {
-  return isNumeric(layout.rangeAxisMinValue) ? layout.rangeAxisMinValue : DEFAULT_MIN_VALUE;
-}
+const getMinValue = (rangeAxisMinValue, dataValues) => isNumeric(rangeAxisMinValue) ? rangeAxisMinValue : (dataValues === null || dataValues === void 0 ? void 0 : dataValues.some(value => value < DEFAULT_MIN_VALUE)) ? undefined : DEFAULT_MIN_VALUE;
 
-function getMaxValue(layout) {
-  return isNumeric(layout.rangeAxisMaxValue) ? layout.rangeAxisMaxValue : undefined;
-}
+const getMaxValue = (rangeAxisMaxValue, dataValues) => isNumeric(rangeAxisMaxValue) ? rangeAxisMaxValue : (dataValues === null || dataValues === void 0 ? void 0 : dataValues.every(value => value < DEFAULT_MIN_VALUE)) ? DEFAULT_MIN_VALUE : undefined;
 
 function getSteps(layout) {
   return isNumeric(layout.rangeAxisSteps) ? layout.rangeAxisSteps : undefined;
@@ -15298,14 +15488,15 @@ function getDefault$3(layout, series, extraOptions) {
 
   const axes = [];
   const filteredSeries = (_layout$series = layout.series) === null || _layout$series === void 0 ? void 0 : _layout$series.filter(layoutSeriesItem => series.some(seriesItem => seriesItem.id === layoutSeriesItem.dimensionItem));
+  const dataValues = series === null || series === void 0 ? void 0 : series.map(item => item.data).flat();
 
   if (isDualAxisType(layout.type) && hasCustomAxes(filteredSeries) && !axisHasRelativeItems(layout.columns)) {
     const axisIdsMap = getAxisIdsMap(layout.series, series);
     axes.push(...getMultipleAxes(extraOptions.multiAxisTheme, [...new Set(Object.keys(axisIdsMap))].sort((a, b) => a - b)));
   } else {
     axes.push(objectClean({
-      min: getMinValue(layout),
-      max: getMaxValue(layout),
+      min: getMinValue(layout.rangeAxisMinValue, dataValues),
+      max: getMaxValue(layout.rangeAxisMaxValue, dataValues),
       tickAmount: getSteps(layout),
       title: getAxisTitle(layout.rangeAxisLabel, layout.fontStyle[FONT_STYLE_VERTICAL_AXIS_TITLE], FONT_STYLE_VERTICAL_AXIS_TITLE, layout.type),
       plotLines: arrayClean([getTargetLine(layout), getBaseLine(layout)]),
@@ -16130,7 +16321,8 @@ const DEFAULT_TRENDLINE = {
     enabled: false,
     symbol: 'circle',
     radius: 2
-  }
+  },
+  zIndex: 1
 };
 const isRegressionIneligible = type => arrayContains([VIS_TYPE_GAUGE, VIS_TYPE_PIE], type);
 function addTrendLines (layout, series, isStacked) {
@@ -17165,6 +17357,7 @@ exports.axisHasPeriodDimension = axisHasPeriodDimension;
 exports.axisIsEmpty = axisIsEmpty;
 exports.canDimensionBeAddedToAxis = canDimensionBeAddedToAxisByVisType;
 exports.colorSets = colorSets;
+exports.convertOuLevelsToUids = convertOuLevelsToUids;
 exports.createVisualization = createVisualization;
 exports.defaultFontStyle = defaultFontStyle;
 exports.defaultVisType = defaultVisType;