Fix all the files affected by changing paths to be an array

okfn · Jun 2, 2024 · 2b23a80 · 2b23a80
1 parent af2f975
commit 2b23a80
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 30 deletions.
diff --git a/client/components/Application/Buttons/Manage.tsx b/client/components/Application/Buttons/Manage.tsx
@@ -7,7 +7,7 @@ import DropdownButton from '../../Parts/Buttons/Dropdown'
 import { useStore, selectors } from '../store'
 
 export default function ManageButton() {
-  const path = useStore((state) => state.path)
+  const path = useStore((state) => state.paths)
   const notIndexedFiles = useStore(selectors.notIndexedFiles)
   return (
     <DropdownButton
@@ -24,7 +24,7 @@ export default function ManageButton() {
 }
 
 function CopyButton() {
-  const path = useStore((state) => state.path)
+  const path = useStore((state) => state.paths)
   const updateState = useStore((state) => state.updateState)
   const isFolder = useStore(selectors.isFolder)
   const type = isFolder ? 'Folder' : 'File'
@@ -40,7 +40,7 @@ function CopyButton() {
 }
 
 function MoveButton() {
-  const path = useStore((state) => state.path)
+  const path = useStore((state) => state.paths)
   const updateState = useStore((state) => state.updateState)
   const isFolder = useStore(selectors.isFolder)
   const type = isFolder ? 'Folder' : 'File'

diff --git a/client/components/Application/Content.tsx b/client/components/Application/Content.tsx
@@ -15,7 +15,7 @@ import { useStore } from './store'
 export default function Content() {
   const record = useStore((state) => state.record)
   const indexing = useStore((state) => state.indexing)
-  const path = useStore((state) => state.path)
+  const path = useStore((state) => state.paths)
   return indexing ? (
     <LoadingContent />
   ) : record && path ? (

diff --git a/client/components/Application/Dialogs/CopyFile.tsx b/client/components/Application/Dialogs/CopyFile.tsx
@@ -3,22 +3,22 @@ import InputDialog from '../../Parts/Dialogs/Input'
 import { useStore } from '../store'
 
 export default function CopyFileDialog() {
-  const path = useStore((state) => state.path)
+  const paths = useStore((state) => state.paths)
   const copyFile = useStore((state) => state.copyFile)
   const updateState = useStore((state) => state.updateState)
-  if (!path) return null
+  if (!paths || paths.length > 1) return null
   return (
     <InputDialog
       open={true}
-      value={path}
+      value={paths[0]}
       title="Copy File"
       label="Copy"
       Icon={ContentCopyIcon}
       placholder="Enter a path"
-      description={`You are copying "${path}". Enter destination:`}
+      description={`You are copying "${paths[0]}". Enter destination:`}
       onCancel={() => updateState({ dialog: undefined })}
       onConfirm={async (toPath) => {
-        await copyFile(path, toPath)
+        await copyFile(paths[0], toPath)
         updateState({ dialog: undefined })
       }}
     />

diff --git a/client/components/Application/Dialogs/CopyFolder.tsx b/client/components/Application/Dialogs/CopyFolder.tsx
@@ -3,22 +3,22 @@ import InputDialog from '../../Parts/Dialogs/Input'
 import { useStore } from '../store'
 
 export default function CopyFolderDialog() {
-  const path = useStore((state) => state.path)
+  const paths = useStore((state) => state.paths)
   const copyFolder = useStore((state) => state.copyFolder)
   const updateState = useStore((state) => state.updateState)
-  if (!path) return null
+  if (!paths || paths.length > 1) return null
   return (
     <InputDialog
       open={true}
-      value={path}
+      value={paths[0]}
       title="Copy Folder"
       label="Copy"
       Icon={ContentCopyIcon}
       placholder="Enter a path"
-      description={`You are copying "${path}". Enter destination:`}
+      description={`You are copying "${paths[0]}". Enter destination:`}
       onCancel={() => updateState({ dialog: undefined })}
       onConfirm={async (toPath) => {
-        await copyFolder(path, toPath)
+        await copyFolder(paths[0], toPath)
         updateState({ dialog: undefined })
       }}
     />

diff --git a/client/components/Application/Dialogs/DeleteFolder.tsx b/client/components/Application/Dialogs/DeleteFolder.tsx
@@ -2,10 +2,10 @@ import ConfirmDialog from '../../Parts/Dialogs/Confirm'
 import { useStore } from '../store'
 
 export default function DeleteFolderDialog() {
-  const path = useStore((state) => state.path)
+  const paths = useStore((state) => state.paths)
   const deleteFolder = useStore((state) => state.deleteFolder)
   const updateState = useStore((state) => state.updateState)
-  if (!path) return null
+  if (!paths || paths.length > 1) return null
   return (
     <ConfirmDialog
       open={true}
@@ -15,7 +15,7 @@ export default function DeleteFolderDialog() {
       cancelLabel="No"
       onCancel={() => updateState({ dialog: undefined })}
       onConfirm={async () => {
-        await deleteFolder(path)
+        await deleteFolder(paths[0])
         updateState({ dialog: undefined })
       }}
     />

diff --git a/client/components/Application/Dialogs/MoveFile.tsx b/client/components/Application/Dialogs/MoveFile.tsx
@@ -3,22 +3,22 @@ import InputDialog from '../../Parts/Dialogs/Input'
 import { useStore } from '../store'
 
 export default function MoveFileDialog() {
-  const path = useStore((state) => state.path)
+  const paths = useStore((state) => state.paths)
   const moveFile = useStore((state) => state.moveFile)
   const updateState = useStore((state) => state.updateState)
-  if (!path) return null
+  if (!paths || paths.length > 1) return null
   return (
     <InputDialog
       open={true}
-      value={path}
+      value={paths[0]}
       title="Move File"
       label="Move"
       Icon={CopyAllIcon}
       placholder="Enter a path"
-      description={`You are moving "${path}". Enter destination:`}
+      description={`You are moving "${paths[0]}". Enter destination:`}
       onCancel={() => updateState({ dialog: undefined })}
       onConfirm={async (toPath) => {
-        await moveFile(path, toPath)
+        await moveFile(paths[0], toPath)
         updateState({ dialog: undefined })
       }}
     />

diff --git a/client/components/Application/Dialogs/MoveFolder.tsx b/client/components/Application/Dialogs/MoveFolder.tsx
@@ -3,22 +3,22 @@ import InputDialog from '../../Parts/Dialogs/Input'
 import { useStore } from '../store'
 
 export default function MoveFolderDialog() {
-  const path = useStore((state) => state.path)
+  const paths = useStore((state) => state.paths)
   const moveFolder = useStore((state) => state.moveFolder)
   const updateState = useStore((state) => state.updateState)
-  if (!path) return null
+  if (!paths || paths.length > 1) return null
   return (
     <InputDialog
       open={true}
-      value={path}
+      value={paths[0]}
       title="Move Folder"
       label="Move"
       Icon={CopyAllIcon}
       placholder="Enter a path"
-      description={`You are moving "${path}". Enter destination:`}
+      description={`You are moving "${paths[0]}". Enter destination:`}
       onCancel={() => updateState({ dialog: undefined })}
       onConfirm={async (toPath) => {
-        await moveFolder(path, toPath)
+        await moveFolder(paths[0], toPath)
         updateState({ dialog: undefined })
       }}
     />

diff --git a/client/components/Application/store.ts b/client/components/Application/store.ts
@@ -203,10 +203,12 @@ export function makeStore(props: ApplicationProps) {
       await loadFiles()
       await selectFile(paths)
     },
-    copyFile: async (path, toPath) => {
+    copyFile: async (paths, toPath) => {
       const { client, onFileCreate } = get()
-      const result = await client.fileCopy({ path, toPath, deduplicate: true })
-      onFileCreate([result.path])
+      for (const path of paths) {
+        const result = await client.fileCopy({ path, toPath, deduplicate: true })
+        onFileCreate([result.path])
+      }
     },
     deleteFile: async (paths) => {
       const { client, onFileDelete } = get()