fix(logs): include subfolders when filtering logs by folder

Author: waleedlatif1

apps/sim/app/api/logs/export/route.ts

@@ -5,7 +5,11 @@ import { and, desc, eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { buildFilterConditions, LogFilterParamsSchema } from '@/lib/logs/filters'
+import {
+  buildFilterConditions,
+  expandFolderIdsWithDescendants,
+  LogFilterParamsSchema,
+} from '@/lib/logs/filters'
 
 const logger = createLogger('LogsExportAPI')
 
@@ -45,6 +49,10 @@ export const GET = withRouteHandler(async (request: NextRequest) => {
       workflowName: sql<string>`COALESCE(${workflow.name}, 'Deleted Workflow')`,
     }
 
+    if (params.folderIds) {
+      params.folderIds = await expandFolderIdsWithDescendants(params.workspaceId, params.folderIds)
+    }
+
     const workspaceCondition = eq(workflowExecutionLogs.workspaceId, params.workspaceId)
     const filterConditions = buildFilterConditions(params)
     const conditions = filterConditions

apps/sim/app/api/logs/route.ts

@@ -31,7 +31,7 @@ import { listLogsContract, type WorkflowLogSummary } from '@/lib/api/contracts/l
 import { parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { buildFilterConditions } from '@/lib/logs/filters'
+import { buildFilterConditions, expandFolderIdsWithDescendants } from '@/lib/logs/filters'
 
 const logger = createLogger('LogsAPI')
 
@@ -162,6 +162,10 @@ export const GET = withRouteHandler(async (request: NextRequest) => {
     }
   }
 
+  if (params.folderIds) {
+    params.folderIds = await expandFolderIdsWithDescendants(params.workspaceId, params.folderIds)
+  }
+
   const commonFilters = buildFilterConditions(params, { useSimpleLevelFilter: false })
   if (commonFilters) workflowConditions.push(commonFilters)
 

apps/sim/app/api/logs/stats/route.ts

@@ -13,7 +13,7 @@ import { isZodError } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { buildFilterConditions } from '@/lib/logs/filters'
+import { buildFilterConditions, expandFolderIdsWithDescendants } from '@/lib/logs/filters'
 
 const logger = createLogger('LogsStatsAPI')
 
@@ -37,6 +37,13 @@ export const GET = withRouteHandler(async (request: NextRequest) => {
 
       const workspaceFilter = eq(workflowExecutionLogs.workspaceId, params.workspaceId)
 
+      if (params.folderIds) {
+        params.folderIds = await expandFolderIdsWithDescendants(
+          params.workspaceId,
+          params.folderIds
+        )
+      }
+
       const commonFilters = buildFilterConditions(params, { useSimpleLevelFilter: true })
       const whereCondition = commonFilters ? and(workspaceFilter, commonFilters) : workspaceFilter
 

apps/sim/lib/logs/filters.ts

@@ -1,5 +1,6 @@
-import { workflow, workflowExecutionLogs } from '@sim/db/schema'
-import { and, eq, gt, gte, inArray, lt, lte, ne, type SQL, sql } from 'drizzle-orm'
+import { db } from '@sim/db'
+import { workflow, workflowExecutionLogs, workflowFolder } from '@sim/db/schema'
+import { and, eq, gt, gte, inArray, isNull, lt, lte, ne, type SQL, sql } from 'drizzle-orm'
 import { z } from 'zod'
 import type { TimeRange } from '@/stores/logs/filters/types'
 
@@ -128,6 +129,53 @@ function buildWorkflowIdsCondition(workflowIds: string): SQL | undefined {
   return undefined
 }
 
+/**
+ * Expands a CSV of selected folder IDs to include every descendant folder in the
+ * workspace, so that filtering by a parent folder also matches workflows that
+ * live in nested subfolders.
+ *
+ * Returns the original CSV when there are no descendants (or when the input is
+ * empty / undefined). Unknown IDs are preserved so the caller's `inArray` check
+ * behaves the same as today (matches nothing).
+ */
+export async function expandFolderIdsWithDescendants(
+  workspaceId: string,
+  folderIdsCsv: string | undefined
+): Promise<string | undefined> {
+  if (!folderIdsCsv) return folderIdsCsv
+  const seedIds = folderIdsCsv.split(',').filter(Boolean)
+  if (seedIds.length === 0) return folderIdsCsv
+
+  const rows = await db
+    .select({ id: workflowFolder.id, parentId: workflowFolder.parentId })
+    .from(workflowFolder)
+    .where(and(eq(workflowFolder.workspaceId, workspaceId), isNull(workflowFolder.archivedAt)))
+
+  const childrenByParent = new Map<string, string[]>()
+  for (const row of rows) {
+    if (!row.parentId) continue
+    const list = childrenByParent.get(row.parentId)
+    if (list) list.push(row.id)
+    else childrenByParent.set(row.parentId, [row.id])
+  }
+
+  const expanded = new Set<string>(seedIds)
+  const queue = [...seedIds]
+  while (queue.length > 0) {
+    const current = queue.shift() as string
+    const children = childrenByParent.get(current)
+    if (!children) continue
+    for (const childId of children) {
+      if (!expanded.has(childId)) {
+        expanded.add(childId)
+        queue.push(childId)
+      }
+    }
+  }
+
+  return Array.from(expanded).join(',')
+}
+
 function buildFolderIdsCondition(folderIds: string): SQL | undefined {
   const ids = folderIds.split(',').filter(Boolean)
   if (ids.length > 0) {