cozy-sharing 31.0.2 → 31.2.0

package/dist/components/Recipient/LinkRecipient.js

@@ -3,14 +3,15 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import Avatar from 'cozy-ui/transpiled/react/Avatar';
-import Button from 'cozy-ui/transpiled/react/Button';
 import Fade from 'cozy-ui/transpiled/react/Fade';
 import Icon from 'cozy-ui/transpiled/react/Icon';
+import IconButton from 'cozy-ui/transpiled/react/IconButton';
 import Gear from 'cozy-ui/transpiled/react/Icons/Gear';
 import LinkIcon from 'cozy-ui/transpiled/react/Icons/Link';
 import ListItem from 'cozy-ui/transpiled/react/ListItem';
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon';
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText';
+import Typography from 'cozy-ui/transpiled/react/Typography';
 import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints';
 import { useI18n } from 'twake-i18n';
 import LinkRecipientPermissions from './LinkRecipientPermissions';
@@ -70,16 +71,19 @@ var LinkRecipient = function LinkRecipient(props) {
   }, /*#__PURE__*/React.createElement(Icon, {
     icon: LinkIcon
   }))), /*#__PURE__*/React.createElement(ListItemText, {
-    primary: /*#__PURE__*/React.createElement(Button, {
-      variant: "ghost",
-      onClick: function onClick() {
-        return setOpenShareRestrictionModal(true);
-      },
-      endIcon: /*#__PURE__*/React.createElement(Icon, {
-        icon: Gear
-      }),
-      className: "u-p-0"
-    }, textPrimary),
+    onClick: function onClick() {
+      return setOpenShareRestrictionModal(true);
+    },
+    primary: /*#__PURE__*/React.createElement("div", {
+      className: "u-flex u-flex-items-center"
+    }, /*#__PURE__*/React.createElement(Typography, {
+      className: "u-c-pointer "
+    }, textPrimary), /*#__PURE__*/React.createElement(IconButton, {
+      size: "small",
+      className: "u-ml-half"
+    }, /*#__PURE__*/React.createElement(Icon, {
+      icon: Gear
+    }))),
     secondary: textSecondary
   }), RightPart, openShareRestrictionModal && /*#__PURE__*/React.createElement(ShareRestrictionModal, {
     file: document,

package/dist/components/Recipient/LinkRecipientLite.js

@@ -36,7 +36,7 @@ var LinkRecipientLite = function LinkRecipientLite(_ref) {
   }), /*#__PURE__*/React.createElement(Typography, {
     className: "u-flex-shrink-0",
     variant: "body2"
-  }, t("Share.type.".concat(isReadOnlyPermissions ? 'one-way' : 'two-way')).toLowerCase()));
+  }, t("Share.type.".concat(isReadOnlyPermissions ? 'one-way' : 'two-way'))));
 };
 
 LinkRecipientLite.propTypes = {

package/dist/components/Recipient/LinkRecipientPermissions.js

@@ -50,6 +50,7 @@ var LinkRecipientPermissions = function LinkRecipientPermissions(_ref) {
     updateDocumentPermissions(document, {
       verbs: verbs
     });
+    hideMenu();
   };
 
   var handleRevocation = function handleRevocation() {
@@ -77,7 +78,7 @@ var LinkRecipientPermissions = function LinkRecipientPermissions(_ref) {
     ref: buttonRef,
     textVariant: "body2",
     onClick: toggleMenu
-  }, t("Share.type.".concat(type)).toLowerCase()), /*#__PURE__*/React.createElement(ActionsMenu, {
+  }, t("Share.type.".concat(type))), /*#__PURE__*/React.createElement(ActionsMenu, {
     ref: buttonRef,
     open: isMenuDisplayed,
     actions: actions,

package/dist/components/Recipient/MemberRecipient.spec.js

@@ -70,7 +70,7 @@ describe('MemberRecipient component', function () {
     expect(getByText('foo.mycozy.cloud')).toBeTruthy();
   });
   it('should call revokeSelf if I am not the owner but try to revoke myself', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var onRevoke, onRevokeSelf, _setup3, getByText;
+    var onRevoke, onRevokeSelf, _setup3, getByLabelText;
 
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -84,20 +84,19 @@ describe('MemberRecipient component', function () {
             documentType: 'Files',
             onRevoke: onRevoke,
             onRevokeSelf: onRevokeSelf
-          }), getByText = _setup3.getByText;
-          fireEvent.click(getByText('can change'));
-          fireEvent.click(getByText('Remove me from sharing'));
+          }), getByLabelText = _setup3.getByLabelText;
+          fireEvent.click(getByLabelText('Remove from sharing'));
           expect(onRevoke).not.toHaveBeenCalled();
           expect(onRevokeSelf).toHaveBeenCalled();
 
-        case 7:
+        case 6:
         case "end":
           return _context.stop();
       }
     }, _callee);
   })));
   it('should call revoke if I am the owner of the sharing', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-    var onRevoke, onRevokeSelf, _setup4, getByText;
+    var onRevoke, onRevokeSelf, _setup4, getByLabelText;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -112,13 +111,12 @@ describe('MemberRecipient component', function () {
             documentType: 'Files',
             onRevoke: onRevoke,
             onRevokeSelf: onRevokeSelf
-          }), getByText = _setup4.getByText;
-          fireEvent.click(getByText('can change'));
-          fireEvent.click(getByText('Remove from sharing'));
+          }), getByLabelText = _setup4.getByLabelText;
+          fireEvent.click(getByLabelText('Remove from sharing'));
           expect(onRevoke).toHaveBeenCalled();
           expect(onRevokeSelf).not.toHaveBeenCalled();
 
