cozy-sharing 38.1.4 → 38.1.6

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [38.1.6](https://github.com/cozy/cozy-libs/compare/cozy-sharing@38.1.5...cozy-sharing@38.1.6) (2026-10-01)
+
+### Bug Fixes
+
+- **cozy-sharing:** Keep an unshared folder shareable by its owner ([d0bdac7](https://github.com/cozy/cozy-libs/commit/d0bdac725d3b854be789def6c67ae31ca8db59bd)), closes [linagora/twake-drive#4264](https://github.com/linagora/twake-drive/issues/4264)
+
+## [38.1.5](https://github.com/cozy/cozy-libs/compare/cozy-sharing@38.1.4...cozy-sharing@38.1.5) (2026-09-30)
+
+**Note:** Version bump only for package cozy-sharing
+
 ## [38.1.4](https://github.com/cozy/cozy-libs/compare/cozy-sharing@38.1.3...cozy-sharing@38.1.4) (2026-09-30)
 
 **Note:** Version bump only for package cozy-sharing

package/dist/DoctypeContact.js

@@ -1,10 +1,7 @@
 import { getInitials as clientGetInitials, getDisplayName as clientGetDisplayName } from 'cozy-client/dist/models/contact';
-import { Contact as DoctypeContact } from 'cozy-doctypes';
-
-var isContact = function isContact(candidate) {
+export var isContact = function isContact(candidate) {
   return candidate._type === 'io.cozy.contacts';
 };
-
 export var getInitials = function getInitials(contactOrRecipient) {
   var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
 
@@ -30,5 +27,4 @@ export var getDisplayName = function getDisplayName(contact) {
     // @todo Extract to RecipientModel ?
     return contact.public_name || contact.displayName || contact.name || contact.email || defaultValue;
   }
-};
-export default DoctypeContact;
+};

package/dist/components/ContactSuggestion.js

@@ -5,7 +5,7 @@ import ListItem from 'cozy-ui/transpiled/react/ListItem';
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon';
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText';
 import { useI18n } from 'twake-i18n';
-import { Contact, Group, getDisplayName } from '../models';
+import { DOCTYPE_GROUPS, contactPropType, groupPropType, getDisplayName } from '../models';
 import { GroupAvatar } from './Avatar/GroupAvatar';
 import { MemberAvatar } from './Avatar/MemberAvatar';
 export var ContactSuggestion = function ContactSuggestion(_ref) {
@@ -14,7 +14,7 @@ export var ContactSuggestion = function ContactSuggestion(_ref) {
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  if (contactOrGroup._type === Group.doctype) {
+  if (contactOrGroup._type === DOCTYPE_GROUPS) {
     return /*#__PURE__*/React.createElement(ListItem, {
       button: true
     }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(GroupAvatar, {
@@ -45,7 +45,7 @@ var newUnknownContactProptypes = PropTypes.shape({
   email: PropTypes.string.isRequired
 });
 ContactSuggestion.propTypes = {
-  contactOrGroup: PropTypes.oneOfType([Contact.propType, Group.propType, newUnknownContactProptypes]).isRequired,
-  contacts: PropTypes.arrayOf(Contact.propType)
+  contactOrGroup: PropTypes.oneOfType([contactPropType, groupPropType, newUnknownContactProptypes]).isRequired,
+  contacts: PropTypes.arrayOf(contactPropType)
 };
 export default ContactSuggestion;

package/dist/components/FederatedFolder/FederatedFolderModal.js

@@ -123,8 +123,9 @@ var FederatedFolderModalContent = function FederatedFolderModalContent(_ref) {
   var displayedLink = existingDocument !== null && existingDocument !== void 0 && existingDocument.driveId ? getFederatedShareLink(existingDocument) : getSharingLink(existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument._id);
   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);
+  })); // Ignore a stale driveId left after an owner revokes the last recipient, so their own folder isn't wrongly restricted to link-only (linagora/twake-drive#4264).
+
+  var isInsideSharedDrive = Boolean((existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.driveId) && !isSharedDriveRoot && (sharedDriveSharing || !isOwner(documentId)));
   var isCurrentUserOwner = existingDocument !== null && existingDocument !== void 0 && existingDocument.driveId ? Boolean(sharedDriveSharing === null || sharedDriveSharing === void 0 || (_sharedDriveSharing$a2 = sharedDriveSharing.attributes) === null || _sharedDriveSharing$a2 === void 0 ? void 0 : _sharedDriveSharing$a2.owner) : documentId ? isOwner(documentId) : false;
   var isMemberReadOnly = isInsideSharedDrive && !isCurrentUserOwner && !hasWriteAccess(documentId, existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.driveId);
   var canManageSharing = isCurrentUserOwner || (documentId ? canReshare(documentId) : false);

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

@@ -385,11 +385,39 @@ describe('FederatedFolderModal', function () {
         }
       }, _callee8);
     })));
-  });
-  describe('shared drive link fetch on mount', function () {
-    it('should fetch shared drive sharing links when document has a driveId and no permissions yet', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+    it('should allow share by email when the owner revoked the sharing of a folder that still carries a stale driveId', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      var _setup9, findByText, queryByText;
+
       return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            // Owner revoked the last recipient: stale driveId, sharing gone, but still owner → stays shareable (linagora/twake-drive#4264).
+            mockGetSharingById.mockReturnValue(null);
+            mockIsOwner.mockReturnValue(true);
+            _setup9 = setup({
+              document: _objectSpread(_objectSpread({}, mockDocument), {}, {
+                driveId: 'federated-folder-id',
+                type: 'directory'
+              })
+            }), findByText = _setup9.findByText, queryByText = _setup9.queryByText;
+            _context9.next = 5;
+            return findByText('Add users');
+
+          case 5:
+            expect(queryByText('This folder can only be shared by link, because')).toBe(null);
+            expect(queryByText('it has a shared parent')).toBe(null);
+
+          case 7:
+          case "end":
+            return _context9.stop();
+        }
+      }, _callee9);
+    })));
+  });
+  describe('shared drive link fetch on mount', function () {
+    it('should fetch shared drive sharing links when document has a driveId and no permissions yet', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
+      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
           case 0:
             mockGetDocumentPermissions.mockReturnValue([]);
             setup({
@@ -397,7 +425,7 @@ describe('FederatedFolderModal', function () {
                 driveId: 'federated-folder-id'
               })
             });
-            _context9.next = 4;
+            _context10.next = 4;
             return waitFor(function () {
               expect(mockFetchSharedDriveSharingLinks).toHaveBeenCalledTimes(1);
             });
@@ -410,14 +438,14 @@ describe('FederatedFolderModal', function () {
 
           case 5:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
-      }, _callee9);
+      }, _callee10);
     })));
