cozy-sharing 32.3.2 → 33.0.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [33.0.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@32.3.2...cozy-sharing@33.0.0) (2026-06-02)
+
+### Bug Fixes
+
+- Avoid adding an already added recipients in EditSharedDriveModal ([d24e01c](https://github.com/cozy/cozy-libs/commit/d24e01c999a2c09fe87e59a0c7a26c3555c96557))
+- Hide owner in EditSharedDriveModal ([9c2b060](https://github.com/cozy/cozy-libs/commit/9c2b060fc3f55c44cf35831298879d3fe0a7a403))
+
+### Features
+
+- Add spinner to create shared drive form ([4112e7c](https://github.com/cozy/cozy-libs/commit/4112e7c7f592115ed2689ded3f45d876ee12f9dc))
+- Add spinner to edit shared drive form ([f135ff5](https://github.com/cozy/cozy-libs/commit/f135ff5bae8e9fbe6b510a3114af363159ced7af))
+
+### BREAKING CHANGES
+
+- You need cozy-ui >= 139.0.2
+
 ## [32.3.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@32.3.1...cozy-sharing@32.3.2) (2026-05-26)
 
 ### Bug Fixes

package/dist/components/SharedDrive/EditSharedDriveModal.js

@@ -14,7 +14,7 @@ import Button from 'cozy-ui/transpiled/react/Buttons';
 import { FixedDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
 import TextField from 'cozy-ui/transpiled/react/TextField';
 import Typography from 'cozy-ui/transpiled/react/Typography';
-import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
+import { useSubmitWithLoader } from 'cozy-ui/transpiled/react/hooks/useSubmitWithLoader';
 import { useI18n } from 'twake-i18n';
 import SharedDriveHeader from './SharedDriveHeader';
 import { getOrCreateFromArray } from '../../helpers/contacts';
@@ -36,51 +36,37 @@ export var EditSharedDriveModal = withLocales(function (_ref) {
       getRecipients = _useSharingContext.getRecipients,
       revoke = _useSharingContext.revoke;
 
-  var _useAlert = useAlert(),
-      showAlert = _useAlert.showAlert;
-
   var _usePendingRecipients = usePendingRecipients(),
       pendingRecipients = _usePendingRecipients.pendingRecipients,
       setPendingRecipients = _usePendingRecipients.setPendingRecipients,
       selectedOption = _usePendingRecipients.selectedOption,
       setSelectedOption = _usePendingRecipients.setSelectedOption;
 
+  var _useSubmitWithLoader = useSubmitWithLoader(),
+      onSubmit = _useSubmitWithLoader.onSubmit,
+      isLoading = _useSubmitWithLoader.isLoading;
+
   var _useState = useState(document.name),
       _useState2 = _slicedToArray(_useState, 2),
       driveName = _useState2[0],
       setDriveName = _useState2[1];
 
-  var _useState3 = useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      isSaving = _useState4[0],
-      setIsSaving = _useState4[1];
-
   var onSave = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var contacts, readWriteRecipients, readOnlyRecipients;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!isSaving) {
-              _context.next = 2;
-              break;
-            }
-
-            return _context.abrupt("return");
-
-          case 2:
-            setIsSaving(true);
-            _context.prev = 3;
-            _context.next = 6;
+            _context.next = 2;
             return getOrCreateFromArray(client, pendingRecipients, function (contact) {
               return client.create('io.cozy.contacts', contact);
             });
 
-          case 6:
+          case 2:
             contacts = _context.sent;
             readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts;
             readOnlyRecipients = selectedOption === 'readOnly' ? contacts : [];
-            _context.next = 11;
+            _context.next = 7;
             return share({
               document: document,
               recipients: readWriteRecipients,
@@ -89,47 +75,23 @@ export var EditSharedDriveModal = withLocales(function (_ref) {
               openSharing: false
             });
 
-          case 11:
+          case 7:
             if (!((document === null || document === void 0 ? void 0 : document.name) !== driveName)) {
-              _context.next = 14;
+              _context.next = 10;
               break;
             }
 
-            _context.next = 14;
+            _context.next = 10;
             return client.collection('io.cozy.files').update(_objectSpread(_objectSpread({}, document), {}, {
               name: driveName,
               _rev: document._rev || document.meta.rev
             }));
 
-          case 14:
-            showAlert({
-              message: t('SharedDrive.editSharedDriveModal.successNotification'),
-              severity: 'success',
-              variant: 'filled'
-            });
-            onClose();
-            _context.next = 21;
-            break;
-
-          case 18:
-            _context.prev = 18;
-            _context.t0 = _context["catch"](3);
-            showAlert({
-              message: t('SharedDrive.editSharedDriveModal.errorNotification'),
-              severity: 'error',
-              variant: 'filled'
-            });
-
-          case 21:
-            _context.prev = 21;
-            setIsSaving(false);
-            return _context.finish(21);
-
-          case 24:
+          case 10:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[3, 18, 21, 24]]);
+      }, _callee);
     }));
 
     return function onSave() {
@@ -168,8 +130,8 @@ export var EditSharedDriveModal = withLocales(function (_ref) {
       variant: "h6",
       className: "u-mb-half"
     }, t('Share.contacts.addUsers')), /*#__PURE__*/React.createElement(DumbShareByEmail, {
-      currentRecipients: [],
       documentType: "Files",
+      currentRecipients: existingRecipients,
       pendingRecipients: pendingRecipients,
       onPendingRecipientsChange: setPendingRecipients,
       selectedOption: selectedOption,
@@ -177,6 +139,7 @@ export var EditSharedDriveModal = withLocales(function (_ref) {
     })), /*#__PURE__*/React.createElement(WhoHasAccess, {
       isOwner: true,
       isSharedDrive: true,
+      showOwner: false,
       recipients: existingRecipients,
       document: document,
       documentType: "Files",
@@ -189,14 +152,28 @@ export var EditSharedDriveModal = withLocales(function (_ref) {
       label: t('SharedDrive.sharedDriveModal.cancel'),
       className: "u-w-100 u-m-1",
       size: "large",
-      onClick: onClose
+      onClick: onClose,
+      disabled: isLoading
     }), /*#__PURE__*/React.createElement(Button, {
       variant: "primary",
       label: t('SharedDrive.sharedDriveModal.save'),
       className: "u-w-100 u-m-1",
       size: "large",
-      disabled: isSaving,
-      onClick: onSave
+      onClick: function onClick() {
+        return onSubmit({
+          submit: onSave,
+          success: {
+            action: onClose,
+            message: t('SharedDrive.editSharedDriveModal.successNotification')
+          },
+          error: {
+            message: function message() {
+              return t('SharedDrive.editSharedDriveModal.errorNotification');
+            }
+          }
+        });
+      },
+      busy: isLoading
     })))
   });
 });

package/dist/components/SharedDrive/SharedDriveForm.js

@@ -3,6 +3,7 @@ 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 { useSubmitWithLoader } from 'cozy-ui/transpiled/react/hooks/useSubmitWithLoader';
 import { useI18n } from 'twake-i18n';
 import withLocales from '../../hoc/withLocales';
 import { default as DumbShareByEmail } from '../ShareByEmail';
@@ -15,9 +16,7 @@ export var SharedDriveForm = withLocales(function (_ref) {
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var _useSharedDrive = useSharedDrive({
-    onSuccess: onSuccess
-  }),
+  var _useSharedDrive = useSharedDrive(),
       sharedDriveName = _useSharedDrive.sharedDriveName,
       handleSharedDriveNameChange = _useSharedDrive.handleSharedDriveNameChange,
       pendingRecipients = _useSharedDrive.pendingRecipients,
@@ -26,6 +25,10 @@ export var SharedDriveForm = withLocales(function (_ref) {
       setSelectedOption = _useSharedDrive.setSelectedOption,
       onCreate = _useSharedDrive.onCreate;
 
+  var _useSubmitWithLoader = useSubmitWithLoader(),
+      onSubmit = _useSubmitWithLoader.onSubmit,
+      isLoading = _useSubmitWithLoader.isLoading;
+
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "u-ph-2"
   }, /*#__PURE__*/React.createElement(SharedDriveHeader, {
@@ -55,13 +58,28 @@ export var SharedDriveForm = withLocales(function (_ref) {
     label: t('SharedDrive.sharedDriveModal.cancel'),
     className: "u-w-100 u-m-1",
     size: "large",
-    onClick: onCancel
+    onClick: onCancel,
+    disabled: isLoading
   }), /*#__PURE__*/React.createElement(Button, {
     variant: "primary",
     label: t('SharedDrive.sharedDriveModal.create'),
     className: "u-w-100 u-m-1",
     size: "large",
-    onClick: onCreate
+    onClick: function onClick() {
+      return onSubmit({
+        submit: onCreate,
+        success: {
+          action: onSuccess,
+          message: t('SharedDrive.sharedDriveModal.successNotification')
+        },
+        error: {
+          message: function message() {
+            return t('SharedDrive.sharedDriveModal.errorNotification');
+          }
+        }
+      });
+    },
+    busy: isLoading
   })));
 });
 SharedDriveForm.propTypes = {

package/dist/components/SharedDrive/useSharedDrive.js

@@ -3,21 +3,12 @@ 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 { getOrCreateFromArray } from '../../helpers/contacts';
 import { usePendingRecipients } from '../../hooks/usePendingRecipients';
 import { Contact } from '../../models';
-export var useSharedDrive = function useSharedDrive(_ref) {
-  var onSuccess = _ref.onSuccess;
+export var useSharedDrive = function useSharedDrive() {
   var client = useClient();
 
-  var _useI18n = useI18n(),
-      t = _useI18n.t;
-
-  var _useAlert = useAlert(),
-      showAlert = _useAlert.showAlert;
-
   var _useState = useState(''),
       _useState2 = _slicedToArray(_useState, 2),
       sharedDriveName = _useState2[0],
@@ -38,20 +29,19 @@ export var useSharedDrive = function useSharedDrive(_ref) {
   };
 
   var onCreate = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var contacts, readWriteRecipients, readOnlyRecipients;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.prev = 0;
-            _context.next = 3;
+            _context.next = 2;
             return getOrCreateFromArray(client, pendingRecipients, createContact);
 
-          case 3:
+          case 2:
             contacts = _context.sent;
             readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts;
             readOnlyRecipients = selectedOption === 'readOnly' ? contacts : [];
-            _context.next = 8;
+            _context.next = 7;
             return client.collection('io.cozy.sharings').createSharedDrive({
               name: sharedDriveName,
               description: sharedDriveName,
@@ -59,34 +49,15 @@ export var useSharedDrive = function useSharedDrive(_ref) {
               readOnlyRecipients: readOnlyRecipients
             });
 
-          case 8:
-            showAlert({
-              message: t('SharedDrive.sharedDriveModal.successNotification'),
-              severity: 'success',
-              variant: 'filled'
-            });
-            onSuccess();
-            _context.next = 15;
-            break;
-
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](0);
-            showAlert({
-              message: t('SharedDrive.sharedDriveModal.errorNotification'),
-              severity: 'error',
-              variant: 'filled'
-            });
-
-          case 15:
+          case 7:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 12]]);
+      }, _callee);
     }));
 
     return function onCreate() {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 

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

@@ -2,16 +2,12 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useSharedDrive } from './useSharedDrive';
-var mockShowAlert = jest.fn();
 var mockCreateSharedDrive = jest.fn();
 var mockCollection = jest.fn(function () {
   return {
     createSharedDrive: mockCreateSharedDrive
   };
 });
