fix(enrichment): cancel upsert dependents

TheodoreSpeaks · TheodoreSpeaks · commit efbcebf26410 · 2026-08-11T15:46:59.000-07:00
diff --git a/apps/sim/lib/table/__tests__/update-row.test.ts b/apps/sim/lib/table/__tests__/update-row.test.ts
@@ -421,6 +421,7 @@ describe('insertRow — position race safety (migration 0198 + advisory lock)',
   })
 
   it('clears stale enrichment state when an upsert updates a matching row', async () => {
+    const cancelSpy = vi.spyOn(workflowColumns, 'cancelWorkflowGroupRuns').mockResolvedValue()
     const runSpy = vi.spyOn(workflowColumns, 'runWorkflowColumn').mockResolvedValue()
     const enrichmentTable: TableDefinition = {
       ...TABLE,
@@ -429,6 +430,7 @@ describe('insertRow — position race safety (migration 0198 + advisory lock)',
           { id: 'name', name: 'Name', type: 'string', unique: true },
           { id: 'domain', name: 'Domain', type: 'string' },
           { id: 'email', name: 'Email', type: 'string', workflowGroupId: 'group-1' },
+          { id: 'score', name: 'Score', type: 'number', workflowGroupId: 'group-2' },
         ],
         workflowGroups: [
           {
@@ -440,6 +442,13 @@ describe('insertRow — position race safety (migration 0198 + advisory lock)',
             inputMappings: [{ inputName: 'companyDomain', columnName: 'domain' }],
             outputs: [{ blockId: '', path: '', outputId: 'email', columnName: 'email' }],
           },
+          {
+            id: 'group-2',
+            workflowId: 'workflow-2',
+            autoRun: true,
+            dependencies: { columns: ['email'] },
+            outputs: [{ blockId: 'block-2', path: 'score', columnName: 'score' }],
+          },
         ],
       },
     }
@@ -449,7 +458,7 @@ describe('insertRow — position race safety (migration 0198 + advisory lock)',
     dbChainMockFns.limit.mockResolvedValueOnce([
       {
         ...EXISTING_ROW,
-        data: { name: 'Alice', domain: 'old.example', email: 'person@old.example' },
+        data: { name: 'Alice', domain: 'old.example', email: 'person@old.example', score: 10 },
       },
     ])
     queueTableRows(tableRowExecutions, [
@@ -466,6 +475,19 @@ describe('insertRow — position race safety (migration 0198 + advisory lock)',
         blockErrors: {},
         cancelledAt: null,
       },
+      {
+        rowId: 'row-1',
+        groupId: 'group-2',
+        status: 'running',
+        executionId: 'execution-2',
+        jobId: 'job-2',
+        workflowId: 'workflow-2',
+        isManualRun: false,
+        error: null,
+        runningBlockIds: [],
+        blockErrors: {},
+        cancelledAt: null,
+      },
     ])
     dbChainMockFns.returning.mockResolvedValueOnce([
       {
@@ -486,8 +508,15 @@ describe('insertRow — position race safety (migration 0198 + advisory lock)',
     )
 
     expect(result.row.data).toEqual({ name: 'Alice', domain: 'new.example', email: null })
-    expect(result.row.executions).toEqual({})
+    expect(result.row.executions['group-1']).toBeUndefined()
     expect(dbChainMockFns.delete).toHaveBeenCalledWith(tableRowExecutions)
+    await vi.waitFor(() => {
+      expect(cancelSpy).toHaveBeenCalledWith('tbl-1', 'row-1', { groupIds: ['group-2'] })
+      expect(runSpy).toHaveBeenCalledWith(
+        expect.objectContaining({ groupIds: ['group-2'], isManualRun: true })
+      )
+    })
+    cancelSpy.mockRestore()
     runSpy.mockRestore()
   })
 })
diff --git a/apps/sim/lib/table/rows/service.ts b/apps/sim/lib/table/rows/service.ts
@@ -740,7 +740,7 @@ export async function upsertRow(
       if (!previousData) throw new Error('Matched table row is missing data')
       const existingExecutions = await loadExecutionsForRow(trx, matchedRowId)
       const existingState = { data: previousData, executions: existingExecutions }
-      const dataBeforeDerivedClears = { ...data.data }
+      const dataBeforeDerivedClears = { ...previousData, ...data.data }
       const persistedData: RowData = {
         ...data.data,
         ...getInvalidatedManualEnrichmentOutputClears(
