@dhis2/analytics 28.0.3 → 28.0.5

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

@@ -16,19 +16,18 @@ var _SelectedEmptyPlaceholder = require("../DataDimension/SelectedEmptyPlacehold
 var _SourceEmptyPlaceholder = require("../DataDimension/SourceEmptyPlaceholder.js");
 var _DimensionSelectorStyle = _interopRequireDefault(require("../styles/DimensionSelector.style.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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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); }
-const ItemSelector = _ref => {
-  let {
-    selectedItems,
-    noItemsMessage,
-    onFetch,
-    onSelect,
-    rightFooter,
-    dataTest
-  } = _ref;
+const SELECTED_ITEMS_PROP_DEFAULT = [];
+const ItemSelector = ({
+  selectedItems = SELECTED_ITEMS_PROP_DEFAULT,
+  noItemsMessage,
+  onFetch,
+  onSelect,
+  rightFooter,
+  dataTest
+}) => {
   const [state, setState] = (0, _react.useState)({
     searchTerm: '',
     options: [],
@@ -48,18 +47,15 @@ const ItemSelector = _ref => {
       loading: true
     }));
     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
-      } = _ref2;
-      return {
-        label: name,
-        value: id,
-        disabled
-      };
-    });
+    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 => ({
       ...state,
       loading: false,
@@ -95,12 +91,9 @@ const ItemSelector = _ref => {
     }
   };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ui.Transfer, {
-    onChange: _ref3 => {
-      let {
-        selected
-      } = _ref3;
-      return onChange(selected);
-    },
+    onChange: ({
+      selected
+    }) => onChange(selected),
     selected: selectedItems.map(item => item.value),
     options: [...state.options, ...selectedItems],
     loading: state.loading,
@@ -116,12 +109,9 @@ const ItemSelector = _ref => {
     filterPlaceholder: _index.default.t('Search'),
     filterablePicked: false,
     searchTerm: state.searchTerm,
-    onFilterChange: _ref4 => {
-      let {
-        value
-      } = _ref4;
-      return setSearchTerm(value);
-    },
+    onFilterChange: ({
+      value
+    }) => setSearchTerm(value),
     enableOrderChange: true,
     height: _dimensionSelectorHelper.TRANSFER_HEIGHT,
     optionsWidth: _dimensionSelectorHelper.TRANSFER_OPTIONS_WIDTH,
@@ -151,7 +141,4 @@ ItemSelector.propTypes = {
     value: _propTypes.default.string.isRequired
   }))
 };
-ItemSelector.defaultProps = {
-  selectedItems: []
-};
 var _default = exports.default = ItemSelector;

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

@@ -10,27 +10,22 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _index = _interopRequireDefault(require("../../locales/index.js"));
 var _utils = require("./utils.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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const getMutation = type => ({
   resource: (0, _utils.endpointFromFileType)(type),
-  id: _ref => {
-    let {
-      id
-    } = _ref;
-    return id;
-  },
+  id: ({
+    id
+  }) => id,
   type: 'delete'
 });
-const DeleteDialog = _ref2 => {
-  let {
-    type,
-    id,
-    onClose,
-    onDelete,
-    onError
-  } = _ref2;
+const DeleteDialog = ({
+  type,
+  id,
+  onClose,
+  onDelete,
+  onError
+}) => {
   const mutation = (0, _react.useMemo)(() => getMutation(type), []);
   const [mutate] = (0, _appRuntime.useDataMutation)(mutation, {
     variables: {

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

@@ -16,27 +16,25 @@ var _GetLinkDialog = require("./GetLinkDialog.js");
 var _RenameDialog = require("./RenameDialog.js");
 var _SaveAsDialog = require("./SaveAsDialog.js");
 var _utils = require("./utils.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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const FileMenu = _ref => {
-  var _fileObject$access, _fileObject$access2, _fileObject$access3, _fileObject$access4, _fileObject$access5, _fileObject$access6, _fileObject$access7, _fileObject$access8, _fileObject$access9, _fileObject$access10;
-  let {
-    currentUser,
-    defaultFilterVisType,
-    fileType,
-    fileObject,
-    filterVisTypes,
-    onNew,
-    onOpen,
-    onSave,
-    onSaveAs,
-    onRename,
-    onShare,
-    onDelete,
-    onError,
-    onTranslate
-  } = _ref;
+const FileMenu = ({
+  currentUser,
+  defaultFilterVisType,
+  fileType,
+  fileObject,
+  filterVisTypes,
+  onNew = Function.prototype,
+  onOpen = Function.prototype,
+  onSave,
+  onSaveAs,
+  onRename = Function.prototype,
+  onShare = Function.prototype,
+  onDelete = Function.prototype,
+  onError = Function.prototype,
+  onTranslate = Function.prototype
+}) => {
+  var _fileObject$access, _fileObject$access2, _fileObject$access3, _fileObject$access4, _fileObject$access5, _fileObject$access6, _fileObject$access7, _fileObject$access8, _fileObject$access9, _fileObject$access0;
   const [currentDialog, setCurrentDialog] = (0, _react.useState)(null);
   const onMenuItemClick = dialogToOpen => () => {
     setCurrentDialog(dialogToOpen);
@@ -193,21 +191,12 @@ const FileMenu = _ref => {
     icon: /*#__PURE__*/_react.default.createElement(_ui.IconDelete24, {
       color: fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access9 = fileObject.access) !== null && _fileObject$access9 !== void 0 && _fileObject$access9.delete ? _ui.colors.red700 : iconInactiveColor
     }),
-    disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access10 = fileObject.access) !== null && _fileObject$access10 !== void 0 && _fileObject$access10.delete),
+    disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access0 = fileObject.access) !== null && _fileObject$access0 !== void 0 && _fileObject$access0.delete),
     onClick: onMenuItemClick('delete'),
     dataTest: "file-menu-delete"
   }))), renderDialog());
 };
 exports.FileMenu = FileMenu;
