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(workflows): clear folderId on restore when folder is archived or … 
…missing

When individually restoring a workflow from Recently Deleted, check if
its folder still exists and is active. If the folder is archived or
missing, clear folderId so the workflow appears at root instead of
being orphaned (invisible in sidebar).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
  • Loading branch information
@waleedlatif1 @claude
waleedlatif1 and claude committed Apr 7, 2026
commit cbabc16d0906d82caa74776cf6da5de94630ab4e
19 changes: 18 additions & 1 deletion apps/sim/lib/workflows/lifecycle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
webhook,
workflow,
workflowDeploymentVersion,
workflowFolder,
workflowMcpTool,
workflowSchedule,
} from '@sim/db/schema'
Expand Down Expand Up @@ -258,12 +259,28 @@ export async function restoreWorkflow(
}
}

let clearFolderId = false
if (existingWorkflow.folderId) {
const [folder] = await db
.select({ archivedAt: workflowFolder.archivedAt })
.from(workflowFolder)
.where(eq(workflowFolder.id, existingWorkflow.folderId))

if (!folder || folder.archivedAt) {
clearFolderId = true
}
}

const now = new Date()

await db.transaction(async (tx) => {
await tx
.update(workflow)
.set({ archivedAt: null, updatedAt: now })
.set({
archivedAt: null,
updatedAt: now,
...(clearFolderId && { folderId: null }),
})
.where(eq(workflow.id, workflowId))

await tx
Expand Down
Loading