cozy-sharing 32.1.2 → 32.3.2

package/dist/components/FederatedFolder/FederatedFolderModal.spec.js

@@ -51,46 +51,6 @@ jest.mock('../../hooks/usePendingRecipients', function () {
     usePendingRecipients: jest.fn()
   };
 });
-jest.mock('../SharedFolder/DumbBatchSharedFolderModal', function () {
-  return {
-    DumbBatchSharedFolderModal: function DumbBatchSharedFolderModal(_ref) {
-      var title = _ref.title,
-          recipients = _ref.recipients,
-          onRevoke = _ref.onRevoke,
-          onSend = _ref.onSend,
-          onClose = _ref.onClose,
-          sharingLink = _ref.sharingLink,
-          pendingRecipients = _ref.pendingRecipients,
-          selectedOption = _ref.selectedOption;
-      return /*#__PURE__*/React.createElement("div", {
-        "data-testid": "dumb-modal"
-      }, /*#__PURE__*/React.createElement("span", {
-        "data-testid": "title"
-      }, title), /*#__PURE__*/React.createElement("span", {
-        "data-testid": "sharing-link"
-      }, sharingLink), /*#__PURE__*/React.createElement("span", {
-        "data-testid": "recipients-count"
-      }, recipients.length), /*#__PURE__*/React.createElement("span", {
-        "data-testid": "pending-recipients-count"
-      }, pendingRecipients.length), /*#__PURE__*/React.createElement("span", {
-        "data-testid": "selected-option"
-      }, selectedOption), /*#__PURE__*/React.createElement("button", {
-        "data-testid": "btn-send",
-        onClick: onSend
-      }, "Send"), /*#__PURE__*/React.createElement("button", {
-        "data-testid": "btn-revoke",
-        onClick: function onClick() {
-          return onRevoke({
-            _id: 'folder-123'
-          }, 'abc', 1);
-        }
-      }, "Revoke"), /*#__PURE__*/React.createElement("button", {
-        "data-testid": "btn-close",
-        onClick: onClose
-      }, "Close"));
-    }
-  };
-});
 var mockDocument = {
   _id: 'folder-123',
   name: 'My Test Folder',
@@ -162,16 +122,14 @@ describe('FederatedFolderModal', function () {
 
   describe('initialization', function () {
     it('should pass document name as title', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _setup, getByTestId;
+      var _setup, findByText;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _setup = setup(), getByTestId = _setup.getByTestId;
+            _setup = setup(), findByText = _setup.findByText;
             _context.next = 3;
-            return waitFor(function () {
-              expect(getByTestId('title').textContent).toBe('Share "My Test Folder"');
-            });
+            return findByText('Share "My Test Folder"');
 
           case 3:
           case "end":
@@ -180,7 +138,7 @@ describe('FederatedFolderModal', function () {
       }, _callee);
     })));
     it('should pass default title when document has no name', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var documentWithoutName, _setup2, getByTestId;
+      var documentWithoutName, _setup2, findByText;
 
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -191,11 +149,9 @@ describe('FederatedFolderModal', function () {
             };
             _setup2 = setup({
               document: documentWithoutName
-            }), getByTestId = _setup2.getByTestId;
+            }), findByText = _setup2.findByText;
             _context2.next = 4;
-            return waitFor(function () {
-              expect(getByTestId('title').textContent).toBe('Share ""');
-            });
+            return findByText('Share ""');
 
           case 4:
           case "end":
@@ -203,17 +159,15 @@ describe('FederatedFolderModal', function () {
         }
       }, _callee2);
     })));
-    it('should pass sharing link to DumbBatchSharedFolderModal', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var _setup3, getByTestId;
+    it('should show Copy link', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      var _setup3, findByText;
 
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _setup3 = setup(), getByTestId = _setup3.getByTestId;
+            _setup3 = setup(), findByText = _setup3.findByText;
             _context3.next = 3;
-            return waitFor(function () {
-              expect(getByTestId('sharing-link').textContent).toBe('https://example.com/share/abc123');
-            });
+            return findByText('Copy link');
 
           case 3:
           case "end":
@@ -221,82 +175,43 @@ describe('FederatedFolderModal', function () {
         }
       }, _callee3);
     })));
