cozy-sharing 32.3.2 → 33.0.1

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({

package/src/helpers/contacts.js

@@ -47,3 +47,15 @@ export const getContactsFromGroupId = (contacts = [], groupId) => {
     )
   })
 }
+
+/**
+ * Returns true when a contact does not exist. A contact without
+ * an `_id` is always a placeholder that must be created before sharing.
+ *
+ * Used to decide whether the autosuggest input should allow creating
+ * a new contact on the fly or should block the pick (depending on the
+ * `enableCreateContact` flag).
+ */
+export const isContactToBeCreated = contact => {
+  return !contact._id
+}