@dhis2/analytics 28.0.3 → 28.0.5

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

@@ -6,26 +6,25 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM, DIMENSION_TYPE_PROGRAM_ATTRIBUTE, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT } from '../../modules/dataTypes.js';
 import styles from './styles/TransferOption.style.js';
-export const TransferOption = _ref => {
-  let {
-    disabled,
-    label,
-    highlighted,
-    selected,
-    onClick,
-    onDoubleClick,
-    value,
-    icon,
-    active,
-    dataItemType,
-    dimensionType,
-    dataTest,
-    optionSetId,
-    itemsRef,
-    showingInfo,
-    onEditClick,
-    onInfoClick
-  } = _ref;
+export const TransferOption = ({
+  disabled,
+  label,
+  highlighted,
+  selected,
+  onClick,
+  onDoubleClick,
+  value,
+  icon,
+  active,
+  dataItemType,
+  dimensionType,
+  dataTest,
+  optionSetId,
+  itemsRef,
+  showingInfo,
+  onEditClick,
+  onInfoClick
+}) => {
   const renderContent = () => /*#__PURE__*/React.createElement("div", {
     "data-test": `${dataTest}-content`,
     onClick: event => {
@@ -72,25 +71,22 @@ export const TransferOption = _ref => {
     content: i18n.t('Click to choose from available options'),
     openDelay: 500,
     closeDelay: 0
-  }, _ref2 => {
-    let {
-      ref,
-      onMouseOver,
-      onMouseOut
-    } = _ref2;
-    return /*#__PURE__*/React.createElement("span", {
-      ref: ref,
-      onMouseOver: onMouseOver,
-      onMouseOut: onMouseOut,
-      onClick: e => {
-        e.stopPropagation();
-        onMouseOut();
-        onEditClick();
-      },
-      "data-test": `${dataTest}-option-set-button`,
-      className: `jsx-${styles.__hash}` + " " + "option-set-button"
-    }, /*#__PURE__*/React.createElement(IconList16, null));
-  })), /*#__PURE__*/React.createElement("div", {
+  }, ({
+    ref,
+    onMouseOver,
+    onMouseOut
+  }) => /*#__PURE__*/React.createElement("span", {
+    ref: ref,
+    onMouseOver: onMouseOver,
+    onMouseOut: onMouseOut,
+    onClick: e => {
+      e.stopPropagation();
+      onMouseOut();
+      onEditClick();
+    },
+    "data-test": `${dataTest}-option-set-button`,
+    className: `jsx-${styles.__hash}` + " " + "option-set-button"
+  }, /*#__PURE__*/React.createElement(IconList16, null)))), /*#__PURE__*/React.createElement("div", {
     className: `jsx-${styles.__hash}` + " " + (cx('group', 'nowrap', 'typeGroup') || "")
   }, /*#__PURE__*/React.createElement("span", {
     className: `jsx-${styles.__hash}` + " " + "type"

package/build/es/components/DimensionMenu.js

@@ -20,20 +20,19 @@ const getDividerItem = key => /*#__PURE__*/React.createElement(MenuDivider, {
 const getUnavailableLabel = visType => i18n.t('Not available for {{visualizationType}}', {
   visualizationType: getDisplayNameByVisType(visType)
 });
-const DimensionMenu = _ref => {
-  let {
-    dimensionId,
-    currentAxisId,
-    visType,
-    numberOfDimensionItems,
-    assignedCategoriesItemHandler,
-    isAssignedCategoriesInLayout,
-    axisItemHandler,
-    removeItemHandler,
-    classes,
-    onClose,
-    dataTest
-  } = _ref;
+const DimensionMenu = ({
+  dimensionId,
+  currentAxisId,
+  visType,
+  numberOfDimensionItems,
+  assignedCategoriesItemHandler,
+  isAssignedCategoriesInLayout,
+  axisItemHandler,
+  removeItemHandler,
+  classes,
+  onClose,
+  dataTest
+}) => {
   const menuItems = [];
   const isDimensionInLayout = !!currentAxisId;
 

package/build/es/components/DimensionsPanel/DimensionsPanel.js

@@ -8,8 +8,8 @@ import Filter from '../Filter/Filter.js';
 import DimensionList from './List/DimensionList.js';
 import { styles } from './styles/DimensionsPanel.style.js';
 class DimensionsPanel extends Component {
-  constructor() {
-    super(...arguments);
+  constructor(...args) {
+    super(...args);
     _defineProperty(this, "state", {
       filterText: ''
     });
@@ -60,6 +60,11 @@ class DimensionsPanel extends Component {
     }));
   }
 }
+_defineProperty(DimensionsPanel, "defaultProps", {
+  selectedIds: [],
+  style: {},
+  onDimensionClick: Function.prototype
+});
 DimensionsPanel.propTypes = {
   dimensions: PropTypes.array.isRequired,
   disabledDimension: PropTypes.func,
@@ -71,9 +76,4 @@ DimensionsPanel.propTypes = {
   onDimensionDragStart: PropTypes.func,
   onDimensionOptionsClick: PropTypes.func
 };
-DimensionsPanel.defaultProps = {
-  selectedIds: [],
-  style: {},
-  onDimensionClick: Function.prototype
-};
 export default DimensionsPanel;

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

@@ -13,8 +13,8 @@ import OptionsButton from './OptionsButton.js';
 import RecommendedIcon from './RecommendedIcon.js';
 import styles from './styles/DimensionItem.style.js';
 class DimensionItem extends Component {
-  constructor() {
-    super(...arguments);
+  constructor(...args) {
+    super(...args);
     _defineProperty(this, "state", {
       mouseOver: false
     });
@@ -123,6 +123,15 @@ class DimensionItem extends Component {
     }, styles));
   }
 }
+_defineProperty(DimensionItem, "defaultProps", {
+  isDeactivated: false,
+  isRecommended: false,
+  isSelected: false,
+  isLocked: false,
+  onClick: Function.prototype,
+  innerRef: Function.prototype,
+  style: {}
+});
 DimensionItem.propTypes = {
   id: PropTypes.string.isRequired,
   isSelected: PropTypes.bool.isRequired,
@@ -137,13 +146,4 @@ DimensionItem.propTypes = {
   onClick: PropTypes.func,
   onOptionsClick: PropTypes.func
 };
-DimensionItem.defaultProps = {
-  isDeactivated: false,
-  isRecommended: false,
-  isSelected: false,
-  isLocked: false,
-  onClick: Function.prototype,
-  innerRef: Function.prototype,
-  style: {}
-};
 export default DimensionItem;

package/build/es/components/DimensionsPanel/List/DimensionList.js

@@ -9,8 +9,8 @@ import { getPredefinedDimensions, getFixedDimensions } from '../../../modules/pr
 import DimensionItem from './DimensionItem.js';
 import styles from './styles/DimensionList.style.js';
 class DimensionList extends Component {
-  constructor() {
-    super(...arguments);
+  constructor(...args) {
+    super(...args);
     _defineProperty(this, "nameContainsFilterText", dimension => dimension.name.toLowerCase().includes(this.props.filterText.toLowerCase()));
     _defineProperty(this, "isDisabled", dimensionId => this.props.disabledDimension(dimensionId) || false);
     _defineProperty(this, "isRecommended", dimensionId => this.props.recommendedDimension(dimensionId) || false);
@@ -25,7 +25,8 @@ class DimensionList extends Component {
       isDeactivated: this.isDisabled(dimension.id),
       onClick: this.props.onDimensionClick,
       onOptionsClick: this.props.onDimensionOptionsClick,
-      onDragStart: this.props.onDimensionDragStart
+      onDragStart: this.props.onDimensionDragStart,
+      dataTest: "dimension-item"
     }));
     _defineProperty(this, "getDimensionItemsByFilter", filter => this.props.dimensions.filter(filter).filter(this.nameContainsFilterText).map(this.renderItem));
   }
@@ -33,6 +34,7 @@ class DimensionList extends Component {
     const fixedDimensions = this.getDimensionItemsByFilter(dimension => Object.values(getFixedDimensions()).some(fixedDim => fixedDim.id === dimension.id));
     const nonPredefinedDimensions = this.getDimensionItemsByFilter(dimension => !Object.values(getPredefinedDimensions()).some(predefDim => predefDim.id === dimension.id));
     return /*#__PURE__*/React.createElement("div", {
+      "data-test": "dhis2-analytics-dimension-list",
       className: `jsx-${styles.__hash}` + " " + "container"
     }, /*#__PURE__*/React.createElement("div", {
       className: `jsx-${styles.__hash}` + " " + "wrapper"
@@ -53,6 +55,12 @@ class DimensionList extends Component {
     }, styles));
   }
 }
+_defineProperty(DimensionList, "defaultProps", {
+  selectedIds: [],
+  disabledDimension: Function.prototype,
+  lockedDimension: Function.prototype,
+  recommendedDimension: Function.prototype
+});
 DimensionList.propTypes = {
   dimensions: PropTypes.array.isRequired,
   filterText: PropTypes.string.isRequired,
@@ -64,10 +72,4 @@ DimensionList.propTypes = {
   onDimensionDragStart: PropTypes.func,
   onDimensionOptionsClick: PropTypes.func
 };
-DimensionList.defaultProps = {
-  selectedIds: [],
-  disabledDimension: Function.prototype,
-  lockedDimension: Function.prototype,
-  recommendedDimension: Function.prototype
-};
 export default DimensionList;

package/build/es/components/DimensionsPanel/List/OptionsButton.js

@@ -2,17 +2,14 @@ import _JSXStyle from "styled-jsx/style";
 import { IconMore16 } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
-const OptionsButton = _ref => {
-  let {
-    onClick
-  } = _ref;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("button", {
-    onClick: onClick,
-    className: "jsx-2074438274"
-  }, /*#__PURE__*/React.createElement(IconMore16, null)), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "2074438274"
-  }, ["button.jsx-2074438274{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;height:100%;width:20px;padding:0;border:none;background:none;outline:none;cursor:pointer;border-top-right-radius:2px;border-bottom-left-radius:2px;}", "button.jsx-2074438274:hover{background-color:rgba(33,41,52,0.08);}", "button.jsx-2074438274:active{background-color:rgba(33,41,52,0.13);}"]));
-};
+const OptionsButton = ({
+  onClick
+}) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("button", {
+  onClick: onClick,
+  className: "jsx-2074438274"
+}, /*#__PURE__*/React.createElement(IconMore16, null)), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "2074438274"
+}, ["button.jsx-2074438274{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;height:100%;width:20px;padding:0;border:none;background:none;outline:none;cursor:pointer;border-top-right-radius:2px;border-bottom-left-radius:2px;}", "button.jsx-2074438274:hover{background-color:rgba(33,41,52,0.08);}", "button.jsx-2074438274:active{background-color:rgba(33,41,52,0.13);}"]));
 OptionsButton.propTypes = {
   onClick: PropTypes.func
 };

package/build/es/components/DimensionsPanel/List/RecommendedIcon.js

@@ -3,19 +3,16 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import i18n from '../../../locales/index.js';
 import { styles } from './styles/RecommendedIcon.style.js';
-const RecommendedIcon = _ref => {
-  let {
-    isRecommended,
-    dataTest
-  } = _ref;
-  return isRecommended ? /*#__PURE__*/React.createElement(Tooltip, {
-    content: i18n.t('Dimension recommended with selected data'),
-    placement: "bottom"
-  }, /*#__PURE__*/React.createElement("div", {
-    style: styles.recommendedIcon,
-    "data-test": dataTest
-  })) : null;
-};
+const RecommendedIcon = ({
+  isRecommended,
+  dataTest
+}) => isRecommended ? /*#__PURE__*/React.createElement(Tooltip, {
+  content: i18n.t('Dimension recommended with selected data'),
+  placement: "bottom"
+}, /*#__PURE__*/React.createElement("div", {
+  style: styles.recommendedIcon,
+  "data-test": dataTest
+})) : null;
 RecommendedIcon.propTypes = {
   isRecommended: PropTypes.bool.isRequired,
   dataTest: PropTypes.string

package/build/es/components/DimensionsPanel/List/__tests__/DimensionItem.spec.js

@@ -1,43 +1,50 @@
-import { shallow } from 'enzyme';
+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 { render } from '@testing-library/react';
 import React from 'react';
 import DimensionItem from '../DimensionItem.js';
-describe('DimensionItem', () => {
-  let props;
-  let shallowItem;
-  const dimensionItem = () => {
-    if (!shallowItem) {
-      shallowItem = shallow(/*#__PURE__*/React.createElement(DimensionItem, props));
-    }
-    return shallowItem;
-  };
-  beforeEach(() => {
-    props = {
-      id: 'pe',
-      name: 'Period',
-      isDeactivated: false,
-      isSelected: false,
-      isRecommended: false,
-      isLocked: false
-    };
-    shallowItem = undefined;
-  });
-  it('matches the snapshot', () => {
-    expect(dimensionItem()).toMatchSnapshot();
-  });
-  it('matches the snapshot with recommended', () => {
-    props.isRecommended = true;
-    expect(dimensionItem()).toMatchSnapshot();
-  });
-  it('matches the snapshot with selected', () => {
-    props.isSelected = true;
-    expect(dimensionItem()).toMatchSnapshot();
-  });
-  it('matches the snapshot with locked', () => {
-    props.isLocked = true;
-    expect(dimensionItem()).toMatchSnapshot();
-  });
-  it('matches the snapshot with onOptionsClick', () => {
-    props.onOptionsClick = jest.fn();
-    expect(dimensionItem()).toMatchSnapshot();
-  });
+const props = {
+  id: 'pe',
+  name: 'Period',
+  isDeactivated: false,
+  isSelected: false,
+  isRecommended: false,
+  isLocked: false
+};
+test('DimensionItem matches the snapshot', () => {
+  const {
+    container
+  } = render(/*#__PURE__*/React.createElement(DimensionItem, props));
+  expect(container).toMatchSnapshot();
+});
+test('DimensionItem matches the snapshot with recommended', () => {
+  const {
+    container
+  } = render(/*#__PURE__*/React.createElement(DimensionItem, _extends({}, props, {
+    isRecommended: true
+  })));
+  expect(container).toMatchSnapshot();
+});
+test('DimensionItem matches the snapshot with selected', () => {
+  const {
+    container
+  } = render(/*#__PURE__*/React.createElement(DimensionItem, _extends({}, props, {
+    isSelected: true
+  })));
+  expect(container).toMatchSnapshot();
+});
+test('DimensionItem matches the snapshot with locked', () => {
+  const {
+    container
+  } = render(/*#__PURE__*/React.createElement(DimensionItem, _extends({}, props, {
+    isLocked: true
+  })));
+  expect(container).toMatchSnapshot();
+});
+test('DimensionItem matches the snapshot with onOptionsClick', () => {
+  const {
+    container
+  } = render(/*#__PURE__*/React.createElement(DimensionItem, _extends({}, props, {
+    onOptionsClick: jest.fn()
+  })));
+  expect(container).toMatchSnapshot();
 });