@dhis2/analytics 21.0.0-alpha.1 → 21.0.0-alpha.2

package/build/cjs/components/FileMenu/DeleteDialog.js

@@ -7,10 +7,10 @@ exports.DeleteDialog = void 0;
 
 var _appRuntime = require("@dhis2/app-runtime");
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

package/build/cjs/components/FileMenu/FileMenu.js

@@ -9,10 +9,10 @@ var _style = _interopRequireDefault(require("styled-jsx/style"));
 
 var _d2UiTranslationDialog = _interopRequireDefault(require("@dhis2/d2-ui-translation-dialog"));
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

package/build/cjs/components/FileMenu/GetLinkDialog.js

@@ -7,10 +7,10 @@ exports.GetLinkDialog = void 0;
 
 var _appRuntime = require("@dhis2/app-runtime");
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

package/build/cjs/components/FileMenu/RenameDialog.js

@@ -7,10 +7,10 @@ exports.RenameDialog = void 0;
 
 var _appRuntime = require("@dhis2/app-runtime");
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

package/build/cjs/components/FileMenu/SaveAsDialog.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SaveAsDialog = void 0;
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

package/build/cjs/components/OrgUnitDimension/OrgUnitDimension.js

@@ -157,7 +157,8 @@ const OrgUnitDimension = ({
     roots: root,
     initiallyExpanded: [root, ...selected.filter(item => !DYNAMIC_ORG_UNITS.includes(item.id) && !_ouIdHelper.ouIdHelper.hasLevelPrefix(item.id) && !_ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)).map(item => item.path)],
     selected: selected.filter(item => !DYNAMIC_ORG_UNITS.includes(item.id) && !_ouIdHelper.ouIdHelper.hasLevelPrefix(item.id) && !_ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)).map(item => item.path),
-    onChange: onSelectItems
+    onChange: onSelectItems,
+    dataTest: 'org-unit-tree'
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: `jsx-${_OrgUnitDimension.default.__hash}` + " " + ((0, _classnames.default)('selectsWrapper', {
       disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id))
@@ -169,11 +170,13 @@ const OrgUnitDimension = ({
     }) => onLevelChange(selected),
     placeholder: _index.default.t('Select a level'),
     loading: !ouLevels.length,
-    dense: true
+    dense: true,
+    dataTest: 'org-unit-level-select'
   }, ouLevels.map(level => /*#__PURE__*/_react.default.createElement(_ui.MultiSelectOption, {
     key: level.id,
     value: level.id,
-    label: level.displayName
+    label: level.displayName,
+    dataTest: `org-unit-level-select-option-${level.id}`
   }))), /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
     selected: ouGroups.length ? selected.filter(item => _ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)).map(item => _ouIdHelper.ouIdHelper.removePrefix(item.id)) : [],
     onChange: ({
@@ -181,11 +184,13 @@ const OrgUnitDimension = ({
     }) => onGroupChange(selected),
     placeholder: _index.default.t('Select a group'),
     loading: !ouGroups.length,
-    dense: true
+    dense: true,
+    dataTest: 'org-unit-group-select'
   }, ouGroups.map(group => /*#__PURE__*/_react.default.createElement(_ui.MultiSelectOption, {
     key: group.id,
     value: group.id,
-    label: group.displayName
+    label: group.displayName,
+    dataTest: `org-unit-group-select-option-${group.id}`
   })))), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _OrgUnitDimension.default.__hash
   }, _OrgUnitDimension.default));

package/build/cjs/components/PeriodDimension/FixedPeriodSelect.js

@@ -7,10 +7,10 @@ exports.default = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

package/build/cjs/components/TransferOption.js

@@ -7,12 +7,12 @@ exports.TransferOption = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _TransferOption = _interopRequireDefault(require("./styles/TransferOption.style"));

package/build/es/components/FileMenu/DeleteDialog.js

@@ -1,6 +1,6 @@
 import { useDataMutation } from '@dhis2/app-runtime';
-import PropTypes from '@dhis2/prop-types';
 import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button } from '@dhis2/ui';
+import PropTypes from 'prop-types';
 import React, { useMemo } from 'react';
 import i18n from '../../locales/index.js';
 import { supportedFileTypes, endpointFromFileType } from './utils';

package/build/es/components/FileMenu/FileMenu.js

@@ -1,7 +1,7 @@
 import _JSXStyle from "styled-jsx/style";
 import TranslationDialog from '@dhis2/d2-ui-translation-dialog';
-import PropTypes from '@dhis2/prop-types';
 import { IconAdd24, IconLaunch24, IconSave24, IconEdit24, IconTranslate24, IconShare24, IconLink24, IconDelete24, SharingDialog, colors, FlyoutMenu, Layer, MenuItem, MenuDivider, Popper } from '@dhis2/ui';
+import PropTypes from 'prop-types';
 import React, { createRef, useState } from 'react';
 import i18n from '../../locales/index.js';
 import { OpenFileDialog } from '../OpenFileDialog/OpenFileDialog';