-var mockT = jest.fn(function (key) {
-  return key;
-});
 jest.mock('cozy-client', function () {
   return {
     useClient: jest.fn(function () {
@@ -22,24 +18,6 @@ jest.mock('cozy-client', function () {
     })
   };
 });
-jest.mock('cozy-ui/transpiled/react/providers/Alert', function () {
-  return {
-    useAlert: jest.fn(function () {
-      return {
-        showAlert: mockShowAlert
-      };
-    })
-  };
-});
-jest.mock('twake-i18n', function () {
-  return {
-    useI18n: jest.fn(function () {
-      return {
-        t: mockT
-      };
-    })
-  };
-});
 jest.mock('../../models', function () {
   return {
     Contact: {
@@ -60,9 +38,7 @@ describe('useSharedDrive', function () {
   });
   it('returns empty initial state', function () {
     var _renderHook = renderHook(function () {
-      return useSharedDrive({
-        onSuccess: jest.fn()
-      });
+      return useSharedDrive();
     }),
         result = _renderHook.result;
 
@@ -72,9 +48,7 @@ describe('useSharedDrive', function () {
   });
   it('handleSharedDriveNameChange updates the name', function () {
     var _renderHook2 = renderHook(function () {
-      return useSharedDrive({
-        onSuccess: jest.fn()
-      });
+      return useSharedDrive();
     }),
         result = _renderHook2.result;
 
@@ -87,18 +61,15 @@ describe('useSharedDrive', function () {
     });
     expect(result.current.sharedDriveName).toBe('My Drive');
   });
-  it('onCreate calls createSharedDrive and onSuccess', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-    var onSuccess, _renderHook3, result;
+  it('onCreate calls createSharedDrive', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var _renderHook3, result;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          onSuccess = jest.fn();
           mockCreateSharedDrive.mockResolvedValue({});
           _renderHook3 = renderHook(function () {
-            return useSharedDrive({
-              onSuccess: onSuccess
-            });
+            return useSharedDrive();
           }), result = _renderHook3.result;
           act(function () {
             result.current.handleSharedDriveNameChange({
@@ -110,7 +81,7 @@ describe('useSharedDrive', function () {
               email: 'a@b.c'
             }]);
           });
-          _context2.next = 6;
+          _context2.next = 5;
           return act( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
             return _regeneratorRuntime.wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
@@ -125,7 +96,7 @@ describe('useSharedDrive', function () {
             }, _callee);
           })));
 
-        case 6:
+        case 5:
           expect(mockCreateSharedDrive).toHaveBeenCalledWith({
             name: 'My Drive',
             description: 'My Drive',
@@ -134,55 +105,11 @@ describe('useSharedDrive', function () {
             }],
             readOnlyRecipients: []
           });
-          expect(mockShowAlert).toHaveBeenCalledWith(expect.objectContaining({
-            severity: 'success'
-          }));
-          expect(onSuccess).toHaveBeenCalledTimes(1);
 
-        case 9:
+        case 6:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
   })));
-  it('onCreate shows error alert and does not call onSuccess on failure', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-    var onSuccess, _renderHook4, result;
-
-    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          onSuccess = jest.fn();
-          mockCreateSharedDrive.mockRejectedValue(new Error('network error'));
-          _renderHook4 = renderHook(function () {
-            return useSharedDrive({
-              onSuccess: onSuccess
-            });
-          }), result = _renderHook4.result;
-          _context4.next = 5;
-          return act( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-              while (1) switch (_context3.prev = _context3.next) {
-                case 0:
-                  _context3.next = 2;
-                  return result.current.onCreate();
-
-                case 2:
-                case "end":
-                  return _context3.stop();
-              }
-            }, _callee3);
-          })));
-
-        case 5:
-          expect(mockShowAlert).toHaveBeenCalledWith(expect.objectContaining({
-            severity: 'error'
-          }));
-          expect(onSuccess).not.toHaveBeenCalled();
-
-        case 7:
-        case "end":
-          return _context4.stop();
-      }
-    }, _callee4);
-  })));
 });

