feat: Implement duplicating files in shared drive ✨

src/components/FolderPicker/types.ts

@@ -1,6 +1,15 @@
 import { IOCozyFile, NextcloudFile } from 'cozy-client/types/types'
 
-export type File = IOCozyFile | NextcloudFile
+export type File = (IOCozyFile | NextcloudFile) & {
+  cozyMetadata?: {
+    createdOn?: string
+  }
+  attributes?: {
+    cozyMetadata?: {
+      createdOn?: string
+    }
+  }
+}
 
 export interface FolderPickerEntry {
   _id?: string
@@ -11,4 +20,5 @@ export interface FolderPickerEntry {
   dir_id?: string
   class?: string
   path?: string
+  driveId?: string
 }

src/contexts/ClipboardProvider.tsx

@@ -27,12 +27,21 @@ interface ClipboardState {
   cutItemIds: Set<string>
   sourceFolderIds: Set<string> | null
   moveValidationModal: MoveValidationModal
+  sourceDirectory: IOCozyFile
 }
 
 interface ClipboardContextValue {
   clipboardData: ClipboardState
-  copyFiles: (files: IOCozyFile[], sourceFolderIds?: Set<string>) => void
-  cutFiles: (files: IOCozyFile[], sourceFolderIds?: Set<string>) => void
+  copyFiles: (
+    files: IOCozyFile[],
+    sourceFolderIds?: Set<string>,
+    sourceDirectory?: IOCozyFile
+  ) => void
+  cutFiles: (
+    files: IOCozyFile[],
+    sourceFolderIds?: Set<string>,
+    sourceDirectory?: IOCozyFile
+  ) => void
   clearClipboard: () => void
   hasClipboardData: boolean
   isItemCut: (itemId: string) => boolean
@@ -56,13 +65,18 @@ const HIDE_SHARING_MODAL = 'HIDE_SHARING_MODAL'
 type ClipboardAction =
   | {
       type: typeof COPY_FILES
-      payload: { files: IOCozyFile[]; sourceFolderIds?: Set<string> }
+      payload: {
+        files: IOCozyFile[]
+        sourceFolderIds?: Set<string>
+        sourceDirectory?: IOCozyFile
+      }
     }
   | {
       type: typeof CUT_FILES
       payload: {
         files: IOCozyFile[]
         sourceFolderIds?: Set<string>
+        sourceDirectory?: IOCozyFile
       }
     }
   | { type: typeof CLEAR_CLIPBOARD }
@@ -84,6 +98,7 @@ const initialState: ClipboardState = {
   timestamp: null,
   cutItemIds: new Set(),
   sourceFolderIds: new Set(),
+  sourceDirectory: {} as IOCozyFile,
   moveValidationModal: {
     isVisible: false,
     type: null,
@@ -106,7 +121,8 @@ const clipboardReducer = (
         operation: OPERATION_COPY,
         timestamp: Date.now(),
         cutItemIds: new Set(),
-        sourceFolderIds: action.payload.sourceFolderIds ?? null
+        sourceFolderIds: action.payload.sourceFolderIds ?? null,
+        sourceDirectory: action.payload.sourceDirectory ?? ({} as IOCozyFile)
       }
     case CUT_FILES:
       return {
@@ -115,7 +131,8 @@ const clipboardReducer = (
         operation: OPERATION_CUT,
         timestamp: Date.now(),
         cutItemIds: new Set(action.payload.files.map(file => file._id)),
-        sourceFolderIds: action.payload.sourceFolderIds ?? null
+        sourceFolderIds: action.payload.sourceFolderIds ?? null,
+        sourceDirectory: action.payload.sourceDirectory ?? ({} as IOCozyFile)
       }
     case CLEAR_CLIPBOARD:
       return {
@@ -157,17 +174,28 @@ const ClipboardProvider: React.FC<ClipboardProviderProps> = ({ children }) => {
   const [state, dispatch] = useReducer(clipboardReducer, initialState)
 
   const copyFiles = useCallback(
-    (files: IOCozyFile[], sourceFolderIds?: Set<string>) => {
-      dispatch({ type: COPY_FILES, payload: { files, sourceFolderIds } })
+    (
+      files: IOCozyFile[],
+      sourceFolderIds?: Set<string>,
+      sourceDirectory?: IOCozyFile
+    ) => {
+      dispatch({
+        type: COPY_FILES,
+        payload: { files, sourceFolderIds, sourceDirectory }
+      })
     },
     []
   )
 
   const cutFiles = useCallback(
-    (files: IOCozyFile[], sourceFolderIds?: Set<string>) => {
+    (
+      files: IOCozyFile[],
+      sourceFolderIds?: Set<string>,
+      sourceDirectory?: IOCozyFile
+    ) => {
       dispatch({
         type: CUT_FILES,
-        payload: { files, sourceFolderIds }
+        payload: { files, sourceFolderIds, sourceDirectory }
       })
     },
     []

src/declarations.d.ts

@@ -101,6 +101,21 @@ declare module 'cozy-client/dist/models/file' {
     filename: string,
     driveId: string
   ) => Promise<string>
+  export const moveRelateToSharedDrive: (
+    client: import('cozy-client/types/CozyClient').CozyClient,
+    source: {
+      instance?: string
+      sharing_id?: string
+      file_id?: string
+      dir_id?: string
+    },
+    dest: {
+      instance?: string
+      sharing_id?: string
+      dir_id: string
+    },
+    isCopy?: boolean
+  ) => Promise<void>
 }
 
 declare module 'cozy-client/dist/models/note' {

src/hooks/useKeyboardShortcuts.tsx

@@ -8,7 +8,7 @@
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
-import { isEditableTarget, normalizeKey } from './helpers'
+import { isEditableButNotCheckbox, normalizeKey } from './helpers'
 
 import { isMacOS } from '@/components/pushClient'
 import { SHARED_DRIVES_DIR_ID } from '@/constants/config'
@@ -17,8 +17,8 @@
   OPERATION_CUT
 } from '@/contexts/ClipboardProvider'
 import { useDisplayedFolder } from '@/hooks'
-import { startRenamingAsync } from '@/modules/drive/rename'
 import DeleteConfirm from '@/modules/drive/DeleteConfirm'
+import { startRenamingAsync } from '@/modules/drive/rename'
 import { useNextcloudCurrentFolder } from '@/modules/nextcloud/hooks/useNextcloudCurrentFolder'
 import { handlePasteOperation } from '@/modules/paste'
 import { useSelectionContext } from '@/modules/selection/SelectionProvider'
@@ -30,6 +30,7 @@
   items?: IOCozyFile[]
   sharingContext?: unknown
   allowCopy?: boolean
+  allowCut?: boolean
   isNextCloudFolder?: boolean
   pushModal?: (modal: React.ReactElement) => void
   popModal?: () => void
@@ -43,6 +44,7 @@
   items = [],
   sharingContext = null,
   allowCopy = true,
+  allowCut = true,
   isNextCloudFolder = false,
   pushModal,
   popModal,
@@ -104,18 +106,38 @@
       return
     }
 
-    copyFiles(filesToCopy, new Set(parentFolderIds))
+    copyFiles(
+      filesToCopy,
+      new Set(parentFolderIds),
+      currentFolder as IOCozyFile
+    )
     const message =
       filesToCopy.length === 1
         ? t('alert.item_copied')
         : t('alert.items_copied', { count: filesToCopy.length })
     showAlert({ message, severity: 'success' })
     clearSelection()
-  }, [allowCopy, selectedItems, copyFiles, showAlert, t, clearSelection])
+  }, [
+    allowCopy,
+    selectedItems,
+    currentFolder,
+    copyFiles,
+    showAlert,
+    t,
+    clearSelection
+  ])
 
   const handleCut = useCallback(() => {
     if (!selectedItems.length) return
 
+    if (!allowCut) {
+      showAlert({
+        message: t('alert.cut_not_allowed'),
+        severity: 'secondary'
+      })
+      return
+    }
+
     const parentFolderIds = selectedItems.map(item => item.dir_id)
 
     if (parentFolderIds.includes(SHARED_DRIVES_DIR_ID)) {
@@ -126,14 +148,26 @@
       return
     }
 
-    cutFiles(selectedItems, new Set(parentFolderIds))
+    cutFiles(
+      selectedItems,
+      new Set(parentFolderIds),
+      currentFolder as IOCozyFile
+    )
     const message =
       selectedItems.length === 1
         ? t('alert.item_cut')
         : t('alert.items_cut', { count: selectedItems.length })
     showAlert({ message, severity: 'success' })
     clearSelection()
-  }, [selectedItems, cutFiles, showAlert, t, clearSelection])
+  }, [
+    selectedItems,
+    allowCut,
+    currentFolder,
+    cutFiles,
+    t,
+    showAlert,
+    clearSelection
+  ])
 
   const handlePaste = useCallback(async () => {
     if (!hasClipboardData || !client || !currentFolder) return
@@ -163,6 +197,7 @@
         client,
         clipboardData.files,
         clipboardData.operation,
+        clipboardData.sourceDirectory,
         currentFolder,
         {
           showAlert,
@@ -257,7 +292,7 @@
       }
 
     const handleKeyDown = (event: KeyboardEvent): void => {
-      if (!event.target || isEditableTarget(event.target)) return
+      if (!event.target || isEditableButNotCheckbox(event.target)) return
 
       const combo = normalizeKey(event, isApple)
       const handler = shortcuts[combo]

src/modules/duplicate/components/DuplicateModal.tsx

@@ -2,7 +2,6 @@ import React, { FC, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 
 import { useClient } from 'cozy-client'
-import { copy } from 'cozy-client/dist/models/file'
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
@@ -12,19 +11,23 @@ import { File, FolderPickerEntry } from '@/components/FolderPicker/types'
 import { ROOT_DIR_ID } from '@/constants/config'
 import { useCancelable } from '@/modules/move/hooks/useCancelable'
 import { computeNextcloudFolderQueryId } from '@/modules/nextcloud/helpers'
+import { buildCopyApi } from '@/modules/paste'
 
 interface DuplicateModalProps {
   entries: FolderPickerEntry[]
   currentFolder: File
   onClose: () => void | Promise<void>
   showNextcloudFolder?: boolean
+  showSharedDriveFolder?: boolean
+  driveId?: string
 }
 
 const DuplicateModal: FC<DuplicateModalProps> = ({
   entries,
   currentFolder,
   onClose,
-  showNextcloudFolder
+  showNextcloudFolder,
+  showSharedDriveFolder
 }) => {
   const { t } = useI18n()
   const { showAlert } = useAlert()
@@ -39,7 +42,9 @@ const DuplicateModal: FC<DuplicateModalProps> = ({
       setBusy(true)
       await Promise.all(
         entries.map(async entry => {
-          await registerCancelable(copy(client, entry as Partial<File>, folder))
+          await registerCancelable(
+            buildCopyApi(client, entry, currentFolder, folder)
+          )
         })
       )
 
@@ -88,6 +93,7 @@ const DuplicateModal: FC<DuplicateModalProps> = ({
   return (
     <FolderPicker
       showNextcloudFolder={showNextcloudFolder}
+      showSharedDriveFolder={showSharedDriveFolder}
       currentFolder={currentFolder}
       entries={entries}
       // eslint-disable-next-line @typescript-eslint/no-misused-promises

src/modules/move/MoveModal.jsx

@@ -94,6 +94,7 @@
     try {
       setMoveInProgress(true)
       const trashedFiles = []
+      const force = !sharedPaths.includes(folder.path)
       await Promise.all(
         entries.map(async entry => {
           const force = !sharedPaths.includes(folder.path)

src/modules/navigation/AppRoute.jsx

@@ -36,6 +36,7 @@ import FileOpenerExternal from '@/modules/viewer/FileOpenerExternal'
 import { KonnectorRoutes } from '@/modules/views/Drive/KonnectorRoutes'
 import { FavoritesView } from '@/modules/views/Favorites/FavoritesView'
 import { FolderDuplicateView } from '@/modules/views/Folder/FolderDuplicateView'
+import { SharedDriveDuplicateView } from '@/modules/views/Folder/SharedDriveDuplicateView'
 import { MoveFilesView } from '@/modules/views/Modal/MoveFilesView'
 import { QualifyFileView } from '@/modules/views/Modal/QualifyFileView'
 import { ShareDisplayedFolderView } from '@/modules/views/Modal/ShareDisplayedFolderView'
@@ -146,6 +147,7 @@ const AppRoute = () => (
             <Route path="file/:fileId/revision" element={<FileHistory />} />
             <Route path="file/:fileId/v/revision" element={<FileHistory />} />
             <Route path="share" element={<ShareDisplayedFolderView />} />
+            <Route path="duplicate" element={<SharedDriveDuplicateView />} />
           </Route>
         </>
       ) : null}