cozy-sharing 30.3.0 → 31.0.0

package/src/components/SharedDrive/useSharedDrive.js

@@ -0,0 +1,98 @@
+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 const useSharedDrive = ({ onSuccess }) => {
+  const client = useClient()
+  const { t } = useI18n()
+  const { showAlert } = useAlert()
+
+  const [sharedDriveRecipients, setSharedDriveRecipients] = useState({
+    recipients: [],
+    readOnlyRecipients: []
+  })
+  const [sharedDriveName, setSharedDriveName] = useState('')
+
+  const handleSharedDriveNameChange = event => {
+    setSharedDriveName(event.target.value)
+  }
+
+  const onShare = params => {
+    setSharedDriveRecipients(prev => ({
+      recipients: mergeAndDeduplicateRecipients([
+        prev.recipients,
+        params.recipients
+      ]),
+      readOnlyRecipients: mergeAndDeduplicateRecipients([
+        prev.readOnlyRecipients,
+        params.readOnlyRecipients
+      ])
+    }))
+  }
+
+  const onCreate = async () => {
+    try {
+      await client.collection('io.cozy.sharings').createSharedDrive({
+        name: sharedDriveName,
+        description: sharedDriveName,
+        recipients: sharedDriveRecipients.recipients,
+        readOnlyRecipients: sharedDriveRecipients.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 onSetType = (index, newType) => {
+    const _id = index.split(RECIPIENT_INDEX_PREFIX)[1]
+    setSharedDriveRecipients(prev =>
+      newType === 'two-way'
+        ? moveRecipientToReadWrite(prev, _id)
+        : moveRecipientToReadOnly(prev, _id)
+    )
+  }
+
+  const onRevoke = index => {
+    const _id = index.split(RECIPIENT_INDEX_PREFIX)[1]
+    setSharedDriveRecipients(prev => ({
+      recipients: prev.recipients.filter(r => r._id !== _id),
+      readOnlyRecipients: prev.readOnlyRecipients.filter(r => r._id !== _id)
+    }))
+  }
+
+  const createContact = contact => client.create(Contact.doctype, contact)
+
+  return {
+    sharedDriveName,
+    recipients: formatRecipients(sharedDriveRecipients),
+    handleSharedDriveNameChange,
+    onShare,
+    onCreate,
+    onSetType,
+    onRevoke,
+    createContact
+  }
+}

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

@@ -0,0 +1,155 @@
+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(() => ({
+    collection: mockCollection
+  })),
+  models: {
+    contact: {
+      getPrimaryEmail: jest.fn(r =>
+        Array.isArray(r.email) && r.email[0] ? r.email[0].address : ''
+      ),
+      getDisplayName: jest.fn(r => r.displayName || r.name || '')
+    }
+  }
+}))
+
+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' }
+}))
+
+describe('useSharedDrive', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('returns empty initial state', () => {
+    const { result } = renderHook(() =>
+      useSharedDrive({ onSuccess: jest.fn() })
+    )
+    expect(result.current.sharedDriveName).toBe('')
+    expect(result.current.recipients).toEqual([])
+  })
+
+  it('handleSharedDriveNameChange updates the name', () => {
+    const { result } = renderHook(() =>
+      useSharedDrive({ onSuccess: jest.fn() })
+    )
+    act(() => {
+      result.current.handleSharedDriveNameChange({
+        target: { value: 'My Drive' }
+      })
+    })
+    expect(result.current.sharedDriveName).toBe('My Drive')
+  })
+
+  it('onRevoke removes a recipient from both lists', () => {
+    const { result } = renderHook(() =>
+      useSharedDrive({ onSuccess: jest.fn() })
+    )
+    act(() => {
+      result.current.onShare({
+        recipients: [{ _id: 'abc', displayName: 'Alice', email: [] }],
+        readOnlyRecipients: []
+      })
+    })
+    act(() => {
+      result.current.onRevoke(`virtual-shared-drive-sharing-abc`)
+    })
+    expect(result.current.recipients).toHaveLength(0)
+  })
+
+  it('onSetType moves a recipient to read-only', () => {
+    const { result } = renderHook(() =>
+      useSharedDrive({ onSuccess: jest.fn() })
+    )
+    act(() => {
+      result.current.onShare({
+        recipients: [{ _id: 'abc', displayName: 'Alice', email: [] }],
+        readOnlyRecipients: []
+      })
+    })
+    act(() => {
+      result.current.onSetType(`virtual-shared-drive-sharing-abc`, 'one-way')
+    })
+    expect(result.current.recipients[0].type).toBe('one-way')
+  })
+
+  it('onSetType moves a recipient to read-write', () => {
+    const { result } = renderHook(() =>
+      useSharedDrive({ onSuccess: jest.fn() })
+    )
+    act(() => {
+      result.current.onShare({
+        recipients: [],
+        readOnlyRecipients: [{ _id: 'xyz', displayName: 'Bob', email: [] }]
+      })
+    })
+    act(() => {
+      result.current.onSetType(`virtual-shared-drive-sharing-xyz`, 'two-way')
+    })
+    expect(result.current.recipients).toHaveLength(1)
+    expect(result.current.recipients[0].type).toBe('two-way')
+  })
+
+  it('onCreate calls createSharedDrive, showAlert with success, and onSuccess', async () => {
+    const onSuccess = jest.fn()
+    mockCreateSharedDrive.mockResolvedValue({})
+
+    const { result } = renderHook(() => useSharedDrive({ onSuccess }))
+
+    act(() => {
+      result.current.handleSharedDriveNameChange({
+        target: { value: 'My Drive' }
+      })
+    })
+
+    await act(async () => {
+      await result.current.onCreate()
+    })
+
+    expect(mockCreateSharedDrive).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: 'My Drive',
+        description: 'My Drive'
+      })
+    )
+    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/index.jsx

