fix(files): index-shape the move conflict probe and cover execution-context URL parses

Author: waleedlatif1

apps/sim/ee/workspace-forking/lib/copy/copy-files.test.ts

@@ -14,6 +14,7 @@ import {
   workspaceFileSecretProvenanceMock,
   workspaceFileSecretProvenanceMockFns,
 } from '@sim/testing/mocks/workspace-file-secret-provenance.mock'
+import { generateShortId } from '@sim/utils/id'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 /** The `workspace_files` columns {@link fileRows} enforces its unique indexes on. */
@@ -36,7 +37,7 @@ interface WorkspaceFileRow {
  */
 const { fileRows, allocateFromFileRows } = vi.hoisted(() => {
   const fileRows: WorkspaceFileRow[] = []
-  const withCopySuffix = (name: string, n: number) => {
+  const withCopySuffix = (name: string, n: number | string) => {
     const lastDot = name.lastIndexOf('.')
     return lastDot > 0 && lastDot < name.length - 1
       ? `${name.slice(0, lastDot)} (${n})${name.slice(lastDot)}`
@@ -63,11 +64,11 @@ const { fileRows, allocateFromFileRows } = vi.hoisted(() => {
             row.originalName === name
         )
       if (!taken(baseName)) return baseName
-      for (let n = 1; n <= 1000; n++) {
+      for (let n = 1; n <= 20; n++) {
         const candidate = withCopySuffix(baseName, n)
         if (!taken(candidate)) return candidate
       }
-      throw new Error(`A file named "${baseName}" already exists in this workspace`)
+      return withCopySuffix(baseName, generateShortId(8))
     },
   }
 })

apps/sim/lib/uploads/archive.test.ts

@@ -114,7 +114,7 @@ function craftCentralDirectory(records: number, extraPerRecord: number): Buffer
   return buffer
 }
 
-/** Mirrors `allocateUniqueWorkspaceFileName`'s " (n)" suffixing. */
+/** Numbered " (n)" suffixing in the style of `allocateUniqueWorkspaceFileName`'s first candidates. */
 function allocateUniqueName(folderKey: string, name: string): string {
   const dot = name.lastIndexOf('.')
   const base = dot > 0 ? name.slice(0, dot) : name

apps/sim/lib/uploads/contexts/workspace/__integration__/file-names.integration.ts

@@ -66,7 +66,7 @@ describe('workspace file names in PostgreSQL', () => {
     })
   }
 
-  it('parses an external URL without saving a copy to workspace Files', async () => {
+  async function parseExternalUrl(executionId?: string) {
     const fixture = await seedWorkspace()
     const url = 'https://example.com/page.txt'
     vi.spyOn(inputValidation, 'validateUrlWithDNS').mockResolvedValue({
@@ -96,9 +96,11 @@ describe('workspace file names in PostgreSQL', () => {
           subjectUserId: fixture.aliceId,
           workspaceId: fixture.workspaceId,
           delegationId: generateId(),
+          executionId,
         }),
         workspaceId: fixture.workspaceId,
         workflowId: generateId(),
+        executionId,
         attributedUserId: fixture.aliceId,
         fileAccessUserId: fixture.aliceId,
       }
@@ -107,11 +109,18 @@ describe('workspace file names in PostgreSQL', () => {
 
     expect(response.status).toBe(200)
     expect(body.output.content).toContain('fetched page body')
-    const rows = await db
-      .select({ id: workspaceFiles.id })
+    return db
+      .select({ context: workspaceFiles.context })
       .from(workspaceFiles)
       .where(eq(workspaceFiles.workspaceId, fixture.workspaceId))
-    expect(rows).toEqual([])
+  }
+
+  it('parses an external URL without saving a copy to workspace Files', async () => {
+    expect(await parseExternalUrl()).toEqual([])
+  })
+
+  it('keeps an external URL parsed during an execution as an execution file only', async () => {
+    expect(await parseExternalUrl(generateId())).toEqual([{ context: 'execution' }])
   })
 
   it('scopes name lookups to root or folder through the unique name index', async () => {

apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.ts

@@ -224,11 +224,6 @@ function folderParentCondition(parentId?: string | null) {
   return normalized ? eq(folderTable.parentId, normalized) : isNull(folderTable.parentId)
 }
 
-function fileFolderCondition(folderId?: string | null) {
-  const normalized = normalizeParentId(folderId)
-  return normalized ? eq(workspaceFiles.folderId, normalized) : isNull(workspaceFiles.folderId)
-}
-
 /**
  * Folder predicate for active-name lookups, spelled exactly as the
  * `workspace_files_workspace_folder_name_active_unique` index expression so the
@@ -1059,7 +1054,7 @@ export async function moveWorkspaceFileItems(params: {
             eq(workspaceFiles.workspaceId, params.workspaceId),
             eq(workspaceFiles.originalName, file.name),
             eq(workspaceFiles.context, 'workspace'),
-            fileFolderCondition(targetFolderId),
+            workspaceFileNameFolderCondition(targetFolderId),
             isNull(workspaceFiles.deletedAt)
           )
         )