-    it('should pass null sharing link when document is undefined', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-      var _setup4, getByTestId;
-
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            _setup4 = setup({
-              document: undefined
-            }), getByTestId = _setup4.getByTestId;
-            _context4.next = 3;
-            return waitFor(function () {
-              expect(getByTestId('sharing-link').textContent).toBe('');
-            });
-
-          case 3:
-          case "end":
-            return _context4.stop();
-        }
-      }, _callee4);
-    })));
-    it('should pass selectedOption from usePendingRecipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-      var _setup5, getByTestId;
-
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            _setup5 = setup(), getByTestId = _setup5.getByTestId;
-            _context5.next = 3;
-            return waitFor(function () {
-              expect(getByTestId('selected-option').textContent).toBe('readWrite');
-            });
-
-          case 3:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5);
-    })));
   });
   describe('onSend callback', function () {
     var pendingRecipient = {
       name: 'Alice',
       email: 'alice@example.com'
     };
-    it('should call onClose and skip share when there are no pending recipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-      var _setup6, getByTestId;
+    it('should call onClose and skip share when there are no pending recipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+      var _setup4, findByText, sendButton;
 
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             // pendingRecipients defaults to [] via beforeEach
-            _setup6 = setup(), getByTestId = _setup6.getByTestId;
-            _context6.next = 3;
-            return waitFor(function () {
-              expect(getByTestId('btn-send')).toBeTruthy();
-            });
+            _setup4 = setup(), findByText = _setup4.findByText;
+            _context4.next = 3;
+            return findByText('Done');
 
           case 3:
-            fireEvent.click(getByTestId('btn-send'));
-            _context6.next = 6;
+            sendButton = _context4.sent;
+            fireEvent.click(sendButton);
+            _context4.next = 7;
             return waitFor(function () {
               expect(mockOnClose).toHaveBeenCalled();
               expect(mockShare).not.toHaveBeenCalled();
             });
 
-          case 6:
+          case 7:
           case "end":
-            return _context6.stop();
+            return _context4.stop();
         }
-      }, _callee6);
+      }, _callee4);
     })));
-    it('should call share with correct parameters', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-      var _setup7, getByTestId;
+    it('should call share with correct parameters', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+      var _setup5, findByText, sendButton;
 
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [pendingRecipient],
@@ -306,15 +221,14 @@ describe('FederatedFolderModal', function () {
             });
             getOrCreateFromArray.mockResolvedValue([pendingRecipient]);
             mockShare.mockResolvedValueOnce({});
-            _setup7 = setup(), getByTestId = _setup7.getByTestId;
-            _context7.next = 6;
-            return waitFor(function () {
-              expect(getByTestId('btn-send')).toBeTruthy();
-            });
+            _setup5 = setup(), findByText = _setup5.findByText;
+            _context5.next = 6;
+            return findByText('Done');
 
           case 6:
-            fireEvent.click(getByTestId('btn-send'));
-            _context7.next = 9;
+            sendButton = _context5.sent;
+            fireEvent.click(sendButton);
+            _context5.next = 10;
             return waitFor(function () {
               expect(mockShare).toHaveBeenCalledWith({
                 description: 'My Test Folder',
@@ -326,17 +240,17 @@ describe('FederatedFolderModal', function () {
               });
             });
 
-          case 9:
+          case 10:
           case "end":
-            return _context7.stop();
+            return _context5.stop();
         }
-      }, _callee7);
+      }, _callee5);
     })));
-    it('should show success alert and close modal on successful share', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
-      var _setup8, getByTestId;
+    it('should show success alert and close modal on successful share', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+      var _setup6, findByText, sendButton;
 
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [pendingRecipient],
@@ -346,15 +260,14 @@ describe('FederatedFolderModal', function () {
             });
             getOrCreateFromArray.mockResolvedValue([pendingRecipient]);
             mockShare.mockResolvedValueOnce({});
-            _setup8 = setup(), getByTestId = _setup8.getByTestId;
-            _context8.next = 6;
-            return waitFor(function () {
-              expect(getByTestId('btn-send')).toBeTruthy();
-            });
+            _setup6 = setup(), findByText = _setup6.findByText;
+            _context6.next = 6;
+            return findByText('Done');
 
           case 6:
-            fireEvent.click(getByTestId('btn-send'));
-            _context8.next = 9;
+            sendButton = _context6.sent;
+            fireEvent.click(sendButton);
+            _context6.next = 10;
             return waitFor(function () {
               expect(mockShowAlert).toHaveBeenCalledWith({
                 message: 'Folder has been shared',
@@ -364,17 +277,17 @@ describe('FederatedFolderModal', function () {
               expect(mockOnClose).toHaveBeenCalled();
             });
 
-          case 9:
+          case 10:
           case "end":
-            return _context8.stop();
+            return _context6.stop();
         }
-      }, _callee8);
+      }, _callee6);
     })));