package/dist/components/WhoHasAccess.js

@@ -32,6 +32,8 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
       isOwner = _ref2$isOwner === void 0 ? false : _ref2$isOwner,
       _ref2$isSharedDrive = _ref2.isSharedDrive,
       isSharedDrive = _ref2$isSharedDrive === void 0 ? false : _ref2$isSharedDrive,
+      _ref2$showOwner = _ref2.showOwner,
+      showOwner = _ref2$showOwner === void 0 ? true : _ref2$showOwner,
       recipients = _ref2.recipients,
       _ref2$recipientsToBeC = _ref2.recipientsToBeConfirmed,
       recipientsToBeConfirmed = _ref2$recipientsToBeC === void 0 ? [] : _ref2$recipientsToBeC,
@@ -57,7 +59,7 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
     onRevokeSelf: onRevokeSelf,
     permissions: permissions,
     fadeIn: linkHasBeenJustCreated
-  }), /*#__PURE__*/React.createElement(OwnerRecipient, {
+  }), showOwner && /*#__PURE__*/React.createElement(OwnerRecipient, {
     recipients: recipients
   }), /*#__PURE__*/React.createElement(RecipientList, {
     recipients: recipients,
@@ -75,6 +77,7 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
 
 WhoHasAccess.propTypes = {
   isOwner: PropTypes.bool,
+  showOwner: PropTypes.bool,
   recipients: PropTypes.array.isRequired,
   recipientsToBeConfirmed: PropTypes.arrayOf(PropTypes.shape({
     email: PropTypes.string.isRequired

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "32.3.2",
+  "version": "33.0.0",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -57,7 +57,7 @@
     "cozy-device-helper": "^4.0.0",
     "cozy-intent": "^2.31.1",
     "cozy-minilog": "^3.10.1",
-    "cozy-ui": "^138.1.0",
+    "cozy-ui": "^139.0.2",
     "cozy-ui-plus": "^8.0.1",
     "jest": "30.3.0",
     "jest-environment-jsdom": "30.3.0",
@@ -73,7 +73,7 @@
     "cozy-flags": ">=4.8.1",
     "cozy-intent": ">=2.29.1",
     "cozy-minilog": ">=3.9.1",
-    "cozy-ui": ">=138.1.0",
+    "cozy-ui": ">=139.0.2",
     "cozy-ui-plus": ">=6.0.0",
     "prop-types": ">=15.7.2",
     "react": ">=16.12.0",
@@ -83,5 +83,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "5fd20886ef0dfec91783b81bce0ae59d210a0cfa"
+  "gitHead": "6276bf5263e77e71944feb505a0aad085e770166"
 }

package/src/components/SharedDrive/EditSharedDriveModal.jsx

@@ -6,7 +6,7 @@ import Button from 'cozy-ui/transpiled/react/Buttons'
 import { FixedDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
 import TextField from 'cozy-ui/transpiled/react/TextField'
 import Typography from 'cozy-ui/transpiled/react/Typography'
-import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
+import { useSubmitWithLoader } from 'cozy-ui/transpiled/react/hooks/useSubmitWithLoader'
 import { useI18n } from 'twake-i18n'
 
 import SharedDriveHeader from './SharedDriveHeader'
@@ -21,62 +21,41 @@ export const EditSharedDriveModal = withLocales(({ onClose, document }) => {
   const client = useClient()
   const { t } = useI18n()
   const { share, getRecipients, revoke } = useSharingContext()
-  const { showAlert } = useAlert()
   const {
     pendingRecipients,
     setPendingRecipients,
     selectedOption,
     setSelectedOption
   } = usePendingRecipients()
+  const { onSubmit, isLoading } = useSubmitWithLoader()
 
   const [driveName, setDriveName] = useState(document.name)
-  const [isSaving, setIsSaving] = useState(false)
 
   const onSave = async () => {
-    if (isSaving) return
-    setIsSaving(true)
-    try {
-      // We add contacts
-      const contacts = await getOrCreateFromArray(
-        client,
-        pendingRecipients,
-        contact => client.create('io.cozy.contacts', contact)
-      )
-      const readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts
-      const readOnlyRecipients = selectedOption === 'readOnly' ? contacts : []
+    // We add contacts
+    const contacts = await getOrCreateFromArray(
+      client,
+      pendingRecipients,
+      contact => client.create('io.cozy.contacts', contact)
+    )
+    const readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts
+    const readOnlyRecipients = selectedOption === 'readOnly' ? contacts : []
 
-      await share({
-        document: document,
-        recipients: readWriteRecipients,
-        readOnlyRecipients,
-        sharedDrive: true,
-        openSharing: false
-      })
-
-      // We rename the shared drive
-      if (document?.name !== driveName) {
-        await client.collection('io.cozy.files').update({
-          ...document,
-          name: driveName,
-          _rev: document._rev || document.meta.rev
-        })
-      }
-
-      showAlert({
-        message: t('SharedDrive.editSharedDriveModal.successNotification'),
-        severity: 'success',
-        variant: 'filled'
-      })
+    await share({
+      document: document,
+      recipients: readWriteRecipients,
+      readOnlyRecipients,
+      sharedDrive: true,
+      openSharing: false
+    })
 
-      onClose()
-    } catch (_err) {
-      showAlert({
-        message: t('SharedDrive.editSharedDriveModal.errorNotification'),
-        severity: 'error',
-        variant: 'filled'
+    // We rename the shared drive
+    if (document?.name !== driveName) {
+      await client.collection('io.cozy.files').update({
+        ...document,
+        name: driveName,
+        _rev: document._rev || document.meta.rev
       })
-    } finally {
-      setIsSaving(false)
     }
   }
 
@@ -110,8 +89,8 @@ export const EditSharedDriveModal = withLocales(({ onClose, document }) => {
               {t('Share.contacts.addUsers')}
             </Typography>
             <DumbShareByEmail
-              currentRecipients={[]}
               documentType="Files"
+              currentRecipients={existingRecipients}
               pendingRecipients={pendingRecipients}
               onPendingRecipientsChange={setPendingRecipients}
               selectedOption={selectedOption}
@@ -121,6 +100,7 @@ export const EditSharedDriveModal = withLocales(({ onClose, document }) => {
           <WhoHasAccess
             isOwner
             isSharedDrive
+            showOwner={false}
             recipients={existingRecipients}
             document={document}
             documentType="Files"
@@ -134,14 +114,29 @@ export const EditSharedDriveModal = withLocales(({ onClose, document }) => {
               className="u-w-100 u-m-1"
               size="large"
               onClick={onClose}
+              disabled={isLoading}
             />
             <Button
               variant="primary"
               label={t('SharedDrive.sharedDriveModal.save')}
               className="u-w-100 u-m-1"
               size="large"
-              disabled={isSaving}
-              onClick={onSave}
+              onClick={() =>
+                onSubmit({
+                  submit: onSave,
+                  success: {
+                    action: onClose,
+                    message: t(
+                      'SharedDrive.editSharedDriveModal.successNotification'
+                    )
+                  },
+                  error: {
+                    message: () =>
+                      t('SharedDrive.editSharedDriveModal.errorNotification')
+                  }
+                })
+              }
+              busy={isLoading}
             />
           </div>
         </div>

package/src/components/SharedDrive/SharedDriveForm.jsx

@@ -4,6 +4,7 @@ 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 { useSubmitWithLoader } from 'cozy-ui/transpiled/react/hooks/useSubmitWithLoader'
 import { useI18n } from 'twake-i18n'
 
 import withLocales from '../../hoc/withLocales'
@@ -21,7 +22,8 @@ export const SharedDriveForm = withLocales(({ onSuccess, onCancel }) => {
     selectedOption,
     setSelectedOption,
     onCreate
-  } = useSharedDrive({ onSuccess })
+  } = useSharedDrive()
+  const { onSubmit, isLoading } = useSubmitWithLoader()
 
   return (
     <div>
@@ -55,13 +57,27 @@ export const SharedDriveForm = withLocales(({ onSuccess, onCancel }) => {
           className="u-w-100 u-m-1"
           size="large"
           onClick={onCancel}
+          disabled={isLoading}
         />
         <Button
           variant="primary"
           label={t('SharedDrive.sharedDriveModal.create')}
           className="u-w-100 u-m-1"
           size="large"
-          onClick={onCreate}
+          onClick={() =>
+            onSubmit({
+              submit: onCreate,
+              success: {
+                action: onSuccess,
+                message: t('SharedDrive.sharedDriveModal.successNotification')
+              },
+              error: {
+                message: () =>
+                  t('SharedDrive.sharedDriveModal.errorNotification')
+              }
+            })
+          }
+          busy={isLoading}
         />
       </div>
     </div>

package/src/components/SharedDrive/useSharedDrive.js

@@ -1,17 +1,13 @@
 import { useState } from 'react'
 
 import { useClient } from 'cozy-client'
-import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
-import { useI18n } from 'twake-i18n'
 
 import { getOrCreateFromArray } from '../../helpers/contacts'
 import { usePendingRecipients } from '../../hooks/usePendingRecipients'
 import { Contact } from '../../models'
 
-export const useSharedDrive = ({ onSuccess }) => {
+export const useSharedDrive = () => {
   const client = useClient()
-  const { t } = useI18n()
-  const { showAlert } = useAlert()
 
   const [sharedDriveName, setSharedDriveName] = useState('')
   const {
@@ -28,36 +24,20 @@ export const useSharedDrive = ({ onSuccess }) => {
   const createContact = contact => client.create(Contact.doctype, contact)
 
   const onCreate = async () => {
-    try {
-      const contacts = await getOrCreateFromArray(
-        client,
-        pendingRecipients,
-        createContact
-      )
-      const readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts
-      const readOnlyRecipients = selectedOption === 'readOnly' ? contacts : []
-
-      await client.collection('io.cozy.sharings').createSharedDrive({
-        name: sharedDriveName,
-        description: sharedDriveName,
-        recipients: readWriteRecipients,
-        readOnlyRecipients
-      })
-
-      showAlert({
-        message: t('SharedDrive.sharedDriveModal.successNotification'),
-        severity: 'success',
-        variant: 'filled'
-      })
-
-      onSuccess()
-    } catch (_err) {
-      showAlert({
-        message: t('SharedDrive.sharedDriveModal.errorNotification'),
-        severity: 'error',
-        variant: 'filled'
-      })
-    }
+    const contacts = await getOrCreateFromArray(
+      client,
+      pendingRecipients,
+      createContact
+    )
+    const readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts
+    const readOnlyRecipients = selectedOption === 'readOnly' ? contacts : []
+
+    await client.collection('io.cozy.sharings').createSharedDrive({
+      name: sharedDriveName,
+      description: sharedDriveName,
+      recipients: readWriteRecipients,
+      readOnlyRecipients
+    })
   }
 
   return {

package/src/components/SharedDrive/useSharedDrive.spec.js

@@ -2,12 +2,10 @@ import { renderHook, act } from '@testing-library/react-hooks'
 
 import { useSharedDrive } from './useSharedDrive'
 
-const mockShowAlert = jest.fn()
 const mockCreateSharedDrive = jest.fn()
 const mockCollection = jest.fn(() => ({
   createSharedDrive: mockCreateSharedDrive
 }))
-const mockT = jest.fn(key => key)
 
 jest.mock('cozy-client', () => ({
   useClient: jest.fn(() => ({
@@ -16,14 +14,6 @@ jest.mock('cozy-client', () => ({
   }))
 }))
 
-jest.mock('cozy-ui/transpiled/react/providers/Alert', () => ({
-  useAlert: jest.fn(() => ({ showAlert: mockShowAlert }))
-}))
-
-jest.mock('twake-i18n', () => ({
-  useI18n: jest.fn(() => ({ t: mockT }))
-}))
-
 jest.mock('../../models', () => ({
   Contact: { doctype: 'io.cozy.contacts' }
 }))
@@ -40,18 +30,14 @@ describe('useSharedDrive', () => {
   })
 
   it('returns empty initial state', () => {
-    const { result } = renderHook(() =>
-      useSharedDrive({ onSuccess: jest.fn() })
-    )
+    const { result } = renderHook(() => useSharedDrive())
     expect(result.current.sharedDriveName).toBe('')
     expect(result.current.pendingRecipients).toEqual([])
     expect(result.current.selectedOption).toBe('readWrite')
   })
 
   it('handleSharedDriveNameChange updates the name', () => {
-    const { result } = renderHook(() =>
-      useSharedDrive({ onSuccess: jest.fn() })
-    )
+    const { result } = renderHook(() => useSharedDrive())
     act(() => {
       result.current.handleSharedDriveNameChange({
         target: { value: 'My Drive' }
@@ -60,11 +46,10 @@ describe('useSharedDrive', () => {
     expect(result.current.sharedDriveName).toBe('My Drive')
   })
 
-  it('onCreate calls createSharedDrive and onSuccess', async () => {
-    const onSuccess = jest.fn()
+  it('onCreate calls createSharedDrive', async () => {
     mockCreateSharedDrive.mockResolvedValue({})
 
-    const { result } = renderHook(() => useSharedDrive({ onSuccess }))
+    const { result } = renderHook(() => useSharedDrive())
 
     act(() => {
       result.current.handleSharedDriveNameChange({
@@ -83,25 +68,5 @@ describe('useSharedDrive', () => {
       recipients: [{ email: 'a@b.c' }],
       readOnlyRecipients: []
     })
-    expect(mockShowAlert).toHaveBeenCalledWith(
-      expect.objectContaining({ severity: 'success' })
-    )
-    expect(onSuccess).toHaveBeenCalledTimes(1)
-  })
-
-  it('onCreate shows error alert and does not call onSuccess on failure', async () => {
-    const onSuccess = jest.fn()
-    mockCreateSharedDrive.mockRejectedValue(new Error('network error'))
-
-    const { result } = renderHook(() => useSharedDrive({ onSuccess }))
-
-    await act(async () => {
-      await result.current.onCreate()
-    })
-
-    expect(mockShowAlert).toHaveBeenCalledWith(
-      expect.objectContaining({ severity: 'error' })
-    )
-    expect(onSuccess).not.toHaveBeenCalled()
   })
 })

package/src/components/WhoHasAccess.jsx

@@ -29,6 +29,7 @@ const RecipientWaitingForConfirmationAlert = ({ recipientsToBeConfirmed }) => {
 const WhoHasAccess = ({
   isOwner = false,
   isSharedDrive = false,
+  showOwner = true,
   recipients,
   recipientsToBeConfirmed = [],
   document,
@@ -61,7 +62,7 @@ const WhoHasAccess = ({
           />
         )}
 
-        <OwnerRecipient recipients={recipients} />
+        {showOwner && <OwnerRecipient recipients={recipients} />}
 
         <RecipientList
           recipients={recipients}
@@ -82,6 +83,7 @@ const WhoHasAccess = ({
 
 WhoHasAccess.propTypes = {
   isOwner: PropTypes.bool,
+  showOwner: PropTypes.bool,
   recipients: PropTypes.array.isRequired,
   recipientsToBeConfirmed: PropTypes.arrayOf(
     PropTypes.shape({