-        case 7:
+        case 6:
         case "end":
           return _context2.stop();
       }

package/dist/components/Recipient/MemberRecipientLite.js

@@ -47,7 +47,7 @@ var MemberRecipientLite = function MemberRecipientLite(_ref) {
   }), /*#__PURE__*/React.createElement(Typography, {
     className: "u-flex-shrink-0",
     variant: "body2"
-  }, recipientOwner ? t("Share.status.".concat(recipient.status)).toLowerCase() : t("Share.type.".concat((_recipient$type = recipient.type) !== null && _recipient$type !== void 0 ? _recipient$type : 'one-way')).toLowerCase()));
+  }, recipientOwner ? t("Share.status.".concat(recipient.status)) : t("Share.type.".concat((_recipient$type = recipient.type) !== null && _recipient$type !== void 0 ? _recipient$type : 'one-way'))));
 };
 
 MemberRecipientLite.propTypes = {

package/dist/components/Recipient/MemberRecipientPermissions.js

@@ -5,13 +5,15 @@ import React, { useState, useRef, useCallback } from 'react';
 import { useClient } from 'cozy-client';
 import minilog from 'cozy-minilog';
 import ActionsMenu from 'cozy-ui/transpiled/react/ActionsMenu';
-import { makeActions, divider } from 'cozy-ui/transpiled/react/ActionsMenu/Actions';
+import { makeActions } from 'cozy-ui/transpiled/react/ActionsMenu/Actions';
 import DropdownButton from 'cozy-ui/transpiled/react/DropdownButton';
+import Icon from 'cozy-ui/transpiled/react/Icon';
+import IconButton from 'cozy-ui/transpiled/react/IconButton';
+import CrossCircleOutlineIcon from 'cozy-ui/transpiled/react/Icons/CrossCircleOutline';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import Typography from 'cozy-ui/transpiled/react/Typography';
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
 import { useI18n } from 'twake-i18n';
-import { revokeMember } from './actions/revokeMember';
 import { setReadOnlySharedPermission } from './actions/setReadOnlySharedPermission';
 import { setReadWriteSharedPermission } from './actions/setReadWriteSharedPermission';
 import { useSharingContext } from '../../hooks/useSharingContext';
@@ -19,7 +21,6 @@ var log = minilog('MemberRecipientPermissions');
 
 var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
   var isOwner = _ref.isOwner,
-      isSharedDrive = _ref.isSharedDrive,
       status = _ref.status,
       instance = _ref.instance,
       type = _ref.type,
@@ -143,32 +144,35 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
       return _ref3.apply(this, arguments);
     };
   }(), [hideMenu, memberIndex, sharingId, showAlert, t, type, updateSharingMemberType]);