-    it('should show error alert when share fails', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
-      var _setup9, getByTestId;
+    it('should show error alert when share fails', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+      var _setup7, findByText, sendButton;
 
-      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [pendingRecipient],
@@ -384,15 +297,14 @@ describe('FederatedFolderModal', function () {
             });
             getOrCreateFromArray.mockResolvedValue([pendingRecipient]);
             mockShare.mockRejectedValueOnce(new Error('Share failed'));
-            _setup9 = setup(), getByTestId = _setup9.getByTestId;
-            _context9.next = 6;
-            return waitFor(function () {
-              expect(getByTestId('btn-send')).toBeTruthy();
-            });
+            _setup7 = setup(), findByText = _setup7.findByText;
+            _context7.next = 6;
+            return findByText('Done');
 
           case 6:
-            fireEvent.click(getByTestId('btn-send'));
-            _context9.next = 9;
+            sendButton = _context7.sent;
+            fireEvent.click(sendButton);
+            _context7.next = 10;
             return waitFor(function () {
               expect(mockShowAlert).toHaveBeenCalledWith({
                 message: 'Error while sharing folder',
@@ -402,103 +314,109 @@ describe('FederatedFolderModal', function () {
               expect(mockOnClose).not.toHaveBeenCalled();
             });
 
-          case 9:
+          case 10:
           case "end":
-            return _context9.stop();
+            return _context7.stop();
         }
-      }, _callee9);
+      }, _callee7);
     })));
   });
-  describe('onRevoke callback', function () {
-    it('should call revoke from sharing context for existing members', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-      var _setup10, getByTestId;
+  describe('onClose callback', function () {
+    it('should call onClose when close button is clicked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+      var _setup8, findByRole, closeButton;
 
-      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            mockRevoke.mockResolvedValueOnce({});
-            _setup10 = setup(), getByTestId = _setup10.getByTestId;
-            _context10.next = 4;
-            return waitFor(function () {
-              expect(getByTestId('dumb-modal')).toBeTruthy();
+            _setup8 = setup(), findByRole = _setup8.findByRole;
+            _context8.next = 3;
+            return findByRole('button', {
+              name: /close/i
             });
 
-          case 4:
-            fireEvent.click(getByTestId('btn-revoke'));
-            _context10.next = 7;
-            return waitFor(function () {
-              expect(mockRevoke).toHaveBeenCalledWith({
-                _id: 'folder-123'
-              }, 'abc', 1);
-            });
+          case 3:
+            closeButton = _context8.sent;
+            fireEvent.click(closeButton);
+            expect(mockOnClose).toHaveBeenCalled();
 
-          case 7:
+          case 6:
           case "end":
-            return _context10.stop();
+            return _context8.stop();
         }
-      }, _callee10);
+      }, _callee8);
     })));
-  });
-  describe('onClose callback', function () {
-    it('should call onClose when close button is clicked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-      var _setup11, getByTestId;
+    it('should ask confirmation when close button is clicked with pending recipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      var _setup9, getByRole, findByRole, getByText, closeButton;
 
-      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            _setup11 = setup(), getByTestId = _setup11.getByTestId;
-            _context11.next = 3;
-            return waitFor(function () {
-              expect(getByTestId('btn-close')).toBeTruthy();
+            usePendingRecipients.mockReturnValue({
+              pendingRecipients: [{
+                name: 'Alice',
+                email: 'alice@example.com'
+              }],
+              setPendingRecipients: jest.fn(),
+              selectedOption: 'readWrite',
+              setSelectedOption: jest.fn()
+            });
+            _setup9 = setup(), getByRole = _setup9.getByRole, findByRole = _setup9.findByRole, getByText = _setup9.getByText;
+            _context9.next = 4;
+            return findByRole('button', {
+              name: /close/i
             });
 
-          case 3:
-            fireEvent.click(getByTestId('btn-close'));
-            expect(mockOnClose).toHaveBeenCalled();
-
-          case 5:
+          case 4:
+            closeButton = _context9.sent;
+            fireEvent.click(closeButton);
+            expect(getByText("Discard the changes you haven't saved?")).toBeTruthy();
+            expect(mockOnClose).not.toHaveBeenCalled();
+            fireEvent.click(getByRole('button', {
+              name: 'Cancel'
+            }));
+            expect(mockOnClose).not.toHaveBeenCalled();
+
+          case 10:
           case "end":
-            return _context11.stop();
+            return _context9.stop();
         }
-      }, _callee11);
+      }, _callee9);
     })));
