cozy-sharing 37.2.11 → 37.2.12

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [37.2.12](https://github.com/cozy/cozy-libs/compare/cozy-sharing@37.2.11...cozy-sharing@37.2.12) (2026-07-30)
+
+### Bug Fixes
+
+- **sharing:** Make shared-drive member modals consistent and correct ([9dcf67d](https://github.com/cozy/cozy-libs/commit/9dcf67d375600a1a02298dc3036880ae37d08aef))
+
 ## [37.2.11](https://github.com/cozy/cozy-libs/compare/cozy-sharing@37.2.10...cozy-sharing@37.2.11) (2026-07-30)
 
 **Note:** Version bump only for package cozy-sharing

package/README.md

@@ -174,16 +174,17 @@ Link and email sharing can coexist on the same resource. The recipient's permiss
 | Org shared drive | `isOrgSharedDrive` = `sharing.drive === true && sharing.org_drive === true` | `state.js:324` |
 | `canLeave` | `false` for org shared drives | `state.js:335` |
 | `canReshare` | `!org_drive && !read_only` for drives; `open_sharing && !read_only` for folders | `state.js:342` |
-| Federated folder modal | Enabled by `drive.federated-shared-folder.enabled` flag | `ShareModal.jsx:39` |
+| Federated folder modal | Enabled by `drive.federated-shared-folder.enabled` flag and `document.driveId` | `ShareModal.jsx:39` |
 | Email sharing in federated folder | Disabled for files inside a federated shared folder (has `driveId` but is not the root) | `FederatedFolderModal.jsx:122-126` |
 | Link sharing in federated folder | Uses `getFederatedShareLink` which resolves the owner's instance URL | `FederatedFolderModal.jsx:108-110` |
+| Member view inside shared drive | Subfolder members see link management only (no member cross/perm). Root members with `canReshare` see full member management; read-only root members see link management only. | `FederatedFolderModal.jsx:118-133`, `SharingDetailsModal.jsx:38-39` |
 
 ### Share management
 
 | Condition | Rule | Source |
 |-----------|------|--------|
 | Editable modal | `isEditable = !byDocId[doc] \|\| isOwner(doc) \|\| canReshare(doc)` | `ShareModal.jsx:35-36` |
-| Non-editable view | `SharingDetailsModal` — read-only view of members, with revoke-self | `ShareModal.jsx:53-62` |
+| Non-editable view | `SharingDetailsModal` — read-only members (no cross/perm menu), with link management (gear + copy link) for shared drives | `ShareModal.jsx:53-62` |
 | Updating member type | `updateSharingMemberType` calls `setReadOnly` / `setReadWrite` on the stack | `SharingProvider.jsx:361-420` |
 | Revoke self | Available to all recipients | `SharingProvider.jsx:349-353` |
 | Revoke group | Available to owner/editor; removes all group members at once | `SharingProvider.jsx:336-347` |
@@ -252,3 +253,4 @@ Key decisions:
 - `EditableSharingModal` renders `ShareModal` (the dumb component), which decides `ShareDialogCozyToCozy` vs `ShareDialogOnlyByLink` based on flags and context.
 - `ShareDialogTwoStepsConfirmationContainer` wraps the cozy-to-cozy dialog when recipients need confirmation (untrusted contacts).
 - Federated mode: when `drive.federated-shared-folder.enabled` is true, `FederatedFolderModal` replaces the standard `EditableSharingModal`.
+- `WhoHasAccess` accepts an independent `canManageLink` prop to control link management (gear + perm dropdown) separately from `canManageMembers` which controls member management. This allows shared-drive members to see the link gear without the member cross/perm menu.

package/dist/components/FederatedFolder/FederatedFolderModal.js

@@ -41,7 +41,7 @@ import WhoHasAccess from '../WhoHasAccess';
 var log = minilog('FederatedFolderModal');
 
 var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
-  var _sharedDriveSharing$a, _sharedDriveSharing$a2;
+  var _sharedDriveSharing$a, _sharedDriveSharing$a2, _sharedDriveSharing$a3;
 
   var onClose = _ref.onClose,
       onRevokeSuccess = _ref.onRevokeSuccess,
@@ -137,7 +137,8 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
     return id === (existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument._id) || id === (existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.id);
   }));
   var isInsideSharedDrive = Boolean((existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.driveId) && !isSharedDriveRoot);
