Skip to content

feat(folders): soft-delete folders and show in Recently Deleted #4001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waleedlatif1 merged 12 commits into from
Apr 7, 2026
Merged

feat(folders): soft-delete folders and show in Recently Deleted #4001

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3ccc067
feat(folders): soft-delete folders and show in Recently Deleted
waleedlatif1 Apr 7, 2026
3c6558d
fix(testing): add FOLDER_RESTORED to audit mock
waleedlatif1 Apr 7, 2026
1b44716
fix(folders): atomic restore transaction and scope to folder-deleted …
waleedlatif1 Apr 7, 2026
6430e1c
refactor(folders): simplify restore to remove hacky 5s time window
waleedlatif1 Apr 7, 2026
98dc9ea
fix(db): regenerate folder soft-delete migration with drizzle-kit
waleedlatif1 Apr 7, 2026
6020dab
chore(db): fix migration metadata formatting
waleedlatif1 Apr 7, 2026
690508a
fix(folders): scope restore to folder-deleted workflows via shared ti…
waleedlatif1 Apr 7, 2026
cbabc16
fix(workflows): clear folderId on restore when folder is archived or …
waleedlatif1 Apr 7, 2026
99a88b4
fix(folders): format restoreFolderRecursively call to satisfy biome
waleedlatif1 Apr 7, 2026
22ba57d
fix(folders): close remaining restore edge cases
waleedlatif1 Apr 7, 2026
47e0ea2
fix(folders): add archivedAt to optimistic folder creation objects
waleedlatif1 Apr 7, 2026
a80cc8b
fix(folders): handle missing parent folder during restore reparenting
waleedlatif1 Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(folders): close remaining restore edge cases 
Three issues caught by audit:

1. Child folder restore used isNotNull instead of timestamp matching,
   so individually-deleted child folders would be incorrectly restored.
   Now uses eq(archivedAt, folderArchivedAt) for both workflows AND
   child folders — consistent and deterministic.

2. No workspace archived check — could restore a folder into an
   archived workspace. Now checks getWorkspaceWithOwner, matching
   the existing restoreWorkflow pattern.

3. Re-restoring an already-restored folder returned an error. Now
   returns success with zero counts (idempotent).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
  • Loading branch information
@waleedlatif1 @claude
waleedlatif1 and claude committed Apr 7, 2026
commit 22ba57d44585376d0df3247fc1ab0db6fe255516
16 changes: 11 additions & 5 deletions apps/sim/lib/workflows/orchestration/folder-lifecycle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
workflowSchedule,
} from '@sim/db/schema'
import { createLogger } from '@sim/logger'
import { and, eq, inArray, isNotNull, isNull } from 'drizzle-orm'
import { and, eq, inArray, isNull } from 'drizzle-orm'
import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
import { archiveWorkflowsByIdsInWorkspace } from '@/lib/workflows/lifecycle'
import type { OrchestrationErrorCode } from '@/lib/workflows/orchestration/types'
Expand Down Expand Up @@ -230,18 +230,18 @@ async function restoreFolderRecursively(
}

const archivedChildren = await tx
.select({ id: workflowFolder.id, archivedAt: workflowFolder.archivedAt })
.select({ id: workflowFolder.id })
.from(workflowFolder)
.where(
and(
eq(workflowFolder.parentId, folderId),
eq(workflowFolder.workspaceId, workspaceId),
isNotNull(workflowFolder.archivedAt)
eq(workflowFolder.archivedAt, folderArchivedAt)
)
)

for (const child of archivedChildren) {
const childStats = await restoreFolderRecursively(child.id, workspaceId, child.archivedAt!, tx)
const childStats = await restoreFolderRecursively(child.id, workspaceId, folderArchivedAt, tx)
stats.folders += childStats.folders
stats.workflows += childStats.workflows
}
Comment thread
waleedlatif1 marked this conversation as resolved.
Expand Down Expand Up @@ -283,7 +283,13 @@ export async function performRestoreFolder(
}

if (!folder.archivedAt) {
return { success: false, error: 'Folder is not archived' }
return { success: true, restoredItems: { folders: 0, workflows: 0 } }
}

const { getWorkspaceWithOwner } = await import('@/lib/workspaces/permissions/utils')
const ws = await getWorkspaceWithOwner(workspaceId)
if (!ws || ws.archivedAt) {
return { success: false, error: 'Cannot restore folder into an archived workspace' }
}

const restoredStats = await db.transaction(async (tx) => {
Expand Down
Loading