cozy-sharing 33.2.0 → 33.2.2

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [33.2.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.2.1...cozy-sharing@33.2.2) (2026-06-10)
+
+### Bug Fixes
+
+- **cozy-sharing:** Allow sharing shared drive folder root by email ([5110b4f](https://github.com/cozy/cozy-libs/commit/5110b4fb306bb664f2c6b62f209ef4af1e25c293))
+- **cozy-sharing:** Fix lint issue in master ([5acd30a](https://github.com/cozy/cozy-libs/commit/5acd30a31412552be6b6223e43df2b320ea07098))
+
+## [33.2.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.2.0...cozy-sharing@33.2.1) (2026-06-09)
+
+### Bug Fixes
+
+- **cozy-sharing:** Refresh link state in share modal ([dfb6dd3](https://github.com/cozy/cozy-libs/commit/dfb6dd39e81b13a7da37ab8f5b4480fb645df01e))
+
 # [33.2.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.1.2...cozy-sharing@33.2.0) (2026-06-09)
 
 ### Features

package/dist/components/FederatedFolder/FederatedFolderModal.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import PropTypes from 'prop-types';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import { useClient } from 'cozy-client';
 import Button from 'cozy-ui/transpiled/react/Buttons';
 import { FixedDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
@@ -38,6 +38,8 @@ import ShareByLink from '../ShareByLink';
 import WhoHasAccess from '../WhoHasAccess';
 
 var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
+  var _sharedDriveSharing$a;
+
   var onClose = _ref.onClose,
       existingDocument = _ref.document,
       autoOpenShareRestriction = _ref.autoOpenShareRestriction,
@@ -49,11 +51,9 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
 
   var _useSharingContext = useSharingContext(),
       share = _useSharingContext.share,
+      getSharingById = _useSharingContext.getSharingById,
       getSharingLink = _useSharingContext.getSharingLink,
       getFederatedShareLink = _useSharingContext.getFederatedShareLink,
-      getDocumentPermissions = _useSharingContext.getDocumentPermissions,
-      getOwner = _useSharingContext.getOwner,
-      getSharingById = _useSharingContext.getSharingById,
       getRecipients = _useSharingContext.getRecipients,
       hasSharedChild = _useSharingContext.hasSharedChild,
       hasSharedParent = _useSharingContext.hasSharedParent,
@@ -66,11 +66,6 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
       showConfirmDialog = _useConfirmDialog.showConfirmDialog,
       closeConfirmDialog = _useConfirmDialog.closeConfirmDialog;
 
-  var _useState = useState(null),
-      _useState2 = _slicedToArray(_useState, 2),
-      sharingLink = _useState2[0],
-      setSharingLink = _useState2[1];
-
   var _usePendingRecipients = usePendingRecipients(),
       pendingRecipients = _usePendingRecipients.pendingRecipients,
       setPendingRecipients = _usePendingRecipients.setPendingRecipients,
@@ -83,20 +78,20 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
   // we do not use the reactive existingDocument and existingRecipients.
 
 
-  var _useState3 = useState(false),
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      isSending = _useState2[0],
+      setIsSending = _useState2[1];
+
+  var _useState3 = useState(null),
       _useState4 = _slicedToArray(_useState3, 2),
-      isSending = _useState4[0],
-      setIsSending = _useState4[1];
+      frozenDoc = _useState4[0],
+      setFrozenDoc = _useState4[1];
 
   var _useState5 = useState(null),
       _useState6 = _slicedToArray(_useState5, 2),
-      frozenDoc = _useState6[0],
-      setFrozenDoc = _useState6[1];
-
-  var _useState7 = useState(null),
-      _useState8 = _slicedToArray(_useState7, 2),
-      frozenRecipients = _useState8[0],
-      setFrozenRecipients = _useState8[1];
+      frozenRecipients = _useState6[0],
+      setFrozenRecipients = _useState6[1];
 
   var handleCloseRequest = useCallback(function () {
     if (pendingRecipients.length === 0) {
@@ -122,90 +117,50 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
       }))
     });
   }, [closeConfirmDialog, onClose, pendingRecipients.length, showConfirmDialog, t]);
-  var documentPermissions = useMemo(function () {
-    return existingDocument ? getDocumentPermissions(existingDocument._id) : [];
-  }, [existingDocument, getDocumentPermissions]);
-  useEffect(function () {
-    var fetchSharingLink = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var link;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (existingDocument) {
-                _context.next = 2;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 2:
-              if (!existingDocument.driveId) {
-                _context.next = 9;
-                break;
-              }
-
-              _context.next = 5;
-              return getFederatedShareLink(existingDocument);
-
-            case 5:
-              link = _context.sent;
-              setSharingLink(link);
-              _context.next = 10;
-              break;
-
-            case 9:
-              setSharingLink(getSharingLink(existingDocument._id));
-
-            case 10:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-
-      return function fetchSharingLink() {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-
-    fetchSharingLink();
-  }, [existingDocument, documentPermissions, getFederatedShareLink, getSharingLink, getOwner, getSharingById]);
   var folderName = (existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.name) || '';
   var documentPath = existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.path;
-  var hasParentRestriction = Boolean((existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.driveId) || documentPath && hasSharedParent(documentPath));
+  var sharedDriveSharing = existingDocument !== null && existingDocument !== void 0 && existingDocument.driveId ? getSharingById(existingDocument.driveId) : null;
+  var sharedDriveRootIds = (sharedDriveSharing === null || sharedDriveSharing === void 0 || (_sharedDriveSharing$a = sharedDriveSharing.attributes) === null || _sharedDriveSharing$a === void 0 || (_sharedDriveSharing$a = _sharedDriveSharing$a.rules) === null || _sharedDriveSharing$a === void 0 ? void 0 : _sharedDriveSharing$a.reduce(function (ids, rule) {
+    return ids.concat(rule.values || []);
+  }, [])) || [];
+  var isSharedDriveRoot = Boolean((existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.driveId) && sharedDriveRootIds.some(function (id) {
+    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 hasSharedParentByPath = Boolean(documentPath && hasSharedParent(documentPath));
+  var hasParentRestriction = isInsideSharedDrive || hasSharedParentByPath;
   var hasChildRestriction = Boolean(documentPath && hasSharedChild(documentPath));
   var canShareByEmail = !hasParentRestriction && !hasChildRestriction;
 
   var onSend = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var contacts, readWriteRecipients, readOnlyRecipients;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!(isSending || pendingRecipients.length === 0)) {
-              _context2.next = 3;
+              _context.next = 3;
               break;
             }
 
             onClose();
-            return _context2.abrupt("return");
+            return _context.abrupt("return");
 
           case 3:
             setIsSending(true);
             setFrozenDoc(existingDocument);
             setFrozenRecipients(existingRecipients);
-            _context2.prev = 6;
-            _context2.next = 9;
+            _context.prev = 6;
+            _context.next = 9;
             return getOrCreateFromArray(client, pendingRecipients, function (contact) {
               return client.create('io.cozy.contacts', contact);
             });
 
           case 9:
-            contacts = _context2.sent;
+            contacts = _context.sent;
             readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts;
             readOnlyRecipients = selectedOption === 'readOnly' ? contacts : [];
-            _context2.next = 14;
+            _context.next = 14;
             return share({
               description: folderName,
               document: existingDocument,
@@ -222,12 +177,12 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
               variant: 'filled'
             });
             onClose();
-            _context2.next = 21;
+            _context.next = 21;
             break;
 
           case 18:
-            _context2.prev = 18;
-            _context2.t0 = _context2["catch"](6);
+            _context.prev = 18;
+            _context.t0 = _context["catch"](6);
             showAlert({
               message: t('FederatedFolder.errorNotification'),
               severity: 'error',
@@ -235,23 +190,24 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
             });
 
           case 21:
-            _context2.prev = 21;
+            _context.prev = 21;
             setIsSending(false);
-            return _context2.finish(21);
+            return _context.finish(21);
 
           case 24:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2, null, [[6, 18, 21, 24]]);
+      }, _callee, null, [[6, 18, 21, 24]]);
     }));
 
     return function onSend() {
-      return _ref3.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 
   var existingRecipients = existingDocument ? getRecipients(existingDocument._id) : [];
+  var displayedLink = existingDocument !== null && existingDocument !== void 0 && existingDocument.driveId ? getFederatedShareLink(existingDocument) : getSharingLink(existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument._id);
   var modalTitle = t('FederatedFolder.shareTitle', {
     name: folderName
   });
@@ -296,10 +252,10 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
       documentType: "Files",
       className: "u-w-100",
       onRevoke: revoke,
-      link: sharingLink
+      link: displayedLink
     })),
     actions: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ShareByLink, {
-      link: sharingLink,
+      link: displayedLink,
       document: isSending ? frozenDoc : existingDocument,
       documentType: "Files",
       showGenerateLinkButton: showGenerateLinkButton,