cozy-sharing 28.3.4 → 28.4.0

package/dist/components/ShareByEmail.js

@@ -1,5 +1,5 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+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';
@@ -49,7 +49,9 @@ export var ShareByEmail = function ShareByEmail(_ref) {
       sharing = _ref.sharing,
       submitLabel = _ref.submitLabel,
       _ref$showNotification = _ref.showNotifications,
-      showNotifications = _ref$showNotification === void 0 ? true : _ref$showNotification;
+      showNotifications = _ref$showNotification === void 0 ? true : _ref$showNotification,
+      _ref$sharedDrive = _ref.sharedDrive,
+      sharedDrive = _ref$sharedDrive === void 0 ? false : _ref$sharedDrive;
   var client = useClient();
 
   var _useI18n = useI18n(),
@@ -58,6 +60,8 @@ export var ShareByEmail = function ShareByEmail(_ref) {
   var _useAlert = useAlert(),
       showAlert = _useAlert.showAlert;
 
+  var isFederatedMode = flag('drive.federated-shared-folder.enabled');
+
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
       recipients = _useState2[0],
@@ -88,10 +92,74 @@ export var ShareByEmail = function ShareByEmail(_ref) {
     setSelectedOption(value);
   };
 
-  var onRecipientPick = function onRecipientPick(recipient) {
-    var mergedRecipients = flag('sharing.show-recipient-groups') ? mergeRecipients(recipients, recipient) : spreadGroupAndMergeRecipients(recipients, recipient);
-    setRecipients(mergedRecipients);
-  };
+  var onRecipientPick = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(recipient) {
+      var contacts, mergedRecipients;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!isFederatedMode) {
+              _context.next = 17;
+              break;
+            }
+
+            setLoading(true);
+            _context.prev = 2;
+            _context.next = 5;
+            return getOrCreateFromArray(client, [recipient], createContact);
+
+          case 5:
+            contacts = _context.sent;
+            _context.next = 8;
+            return onShare({
+              document: document,
+              recipients: contacts,
+              readOnlyRecipients: [],
+              description: sharingDesc,
+              openSharing: false,
+              sharedDrive: true
+            });
+
+          case 8:
+            _context.next = 13;
+            break;
+
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](2);
+
+            if (showNotifications) {
+              showAlert({
+                message: t('Share.shareByEmail.error.addingRecipient'),
+                severity: 'error',
+                variant: 'filled'
+              });
+            }
+
+          case 13:
+            _context.prev = 13;
+            reset();
+            return _context.finish(13);
+
+          case 16:
+            return _context.abrupt("return");
+
+          case 17:
+            // Normal mode: just add to the list
+            mergedRecipients = flag('sharing.show-recipient-groups') ? mergeRecipients(recipients, recipient) : spreadGroupAndMergeRecipients(recipients, recipient);
+            setRecipients(mergedRecipients);
+
+          case 19:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[2, 10, 13, 16]]);
+    }));
+
+    return function onRecipientPick(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
 
   var onRecipientRemove = function onRecipientRemove(recipient) {
     var idx = recipients.findIndex(function (r) {
@@ -101,17 +169,17 @@ export var ShareByEmail = function ShareByEmail(_ref) {
   };
 
   var share = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var recipientsBefore, contacts, readWriteRecipients, readOnlyRecipients;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             if (!(recipients.length === 0)) {
-              _context.next = 2;
+              _context2.next = 2;
               break;
             }
 
-            return _context.abrupt("return");
+            return _context2.abrupt("return");
 
           case 2:
             // we can't use currentRecipients prop in getSuccessMessage because it may use
@@ -119,21 +187,21 @@ export var ShareByEmail = function ShareByEmail(_ref) {
             recipientsBefore = currentRecipients;
 
             if (!hasReachRecipientsLimit(recipientsBefore, recipients)) {
-              _context.next = 6;
+              _context2.next = 6;
               break;
             }
 
             setRecipientsLimit(true);
-            return _context.abrupt("return");
+            return _context2.abrupt("return");
 
           case 6:
             setLoading(true);
-            _context.prev = 7;
-            _context.next = 10;
+            _context2.prev = 7;
+            _context2.next = 10;
             return getOrCreateFromArray(client, recipients, createContact);
 
           case 10:
-            contacts = _context.sent;
+            contacts = _context2.sent;
             readWriteRecipients = [];
             readOnlyRecipients = [];
 
@@ -143,13 +211,14 @@ export var ShareByEmail = function ShareByEmail(_ref) {
               readWriteRecipients = contacts;
             }
 
-            _context.next = 16;
+            _context2.next = 16;
             return onShare({
               document: document,
               recipients: readWriteRecipients,
               readOnlyRecipients: readOnlyRecipients,
               description: sharingDesc,
-              openSharing: readWriteRecipients.length > 0
+              openSharing: readWriteRecipients.length > 0,
+              sharedDrive: sharedDrive
             });
 
           case 16:
@@ -161,18 +230,18 @@ export var ShareByEmail = function ShareByEmail(_ref) {
               });
             }
 
-            _context.next = 22;
+            _context2.next = 22;
             break;
 
           case 19:
-            _context.prev = 19;
-            _context.t0 = _context["catch"](7);
+            _context2.prev = 19;
+            _context2.t0 = _context2["catch"](7);
 
             if (showNotifications) {
               showAlert({
                 message: t.apply(void 0, _toConsumableArray(getErrorMessage({
                   t: t,
-                  err: _context.t0,
+                  err: _context2.t0,
                   documentType: documentType,
                   recipients: recipients,
                   selectedOption: selectedOption
@@ -183,24 +252,24 @@ export var ShareByEmail = function ShareByEmail(_ref) {
             }
 
           case 22:
-            _context.prev = 22;
+            _context2.prev = 22;
             reset();
-            return _context.finish(22);
+            return _context2.finish(22);
 
           case 25:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[7, 19, 22, 25]]);
+      }, _callee2, null, [[7, 19, 22, 25]]);
     }));
 
     return function share() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
   var getSharingOptions = function getSharingOptions() {
-    var isSharingReadOnly = sharing ? isReadOnlySharing(sharing, document._id) : false;
+    var isSharingReadOnly = sharing ? isReadOnlySharing(sharing, document === null || document === void 0 ? void 0 : document._id) : false;
     var readWrite = {
       value: 'readWrite',
       label: t('Share.type.two-way'),
@@ -230,8 +299,9 @@ export var ShareByEmail = function ShareByEmail(_ref) {
       return onRecipientRemove(recipient);
     },
     currentRecipients: currentRecipients,
-    recipients: recipients
-  })), showShareControl && /*#__PURE__*/React.createElement("div", {
+    recipients: recipients,
+    disabled: loading
+  })), !isFederatedMode && showShareControl && /*#__PURE__*/React.createElement("div", {
     className: styles['share-type-control']
   }, /*#__PURE__*/React.createElement(ShareTypeSelect, {
     value: selectedOption,
@@ -243,7 +313,7 @@ export var ShareByEmail = function ShareByEmail(_ref) {
     loading: loading,
     disabled: recipients.length === 0
   })), showRecipientsLimit ? /*#__PURE__*/React.createElement(ShareRecipientsLimitModal, {
-    documentName: document.name,
+    documentName: document === null || document === void 0 ? void 0 : document.name,
     onConfirm: function onConfirm() {
       return setRecipientsLimit(false);
     }
@@ -251,7 +321,7 @@ export var ShareByEmail = function ShareByEmail(_ref) {
 };
 ShareByEmail.propTypes = {
   currentRecipients: PropTypes.arrayOf(PropTypes.object),
-  document: PropTypes.object.isRequired,
+  document: PropTypes.object,
   documentType: PropTypes.string.isRequired,
   sharingDesc: PropTypes.string.isRequired,
   onShare: PropTypes.func.isRequired,
@@ -261,6 +331,8 @@ ShareByEmail.propTypes = {
   // Customize the label of the button that submit contacts
   submitLabel: PropTypes.string,
   // Display success or error notifications
-  showNotifications: PropTypes.bool
+  showNotifications: PropTypes.bool,
+  // Set to true for shared drive context
+  sharedDrive: PropTypes.bool
 };
 export default ShareByEmail;

package/dist/components/ShareByEmail.spec.js

@@ -6,14 +6,25 @@ import { act } from 'react-dom/test-utils';
 import flag from 'cozy-flags';
 import { ShareByEmail } from './ShareByEmail';
 import AppLike from '../../test/AppLike';
+import { getOrCreateFromArray } from '../helpers/contacts';
 jest.mock('../helpers/contacts', function () {
   return {
-    getOrCreateFromArray: function getOrCreateFromArray(client, recipients) {
-      return recipients;
-    }
+    // eslint-disable-next-line no-unused-vars
+    getOrCreateFromArray: jest.fn(function (client, recipients, _createContact) {
+      // Return the recipients as-is by default (simulating contact creation/lookup)
+      return Promise.resolve(recipients);
+    })
   };
 });
-jest.mock('cozy-flags');
+jest.mock('cozy-flags', function () {
+  return jest.fn(function (flagName) {
+    if (flagName === 'drive.federated-shared-folder.enabled') {
+      return false;
+    }
+
+    return null;
+  });
+});
 describe('ShareByEmailComponent', function () {
   var defaultDocument = {
     id: 'doc_id',
@@ -28,7 +39,9 @@ describe('ShareByEmailComponent', function () {
         _ref$document = _ref.document,
         document = _ref$document === void 0 ? defaultDocument : _ref$document,
         _ref$currentRecipient = _ref.currentRecipients,
-        currentRecipients = _ref$currentRecipient === void 0 ? [] : _ref$currentRecipient;
+        currentRecipients = _ref$currentRecipient === void 0 ? [] : _ref$currentRecipient,
+        _ref$sharedDrive = _ref.sharedDrive,
+        sharedDrive = _ref$sharedDrive === void 0 ? false : _ref$sharedDrive;
 
     var props = {
       documentType: 'Files',
@@ -36,13 +49,22 @@ describe('ShareByEmailComponent', function () {
       document: document,
       sharingDesc: sharingDesc,
       currentRecipients: currentRecipients,
-      createContact: jest.fn()
+      createContact: jest.fn(),
+      sharedDrive: sharedDrive
     };
     return render( /*#__PURE__*/React.createElement(AppLike, null, /*#__PURE__*/React.createElement(ShareByEmail, props)));
   };
 
   beforeEach(function () {
-    jest.clearAllMocks();
+    jest.clearAllMocks(); // Reset flag mock to default (non-federated mode)
+
+    flag.mockImplementation(function (flagName) {
+      if (flagName === 'drive.federated-shared-folder.enabled') {
+        return false;
+      }
+
+      return null;
+    });
   });
   it('shoud call share if submited', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var sharingDesc;
@@ -81,7 +103,8 @@ describe('ShareByEmailComponent', function () {
               readOnlyRecipients: [],
               recipients: [{
                 email: 'quentin@cozycloud.cc'
-              }]
+              }],
+              sharedDrive: false
             });
           });
 
@@ -95,7 +118,17 @@ describe('ShareByEmailComponent', function () {
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          flag.mockReturnValue(2);
+          flag.mockImplementation(function (flagName) {
+            if (flagName === 'sharing.recipients-limit') {
+              return 2;
+            }
+
+            if (flagName === 'drive.federated-shared-folder.enabled') {
+              return false;
+            }
+
+            return null;
+          });
           setup({
             currentRecipients: [{
               email: 'alice@gmail.com',
@@ -142,4 +175,73 @@ describe('ShareByEmailComponent', function () {
       }
     }, _callee2);
   })));
+  describe('federated mode', function () {
+    beforeEach(function () {
+      flag.mockImplementation(function (flagName) {
+        if (flagName === 'drive.federated-shared-folder.enabled') {
+          return true;
+        }
+
+        return null;
+      });
+      getOrCreateFromArray.mockResolvedValue([{
+        _id: 'contact1',
+        email: 'quentin@cozycloud.cc'
+      }]);
+    });
+    it('should directly share when selecting a recipient in federated mode', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      var sharingDesc, createContact;
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            sharingDesc = 'test';
+            createContact = jest.fn();
+            setup({
+              sharingDesc: sharingDesc,
+              createContact: createContact
+            });
+            act(function () {
+              fireEvent.change(screen.getByPlaceholderText('Add contacts or groups'), {
+                target: {
+                  value: 'quentin@cozycloud.cc'
+                }
+              });
+            });
+            act(function () {
+              fireEvent.keyPress(screen.getByPlaceholderText('Add contacts or groups'), {
+                key: 'Enter',
+                code: 'Enter',
+                charCode: 13
+              });
+            });
+            _context3.next = 7;
+            return waitFor(function () {
+              expect(getOrCreateFromArray).toHaveBeenCalledWith(expect.any(Object), [{
+                email: 'quentin@cozycloud.cc'
+              }], expect.any(Function));
+            });
+
+          case 7:
+            _context3.next = 9;
+            return waitFor(function () {
+              expect(onShare).toHaveBeenCalledWith({
+                document: defaultDocument,
+                recipients: [{
+                  _id: 'contact1',
+                  email: 'quentin@cozycloud.cc'
+                }],
+                readOnlyRecipients: [],
+                description: sharingDesc,
+                openSharing: false,
+                sharedDrive: true
+              });
+            });
+
+          case 9:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    })));
+  });
 });

package/dist/components/ShareByLink.js

@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import React, { useReducer, useState } from 'react';
 import { useI18n } from 'twake-i18n';
 import { useClient } from 'cozy-client';
+import flag from 'cozy-flags';
 import Button from 'cozy-ui/transpiled/react/Buttons';
 import Icon from 'cozy-ui/transpiled/react/Icon';
 import CopyIcon from 'cozy-ui/transpiled/react/Icons/Copy';
@@ -44,6 +45,7 @@ var ShareByLink = function ShareByLink(_ref) {
   var canShare = typeof ((_navigator = navigator) === null || _navigator === void 0 ? void 0 : _navigator.share) === 'function';
   var showCopyAndSendButtons = isMobile && canShare;
   var showOnlyCopyButton = !isMobile || !canShare;
+  var isFederated = flag('drive.federated-shared-folder.enabled');
 
   var _useReducer = useReducer(function (state) {
     return !state;
@@ -224,7 +226,7 @@ var ShareByLink = function ShareByLink(_ref) {
   }();
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "u-w-100 u-flex u-flex-justify-center"
+    className: isFederated ? 'u-w-100' : 'u-w-100 u-flex u-flex-justify-center'
   }, showCopyAndSendButtons && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     label: t("".concat(documentType, ".share.shareByLink.send")),
     variant: "secondary",
@@ -232,7 +234,6 @@ var ShareByLink = function ShareByLink(_ref) {
     startIcon: /*#__PURE__*/React.createElement(Icon, {
       icon: LinkIcon
     }),
-    className: "u-flex-auto u-mr-half",
     onClick: shareLink,
     busy: isGenerating
   }), /*#__PURE__*/React.createElement(Button, {
@@ -250,7 +251,6 @@ var ShareByLink = function ShareByLink(_ref) {
     startIcon: /*#__PURE__*/React.createElement(Icon, {
       icon: LinkIcon
     }),
-    className: "u-flex-auto u-mr-half",
     onClick: generateLinkAndCopyLinkToClipboard,
     busy: isGenerating
   }), isEditDialogOpen && /*#__PURE__*/React.createElement(ShareRestrictionModal, {

package/dist/components/ShareModal/ShareModal.js

@@ -7,12 +7,14 @@ import omit from 'lodash/omit';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { useLocation } from 'react-router';
+import flag from 'cozy-flags';
 import EditableSharingModal from './EditableSharingModal';
 import { SharingDetailsModal } from './SharingDetailsModal';
 import withLocales from '../../hoc/withLocales';
 import { useSharingContext } from '../../hooks/useSharingContext';
+import { FederatedFolderModal } from '../FederatedFolder/FederatedFolderModal';
 export var ShareModal = withLocales(function (props) {
-  var _location$state;
+  var _location$state, _byDocId$document$id;
 
   var location = useLocation === null || useLocation === void 0 ? void 0 : useLocation();
   var locationProps = location === null || location === void 0 || (_location$state = location.state) === null || _location$state === void 0 ? void 0 : _location$state.modalProps;
@@ -30,7 +32,8 @@ export var ShareModal = withLocales(function (props) {
       getOwner = _useSharingContext.getOwner,
       getSharingType = _useSharingContext.getSharingType,
       getRecipients = _useSharingContext.getRecipients,
-      revokeSelf = _useSharingContext.revokeSelf;
+      revokeSelf = _useSharingContext.revokeSelf,
+      allLoaded = _useSharingContext.allLoaded;
 
   var handleRevokeSelf = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(document) {
@@ -55,6 +58,19 @@ export var ShareModal = withLocales(function (props) {
     };
   }();
 
+  var isFederatedMode = flag('drive.federated-shared-folder.enabled');
+  var hasSharings = ((_byDocId$document$id = byDocId[document.id]) === null || _byDocId$document$id === void 0 || (_byDocId$document$id = _byDocId$document$id.sharings) === null || _byDocId$document$id === void 0 ? void 0 : _byDocId$document$id.length) > 0; // In federated mode, show FederatedFolderModal for unshared documents (sharing an existing folder).
+  // When isFederatedMode && hasSharings is true, we intentionally fall through to the legacy
+  // modals (EditableSharingModal / SharingDetailsModal) because federated-shared folders are
+  // handled by those components.
+
+  if (isFederatedMode && allLoaded && !hasSharings) {
+    return /*#__PURE__*/React.createElement(FederatedFolderModal, {
+      document: document,
+      onClose: rest.onClose
+    });
+  }
+
   var isEditable = !byDocId[document.id] || isOwner(document.id) || canReshare(document.id);
 
   if (isEditable) {

package/dist/components/ShareModal.js

@@ -24,7 +24,7 @@ export var ShareModal = function ShareModal(_ref) {
       sharingDesc = _ref.sharingDesc,
       twoStepsConfirmationMethods = _ref.twoStepsConfirmationMethods;
 
-  if (isSharedDrive) {
+  if (isSharedDrive && !flag('drive.federated-shared-folder.enabled')) {
     return /*#__PURE__*/React.createElement(SharedDriveEditModal, {
       document: document,
       sharing: sharing,

package/dist/components/ShareRecipientsInput.js

@@ -23,7 +23,8 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
       recipients = _ref.recipients,
       placeholder = _ref.placeholder,
       onPick = _ref.onPick,
-      onRemove = _ref.onRemove;
+      onRemove = _ref.onRemove,
+      disabled = _ref.disabled;
   var reachableContactsQuery = buildReachableContactsQuery();
   var reachableContactsResult = useQueryAll(reachableContactsQuery.definition, reachableContactsQuery.options);
   var unreachableContactsWithGroupsQuery = buildUnreachableContactsWithGroupsQuery();
@@ -65,6 +66,7 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
   var contactsAndGroups = [].concat(_toConsumableArray(reachableContactsResult.data || []), _toConsumableArray(contactGroups));
   return /*#__PURE__*/React.createElement(ShareAutosuggest, {
     loading: isLoading,
+    disabled: disabled,
     contactsAndGroups: contactsAndGroups,
     recipients: recipients,
     onPick: onPick,
@@ -78,7 +80,8 @@ ShareRecipientsInput.propTypes = {
   recipients: PropTypes.array,
   placeholder: PropTypes.string,
   onPick: PropTypes.func.isRequired,
-  onRemove: PropTypes.func.isRequired
+  onRemove: PropTypes.func.isRequired,
+  disabled: PropTypes.bool
 };
 ShareRecipientsInput.defaultProps = {
   currentRecipients: [],