-  var actions = makeActions([setReadOnlySharedPermission, setReadWriteSharedPermission, divider, revokeMember], {
-    client: client,
+  var actions = makeActions([setReadOnlySharedPermission, setReadWriteSharedPermission], {
     t: t,
     type: type !== null && type !== void 0 ? type : 'one-way',
-    isOwner: isOwner,
-    isSharedDrive: isSharedDrive,
-    setType: setType,
-    handleRevocation: handleRevocation
+    setType: setType
   });
   return /*#__PURE__*/React.createElement("div", {
     className: className
   }, revoking && /*#__PURE__*/React.createElement(Spinner, null), !shouldShowMenu && !revoking && /*#__PURE__*/React.createElement(Typography, {
     variant: "body2"
-  }, t("Share.status.".concat(status)).toLowerCase()), shouldShowMenu && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DropdownButton, {
+  }, t("Share.status.".concat(status))), shouldShowMenu && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DropdownButton, {
     ref: buttonRef,
     "aria-controls": "simple-menu",
     "aria-haspopup": "true",
     onClick: toggleMenu,
     textVariant: "body2"
-  }, t("Share.type.".concat(type)).toLowerCase()), /*#__PURE__*/React.createElement(ActionsMenu, {
+  }, t("Share.type.".concat(type))), /*#__PURE__*/React.createElement(ActionsMenu, {
     ref: buttonRef,
     open: isMenuDisplayed,
     actions: actions,
     autoClose: true,
     onClose: hideMenu
-  })));
+  }), /*#__PURE__*/React.createElement(IconButton, {
+    onClick: handleRevocation,
+    size: "small",
+    className: "u-ml-half",
+    "aria-label": t('Share.members.revoke')
+  }, /*#__PURE__*/React.createElement(Icon, {
+    icon: CrossCircleOutlineIcon
+  }))));
 };
 
 export default MemberRecipientPermissions;

package/dist/components/Recipient/MemberRecipientPermissions.spec.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { render, fireEvent, screen, act, waitFor } from '@testing-library/react';
+import { render, fireEvent, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import { createMockClient } from 'cozy-client';
 import MemberRecipientPermissions from './MemberRecipientPermissions';
@@ -81,10 +81,12 @@ describe('MemberRecipientPermissions component', function () {
   });
   it('should render the current permission type', function () {
     setup();
-    expect(screen.getByText('can change')).toBeInTheDocument();
+    expect(screen.getByRole('button', {
+      name: 'Editor'
+    })).toBeInTheDocument();
   });
   it('should call updateSharingMemberType when changing to one-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var _setup, getByText;
+    var _setup, getByRole;
 
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -92,9 +94,13 @@ describe('MemberRecipientPermissions component', function () {
           mockUpdateSharingMemberType.mockResolvedValue(undefined);
           _setup = setup({
             type: 'two-way'
-          }), getByText = _setup.getByText;
-          fireEvent.click(getByText('can change'));
-          fireEvent.click(getByText('Can view'));
+          }), getByRole = _setup.getByRole;
+          fireEvent.click(getByRole('button', {
+            name: 'Editor'
+          }));
+          fireEvent.click(getByRole('menuitem', {
+            name: 'Viewer'
+          }));
           expect(mockUpdateSharingMemberType).toHaveBeenCalledWith('sharing-123', 1, 'one-way');
 
         case 5:
@@ -104,7 +110,7 @@ describe('MemberRecipientPermissions component', function () {
     }, _callee);
   })));
   it('should call updateSharingMemberType when changing to two-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-    var _setup2, getByText;
+    var _setup2, getByRole;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -112,9 +118,13 @@ describe('MemberRecipientPermissions component', function () {
           mockUpdateSharingMemberType.mockResolvedValue(undefined);
           _setup2 = setup({
             type: 'one-way'
-          }), getByText = _setup2.getByText;
-          fireEvent.click(getByText('can view'));
-          fireEvent.click(getByText('Can change'));
+          }), getByRole = _setup2.getByRole;
+          fireEvent.click(getByRole('button', {
+            name: 'Viewer'
+          }));
+          fireEvent.click(getByRole('menuitem', {
+            name: 'Editor'
+          }));
           expect(mockUpdateSharingMemberType).toHaveBeenCalledWith('sharing-123', 1, 'two-way');
 
         case 5:
@@ -123,33 +133,23 @@ describe('MemberRecipientPermissions component', function () {
       }
     }, _callee2);
   })));
