cozy-sharing 28.3.4 → 28.4.0

package/src/components/ShareByEmail.spec.jsx

@@ -6,12 +6,24 @@ import flag from 'cozy-flags'
 
 import { ShareByEmail } from './ShareByEmail'
 import AppLike from '../../test/AppLike'
+import { getOrCreateFromArray } from '../helpers/contacts'
 
 jest.mock('../helpers/contacts', () => ({
-  getOrCreateFromArray: (client, recipients) => recipients
+  // eslint-disable-next-line no-unused-vars
+  getOrCreateFromArray: jest.fn((client, recipients, _createContact) => {
+    // Return the recipients as-is by default (simulating contact creation/lookup)
+    return Promise.resolve(recipients)
+  })
 }))
 
-jest.mock('cozy-flags')
+jest.mock('cozy-flags', () =>
+  jest.fn(flagName => {
+    if (flagName === 'drive.federated-shared-folder.enabled') {
+      return false
+    }
+    return null
+  })
+)
 
 describe('ShareByEmailComponent', () => {
   const defaultDocument = {
@@ -24,7 +36,8 @@ describe('ShareByEmailComponent', () => {
   const setup = ({
     sharingDesc = 'test',
     document = defaultDocument,
-    currentRecipients = []
+    currentRecipients = [],
+    sharedDrive = false
   } = {}) => {
     const props = {
       documentType: 'Files',
@@ -32,7 +45,8 @@ describe('ShareByEmailComponent', () => {
       document,
       sharingDesc,
       currentRecipients,
-      createContact: jest.fn()
+      createContact: jest.fn(),
+      sharedDrive
     }
     return render(
       <AppLike>
@@ -43,6 +57,13 @@ describe('ShareByEmailComponent', () => {
 
   beforeEach(() => {
     jest.clearAllMocks()
+    // Reset flag mock to default (non-federated mode)
+    flag.mockImplementation(flagName => {
+      if (flagName === 'drive.federated-shared-folder.enabled') {
+        return false
+      }
+      return null
+    })
   })
 
   it('shoud call share if submited', async () => {
@@ -77,13 +98,22 @@ describe('ShareByEmailComponent', () => {
         document: defaultDocument,
         openSharing: true,
         readOnlyRecipients: [],
-        recipients: [{ email: 'quentin@cozycloud.cc' }]
+        recipients: [{ email: 'quentin@cozycloud.cc' }],
+        sharedDrive: false
       })
     })
   })
 
   it('should alert user when it has reached the recipients limit for a document', async () => {
-    flag.mockReturnValue(2)
+    flag.mockImplementation(flagName => {
+      if (flagName === 'sharing.recipients-limit') {
+        return 2
+      }
+      if (flagName === 'drive.federated-shared-folder.enabled') {
+        return false
+      }
+      return null
+    })
 
     setup({
       currentRecipients: [
@@ -129,4 +159,64 @@ describe('ShareByEmailComponent', () => {
       expect(onShare).not.toBeCalled()
     })
   })
+
+  describe('federated mode', () => {
+    beforeEach(() => {
+      flag.mockImplementation(flagName => {
+        if (flagName === 'drive.federated-shared-folder.enabled') {
+          return true
+        }
+        return null
+      })
+      getOrCreateFromArray.mockResolvedValue([
+        { _id: 'contact1', email: 'quentin@cozycloud.cc' }
+      ])
+    })
+
+    it('should directly share when selecting a recipient in federated mode', async () => {
+      const sharingDesc = 'test'
+      const createContact = jest.fn()
+
+      setup({ sharingDesc, createContact })
+
+      act(() => {
+        fireEvent.change(
+          screen.getByPlaceholderText('Add contacts or groups'),
+          {
+            target: { value: 'quentin@cozycloud.cc' }
+          }
+        )
+      })
+
+      act(() => {
+        fireEvent.keyPress(
+          screen.getByPlaceholderText('Add contacts or groups'),
+          {
+            key: 'Enter',
+            code: 'Enter',
+            charCode: 13
+          }
+        )
+      })
+
+      await waitFor(() => {
+        expect(getOrCreateFromArray).toHaveBeenCalledWith(
+          expect.any(Object),
+          [{ email: 'quentin@cozycloud.cc' }],
+          expect.any(Function)
+        )
+      })
+
+      await waitFor(() => {
+        expect(onShare).toHaveBeenCalledWith({
+          document: defaultDocument,
+          recipients: [{ _id: 'contact1', email: 'quentin@cozycloud.cc' }],
+          readOnlyRecipients: [],
+          description: sharingDesc,
+          openSharing: false,
+          sharedDrive: true
+        })
+      })
+    })
+  })
 })

package/src/components/ShareByLink.jsx

@@ -3,6 +3,7 @@ import React, { useReducer, useState } from 'react'
 import { useI18n } from 'twake-i18n'
 
 import { useClient } from 'cozy-client'
+import flag from 'cozy-flags'
 import Button from 'cozy-ui/transpiled/react/Buttons'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import CopyIcon from 'cozy-ui/transpiled/react/Icons/Copy'
@@ -28,6 +29,7 @@ const ShareByLink = ({ link, document, documentType }) => {
   const canShare = typeof navigator?.share === 'function'
   const showCopyAndSendButtons = isMobile && canShare
   const showOnlyCopyButton = !isMobile || !canShare
+  const isFederated = flag('drive.federated-shared-folder.enabled')
 
   const [isEditDialogOpen, toggleEditDialogOpen] = useReducer(
     state => !state,
@@ -106,7 +108,11 @@ const ShareByLink = ({ link, document, documentType }) => {
   }
 
   return (
-    <div className="u-w-100 u-flex u-flex-justify-center">
+    <div
+      className={
+        isFederated ? 'u-w-100' : 'u-w-100 u-flex u-flex-justify-center'
+      }
+    >
       {showCopyAndSendButtons && (
         <>
           <Button
@@ -114,7 +120,6 @@ const ShareByLink = ({ link, document, documentType }) => {
             variant="secondary"
             size="medium"
             startIcon={<Icon icon={LinkIcon} />}
-            className="u-flex-auto u-mr-half"
             onClick={shareLink}
             busy={isGenerating}
           />
@@ -133,7 +138,6 @@ const ShareByLink = ({ link, document, documentType }) => {
           variant="secondary"
           size="medium"
           startIcon={<Icon icon={LinkIcon} />}
-          className="u-flex-auto u-mr-half"
           onClick={generateLinkAndCopyLinkToClipboard}
           busy={isGenerating}
         />

package/src/components/ShareModal/ShareModal.jsx

@@ -3,10 +3,13 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import { useLocation } from 'react-router'
 
+import flag from 'cozy-flags'
+
 import EditableSharingModal from './EditableSharingModal'
 import { SharingDetailsModal } from './SharingDetailsModal'
 import withLocales from '../../hoc/withLocales'
 import { useSharingContext } from '../../hooks/useSharingContext'
+import { FederatedFolderModal } from '../FederatedFolder/FederatedFolderModal'
 
 export const ShareModal = withLocales(props => {
   const location = useLocation?.()
@@ -22,7 +25,8 @@ export const ShareModal = withLocales(props => {
     getOwner,
     getSharingType,
     getRecipients,
-    revokeSelf
+    revokeSelf,
+    allLoaded
   } = useSharingContext()
 
   const handleRevokeSelf = async document => {
@@ -30,6 +34,17 @@ export const ShareModal = withLocales(props => {
     onRevokeSuccess?.(document)
   }
 
+  const isFederatedMode = flag('drive.federated-shared-folder.enabled')
+  const hasSharings = byDocId[document.id]?.sharings?.length > 0
+
+  // In federated mode, show FederatedFolderModal for unshared documents (sharing an existing folder).
+  // When isFederatedMode && hasSharings is true, we intentionally fall through to the legacy
+  // modals (EditableSharingModal / SharingDetailsModal) because federated-shared folders are
+  // handled by those components.
+  if (isFederatedMode && allLoaded && !hasSharings) {
+    return <FederatedFolderModal document={document} onClose={rest.onClose} />
+  }
+
   const isEditable =
     !byDocId[document.id] || isOwner(document.id) || canReshare(document.id)
 

package/src/components/ShareModal.jsx

@@ -26,7 +26,7 @@ export const ShareModal = ({
   sharingDesc,
   twoStepsConfirmationMethods
 }) => {
-  if (isSharedDrive) {
+  if (isSharedDrive && !flag('drive.federated-shared-folder.enabled')) {
     return (
       <SharedDriveEditModal
         document={document}

package/src/components/ShareRecipientsInput.jsx

@@ -22,7 +22,8 @@ const ShareRecipientsInput = ({
   recipients,
   placeholder,
   onPick,
-  onRemove
+  onRemove,
+  disabled
 }) => {
   const reachableContactsQuery = buildReachableContactsQuery()
   const reachableContactsResult = useQueryAll(
@@ -102,6 +103,7 @@ const ShareRecipientsInput = ({
   return (
     <ShareAutosuggest
       loading={isLoading}
+      disabled={disabled}
       contactsAndGroups={contactsAndGroups}
       recipients={recipients}
       onPick={onPick}
@@ -116,7 +118,8 @@ ShareRecipientsInput.propTypes = {
   recipients: PropTypes.array,
   placeholder: PropTypes.string,
   onPick: PropTypes.func.isRequired,
-  onRemove: PropTypes.func.isRequired
+  onRemove: PropTypes.func.isRequired,
+  disabled: PropTypes.bool
 }
 
 ShareRecipientsInput.defaultProps = {

package/src/components/SharedDrive/DumbSharedDriveModal.jsx

@@ -2,15 +2,8 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import { useI18n } from 'twake-i18n'
 
-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 withLocales from '../../hoc/withLocales'
-import AntivirusAlert from '../AntivirusAlert'
-import { default as DumbShareByEmail } from '../ShareByEmail'
-import WhoHasAccess from '../WhoHasAccess'
+import DumbBatchSharedFolderModal from '../SharedFolder/DumbBatchSharedFolderModal'
 
 export const DumbSharedDriveModal = withLocales(
   ({
@@ -20,92 +13,43 @@ export const DumbSharedDriveModal = withLocales(
     handleSharedDriveNameChange,
     createContact,
     recipients,
+    currentRecipients,
     onRevoke,
     onSetType,
     onCreate,
+    onSend,
     onClose,
     onShare,
-    onRename
+    onRename,
+    showNameField = true,
+    sharingLink
   }) => {
     const { t } = useI18n()
-
     return (
-      <FixedDialog
-        open
-        disableGutters
-        onClose={onClose}
+      <DumbBatchSharedFolderModal
         title={title}
-        classes={{ paper: 'u-ov-visible' }}
-        componentsProps={{
-          dialogContent: { className: 'u-ov-visible' }
-        }}
-        content={
-          <div>
-            <div className="u-ph-2">
-              <AntivirusAlert document={document} />
-              {handleSharedDriveNameChange && (
-                <TextField
-                  required
-                  label={t('SharedDrive.sharedDriveModal.nameLabel')}
-                  variant="outlined"
-                  size="small"
-                  className="u-w-100 u-mt-1-half"
-                  value={sharedDriveName}
-                  onChange={handleSharedDriveNameChange}
-                />
-              )}
-              <Typography variant="h6" className="u-mt-1-half u-mb-half">
-                {t('SharedDrive.sharedDriveModal.addPeople')}
-              </Typography>
-              <DumbShareByEmail
-                createContact={createContact}
-                currentRecipients={[]}
-                document={document}
-                documentType="Files"
-                onShare={onShare}
-                submitLabel={t('SharedDrive.sharedDriveModal.add')}
-                showNotifications={false}
-              />
-            </div>
-            <WhoHasAccess
-              isOwner
-              isSharedDrive
-              recipients={recipients}
-              document={document}
-              documentType="Files"
-              className="u-w-100"
-              onRevoke={onRevoke}
-              onSetType={onSetType}
-            />
-          </div>
-        }
-        actions={
-          <>
-            {onCreate && (
-              <>
-                <Button
-                  variant="secondary"
-                  label={t('SharedDrive.sharedDriveModal.cancel')}
-                  onClick={onClose}
-                />
-                <Button
-                  variant="primary"
-                  label={t('SharedDrive.sharedDriveModal.create')}
-                  onClick={onCreate}
-                />
-              </>
-            )}
-            {onRename && (
-              <>
-                <Button
-                  variant="primary"
-                  label={t('SharedDrive.sharedDriveModal.save')}
-                  onClick={() => onRename(sharedDriveName)}
-                />
-              </>
-            )}
-          </>
-        }
+        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')}
       />
     )
   }
@@ -115,13 +59,19 @@ DumbSharedDriveModal.propTypes = {
   title: PropTypes.string,
   document: PropTypes.object,
   sharedDriveName: PropTypes.string,
-  handleSharedDriveNameChange: PropTypes.func.isRequired,
+  handleSharedDriveNameChange: PropTypes.func,
   createContact: PropTypes.func.isRequired,
   recipients: PropTypes.array,
+  currentRecipients: PropTypes.array,
   onRevoke: PropTypes.func.isRequired,
   onSetType: PropTypes.func.isRequired,
-  onCreate: PropTypes.func.isRequired,
+  onCreate: PropTypes.func,
+  onSend: PropTypes.func,
   onClose: PropTypes.func.isRequired,
   onShare: PropTypes.func.isRequired,
-  onRename: PropTypes.func.isRequired
+  onRename: PropTypes.func,
+  showNameField: PropTypes.bool,
+  sharingLink: PropTypes.string
 }
+
+export default DumbSharedDriveModal

package/src/components/SharedDrive/SharedDriveModal.jsx

@@ -6,7 +6,11 @@ import { useClient } from 'cozy-client'
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
 
 import { DumbSharedDriveModal } from './DumbSharedDriveModal'
-import { mergeAndDeduplicateRecipients, formatRecipients } from './helpers'
+import {
+  mergeAndDeduplicateRecipients,
+  formatRecipients,
+  RECIPIENT_INDEX_PREFIX
+} from './helpers'
 import withLocales from '../../hoc/withLocales'
 import { useSharingContext } from '../../hooks/useSharingContext'
 import { Contact } from '../../models'
@@ -56,7 +60,8 @@ export const SharedDriveModal = withLocales(({ onClose }) => {
         document: sharedDriveFolder,
         recipients: sharedDriveRecipients.recipients,
         readOnlyRecipients: sharedDriveRecipients.readOnlyRecipients,
-        sharedDrive: true
+        sharedDrive: true,
+        openSharing: false
       })
 
       showAlert({
@@ -76,7 +81,7 @@ export const SharedDriveModal = withLocales(({ onClose }) => {
   }
 
   const onSetType = (index, newType) => {
-    const _id = index.split('virtual-shared-drive-sharing-')[1]
+    const _id = index.split(RECIPIENT_INDEX_PREFIX)[1]
 
     if (newType === 'two-way') {
       setSharedDriveRecipients(prev => {
@@ -100,7 +105,7 @@ export const SharedDriveModal = withLocales(({ onClose }) => {
   }
 
   const onRevoke = index => {
-    const _id = index.split('virtual-shared-drive-sharing-')[1]
+    const _id = index.split(RECIPIENT_INDEX_PREFIX)[1]
 
     setSharedDriveRecipients(prev => {
       return {
@@ -121,11 +126,16 @@ export const SharedDriveModal = withLocales(({ onClose }) => {
       handleSharedDriveNameChange={handleSharedDriveNameChange}
       createContact={createContact}
       recipients={recipients}
+      currentRecipients={[]}
       onRevoke={onRevoke}
       onSetType={onSetType}
       onCreate={onCreate}
+      onSend={undefined}
       onClose={onClose}
       onShare={onShare}
+      showNameField={true}
+      sharingLink={undefined}
+      document={undefined}
     />
   )
 })

package/src/components/SharedDrive/helpers.js

@@ -2,6 +2,8 @@ import { models } from 'cozy-client'
 
 const ContactModel = models.contact
 
+export const RECIPIENT_INDEX_PREFIX = 'virtual-shared-drive-sharing-'
+
 export const mergeAndDeduplicateRecipients = arrays => {
   const combinedArray = arrays.flat()
 
@@ -18,12 +20,41 @@ export const mergeAndDeduplicateRecipients = arrays => {
   return uniqueArray
 }
 
+export const moveRecipientToReadWrite = (federatedRecipients, _id) => {
+  const recipientToMove = federatedRecipients.readOnlyRecipients.find(
+    r => r._id === _id
+  )
+  if (!recipientToMove) return federatedRecipients
+
+  return {
+    recipients: [...federatedRecipients.recipients, recipientToMove],
+    readOnlyRecipients: federatedRecipients.readOnlyRecipients.filter(
+      r => r._id !== _id
+    )
+  }
+}
+
+export const moveRecipientToReadOnly = (federatedRecipients, _id) => {
+  const recipientToMove = federatedRecipients.recipients.find(
+    r => r._id === _id
+  )
+  if (!recipientToMove) return federatedRecipients
+
+  return {
+    recipients: federatedRecipients.recipients.filter(r => r._id !== _id),
+    readOnlyRecipients: [
+      ...federatedRecipients.readOnlyRecipients,
+      recipientToMove
+    ]
+  }
+}
+
 export const formatRecipients = sharedDriveRecipients => {
   const recipients = []
 
   sharedDriveRecipients.recipients.forEach(r => {
     recipients.push({
-      index: `virtual-shared-drive-sharing-${r._id}`,
+      index: `${RECIPIENT_INDEX_PREFIX}${r._id}`,
       email: ContactModel.getPrimaryEmail(r),
       public_name: r.displayName || r.name,
       memberIndex: r._id,
@@ -34,7 +65,7 @@ export const formatRecipients = sharedDriveRecipients => {
 
   sharedDriveRecipients.readOnlyRecipients.forEach(r => {
     recipients.push({
-      index: `virtual-shared-drive-sharing-${r._id}`,
+      index: `${RECIPIENT_INDEX_PREFIX}${r._id}`,
       email: ContactModel.getPrimaryEmail(r),
       public_name: r.displayName || r.name,
       memberIndex: r._id,