feat(folders): move workflow folders onto the generic folder table

Repoints every workflow-folder read and write from `workflow_folder` to the
generic `folder` table backfilled by migration 0272, scoped to
`resourceType = 'workflow'`.

- 11 write sites and 39 read sites repointed; the 21 reads that select by
  workspace or parent rather than by id now carry an explicit
  `resourceType` filter so they cannot return another type's folders
- `archivedAt` becomes `deletedAt`; the dropped `color`/`isExpanded`
  columns are gone from the write paths
- v1 admin `AdminFolder.color` is retained as always-null so the public
  response shape stays stable rather than silently losing a field
- `GET /api/folders` still returns empty for non-workflow types: file
  folders are written by `uploads/contexts/workspace` and their backfilled
  rows are a frozen snapshot until that writer moves too

Author: waleedlatif1

apps/sim/app/api/folders/[id]/duplicate/route.ts

@@ -1,6 +1,6 @@
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db } from '@sim/db'
-import { workflow, workflowFolder } from '@sim/db/schema'
+import { workflow, folder as workflowFolder } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { FolderLockedError } from '@sim/platform-authz/workflow'
 import { generateId } from '@sim/utils/id'
@@ -41,7 +41,7 @@ export const POST = withRouteHandler(
       const sourceFolder = await db
         .select()
         .from(workflowFolder)
-        .where(and(eq(workflowFolder.id, sourceFolderId), isNull(workflowFolder.archivedAt)))
+        .where(and(eq(workflowFolder.id, sourceFolderId), isNull(workflowFolder.deletedAt)))
         .then((rows) => rows[0])
 
       if (!sourceFolder) {
@@ -80,7 +80,13 @@ export const POST = withRouteHandler(
           tx
             .select({ minSortOrder: min(workflowFolder.sortOrder) })
             .from(workflowFolder)
-            .where(and(eq(workflowFolder.workspaceId, targetWorkspaceId), folderParentCondition)),
+            .where(
+              and(
+                eq(workflowFolder.workspaceId, targetWorkspaceId),
+                eq(workflowFolder.resourceType, 'workflow'),
+                folderParentCondition
+              )
+            ),
           tx
             .select({ minSortOrder: min(workflow.sortOrder) })
             .from(workflow)
@@ -104,13 +110,12 @@ export const POST = withRouteHandler(
 
         await tx.insert(workflowFolder).values({
           id: newFolderId,
+          resourceType: 'workflow',
           userId: session.user.id,
           workspaceId: targetWorkspaceId,
           name: deduplicatedName,
-          color: sourceFolder.color,
           parentId: targetParentId,
           sortOrder,
-          isExpanded: false,
           locked: false,
           createdAt: now,
           updatedAt: now,
@@ -234,7 +239,7 @@ async function assertTargetParentFolderMutable(
         parentId: workflowFolder.parentId,
         workspaceId: workflowFolder.workspaceId,
         locked: workflowFolder.locked,
-        archivedAt: workflowFolder.archivedAt,
+        archivedAt: workflowFolder.deletedAt,
       })
       .from(workflowFolder)
       .where(eq(workflowFolder.id, currentFolderId))
@@ -269,8 +274,9 @@ async function deduplicateFolderName(
     .where(
       and(
         eq(workflowFolder.workspaceId, workspaceId),
+        eq(workflowFolder.resourceType, 'workflow'),
         parentCondition,
-        isNull(workflowFolder.archivedAt)
+        isNull(workflowFolder.deletedAt)
       )
     )
   const siblingNames = new Set(siblingRows.map((row) => row.name))
@@ -302,7 +308,8 @@ async function duplicateFolderStructure(
       and(
         eq(workflowFolder.parentId, sourceFolderId),
         eq(workflowFolder.workspaceId, sourceWorkspaceId),
-        isNull(workflowFolder.archivedAt)
+        eq(workflowFolder.resourceType, 'workflow'),
+        isNull(workflowFolder.deletedAt)
       )
     )
 
@@ -312,13 +319,12 @@ async function duplicateFolderStructure(
 
     await tx.insert(workflowFolder).values({
       id: newChildFolderId,
+      resourceType: 'workflow',
       userId,
       workspaceId: targetWorkspaceId,
       name: childFolder.name,
-      color: childFolder.color,
       parentId: newParentFolderId,
       sortOrder: childFolder.sortOrder,
-      isExpanded: false,
       locked: false,
       createdAt: timestamp,
       updatedAt: timestamp,

apps/sim/app/api/folders/[id]/route.test.ts

@@ -73,7 +73,7 @@ const mockFolder = {
 
 /** Queues the folder-existence lookup the route runs before authorizing. */
 function queueFolderLookup(folder: Record<string, unknown> = mockFolder) {
-  queueTableRows(schemaMock.workflowFolder, [folder])
+  queueTableRows(schemaMock.folder, [folder])
 }
 
 /** Makes the next folder lookup throw, exercising the route's 500 path. */

apps/sim/app/api/folders/[id]/route.ts

@@ -1,5 +1,5 @@
 import { db } from '@sim/db'
-import { workflowFolder } from '@sim/db/schema'
+import { folder as workflowFolder } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { assertFolderMutable, FolderLockedError } from '@sim/platform-authz/workflow'
 import { eq } from 'drizzle-orm'

apps/sim/app/api/folders/reorder/route.ts

@@ -1,8 +1,8 @@
 import { db } from '@sim/db'
-import { workflowFolder } from '@sim/db/schema'
+import { folder as workflowFolder } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { assertFolderMutable, FolderLockedError } from '@sim/platform-authz/workflow'
-import { eq, inArray } from 'drizzle-orm'
+import { and, eq, inArray } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { reorderFoldersContract } from '@/lib/api/contracts'
 import { parseRequest } from '@/lib/api/server'
@@ -60,7 +60,7 @@ export const PUT = withRouteHandler(async (req: NextRequest) => {
         .select({
           id: workflowFolder.id,
           workspaceId: workflowFolder.workspaceId,
-          archivedAt: workflowFolder.archivedAt,
+          archivedAt: workflowFolder.deletedAt,
         })
         .from(workflowFolder)
         .where(inArray(workflowFolder.id, targetParentIds))
@@ -83,7 +83,13 @@ export const PUT = withRouteHandler(async (req: NextRequest) => {
     const workspaceFolders = await db
       .select({ id: workflowFolder.id, parentId: workflowFolder.parentId })
       .from(workflowFolder)
-      .where(eq(workflowFolder.workspaceId, workspaceId))
+      .where(
+        and(
+          eq(workflowFolder.workspaceId, workspaceId),
+          eq(workflowFolder.resourceType, 'workflow'),
+          eq(workflowFolder.resourceType, 'workflow')
+        )
+      )
 
     const parentById = new Map<string, string | null>()
     for (const folder of workspaceFolders) {

apps/sim/app/api/folders/route.test.ts

@@ -579,35 +579,5 @@ describe('Folders API Route', () => {
       expect(capturedValues).not.toBeNull()
       expect(capturedValues!.name).toBe('Test Folder With Spaces')
     })
-
-    it('should use default color when not provided', async () => {
-      mockAuthenticatedUser()
-
-      let capturedValues: CapturedFolderValues | null = null
-
-      mockTransaction.mockImplementationOnce(
-        createMockTransaction({
-          selectResults: [[], []],
-          insertResult: [mockFolders[0]],
-          onInsertValues: (values) => {
-            capturedValues = values
-          },
-        })
-      )
-      mockValues.mockImplementationOnce((values: CapturedFolderValues) => {
-        capturedValues = values
-        return { returning: mockReturning }
-      })
-
-      const req = createMockRequest('POST', {
-        name: 'Test Folder',
-        workspaceId: 'workspace-123',
-      })
-
-      await POST(req)
-
-      expect(capturedValues).not.toBeNull()
-      expect(capturedValues!.color).toBe('#6B7280')
-    })
   })
 })

apps/sim/app/api/v1/admin/folders/[id]/export/route.ts

@@ -12,9 +12,9 @@
  */
 
 import { db } from '@sim/db'
-import { workflow, workflowFolder } from '@sim/db/schema'
+import { workflow, folder as workflowFolder } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { eq } from 'drizzle-orm'
+import { and, eq } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
 import { adminV1ExportFolderContract } from '@/lib/api/contracts/v1/admin'
 import { parseRequest } from '@/lib/api/server'
@@ -130,7 +130,13 @@ export const GET = withRouteHandler(
           parentId: workflowFolder.parentId,
         })
         .from(workflowFolder)
-        .where(eq(workflowFolder.workspaceId, folderData.workspaceId))
+        .where(
+          and(
+            eq(workflowFolder.workspaceId, folderData.workspaceId),
+            eq(workflowFolder.resourceType, 'workflow'),
+            eq(workflowFolder.resourceType, 'workflow')
+          )
+        )
 
       const workflowsInFolder = collectWorkflowsInFolder(folderId, allWorkflows, allFolders)
       const subfolders = collectSubfolders(folderId, allFolders)

apps/sim/app/api/v1/admin/types.ts

@@ -13,7 +13,7 @@ import type {
   user,
   userStats,
   workflow,
-  workflowFolder,
+  folder as workflowFolder,
   workspace,
 } from '@sim/db/schema'
 import type { InferSelectModel } from 'drizzle-orm'
@@ -156,6 +156,11 @@ export interface AdminFolder {
   id: string
   name: string
   parentId: string | null
+  /**
+   * Always `null` since folders moved to the generic `folder` table, which has no `color`
+   * column (it had no consumer). Retained so the v1 admin response shape stays stable for
+   * existing API clients rather than silently dropping a documented field.
+   */
   color: string | null
   sortOrder: number
   createdAt: string
@@ -167,7 +172,7 @@ export function toAdminFolder(dbFolder: DbWorkflowFolder): AdminFolder {
     id: dbFolder.id,
     name: dbFolder.name,
     parentId: dbFolder.parentId,
-    color: dbFolder.color,
+    color: null,
     sortOrder: dbFolder.sortOrder,
     createdAt: dbFolder.createdAt.toISOString(),
     updatedAt: dbFolder.updatedAt.toISOString(),

apps/sim/app/api/v1/admin/workspaces/[id]/export/route.ts

@@ -13,9 +13,9 @@
 
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db } from '@sim/db'
-import { workflow, workflowFolder, workspace } from '@sim/db/schema'
+import { workflow, folder as workflowFolder, workspace } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { eq } from 'drizzle-orm'
+import { and, eq } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
 import { adminV1ExportWorkspaceContract } from '@/lib/api/contracts/v1/admin'
 import { parseRequest } from '@/lib/api/server'
@@ -69,7 +69,13 @@ export const GET = withRouteHandler(
       const folders = await db
         .select()
         .from(workflowFolder)
-        .where(eq(workflowFolder.workspaceId, workspaceId))
+        .where(
+          and(
+            eq(workflowFolder.workspaceId, workspaceId),
+            eq(workflowFolder.resourceType, 'workflow'),
+            eq(workflowFolder.resourceType, 'workflow')
+          )
+        )
 
       const workflowExports: Array<{
         workflow: WorkspaceExportPayload['workflows'][number]['workflow']

apps/sim/app/api/v1/admin/workspaces/[id]/folders/route.ts

@@ -11,9 +11,9 @@
  */
 
 import { db } from '@sim/db'
-import { workflowFolder, workspace } from '@sim/db/schema'
+import { folder as workflowFolder, workspace } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { count, eq } from 'drizzle-orm'
+import { and, count, eq } from 'drizzle-orm'
 import { adminV1ListWorkspaceFoldersContract } from '@/lib/api/contracts/v1/admin'
 import { parseRequest } from '@/lib/api/server'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
@@ -50,11 +50,23 @@ export const GET = withRouteHandler(
         db
           .select({ total: count() })
           .from(workflowFolder)
-          .where(eq(workflowFolder.workspaceId, workspaceId)),
+          .where(
+            and(
+              eq(workflowFolder.workspaceId, workspaceId),
+              eq(workflowFolder.resourceType, 'workflow'),
+              eq(workflowFolder.resourceType, 'workflow')
+            )
+          ),
         db
           .select()
           .from(workflowFolder)
-          .where(eq(workflowFolder.workspaceId, workspaceId))
+          .where(
+            and(
+              eq(workflowFolder.workspaceId, workspaceId),
+              eq(workflowFolder.resourceType, 'workflow'),
+              eq(workflowFolder.resourceType, 'workflow')
+            )
+          )
           .orderBy(workflowFolder.sortOrder, workflowFolder.name)
           .limit(limit)
           .offset(offset),

apps/sim/app/api/v1/admin/workspaces/[id]/import/route.ts

@@ -24,7 +24,7 @@
  */
 
 import { db } from '@sim/db'
-import { workflow, workflowFolder } from '@sim/db/schema'
+import { workflow, folder as workflowFolder } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
@@ -154,6 +154,7 @@ export const POST = withRouteHandler(
         rootFolderId = generateId()
         await db.insert(workflowFolder).values({
           id: rootFolderId,
+          resourceType: 'workflow',
           name: rootFolderName,
           userId: workspaceData.ownerId,
           workspaceId,
@@ -232,6 +233,7 @@ async function importSingleWorkflow(
           const folderId = generateId()
           await db.insert(workflowFolder).values({
             id: folderId,
+            resourceType: 'workflow',
             name: wf.folderPath[i],
             userId: ownerId,
             workspaceId,