@@ -20,6 +20,7 @@ export { default as OwnerRecipientDefaultLite } from './components/Recipient/Own
 export { SharedRecipientsList } from './SharedRecipientsList'
 export { ShareButton } from './ShareButton'
 export { SharedDriveModal } from './components/SharedDrive/SharedDriveModal'
+export { SharedDriveForm } from './components/SharedDrive/SharedDriveForm'
 export { FederatedFolderModal } from './components/FederatedFolder/FederatedFolderModal'
 export { ShareModal } from './components/ShareModal/ShareModal'
 export { RefreshableSharings } from './RefreshableSharings'

package/dist/components/SharedDrive/DumbSharedDriveModal.js

@@ -1,78 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import { useI18n } from 'twake-i18n';
-import withLocales from '../../hoc/withLocales';
-import { DumbBatchSharedFolderModal } from '../SharedFolder/DumbBatchSharedFolderModal';
-export var DumbSharedDriveModal = withLocales(function (_ref) {
-  var title = _ref.title,
-      document = _ref.document,
-      sharedDriveName = _ref.sharedDriveName,
-      handleSharedDriveNameChange = _ref.handleSharedDriveNameChange,
-      createContact = _ref.createContact,
-      recipients = _ref.recipients,
-      currentRecipients = _ref.currentRecipients,
-      onRevoke = _ref.onRevoke,
-      onSetType = _ref.onSetType,
-      onCreate = _ref.onCreate,
-      onSend = _ref.onSend,
-      onClose = _ref.onClose,
-      onShare = _ref.onShare,
-      onRename = _ref.onRename,
-      _ref$showNameField = _ref.showNameField,
-      showNameField = _ref$showNameField === void 0 ? true : _ref$showNameField,
-      sharingLink = _ref.sharingLink,
-      autoOpenShareRestriction = _ref.autoOpenShareRestriction,
-      showGenerateLinkButton = _ref.showGenerateLinkButton;
-
-  var _useI18n = useI18n(),
-      t = _useI18n.t;
-
-  return /*#__PURE__*/React.createElement(DumbBatchSharedFolderModal, {
-    title: title,
-    document: document,
-    folderName: sharedDriveName,
-    handleFolderNameChange: handleSharedDriveNameChange,
-    createContact: createContact,
-    recipients: recipients,
-    currentRecipients: currentRecipients,
-    onRevoke: onRevoke,
-    onSetType: onSetType,
-    onCreate: onCreate,
-    onSend: onSend,
-    onClose: onClose,
-    onShare: onShare,
-    onRename: onRename,
-    showNameField: showNameField,
-    sharingLink: sharingLink,
-    nameLabel: t('SharedDrive.sharedDriveModal.nameLabel'),
-    addPeopleLabel: t('SharedDrive.sharedDriveModal.addPeople'),
-    addButtonLabel: t('SharedDrive.sharedDriveModal.add'),
-    cancelLabel: t('SharedDrive.sharedDriveModal.cancel'),
-    createLabel: t('SharedDrive.sharedDriveModal.create'),
-    shareLabel: t('FederatedFolder.share'),
-    saveLabel: t('SharedDrive.sharedDriveModal.save'),
-    autoOpenShareRestriction: autoOpenShareRestriction,
-    showGenerateLinkButton: showGenerateLinkButton
-  });
-});
-DumbSharedDriveModal.propTypes = {
-  title: PropTypes.string,
-  document: PropTypes.object,
-  sharedDriveName: PropTypes.string,
-  handleSharedDriveNameChange: PropTypes.func,
-  createContact: PropTypes.func.isRequired,
-  recipients: PropTypes.array,
-  currentRecipients: PropTypes.array,
-  onRevoke: PropTypes.func.isRequired,
-  onSetType: PropTypes.func.isRequired,
-  onCreate: PropTypes.func,
-  onSend: PropTypes.func,
-  onClose: PropTypes.func.isRequired,
-  onShare: PropTypes.func.isRequired,
-  onRename: PropTypes.func,
-  showNameField: PropTypes.bool,
-  sharingLink: PropTypes.string,
-  autoOpenShareRestriction: PropTypes.bool,
-  showGenerateLinkButton: PropTypes.bool
-};
-export default DumbSharedDriveModal;

