cozy-sharing 30.3.0 → 31.0.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [31.0.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@30.3.1...cozy-sharing@31.0.0) (2026-05-05)
+
+### Features
+
+- **cozy-sharing:** Split SharedDriveModal ([82b9166](https://github.com/cozy/cozy-libs/commit/82b91662eadf1eb7380aa19484c6dac8c2757b2c))
+- **cozy-sharing:** Update cozy-client ([bb5a3cf](https://github.com/cozy/cozy-libs/commit/bb5a3cf5c3ddb231f62d250508f744410dbfe477))
+- **cozy-sharing:** Use new API to create shared drive ([4296b92](https://github.com/cozy/cozy-libs/commit/4296b92821643c3daa102192b550080b8d34b27f))
+
+### BREAKING CHANGES
+
+- **cozy-sharing:** You need to update cozy-client to >=60.24.0
+
+## [30.3.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@30.3.0...cozy-sharing@30.3.1) (2026-04-24)
+
+### Bug Fixes
+
+- **cozy-sharing:** Flatten contact name object in formatRecipients ([c804f59](https://github.com/cozy/cozy-libs/commit/c804f59d87d40cc8a6bfc5e96e88d88a13cbaadb))
+
 # [30.3.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@30.2.2...cozy-sharing@30.3.0) (2026-04-23)
 
 ### Features

package/dist/components/ShareModal/EditableSharingModal.js

@@ -24,7 +24,6 @@ export var EditableSharingModal = function EditableSharingModal(_ref) {
       hasSharedChild = _useSharingContext.hasSharedChild,
       hasSharedParent = _useSharingContext.hasSharedParent,
       isOwner = _useSharingContext.isOwner,
-      isSharedDrive = _useSharingContext.isSharedDrive,
       revoke = _useSharingContext.revoke,
       revokeSelf = _useSharingContext.revokeSelf,
       share = _useSharingContext.share;
@@ -38,7 +37,6 @@ export var EditableSharingModal = function EditableSharingModal(_ref) {
     hasSharedChild: documentPath && hasSharedChild(documentPath),
     hasSharedParent: documentPath && hasSharedParent(documentPath),
     isOwner: isOwner(document._id),
-    isSharedDrive: isSharedDrive(document._id),
     link: getSharingLink(document._id),
     onRevoke: revoke,
     onRevokeSelf: revokeSelf,

package/dist/components/ShareModal.js

@@ -3,7 +3,6 @@ import React from 'react';
 import flag from 'cozy-flags';
 import ShareDialogCozyToCozy from './ShareDialogCozyToCozy';
 import ShareDialogOnlyByLink from './ShareDialogOnlyByLink';
-import { SharedDriveEditModal } from './SharedDrive/SharedDriveEditModal';
 export var ShareModal = function ShareModal(_ref) {
   var autoOpenShareRestriction = _ref.autoOpenShareRestriction,
       createContact = _ref.createContact,
@@ -13,7 +12,6 @@ export var ShareModal = function ShareModal(_ref) {
       hasSharedChild = _ref.hasSharedChild,
       hasSharedParent = _ref.hasSharedParent,
       isOwner = _ref.isOwner,
-      isSharedDrive = _ref.isSharedDrive,
       link = _ref.link,
       onClose = _ref.onClose,
       onRevoke = _ref.onRevoke,
@@ -25,20 +23,6 @@ export var ShareModal = function ShareModal(_ref) {
       sharingDesc = _ref.sharingDesc,
       showGenerateLinkButton = _ref.showGenerateLinkButton,
       twoStepsConfirmationMethods = _ref.twoStepsConfirmationMethods;
-
-  if (isSharedDrive && !flag('drive.federated-shared-folder.enabled')) {
-    return /*#__PURE__*/React.createElement(SharedDriveEditModal, {
-      document: document,
-      sharing: sharing,
-      recipients: recipients,
-      onShare: onShare,
-      onRevoke: onRevoke,
-      onClose: onClose,
-      autoOpenShareRestriction: autoOpenShareRestriction,
-      showGenerateLinkButton: showGenerateLinkButton
-    });
-  }
-
   var shareDialogOnlyByLink = flag('cozy.hide-sharing-cozy-to-cozy') || documentType === 'Albums';
   var showShareByEmail = !hasSharedParent && !hasSharedChild;
   var showShareByLink = documentType !== 'Organizations';

package/dist/components/SharedDrive/SharedDriveForm.js

@@ -0,0 +1,75 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Button from 'cozy-ui/transpiled/react/Buttons';
+import TextField from 'cozy-ui/transpiled/react/TextField';
+import Typography from 'cozy-ui/transpiled/react/Typography';
+import { useI18n } from 'twake-i18n';
+import withLocales from '../../hoc/withLocales';
+import { default as DumbShareByEmail } from '../ShareByEmail';
+import WhoHasAccess from '../WhoHasAccess';
+import { useSharedDrive } from './useSharedDrive';
+export var SharedDriveForm = withLocales(function (_ref) {
+  var onSuccess = _ref.onSuccess,
+      onCancel = _ref.onCancel;
+
+  var _useI18n = useI18n(),
+      t = _useI18n.t;
+
+  var _useSharedDrive = useSharedDrive({
+    onSuccess: onSuccess
+  }),
+      sharedDriveName = _useSharedDrive.sharedDriveName,
+      recipients = _useSharedDrive.recipients,
+      handleSharedDriveNameChange = _useSharedDrive.handleSharedDriveNameChange,
+      onShare = _useSharedDrive.onShare,
+      onCreate = _useSharedDrive.onCreate,
+      onSetType = _useSharedDrive.onSetType,
+      onRevoke = _useSharedDrive.onRevoke,
+      createContact = _useSharedDrive.createContact;
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    className: "u-ph-2"
+  }, /*#__PURE__*/React.createElement(TextField, {
+    required: true,
+    label: t('SharedDrive.sharedDriveModal.nameLabel'),
+    variant: "outlined",
+    size: "small",
+    className: "u-w-100 u-mt-1-half",
+    value: sharedDriveName,
+    onChange: handleSharedDriveNameChange
+  }), /*#__PURE__*/React.createElement(Typography, {
+    variant: "h6",
+    className: "u-mt-1-half u-mb-half"
+  }, t('SharedDrive.sharedDriveModal.addPeople')), /*#__PURE__*/React.createElement(DumbShareByEmail, {
+    createContact: createContact,
+    currentRecipients: recipients,
+    documentType: "Files",
+    sharedDrive: true,
+    onShare: onShare,
+    submitLabel: t('SharedDrive.sharedDriveModal.add'),
+    showNotifications: false,
+    sharingDesc: ""
+  })), /*#__PURE__*/React.createElement(WhoHasAccess, {
+    isOwner: true,
+    isSharedDrive: true,
+    recipients: recipients,
+    documentType: "Files",
+    className: "u-w-100",
+    onRevoke: onRevoke,
+    onSetType: onSetType
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "u-flex u-flex-justify-end u-ph-2 u-pv-1 u-column-gap-half"
+  }, /*#__PURE__*/React.createElement(Button, {
+    variant: "secondary",
+    label: t('SharedDrive.sharedDriveModal.cancel'),
+    onClick: onCancel
+  }), /*#__PURE__*/React.createElement(Button, {
+    variant: "primary",
+    label: t('SharedDrive.sharedDriveModal.create'),
+    onClick: onCreate
+  })));
+});
+SharedDriveForm.propTypes = {
+  onSuccess: PropTypes.func.isRequired,
+  onCancel: PropTypes.func.isRequired
+};

package/dist/components/SharedDrive/SharedDriveModal.js

@@ -1,182 +1,32 @@
-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';
-import React, { useState } from 'react';
-import { useClient } from 'cozy-client';
-import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
+import React from 'react';
+import { FixedDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
 import { useI18n } from 'twake-i18n';
-import { DumbSharedDriveModal } from './DumbSharedDriveModal';
-import { mergeAndDeduplicateRecipients, formatRecipients, RECIPIENT_INDEX_PREFIX } from './helpers';
 import withLocales from '../../hoc/withLocales';
-import { useSharingContext } from '../../hooks/useSharingContext';
-import { Contact } from '../../models';
+import { SharedDriveForm } from './SharedDriveForm';
 export var SharedDriveModal = withLocales(function (_ref) {
   var onClose = _ref.onClose;
-  var client = useClient();
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var _useSharingContext = useSharingContext(),
-      share = _useSharingContext.share;
-
-  var _useAlert = useAlert(),
-      showAlert = _useAlert.showAlert;
-
-  var _useState = useState({
-    recipients: [],
-    readOnlyRecipients: []
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      sharedDriveRecipients = _useState2[0],
-      setSharedDriveRecipients = _useState2[1];
-
-  var _useState3 = useState(''),
-      _useState4 = _slicedToArray(_useState3, 2),
-      sharedDriveName = _useState4[0],
-      setSharedDriveName = _useState4[1];
-
-  var onShare = function onShare(params) {
-    setSharedDriveRecipients({
-      recipients: mergeAndDeduplicateRecipients([sharedDriveRecipients.recipients, params.recipients]),
-      readOnlyRecipients: mergeAndDeduplicateRecipients([sharedDriveRecipients.readOnlyRecipients, params.readOnlyRecipients])
-    });
-  };
-
-  var handleSharedDriveNameChange = function handleSharedDriveNameChange(event) {
-    setSharedDriveName(event.target.value);
-  };
-
-  var onCreate = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _yield$client$create2, sharedDriveFolder;
-
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return client.collection('io.cozy.files').getOrCreateSharedDrivesDirectory();
-
-          case 3:
-            _context.next = 5;
-            return client.create('io.cozy.files', {
-              name: sharedDriveName,
-              dirId: 'io.cozy.files.shared-drives-dir',
-              type: 'directory'
-            });
-
-          case 5:
-            _yield$client$create2 = _context.sent;
-            sharedDriveFolder = _yield$client$create2.data;
-            _context.next = 9;
-            return share({
-              description: sharedDriveName,
-              document: sharedDriveFolder,
-              recipients: sharedDriveRecipients.recipients,
-              readOnlyRecipients: sharedDriveRecipients.readOnlyRecipients,
-              sharedDrive: true,
-              openSharing: false
-            });
-
-          case 9:
-            showAlert({
-              message: t('SharedDrive.sharedDriveModal.successNotification'),
-              severity: 'success',
-              variant: 'filled'
-            });
-            onClose();
-            _context.next = 16;
-            break;
-
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](0);
-            showAlert({
-              message: t('SharedDrive.sharedDriveModal.errorNotification'),
-              severity: 'error',
-              variant: 'filled'
-            });
-
-          case 16:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0, 13]]);
-    }));
-
-    return function onCreate() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-
-  var onSetType = function onSetType(index, newType) {
-    var _id = index.split(RECIPIENT_INDEX_PREFIX)[1];
-
-    if (newType === 'two-way') {
-      setSharedDriveRecipients(function (prev) {
-        var recipientToMove = prev.readOnlyRecipients.find(function (r) {
-          return r._id === _id;
-        });
-        return {
-          recipients: [].concat(_toConsumableArray(prev.recipients), [recipientToMove]),
-          readOnlyRecipients: prev.readOnlyRecipients.filter(function (r) {
-            return r._id !== _id;
-          })
-        };
-      });
-    } else {
-      setSharedDriveRecipients(function (prev) {
-        var recipientToMove = prev.recipients.find(function (r) {
-          return r._id === _id;
-        });
-        return {
-          recipients: prev.recipients.filter(function (r) {
-            return r._id !== _id;
-          }),
-          readOnlyRecipients: [].concat(_toConsumableArray(prev.readOnlyRecipients), [recipientToMove])
-        };
-      });
-    }
-  };
-
-  var onRevoke = function onRevoke(index) {
-    var _id = index.split(RECIPIENT_INDEX_PREFIX)[1];
-    setSharedDriveRecipients(function (prev) {
-      return {
-        recipients: prev.recipients.filter(function (r) {
-          return r._id !== _id;
-        }),
-        readOnlyRecipients: prev.readOnlyRecipients.filter(function (r) {
-          return r._id !== _id;
-        })
-      };
-    });
-  };
-
-  var createContact = function createContact(contact) {
-    return client.create(Contact.doctype, contact);
-  };
-
-  var recipients = formatRecipients(sharedDriveRecipients);
-  return /*#__PURE__*/React.createElement(DumbSharedDriveModal, {
-    title: t('SharedDrive.sharedDriveModal.title'),
-    sharedDriveName: sharedDriveName,
-    handleSharedDriveNameChange: handleSharedDriveNameChange,
-    createContact: createContact,
-    recipients: recipients,
-    currentRecipients: [],
-    onRevoke: onRevoke,
-    onSetType: onSetType,
-    onCreate: onCreate,
-    onSend: undefined,
+  return /*#__PURE__*/React.createElement(FixedDialog, {
+    open: true,
+    disableGutters: true,
     onClose: onClose,
-    onShare: onShare,
-    showNameField: true,
-    sharingLink: undefined,
-    document: undefined
+    title: t('SharedDrive.sharedDriveModal.title'),
+    classes: {
+      paper: 'u-ov-visible'
+    },
+    componentsProps: {
+      dialogContent: {
+        className: 'u-ov-visible'
+      }
+    },
+    content: /*#__PURE__*/React.createElement(SharedDriveForm, {
+      onSuccess: onClose,
+      onCancel: onClose
+    })
   });
 });
 SharedDriveModal.propTypes = {

package/dist/components/SharedDrive/helpers.js

@@ -68,7 +68,7 @@ export var formatRecipients = function formatRecipients(sharedDriveRecipients) {
     recipients.push({
       index: "".concat(RECIPIENT_INDEX_PREFIX).concat(r._id),
       email: ContactModel.getPrimaryEmail(r),
-      public_name: r.displayName || r.name,
+      public_name: ContactModel.getDisplayName(r),
       memberIndex: r._id,
       type: 'two-way',
       members: r.members
@@ -78,7 +78,7 @@ export var formatRecipients = function formatRecipients(sharedDriveRecipients) {
     recipients.push({
       index: "".concat(RECIPIENT_INDEX_PREFIX).concat(r._id),
       email: ContactModel.getPrimaryEmail(r),
-      public_name: r.displayName || r.name,
+      public_name: ContactModel.getDisplayName(r),
       memberIndex: r._id,
       type: 'one-way',
       members: r.members

package/dist/components/SharedDrive/helpers.spec.js

@@ -182,6 +182,25 @@ describe('formatRecipients', function () {
       public_name: 'Bob'
     });
   });
+  it('should flatten an object-shaped contact name into a string public_name', function () {
+    var input = {
+      recipients: [{
+        _id: '3',
+        name: {
+          givenName: 'Arya',
+          familyName: 'Stark'
+        },
+        email: [{
+          address: 'arya@example.com',
+          primary: true
+        }]
+      }],
+      readOnlyRecipients: []
+    };
+    var result = formatRecipients(input);
+    expect(typeof result[0].public_name).toBe('string');
+    expect(result[0].public_name).toBe('Arya Stark');
+  });
   it('should sort recipients by public_name', function () {
     var input = {
       recipients: [{

package/dist/components/SharedDrive/useSharedDrive.js

@@ -0,0 +1,126 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useState } from 'react';
+import { useClient } from 'cozy-client';
+import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
+import { useI18n } from 'twake-i18n';
+import { RECIPIENT_INDEX_PREFIX, formatRecipients, mergeAndDeduplicateRecipients, moveRecipientToReadOnly, moveRecipientToReadWrite } from './helpers';
+import { Contact } from '../../models';
+export var useSharedDrive = function useSharedDrive(_ref) {
+  var onSuccess = _ref.onSuccess;
+  var client = useClient();
+
+  var _useI18n = useI18n(),
+      t = _useI18n.t;
+
+  var _useAlert = useAlert(),
+      showAlert = _useAlert.showAlert;
+
+  var _useState = useState({
+    recipients: [],
+    readOnlyRecipients: []
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      sharedDriveRecipients = _useState2[0],
+      setSharedDriveRecipients = _useState2[1];
+
+  var _useState3 = useState(''),
+      _useState4 = _slicedToArray(_useState3, 2),
+      sharedDriveName = _useState4[0],
+      setSharedDriveName = _useState4[1];
+
+  var handleSharedDriveNameChange = function handleSharedDriveNameChange(event) {
+    setSharedDriveName(event.target.value);
+  };
+
+  var onShare = function onShare(params) {
+    setSharedDriveRecipients(function (prev) {
+      return {
+        recipients: mergeAndDeduplicateRecipients([prev.recipients, params.recipients]),
+        readOnlyRecipients: mergeAndDeduplicateRecipients([prev.readOnlyRecipients, params.readOnlyRecipients])
+      };
+    });
+  };
+
+  var onCreate = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return client.collection('io.cozy.sharings').createSharedDrive({
+              name: sharedDriveName,
+              description: sharedDriveName,
+              recipients: sharedDriveRecipients.recipients,
+              readOnlyRecipients: sharedDriveRecipients.readOnlyRecipients
+            });
+
+          case 3:
+            showAlert({
+              message: t('SharedDrive.sharedDriveModal.successNotification'),
+              severity: 'success',
+              variant: 'filled'
+            });
+            onSuccess();
+            _context.next = 10;
+            break;
+
+          case 7:
+            _context.prev = 7;
+            _context.t0 = _context["catch"](0);
+            showAlert({
+              message: t('SharedDrive.sharedDriveModal.errorNotification'),
+              severity: 'error',
+              variant: 'filled'
+            });
+
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 7]]);
+    }));
+
+    return function onCreate() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  var onSetType = function onSetType(index, newType) {
+    var _id = index.split(RECIPIENT_INDEX_PREFIX)[1];
+    setSharedDriveRecipients(function (prev) {
+      return newType === 'two-way' ? moveRecipientToReadWrite(prev, _id) : moveRecipientToReadOnly(prev, _id);
+    });
+  };
+
+  var onRevoke = function onRevoke(index) {
+    var _id = index.split(RECIPIENT_INDEX_PREFIX)[1];
+    setSharedDriveRecipients(function (prev) {
+      return {
+        recipients: prev.recipients.filter(function (r) {
+          return r._id !== _id;
+        }),
+        readOnlyRecipients: prev.readOnlyRecipients.filter(function (r) {
+          return r._id !== _id;
+        })
+      };
+    });
+  };
+
+  var createContact = function createContact(contact) {
+    return client.create(Contact.doctype, contact);
+  };
+
+  return {
+    sharedDriveName: sharedDriveName,
+    recipients: formatRecipients(sharedDriveRecipients),
+    handleSharedDriveNameChange: handleSharedDriveNameChange,
+    onShare: onShare,
+    onCreate: onCreate,
+    onSetType: onSetType,
+    onRevoke: onRevoke,
+    createContact: createContact
+  };
+};