package/build/es/components/FileMenu/GetLinkDialog.js

@@ -1,6 +1,6 @@
 import { useConfig } from '@dhis2/app-runtime';
-import PropTypes from '@dhis2/prop-types';
 import { Modal, ModalContent, ModalActions, ButtonStrip, Button } from '@dhis2/ui';
+import PropTypes from 'prop-types';
 import React from 'react';
 import i18n from '../../locales/index.js';
 import { supportedFileTypes, appPathFor } from './utils';

package/build/es/components/FileMenu/RenameDialog.js

@@ -1,6 +1,6 @@
 import { useDataMutation } from '@dhis2/app-runtime';
-import PropTypes from '@dhis2/prop-types';
 import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button, InputField, TextAreaField } from '@dhis2/ui';
+import PropTypes from 'prop-types';
 import React, { useMemo, useState } from 'react';
 import i18n from '../../locales/index.js';
 import { supportedFileTypes, endpointFromFileType } from './utils';

package/build/es/components/FileMenu/SaveAsDialog.js

@@ -1,5 +1,5 @@
-import PropTypes from '@dhis2/prop-types';
 import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button, InputField, TextAreaField } from '@dhis2/ui';
+import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import i18n from '../../locales/index.js';
 import { supportedFileTypes } from './utils';

package/build/es/components/OrgUnitDimension/OrgUnitDimension.js

@@ -133,7 +133,8 @@ const OrgUnitDimension = ({
     roots: root,
     initiallyExpanded: [root, ...selected.filter(item => !DYNAMIC_ORG_UNITS.includes(item.id) && !ouIdHelper.hasLevelPrefix(item.id) && !ouIdHelper.hasGroupPrefix(item.id)).map(item => item.path)],
     selected: selected.filter(item => !DYNAMIC_ORG_UNITS.includes(item.id) && !ouIdHelper.hasLevelPrefix(item.id) && !ouIdHelper.hasGroupPrefix(item.id)).map(item => item.path),
-    onChange: onSelectItems
+    onChange: onSelectItems,
+    dataTest: 'org-unit-tree'
   })), /*#__PURE__*/React.createElement("div", {
     className: `jsx-${styles.__hash}` + " " + (cx('selectsWrapper', {
       disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id))
@@ -145,11 +146,13 @@ const OrgUnitDimension = ({
     }) => onLevelChange(selected),
     placeholder: i18n.t('Select a level'),
     loading: !ouLevels.length,
-    dense: true
+    dense: true,
+    dataTest: 'org-unit-level-select'
   }, ouLevels.map(level => /*#__PURE__*/React.createElement(MultiSelectOption, {
     key: level.id,
     value: level.id,
-    label: level.displayName
+    label: level.displayName,
+    dataTest: `org-unit-level-select-option-${level.id}`
   }))), /*#__PURE__*/React.createElement(MultiSelect, {
     selected: ouGroups.length ? selected.filter(item => ouIdHelper.hasGroupPrefix(item.id)).map(item => ouIdHelper.removePrefix(item.id)) : [],
     onChange: ({
@@ -157,11 +160,13 @@ const OrgUnitDimension = ({
     }) => onGroupChange(selected),
     placeholder: i18n.t('Select a group'),
     loading: !ouGroups.length,
-    dense: true
+    dense: true,
+    dataTest: 'org-unit-group-select'
   }, ouGroups.map(group => /*#__PURE__*/React.createElement(MultiSelectOption, {
     key: group.id,
     value: group.id,
-    label: group.displayName
+    label: group.displayName,
+    dataTest: `org-unit-group-select-option-${group.id}`
   })))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));

package/build/es/components/PeriodDimension/FixedPeriodSelect.js

@@ -2,8 +2,8 @@ import _JSXStyle from "styled-jsx/style";
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import propTypes from '@dhis2/prop-types';
 import { SingleSelectField, SingleSelectOption } from '@dhis2/ui';
+import propTypes from 'prop-types';
 import React, { Component } from 'react';
 import i18n from '../../locales/index.js';
 import FixedPeriodFilter from './FixedPeriodFilter.js';

package/build/es/components/TransferOption.js

@@ -1,7 +1,7 @@
 import _JSXStyle from "styled-jsx/style";
-import propTypes from '@dhis2/prop-types';
 import { Tooltip } from '@dhis2/ui';
 import cx from 'classnames';
+import propTypes from 'prop-types';
 import React from 'react';
 import styles from './styles/TransferOption.style';
 export const TransferOption = ({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "21.0.0-alpha.1",
+    "version": "21.0.0-alpha.2",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -44,6 +44,7 @@
         "enzyme-adapter-react-16": "^1.15.6",
         "fs-extra": "^10.0.0",
         "jest-enzyme": "^7.0.2",
+        "prop-types": "^15",
         "styled-jsx": "3.3.2",
         "typeface-roboto": "^0.0.75"
     },