Merge branch 'fix/tabl' of github.com:simstudioai/sim into fix/tabl

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/column-config-sidebar/column-config-sidebar.tsx

@@ -135,8 +135,6 @@ function ColumnConfigBody({
       toast.success(`Saved "${trimmedName}"`)
       onClose()
     } catch (err) {
-      // Server validation errors carry a Zod issue array on the body; surface
-      // them inline next to the offending field instead of as a raw toast.
       if (isValidationError(err)) {
         const nameIssue =
           findValidationIssue(err, ['updates', 'name']) ??
@@ -146,8 +144,8 @@ function ColumnConfigBody({
           setNameError(nameIssue.message)
           return
         }
+        toast.error(toError(err).message)
       }
-      toast.error(toError(err).message)
     }
   }
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/constants.ts

@@ -0,0 +1,2 @@
+export const WORKFLOW_SEARCH_HIGHLIGHT_CLASS =
+  'rounded-sm bg-orange-400 shadow-[3px_0_0_#fb923c,-3px_0_0_#fb923c]'

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx

@@ -55,6 +55,7 @@ import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/c
 import type { SubBlockConfig } from '@/blocks/types'
 import { useWebhookManagement } from '@/hooks/use-webhook-management'
 import type { ActiveSearchTarget } from '@/stores/panel/editor/store'
+import { WORKFLOW_SEARCH_HIGHLIGHT_CLASS } from '../constants'
 
 const SLACK_OVERRIDES: SelectorOverrides = {
   transformContext: (context, deps) => {
@@ -73,9 +74,6 @@ const FOLDER_OVERRIDES: SelectorOverrides = {
   },
 }
 
-const WORKFLOW_SEARCH_HIGHLIGHT_CLASS =
-  'rounded-sm bg-orange-400 shadow-[3px_0_0_#fb923c,-3px_0_0_#fb923c]'
-
 function hasNestedWorkflowSearchHighlight(
   config: SubBlockConfig,
   activeSearchTarget?: ActiveSearchTarget | null

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/subflow-editor/subflow-editor.tsx

@@ -10,9 +10,7 @@ import type { BlockState } from '@/stores/workflows/workflow/types'
 import type { ConnectedBlock } from '../../hooks/use-block-connections'
 import { useSubflowEditor } from '../../hooks/use-subflow-editor'
 import { ConnectionBlocks } from '../connection-blocks'
-
-const WORKFLOW_SEARCH_HIGHLIGHT_CLASS =
-  'rounded-sm bg-orange-400 shadow-[3px_0_0_#fb923c,-3px_0_0_#fb923c]'
+import { WORKFLOW_SEARCH_HIGHLIGHT_CLASS } from '../constants'
 
 interface SubflowEditorProps {
   currentBlock: BlockState

apps/sim/hooks/queries/tables.ts

@@ -466,6 +466,10 @@ export function useCreateTable(workspaceId: string) {
         body: { ...params, workspaceId },
       })
     },
+    onError: (error) => {
+      if (isValidationError(error)) return
+      toast.error(error.message, { duration: 5000 })
+    },
     onSettled: () => {
       queryClient.invalidateQueries({ queryKey: tableKeys.lists() })
     },
@@ -485,6 +489,10 @@ export function useAddTableColumn({ workspaceId, tableId }: RowMutationContext)
         body: { workspaceId, column },
       })
     },
+    onError: (error) => {
+      if (isValidationError(error)) return
+      toast.error(error.message, { duration: 5000 })
+    },
     onSettled: () => {
       invalidateTableSchema(queryClient, tableId)
     },
@@ -528,6 +536,10 @@ export function useDeleteTable(workspaceId: string) {
         query: { workspaceId },
       })
     },
+    onError: (error) => {
+      if (isValidationError(error)) return
+      toast.error(error.message, { duration: 5000 })
+    },
     onSettled: (_data, _error, tableId) => {
       queryClient.invalidateQueries({ queryKey: tableKeys.lists() })
       queryClient.removeQueries({ queryKey: tableKeys.detail(tableId) })
@@ -814,6 +826,10 @@ export function useDeleteTableRow({ workspaceId, tableId }: RowMutationContext)
         body: { workspaceId },
       })
     },
