better organization

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/search-replace/hooks/use-workflow-search-reference-hydration.ts

@@ -1,5 +1,5 @@
 import { useMemo } from 'react'
-import { getWorkflowSearchMatchResourceGroupKey } from '@/lib/workflows/search-replace/resource-resolvers'
+import { getWorkflowSearchMatchResourceGroupKey } from '@/lib/workflows/search-replace/resources'
 import type { WorkflowSearchMatch } from '@/lib/workflows/search-replace/types'
 import { usePersonalEnvironment, useWorkspaceEnvironment } from '@/hooks/queries/environment'
 import {

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/search-replace/workflow-search-replace.tsx

@@ -7,17 +7,15 @@ import { Button, Input } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
 import { getWorkflowSearchDependentClears } from '@/lib/workflows/search-replace/dependencies'
 import { indexWorkflowSearchMatches } from '@/lib/workflows/search-replace/indexer'
-import {
-  getCompatibleResourceReplacementOptions,
-  getWorkflowSearchReplacementIssue,
-  isConstrainedResourceMatch,
-} from '@/lib/workflows/search-replace/replacement-validation'
 import { buildWorkflowSearchReplacePlan } from '@/lib/workflows/search-replace/replacements'
 import {
+  getCompatibleResourceReplacementOptions,
   getWorkflowSearchCompatibleResourceMatches,
   getWorkflowSearchMatchResourceGroupKey,
+  getWorkflowSearchReplacementIssue,
+  isConstrainedResourceMatch,
   workflowSearchMatchMatchesQuery,
-} from '@/lib/workflows/search-replace/resource-resolvers'
+} from '@/lib/workflows/search-replace/resources'
 import { getWorkflowSearchBlocks } from '@/lib/workflows/search-replace/state'
 import { WORKFLOW_SEARCH_SUBFLOW_FIELD_IDS } from '@/lib/workflows/search-replace/subflow-fields'
 import type { WorkflowSearchReplaceSubflowUpdate } from '@/lib/workflows/search-replace/types'

apps/sim/hooks/queries/workflow-search-replace.ts

@@ -20,7 +20,7 @@ import {
 } from '@/lib/api/contracts/workspace-files'
 import { createMcpToolId } from '@/lib/mcp/shared'
 import type { Credential } from '@/lib/oauth'
-import { stableStringifyWorkflowSearchValue } from '@/lib/workflows/search-replace/resource-resolvers'
+import { stableStringifyWorkflowSearchValue } from '@/lib/workflows/search-replace/resources'
 import type {
   WorkflowSearchMatch,
   WorkflowSearchReplacementOption,

apps/sim/lib/workflows/search-replace/indexer.test.ts

@@ -3,7 +3,7 @@
  */
 import { describe, expect, it } from 'vitest'
 import { indexWorkflowSearchMatches } from '@/lib/workflows/search-replace/indexer'
-import { workflowSearchMatchMatchesQuery } from '@/lib/workflows/search-replace/resource-resolvers'
+import { workflowSearchMatchMatchesQuery } from '@/lib/workflows/search-replace/resources'
 import {
   createSearchReplaceWorkflowFixture,
   SEARCH_REPLACE_BLOCK_CONFIGS,

apps/sim/lib/workflows/search-replace/indexer.ts

@@ -9,7 +9,7 @@ import {
   matchesSearchText,
   parseInlineReferences,
   parseStructuredResourceReferences,
-} from '@/lib/workflows/search-replace/reference-registry'
+} from '@/lib/workflows/search-replace/resources'
 import { getWorkflowSearchSubflowFields } from '@/lib/workflows/search-replace/subflow-fields'
 import type {
   WorkflowSearchBlockState,

apps/sim/lib/workflows/search-replace/reference-registry.ts

@@ -505,6 +505,60 @@ describe('buildWorkflowSearchReplacePlan', () => {
     ])
   })
 
+  it('rejects invalid file upload replacement payloads', () => {
+    const workflow = createSearchReplaceWorkflowFixture()
+    workflow.blocks['file-upload-1'] = {
+      id: 'file-upload-1',
+      type: 'custom',
+      name: 'File Upload Block',
+      position: { x: 0, y: 0 },
+      enabled: true,
+      outputs: {},
+      subBlocks: {
+        file: {
+          id: 'file',
+          type: 'file-upload',
+          value: {
+            name: 'old.csv',
+            path: '/workspace/ws-1/old-key',
+            key: 'old-key',
+          },
+        },
+      },
+    }
+    const blockConfigs = {
+      ...SEARCH_REPLACE_BLOCK_CONFIGS,
+      custom: {
+        subBlocks: [{ id: 'file', title: 'File', type: 'file-upload' }],
+      },
+    }
+
+    const matches = indexWorkflowSearchMatches({
+      workflow,
+      query: 'old',
+      mode: 'resource',
+      blockConfigs,
+    }).filter((match) => match.blockId === 'file-upload-1')
+
+    const plan = buildWorkflowSearchReplacePlan({
+      blocks: workflow.blocks,
+      matches,
+      selectedMatchIds: new Set(matches.map((match) => match.id)),
+      defaultReplacement: '"not-a-file-object"',
+      resourceReplacementOptions: [
+        { kind: 'file', value: '"not-a-file-object"', label: 'Invalid file' },
+      ],
+    })
+
+    expect(plan.updates).toEqual([])
+    expect(plan.conflicts).toEqual([
+      {
+        matchId: matches[0].id,
+        reason: 'Replacement file is no longer valid',
+      },
+    ])
+  })
+
   it('rejects invalid subflow iteration replacements', () => {
     const workflow = createSearchReplaceWorkflowFixture()
     workflow.blocks['parallel-1'] = {