The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(workflow): fall back to the last published version before the newest one (#26474)
Thomas Trompette631f77232171
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.tsindex e7b7c84305e..f9475b4c32c 100644--- a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts+++ b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts@@ -83,7 +83,10 @@ export const useWorkflowWithCurrentVersion = (.sort((a, b) => (a.createdAt > b.createdAt ? -1 : 1));const currentVersionId = isWorkflowCoreIndexPageEnabled- ? getWorkflowCurrentVersion(workflowVersions)?.id+ ? getWorkflowCurrentVersion({+ versions: workflowVersions,+ lastPublishedVersionId: coreWorkflow?.lastPublishedVersionId,+ })?.id: (effectiveDraftId ?? workflowVersions[0]?.id);const { record: workspaceCurrentVersion } = useFindOneRecord<WorkflowVersion>(diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowCurrentVersion.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowCurrentVersion.test.tsindex 8592ba608a1..a011c3cb1ff 100644--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowCurrentVersion.test.ts+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowCurrentVersion.test.ts@@ -7,7 +7,7 @@ const buildVersion = (status: string, createdAt: string) => ({});describe('getWorkflowCurrentVersion', () => {- it('prefers a draft, then an active version, then the newest version', () => {+ it('prefers a draft, then an active version, over the last published version', () => {const deactivatedVersion = buildVersion('DEACTIVATED','2026-09-18T12:00:00.000Z',@@ -16,17 +16,58 @@ describe('getWorkflowCurrentVersion', () => {const draftVersion = buildVersion('DRAFT', '2026-09-18T10:00:00.000Z');expect(- getWorkflowCurrentVersion([- draftVersion,- activeVersion,- deactivatedVersion,- ]),+ getWorkflowCurrentVersion({+ versions: [draftVersion, activeVersion, deactivatedVersion],+ lastPublishedVersionId: activeVersion.id,+ }),).toEqual(draftVersion);expect(- getWorkflowCurrentVersion([activeVersion, deactivatedVersion]),+ getWorkflowCurrentVersion({+ versions: [activeVersion, deactivatedVersion],+ lastPublishedVersionId: deactivatedVersion.id,+ }),).toEqual(activeVersion);- expect(getWorkflowCurrentVersion([deactivatedVersion])).toEqual(- deactivatedVersion,+ expect(+ getWorkflowCurrentVersion({+ versions: [deactivatedVersion],+ lastPublishedVersionId: null,+ }),+ ).toEqual(deactivatedVersion);+ });++ it('prefers the last published version when versions share the same createdAt', () => {+ const deactivatedVersion = buildVersion(+ 'DEACTIVATED',+ '2026-07-17T10:00:00.000Z',+ );+ const archivedVersion = buildVersion(+ 'ARCHIVED',+ '2026-07-17T10:00:00.000Z',+ );++ expect(+ getWorkflowCurrentVersion({+ versions: [archivedVersion, deactivatedVersion],+ lastPublishedVersionId: deactivatedVersion.id,+ }),+ ).toEqual(deactivatedVersion);+ });++ it('falls back to the newest version when the last published version is unknown', () => {+ const olderArchivedVersion = buildVersion(+ 'ARCHIVED',+ '2026-09-18T10:00:00.000Z',);+ const newerArchivedVersion = buildVersion(+ 'ARCHIVED',+ '2026-09-18T11:00:00.000Z',+ );++ expect(+ getWorkflowCurrentVersion({+ versions: [olderArchivedVersion, newerArchivedVersion],+ lastPublishedVersionId: 'missing-version-id',+ }),+ ).toEqual(newerArchivedVersion);});});diff --git a/packages/twenty-front/src/modules/workflow/utils/getWorkflowCurrentVersion.ts b/packages/twenty-front/src/modules/workflow/utils/getWorkflowCurrentVersion.tsindex 3f70960aa55..4ed9b712961 100644--- a/packages/twenty-front/src/modules/workflow/utils/getWorkflowCurrentVersion.ts+++ b/packages/twenty-front/src/modules/workflow/utils/getWorkflowCurrentVersion.ts@@ -1,13 +1,18 @@type WorkflowVersionForCurrentSelection = {+ id: string;createdAt: string;status: string;};export const getWorkflowCurrentVersion = <TWorkflowVersion extends WorkflowVersionForCurrentSelection,->(- versions: TWorkflowVersion[],-): TWorkflowVersion | undefined => {+>({+ versions,+ lastPublishedVersionId,+}: {+ versions: TWorkflowVersion[];+ lastPublishedVersionId: string | null | undefined;+}): TWorkflowVersion | undefined => {const versionsByRecency = versions.toSorted((firstVersion, secondVersion) =>secondVersion.createdAt.localeCompare(firstVersion.createdAt),);@@ -15,6 +20,7 @@ export const getWorkflowCurrentVersion = <return (versionsByRecency.find(({ status }) => status === 'DRAFT') ??versionsByRecency.find(({ status }) => status === 'ACTIVE') ??+ versionsByRecency.find(({ id }) => id === lastPublishedVersionId) ??versionsByRecency[0]);};diff --git a/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx b/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsxindex 753c45334ce..2b4db6b6441 100644--- a/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx+++ b/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx@@ -71,9 +71,10 @@ const CoreWorkflowShowContent = ({const [searchParams, setSearchParams] = useSearchParams();const [editedName, setEditedName] = useState<string>();const requestedVersionId = searchParams.get('version');- const currentVersion = getWorkflowCurrentVersion(- versions.coreWorkflowVersions,- );+ const currentVersion = getWorkflowCurrentVersion({+ versions: versions.coreWorkflowVersions,+ lastPublishedVersionId: coreWorkflow?.lastPublishedCoreWorkflowVersionId,+ });const selectedVersion = isDefined(requestedVersionId)? versions.coreWorkflowVersions.find(({ id }) => id === requestedVersionId): currentVersion;diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-list.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-list.service.tsindex 319bb1f6e71..2f527fc4b09 100644--- a/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-list.service.ts+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-list.service.ts@@ -24,6 +24,7 @@ import { canChangeCoreWorkflowVisibility } from 'src/engine/core-modules/workfloimport { canChangeCoreWorkflowVisibilitySelectExpression } from 'src/engine/core-modules/workflow/utils/can-change-core-workflow-visibility-select-expression.util';import { buildCoreWorkflowVersionLabel } from 'src/engine/core-modules/workflow/utils/build-core-workflow-version-label.util';import { computeCoreWorkflowStatuses } from 'src/engine/core-modules/workflow/utils/compute-core-workflow-statuses.util';+import { getCoreWorkflowCurrentVersion } from 'src/engine/core-modules/workflow/utils/get-core-workflow-current-version.util';import { WorkflowEntity } from 'src/engine/core-modules/workflow/entities/workflow.entity';import {WorkflowVersionEntity,@@ -184,15 +185,11 @@ export class CoreWorkflowListService {coreWorkflowId,versionsInCreationOrder,] of versionsByWorkflowId) {- const versions = [...versionsInCreationOrder].reverse();- const currentVersion =- versions.find(- (version) => version.status === WorkflowVersionStatus.DRAFT,- ) ??- versions.find(- (version) => version.status === WorkflowVersionStatus.ACTIVE,- ) ??- versions[0];+ const currentVersion = getCoreWorkflowCurrentVersion({+ versionsByRecency: [...versionsInCreationOrder].reverse(),+ lastPublishedCoreWorkflowVersionId:+ workflowById.get(coreWorkflowId)?.lastPublishedCoreWorkflowVersionId,+ });if (isDefined(currentVersion)) {currentVersionIdByWorkflowId.set(coreWorkflowId, currentVersion.id);diff --git a/packages/twenty-server/src/engine/core-modules/workflow/utils/__tests__/get-core-workflow-current-version.util.spec.ts b/packages/twenty-server/src/engine/core-modules/workflow/utils/__tests__/get-core-workflow-current-version.util.spec.tsnew file mode 100644index 00000000000..f4fc8e9e065--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/workflow/utils/__tests__/get-core-workflow-current-version.util.spec.ts@@ -0,0 +1,67 @@+import { WorkflowVersionStatus } from 'src/engine/core-modules/workflow/entities/workflow-version.entity';+import { getCoreWorkflowCurrentVersion } from 'src/engine/core-modules/workflow/utils/get-core-workflow-current-version.util';++const buildVersion = (id: string, status: WorkflowVersionStatus) => ({+ id,+ status,+});++describe('getCoreWorkflowCurrentVersion', () => {+ it('should prefer a draft, then an active version, over the last published version', () => {+ const draftVersion = buildVersion('draft', WorkflowVersionStatus.DRAFT);+ const activeVersion = buildVersion('active', WorkflowVersionStatus.ACTIVE);+ const deactivatedVersion = buildVersion(+ 'deactivated',+ WorkflowVersionStatus.DEACTIVATED,+ );++ expect(+ getCoreWorkflowCurrentVersion({+ versionsByRecency: [deactivatedVersion, activeVersion, draftVersion],+ lastPublishedCoreWorkflowVersionId: deactivatedVersion.id,+ }),+ ).toEqual(draftVersion);+ expect(+ getCoreWorkflowCurrentVersion({+ versionsByRecency: [deactivatedVersion, activeVersion],+ lastPublishedCoreWorkflowVersionId: deactivatedVersion.id,+ }),+ ).toEqual(activeVersion);+ });++ it('should prefer the last published version over a newer archived version', () => {+ const archivedVersion = buildVersion(+ 'archived',+ WorkflowVersionStatus.ARCHIVED,+ );+ const deactivatedVersion = buildVersion(+ 'deactivated',+ WorkflowVersionStatus.DEACTIVATED,+ );++ expect(+ getCoreWorkflowCurrentVersion({+ versionsByRecency: [archivedVersion, deactivatedVersion],+ lastPublishedCoreWorkflowVersionId: deactivatedVersion.id,+ }),+ ).toEqual(deactivatedVersion);+ });++ it('should fall back to the newest version when the last published version is unknown', () => {+ const newerArchivedVersion = buildVersion(+ 'newer-archived',+ WorkflowVersionStatus.ARCHIVED,+ );+ const olderArchivedVersion = buildVersion(+ 'older-archived',+ WorkflowVersionStatus.ARCHIVED,+ );++ expect(+ getCoreWorkflowCurrentVersion({+ versionsByRecency: [newerArchivedVersion, olderArchivedVersion],+ lastPublishedCoreWorkflowVersionId: null,+ }),+ ).toEqual(newerArchivedVersion);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/workflow/utils/get-core-workflow-current-version.util.ts b/packages/twenty-server/src/engine/core-modules/workflow/utils/get-core-workflow-current-version.util.tsnew file mode 100644index 00000000000..2138d795734--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/workflow/utils/get-core-workflow-current-version.util.ts@@ -0,0 +1,21 @@+import { WorkflowVersionStatus } from 'src/engine/core-modules/workflow/entities/workflow-version.entity';++export const getCoreWorkflowCurrentVersion = <+ TCoreWorkflowVersion extends { id: string; status: WorkflowVersionStatus },+>({+ versionsByRecency,+ lastPublishedCoreWorkflowVersionId,+}: {+ versionsByRecency: TCoreWorkflowVersion[];+ lastPublishedCoreWorkflowVersionId: string | null | undefined;+}): TCoreWorkflowVersion | undefined =>+ versionsByRecency.find(+ ({ status }) => status === WorkflowVersionStatus.DRAFT,+ ) ??+ versionsByRecency.find(+ ({ status }) => status === WorkflowVersionStatus.ACTIVE,+ ) ??+ versionsByRecency.find(+ ({ id }) => id === lastPublishedCoreWorkflowVersionId,+ ) ??+ versionsByRecency[0];