cozy-sharing 40.1.6 → 40.1.7

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [40.1.7](https://github.com/cozy/cozy-libs/compare/cozy-sharing@40.1.6...cozy-sharing@40.1.7) (2026-10-27)
+
+**Note:** Version bump only for package cozy-sharing
+
 ## [40.1.6](https://github.com/cozy/cozy-libs/compare/cozy-sharing@40.1.5...cozy-sharing@40.1.6) (2026-10-26)
 
 **Note:** Version bump only for package cozy-sharing

package/dist/components/FederatedFolder/FederatedFolderModal.js

@@ -6,7 +6,6 @@ var _excluded = ["document"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useState } from 'react';
-import { useClient } from 'cozy-client';
 import minilog from 'cozy-minilog';
 import Button from 'cozy-ui/transpiled/react/Buttons';
 import { FixedDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
@@ -14,9 +13,9 @@ import Typography from 'cozy-ui/transpiled/react/Typography';
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
 import ConfirmDialogProvider, { useConfirmDialog } from 'cozy-ui/transpiled/react/providers/ConfirmDialog';
 import { useI18n } from 'twake-i18n';
-import { getOrCreateFromArray } from '../../helpers/contacts';
 import withLocales from '../../hoc/withLocales';
 import { usePendingRecipients } from '../../hooks/usePendingRecipients';
+import { useResolveRecipients } from '../../hooks/useResolveRecipients';
 import { useSharingContext } from '../../hooks/useSharingContext';
 var styles = {
   "share-modal-content": "share__share-modal-content___1iqEq",
@@ -39,7 +38,7 @@ var styles = {
 import AntivirusAlert from '../AntivirusAlert';
 import { default as DumbShareByEmail } from '../ShareByEmail';
 import ShareByLink from '../ShareByLink';
-import WhoHasAccess from '../WhoHasAccess';
+import WhoHasAccessWrapper from '../WhoHasAccessWrapper';
 var log = minilog('FederatedFolderModal');
 
 var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
@@ -57,7 +56,7 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
   // we close the popup and we do not want to see briefly the new contacts added
   // in members before the modal closes. That's why when clicking on "Share"
   // we do not use the reactive existingDocument and existingRecipients.
-  var client = useClient();
+  var resolveRecipients = useResolveRecipients();
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
@@ -180,7 +179,8 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
 
   var onSend = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var contacts, readWriteRecipients, readOnlyRecipients;
+      var _yield$resolveRecipie2, readWriteRecipients, readOnlyRecipients;
+
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -198,14 +198,12 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
             setFrozenRecipients(recipients);
             _context2.prev = 6;
             _context2.next = 9;
-            return getOrCreateFromArray(client, pendingRecipients, function (contact) {
-              return client.create('io.cozy.contacts', contact);
-            });
+            return resolveRecipients(pendingRecipients, selectedOption);
 
           case 9:
-            contacts = _context2.sent;
-            readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts;
-            readOnlyRecipients = selectedOption === 'readOnly' ? contacts : [];
+            _yield$resolveRecipie2 = _context2.sent;
+            readWriteRecipients = _yield$resolveRecipie2.recipients;
+            readOnlyRecipients = _yield$resolveRecipie2.readOnlyRecipients;
             _context2.next = 14;
             return share({
               description: folderName,
@@ -336,7 +334,7 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
       selectedOption: selectedOption,
       onSelectedOptionChange: setSelectedOption,
       enableCreateContact: true
-    }))), /*#__PURE__*/React.createElement(WhoHasAccess, {
+    }))), /*#__PURE__*/React.createElement(WhoHasAccessWrapper, {
       isOwner: isCurrentUserOwner,
       canManageSharing: canManageSharing,
       isSharedDrive: true,

package/dist/components/Recipient/DowngradePermissionConfirmDialog.js

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import snarkdown from 'snarkdown';
 import { Icon, FolderOutlined, ArrowUp } from '@linagora/twake-icons';
-import { useClient } from 'cozy-client';
 import Button from 'cozy-ui/transpiled/react/Buttons';
 import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
 import Timeline from 'cozy-ui/transpiled/react/Timeline';
@@ -16,27 +15,18 @@ import TimelineSeparator from 'cozy-ui/transpiled/react/TimelineSeparator';
 import Typography from 'cozy-ui/transpiled/react/Typography';
 import { useI18n } from 'twake-i18n';
 import { DEFAULT_DISPLAY_NAME } from '../../helpers/recipients';
-import { useFetchDocumentPath } from '../../hooks/useFetchDocumentPath';
-import { useSharingContext } from '../../hooks/useSharingContext';
 import { getDisplayName } from '../../models';
 
 var DowngradePermissionConfirmDialog = function DowngradePermissionConfirmDialog(_ref) {
   var document = _ref.document,
       recipient = _ref.recipient,
+      sharedParentName = _ref.sharedParentName,
       onCancel = _ref.onCancel,
       onConfirm = _ref.onConfirm;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var client = useClient();
-
-  var _useSharingContext = useSharingContext(),
-      getSharedParentPath = _useSharingContext.getSharedParentPath;
-
-  var documentPath = useFetchDocumentPath(client, document);
-  var sharedParentPath = documentPath && getSharedParentPath(documentPath);
-  var parentFolderName = sharedParentPath === null || sharedParentPath === void 0 ? void 0 : sharedParentPath.split('/').pop();
   var contactName = getDisplayName(recipient, t(DEFAULT_DISPLAY_NAME));
 
   var _snarkdown$split = snarkdown(t('DowngradePermissionConfirmDialog.content', {
@@ -68,7 +58,7 @@ var DowngradePermissionConfirmDialog = function DowngradePermissionConfirmDialog
       size: 24
     }))), /*#__PURE__*/React.createElement(TimelineConnector, null)), /*#__PURE__*/React.createElement(TimelineContent, null, /*#__PURE__*/React.createElement(Typography, {
       variant: "body2"
-    }, parentFolderName), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("s", null, /*#__PURE__*/React.createElement(Typography, {
+    }, sharedParentName), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("s", null, /*#__PURE__*/React.createElement(Typography, {
       display: "inline",
       variant: "caption"
     }, t('Share.type.two-way'))), /*#__PURE__*/React.createElement(Icon, {
@@ -123,6 +113,7 @@ var DowngradePermissionConfirmDialog = function DowngradePermissionConfirmDialog
 DowngradePermissionConfirmDialog.propTypes = {
   document: PropTypes.object.isRequired,
   recipient: PropTypes.object.isRequired,
+  sharedParentName: PropTypes.string,
   onCancel: PropTypes.func.isRequired,
   onConfirm: PropTypes.func.isRequired
 };

package/dist/components/Recipient/GroupRecipient.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useState } from 'react';
-import { useClient } from 'cozy-client';
 import Fade from 'cozy-ui/transpiled/react/Fade';
 import ListItem from 'cozy-ui/transpiled/react/ListItem';
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon';
@@ -25,8 +24,6 @@ var GroupRecipient = function GroupRecipient(props) {
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var client = useClient();
-
   var _useBreakpoints = useBreakpoints(),
       isMobile = _useBreakpoints.isMobile;
 
@@ -40,7 +37,7 @@ var GroupRecipient = function GroupRecipient(props) {
     return !['revoked', 'mail-not-sent'].includes(member.status);
   }).length;
   var isUserInsideMembers = members.some(function (member) {
-    return member.instance === client.options.uri;
+    return member.isCurrentUser;
   });
 
   var toogleDetailOpened = function toogleDetailOpened() {

package/dist/components/Recipient/GroupRecipient.stories.js

@@ -15,7 +15,9 @@ var meta = {
     }, {
       status: 'revoked'
     }],
-    groupIndex: 0
+    groupIndex: 0,
+    onRevokeGroup: function onRevokeGroup() {},
+    onLeaveGroup: function onLeaveGroup() {}
   }
 };
 export default meta;

package/dist/components/Recipient/GroupRecipientDetailWithAccess.js

@@ -1,5 +1,4 @@
 import React from 'react';
-import { useClient } from 'cozy-client';
 import Avatar from 'cozy-ui/transpiled/react/Avatar';
 import List from 'cozy-ui/transpiled/react/List';
 import ListItem from 'cozy-ui/transpiled/react/ListItem';
@@ -16,12 +15,10 @@ var GroupRecipientDetailWithAccess = function GroupRecipientDetailWithAccess(_re
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var client = useClient();
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Typography, {
     variant: "subtitle2"
   }, t('GroupRecipientDetail.withAccess.title')), /*#__PURE__*/React.createElement(List, null, withAccess.map(function (recipient) {
     var name = getDisplayName(recipient);
-    var isMe = recipient.instance === client.options.uri;
     return /*#__PURE__*/React.createElement(ListItem, {
       disableGutters: true,
       key: recipient.index,
@@ -32,7 +29,7 @@ var GroupRecipientDetailWithAccess = function GroupRecipientDetailWithAccess(_re
       primary: name,
       secondary: /*#__PURE__*/React.createElement(MemberRecipientStatus, {
         status: recipient.status,
-        isMe: isMe,
+        isMe: Boolean(recipient.isCurrentUser),
         instance: recipient.instance,
         email: recipient.email,
         name: recipient.name || recipient.public_name

package/dist/components/Recipient/GroupRecipientPermissions.js

@@ -14,7 +14,6 @@ import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import Typography from 'cozy-ui/transpiled/react/Typography';
 import { useI18n } from 'twake-i18n';
 import { permission } from './actions/permission';
-import { useSharingContext } from '../../hooks/useSharingContext';
 import { GroupAvatar } from '../Avatar/GroupAvatar';
 
 var GroupRecipientPermissions = function GroupRecipientPermissions(_ref) {
@@ -29,17 +28,15 @@ var GroupRecipientPermissions = function GroupRecipientPermissions(_ref) {
       read_only = _ref$read_only === void 0 ? false : _ref$read_only,
       className = _ref.className,
       isUserInsideMembers = _ref.isUserInsideMembers,
-      document = _ref.document;
+      document = _ref.document,
+      onRevokeGroup = _ref.onRevokeGroup,
+      onLeaveGroup = _ref.onLeaveGroup;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
   var buttonRef = useRef();
 
-  var _useSharingContext = useSharingContext(),
-      revokeGroup = _useSharingContext.revokeGroup,
-      revokeSelf = _useSharingContext.revokeSelf;
-
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       isMenuDisplayed = _useState2[0],
@@ -73,7 +70,7 @@ var GroupRecipientPermissions = function GroupRecipientPermissions(_ref) {
             }
 
             _context.next = 4;
-            return revokeGroup(document, sharingId, groupIndex);
+            return onRevokeGroup(document, sharingId, groupIndex);
 
           case 4:
             _context.next = 8;
@@ -81,7 +78,7 @@ var GroupRecipientPermissions = function GroupRecipientPermissions(_ref) {
 
           case 6:
             _context.next = 8;
-            return revokeSelf(document);
+            return onLeaveGroup(document);
 
           case 8:
             setRevoking(false);

package/dist/components/Recipient/GroupRecipientPermissions.stories.js

@@ -4,6 +4,8 @@ var meta = {
   args: {
     onRevoke: function onRevoke() {},
     onRevokeSelf: function onRevokeSelf() {},
+    onRevokeGroup: function onRevokeGroup() {},
+    onLeaveGroup: function onLeaveGroup() {},
     type: 'two-way',
     status: 'ready',
     groupIndex: 0

package/dist/components/Recipient/LinkRecipient.js

@@ -15,7 +15,6 @@ import LinkRecipientPermissions from './LinkRecipientPermissions';
 import RecipientConfirm from './RecipientConfirm';
 import { checkIsPermissionHasPassword, getPermissionExpiresDate } from '../../helpers/permissions';
 import { FADE_IN_DURATION } from '../../helpers/recipients';
-import { useSharingContext } from '../../hooks/useSharingContext';
 import { ShareRestrictionModal } from '../ShareRestrictionModal/ShareRestrictionModal';
 
 var LinkRecipientTextReadOnly = function LinkRecipientTextReadOnly(_ref) {
@@ -58,21 +57,18 @@ var LinkRecipient = function LinkRecipient(props) {
   var _useBreakpoints = useBreakpoints(),
       isMobile = _useBreakpoints.isMobile;
 
-  var _useSharingContext = useSharingContext(),
-      getDocumentPermissions = _useSharingContext.getDocumentPermissions;
-
   var recipientConfirmationData = props.recipientConfirmationData,
       verifyRecipient = props.verifyRecipient,
       fadeIn = props.fadeIn,
       document = props.document,
-      isReadOnly = props.isReadOnly;
+      isReadOnly = props.isReadOnly,
+      permissions = props.permissions;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       openShareRestrictionModal = _useState2[0],
       setOpenShareRestrictionModal = _useState2[1];
 
-  var permissions = getDocumentPermissions(document === null || document === void 0 ? void 0 : document._id);
   var hasPassword = checkIsPermissionHasPassword(permissions);
   var expiresDate = getPermissionExpiresDate(permissions);
   var dateFormatted = expiresDate ? f(expiresDate, lang === 'fr' ? 'dd/LL/yyyy' : 'LL/dd/yyyy') : null;

package/dist/components/Recipient/LinkRecipient.stories.js

@@ -9,6 +9,10 @@ var meta = {
     document: {
       _id: '123'
     },
+    documentType: 'Files',
+    permissions: [],
+    onUpdateLinkPermissions: function onUpdateLinkPermissions() {},
+    onRevokeLink: function onRevokeLink() {},
     fadeIn: false
   }
 };

package/dist/components/Recipient/LinkRecipientPermissions.js

@@ -11,12 +11,15 @@ import { setReadOnlySharedPermission } from './actions/setReadOnlySharedPermissi
 import { setReadWriteSharedPermission } from './actions/setReadWriteSharedPermission';
 import { isOnlyReadOnlyLinkAllowed } from '../../helpers/link';
 import { checkIsReadOnlyPermissions } from '../../helpers/permissions';
-import { useSharingContext } from '../../hooks/useSharingContext';
 import { WRITE_PERMS, READ_ONLY_PERMS } from '../ShareRestrictionModal/helpers';
 
 var LinkRecipientPermissions = function LinkRecipientPermissions(_ref) {
   var document = _ref.document,
-      isReadOnly = _ref.isReadOnly;
+      documentType = _ref.documentType,
+      isReadOnly = _ref.isReadOnly,
+      permissions = _ref.permissions,
+      onUpdateLinkPermissions = _ref.onUpdateLinkPermissions,
+      onRevokeLink = _ref.onRevokeLink;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
@@ -28,13 +31,6 @@ var LinkRecipientPermissions = function LinkRecipientPermissions(_ref) {
       isMenuDisplayed = _useState2[0],
       setMenuDisplayed = _useState2[1];
 
-  var _useSharingContext = useSharingContext(),
-      updateDocumentPermissions = _useSharingContext.updateDocumentPermissions,
-      revokeSharingLink = _useSharingContext.revokeSharingLink,
-      documentType = _useSharingContext.documentType,
-      getDocumentPermissions = _useSharingContext.getDocumentPermissions;
-
-  var permissions = getDocumentPermissions(document._id);
   var isReadOnlyPermissions = checkIsReadOnlyPermissions(permissions);
   var type = isReadOnlyPermissions ? 'one-way' : 'two-way';
 
@@ -48,14 +44,14 @@ var LinkRecipientPermissions = function LinkRecipientPermissions(_ref) {
 
   var handleSetType = function handleSetType(newType) {
     var verbs = newType === 'one-way' ? READ_ONLY_PERMS : WRITE_PERMS;
-    updateDocumentPermissions(document, {
+    onUpdateLinkPermissions(document, {
       verbs: verbs
     });
     hideMenu();
   };
 
   var handleRevocation = function handleRevocation() {
-    return revokeSharingLink(document);
+    return onRevokeLink(document);
   };
 
   var actionsToShow = [setReadOnlySharedPermission];
@@ -90,6 +86,11 @@ var LinkRecipientPermissions = function LinkRecipientPermissions(_ref) {
 };
 
 LinkRecipientPermissions.propTypes = {
-  document: PropTypes.object.isRequired
+  document: PropTypes.object.isRequired,
+  documentType: PropTypes.string.isRequired,
+  isReadOnly: PropTypes.bool,
+  permissions: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onUpdateLinkPermissions: PropTypes.func.isRequired,
+  onRevokeLink: PropTypes.func.isRequired
 };
 export default LinkRecipientPermissions;

package/dist/components/Recipient/LinkRecipientPermissions.stories.js

@@ -4,7 +4,11 @@ var meta = {
   args: {
     document: {
       _id: '123'
-    }
+    },
+    documentType: 'Files',
+    permissions: [],
+    onUpdateLinkPermissions: function onUpdateLinkPermissions() {},
+    onRevokeLink: function onRevokeLink() {}
   }
 };
 export default meta;

package/dist/components/Recipient/MemberRecipient.js

@@ -1,9 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["instance", "isOwner", "status", "recipientConfirmationData", "verifyRecipient", "fadeIn", "isOrgSharedDrive"];
+var _excluded = ["instance", "isOwner", "status", "isCurrentUser", "recipientConfirmationData", "verifyRecipient", "fadeIn", "isOrgSharedDrive"];
 import PropTypes from 'prop-types';
 import React from 'react';
-import { useClient } from 'cozy-client';
 import Fade from 'cozy-ui/transpiled/react/Fade';
 import ListItem from 'cozy-ui/transpiled/react/ListItem';
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon';
@@ -22,21 +21,21 @@ var MemberRecipient = function MemberRecipient(props) {
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var client = useClient();
-
   var _useBreakpoints = useBreakpoints(),
       isMobile = _useBreakpoints.isMobile;
 
   var instance = props.instance,
       isOwner = props.isOwner,
       status = props.status,
+      _props$isCurrentUser = props.isCurrentUser,
+      isCurrentUser = _props$isCurrentUser === void 0 ? false : _props$isCurrentUser,
       recipientConfirmationData = props.recipientConfirmationData,
       verifyRecipient = props.verifyRecipient,
       fadeIn = props.fadeIn,
       isOrgSharedDrive = props.isOrgSharedDrive,
       rest = _objectWithoutProperties(props, _excluded);
 
-  var isMe = isOwner && status === 'owner' || instance === client.options.uri;
+  var isMe = isOwner && status === 'owner' || isCurrentUser;
   var defaultDisplayName = t(DEFAULT_DISPLAY_NAME);
   var name = getDisplayName(rest, defaultDisplayName);
   var RightPart = recipientConfirmationData ? /*#__PURE__*/React.createElement(RecipientConfirm, {
@@ -45,7 +44,8 @@ var MemberRecipient = function MemberRecipient(props) {
   }) : /*#__PURE__*/React.createElement(MemberRecipientPermissions, _extends({}, rest, {
     instance: instance,
     isOwner: isOwner,
-    status: status
+    status: status,
+    isCurrentUser: isCurrentUser
   }));
   return /*#__PURE__*/React.createElement(Fade, {
     in: true,
@@ -75,6 +75,7 @@ MemberRecipient.propTypes = {
   instance: PropTypes.string,
   isOwner: PropTypes.bool,
   status: PropTypes.string,
+  isCurrentUser: PropTypes.bool,
   recipientConfirmationData: PropTypes.object,
   verifyRecipient: PropTypes.func,
   isOrgSharedDrive: PropTypes.bool

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

@@ -5,18 +5,6 @@ import React from 'react';
 import { createMockClient } from 'cozy-client';
 import MemberRecipient from './MemberRecipient';
 import AppLike from '../../../test/AppLike';
-var mockUpdateDocumentPermissions = jest.fn();
-var mockUpdateSharingMemberType = jest.fn();
-jest.mock('../../hooks/useSharingContext', function () {
-  return {
-    useSharingContext: function useSharingContext() {
-      return {
-        updateDocumentPermissions: mockUpdateDocumentPermissions,
-        updateSharingMemberType: mockUpdateSharingMemberType
-      };
-    }
-  };
-});
 describe('MemberRecipient component', function () {
   var client = createMockClient({});
   client.options = {
@@ -49,6 +37,7 @@ describe('MemberRecipient component', function () {
   it('should render if isMe ', function () {
     var _setup = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way'
     }),
@@ -60,6 +49,7 @@ describe('MemberRecipient component', function () {
   it('should match snapshot if isOwner', function () {
     var _setup2 = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way',
       isOwner: true
@@ -79,6 +69,7 @@ describe('MemberRecipient component', function () {
           onRevokeSelf = jest.fn();
           _setup3 = setup({
             instance: 'foo.mycozy.cloud',
+            isCurrentUser: true,
             status: 'ready',
             type: 'two-way',
             documentType: 'Files',
@@ -105,6 +96,7 @@ describe('MemberRecipient component', function () {
           onRevokeSelf = jest.fn();
           _setup4 = setup({
             instance: 'foo.mycozy.cloud',
+            isCurrentUser: true,
             status: 'ready',
             type: 'two-way',
             isOwner: true,
@@ -128,6 +120,7 @@ describe('MemberRecipient component', function () {
 
     var _setup5 = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way',
       isOwner: false,
@@ -148,6 +141,7 @@ describe('MemberRecipient component', function () {
 
     var _setup6 = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way',
       isOwner: false,
@@ -165,6 +159,7 @@ describe('MemberRecipient component', function () {
 
     var _setup7 = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way',
       isOwner: false,

package/dist/components/Recipient/MemberRecipientPermissions.js

@@ -1,16 +1,16 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["isOwner", "canManageSharing", "canManageMembers", "status", "instance", "type", "document", "onRevoke", "onRevokeSelf", "sharingId", "memberIndex"];
+var _excluded = ["isOwner", "canManageSharing", "canManageMembers", "status", "isCurrentUser", "type", "document", "isInsideSharedParent", "sharedParentName", "onRevoke", "onRevokeSelf", "onSetMemberType", "sharingId", "memberIndex"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useCallback } from 'react';
 import { Icon, CrossCircleOutline } from '@linagora/twake-icons';
-import { useClient } from 'cozy-client';
 import IconButton from 'cozy-ui/transpiled/react/IconButton';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import Typography from 'cozy-ui/transpiled/react/Typography';
 import { useI18n } from 'twake-i18n';
-import { PermissionTypeMenu } from './PermissionTypeMenu';
+import PermissionTypeMenu from './PermissionTypeMenu';
+import { hasMemberActions } from '../../helpers/recipients';
 
 var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
   var isOwner = _ref.isOwner,
@@ -19,11 +19,15 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
       _ref$canManageMembers = _ref.canManageMembers,
       canManageMembers = _ref$canManageMembers === void 0 ? true : _ref$canManageMembers,
       status = _ref.status,
-      instance = _ref.instance,
+      _ref$isCurrentUser = _ref.isCurrentUser,
+      isCurrentUser = _ref$isCurrentUser === void 0 ? false : _ref$isCurrentUser,
       type = _ref.type,
       document = _ref.document,
+      isInsideSharedParent = _ref.isInsideSharedParent,
+      sharedParentName = _ref.sharedParentName,
       onRevoke = _ref.onRevoke,
       onRevokeSelf = _ref.onRevokeSelf,
+      onSetMemberType = _ref.onSetMemberType,
       sharingId = _ref.sharingId,
       memberIndex = _ref.memberIndex,
       recipient = _objectWithoutProperties(_ref, _excluded);
@@ -31,16 +35,19 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var client = useClient();
-
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       revoking = _useState2[0],
       setRevoking = _useState2[1];
 
-  var instanceMatchesClient = instance !== undefined && instance === client.options.uri;
   var contactIsOwner = status === 'owner';
-  var shouldShowMenu = canManageMembers && !revoking && !contactIsOwner && (instanceMatchesClient && !isOwner || canManageSharing);
+  var shouldShowMenu = !revoking && hasMemberActions({
+    status: status,
+    isCurrentUser: isCurrentUser,
+    isOwner: isOwner,
+    canManageSharing: canManageSharing,
+    canManageMembers: canManageMembers
+  });
   var handleRevocation = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -48,7 +55,7 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
           setRevoking(true);
           _context.prev = 1;
 
-          if (!(instanceMatchesClient && !isOwner)) {
+          if (!(isCurrentUser && !isOwner)) {
             _context.next = 7;
             break;
           }
@@ -74,15 +81,23 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
           return _context.stop();
       }
     }, _callee, null, [[1,, 9, 12]]);
-  })), [document, instanceMatchesClient, isOwner, memberIndex, onRevoke, onRevokeSelf, sharingId]);
+  })), [document, isCurrentUser, isOwner, memberIndex, onRevoke, onRevokeSelf, sharingId]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, revoking && /*#__PURE__*/React.createElement(Spinner, null), !shouldShowMenu && /*#__PURE__*/React.createElement(Typography, {
     variant: "body2"
   }, contactIsOwner ? t("Share.status.".concat(status)) : t("Share.type.".concat(type))), shouldShowMenu && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PermissionTypeMenu, {
-    sharingId: sharingId,
-    memberIndex: memberIndex,
     type: type !== null && type !== void 0 ? type : 'one-way',
     document: document,
-    recipient: recipient
+    recipient: recipient,
+    isInsideSharedParent: isInsideSharedParent,
+    sharedParentName: sharedParentName,
+    onSetType: function onSetType(newType, options) {
+      return onSetMemberType({
+        sharingId: sharingId,
+        memberIndex: memberIndex,
+        type: type !== null && type !== void 0 ? type : 'one-way',
+        recipient: recipient
+      }, newType, options);
+    }
   }), /*#__PURE__*/React.createElement(IconButton, {
     onClick: handleRevocation,
     size: "small",

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

@@ -4,17 +4,7 @@ import React from 'react';
 import { createMockClient } from 'cozy-client';
 import MemberRecipientPermissions from './MemberRecipientPermissions';
 import AppLike from '../../../test/AppLike';
-var mockUpdateSharingMemberType = jest.fn();
 var mockShowAlert = jest.fn();
-jest.mock('../../hooks/useSharingContext', function () {
-  return {
-    useSharingContext: function useSharingContext() {
-      return {
-        updateSharingMemberType: mockUpdateSharingMemberType
-      };
-    }
-  };
-});
 jest.mock('cozy-ui/transpiled/react/providers/Alert', function () {
   return {
     __esModule: true,
@@ -38,7 +28,7 @@ describe('MemberRecipientPermissions component', function () {
     isOwner: true,
     isSharedDrive: false,
     status: 'ready',
-    instance: 'http://cozy.local:8080',
+    isCurrentUser: true,
     type: 'two-way',
     document: {
       id: 'doc-123',
@@ -48,7 +38,8 @@ describe('MemberRecipientPermissions component', function () {
     sharingId: 'sharing-123',
     memberIndex: 1,
     onRevoke: jest.fn(),
-    onRevokeSelf: jest.fn()
+    onRevokeSelf: jest.fn(),
+    onSetMemberType: jest.fn()
   };
   beforeEach(function () {
     jest.clearAllMocks();
@@ -80,7 +71,7 @@ describe('MemberRecipientPermissions component', function () {
   it('should not render menu when user is not owner and not the shared drive contact', function () {
     var _setup = setup({
       isOwner: false,
-      instance: 'http://other-cozy.local:8080'
+      isCurrentUser: false
     }),
         queryByRole = _setup.queryByRole;
 
@@ -104,7 +95,7 @@ describe('MemberRecipientPermissions component', function () {
   it('should render menu for the user themselves', function () {
     var _setup3 = setup({
       isOwner: false,
-      instance: 'http://cozy.local:8080'
+      isCurrentUser: true
     }),
         getByRole = _setup3.getByRole;