fix(workflows): preserve version-specific container labels

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/w/components/workflow-diff/utils.test.ts

@@ -1,8 +1,12 @@
 /**
  * @vitest-environment node
  */
+import {
+  generateLoopBlocks,
+  generateParallelBlocks,
+} from '@sim/workflow-persistence/subflow-helpers'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { WorkflowDiffSummary } from '@/lib/workflows/comparison'
+import { generateWorkflowDiffSummary, type WorkflowDiffSummary } from '@/lib/workflows/comparison'
 import {
   classifyChange,
   listBlockChanges,
@@ -238,6 +242,61 @@ describe('listOneSidedFields', () => {
 })
 
 describe('listBlockChanges', () => {
+  it("uses each version's names for moved members and added or removed containers", () => {
+    const baseBlocks = {
+      source: block('source', { type: 'loop', name: 'Original source' }),
+      destination: block('destination', { type: 'parallel', name: 'Original destination' }),
+      mover: block('mover', { name: 'Original member', data: { parentId: 'source' } }),
+      removedWrapper: block('removedWrapper', { type: 'loop', name: 'Removed wrapper' }),
+      survivor: block('survivor', {
+        name: 'Original survivor',
+        data: { parentId: 'removedWrapper' },
+      }),
+    }
+    const targetBlocks = {
+      source: block('source', { type: 'loop', name: 'Renamed source' }),
+      destination: block('destination', { type: 'parallel', name: 'Renamed destination' }),
+      mover: block('mover', { name: 'Renamed member', data: { parentId: 'destination' } }),
+      addedWrapper: block('addedWrapper', { type: 'parallel', name: 'Added wrapper' }),
+      survivor: block('survivor', { name: 'Renamed survivor', data: { parentId: 'addedWrapper' } }),
+    }
+    const base: WorkflowState = {
+      blocks: baseBlocks,
+      edges: [],
+      loops: generateLoopBlocks(baseBlocks),
+      parallels: generateParallelBlocks(baseBlocks),
+    }
+    const target: WorkflowState = {
+      blocks: targetBlocks,
+      edges: [],
+      loops: generateLoopBlocks(targetBlocks),
+      parallels: generateParallelBlocks(targetBlocks),
+    }
+    const entries = listBlockChanges(
+      generateWorkflowDiffSummary(target, base),
+      baseBlocks,
+      targetBlocks,
+      { base, target }
+    )
+    const byId = new Map(entries.map((entry) => [entry.id, entry]))
+    expect(byId.get('mover')?.moved).toEqual({
+      outOf: 'Original source',
+      into: 'Renamed destination',
+    })
+    expect(byId.get('source')?.membership?.removed).toEqual([
+      { name: 'Original member', moved: true },
+    ])
+    expect(byId.get('destination')?.membership?.added).toEqual([
+      { name: 'Renamed member', moved: true },
+    ])
+    expect(byId.get('removedWrapper')?.membership?.removed).toEqual([
+      { name: 'Original survivor', moved: true },
+    ])
+    expect(byId.get('addedWrapper')?.membership?.added).toEqual([
+      { name: 'Renamed survivor', moved: true },
+    ])
+  })
+
   it('orders modified, added, removed and nests children under an added or removed container', () => {
     const baseBlocks = {
       keep: block('keep', { subBlocks: { code: { id: 'code', type: 'code', value: 'a' } } }),

apps/sim/app/workspace/[workspaceId]/w/components/workflow-diff/utils.ts

@@ -375,7 +375,6 @@ export function listBlockChanges(
     target: Pick<WorkflowState, 'loops' | 'parallels'>
   }
 ): BlockChangeEntry[] {
-  const blocks = { ...baseBlocks, ...targetBlocks }
   const modified = new Map<string, BlockChangeEntry>()
   for (const block of summary.modifiedBlocks) {
     modified.set(block.id, {
@@ -395,8 +394,8 @@ export function listBlockChanges(
     if (!entry) {
       entry = {
         id,
-        type: blocks[id]?.type ?? 'unknown',
-        name: blockName(blocks, id),
+        type: targetBlocks[id]?.type ?? 'unknown',
+        name: blockName(targetBlocks, id),
         status: 'modified',
         changes: [],
         children: [],
@@ -414,8 +413,8 @@ export function listBlockChanges(
     if (before === after) continue
     const entry = ensureModified(id)
     entry.moved = {
-      ...(after ? { into: blockName(blocks, after) } : {}),
-      ...(before ? { outOf: blockName(blocks, before) } : {}),
+      ...(after ? { into: blockName(targetBlocks, after) } : {}),
+      ...(before ? { outOf: blockName(baseBlocks, before) } : {}),
     }
   }
 
@@ -430,13 +429,13 @@ export function listBlockChanges(
         .map((change) => ({ ...change, scope: 'container' as const })),
     ]
     if (container.nodesAdded.length || container.nodesRemoved.length) {
-      const row = (id: string): MembershipRow => ({
-        name: blockName(blocks, id),
+      const row = (id: string, side: Record<string, BlockState>): MembershipRow => ({
+        name: blockName(side, id),
         moved: Boolean(baseBlocks[id] && targetBlocks[id]),
       })
       entry.membership = {
-        added: container.nodesAdded.map(row),
-        removed: container.nodesRemoved.map(row),
+        added: container.nodesAdded.map((id) => row(id, targetBlocks)),
+        removed: container.nodesRemoved.map((id) => row(id, baseBlocks)),
       }
     }
   }
@@ -486,7 +485,7 @@ export function listBlockChanges(
       if (isContainerType(entry.type)) {
         const survivors = (children.get(entry.id) ?? []).filter((id) => !sameStatus.has(id))
         if (survivors.length) {
-          const rows = survivors.map((id) => ({ name: blockName(blocks, id), moved: true }))
+          const rows = survivors.map((id) => ({ name: blockName(side, id), moved: true }))
           entry.membership = {
             added: status === 'added' ? rows : [],
             removed: status === 'removed' ? rows : [],