-    it('should use document.id when _id is missing', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
+    it('should use document.id when _id is missing', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
       var document;
-      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
           case 0:
             document = {
               id: 'folder-id-only',
@@ -428,7 +456,7 @@ describe('FederatedFolderModal', function () {
             setup({
               document: document
             });
-            _context10.next = 4;
+            _context11.next = 4;
             return waitFor(function () {
               expect(mockFetchSharedDriveSharingLinks).toHaveBeenCalledWith(document);
             });
@@ -438,20 +466,20 @@ describe('FederatedFolderModal', function () {
 
           case 5:
           case "end":
-            return _context10.stop();
+            return _context11.stop();
         }
-      }, _callee10);
+      }, _callee11);
     })));
-    it('should not fetch shared drive sharing links when document has no driveId', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-      var _setup9, findByText;
+    it('should not fetch shared drive sharing links when document has no driveId', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
+      var _setup10, findByText;
 
-      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
           case 0:
-            _setup9 = setup({
+            _setup10 = setup({
               document: mockDocument
-            }), findByText = _setup9.findByText;
-            _context11.next = 3;
+            }), findByText = _setup10.findByText;
+            _context12.next = 3;
             return findByText('Copy link');
 
           case 3:
@@ -459,23 +487,23 @@ describe('FederatedFolderModal', function () {
 
           case 4:
           case "end":
-            return _context11.stop();
+            return _context12.stop();
         }
-      }, _callee11);
+      }, _callee12);
     })));
-    it('should not refetch after one attempt when permissions stay empty', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-      var document, _setup10, rerender;
+    it('should not refetch after one attempt when permissions stay empty', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
+      var document, _setup11, rerender;
 
-      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
           case 0:
             document = _objectSpread(_objectSpread({}, mockDocument), {}, {
               driveId: 'federated-folder-id'
             });
-            _setup10 = setup({
+            _setup11 = setup({
               document: document
-            }), rerender = _setup10.rerender;
-            _context12.next = 4;
+            }), rerender = _setup11.rerender;
+            _context13.next = 4;
             return waitFor(function () {
               expect(mockFetchSharedDriveSharingLinks).toHaveBeenCalledTimes(1);
             });
@@ -492,15 +520,15 @@ describe('FederatedFolderModal', function () {
 
           case 6:
           case "end":
-            return _context12.stop();
+            return _context13.stop();
         }
-      }, _callee12);
+      }, _callee13);
     })));