-  });
-  describe('existing recipients', function () {
-    var existingRecipients = [{
-      index: 'sharing-abc-member-0',
-      name: 'Charlie',
-      email: 'charlie@example.com',
-      status: 'owner',
-      type: 'two-way',
-      sharingId: 'abc',
-      memberIndex: 0
-    }, {
-      index: 'sharing-abc-member-1',
-      name: 'Diana',
-      email: 'diana@example.com',
-      status: 'ready',
-      type: 'one-way',
-      sharingId: 'abc',
-      memberIndex: 1
-    }];
-    it('should display existing recipients from getRecipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-      var _setup12, getByTestId;
-
-      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+    it('should close after discard confirmation', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
+      var _setup10, getByRole, findByRole, getByText, closeButton;
+
+      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
           case 0:
-            mockGetRecipients.mockReturnValue(existingRecipients);
-            _setup12 = setup(), getByTestId = _setup12.getByTestId;
-            _context12.next = 4;
-            return waitFor(function () {
-              expect(getByTestId('recipients-count').textContent).toBe('2');
+            usePendingRecipients.mockReturnValue({
+              pendingRecipients: [{
+                name: 'Alice',
+                email: 'alice@example.com'
+              }],
+              setPendingRecipients: jest.fn(),
+              selectedOption: 'readWrite',
+              setSelectedOption: jest.fn()
+            });
+            _setup10 = setup(), getByRole = _setup10.getByRole, findByRole = _setup10.findByRole, getByText = _setup10.getByText;
+            _context10.next = 4;
+            return findByRole('button', {
+              name: /close/i
             });
 
           case 4:
+            closeButton = _context10.sent;
+            fireEvent.click(closeButton);
+            expect(getByText("Discard the changes you haven't saved?")).toBeTruthy();
+            fireEvent.click(getByRole('button', {
+              name: 'Discard'
+            }));
+            expect(mockOnClose).toHaveBeenCalledTimes(1);
+
+          case 9:
           case "end":
-            return _context12.stop();
+            return _context10.stop();
         }
-      }, _callee12);
+      }, _callee10);
     })));
   });
 });

package/dist/components/Recipient/RecipientList.js

@@ -4,7 +4,6 @@ import { GroupRecipient } from './GroupRecipient';
 import MemberRecipient from './MemberRecipient';
 import { usePrevious } from '../../helpers/hooks';
 import { filterAndReworkRecipients } from '../../helpers/recipients';
-import SharedDriveRecipient from '../SharedDrive/SharedDriveRecipient';
 
 var RecipientList = function RecipientList(_ref) {
   var recipients = _ref.recipients,
@@ -15,27 +14,13 @@ var RecipientList = function RecipientList(_ref) {
       documentType = _ref.documentType,
       onRevoke = _ref.onRevoke,
       onRevokeSelf = _ref.onRevokeSelf,
-      onSetType = _ref.onSetType,
       verifyRecipient = _ref.verifyRecipient;
   var previousRecipients = usePrevious(recipients);
   var recipientsToDisplay = filterAndReworkRecipients(recipients, previousRecipients);
   return recipientsToDisplay.map(function (recipient) {
-    var _recipient$index;
-
     var recipientConfirmationData = recipientsToBeConfirmed.find(function (user) {
       return user.email === recipient.email;
     });
-    var isSharedDriveRecipient = recipient === null || recipient === void 0 || (_recipient$index = recipient.index) === null || _recipient$index === void 0 ? void 0 : _recipient$index.toString().startsWith('virtual-shared-drive');
-
-    if (isSharedDriveRecipient) {
-      return /*#__PURE__*/React.createElement(SharedDriveRecipient, _extends({}, recipient, {
-        key: recipient.index,
-        onRevoke: onRevoke,
-        onSetType: onSetType,
-        fadeIn: recipient.hasBeenJustAdded
-      }));
-    }
-
     var isGroupRecipient = recipient.members;
 
     if (isGroupRecipient) {

package/dist/components/ShareAutosuggest.js

@@ -220,6 +220,7 @@ var ShareAutocomplete = function ShareAutocomplete(_ref) {
     renderInputComponent: renderInput,
     highlightFirstSuggestion: true,
     inputProps: {
+      autoFocus: true,
       onFocus: onAutosuggestFocus,
       onChange: onAutosuggestChange,
       onPaste: onAutosuggestPaste,

package/dist/components/ShareAutosuggest.spec.js

@@ -78,17 +78,25 @@ describe('ShareAutosuggest', function () {
       email: 'quentin.valmori@cozycloud.cc'
     });
   });
-  it('should show loading only after user focus input', function () {
+  it('should show loading indicator when loading prop is true (autoFocus triggers onFocus on mount)', function () {
     var onPick = jest.fn();
     var onRemove = jest.fn();
     setup({
       onPick: onPick,
       onRemove: onRemove,
       loading: true
+    }); // autoFocus triggers onFocus on mount, which sets isLoadingDisplayed
+
+    expect(screen.getByText('loading')).toBeInTheDocument();
+  });
+  it('should not show loading indicator when loading prop is false', function () {
+    var onPick = jest.fn();
+    var onRemove = jest.fn();
+    setup({
+      onPick: onPick,
+      onRemove: onRemove,
+      loading: false
     });
-    var inputNode = screen.getByPlaceholderText('myPlaceHolder');
     expect(screen.queryByText('loading')).toBeNull();
-    fireEvent.focus(inputNode);
-    expect(screen.getByText('loading')).toBeInTheDocument();
   });
 });