Skip to content

fix(folders): modified folder deletion to delete subfolders & workflows in it instead of moving to root #508

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 3 commits into from
Jun 17, 2025
Merged

fix(folders): modified folder deletion to delete subfolders & workflows in it instead of moving to root #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27f39fa
modified folder deletion to delete subfolders & workflows in it inste…
waleedlatif1 Jun 17, 2025
0b03b35
added additional testing utils
waleedlatif1 Jun 17, 2025
6620f36
ack PR comments
waleedlatif1 Jun 17, 2025
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
396 changes: 396 additions & 0 deletions apps/sim/app/api/__test-utils__/utils.ts
View file
Open in desktop

Large diffs are not rendered by default.

414 changes: 414 additions & 0 deletions apps/sim/app/api/folders/[id]/route.test.ts
View file
Open in desktop

Large diffs are not rendered by default.

98 changes: 50 additions & 48 deletions apps/sim/app/api/folders/[id]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
}
}

// DELETE - Delete a folder
// DELETE - Delete a folder and all its contents
export async function DELETE(
request: NextRequest,
{ params }: { params: Promise<{ id: string }> }
Expand All @@ -80,8 +80,6 @@ export async function DELETE(
}

const { id } = await params
const { searchParams } = new URL(request.url)
const moveWorkflowsTo = searchParams.get('moveWorkflowsTo') // Optional: move workflows to another folder

// Verify the folder exists and belongs to the user
const existingFolder = await db
Expand All @@ -94,64 +92,68 @@ export async function DELETE(
return NextResponse.json({ error: 'Folder not found' }, { status: 404 })
}

// Check if folder has child folders
const childFolders = await db
.select({ id: workflowFolder.id })
.from(workflowFolder)
.where(eq(workflowFolder.parentId, id))

// Check if folder has workflows
const workflowsInFolder = await db
.select({ id: workflow.id })
.from(workflow)
.where(eq(workflow.folderId, id))

// Handle child folders - move them to parent or root
if (childFolders.length > 0) {
await db
.update(workflowFolder)
.set({
parentId: existingFolder.parentId, // Move to the parent of the deleted folder
updatedAt: new Date(),
})
.where(eq(workflowFolder.parentId, id))
}

// Handle workflows in the folder
if (workflowsInFolder.length > 0) {
const newFolderId = moveWorkflowsTo || null // Move to specified folder or root
await db
.update(workflow)
.set({
folderId: newFolderId,
updatedAt: new Date(),
})
.where(eq(workflow.folderId, id))
}
// Recursively delete folder and all its contents
const deletionStats = await deleteFolderRecursively(id, session.user.id)

// Delete the folder
await db.delete(workflowFolder).where(eq(workflowFolder.id, id))

logger.info('Deleted folder:', {
logger.info('Deleted folder and all contents:', {
id,
childFoldersCount: childFolders.length,
workflowsCount: workflowsInFolder.length,
movedWorkflowsTo: moveWorkflowsTo,
deletionStats,
})

return NextResponse.json({
success: true,
movedItems: {
childFolders: childFolders.length,
workflows: workflowsInFolder.length,
},
deletedItems: deletionStats,
})
} catch (error) {
logger.error('Error deleting folder:', { error })
return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
}
}

// Helper function to recursively delete a folder and all its contents
async function deleteFolderRecursively(
folderId: string,
userId: string
): Promise<{ folders: number; workflows: number }> {
const stats = { folders: 0, workflows: 0 }

// Get all child folders first
const childFolders = await db
.select({ id: workflowFolder.id })
.from(workflowFolder)
.where(and(eq(workflowFolder.parentId, folderId), eq(workflowFolder.userId, userId)))

// Recursively delete child folders
for (const childFolder of childFolders) {
const childStats = await deleteFolderRecursively(childFolder.id, userId)
stats.folders += childStats.folders
stats.workflows += childStats.workflows
}

// Delete all workflows in this folder
const workflowsInFolder = await db
.select({ id: workflow.id })
.from(workflow)
.where(and(eq(workflow.folderId, folderId), eq(workflow.userId, userId)))

if (workflowsInFolder.length > 0) {
await db
.delete(workflow)
.where(and(eq(workflow.folderId, folderId), eq(workflow.userId, userId)))

stats.workflows += workflowsInFolder.length
}

// Delete this folder
await db
.delete(workflowFolder)
.where(and(eq(workflowFolder.id, folderId), eq(workflowFolder.userId, userId)))

stats.folders += 1

return stats
}

// Helper function to check for circular references
async function checkForCircularReference(folderId: string, parentId: string): Promise<boolean> {
let currentParentId: string | null = parentId
Expand Down
Loading