+    onError: (error) => {
+      if (isValidationError(error)) return
+      toast.error(error.message, { duration: 5000 })
+    },
     onSettled: () => {
       invalidateRowCount(queryClient, tableId)
     },
@@ -851,6 +867,10 @@ export function useDeleteTableRows({ workspaceId, tableId }: RowMutationContext)
 
       return { deletedRowIds }
     },
+    onError: (error) => {
+      if (isValidationError(error)) return
+      toast.error(error.message, { duration: 5000 })
+    },
     onSettled: () => {
       invalidateRowCount(queryClient, tableId)
     },
@@ -1028,6 +1048,10 @@ export function useRestoreTable() {
         params: { tableId },
       })
     },
+    onError: (error) => {
+      if (isValidationError(error)) return
+      toast.error(error.message, { duration: 5000 })
+    },
     onSettled: () => {
       queryClient.invalidateQueries({ queryKey: tableKeys.lists() })
     },
@@ -1064,11 +1088,12 @@ export function useUploadCsvToTable() {
 
       return response.json()
     },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: tableKeys.lists() })
-    },
     onError: (error) => {
       logger.error('Failed to upload CSV:', error)
+      toast.error(error.message, { duration: 5000 })
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: tableKeys.lists() })
     },
   })
 }
@@ -1140,13 +1165,14 @@ export function useImportCsvIntoTable() {
 
       return response.json()
     },
+    onError: (error) => {
+      logger.error('Failed to import CSV into table:', error)
+      toast.error(error.message, { duration: 5000 })
+    },
     onSettled: (_data, _error, variables) => {
       if (!variables) return
       invalidateRowCount(queryClient, variables.tableId)
     },
-    onError: (error) => {
-      logger.error('Failed to import CSV into table:', error)
-    },
   })
 }
 
@@ -1438,6 +1464,10 @@ export function useAddWorkflowGroup({ workspaceId, tableId }: RowMutationContext
         body: { workspaceId, group, outputColumns },
       })
     },
+    onError: (error) => {
+      if (isValidationError(error)) return
+      toast.error(error.message, { duration: 5000 })
+    },
     onSettled: () => {
       invalidateTableSchema(queryClient, tableId)
     },
@@ -1464,6 +1494,10 @@ export function useUpdateWorkflowGroup({ workspaceId, tableId }: RowMutationCont
         body: { workspaceId, ...vars },
       })
     },
+    onError: (error) => {
+      if (isValidationError(error)) return
+      toast.error(error.message, { duration: 5000 })
+    },
     onSettled: () => {
       invalidateTableSchema(queryClient, tableId)
       queryClient.invalidateQueries({ queryKey: tableKeys.rowsRoot(tableId) })
@@ -1484,6 +1518,10 @@ export function useDeleteWorkflowGroup({ workspaceId, tableId }: RowMutationCont
         body: { workspaceId, groupId },
       })
     },
+    onError: (error) => {
+      if (isValidationError(error)) return
+      toast.error(error.message, { duration: 5000 })
+    },
     onSettled: () => {
       invalidateTableSchema(queryClient, tableId)
       queryClient.invalidateQueries({ queryKey: tableKeys.rowsRoot(tableId) })

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

@@ -457,6 +457,160 @@ describe('indexWorkflowSearchMatches', () => {
     ])
   })
 
