fix(workflows): compare against previous saved version by default

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/compare-pair.test.ts

@@ -5,22 +5,25 @@ import { describe, expect, it } from 'vitest'
 import { resolveComparePair } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/compare-pair'
 
 describe('resolveComparePair', () => {
-  it('puts the older version on the base side whichever was clicked', () => {
-    const expected = {
-      base: { kind: 'version', version: 3 },
-      target: { kind: 'version', version: 5 },
-    }
-    expect(resolveComparePair(5, 3)).toEqual(expected)
-    expect(resolveComparePair(3, 5)).toEqual(expected)
+  it('compares the closest previous saved version to the selected version despite gaps or ordering', () => {
+    const versions = [{ version: 9 }, { version: 2 }, { version: 7 }, { version: 5 }]
+    expect(resolveComparePair(7, versions)).toEqual({
+      base: { kind: 'version', version: 5 },
+      target: { kind: 'version', version: 7 },
+    })
+    expect(resolveComparePair(9, versions)).toEqual({
+      base: { kind: 'version', version: 7 },
+      target: { kind: 'version', version: 9 },
+    })
   })
 
-  it('compares the live version, or any version with nothing live, against the draft', () => {
-    expect(resolveComparePair(3, 3)).toEqual({
-      base: { kind: 'version', version: 3 },
+  it('compares the earliest available version to draft when it has no predecessor', () => {
+    expect(resolveComparePair(1, [{ version: 2 }, { version: 1 }])).toEqual({
+      base: { kind: 'version', version: 1 },
       target: { kind: 'draft' },
     })
-    expect(resolveComparePair(2, null)).toEqual({
-      base: { kind: 'version', version: 2 },
+    expect(resolveComparePair(4, [{ version: 4 }])).toEqual({
+      base: { kind: 'version', version: 4 },
       target: { kind: 'draft' },
     })
   })

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/compare-pair.ts

@@ -5,16 +5,26 @@ export interface ComparePair {
   target: CompareSide
 }
 
-/**
- * Which two sides a "Compare" on a version opens: the older version on the
- * left and the newer on the right, except that the live version (or any
- * version when nothing is live) compares against the draft, since that is
- * what a redeploy would ship.
- */
-export function resolveComparePair(version: number, activeVersion: number | null): ComparePair {
-  if (activeVersion === null || activeVersion === version) {
+/** Compares against the previous saved version, or the draft when no predecessor exists. */
+export function resolveComparePair(
+  version: number,
+  versions: readonly { version: number }[]
+): ComparePair {
+  let previousVersion: number | null = null
+  for (const candidate of versions) {
+    if (
+      candidate.version < version &&
+      (previousVersion === null || candidate.version > previousVersion)
+    ) {
+      previousVersion = candidate.version
+    }
+  }
+
+  if (previousVersion === null) {
     return { base: { kind: 'version', version }, target: { kind: 'draft' } }
   }
-  const [low, high] = version < activeVersion ? [version, activeVersion] : [activeVersion, version]
-  return { base: { kind: 'version', version: low }, target: { kind: 'version', version: high } }
+  return {
+    base: { kind: 'version', version: previousVersion },
+    target: { kind: 'version', version },
+  }
 }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/general.tsx

@@ -88,11 +88,8 @@ export function GeneralDeploy({
     workflowId: string
     version: number
   } | null>(null)
-  const activeVersion = versions.find((v) => v.isActive)?.version ?? null
-
-  /** See resolveComparePair for which two sides a version opens against. */
   const handleCompareVersion = (version: number) => {
-    setComparePair(resolveComparePair(version, activeVersion))
+    setComparePair(resolveComparePair(version, versions))
   }
 
   const selectedVersionInfo = versions.find((v) => v.version === selectedVersion)