-  it('should show error alert when updateSharingMemberType fails', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-    var _setup3, getByText;
+  it('should show error alert when updateSharingMemberType fails', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    var _setup3, getByRole;
 
-    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           mockUpdateSharingMemberType.mockRejectedValue(new Error('Network error'));
           _setup3 = setup({
             type: 'two-way'
-          }), getByText = _setup3.getByText;
-          _context4.next = 4;
-          return act( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-              while (1) switch (_context3.prev = _context3.next) {
-                case 0:
-                  fireEvent.click(getByText('can change'));
-                  fireEvent.click(getByText('Can view'));
-
-                case 2:
-                case "end":
-                  return _context3.stop();
-              }
-            }, _callee3);
-          })));
-
-        case 4:
-          _context4.next = 6;
+          }), getByRole = _setup3.getByRole;
+          fireEvent.click(getByRole('button', {
+            name: 'Editor'
+          }));
+          fireEvent.click(getByRole('menuitem', {
+            name: 'Viewer'
+          }));
+          _context3.next = 6;
           return waitFor(function () {
             expect(mockShowAlert).toHaveBeenCalledWith({
               message: 'An error occurred while changing the permissions. Please try again.',
@@ -160,55 +160,67 @@ describe('MemberRecipientPermissions component', function () {
 
         case 6:
         case "end":
-          return _context4.stop();
+          return _context3.stop();
       }
-    }, _callee4);
+    }, _callee3);
   })));
-  it('should not call updateSharingMemberType when selecting same type', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-    var _setup4, getByText;
+  it('should not call updateSharingMemberType when selecting same type', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    var _setup4, getByRole;
 
-    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           mockUpdateSharingMemberType.mockResolvedValue(undefined);
           _setup4 = setup({
             type: 'two-way'
-          }), getByText = _setup4.getByText;
-          fireEvent.click(getByText('can change'));
-          fireEvent.click(getByText('Can change'));
+          }), getByRole = _setup4.getByRole;
+          fireEvent.click(getByRole('button', {
+            name: 'Editor'
+          }));
+          fireEvent.click(getByRole('menuitem', {
+            name: 'Editor'
+          }));
           expect(mockUpdateSharingMemberType).not.toHaveBeenCalled();
 
         case 5:
         case "end":
-          return _context5.stop();
+          return _context4.stop();
       }