+  it('does not index skill-shaped values even when persisted under a legacy id', () => {
+    const workflow = createSearchReplaceWorkflowFixture()
+    workflow.blocks['legacy-agent-1'] = {
+      id: 'legacy-agent-1',
+      type: 'custom',
+      name: 'Legacy Agent',
+      position: { x: 0, y: 0 },
+      enabled: true,
+      outputs: {},
+      subBlocks: {
+        legacySkills: {
+          id: 'legacySkills',
+          type: 'short-input',
+          value: [{ skillId: 'skill-vik-id', name: 'vik-skill' }],
+        },
+      },
+    }
+
+    const matches = indexWorkflowSearchMatches({
+      workflow,
+      query: 'vik',
+      mode: 'text',
+      blockConfigs: {
+        ...SEARCH_REPLACE_BLOCK_CONFIGS,
+        custom: { subBlocks: [] },
+      },
+    }).filter((match) => match.blockId === 'legacy-agent-1')
+
+    expect(matches).toEqual([])
+  })
+
+  it('does not index upload or dynamic control internals as text', () => {
+    const workflow = createSearchReplaceWorkflowFixture()
+    workflow.blocks['dynamic-1'] = {
+      id: 'dynamic-1',
+      type: 'custom',
+      name: 'Dynamic Block',
+      position: { x: 0, y: 0 },
+      enabled: true,
+      outputs: {},
+      subBlocks: {
+        upload: {
+          id: 'upload',
+          type: 'file-upload',
+          value: {
+            name: 'customer.csv',
+            path: '/workspace/customer.csv',
+            key: 'storage-customer-key',
+          },
+        },
+        mcpArgs: {
+          id: 'mcpArgs',
+          type: 'mcp-dynamic-args',
+          value: { prompt: 'customer prompt' },
+        },
+        slider: {
+          id: 'slider',
+          type: 'slider',
+          value: 42,
+        },
+        enabled: {
+          id: 'enabled',
+          type: 'switch',
+          value: true,
+        },
+      },
+    }
+
+    const matches = indexWorkflowSearchMatches({
+      workflow,
+      query: 'customer',
+      mode: 'text',
+      blockConfigs: {
+        ...SEARCH_REPLACE_BLOCK_CONFIGS,
+        custom: {
+          subBlocks: [
+            { id: 'upload', title: 'Upload', type: 'file-upload' },
+            { id: 'mcpArgs', title: 'MCP Args', type: 'mcp-dynamic-args' },
+            { id: 'slider', title: 'Slider', type: 'slider' },
+            { id: 'enabled', title: 'Enabled', type: 'switch' },
+          ],
+        },
+      },
+    }).filter((match) => match.blockId === 'dynamic-1')
+
+    expect(matches).toEqual([])
+  })
+
+  it('indexes only safe user-facing paths inside tool input values', () => {
+    const workflow = createSearchReplaceWorkflowFixture()
+    workflow.blocks['tool-input-1'] = {
+      id: 'tool-input-1',
+      type: 'custom',
+      name: 'Tool Input Block',
+      position: { x: 0, y: 0 },
+      enabled: true,
+      outputs: {},
+      subBlocks: {
+        tools: {
+          id: 'tools',
+          type: 'tool-input',
+          value: [
+            {
+              type: 'native',
+              toolId: 'gmail_customer_tool',
+              operation: 'send_customer_message',
+              title: 'Customer notifier',
+              params: {
+                body: 'hello customer',
+                credentialId: 'credential-customer-id',
+                inputMapping: JSON.stringify({ query: 'customer json value' }),
+              },
+              schema: {
+                description: 'customer schema text',
+              },
+            },
+          ],
+        },
+      },
+    }
+
+    const matches = indexWorkflowSearchMatches({
+      workflow,
+      query: 'customer',
+      mode: 'text',
+      blockConfigs: {
+        ...SEARCH_REPLACE_BLOCK_CONFIGS,
+        custom: {
+          subBlocks: [{ id: 'tools', title: 'Tools', type: 'tool-input' }],
+        },
+      },
+    }).filter((match) => match.blockId === 'tool-input-1')
+
+    expect(matches).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          subBlockId: 'tools',
+          valuePath: [0, 'title'],
+          searchText: 'Customer notifier',
+        }),
+        expect.objectContaining({
+          subBlockId: 'tools',
+          valuePath: [0, 'params', 'body'],
+          searchText: 'hello customer',
+        }),
+      ])
+    )
+    expect(matches.some((match) => match.valuePath.includes('toolId'))).toBe(false)
+    expect(matches.some((match) => match.valuePath.includes('operation'))).toBe(false)
+    expect(matches.some((match) => match.valuePath.includes('credentialId'))).toBe(false)
+    expect(matches.some((match) => match.valuePath.includes('inputMapping'))).toBe(false)
+    expect(matches.some((match) => match.valuePath.includes('schema'))).toBe(false)
+  })
+
   it('does not index condition-hidden subblocks', () => {
     const workflow = createSearchReplaceWorkflowFixture()
     workflow.blocks['condition-1'] = {