cleanup unnused code

Author: icecrasher321

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

@@ -254,7 +254,6 @@ export function Files() {
     fileIds: string[]
     folderIds: string[]
     name: string
-    isFolder?: boolean
   } | null>(null)
 
   const listRename = useInlineRename({
@@ -884,7 +883,6 @@ export function Files() {
             folders.find((folder) => folder.id === selectedFolderIds[0])?.name ??
             'selected item')
           : `${selectedFileIds.length + selectedFolderIds.length} selected items`,
-      isFolder: selectedFolderIds.length > 0,
     })
     setShowDeleteConfirm(true)
   }, [selectedFileIds, selectedFolderIds, files, folders])
@@ -1123,7 +1121,7 @@ export function Files() {
     setDeleteTarget(
       item.kind === 'file'
         ? { fileIds: [item.file.id], folderIds: [], name: item.file.name }
-        : { fileIds: [], folderIds: [item.folder.id], name: item.folder.name, isFolder: true }
+        : { fileIds: [], folderIds: [item.folder.id], name: item.folder.name }
     )
     setShowDeleteConfirm(true)
     closeContextMenu()
@@ -1648,7 +1646,8 @@ export function Files() {
           open={showDeleteConfirm}
           onOpenChange={setShowDeleteConfirm}
           fileName={deleteTarget?.name}
-          isFolder={deleteTarget?.isFolder}
+          fileCount={deleteTarget?.fileIds.length ?? 0}
+          folderCount={deleteTarget?.folderIds.length ?? 0}
           onDelete={handleDelete}
           isPending={deleteFile.isPending || bulkArchiveItems.isPending}
         />
@@ -1733,7 +1732,8 @@ export function Files() {
         open={showDeleteConfirm}
         onOpenChange={setShowDeleteConfirm}
         fileName={deleteTarget?.name}
-        isFolder={deleteTarget?.isFolder}
+        fileCount={deleteTarget?.fileIds.length ?? 0}
+        folderCount={deleteTarget?.folderIds.length ?? 0}
         onDelete={handleDelete}
         isPending={deleteFile.isPending || bulkArchiveItems.isPending}
       />
@@ -1855,7 +1855,8 @@ interface DeleteConfirmModalProps {
   open: boolean
   onOpenChange: (open: boolean) => void
   fileName?: string
-  isFolder?: boolean
+  fileCount: number
+  folderCount: number
   onDelete: () => void
   isPending: boolean
 }
@@ -1864,21 +1865,29 @@ const DeleteConfirmModal = memo(function DeleteConfirmModal({
   open,
   onOpenChange,
   fileName,
-  isFolder = false,
+  fileCount,
+  folderCount,
   onDelete,
   isPending,
 }: DeleteConfirmModalProps) {
+  const totalCount = fileCount + folderCount
+  const hasFolders = folderCount > 0
+  const title = totalCount > 1 ? 'Delete Items' : hasFolders ? 'Delete Folder' : 'Delete File'
+  const consequence = hasFolders
+    ? totalCount > 1
+      ? 'This will also delete files and folders inside any selected folders.'
+      : 'This will also delete files and folders inside it.'
+    : 'You can restore it from Recently Deleted in Settings.'
+
   return (
     <Modal open={open} onOpenChange={onOpenChange}>
       <ModalContent size='sm'>
-        <ModalHeader>{isFolder ? 'Delete Folder' : 'Delete File'}</ModalHeader>
+        <ModalHeader>{title}</ModalHeader>
         <ModalBody>
           <p className='text-[var(--text-secondary)]'>
             Are you sure you want to delete{' '}
             <span className='font-medium text-[var(--text-primary)]'>{fileName}</span>?{' '}
-            {isFolder
-              ? 'This will also delete files and folders inside it.'
-              : 'You can restore it from Recently Deleted in Settings.'}
+            {consequence}
           </p>
         </ModalBody>
         <ModalFooter>

apps/sim/hooks/queries/workspace-file-folders.ts

@@ -3,7 +3,6 @@ import { requestJson } from '@/lib/api/client/request'
 import {
   bulkArchiveWorkspaceFileItemsContract,
   createWorkspaceFileFolderContract,
-  deleteWorkspaceFileFolderContract,
   listWorkspaceFileFoldersContract,
   moveWorkspaceFileItemsContract,
   updateWorkspaceFileFolderContract,
@@ -96,20 +95,6 @@ export function useUpdateWorkspaceFileFolder() {
   })
 }
 
-export function useDeleteWorkspaceFileFolder() {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: async (variables: { workspaceId: string; folderId: string }) => {
-      return requestJson(deleteWorkspaceFileFolderContract, {
-        params: { id: variables.workspaceId, folderId: variables.folderId },
-      })
-    },
-    onSettled: (_data, _error, variables) => {
-      invalidateWorkspaceFileBrowsers(queryClient, variables.workspaceId)
-    },
-  })
-}
-
 export function useMoveWorkspaceFileItems() {
   const queryClient = useQueryClient()
   return useMutation({

apps/sim/lib/uploads/client/download.ts

@@ -24,14 +24,3 @@ export async function triggerFileDownload(record: WorkspaceFileRecord): Promise<
   document.body.removeChild(a)
   URL.revokeObjectURL(objectUrl)
 }
-
-export function triggerBlobDownload(blob: Blob, fileName: string): void {
-  const objectUrl = URL.createObjectURL(blob)
-  const a = document.createElement('a')
-  a.href = objectUrl
-  a.download = fileName
-  document.body.appendChild(a)
-  a.click()
-  document.body.removeChild(a)
-  URL.revokeObjectURL(objectUrl)
-}

apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.ts

@@ -3,7 +3,7 @@ import { workspaceFileFolder, workspaceFiles } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { getPostgresErrorCode } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
-import { and, asc, eq, inArray, isNull, min, sql } from 'drizzle-orm'
+import { and, asc, eq, inArray, isNull, min, type SQL, sql } from 'drizzle-orm'
 
 const logger = createLogger('WorkspaceFileFolders')
 
@@ -50,6 +50,10 @@ interface RawWorkspaceFileFolder {
   updatedAt: Date
 }
 
+interface WorkspaceFileFolderLockTx {
+  execute(query: SQL): Promise<unknown>
+}
+
 export interface WorkspaceFileArchiveResult {
   folders: number
   files: number
@@ -82,6 +86,15 @@ function fileFolderCondition(folderId?: string | null) {
   return normalized ? eq(workspaceFiles.folderId, normalized) : isNull(workspaceFiles.folderId)
 }
 
+async function acquireWorkspaceFileFolderMutationLock(
+  tx: WorkspaceFileFolderLockTx,
+  workspaceId: string
+) {
+  await tx.execute(
+    sql`SELECT pg_advisory_xact_lock(hashtextextended(${`workspace_file_folders:${workspaceId}`}, 0))`
+  )
+}
+
 export function buildWorkspaceFileFolderPathMap(
   folders: Array<Pick<RawWorkspaceFileFolder, 'id' | 'name' | 'parentId'>>
 ): Map<string, string> {
@@ -300,34 +313,38 @@ export async function createWorkspaceFileFolder(params: {
   parentId?: string | null
   sortOrder?: number
 }): Promise<WorkspaceFileFolderRecord> {
-  const parentId = await assertWorkspaceFileFolderTarget(params.workspaceId, params.parentId)
   const name = normalizeWorkspaceFileItemName(params.name, 'Folder')
 
-  if (await workspaceFileFolderExists(params.workspaceId, name, parentId)) {
-    throw new WorkspaceFileFolderConflictError(name)
-  }
+  const folder = await db.transaction(async (tx) => {
+    await acquireWorkspaceFileFolderMutationLock(tx, params.workspaceId)
 
-  const id = generateId()
-  let folder: RawWorkspaceFileFolder
-  try {
-    const [inserted] = await db
-      .insert(workspaceFileFolder)
-      .values({
-        id,
-        name,
-        userId: params.userId,
-        workspaceId: params.workspaceId,
-        parentId,
-        sortOrder: params.sortOrder ?? (await nextFolderSortOrder(params.workspaceId, parentId)),
-      })
-      .returning()
-    folder = inserted
-  } catch (error) {
-    if (getPostgresErrorCode(error) === '23505') {
+    const parentId = await assertWorkspaceFileFolderTarget(params.workspaceId, params.parentId)
+
+    if (await workspaceFileFolderExists(params.workspaceId, name, parentId)) {
       throw new WorkspaceFileFolderConflictError(name)
     }
-    throw error
-  }
+
+    const id = generateId()
+    try {
+      const [inserted] = await tx
+        .insert(workspaceFileFolder)
+        .values({
+          id,
+          name,
+          userId: params.userId,
+          workspaceId: params.workspaceId,
+          parentId,
+          sortOrder: params.sortOrder ?? (await nextFolderSortOrder(params.workspaceId, parentId)),
+        })
+        .returning()
+      return inserted
+    } catch (error) {
+      if (getPostgresErrorCode(error) === '23505') {
+        throw new WorkspaceFileFolderConflictError(name)
+      }
+      throw error
+    }
+  })
 
   return mapFolderWithPath(params.workspaceId, folder)
 }
@@ -407,6 +424,31 @@ async function getDescendantFolderIds(
   return descendants
 }
 
+function collectDescendantFolderIds(
+  folders: Array<Pick<WorkspaceFileFolderRecord, 'id' | 'parentId'>>,
+  folderId: string
+): string[] {
+  const childrenByParent = new Map<string, string[]>()
+
+  for (const folder of folders) {
+    if (!folder.parentId) continue
+    const children = childrenByParent.get(folder.parentId) ?? []
+    children.push(folder.id)
+    childrenByParent.set(folder.parentId, children)
+  }
+
+  const descendants: string[] = []
+  const visit = (id: string) => {
+    for (const childId of childrenByParent.get(id) ?? []) {
+      descendants.push(childId)
+      visit(childId)
+    }
+  }
+  visit(folderId)
+
+  return descendants
+}
+
 export async function updateWorkspaceFileFolder(params: {
   workspaceId: string
   folderId: string
@@ -611,13 +653,33 @@ export async function archiveWorkspaceFileFolderRecursive(
   workspaceId: string,
   folderId: string
 ): Promise<WorkspaceFileArchiveResult> {
-  const folder = await getWorkspaceFileFolder(workspaceId, folderId)
-  if (!folder) throw new Error('Folder not found')
-
   const now = new Date()
-  const folderIds = [folderId, ...(await getDescendantFolderIds(workspaceId, folderId))]
 
   return db.transaction(async (tx) => {
+    await acquireWorkspaceFileFolderMutationLock(tx, workspaceId)
+
+    const [folder] = await tx
+      .select({ id: workspaceFileFolder.id })
+      .from(workspaceFileFolder)
+      .where(
+        and(
+          eq(workspaceFileFolder.id, folderId),
+          eq(workspaceFileFolder.workspaceId, workspaceId),
+          isNull(workspaceFileFolder.deletedAt)
+        )
+      )
+      .limit(1)
+
+    if (!folder) throw new Error('Folder not found')
+
+    const activeFolders = await tx
+      .select({ id: workspaceFileFolder.id, parentId: workspaceFileFolder.parentId })
+      .from(workspaceFileFolder)
+      .where(
+        and(eq(workspaceFileFolder.workspaceId, workspaceId), isNull(workspaceFileFolder.deletedAt))
+      )
+    const folderIds = [folderId, ...collectDescendantFolderIds(activeFolders, folderId)]
+
     const archivedFiles = await tx
       .update(workspaceFiles)
       .set({ deletedAt: now, updatedAt: now })
@@ -662,14 +724,27 @@ export async function bulkArchiveWorkspaceFileItems(params: {
   const now = new Date()
   const explicitFileIds = Array.from(new Set(params.fileIds ?? []))
   const explicitFolderIds = Array.from(new Set(params.folderIds ?? []))
-  const descendantFolderIds = (
-    await Promise.all(
-      explicitFolderIds.map((folderId) => getDescendantFolderIds(params.workspaceId, folderId))
-    )
-  ).flat()
-  const allFolderIds = Array.from(new Set([...explicitFolderIds, ...descendantFolderIds]))
 
   return db.transaction(async (tx) => {
+    await acquireWorkspaceFileFolderMutationLock(tx, params.workspaceId)
+
+    const activeFolders =
+      explicitFolderIds.length > 0
+        ? await tx
+            .select({ id: workspaceFileFolder.id, parentId: workspaceFileFolder.parentId })
+            .from(workspaceFileFolder)
+            .where(
+              and(
+                eq(workspaceFileFolder.workspaceId, params.workspaceId),
+                isNull(workspaceFileFolder.deletedAt)
+              )
+            )
+        : []
+    const descendantFolderIds = explicitFolderIds.flatMap((folderId) =>
+      collectDescendantFolderIds(activeFolders, folderId)
+    )
+    const allFolderIds = Array.from(new Set([...explicitFolderIds, ...descendantFolderIds]))
+
     const archivedExplicitFiles =
       explicitFileIds.length > 0
         ? await tx