-  var isCurrentUserOwner = documentId ? isOwner(documentId) : false;
+  var isCurrentUserOwner = existingDocument !== null && existingDocument !== void 0 && existingDocument.driveId ? Boolean(sharedDriveSharing === null || sharedDriveSharing === void 0 || (_sharedDriveSharing$a3 = sharedDriveSharing.attributes) === null || _sharedDriveSharing$a3 === void 0 ? void 0 : _sharedDriveSharing$a3.owner) : documentId ? isOwner(documentId) : false;
+  var isMemberReadOnly = isInsideSharedDrive && !isCurrentUserOwner;
   var hasParentRestriction = isInsideSharedDrive || hasSharedParentByPath;
   var hasChildRestriction = Boolean(documentPath && hasSharedChild(documentPath));
   var canShareByEmail = !hasParentRestriction && !hasChildRestriction;
@@ -391,6 +392,8 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
       isOwner: isCurrentUserOwner,
       canManageSharing: canManageSharing,
       isSharedDrive: true,
+      canManageMembers: !isMemberReadOnly,
+      canManageLink: true,
       recipients: isSending ? frozenRecipients : existingRecipients,
       document: isSending ? frozenDoc : existingDocument,
       documentType: "Files",

package/dist/components/Recipient/GroupRecipientPermissions.js