-    it('should not fetch shared drive sharing links when permissions are already loaded', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
-      var _setup11, findByText;
+    it('should not fetch shared drive sharing links when permissions are already loaded', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
+      var _setup12, findByText;
 
-      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
+      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
           case 0:
             mockGetDocumentPermissions.mockReturnValue([{
               id: 'perm-1',
@@ -511,12 +539,12 @@ describe('FederatedFolderModal', function () {
                 }
               }
             }]);
-            _setup11 = setup({
+            _setup12 = setup({
               document: _objectSpread(_objectSpread({}, mockDocument), {}, {
                 driveId: 'federated-folder-id'
               })
-            }), findByText = _setup11.findByText;
-            _context13.next = 4;
+            }), findByText = _setup12.findByText;
+            _context14.next = 4;
             return findByText('Copy link');
 
           case 4:
@@ -524,9 +552,9 @@ describe('FederatedFolderModal', function () {
 
           case 5:
           case "end":
-            return _context13.stop();
+            return _context14.stop();
         }
-      }, _callee13);
+      }, _callee14);
     })));
   });
   describe('onSend callback', function () {
@@ -534,21 +562,21 @@ describe('FederatedFolderModal', function () {
       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 _callee14() {
-      var _setup12, findByText, sendButton;
+    it('should call onClose and skip share when there are no pending recipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
+      var _setup13, findByText, sendButton;
 
-      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+        while (1) switch (_context15.prev = _context15.next) {
           case 0:
             // pendingRecipients defaults to [] via beforeEach
-            _setup12 = setup(), findByText = _setup12.findByText;
-            _context14.next = 3;
+            _setup13 = setup(), findByText = _setup13.findByText;
+            _context15.next = 3;
             return findByText('Done');
 
           case 3:
-            sendButton = _context14.sent;
+            sendButton = _context15.sent;
             fireEvent.click(sendButton);
-            _context14.next = 7;
+            _context15.next = 7;
             return waitFor(function () {
               expect(mockOnClose).toHaveBeenCalled();
               expect(mockShare).not.toHaveBeenCalled();
@@ -556,15 +584,15 @@ describe('FederatedFolderModal', function () {
 
           case 7:
           case "end":
-            return _context14.stop();
+            return _context15.stop();
         }
-      }, _callee14);
+      }, _callee15);
     })));
-    it('should call share with correct parameters', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
-      var _setup13, findByText, sendButton;
+    it('should call share with correct parameters', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16() {
+      var _setup14, findByText, sendButton;
 
-      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
-        while (1) switch (_context15.prev = _context15.next) {
+      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
+        while (1) switch (_context16.prev = _context16.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [pendingRecipient],
@@ -574,14 +602,14 @@ describe('FederatedFolderModal', function () {
             });
             getOrCreateFromArray.mockResolvedValue([pendingRecipient]);
             mockShare.mockResolvedValueOnce({});
-            _setup13 = setup(), findByText = _setup13.findByText;
-            _context15.next = 6;
+            _setup14 = setup(), findByText = _setup14.findByText;
+            _context16.next = 6;
             return findByText('Done');
 
           case 6:
-            sendButton = _context15.sent;
+            sendButton = _context16.sent;
             fireEvent.click(sendButton);
-            _context15.next = 10;
+            _context16.next = 10;
             return waitFor(function () {
               expect(mockShare).toHaveBeenCalledWith({
                 description: 'My Test Folder',
@@ -595,15 +623,15 @@ describe('FederatedFolderModal', function () {
 
           case 10:
           case "end":
-            return _context15.stop();
+            return _context16.stop();
         }
-      }, _callee15);
+      }, _callee16);
     })));
-    it('should show success alert and close modal on successful share', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16() {
-      var _setup14, findByText, sendButton;
+    it('should show success alert and close modal on successful share', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17() {
+      var _setup15, findByText, sendButton;
 
-      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
+      return _regeneratorRuntime.wrap(function _callee17$(_context17) {
+        while (1) switch (_context17.prev = _context17.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [pendingRecipient],
@@ -613,14 +641,14 @@ describe('FederatedFolderModal', function () {
             });
             getOrCreateFromArray.mockResolvedValue([pendingRecipient]);
             mockShare.mockResolvedValueOnce({});
-            _setup14 = setup(), findByText = _setup14.findByText;
-            _context16.next = 6;
+            _setup15 = setup(), findByText = _setup15.findByText;
+            _context17.next = 6;
             return findByText('Done');
 
           case 6:
-            sendButton = _context16.sent;
+            sendButton = _context17.sent;
             fireEvent.click(sendButton);
-            _context16.next = 10;
+            _context17.next = 10;
             return waitFor(function () {
               expect(mockShowAlert).toHaveBeenCalledWith({
                 message: 'Folder has been shared',
@@ -632,15 +660,15 @@ describe('FederatedFolderModal', function () {
 
           case 10:
           case "end":
-            return _context16.stop();
+            return _context17.stop();
         }
-      }, _callee16);
+      }, _callee17);
     })));
-    it('should show error alert when share fails', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17() {
-      var _setup15, findByText, sendButton;
+    it('should show error alert when share fails', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
+      var _setup16, findByText, sendButton;
 
-      return _regeneratorRuntime.wrap(function _callee17$(_context17) {
-        while (1) switch (_context17.prev = _context17.next) {
+      return _regeneratorRuntime.wrap(function _callee18$(_context18) {
+        while (1) switch (_context18.prev = _context18.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [pendingRecipient],
@@ -650,14 +678,14 @@ describe('FederatedFolderModal', function () {
             });
             getOrCreateFromArray.mockResolvedValue([pendingRecipient]);
             mockShare.mockRejectedValueOnce(new Error('Share failed'));
-            _setup15 = setup(), findByText = _setup15.findByText;
-            _context17.next = 6;
+            _setup16 = setup(), findByText = _setup16.findByText;
+            _context18.next = 6;
             return findByText('Done');
 
           case 6:
-            sendButton = _context17.sent;
+            sendButton = _context18.sent;
             fireEvent.click(sendButton);
-            _context17.next = 10;
+            _context18.next = 10;
             return waitFor(function () {
               expect(mockShowAlert).toHaveBeenCalledWith({
                 message: 'Error while sharing folder',
@@ -669,15 +697,15 @@ describe('FederatedFolderModal', function () {
 
           case 10:
           case "end":
-            return _context17.stop();
+            return _context18.stop();
         }
-      }, _callee17);
+      }, _callee18);
     })));
-    it('should show progress icon on Done button while share is in progress', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19() {
-      var resolveShare, _setup16, findByText, getByRole, queryByRole, sendButton;
+    it('should show progress icon on Done button while share is in progress', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20() {
+      var resolveShare, _setup17, findByText, getByRole, queryByRole, sendButton;
 
-      return _regeneratorRuntime.wrap(function _callee19$(_context19) {
-        while (1) switch (_context19.prev = _context19.next) {
+      return _regeneratorRuntime.wrap(function _callee20$(_context20) {
+        while (1) switch (_context20.prev = _context20.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [pendingRecipient],
@@ -689,14 +717,14 @@ describe('FederatedFolderModal', function () {
             mockShare.mockReturnValueOnce(new Promise(function (resolve) {
               resolveShare = resolve;
             }));
-            _setup16 = setup(), findByText = _setup16.findByText, getByRole = _setup16.getByRole, queryByRole = _setup16.queryByRole;
-            _context19.next = 6;
+            _setup17 = setup(), findByText = _setup17.findByText, getByRole = _setup17.getByRole, queryByRole = _setup17.queryByRole;
+            _context20.next = 6;
             return findByText('Done');
 
           case 6:
-            sendButton = _context19.sent;
+            sendButton = _context20.sent;
             fireEvent.click(sendButton);
-            _context19.next = 10;
+            _context20.next = 10;
             return waitFor(function () {
               expect(getByRole('button', {
                 name: 'Done'
@@ -705,25 +733,25 @@ describe('FederatedFolderModal', function () {
             });
 
           case 10:
-            _context19.next = 12;
-            return act( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
-              return _regeneratorRuntime.wrap(function _callee18$(_context18) {
-                while (1) switch (_context18.prev = _context18.next) {
+            _context20.next = 12;
+            return act( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19() {
+              return _regeneratorRuntime.wrap(function _callee19$(_context19) {
+                while (1) switch (_context19.prev = _context19.next) {
                   case 0:
                     resolveShare({});
 
                   case 1:
                   case "end":
-                    return _context18.stop();
+                    return _context19.stop();
                 }
-              }, _callee18);
+              }, _callee19);
             })));
 
           case 12:
           case "end":
-            return _context19.stop();
+            return _context20.stop();
         }
-      }, _callee19);
+      }, _callee20);
     })));
   });
   describe('onRevoke callback', function () {
@@ -736,27 +764,27 @@ describe('FederatedFolderModal', function () {
       name: 'Me',
       email: 'me@test.com'
     };
-    it('should call onRevokeSelf and onRevokeSuccess when the current user is revoked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20() {
-      var onRevokeSuccess, _setup17, findByLabelText;
+    it('should call onRevokeSelf and onRevokeSuccess when the current user is revoked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21() {
+      var onRevokeSuccess, _setup18, findByLabelText;
 
-      return _regeneratorRuntime.wrap(function _callee20$(_context20) {
-        while (1) switch (_context20.prev = _context20.next) {
+      return _regeneratorRuntime.wrap(function _callee21$(_context21) {
+        while (1) switch (_context21.prev = _context21.next) {
           case 0:
             onRevokeSuccess = jest.fn();
             mockGetEffectiveRecipients.mockReturnValue([currentUserRecipient]);
-            _setup17 = setup({
+            _setup18 = setup({
               onRevokeSuccess: onRevokeSuccess
-            }), findByLabelText = _setup17.findByLabelText;
-            _context20.t0 = fireEvent;
-            _context20.next = 6;
+            }), findByLabelText = _setup18.findByLabelText;
+            _context21.t0 = fireEvent;
+            _context21.next = 6;
             return findByLabelText('Remove from sharing');
 
           case 6:
-            _context20.t1 = _context20.sent;
+            _context21.t1 = _context21.sent;
 
-            _context20.t0.click.call(_context20.t0, _context20.t1);
+            _context21.t0.click.call(_context21.t0, _context21.t1);
 
-            _context20.next = 10;
+            _context21.next = 10;
             return waitFor(function () {
               expect(mockRevokeSelf).toHaveBeenCalledWith(mockDocument);
               expect(mockRevoke).not.toHaveBeenCalled();
@@ -765,15 +793,15 @@ describe('FederatedFolderModal', function () {
 
           case 10:
           case "end":
-            return _context20.stop();
+            return _context21.stop();
         }
-      }, _callee20);
+      }, _callee21);
     })));
-    it('should allow a write recipient to revoke another recipient', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21() {
-      var otherRecipient, _setup18, findByLabelText;
+    it('should allow a write recipient to revoke another recipient', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22() {
+      var otherRecipient, _setup19, findByLabelText;
 
-      return _regeneratorRuntime.wrap(function _callee21$(_context21) {
-        while (1) switch (_context21.prev = _context21.next) {
+      return _regeneratorRuntime.wrap(function _callee22$(_context22) {
+        while (1) switch (_context22.prev = _context22.next) {
           case 0:
             otherRecipient = {
               instance: 'https://other.mycozy.cloud',
@@ -786,17 +814,17 @@ describe('FederatedFolderModal', function () {
             };
             mockCanReshare.mockReturnValue(true);
             mockGetEffectiveRecipients.mockReturnValue([otherRecipient]);
-            _setup18 = setup(), findByLabelText = _setup18.findByLabelText;
-            _context21.t0 = fireEvent;
-            _context21.next = 7;
+            _setup19 = setup(), findByLabelText = _setup19.findByLabelText;
+            _context22.t0 = fireEvent;
+            _context22.next = 7;
             return findByLabelText('Remove from sharing');
 
           case 7:
-            _context21.t1 = _context21.sent;
+            _context22.t1 = _context22.sent;
 
-            _context21.t0.click.call(_context21.t0, _context21.t1);
+            _context22.t0.click.call(_context22.t0, _context22.t1);
 
-            _context21.next = 11;
+            _context22.next = 11;
             return waitFor(function () {
               expect(mockCanReshare).toHaveBeenCalledWith(mockDocument._id);
               expect(mockRevoke).toHaveBeenCalledWith(mockDocument, otherRecipient.sharingId, otherRecipient.memberIndex);
@@ -805,40 +833,40 @@ describe('FederatedFolderModal', function () {
 
           case 11:
           case "end":
-            return _context21.stop();
+            return _context22.stop();
         }
-      }, _callee21);
+      }, _callee22);
     })));
   });
   describe('onClose callback', function () {
-    it('should call onClose when close button is clicked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22() {
-      var _setup19, findByRole, closeButton;
+    it('should call onClose when close button is clicked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23() {
+      var _setup20, findByRole, closeButton;
 
-      return _regeneratorRuntime.wrap(function _callee22$(_context22) {
-        while (1) switch (_context22.prev = _context22.next) {
+      return _regeneratorRuntime.wrap(function _callee23$(_context23) {
+        while (1) switch (_context23.prev = _context23.next) {
           case 0:
-            _setup19 = setup(), findByRole = _setup19.findByRole;
-            _context22.next = 3;
+            _setup20 = setup(), findByRole = _setup20.findByRole;
+            _context23.next = 3;
             return findByRole('button', {
               name: /close/i
             });
 
           case 3:
-            closeButton = _context22.sent;
+            closeButton = _context23.sent;
             fireEvent.click(closeButton);
             expect(mockOnClose).toHaveBeenCalled();
 
           case 6:
           case "end":
-            return _context22.stop();
+            return _context23.stop();
         }
-      }, _callee22);
+      }, _callee23);
     })));
-    it('should ask confirmation when close button is clicked with pending recipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23() {
-      var _setup20, getByRole, findByRole, getByText, closeButton;
+    it('should ask confirmation when close button is clicked with pending recipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee24() {
+      var _setup21, getByRole, findByRole, getByText, closeButton;
 
-      return _regeneratorRuntime.wrap(function _callee23$(_context23) {
-        while (1) switch (_context23.prev = _context23.next) {
+      return _regeneratorRuntime.wrap(function _callee24$(_context24) {
+        while (1) switch (_context24.prev = _context24.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [{
@@ -849,14 +877,14 @@ describe('FederatedFolderModal', function () {
               selectedOption: 'readWrite',
               setSelectedOption: jest.fn()
             });
-            _setup20 = setup(), getByRole = _setup20.getByRole, findByRole = _setup20.findByRole, getByText = _setup20.getByText;
-            _context23.next = 4;
+            _setup21 = setup(), getByRole = _setup21.getByRole, findByRole = _setup21.findByRole, getByText = _setup21.getByText;
+            _context24.next = 4;
             return findByRole('button', {
               name: /close/i
             });
 
           case 4:
-            closeButton = _context23.sent;
+            closeButton = _context24.sent;
             fireEvent.click(closeButton);
             expect(getByText("Discard the changes you haven't saved?")).toBeTruthy();
             expect(mockOnClose).not.toHaveBeenCalled();
@@ -867,15 +895,15 @@ describe('FederatedFolderModal', function () {
 
           case 10:
           case "end":
-            return _context23.stop();
+            return _context24.stop();
         }
-      }, _callee23);
+      }, _callee24);
     })));
-    it('should close after discard confirmation', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee24() {
-      var _setup21, getByRole, findByRole, getByText, closeButton;
+    it('should close after discard confirmation', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25() {
+      var _setup22, getByRole, findByRole, getByText, closeButton;
 
-      return _regeneratorRuntime.wrap(function _callee24$(_context24) {
-        while (1) switch (_context24.prev = _context24.next) {
+      return _regeneratorRuntime.wrap(function _callee25$(_context25) {
+        while (1) switch (_context25.prev = _context25.next) {
           case 0:
             usePendingRecipients.mockReturnValue({
               pendingRecipients: [{
@@ -886,14 +914,14 @@ describe('FederatedFolderModal', function () {
               selectedOption: 'readWrite',
               setSelectedOption: jest.fn()
             });
-            _setup21 = setup(), getByRole = _setup21.getByRole, findByRole = _setup21.findByRole, getByText = _setup21.getByText;
-            _context24.next = 4;
+            _setup22 = setup(), getByRole = _setup22.getByRole, findByRole = _setup22.findByRole, getByText = _setup22.getByText;
+            _context25.next = 4;
             return findByRole('button', {
               name: /close/i
             });
 
           case 4:
-            closeButton = _context24.sent;
+            closeButton = _context25.sent;
             fireEvent.click(closeButton);
             expect(getByText("Discard the changes you haven't saved?")).toBeTruthy();
             fireEvent.click(getByRole('button', {
@@ -903,9 +931,9 @@ describe('FederatedFolderModal', function () {
 
           case 9:
           case "end":
-            return _context24.stop();
+            return _context25.stop();
         }
-      }, _callee24);
+      }, _callee25);
     })));
   });
 });

package/dist/components/ShareAutosuggest.js

@@ -10,7 +10,7 @@ import { MemberAvatar } from './Avatar/MemberAvatar';
 import ContactSuggestion from './ContactSuggestion';
 import { isContactToBeCreated } from '../helpers/contacts';
 import { extractEmails, validateEmail } from '../helpers/email';
-import { getDisplayName, Contact, Group } from '../models';
+import { getDisplayName, DOCTYPE_CONTACTS, DOCTYPE_GROUPS } from '../models';
 var styles = {
   "container": "autosuggest__container___1Yro7",
   "suggestionsContainer": "autosuggest__suggestionsContainer___3EDuG",
@@ -76,7 +76,7 @@ var ShareAutosuggest = function ShareAutosuggest(_ref) {
     } else if (enableCreateContact && validateEmail(value)) {
       setSuggestions([{
         email: value,
-        _type: Contact.doctype
+        _type: DOCTYPE_CONTACTS
       }]);
     } else {
       setSuggestions([]);
@@ -181,7 +181,7 @@ var ShareAutosuggest = function ShareAutosuggest(_ref) {
     return /*#__PURE__*/React.createElement("div", {
       className: styles['recipientsContainer']
     }, recipients.map(function (recipient, idx) {
-      var isContactGroup = recipient._type === Group.doctype;
+      var isContactGroup = recipient._type === DOCTYPE_GROUPS;
       var name = getDisplayName(recipient);
       return /*#__PURE__*/React.createElement(Chip, {
         id: "recipient_".concat(idx),

package/dist/components/ShareModal/EditableSharingModal.js

@@ -9,7 +9,7 @@ import flag from 'cozy-flags';
 import minilog from 'cozy-minilog';
 import { useFetchDocumentPath } from '../../hooks/useFetchDocumentPath';
 import { useSharingContext } from '../../hooks/useSharingContext';
-import { Contact } from '../../models';
+import { DOCTYPE_CONTACTS } from '../../models';
 import { ShareModal } from '../ShareModal';
 export var EditableSharingModal = function EditableSharingModal(_ref) {
   var document = _ref.document,
@@ -34,7 +34,7 @@ export var EditableSharingModal = function EditableSharingModal(_ref) {
 
   return /*#__PURE__*/React.createElement(ShareModal, _extends({
     createContact: function createContact(contact) {
-      return client.create(Contact.doctype, contact);
+      return client.create(DOCTYPE_CONTACTS, contact);
     },
     document: document,
     documentType: documentType,

package/dist/components/SharedDrive/useSharedDrive.js

@@ -5,7 +5,7 @@ import { useState } from 'react';
 import { useClient } from 'cozy-client';
 import { getOrCreateFromArray } from '../../helpers/contacts';
 import { usePendingRecipients } from '../../hooks/usePendingRecipients';
-import { Contact } from '../../models';
+import { DOCTYPE_CONTACTS } from '../../models';
 export var useSharedDrive = function useSharedDrive() {
   var client = useClient();
 
@@ -25,7 +25,7 @@ export var useSharedDrive = function useSharedDrive() {
   };
 
   var createContact = function createContact(contact) {
-    return client.create(Contact.doctype, contact);
+    return client.create(DOCTYPE_CONTACTS, contact);
   };
 
   var onCreate = /*#__PURE__*/function () {

package/dist/helpers/recipients.js

@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import flag from 'cozy-flags';
-import { Group } from '../models';
+import { DOCTYPE_GROUPS } from '../models';
 export var DEFAULT_DISPLAY_NAME = 'Share.contacts.defaultDisplayName';
 export var filterAndReworkRecipients = function filterAndReworkRecipients(recipients, previousRecipients) {
   return recipients.filter(function (recipient) {
@@ -66,7 +66,7 @@ export var hasReachRecipientsLimit = function hasReachRecipientsLimit(current, n
 export var spreadGroupAndMergeRecipients = function spreadGroupAndMergeRecipients(recipients, newRecipient) {
   var contactsToAdd;
 
-  if (newRecipient._type === Group.doctype) {
+  if (newRecipient._type === DOCTYPE_GROUPS) {
     contactsToAdd = newRecipient.members;
   } else {
     contactsToAdd = [newRecipient];

package/dist/helpers/share.js

@@ -5,10 +5,10 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import { models } from 'cozy-client';
-import { Contact, Group, getDisplayName } from '../models';
+import { DOCTYPE_CONTACTS, DOCTYPE_GROUPS, isContact, getDisplayName } from '../models';
 export var countNewRecipients = function countNewRecipients(currentRecipients, newRecipients) {
   var newRecipientsNotAlreadyIncluded = newRecipients.filter(function (recipient) {
-    if (Contact.isContact(recipient)) {
+    if (isContact(recipient)) {
       var email = models.contact.getPrimaryEmail(recipient);
       var cozyUrl = models.contact.getPrimaryCozy(recipient);
       return !currentRecipients.find(function (r) {
@@ -19,7 +19,7 @@ export var countNewRecipients = function countNewRecipients(currentRecipients, n
     return true;
   });
   return newRecipientsNotAlreadyIncluded.reduce(function (acc, recipient) {
-    if (recipient._type === Group.doctype) {
+    if (recipient._type === DOCTYPE_GROUPS) {
       return _objectSpread(_objectSpread({}, acc), {}, {
         group: acc.group + 1
       });
@@ -36,9 +36,9 @@ export var countNewRecipients = function countNewRecipients(currentRecipients, n
 export var getSuccessMessage = function getSuccessMessage(recipientsBefore, recipientsAfter, documentType) {
   if (recipientsAfter.length === 1) {
     var recipient = recipientsAfter[0];
-    var email = Contact.isContact(recipient) ? models.contact.getPrimaryEmail(recipient) : recipient.email;
+    var email = isContact(recipient) ? models.contact.getPrimaryEmail(recipient) : recipient.email;
     var cozyUrl = models.contact.getPrimaryCozy(recipient);
-    var isContactGroup = recipient._type === Group.doctype;
+    var isContactGroup = recipient._type === DOCTYPE_GROUPS;
 
     if (isContactGroup) {
       return ["".concat(documentType, ".share.shareByEmail.singleGroupSuccess"), {
@@ -89,7 +89,7 @@ export var getErrorMessage = function getErrorMessage(_ref) {
     if (detail.startsWith('A group member cannot be added as they are already in')) {
       var sharingRights = t("Share.errors.sharingRights.".concat(selectedOption === 'readOnly' ? 'readWrite' : 'readOnly'));
 
-      if (recipients.length === 1 && recipients[0]._type === Contact.doctype) {
+      if (recipients.length === 1 && recipients[0]._type === DOCTYPE_CONTACTS) {
         return ['Share.errors.contactAlreadyInSharing', {
           smart_count: recipients.length,
           contactName: getDisplayName(recipients[0]),

package/dist/models.js

@@ -1,3 +1,14 @@
-export { CozyFile } from 'cozy-doctypes';
-export { Group } from 'cozy-doctypes';
-export { default as Contact, getInitials, getDisplayName } from './DoctypeContact';
+import PropTypes from 'prop-types';
+export var DOCTYPE_CONTACTS = 'io.cozy.contacts';
+export var DOCTYPE_GROUPS = 'io.cozy.contacts.groups';
+export var contactPropType = PropTypes.shape({
+  _id: PropTypes.string.isRequired,
+  _type: PropTypes.string.isRequired
+});
+export var groupPropType = PropTypes.shape({
+  _id: PropTypes.string.isRequired,
+  _type: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  trashed: PropTypes.bool
+});
+export { isContact, getInitials, getDisplayName } from './DoctypeContact';

package/dist/queries/queries.js

@@ -1,5 +1,5 @@
 import { Q, fetchPolicies } from 'cozy-client';
-import { Contact, Group } from '../models';
+import { DOCTYPE_CONTACTS, DOCTYPE_GROUPS } from '../models';
 var DEFAULT_CACHE_TIMEOUT_QUERIES = 9 * 60 * 1000;
 var defaultFetchPolicy = fetchPolicies.olderThan(DEFAULT_CACHE_TIMEOUT_QUERIES);
 export var buildSharingsByIdQuery = function buildSharingsByIdQuery(sharingId) {
@@ -13,7 +13,7 @@ export var buildSharingsByIdQuery = function buildSharingsByIdQuery(sharingId) {
 };
 export var buildReachableContactsQuery = function buildReachableContactsQuery() {
   return {
-    definition: Q(Contact.doctype).where({
+    definition: Q(DOCTYPE_CONTACTS).where({
       _id: {
         $gt: null
       }
@@ -46,7 +46,7 @@ export var buildReachableContactsQuery = function buildReachableContactsQuery()
 };
 export var buildContactGroupsQuery = function buildContactGroupsQuery() {
   return {
-    definition: Q(Group.doctype),
+    definition: Q(DOCTYPE_GROUPS),
     options: {
       as: "io.cozy.contacts.groups",
       fetchPolicy: defaultFetchPolicy
@@ -55,7 +55,7 @@ export var buildContactGroupsQuery = function buildContactGroupsQuery() {
 };
 export var buildUnreachableContactsWithGroupsQuery = function buildUnreachableContactsWithGroupsQuery() {
   return {
-    definition: Q(Contact.doctype).where({
+    definition: Q(DOCTYPE_CONTACTS).where({
       _id: {
         $gt: null
       }

package/dist/suggestionMatchers.js

@@ -1,4 +1,4 @@
-import { Group } from 'cozy-doctypes';
+import { DOCTYPE_GROUPS } from './models';
 var removeDiacritics;
 
 try {
@@ -50,7 +50,7 @@ var cozyUrlMatch = function cozyUrlMatch(input, contact) {
 };
 
 var groupNameMatch = function groupNameMatch(input, contactOrGroup) {
-  if (contactOrGroup._type !== Group.doctype) return false;
+  if (contactOrGroup._type !== DOCTYPE_GROUPS) return false;
   var normalizedInput = normalizeLowercase(input);
   return normalizeLowercase(contactOrGroup.name).includes(normalizedInput);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "38.1.4",
+  "version": "38.1.6",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -30,7 +30,6 @@
   "dependencies": {
     "@cozy/minilog": "^1.0.0",
     "classnames": "^2.5.1",
-    "cozy-doctypes": "^1.99.1",
     "date-fns": "2.30.0",
     "lodash": "^4.17.21",
     "react-autosuggest": "^10.1.0",
@@ -59,7 +58,7 @@
     "cozy-intent": "^2.31.1",
     "cozy-minilog": "^3.10.1",
     "cozy-ui": "^140.5.0",
-    "cozy-ui-plus": "^13.0.8",
+    "cozy-ui-plus": "^13.0.10",
     "jest": "30.3.0",
     "jest-environment-jsdom": "30.3.0",
     "react": "16.12.0",
@@ -85,5 +84,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "2928778c60c287a513ae3e131177ef20b3d35ef5"
+  "gitHead": "59aff51cc02c4315da7889122d476df36d4c90e2"
 }

package/src/DoctypeContact.js

@@ -2,9 +2,8 @@ import {
   getInitials as clientGetInitials,
   getDisplayName as clientGetDisplayName
 } from 'cozy-client/dist/models/contact'
-import { Contact as DoctypeContact } from 'cozy-doctypes'
 
-const isContact = candidate => {
+export const isContact = candidate => {
   return candidate._type === 'io.cozy.contacts'
 }
 export const getInitials = (contactOrRecipient, defaultValue = '') => {
@@ -43,5 +42,3 @@ export const getDisplayName = (contact, defaultValue = '') => {
     )
   }
 }
-
-export default DoctypeContact

package/src/components/ContactSuggestion.jsx

@@ -7,14 +7,19 @@ import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText'
 import { useI18n } from 'twake-i18n'
 
-import { Contact, Group, getDisplayName } from '../models'
+import {
+  DOCTYPE_GROUPS,
+  contactPropType,
+  groupPropType,
+  getDisplayName
+} from '../models'
 import { GroupAvatar } from './Avatar/GroupAvatar'
 import { MemberAvatar } from './Avatar/MemberAvatar'
 
 export const ContactSuggestion = ({ contactOrGroup }) => {
   const { t } = useI18n()
 
-  if (contactOrGroup._type === Group.doctype) {
+  if (contactOrGroup._type === DOCTYPE_GROUPS) {
     return (
       <ListItem button>
         <ListItemIcon>
@@ -50,11 +55,11 @@ const newUnknownContactProptypes = PropTypes.shape({
 
 ContactSuggestion.propTypes = {
   contactOrGroup: PropTypes.oneOfType([
-    Contact.propType,
-    Group.propType,
+    contactPropType,
+    groupPropType,
     newUnknownContactProptypes
   ]).isRequired,
-  contacts: PropTypes.arrayOf(Contact.propType)
+  contacts: PropTypes.arrayOf(contactPropType)
 }
 
 export default ContactSuggestion

package/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -92,8 +92,11 @@ const FederatedFolderModalContent = ({
       id => id === existingDocument?._id || id === existingDocument?.id
     )
   )
+  // Ignore a stale driveId left after an owner revokes the last recipient, so their own folder isn't wrongly restricted to link-only (linagora/twake-drive#4264).
   const isInsideSharedDrive = Boolean(
-    existingDocument?.driveId && !isSharedDriveRoot
+    existingDocument?.driveId &&
+    !isSharedDriveRoot &&
+    (sharedDriveSharing || !isOwner(documentId))
   )
   const isCurrentUserOwner = existingDocument?.driveId
     ? Boolean(sharedDriveSharing?.attributes?.owner)

package/src/components/FederatedFolder/FederatedFolderModal.spec.jsx

@@ -271,6 +271,27 @@ describe('FederatedFolderModal', () => {
       ).toBe(null)
       expect(queryByText('it has a shared parent')).toBe(null)
     })
+
+    it('should allow share by email when the owner revoked the sharing of a folder that still carries a stale driveId', async () => {
+      // Owner revoked the last recipient: stale driveId, sharing gone, but still owner → stays shareable (linagora/twake-drive#4264).
+      mockGetSharingById.mockReturnValue(null)
+      mockIsOwner.mockReturnValue(true)
+
+      const { findByText, queryByText } = setup({
+        document: {
+          ...mockDocument,
+          driveId: 'federated-folder-id',
+          type: 'directory'
+        }
+      })
+
+      await findByText('Add users')
+
+      expect(
+        queryByText('This folder can only be shared by link, because')
+      ).toBe(null)
+      expect(queryByText('it has a shared parent')).toBe(null)
+    })
   })
 
   describe('shared drive link fetch on mount', () => {

package/src/components/ShareAutosuggest.jsx

@@ -10,7 +10,7 @@ import { MemberAvatar } from './Avatar/MemberAvatar'
 import ContactSuggestion from './ContactSuggestion'
 import { isContactToBeCreated } from '../helpers/contacts'
 import { extractEmails, validateEmail } from '../helpers/email'
-import { getDisplayName, Contact, Group } from '../models'
+import { getDisplayName, DOCTYPE_CONTACTS, DOCTYPE_GROUPS } from '../models'
 import styles from '../styles/autosuggest.styl'
 import { contactOrGroupMatch } from '../suggestionMatchers'
 
@@ -53,7 +53,7 @@ const ShareAutosuggest = ({
       setSuggestions([
         {
           email: value,
-          _type: Contact.doctype
+          _type: DOCTYPE_CONTACTS
         }
       ])
     } else {
@@ -152,7 +152,7 @@ const ShareAutosuggest = ({
   const renderInput = inputProps => (
     <div className={styles['recipientsContainer']}>
       {recipients.map((recipient, idx) => {
-        const isContactGroup = recipient._type === Group.doctype
+        const isContactGroup = recipient._type === DOCTYPE_GROUPS
         const name = getDisplayName(recipient)
         return (
           <Chip

package/src/components/ShareModal/EditableSharingModal.jsx

@@ -7,7 +7,7 @@ import minilog from 'cozy-minilog'
 
 import { useFetchDocumentPath } from '../../hooks/useFetchDocumentPath'
 import { useSharingContext } from '../../hooks/useSharingContext'
-import { Contact } from '../../models'
+import { DOCTYPE_CONTACTS } from '../../models'
 import { ShareModal } from '../ShareModal'
 
 export const EditableSharingModal = ({ document, recipients, ...rest }) => {
@@ -30,7 +30,7 @@ export const EditableSharingModal = ({ document, recipients, ...rest }) => {
 
   return (
     <ShareModal
-      createContact={contact => client.create(Contact.doctype, contact)}
+      createContact={contact => client.create(DOCTYPE_CONTACTS, contact)}
       document={document}
       documentType={documentType}
       hasSharedChild={

package/src/components/SharedDrive/useSharedDrive.js

@@ -4,7 +4,7 @@ import { useClient } from 'cozy-client'
 
 import { getOrCreateFromArray } from '../../helpers/contacts'
 import { usePendingRecipients } from '../../hooks/usePendingRecipients'
-import { Contact } from '../../models'
+import { DOCTYPE_CONTACTS } from '../../models'
 
 export const useSharedDrive = () => {
   const client = useClient()
@@ -21,7 +21,7 @@ export const useSharedDrive = () => {
     setSharedDriveName(event.target.value)
   }
 
-  const createContact = contact => client.create(Contact.doctype, contact)
+  const createContact = contact => client.create(DOCTYPE_CONTACTS, contact)
 
   const onCreate = async () => {
     const contacts = await getOrCreateFromArray(

package/src/helpers/recipients.js

@@ -1,6 +1,6 @@
 import flag from 'cozy-flags'
 
-import { Group } from '../models'
+import { DOCTYPE_GROUPS } from '../models'
 
 export const DEFAULT_DISPLAY_NAME = 'Share.contacts.defaultDisplayName'
 
@@ -60,7 +60,7 @@ export const hasReachRecipientsLimit = (current, next) => {
  */
 export const spreadGroupAndMergeRecipients = (recipients, newRecipient) => {
   let contactsToAdd
-  if (newRecipient._type === Group.doctype) {
+  if (newRecipient._type === DOCTYPE_GROUPS) {
     contactsToAdd = newRecipient.members
   } else {
     contactsToAdd = [newRecipient]

package/src/helpers/share.js

@@ -1,10 +1,15 @@
 import { models } from 'cozy-client'
 
-import { Contact, Group, getDisplayName } from '../models'
+import {
+  DOCTYPE_CONTACTS,
+  DOCTYPE_GROUPS,
+  isContact,
+  getDisplayName
+} from '../models'
 
 export const countNewRecipients = (currentRecipients, newRecipients) => {
   const newRecipientsNotAlreadyIncluded = newRecipients.filter(recipient => {
-    if (Contact.isContact(recipient)) {
+    if (isContact(recipient)) {
       const email = models.contact.getPrimaryEmail(recipient)
       const cozyUrl = models.contact.getPrimaryCozy(recipient)
       return !currentRecipients.find(
@@ -18,7 +23,7 @@ export const countNewRecipients = (currentRecipients, newRecipients) => {
 
   return newRecipientsNotAlreadyIncluded.reduce(
     (acc, recipient) => {
-      if (recipient._type === Group.doctype) {
+      if (recipient._type === DOCTYPE_GROUPS) {
         return {
           ...acc,
           group: acc.group + 1
@@ -44,11 +49,11 @@ export const getSuccessMessage = (
 ) => {
   if (recipientsAfter.length === 1) {
     const recipient = recipientsAfter[0]
-    const email = Contact.isContact(recipient)
+    const email = isContact(recipient)
       ? models.contact.getPrimaryEmail(recipient)
       : recipient.email
     const cozyUrl = models.contact.getPrimaryCozy(recipient)
-    const isContactGroup = recipient._type === Group.doctype
+    const isContactGroup = recipient._type === DOCTYPE_GROUPS
 
     if (isContactGroup) {
       return [
@@ -125,7 +130,7 @@ export const getErrorMessage = ({
         }`
       )
 
-      if (recipients.length === 1 && recipients[0]._type === Contact.doctype) {
+      if (recipients.length === 1 && recipients[0]._type === DOCTYPE_CONTACTS) {
         return [
           'Share.errors.contactAlreadyInSharing',
           {

package/src/models.js

@@ -1,8 +1,18 @@
-export { CozyFile } from 'cozy-doctypes'
-export { Group } from 'cozy-doctypes'
-
-export {
-  default as Contact,
-  getInitials,
-  getDisplayName
-} from './DoctypeContact'
+import PropTypes from 'prop-types'
+
+export const DOCTYPE_CONTACTS = 'io.cozy.contacts'
+export const DOCTYPE_GROUPS = 'io.cozy.contacts.groups'
+
+export const contactPropType = PropTypes.shape({
+  _id: PropTypes.string.isRequired,
+  _type: PropTypes.string.isRequired
+})
+
+export const groupPropType = PropTypes.shape({
+  _id: PropTypes.string.isRequired,
+  _type: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  trashed: PropTypes.bool
+})
+
+export { isContact, getInitials, getDisplayName } from './DoctypeContact'

package/src/queries/queries.js

@@ -1,6 +1,6 @@
 import { Q, fetchPolicies } from 'cozy-client'
 
-import { Contact, Group } from '../models'
+import { DOCTYPE_CONTACTS, DOCTYPE_GROUPS } from '../models'
 
 const DEFAULT_CACHE_TIMEOUT_QUERIES = 9 * 60 * 1000
 
@@ -17,7 +17,7 @@ export const buildSharingsByIdQuery = sharingId => ({
 })
 
 export const buildReachableContactsQuery = () => ({
-  definition: Q(Contact.doctype)
+  definition: Q(DOCTYPE_CONTACTS)
     .where({
       _id: {
         $gt: null
@@ -52,7 +52,7 @@ export const buildReachableContactsQuery = () => ({
 })
 
 export const buildContactGroupsQuery = () => ({
-  definition: Q(Group.doctype),
+  definition: Q(DOCTYPE_GROUPS),
   options: {
     as: `io.cozy.contacts.groups`,
     fetchPolicy: defaultFetchPolicy
@@ -60,7 +60,7 @@ export const buildContactGroupsQuery = () => ({
 })
 
 export const buildUnreachableContactsWithGroupsQuery = () => ({
-  definition: Q(Contact.doctype)
+  definition: Q(DOCTYPE_CONTACTS)
     .where({
       _id: {
         $gt: null

package/src/suggestionMatchers.js

@@ -1,4 +1,4 @@
-import { Group } from 'cozy-doctypes'
+import { DOCTYPE_GROUPS } from './models'
 
 let removeDiacritics
 try {
@@ -36,7 +36,7 @@ const cozyUrlMatch = (input, contact) => {
 }
 
 const groupNameMatch = (input, contactOrGroup) => {
-  if (contactOrGroup._type !== Group.doctype) return false
+  if (contactOrGroup._type !== DOCTYPE_GROUPS) return false
   const normalizedInput = normalizeLowercase(input)
   return normalizeLowercase(contactOrGroup.name).includes(normalizedInput)
 }