fix(files): revert broken ref opt, clean 409 on restore, null parentId on orphaned restore

- files.tsx: revert the activeDropTargetId ref optimization — the ref doesn't
  trigger re-renders so the drop-target highlight never updated during drag;
  activeDropTargetId is back in state and in the rowDragDropConfig deps
- restore/route.ts: catch Postgres 23505 unique-constraint violation and
  return a clean 409 instead of leaking the raw error as 400
- restoreWorkspaceFileFolder: check if the parent folder is still archived
  before restoring; if it is, restore to root (parentId: null) so the folder
  is never orphaned under an archived parent

Author: waleedlatif1

apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/restore/route.ts

@@ -1,6 +1,6 @@
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { createLogger } from '@sim/logger'
-import { toError } from '@sim/utils/errors'
+import { getPostgresErrorCode, toError } from '@sim/utils/errors'
 import { type NextRequest, NextResponse } from 'next/server'
 import { restoreWorkspaceFileFolderContract } from '@/lib/api/contracts/workspace-file-folders'
 import { parseRequest } from '@/lib/api/server'
@@ -55,13 +55,13 @@ export const POST = withRouteHandler(
       return NextResponse.json({ success: true, folder })
     } catch (error) {
       logger.error('Failed to restore workspace file folder:', error)
-      return NextResponse.json(
-        {
-          success: false,
-          error: toError(error).message,
-        },
-        { status: 400 }
-      )
+      if (getPostgresErrorCode(error) === '23505') {
+        return NextResponse.json(
+          { success: false, error: 'A folder with this name already exists in this location' },
+          { status: 409 }
+        )
+      }
+      return NextResponse.json({ success: false, error: toError(error).message }, { status: 400 })
     }
   }
 )

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

@@ -243,10 +243,6 @@ export function Files() {
   const [saveStatus, setSaveStatus] = useState<SaveStatus>('idle')
   const [selectedRowIds, setSelectedRowIds] = useState<Set<string>>(() => new Set())
   const [activeDropTargetId, setActiveDropTargetId] = useState<string | null>(null)
-  const activeDropTargetIdRef = useRef(activeDropTargetId)
-  useEffect(() => {
-    activeDropTargetIdRef.current = activeDropTargetId
-  }, [activeDropTargetId])
   const [draggedRowIds, setDraggedRowIds] = useState<Set<string>>(() => new Set())
   const [previewMode, setPreviewMode] = useState<PreviewMode>(() => {
     if (isNewFile) return 'editor'
@@ -683,7 +679,7 @@ export function Files() {
 
   const rowDragDropConfig = useMemo<RowDragDropConfig>(
     () => ({
-      activeDropTargetId: activeDropTargetIdRef.current,
+      activeDropTargetId,
       draggedRowIds,
       isAnyDragActive: draggedRowIds.size > 0,
       isRowDraggable: (rowId) => canEdit && listRename.editingId !== rowId,
@@ -817,6 +813,7 @@ export function Files() {
       },
     }),
     [
+      activeDropTargetId,
       draggedRowIds,
       canEdit,
       listRename.editingId,

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

@@ -914,9 +914,27 @@ export async function restoreWorkspaceFileFolder(
   if (!raw) throw new Error('Folder not found')
   if (!raw.deletedAt) throw new Error('Folder is not archived')
 
+  // If the parent folder is still archived, restore to root so the folder
+  // doesn't become an orphan (hidden under an archived parent).
+  let resolvedParentId = raw.parentId
+  if (resolvedParentId) {
+    const parent = await db
+      .select({ deletedAt: workspaceFileFolder.deletedAt })
+      .from(workspaceFileFolder)
+      .where(
+        and(
+          eq(workspaceFileFolder.id, resolvedParentId),
+          eq(workspaceFileFolder.workspaceId, workspaceId)
+        )
+      )
+      .limit(1)
+      .then((rows) => rows[0] ?? null)
+    if (!parent || parent.deletedAt) resolvedParentId = null
+  }
+
   const [restored] = await db
     .update(workspaceFileFolder)
-    .set({ deletedAt: null, updatedAt: new Date() })
+    .set({ deletedAt: null, parentId: resolvedParentId, updatedAt: new Date() })
     .where(
       and(eq(workspaceFileFolder.id, folderId), eq(workspaceFileFolder.workspaceId, workspaceId))
     )