@@ -21,7 +21,8 @@ var GroupRecipientPermissions = function GroupRecipientPermissions(_ref) {
   var name = _ref.name,
       color = _ref.color,
       isOwner = _ref.isOwner,
-      isReadOnly = _ref.isReadOnly,
+      _ref$canManageMembers = _ref.canManageMembers,
+      canManageMembers = _ref$canManageMembers === void 0 ? true : _ref$canManageMembers,
       sharingId = _ref.sharingId,
       groupIndex = _ref.groupIndex,
       _ref$read_only = _ref.read_only,
@@ -49,7 +50,7 @@ var GroupRecipientPermissions = function GroupRecipientPermissions(_ref) {
       revoking = _useState4[0],
       setRevoking = _useState4[1];
 
-  var shouldShowMenu = !isReadOnly && !revoking && (isOwner || isUserInsideMembers);
+  var shouldShowMenu = canManageMembers && !revoking && (isOwner || isUserInsideMembers);
 
   var toggleMenu = function toggleMenu() {
     return setMenuDisplayed(!isMenuDisplayed);

package/dist/components/Recipient/MemberRecipientPermissions.js

@@ -14,7 +14,8 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
   var isOwner = _ref.isOwner,
       _ref$canManageSharing = _ref.canManageSharing,
       canManageSharing = _ref$canManageSharing === void 0 ? isOwner : _ref$canManageSharing,
-      isReadOnly = _ref.isReadOnly,
+      _ref$canManageMembers = _ref.canManageMembers,
+      canManageMembers = _ref$canManageMembers === void 0 ? true : _ref$canManageMembers,
       status = _ref.status,
       instance = _ref.instance,
       type = _ref.type,
@@ -36,7 +37,7 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
 
   var instanceMatchesClient = instance !== undefined && instance === client.options.uri;
   var contactIsOwner = status === 'owner';
-  var shouldShowMenu = !isReadOnly && !revoking && !contactIsOwner && (instanceMatchesClient && !isOwner || canManageSharing);
+  var shouldShowMenu = canManageMembers && !revoking && !contactIsOwner && (instanceMatchesClient && !isOwner || canManageSharing);
   var handleRevocation = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {

package/dist/components/Recipient/RecipientList.js

@@ -10,8 +10,8 @@ var RecipientList = function RecipientList(_ref) {
       recipientsToBeConfirmed = _ref.recipientsToBeConfirmed,
       isOwner = _ref.isOwner,
       canManageSharing = _ref.canManageSharing,
+      canManageMembers = _ref.canManageMembers,
       isSharedDrive = _ref.isSharedDrive,
-      isReadOnly = _ref.isReadOnly,
       document = _ref.document,
       documentType = _ref.documentType,
       onRevoke = _ref.onRevoke,
@@ -28,7 +28,7 @@ var RecipientList = function RecipientList(_ref) {
     if (isGroupRecipient) {
       return /*#__PURE__*/React.createElement(GroupRecipient, _extends({}, recipient, {
         isOwner: isOwner,
-        isReadOnly: isReadOnly,
+        canManageMembers: canManageMembers,
         key: recipient.index,
         document: document,
         documentType: documentType,
@@ -42,8 +42,8 @@ var RecipientList = function RecipientList(_ref) {
       key: recipient.index,
       isOwner: isOwner,
       canManageSharing: canManageSharing,
+      canManageMembers: canManageMembers,
       isSharedDrive: isSharedDrive,
-      isReadOnly: isReadOnly,
       document: document,
       documentType: documentType,
       onRevoke: onRevoke,

package/dist/components/ShareModal/ShareModal.js

@@ -30,8 +30,7 @@ export var ShareModal = withLocales(function (props) {
       canReshare = _useSharingContext.canReshare,
       documentType = _useSharingContext.documentType,
       getRecipients = _useSharingContext.getRecipients,
-      revokeSelf = _useSharingContext.revokeSelf,
-      allLoaded = _useSharingContext.allLoaded;
+      revokeSelf = _useSharingContext.revokeSelf;
 
   var handleRevokeSelf = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(document) {
@@ -61,7 +60,7 @@ export var ShareModal = withLocales(function (props) {
   if (isEditable) {
     var isFederatedMode = flag('drive.federated-shared-folder.enabled');
 
-    if (isFederatedMode && allLoaded) {
+    if (isFederatedMode && document.driveId) {
       return /*#__PURE__*/React.createElement(FederatedFolderModal, _extends({
         document: document,
         onRevokeSuccess: onRevokeSuccess

package/dist/components/ShareModal/SharingDetailsModal.js

@@ -1,7 +1,8 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { Dialog } from 'cozy-ui/transpiled/react/CozyDialogs';
+import { FixedDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
 import { useI18n } from 'twake-i18n';
+import { useSharingContext } from '../../hooks/useSharingContext';
 var styles = {
   "share-modal-content": "share__share-modal-content___1iqEq",
   "coz-form": "share__coz-form___1ICST",
@@ -20,6 +21,7 @@ var styles = {
   "share-byemail-onlybylink": "share__share-byemail-onlybylink___29W-t",
   "aligned-dropdown-button": "share__aligned-dropdown-button___3crgG"
 };
+import ShareByLink from '../ShareByLink';
 import WhoHasAccess from '../WhoHasAccess';
 export var SharingDetailsModal = function SharingDetailsModal(_ref) {
   var recipients = _ref.recipients,
@@ -33,7 +35,13 @@ export var SharingDetailsModal = function SharingDetailsModal(_ref) {
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  return /*#__PURE__*/React.createElement(Dialog, {
+  var _useSharingContext = useSharingContext(),
+      getSharingLink = _useSharingContext.getSharingLink,
+      getFederatedShareLink = _useSharingContext.getFederatedShareLink;
+
+  var isSharedDrive = Boolean(document === null || document === void 0 ? void 0 : document.driveId);
+  var displayedLink = isSharedDrive ? getFederatedShareLink(document) : getSharingLink(document === null || document === void 0 ? void 0 : document._id);
+  return /*#__PURE__*/React.createElement(FixedDialog, {
     disableGutters: true,
     open: true,
     onClose: onClose,
@@ -42,14 +50,23 @@ export var SharingDetailsModal = function SharingDetailsModal(_ref) {
     content: /*#__PURE__*/React.createElement("div", {
       className: styles['share-modal-content']
     }, /*#__PURE__*/React.createElement(WhoHasAccess, {
-      isReadOnly: true,
+      canManageMembers: false,
+      canManageLink: isSharedDrive,
+      isSharedDrive: isSharedDrive,
       recipients: recipients,
       document: document,
       documentType: documentType,
       onRevoke: onRevoke,
       onRevokeSelf: onRevokeSelf,
-      link: "ok"
-    }))
+      link: displayedLink
+    })),
+    actions: isSharedDrive && /*#__PURE__*/React.createElement(ShareByLink, {
+      link: displayedLink,
+      document: document,
+      documentType: "Files",
+      showGenerateLinkButton: true,
+      autoOpenShareRestriction: false
+    })
   });
 };
 SharingDetailsModal.propTypes = {

package/dist/components/WhoHasAccess.js

@@ -37,6 +37,10 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
       isSharedDrive = _ref2$isSharedDrive === void 0 ? false : _ref2$isSharedDrive,
       _ref2$isReadOnly = _ref2.isReadOnly,
       isReadOnly = _ref2$isReadOnly === void 0 ? false : _ref2$isReadOnly,
+      _ref2$canManageMember = _ref2.canManageMembers,
+      canManageMembers = _ref2$canManageMember === void 0 ? !isReadOnly : _ref2$canManageMember,
+      _ref2$canManageLink = _ref2.canManageLink,
+      canManageLink = _ref2$canManageLink === void 0 ? canManageMembers : _ref2$canManageLink,
       _ref2$showOwner = _ref2.showOwner,
       showOwner = _ref2$showOwner === void 0 ? true : _ref2$showOwner,
       recipients = _ref2.recipients,
@@ -63,7 +67,7 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
   }, /*#__PURE__*/React.createElement(RecipientWaitingForConfirmationAlert, {
     recipientsToBeConfirmed: recipientsToBeConfirmed
   }), /*#__PURE__*/React.createElement(List, null, link && /*#__PURE__*/React.createElement(LinkRecipient, {
-    isReadOnly: isReadOnly,
+    isReadOnly: !canManageLink,
     document: document,
     documentType: documentType,
     onRevoke: onRevoke,
@@ -78,8 +82,8 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
     recipientsToBeConfirmed: recipientsToBeConfirmed,
     isOwner: isOwner,
     canManageSharing: canManageSharing,
+    canManageMembers: canManageMembers,
     isSharedDrive: isSharedDrive,
-    isReadOnly: isReadOnly,
     document: document,
     documentType: documentType,
     onRevoke: onRevoke,
@@ -92,6 +96,8 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
 WhoHasAccess.propTypes = {
   isOwner: PropTypes.bool,
   canManageSharing: PropTypes.bool,
+  canManageMembers: PropTypes.bool,
+  canManageLink: PropTypes.bool,
   showOwner: PropTypes.bool,
   recipients: PropTypes.array.isRequired,
   recipientsToBeConfirmed: PropTypes.arrayOf(PropTypes.shape({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "37.2.11",
+  "version": "37.2.12",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -59,7 +59,7 @@
     "cozy-intent": "^2.31.1",
     "cozy-minilog": "^3.10.1",
     "cozy-ui": "^140.5.0",
-    "cozy-ui-plus": "^12.3.5",
+    "cozy-ui-plus": "^12.3.6",
     "jest": "30.3.0",
     "jest-environment-jsdom": "30.3.0",
     "react": "16.12.0",
@@ -85,5 +85,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "163abe4aea6ccd37e5b6a256f30b081be81c0661"
+  "gitHead": "8dbc03f6ef437764cfec18a0b2a6e1b44102f7c3"
 }

package/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -118,7 +118,12 @@ const FederatedFolderModalContent = ({
   const isInsideSharedDrive = Boolean(
     existingDocument?.driveId && !isSharedDriveRoot
   )
-  const isCurrentUserOwner = documentId ? isOwner(documentId) : false
+  const isCurrentUserOwner = existingDocument?.driveId
+    ? Boolean(sharedDriveSharing?.attributes?.owner)
+    : documentId
+      ? isOwner(documentId)
+      : false
+  const isMemberReadOnly = isInsideSharedDrive && !isCurrentUserOwner
   const hasParentRestriction = isInsideSharedDrive || hasSharedParentByPath
   const hasChildRestriction = Boolean(
     documentPath && hasSharedChild(documentPath)
@@ -322,6 +327,8 @@ const FederatedFolderModalContent = ({
             isOwner={isCurrentUserOwner}
             canManageSharing={canManageSharing}
             isSharedDrive
+            canManageMembers={!isMemberReadOnly}
+            canManageLink={true}
             recipients={isSending ? frozenRecipients : existingRecipients}
             document={isSending ? frozenDoc : existingDocument}
             documentType="Files"

package/src/components/Recipient/GroupRecipientPermissions.jsx

@@ -20,7 +20,7 @@ const GroupRecipientPermissions = ({
   name,
   color,
   isOwner,
-  isReadOnly,
+  canManageMembers = true,
   sharingId,
   groupIndex,
   read_only = false,
@@ -36,7 +36,7 @@ const GroupRecipientPermissions = ({
   const [revoking, setRevoking] = useState(false)
 
   const shouldShowMenu =
-    !isReadOnly && !revoking && (isOwner || isUserInsideMembers)
+    canManageMembers && !revoking && (isOwner || isUserInsideMembers)
 
   const toggleMenu = () => setMenuDisplayed(!isMenuDisplayed)
   const hideMenu = () => setMenuDisplayed(false)

package/src/components/Recipient/MemberRecipientPermissions.jsx

@@ -12,7 +12,7 @@ import { PermissionTypeMenu } from './PermissionTypeMenu'
 const MemberRecipientPermissions = ({
   isOwner,
   canManageSharing = isOwner,
-  isReadOnly,
+  canManageMembers = true,
   status,
   instance,
   type,
@@ -31,7 +31,7 @@ const MemberRecipientPermissions = ({
     instance !== undefined && instance === client.options.uri
   const contactIsOwner = status === 'owner'
   const shouldShowMenu =
-    !isReadOnly &&
+    canManageMembers &&
     !revoking &&
     !contactIsOwner &&
     ((instanceMatchesClient && !isOwner) || canManageSharing)

package/src/components/Recipient/RecipientList.jsx

@@ -10,8 +10,8 @@ const RecipientList = ({
   recipientsToBeConfirmed,
   isOwner,
   canManageSharing,
+  canManageMembers,
   isSharedDrive,
-  isReadOnly,
   document,
   documentType,
   onRevoke,
@@ -35,7 +35,7 @@ const RecipientList = ({
         <GroupRecipient
           {...recipient}
           isOwner={isOwner}
-          isReadOnly={isReadOnly}
+          canManageMembers={canManageMembers}
           key={recipient.index}
           document={document}
           documentType={documentType}
@@ -52,8 +52,8 @@ const RecipientList = ({
         key={recipient.index}
         isOwner={isOwner}
         canManageSharing={canManageSharing}
+        canManageMembers={canManageMembers}
         isSharedDrive={isSharedDrive}
-        isReadOnly={isReadOnly}
         document={document}
         documentType={documentType}
         onRevoke={onRevoke}

package/src/components/ShareModal/ShareModal.jsx

@@ -23,8 +23,7 @@ export const ShareModal = withLocales(props => {
     canReshare,
     documentType,
     getRecipients,
-    revokeSelf,
-    allLoaded
+    revokeSelf
   } = useSharingContext()
 
   const handleRevokeSelf = async document => {
@@ -37,7 +36,7 @@ export const ShareModal = withLocales(props => {
 
   if (isEditable) {
     const isFederatedMode = flag('drive.federated-shared-folder.enabled')
-    if (isFederatedMode && allLoaded) {
+    if (isFederatedMode && document.driveId) {
       return (
         <FederatedFolderModal
           document={document}

package/src/components/ShareModal/SharingDetailsModal.jsx

@@ -1,10 +1,12 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 
-import { Dialog } from 'cozy-ui/transpiled/react/CozyDialogs'
+import { FixedDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
 import { useI18n } from 'twake-i18n'
 
+import { useSharingContext } from '../../hooks/useSharingContext'
 import styles from '../../styles/share.styl'
+import ShareByLink from '../ShareByLink'
 import WhoHasAccess from '../WhoHasAccess'
 
 export const SharingDetailsModal = ({
@@ -16,9 +18,15 @@ export const SharingDetailsModal = ({
   onClose
 }) => {
   const { t } = useI18n()
+  const { getSharingLink, getFederatedShareLink } = useSharingContext()
+
+  const isSharedDrive = Boolean(document?.driveId)
+  const displayedLink = isSharedDrive
+    ? getFederatedShareLink(document)
+    : getSharingLink(document?._id)
 
   return (
-    <Dialog
+    <FixedDialog
       disableGutters
       open={true}
       onClose={onClose}
@@ -27,16 +35,29 @@ export const SharingDetailsModal = ({
       content={
         <div className={styles['share-modal-content']}>
           <WhoHasAccess
-            isReadOnly
+            canManageMembers={false}
+            canManageLink={isSharedDrive}
+            isSharedDrive={isSharedDrive}
             recipients={recipients}
             document={document}
             documentType={documentType}
             onRevoke={onRevoke}
             onRevokeSelf={onRevokeSelf}
-            link="ok"
+            link={displayedLink}
           />
         </div>
       }
+      actions={
+        isSharedDrive && (
+          <ShareByLink
+            link={displayedLink}
+            document={document}
+            documentType="Files"
+            showGenerateLinkButton={true}
+            autoOpenShareRestriction={false}
+          />
+        )
+      }
     />
   )
 }

package/src/components/WhoHasAccess.jsx

@@ -32,6 +32,8 @@ const WhoHasAccess = ({
   canManageSharing = isOwner,
   isSharedDrive = false,
   isReadOnly = false,
+  canManageMembers = !isReadOnly,
+  canManageLink = canManageMembers,
   showOwner = true,
   recipients,
   recipientsToBeConfirmed = [],
@@ -58,7 +60,7 @@ const WhoHasAccess = ({
       <List>
         {link && (
           <LinkRecipient
-            isReadOnly={isReadOnly}
+            isReadOnly={!canManageLink}
             document={document}
             documentType={documentType}
             onRevoke={onRevoke}
@@ -80,8 +82,8 @@ const WhoHasAccess = ({
           recipientsToBeConfirmed={recipientsToBeConfirmed}
           isOwner={isOwner}
           canManageSharing={canManageSharing}
+          canManageMembers={canManageMembers}
           isSharedDrive={isSharedDrive}
-          isReadOnly={isReadOnly}
           document={document}
           documentType={documentType}
           onRevoke={onRevoke}
@@ -97,6 +99,8 @@ const WhoHasAccess = ({
 WhoHasAccess.propTypes = {
   isOwner: PropTypes.bool,
   canManageSharing: PropTypes.bool,
+  canManageMembers: PropTypes.bool,
+  canManageLink: PropTypes.bool,
   showOwner: PropTypes.bool,
   recipients: PropTypes.array.isRequired,
   recipientsToBeConfirmed: PropTypes.arrayOf(