package/dist/components/SharedDrive/SharedDriveEditModal.js

@@ -1,110 +0,0 @@
-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 { useI18n } from 'twake-i18n';
-import { DumbSharedDriveModal } from './DumbSharedDriveModal';
-import withLocales from '../../hoc/withLocales';
-import { useSharingContext } from '../../hooks/useSharingContext';
-import { Contact } from '../../models';
-export var SharedDriveEditModal = withLocales(function (_ref) {
-  var document = _ref.document,
-      sharing = _ref.sharing,
-      recipients = _ref.recipients,
-      onShare = _ref.onShare,
-      onRevoke = _ref.onRevoke,
-      onClose = _ref.onClose,
-      autoOpenShareRestriction = _ref.autoOpenShareRestriction,
-      showGenerateLinkButton = _ref.showGenerateLinkButton;
-  var client = useClient();
-
-  var _useI18n = useI18n(),
-      t = _useI18n.t;
-
-  var _useAlert = useAlert(),
-      showAlert = _useAlert.showAlert;
-
-  var _useSharingContext = useSharingContext(),
-      renameSharedDrive = _useSharingContext.renameSharedDrive;
-
-  var createContact = function createContact(contact) {
-    return client.create(Contact.doctype, contact);
-  };
-
-  var _useState = useState(sharing === null || sharing === void 0 ? void 0 : sharing.description),
-      _useState2 = _slicedToArray(_useState, 2),
-      name = _useState2[0],
-      setName = _useState2[1];
-
-  var handleNameChange = function handleNameChange(event) {
-    setName(event.target.value);
-  };
-
-  var onRename = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return renameSharedDrive(document, value);
-
-          case 3:
-            showAlert({
-              message: t('SharedDrive.sharedDriveModal.successNotificationUpdate'),
-              severity: 'success'
-            });
-            onClose();
-            _context.next = 10;
-            break;
-
-          case 7:
-            _context.prev = 7;
-            _context.t0 = _context["catch"](0);
-            showAlert({
-              message: t('SharedDrive.sharedDriveModal.errorNotificationUpdate'),
-              severity: 'error'
-            });
-
-          case 10:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0, 7]]);
-    }));
-
-    return function onRename(_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-
-  return /*#__PURE__*/React.createElement(DumbSharedDriveModal, {
-    title: t('Files.share.title', {
-      name: sharing === null || sharing === void 0 ? void 0 : sharing.description
-    }),
-    document: document,
-    createContact: createContact,
-    recipients: recipients,
-    onRevoke: onRevoke,
-    onClose: onClose,
-    onShare: onShare,
-    sharedDriveName: name,
-    handleSharedDriveNameChange: handleNameChange,
-    onRename: onRename,
-    autoOpenShareRestriction: autoOpenShareRestriction,
-    showGenerateLinkButton: showGenerateLinkButton
-  });
-});
-SharedDriveEditModal.propTypes = {
-  document: PropTypes.object,
-  sharing: PropTypes.object,
-  recipients: PropTypes.array,
-  onShare: PropTypes.func.isRequired,
-  onRevoke: PropTypes.func.isRequired,
-  onClose: PropTypes.func.isRequired,
-  autoOpenShareRestriction: PropTypes.bool,
-  showGenerateLinkButton: PropTypes.bool
-};

package/src/components/SharedDrive/DumbSharedDriveModal.jsx