-FileMenu.defaultProps = {
-  onDelete: Function.prototype,
-  onError: Function.prototype,
-  onNew: Function.prototype,
-  onOpen: Function.prototype,
-  onRename: Function.prototype,
-  onShare: Function.prototype,
-  onTranslate: Function.prototype
-};
 FileMenu.propTypes = {
   currentUser: _propTypes.default.object,
   defaultFilterVisType: _propTypes.default.string,

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

@@ -13,12 +13,11 @@ var _index = _interopRequireDefault(require("../../locales/index.js"));
 var _GetLinkDialogStyles = require("./GetLinkDialog.styles.js");
 var _utils = require("./utils.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const GetLinkDialog = _ref => {
-  let {
-    type,
-    id,
-    onClose
-  } = _ref;
+const GetLinkDialog = ({
+  type,
+  id,
+  onClose
+}) => {
   const {
     apiVersion,
     baseUrl
@@ -39,7 +38,8 @@ const GetLinkDialog = _ref => {
   }, appUrl), /*#__PURE__*/_react.default.createElement(_ui.Button, {
     icon: /*#__PURE__*/_react.default.createElement(_ui.IconCopy24, null),
     small: true,
-    onClick: () => navigator.clipboard.writeText(appUrl)
+    onClick: () => navigator.clipboard.writeText(appUrl),
+    "aria-label": _index.default.t('Copy to clipboard')
   }))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     onClick: onClose,
     secondary: true

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

@@ -11,16 +11,14 @@ var _react = _interopRequireWildcard(require("react"));
 var _index = _interopRequireDefault(require("../../locales/index.js"));
 var _FileMenuStyles = require("./FileMenu.styles.js");
 var _utils = require("./utils.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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const RenameDialog = _ref => {
-  let {
-    type,
-    object,
-    onClose,
-    onRename
-  } = _ref;
+const RenameDialog = ({
+  type,
+  object,
+  onClose,
+  onRename
+}) => {
   const [name, setName] = (0, _react.useState)(object.name);
   const [description, setDescription] = (0, _react.useState)(object.description);
   const renameObject = () => {
@@ -43,23 +41,17 @@ const RenameDialog = _ref => {
     label: _index.default.t('Name'),
     required: true,
     value: name,
-    onChange: _ref2 => {
-      let {
-        value
-      } = _ref2;
-      return setName(value);
-    },
+    onChange: ({
+      value
+    }) => setName(value),
     dataTest: "file-menu-rename-modal-name"
   }), /*#__PURE__*/_react.default.createElement(_ui.TextAreaField, {
     label: _index.default.t('Description'),
     value: description,
     rows: 3,
-    onChange: _ref3 => {
-      let {
-        value
-      } = _ref3;
-      return setDescription(value);
-    },
+    onChange: ({
+      value
+    }) => setDescription(value),
     dataTest: "file-menu-rename-modal-description"
   }))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     onClick: onClose,

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

@@ -11,17 +11,15 @@ var _react = _interopRequireWildcard(require("react"));
 var _index = _interopRequireDefault(require("../../locales/index.js"));
 var _FileMenuStyles = require("./FileMenu.styles.js");
 var _utils = require("./utils.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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const NAME_MAXLENGTH = 230;
-const SaveAsDialog = _ref => {
-  let {
-    type,
-    object,
-    onClose,
-    onSaveAs
-  } = _ref;
+const SaveAsDialog = ({
+  type,
+  object,
+  onClose,
+  onSaveAs
+}) => {
   const [name, setName] = (0, _react.useState)(object !== null && object !== void 0 && object.displayName || object !== null && object !== void 0 && object.name ? _index.default.t('{{- objectName}} (copy)', {
     objectName: object.name
   }) : '');
@@ -47,23 +45,17 @@ const SaveAsDialog = _ref => {
   }, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
     label: _index.default.t('Name'),
     value: name,
-    onChange: _ref2 => {
-      let {
-        value
-      } = _ref2;
-      return setName(value.substring(0, NAME_MAXLENGTH));
-    },
+    onChange: ({
+      value
+    }) => setName(value.substring(0, NAME_MAXLENGTH)),
     dataTest: "file-menu-saveas-modal-name"
   }), /*#__PURE__*/_react.default.createElement(_ui.TextAreaField, {
     label: _index.default.t('Description'),
     value: description,
     rows: 3,
-    onChange: _ref3 => {
-      let {
-        value
-      } = _ref3;
-      return setDescription(value);
-    },
+    onChange: ({
+      value
+    }) => setDescription(value),
     dataTest: "file-menu-saveas-modal-description"
   }))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     onClick: onClose,

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

@@ -1,36 +1,33 @@
 "use strict";
 
-var _ui = require("@dhis2/ui");
-var _enzyme = require("enzyme");
-var _react = _interopRequireDefault(require("react"));
+var _react = require("@testing-library/react");
+var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
+var _react2 = _interopRequireDefault(require("react"));
 var _DeleteDialog = require("../DeleteDialog.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-describe('The FileMenu - DeleteDialog component', () => {
-  let shallowDeleteDialog;
-  let props;
-  const onClose = jest.fn();
-  const getDeleteDialogComponent = props => {
-    if (!shallowDeleteDialog) {
-      shallowDeleteDialog = (0, _enzyme.shallow)(/*#__PURE__*/_react.default.createElement(_DeleteDialog.DeleteDialog, props));
-    }
-    return shallowDeleteDialog;
+describe('FileMenu - DeleteDialog component', () => {
+  const props = {
+    type: 'visualization',
+    id: 'delete-test',
+    onClose: jest.fn()
   };
-  beforeEach(() => {
-    shallowDeleteDialog = undefined;
-    props = {
-      type: 'visualization',
-      id: 'delete-test',
-      onClose
-    };
+  test('renders a Modal component', () => {
+    (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_DeleteDialog.DeleteDialog, props));
+    const modalComponent = _react.screen.getByTestId('file-menu-delete-modal');
+    expect(modalComponent).toBeInTheDocument();
   });
-  it('renders a Modal component', () => {
-    expect(getDeleteDialogComponent(props).find(_ui.Modal)).toHaveLength(1);
+  test('renders a ModalTitle containing the type prop', () => {
+    (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_DeleteDialog.DeleteDialog, props));
+    const modalTitleComponent = _react.screen.getByText(`Delete ${props.type}`);
+    expect(modalTitleComponent).toBeInTheDocument();
   });
-  it('renders a ModalTitle containing the type prop', () => {
-    expect(getDeleteDialogComponent(props).find(_ui.ModalTitle).childAt(0).text()).toEqual(`Delete ${props.type}`);
-  });
-  it('calls the onClose callback when the Cancel button is clicked', () => {
-    getDeleteDialogComponent(props).find(_ui.Button).first().simulate('click');
-    expect(onClose).toHaveBeenCalled();
+  test('calls the onClose callback when the Cancel button is clicked', async () => {
+    const user = _userEvent.default.setup();
+    (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_DeleteDialog.DeleteDialog, props));
+    const cancelButton = _react.screen.getByRole('button', {
+      name: 'Cancel'
+    });
+    await user.click(cancelButton);
+    expect(props.onClose).toHaveBeenCalledTimes(1);
   });
 });