-    }, _callee5);
+    }, _callee4);
   })));
   it('should not render menu when user is not owner and not the shared drive contact', function () {
     var _setup5 = setup({
       isOwner: false,
       instance: 'http://other-cozy.local:8080'
     }),
-        queryByText = _setup5.queryByText;
+        queryByRole = _setup5.queryByRole;
 
-    expect(queryByText('can change')).not.toBeInTheDocument();
-    expect(queryByText('can view')).not.toBeInTheDocument();
+    expect(queryByRole('button', {
+      name: 'Editor'
+    })).not.toBeInTheDocument();
+    expect(queryByRole('button', {
+      name: 'Viewer'
+    })).not.toBeInTheDocument();
   });
   it('should render menu for owner', function () {
     var _setup6 = setup({
       isOwner: true
     }),
-        getByText = _setup6.getByText;
+        getByRole = _setup6.getByRole;
 
-    expect(getByText('can change')).toBeInTheDocument();
+    expect(getByRole('button', {
+      name: 'Editor'
+    })).toBeInTheDocument();
   });
   it('should render menu for the user themselves', function () {
     var _setup7 = setup({
       isOwner: false,
       instance: 'http://cozy.local:8080'
     }),
-        getByText = _setup7.getByText;
+        getByRole = _setup7.getByRole;
 
-    expect(getByText('can change')).toBeInTheDocument();
+    expect(getByRole('button', {
+      name: 'Editor'
+    })).toBeInTheDocument();
   });
 });

package/dist/components/Recipient/RecipientConfirm.js

@@ -16,11 +16,6 @@ var modalStyles = {
   "error": "share__error___pwqPO",
   "share-byemail-onlybylink": "share__share-byemail-onlybylink___29W-t",
   "aligned-dropdown-button": "share__aligned-dropdown-button___3crgG",
-  "share-type-control": "share__share-type-control___1YoRr",
-  "select-wrapper": "share__select-wrapper___3XBKC",
-  "select-option": "share__select-option___3Jp8_",
-  "select-option-label": "share__select-option-label___1BWz_",
-  "select-option-desc": "share__select-option-desc___3jOnr",
   "share-details-created": "share__share-details-created___z3nvO",
   "share-details-perm": "share__share-details-perm___3HjxK",
   "share-details-perm-desc": "share__share-details-perm-desc___3HyHu"

package/dist/components/ShareAutosuggest.js

@@ -19,7 +19,8 @@ var styles = {
   "suggestionHighlighted": "autosuggest__suggestionHighlighted___1vpXJ",
   "suggestionInput": "autosuggest__suggestionInput___3SK9w",
   "recipientsContainer": "autosuggest__recipientsContainer___1JYxA",
-  "recipientChip": "autosuggest__recipientChip___d5I3R"
+  "recipientChip": "autosuggest__recipientChip___d5I3R",
+  "endAdornment": "autosuggest__endAdornment___2EwTN"
 };
 import { cozyUrlMatch, emailMatch, groupNameMatch, fullnameMatch } from '../suggestionMatchers';
 
@@ -30,7 +31,8 @@ var ShareAutocomplete = function ShareAutocomplete(_ref) {
       recipients = _ref.recipients,
       onPick = _ref.onPick,
       onRemove = _ref.onRemove,
-      placeholder = _ref.placeholder;
+      placeholder = _ref.placeholder,
+      endAdornment = _ref.endAdornment;
 
   var _useState = useState(''),
       _useState2 = _slicedToArray(_useState, 2),
@@ -191,7 +193,9 @@ var ShareAutocomplete = function ShareAutocomplete(_ref) {
       onKeyUp: onKeyUp
     })), loading && isLoadingDisplayed ? /*#__PURE__*/React.createElement(Spinner, {
       color: "var(--primaryColor)"
-    }) : null);
+    }) : null, endAdornment ? /*#__PURE__*/React.createElement("div", {
+      className: styles['endAdornment']
+    }, endAdornment) : null);
   };
 
   var renderSuggestion = function renderSuggestion(contactOrGroup) {
@@ -236,6 +240,7 @@ ShareAutocomplete.propTypes = {
   recipients: PropTypes.array.isRequired,
   onPick: PropTypes.func.isRequired,
   onRemove: PropTypes.func.isRequired,
-  placeholder: PropTypes.string
+  placeholder: PropTypes.string,
+  endAdornment: PropTypes.node
 };
 export default ShareAutocomplete;