@@ -1,84 +0,0 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-
-import { useI18n } from 'twake-i18n'
-
-import withLocales from '../../hoc/withLocales'
-import { DumbBatchSharedFolderModal } from '../SharedFolder/DumbBatchSharedFolderModal'
-
-export const DumbSharedDriveModal = withLocales(
-  ({
-    title,
-    document,
-    sharedDriveName,
-    handleSharedDriveNameChange,
-    createContact,
-    recipients,
-    currentRecipients,
-    onRevoke,
-    onSetType,
-    onCreate,
-    onSend,
-    onClose,
-    onShare,
-    onRename,
-    showNameField = true,
-    sharingLink,
-    autoOpenShareRestriction,
-    showGenerateLinkButton
-  }) => {
-    const { t } = useI18n()
-    return (
-      <DumbBatchSharedFolderModal
-        title={title}
-        document={document}
-        folderName={sharedDriveName}
-        handleFolderNameChange={handleSharedDriveNameChange}
-        createContact={createContact}
-        recipients={recipients}
-        currentRecipients={currentRecipients}
-        onRevoke={onRevoke}
-        onSetType={onSetType}
-        onCreate={onCreate}
-        onSend={onSend}
-        onClose={onClose}
-        onShare={onShare}
-        onRename={onRename}
-        showNameField={showNameField}
-        sharingLink={sharingLink}
-        nameLabel={t('SharedDrive.sharedDriveModal.nameLabel')}
-        addPeopleLabel={t('SharedDrive.sharedDriveModal.addPeople')}
-        addButtonLabel={t('SharedDrive.sharedDriveModal.add')}
-        cancelLabel={t('SharedDrive.sharedDriveModal.cancel')}
-        createLabel={t('SharedDrive.sharedDriveModal.create')}
-        shareLabel={t('FederatedFolder.share')}
-        saveLabel={t('SharedDrive.sharedDriveModal.save')}
-        autoOpenShareRestriction={autoOpenShareRestriction}
-        showGenerateLinkButton={showGenerateLinkButton}
-      />
-    )
-  }
-)
-
-DumbSharedDriveModal.propTypes = {
-  title: PropTypes.string,
-  document: PropTypes.object,
-  sharedDriveName: PropTypes.string,
-  handleSharedDriveNameChange: PropTypes.func,
-  createContact: PropTypes.func.isRequired,
-  recipients: PropTypes.array,
-  currentRecipients: PropTypes.array,
-  onRevoke: PropTypes.func.isRequired,
-  onSetType: PropTypes.func.isRequired,
-  onCreate: PropTypes.func,
-  onSend: PropTypes.func,
-  onClose: PropTypes.func.isRequired,
-  onShare: PropTypes.func.isRequired,
-  onRename: PropTypes.func,
-  showNameField: PropTypes.bool,
-  sharingLink: PropTypes.string,
-  autoOpenShareRestriction: PropTypes.bool,
-  showGenerateLinkButton: PropTypes.bool
-}
-
-export default DumbSharedDriveModal

package/src/components/SharedDrive/SharedDriveEditModal.jsx

@@ -1,79 +0,0 @@
-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 { useI18n } from 'twake-i18n'
-
-import { DumbSharedDriveModal } from './DumbSharedDriveModal'
-import withLocales from '../../hoc/withLocales'
-import { useSharingContext } from '../../hooks/useSharingContext'
-import { Contact } from '../../models'
-
-export const SharedDriveEditModal = withLocales(
-  ({
-    document,
-    sharing,
-    recipients,
-    onShare,
-    onRevoke,
-    onClose,
-    autoOpenShareRestriction,
-    showGenerateLinkButton
-  }) => {
-    const client = useClient()
-    const { t } = useI18n()
-    const { showAlert } = useAlert()
-    const { renameSharedDrive } = useSharingContext()
-
-    const createContact = contact => client.create(Contact.doctype, contact)
-    const [name, setName] = useState(sharing?.description)
-
-    const handleNameChange = event => {
-      setName(event.target.value)
-    }
-    const onRename = async value => {
-      try {
-        await renameSharedDrive(document, value)
-        showAlert({
-          message: t('SharedDrive.sharedDriveModal.successNotificationUpdate'),
-          severity: 'success'
-        })
-        onClose()
-      } catch (_error) {
-        showAlert({
-          message: t('SharedDrive.sharedDriveModal.errorNotificationUpdate'),
-          severity: 'error'
-        })
-      }
-    }
-
-    return (
-      <DumbSharedDriveModal
-        title={t('Files.share.title', { name: sharing?.description })}
-        document={document}
-        createContact={createContact}
-        recipients={recipients}
-        onRevoke={onRevoke}
-        onClose={onClose}
-        onShare={onShare}
-        sharedDriveName={name}
-        handleSharedDriveNameChange={handleNameChange}
-        onRename={onRename}
-        autoOpenShareRestriction={autoOpenShareRestriction}
-        showGenerateLinkButton={showGenerateLinkButton}
-      />
-    )
-  }
-)
-
-SharedDriveEditModal.propTypes = {
-  document: PropTypes.object,
-  sharing: PropTypes.object,
-  recipients: PropTypes.array,
-  onShare: PropTypes.func.isRequired,
-  onRevoke: PropTypes.func.isRequired,
-  onClose: PropTypes.func.isRequired,
-  autoOpenShareRestriction: PropTypes.bool,
-  showGenerateLinkButton: PropTypes.bool
-}