address next set

Author: icecrasher321

apps/sim/app/api/workspaces/[id]/files/download/route.ts

@@ -102,10 +102,11 @@ export const GET = withRouteHandler(
       const usedPaths = new Set<string>()
       for (const file of filesToZip) {
         const buffer = await fetchWorkspaceFileBuffer(file)
-        const basePath = safeZipPath(
-          file.folderPath ? `${file.folderPath}/${file.name}` : file.name
-        )
-        let zipPath = basePath || file.name
+        const basePath =
+          safeZipPath(file.folderPath ? `${file.folderPath}/${file.name}` : file.name) ||
+          safeZipPath(file.name) ||
+          file.id
+        let zipPath = basePath
         let suffix = 2
         while (usedPaths.has(zipPath)) {
           const dotIndex = basePath.lastIndexOf('.')

apps/sim/app/workspace/[workspaceId]/files/files.tsx

@@ -435,8 +435,6 @@ export function Files() {
       if (row.id !== listRename.editingId) return row
       const parsed = parseRowId(row.id)
       const file = parsed.kind === 'file' ? filteredFiles.find((f) => f.id === parsed.id) : null
-      const folder =
-        parsed.kind === 'folder' ? visibleFolders.find((item) => item.id === parsed.id) : null
       const Icon = file ? getDocumentIcon(file.type || '', file.name) : Folder
       return {
         ...row,
@@ -469,7 +467,6 @@ export function Files() {
     listRename.submitRename,
     listRename.cancelRename,
     filteredFiles,
-    visibleFolders,
   ])
 
   const visibleRowIds = useMemo(() => rows.map((row) => row.id), [rows])
@@ -817,11 +814,15 @@ export function Files() {
           fileIds: target.fileIds,
           folderIds: target.folderIds,
         })
-      } else {
+      } else if (target.fileIds.length === 1) {
         await deleteFile.mutateAsync({
           workspaceId,
           fileId: target.fileIds[0],
         })
+      } else {
+        setShowDeleteConfirm(false)
+        setDeleteTarget(null)
+        return
       }
       setShowDeleteConfirm(false)
       setDeleteTarget(null)