Handle falsy check, correctly clean up file storage

Author: TheodoreSpeaks

apps/sim/background/cleanup-soft-deletes.ts

@@ -22,6 +22,7 @@ import {
   DEFAULT_MAX_BATCHES_PER_TABLE,
 } from '@/lib/cleanup/batch-delete'
 import { prepareChatCleanup } from '@/lib/cleanup/chat-cleanup'
+import type { StorageContext } from '@/lib/uploads'
 import { isUsingCloudStorage, StorageService } from '@/lib/uploads'
 
 const logger = createLogger('CleanupSoftDeletes')
@@ -34,26 +35,46 @@ async function cleanupWorkspaceFileStorage(
 
   if (!isUsingCloudStorage() || workspaceIds.length === 0) return stats
 
-  const filesToDelete = await db
-    .select({ key: workspaceFiles.key })
-    .from(workspaceFiles)
-    .where(
-      and(
-        inArray(workspaceFiles.workspaceId, workspaceIds),
-        isNotNull(workspaceFiles.deletedAt),
-        lt(workspaceFiles.deletedAt, retentionDate)
+  const limit = DEFAULT_BATCH_SIZE * DEFAULT_MAX_BATCHES_PER_TABLE
+
+  const [legacyFiles, multiContextFiles] = await Promise.all([
+    db
+      .select({ key: workspaceFile.key })
+      .from(workspaceFile)
+      .where(
+        and(
+          inArray(workspaceFile.workspaceId, workspaceIds),
+          isNotNull(workspaceFile.deletedAt),
+          lt(workspaceFile.deletedAt, retentionDate)
+        )
       )
-    )
-    .limit(DEFAULT_BATCH_SIZE * DEFAULT_MAX_BATCHES_PER_TABLE)
+      .limit(limit),
+    db
+      .select({ key: workspaceFiles.key, context: workspaceFiles.context })
+      .from(workspaceFiles)
+      .where(
+        and(
+          inArray(workspaceFiles.workspaceId, workspaceIds),
+          isNotNull(workspaceFiles.deletedAt),
+          lt(workspaceFiles.deletedAt, retentionDate)
+        )
+      )
+      .limit(limit),
+  ])
+
+  const toDelete: Array<{ key: string; context: StorageContext }> = [
+    ...legacyFiles.map((f) => ({ key: f.key, context: 'workspace' as StorageContext })),
+    ...multiContextFiles.map((f) => ({ key: f.key, context: f.context as StorageContext })),
+  ]
 
   await Promise.all(
-    filesToDelete.map(async (file) => {
+    toDelete.map(async ({ key, context }) => {
       try {
-        await StorageService.deleteFile({ key: file.key, context: 'workspace' })
+        await StorageService.deleteFile({ key, context })
         stats.filesDeleted++
       } catch (error) {
         stats.filesFailed++
-        logger.error(`Failed to delete storage file ${file.key}:`, { error })
+        logger.error(`Failed to delete storage file ${key} (context: ${context}):`, { error })
       }
     })
   )

apps/sim/ee/data-retention/components/data-retention-settings.tsx

@@ -45,6 +45,11 @@ interface RetentionFieldProps {
 }
 
 function RetentionField({ label, description, value, onChange, disabled }: RetentionFieldProps) {
+  const standard = DAY_OPTIONS.find((o) => o.value === value)
+  const options = standard
+    ? DAY_OPTIONS
+    : [...DAY_OPTIONS, { value, label: `${value} days (custom)` } as const]
+
   return (
     <div className='flex items-center justify-between py-2'>
       <div className='flex flex-col gap-0.5'>
@@ -53,15 +58,15 @@ function RetentionField({ label, description, value, onChange, disabled }: Reten
       </div>
       {disabled ? (
         <span className='text-[13px] text-[var(--text-muted)]'>
-          {DAY_OPTIONS.find((o) => o.value === value)?.label ?? `${value} days`}
+          {standard?.label ?? `${value} days`}
         </span>
       ) : (
         <Select value={value} onValueChange={onChange}>
           <SelectTrigger className='w-[140px] text-[13px]'>
             <SelectValue />
           </SelectTrigger>
           <SelectContent>
-            {DAY_OPTIONS.map((opt) => (
+            {options.map((opt) => (
               <SelectItem key={opt.value} value={opt.value} className='text-[13px]'>
                 {opt.label}
               </SelectItem>

apps/sim/lib/billing/cleanup-dispatcher.ts

@@ -126,7 +126,7 @@ export async function resolveCleanupScope(
     .where(eq(workspace.id, payload.workspaceId))
     .limit(1)
 
-  if (!ws?.hours) return null
+  if (ws?.hours == null) return null
 
   return {
     workspaceIds: [payload.workspaceId],