The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(workflow): point core workflows and command menu items at core version ids (#25757)
Thomas Trompette8db05da2b243
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 222f47c2f87..f965483323d 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -4769,6 +4769,7 @@ input UpdateLogicFunctionFromSourceInputUpdates {input CreateCommandMenuItemInput {workflowVersionId: UUID+ coreWorkflowVersionId: UUIDfrontComponentId: UUIDengineComponentKey: EngineComponentKey!label: String!diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex fa36c2be56a..3b823c8852f 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -7525,7 +7525,7 @@ update: UpdateLogicFunctionFromSourceInputUpdates}export interface UpdateLogicFunctionFromSourceInputUpdates {name?: (Scalars['String'] | null),description?: (Scalars['String'] | null),timeoutSeconds?: (Scalars['Float'] | null),sourceHandlerCode?: (Scalars['String'] | null),handlerName?: (Scalars['String'] | null),sourceHandlerPath?: (Scalars['String'] | null),cronTriggerSettings?: (Scalars['JSON'] | null),databaseEventTriggerSettings?: (Scalars['JSON'] | null),httpRouteTriggerSettings?: (Scalars['JSON'] | null),toolTriggerSettings?: (Scalars['JSON'] | null),workflowActionTriggerSettings?: (Scalars['JSON'] | null)}-export interface CreateCommandMenuItemInput {workflowVersionId?: (Scalars['UUID'] | null),frontComponentId?: (Scalars['UUID'] | null),engineComponentKey: EngineComponentKey,label: Scalars['String'],icon?: (Scalars['String'] | null),shortLabel?: (Scalars['String'] | null),position?: (Scalars['Float'] | null),isPinned?: (Scalars['Boolean'] | null),availabilityType?: (CommandMenuItemAvailabilityType | null),hotKeys?: (Scalars['String'][] | null),conditionalAvailabilityExpression?: (Scalars['String'] | null),conditionalPinnedExpression?: (Scalars['String'] | null),availabilityObjectMetadataId?: (Scalars['UUID'] | null),payload?: (Scalars['JSON'] | null),navigationTargetObjectMetadataId?: (Scalars['UUID'] | null),pageLayoutId?: (Scalars['UUID'] | null)}+export interface CreateCommandMenuItemInput {workflowVersionId?: (Scalars['UUID'] | null),coreWorkflowVersionId?: (Scalars['UUID'] | null),frontComponentId?: (Scalars['UUID'] | null),engineComponentKey: EngineComponentKey,label: Scalars['String'],icon?: (Scalars['String'] | null),shortLabel?: (Scalars['String'] | null),position?: (Scalars['Float'] | null),isPinned?: (Scalars['Boolean'] | null),availabilityType?: (CommandMenuItemAvailabilityType | null),hotKeys?: (Scalars['String'][] | null),conditionalAvailabilityExpression?: (Scalars['String'] | null),conditionalPinnedExpression?: (Scalars['String'] | null),availabilityObjectMetadataId?: (Scalars['UUID'] | null),payload?: (Scalars['JSON'] | null),navigationTargetObjectMetadataId?: (Scalars['UUID'] | null),pageLayoutId?: (Scalars['UUID'] | null)}export interface UpdateCommandMenuItemInput {id: Scalars['UUID'],label?: (Scalars['String'] | null),icon?: (Scalars['String'] | null),shortLabel?: (Scalars['String'] | null),position?: (Scalars['Float'] | null),isPinned?: (Scalars['Boolean'] | null),availabilityType?: (CommandMenuItemAvailabilityType | null),availabilityObjectMetadataId?: (Scalars['UUID'] | null),engineComponentKey?: (EngineComponentKey | null),hotKeys?: (Scalars['String'][] | null),pageLayoutId?: (Scalars['UUID'] | null)}diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex ac09542fe09..a3dfbd0a430 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -12169,6 +12169,9 @@ export default {"workflowVersionId": [3],+ "coreWorkflowVersionId": [+ 3+ ],"frontComponentId": [3],diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 912eaf66b7f..98e09e8c29d 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -1285,6 +1285,7 @@ export type CreateCommandMenuItemInput = {availabilityType?: InputMaybe<CommandMenuItemAvailabilityType>;conditionalAvailabilityExpression?: InputMaybe<Scalars['String']['input']>;conditionalPinnedExpression?: InputMaybe<Scalars['String']['input']>;+ coreWorkflowVersionId?: InputMaybe<Scalars['UUID']['input']>;engineComponentKey: EngineComponentKey;frontComponentId?: InputMaybe<Scalars['UUID']['input']>;hotKeys?: InputMaybe<Array<Scalars['String']['input']>>;diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500013000-refactor-navigation-commands.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500013000-refactor-navigation-commands.command.tsindex d8bd59a398f..a60a300af6a 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500013000-refactor-navigation-commands.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500013000-refactor-navigation-commands.command.ts@@ -237,6 +237,7 @@ export class RefactorNavigationCommandsCommand extends ProvisionedWorkspaceCommapayload: { ...commandMenuItem.payload },hotKeys: commandMenuItem.hotKeys ? [...commandMenuItem.hotKeys] : null,workflowVersionId: null,+ coreWorkflowVersionId: null,availabilityObjectMetadataId: null,availabilityObjectMetadataUniversalIdentifier: null,navigationTargetObjectMetadataId: null,diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/utils/__tests__/build-sync-discard-draft-workflow-availability-expression-sync-operations.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/utils/__tests__/build-sync-discard-draft-workflow-availability-expression-sync-operations.util.spec.tsindex 247b7e1e82f..ac72aaafcc3 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/utils/__tests__/build-sync-discard-draft-workflow-availability-expression-sync-operations.util.spec.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/utils/__tests__/build-sync-discard-draft-workflow-availability-expression-sync-operations.util.spec.ts@@ -67,6 +67,7 @@ const buildDiscardDraftWorkflowCommandMenuItem = ({payload: null,hotKeys: null,workflowVersionId: null,+ coreWorkflowVersionId: null,availabilityObjectMetadataId: 'workflow-object-metadata-id',availabilityObjectMetadataUniversalIdentifier:DISCARD_DRAFT_WORKFLOW_DEFINITION.availabilityObjectMetadataUniversalIdentifier,diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-instance-command-fast-1789370101008-add-core-version-pointers.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-instance-command-fast-1789370101008-add-core-version-pointers.tsnew file mode 100644index 00000000000..978a702a8c8--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-instance-command-fast-1789370101008-add-core-version-pointers.ts@@ -0,0 +1,25 @@+import { type QueryRunner } from 'typeorm';++import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';+import { type FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';++@RegisteredInstanceCommand('2.41.0', 1789370101008)+export class AddCoreVersionPointersFastInstanceCommand implements FastInstanceCommand {+ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ `ALTER TABLE "core"."workflow" ADD COLUMN IF NOT EXISTS "lastPublishedCoreWorkflowVersionId" uuid`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."commandMenuItem" ADD COLUMN IF NOT EXISTS "coreWorkflowVersionId" uuid`,+ );+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ `ALTER TABLE "core"."commandMenuItem" DROP COLUMN IF EXISTS "coreWorkflowVersionId"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."workflow" DROP COLUMN IF EXISTS "lastPublishedCoreWorkflowVersionId"`,+ );+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.tsindex aea7ce7a7e9..a78005f6141 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts@@ -4,20 +4,24 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';import { CorrectStandardFieldAcronymCasingCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789331219041-correct-standard-field-acronym-casing.command';import { BackfillWorkspaceWorkflowIdOnWorkflowsCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789350000002-backfill-workspace-workflow-id-on-workflows.command';+import { BackfillCoreVersionPointersCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789370101009-backfill-core-version-pointers.command';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@Module({imports: [TypeOrmModule.forFeature([FieldMetadataEntity]),ApplicationModule,+ WorkspaceCacheModule,WorkspaceIteratorModule,WorkspaceMigrationRunnerModule,],providers: [CorrectStandardFieldAcronymCasingCommand,BackfillWorkspaceWorkflowIdOnWorkflowsCommand,+ BackfillCoreVersionPointersCommand,],})export class V2_41_UpgradeVersionCommandModule {}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789370101009-backfill-core-version-pointers.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789370101009-backfill-core-version-pointers.command.tsnew file mode 100644index 00000000000..5b72690ae6b--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789370101009-backfill-core-version-pointers.command.ts@@ -0,0 +1,194 @@+import { Command } from 'nest-commander';+import { isDefined } from 'twenty-shared/utils';+import { type QueryRunner } from 'typeorm';++import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';++@RegisteredWorkspaceCommand('2.41.0', 1789370101009)+@Command({+ name: 'upgrade:2-41:backfill-core-version-pointers',+ description:+ 'Backfill lastPublishedCoreWorkflowVersionId on core workflows and coreWorkflowVersionId on core command menu items',+})+export class BackfillCoreVersionPointersCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace({+ workspaceId,+ options,+ dataSource,+ }: RunOnWorkspaceArgs): Promise<void> {+ if (!isDefined(dataSource)) {+ this.logger.warn(+ `No data source for workspace ${workspaceId}, skipping backfill`,+ );++ return;+ }++ const schema = getWorkspaceSchemaName(workspaceId);++ const queryRunner = dataSource.createQueryRunner();++ await queryRunner.connect();++ try {+ if (!(await this.hasCoreWorkflowVersionIdColumn(queryRunner, schema))) {+ this.logger.warn(+ `workflowVersion.coreWorkflowVersionId missing for workspace ${workspaceId}, skipping backfill`,+ );++ return;+ }++ await this.backfillWorkflows({+ queryRunner,+ schema,+ workspaceId,+ dryRun: options.dryRun ?? false,+ });++ await this.backfillCommandMenuItems({+ queryRunner,+ schema,+ workspaceId,+ dryRun: options.dryRun ?? false,+ });++ if (!options.dryRun) {+ await this.workspaceCacheService.flush(workspaceId, [+ 'flatCommandMenuItemMaps',+ ]);+ }+ } finally {+ await queryRunner.release();+ }+ }++ private async backfillWorkflows({+ queryRunner,+ schema,+ workspaceId,+ dryRun,+ }: {+ queryRunner: QueryRunner;+ schema: string;+ workspaceId: string;+ dryRun: boolean;+ }): Promise<void> {+ const versionsTable = `"${schema}"."workflowVersion" wv`;+ const predicate = `+ WHERE cw."workspaceId" = $1+ AND cw."lastPublishedCoreWorkflowVersionId" IS NULL+ AND wv.id = cw."lastPublishedVersionId"+ AND wv."coreWorkflowVersionId" IS NOT NULL`;++ const [counts] = await queryRunner.query(+ `SELECT count(*)::int AS total+ FROM core."workflow" cw, ${versionsTable}+ ${predicate}`,+ [workspaceId],+ );++ if (counts.total === 0) {+ return;+ }++ if (dryRun) {+ this.logger.log(+ `[DRY RUN] Would backfill lastPublishedCoreWorkflowVersionId on ${counts.total} core workflow row(s) for workspace ${workspaceId}`,+ );++ return;+ }++ await queryRunner.query(+ `UPDATE core."workflow" cw+ SET "lastPublishedCoreWorkflowVersionId" = wv."coreWorkflowVersionId"+ FROM ${versionsTable}+ ${predicate}`,+ [workspaceId],+ );++ this.logger.log(+ `Backfilled lastPublishedCoreWorkflowVersionId on ${counts.total} core workflow row(s) for workspace ${workspaceId}`,+ );+ }++ private async backfillCommandMenuItems({+ queryRunner,+ schema,+ workspaceId,+ dryRun,+ }: {+ queryRunner: QueryRunner;+ schema: string;+ workspaceId: string;+ dryRun: boolean;+ }): Promise<void> {+ const versionsTable = `"${schema}"."workflowVersion" wv`;+ const predicate = `+ WHERE cmi."workspaceId" = $1+ AND cmi."coreWorkflowVersionId" IS NULL+ AND wv.id = cmi."workflowVersionId"+ AND wv."coreWorkflowVersionId" IS NOT NULL`;++ const [counts] = await queryRunner.query(+ `SELECT count(*)::int AS total+ FROM core."commandMenuItem" cmi, ${versionsTable}+ ${predicate}`,+ [workspaceId],+ );++ if (counts.total === 0) {+ return;+ }++ if (dryRun) {+ this.logger.log(+ `[DRY RUN] Would backfill coreWorkflowVersionId on ${counts.total} core command menu item row(s) for workspace ${workspaceId}`,+ );++ return;+ }++ await queryRunner.query(+ `UPDATE core."commandMenuItem" cmi+ SET "coreWorkflowVersionId" = wv."coreWorkflowVersionId"+ FROM ${versionsTable}+ ${predicate}`,+ [workspaceId],+ );++ this.logger.log(+ `Backfilled coreWorkflowVersionId on ${counts.total} core command menu item row(s) for workspace ${workspaceId}`,+ );+ }++ private async hasCoreWorkflowVersionIdColumn(+ queryRunner: QueryRunner,+ schema: string,+ ): Promise<boolean> {+ const rows = await queryRunner.query(+ `SELECT 1+ FROM information_schema.columns+ WHERE table_schema = $1+ AND table_name = 'workflowVersion'+ AND column_name = 'coreWorkflowVersionId'+ LIMIT 1`,+ [schema],+ );++ return rows.length > 0;+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/__tests__/2-41-workspace-command-1789370101009-backfill-core-version-pointers.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/__tests__/2-41-workspace-command-1789370101009-backfill-core-version-pointers.command.spec.tsnew file mode 100644index 00000000000..b2ea2323ddd--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/__tests__/2-41-workspace-command-1789370101009-backfill-core-version-pointers.command.spec.ts@@ -0,0 +1,182 @@+import { type DataSource } from 'typeorm';++import { type WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { BackfillCoreVersionPointersCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789370101009-backfill-core-version-pointers.command';++const WORKSPACE_ID = '20202020-0000-0000-0000-000000000001';++const isUpdate = (sql: unknown) =>+ typeof sql === 'string' && sql.trimStart().startsWith('UPDATE');++const updatedTable = (sql: string) =>+ sql.includes('core."workflow" cw') ? 'workflow' : 'commandMenuItem';++const setup = ({+ workflowTotal = 0,+ commandMenuItemTotal = 0,+ hasCoreWorkflowVersionIdColumn = true,+}: {+ workflowTotal?: number;+ commandMenuItemTotal?: number;+ hasCoreWorkflowVersionIdColumn?: boolean;+} = {}) => {+ const query = jest.fn(async (...args: unknown[]) => {+ const sql = args[0] as string;++ if (sql.includes('information_schema.columns')) {+ return hasCoreWorkflowVersionIdColumn ? [{ '?column?': 1 }] : [];+ }+ if (sql.includes('count(*)')) {+ return [+ {+ total: sql.includes('core."workflow" cw')+ ? workflowTotal+ : commandMenuItemTotal,+ },+ ];+ }++ return [];+ });++ const queryRunner = {+ connect: jest.fn(),+ release: jest.fn(),+ query,+ };++ const dataSource = {+ createQueryRunner: () => queryRunner,+ } as unknown as DataSource;++ const flush = jest.fn();++ const command = new BackfillCoreVersionPointersCommand(+ {} as WorkspaceIteratorService,+ { flush } as unknown as WorkspaceCacheService,+ );++ const run = (dryRun = false) =>+ command.runOnWorkspace({+ workspaceId: WORKSPACE_ID,+ dataSource,+ options: { dryRun },+ index: 0,+ total: 1,+ });++ return { run, query, queryRunner, flush };+};++describe('BackfillCoreVersionPointersCommand', () => {+ beforeEach(() => jest.clearAllMocks());++ it('builds single-FROM statements', async () => {+ const { run, query } = setup({+ workflowTotal: 2,+ commandMenuItemTotal: 3,+ });++ await run();++ const statements = query.mock.calls+ .map((call) => String(call[0]))+ .filter((sql) => !sql.includes('information_schema.columns'));++ expect(statements).not.toHaveLength(0);++ for (const sql of statements) {+ expect(sql.match(/\bFROM\b/g)).toHaveLength(1);+ }+ });++ it('updates both tables when both have rows left to fill', async () => {+ const { run, query, queryRunner, flush } = setup({+ workflowTotal: 2,+ commandMenuItemTotal: 3,+ });++ await run();++ const updated = query.mock.calls+ .filter((call) => isUpdate(call[0]))+ .map((call) => updatedTable(String(call[0])));++ expect(updated).toEqual(['workflow', 'commandMenuItem']);+ expect(queryRunner.release).toHaveBeenCalledTimes(1);+ expect(flush).toHaveBeenCalledTimes(1);+ expect(flush).toHaveBeenCalledWith(WORKSPACE_ID, [+ 'flatCommandMenuItemMaps',+ ]);+ });++ it('updates only the table that has rows left to fill', async () => {+ const { run, query } = setup({+ workflowTotal: 0,+ commandMenuItemTotal: 3,+ });++ await run();++ const updated = query.mock.calls+ .filter((call) => isUpdate(call[0]))+ .map((call) => updatedTable(String(call[0])));++ expect(updated).toEqual(['commandMenuItem']);+ });++ it('skips a workspace whose workflowVersion table has no coreWorkflowVersionId column', async () => {+ const { run, query, queryRunner } = setup({+ workflowTotal: 2,+ commandMenuItemTotal: 3,+ hasCoreWorkflowVersionIdColumn: false,+ });++ await run();++ expect(query).toHaveBeenCalledTimes(1);+ expect(queryRunner.release).toHaveBeenCalledTimes(1);+ });++ it('does not update on a dry run', async () => {+ const { run, query, flush } = setup({+ workflowTotal: 2,+ commandMenuItemTotal: 3,+ });++ await run(true);++ expect(query.mock.calls.some((call) => isUpdate(call[0]))).toBe(false);+ expect(flush).not.toHaveBeenCalled();+ });++ it('is a no-op when nothing is left to fill', async () => {+ const { run, query } = setup();++ await run();++ expect(query.mock.calls.some((call) => isUpdate(call[0]))).toBe(false);+ });++ it('releases the query runner when an update throws', async () => {+ const { run, queryRunner, query } = setup({ workflowTotal: 2 });++ query.mockImplementation(async (...args: unknown[]) => {+ const sql = args[0] as string;++ if (sql.includes('information_schema.columns')) {+ return [{ '?column?': 1 }];+ }+ if (sql.includes('count(*)')) {+ return [{ total: 2 }];+ }++ throw new Error('update failed');+ });++ await expect(run()).rejects.toThrow('update failed');++ expect(queryRunner.release).toHaveBeenCalledTimes(1);+ });+});diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/add-core-version-pointers-upgrade-command-name.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/add-core-version-pointers-upgrade-command-name.constant.tsnew file mode 100644index 00000000000..ac2ad344f17--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/add-core-version-pointers-upgrade-command-name.constant.ts@@ -0,0 +1,2 @@+export const ADD_CORE_VERSION_POINTERS_UPGRADE_COMMAND_NAME =+ '2.41.0_AddCoreVersionPointersFastInstanceCommand_1789370101008';diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.tsindex a9d5f9ca215..721572f7ed4 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts@@ -189,6 +189,7 @@ import { MigrateWorkspaceModelsToTiersSlowInstanceCommand } from 'src/database/cimport { AddIsSystemToSkillFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-40/2-40-instance-command-fast-1789129759228-add-is-system-to-skill';import { MigrateCanvasTabsToVerticalListSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-40/2-40-instance-command-slow-1789139070588-migrate-canvas-tabs-to-vertical-list';import { AddWorkspaceWorkflowIdToWorkflowFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-instance-command-fast-1789350000001-add-workspace-workflow-id-to-workflow';+import { AddCoreVersionPointersFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-instance-command-fast-1789370101008-add-core-version-pointers';export const INSTANCE_COMMANDS = [AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,@@ -380,4 +381,5 @@ export const INSTANCE_COMMANDS = [AddIsSystemToSkillFastInstanceCommand,MigrateCanvasTabsToVerticalListSlowInstanceCommand,AddWorkspaceWorkflowIdToWorkflowFastInstanceCommand,+ AddCoreVersionPointersFastInstanceCommand,];diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util.tsindex d5de0ba6388..eda05c01020 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util.ts@@ -72,6 +72,7 @@ export const buildLegacyNavigationFlatCommandMenuItem = ({? ['G', objectMetadata.shortcut]: null,workflowVersionId: null,+ coreWorkflowVersionId: null,availabilityObjectMetadataId: null,availabilityObjectMetadataUniversalIdentifier: null,pageLayoutId: null,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-command-menu-item-manifest-to-universal-flat-command-menu-item.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-command-menu-item-manifest-to-universal-flat-command-menu-item.util.tsindex e54db157f3f..68a179ea759 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-command-menu-item-manifest-to-universal-flat-command-menu-item.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-command-menu-item-manifest-to-universal-flat-command-menu-item.util.ts@@ -36,6 +36,7 @@ export const fromCommandMenuItemManifestToUniversalFlatCommandMenuItem = ({payload: null,hotKeys: null,workflowVersionId: null,+ coreWorkflowVersionId: null,pageLayoutUniversalIdentifier: null,isActive: true,isSystemSideEffect: false,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.tsindex 0699bee7140..f3390324429 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts@@ -70,6 +70,7 @@ const COMMAND_MENU_ITEM: FlatCommandMenuItem = {id: 'command-menu-item-id',universalIdentifier: 'command-menu-item-universal-identifier',workflowVersionId: null,+ coreWorkflowVersionId: null,frontComponentId: null,frontComponentUniversalIdentifier: null,engineComponentKey: EngineComponentKey.NAVIGATION,diff --git a/packages/twenty-server/src/engine/core-modules/workflow/entities/workflow.entity.ts b/packages/twenty-server/src/engine/core-modules/workflow/entities/workflow.entity.tsindex e93b160789a..05c7788b9f6 100644--- a/packages/twenty-server/src/engine/core-modules/workflow/entities/workflow.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/workflow/entities/workflow.entity.ts@@ -9,6 +9,7 @@ import {import { CREATE_WORKFLOW_CORE_TABLE_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-20/create-workflow-core-table-upgrade-command-name.constant';import { ADD_WORKSPACE_WORKFLOW_ID_TO_WORKFLOW_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-41/add-workspace-workflow-id-to-workflow-upgrade-command-name.constant';+import { ADD_CORE_VERSION_POINTERS_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-41/add-core-version-pointers-upgrade-command-name.constant';import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';@@ -35,6 +36,12 @@ export class WorkflowEntity extends SyncableEntity {@Column({ type: 'uuid', nullable: true })workspaceWorkflowId: string | null;+ @WasIntroducedInUpgrade({+ upgradeCommandName: ADD_CORE_VERSION_POINTERS_UPGRADE_COMMAND_NAME,+ })+ @Column({ type: 'uuid', nullable: true })+ lastPublishedCoreWorkflowVersionId: string | null;+@CreateDateColumn({ type: 'timestamptz' })createdAt: Date;diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.tsindex 04de54bc6ec..492c4ebb8bd 100644--- a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts@@ -14,6 +14,7 @@ import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspaceimport { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { type WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';import { type WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow.workspace-entity';@Injectable()@@ -49,6 +50,12 @@ export class WorkflowCoreSyncService {liveWorkflows,);+ const coreVersionIdByWorkspaceVersionId =+ await this.resolveCoreVersionIdByWorkspaceVersionId(+ workspaceId,+ liveWorkflows,+ );+const coreWorkflowIdByWorkspaceRecordId = new Map<string, string>();const coreRows = liveWorkflows.map((workflow) => {@@ -81,6 +88,13 @@ export class WorkflowCoreSyncService {)? workflow.lastPublishedVersionId: null,+ lastPublishedCoreWorkflowVersionId: isNonEmptyString(+ workflow.lastPublishedVersionId,+ )+ ? (coreVersionIdByWorkspaceVersionId.get(+ workflow.lastPublishedVersionId,+ ) ?? null)+ : null,universalIdentifier: uuidv4(),applicationId,};@@ -94,6 +108,40 @@ export class WorkflowCoreSyncService {);}+ private async resolveCoreVersionIdByWorkspaceVersionId(+ workspaceId: string,+ workflows: WorkflowWorkspaceEntity[],+ ): Promise<Map<string, string>> {+ const publishedVersionIds = workflows+ .map((workflow) => workflow.lastPublishedVersionId)+ .filter(isNonEmptyString);++ if (publishedVersionIds.length === 0) {+ return new Map();+ }++ return this.workspaceOrmManager.executeInWorkspaceContext(async () => {+ const workflowVersionRepository =+ this.workspaceOrmManager.getRepository<WorkflowVersionWorkspaceEntity>(+ 'workflowVersion',+ { shouldBypassPermissionChecks: true },+ );++ const rows = await workflowVersionRepository.find({+ where: { id: In(publishedVersionIds) },+ select: { id: true, coreWorkflowVersionId: true },+ });++ return new Map(+ rows.flatMap((row) =>+ isNonEmptyString(row.coreWorkflowVersionId)+ ? [[row.id, row.coreWorkflowVersionId] as const]+ : [],+ ),+ );+ }, buildSystemAuthContext(workspaceId));+ }+// coreWorkflowId is a writable column on the workspace record, so a caller// can point it at a core row owned by another workspace.private async resolveWorkspaceWorkflowIdByOwnedCoreWorkflowId(diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/create-command-menu-item.input.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/create-command-menu-item.input.tsindex 31eaf2e999d..846833f7487 100644--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/create-command-menu-item.input.ts+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/create-command-menu-item.input.ts@@ -24,6 +24,11 @@ export class CreateCommandMenuItemInput {@Field(() => UUIDScalarType, { nullable: true })workflowVersionId?: string;+ @IsUUID()+ @IsOptional()+ @Field(() => UUIDScalarType, { nullable: true })+ coreWorkflowVersionId?: string;+@IsUUID()@IsOptional()@Field(() => UUIDScalarType, { nullable: true })diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.tsindex 33153912fc4..005a9e139ef 100644--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts@@ -18,6 +18,7 @@ import {import { ADD_IS_SYSTEM_SIDE_EFFECT_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-15/is-system-side-effect-upgrade-command-name.constant';import { ADD_COMMAND_MENU_ITEM_TARGET_OBJECT_METADATA_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-35/add-command-menu-item-target-object-metadata-upgrade-command-name.constant';import { ADD_COMMAND_MENU_ITEM_CONDITIONAL_PINNED_EXPRESSION_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-39/add-command-menu-item-conditional-pinned-expression-upgrade-command-name.constant';+import { ADD_CORE_VERSION_POINTERS_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-41/add-core-version-pointers-upgrade-command-name.constant';import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';import { type PathCommandMenuItemPayload } from 'src/engine/metadata-modules/command-menu-item/dtos/types/path-command-menu-item-payload.type';import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';@@ -73,6 +74,12 @@ export class CommandMenuItemEntity@Column({ nullable: true, type: 'uuid' })workflowVersionId: string | null;+ @WasIntroducedInUpgrade({+ upgradeCommandName: ADD_CORE_VERSION_POINTERS_UPGRADE_COMMAND_NAME,+ })+ @Column({ nullable: true, type: 'uuid' })+ coreWorkflowVersionId: string | null;+@Column({ nullable: true, type: 'uuid' })frontComponentId: string | null;diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.tsindex 04802ba9e69..4f3f770da57 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts@@ -117,6 +117,7 @@ export const buildObjectNavigationUniversalFlatCommandMenuItem = ({? ['G', objectMetadata.shortcut]: null,workflowVersionId: null,+ coreWorkflowVersionId: null,availabilityObjectMetadataUniversalIdentifier: null,pageLayoutUniversalIdentifier: null,isActive: objectMetadata.isActive,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-create-command-menu-item-input-to-flat-command-menu-item-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-create-command-menu-item-input-to-flat-command-menu-item-to-create.util.tsindex dbb46e02323..b74022aa813 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-create-command-menu-item-input-to-flat-command-menu-item-to-create.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-create-command-menu-item-input-to-flat-command-menu-item-to-create.util.ts@@ -2,13 +2,13 @@ import { isDefined } from 'twenty-shared/utils';import { v4 as uuidv4 } from 'uuid';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';-import { type CreateCommandMenuItemInput } from 'src/engine/metadata-modules/command-menu-item/dtos/create-command-menu-item.input';import { CommandMenuItemAvailabilityType } from 'twenty-shared/types';import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';import { isObjectMetadataCommandMenuItemPayload } from 'src/engine/metadata-modules/command-menu-item/utils/is-object-metadata-command-menu-item-payload.util';import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';import { resolveEntityRelationUniversalIdentifiers } from 'src/engine/metadata-modules/flat-entity/utils/resolve-entity-relation-universal-identifiers.util';+import { type CreateCommandMenuItemInput } from 'src/engine/metadata-modules/command-menu-item/dtos/create-command-menu-item.input';export const fromCreateCommandMenuItemInputToFlatCommandMenuItemToCreate = ({createCommandMenuItemInput,@@ -71,6 +71,8 @@ export const fromCreateCommandMenuItemInputToFlatCommandMenuItemToCreate = ({id,universalIdentifier: id,workflowVersionId: createCommandMenuItemInput.workflowVersionId ?? null,+ coreWorkflowVersionId:+ createCommandMenuItemInput.coreWorkflowVersionId ?? null,frontComponentId: createCommandMenuItemInput.frontComponentId ?? null,frontComponentUniversalIdentifier,engineComponentKey: createCommandMenuItemInput.engineComponentKey,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.tsindex 5fd356d5537..5a7b9d8ac91 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts@@ -1317,6 +1317,11 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {toStringify: false,universalProperty: undefined,},+ coreWorkflowVersionId: {+ toCompare: false,+ toStringify: false,+ universalProperty: undefined,+ },pageLayoutId: {toCompare: false,toStringify: false,diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-front-component-command-menu-items.util.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-front-component-command-menu-items.util.tsindex 65c51e3492a..8d7666b3955 100644--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-front-component-command-menu-items.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-front-component-command-menu-items.util.ts@@ -74,6 +74,7 @@ export const prefillFrontComponentCommandMenuItems = async ({frontComponent.applicationUniversalIdentifier,workspaceId,workflowVersionId: null,+ coreWorkflowVersionId: null,frontComponentId: definition.frontComponentId,frontComponentUniversalIdentifier:definitionFrontComponent?.universalIdentifier ?? null,diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflow-command-menu-items.util.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflow-command-menu-items.util.tsindex d957a3227d1..f68f688c11d 100644--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflow-command-menu-items.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflow-command-menu-items.util.ts@@ -46,7 +46,8 @@ export const prefillWorkflowCommandMenuItems = async ({const now = new Date().toISOString();- const { quickLeadWorkflowVersionId } = getWorkflowPrefillIds(workspaceId);+ const { quickLeadWorkflowVersionId, coreQuickLeadWorkflowVersionId } =+ getWorkflowPrefillIds(workspaceId);const quickLeadFlatCommandMenuItem: FlatCommandMenuItem = {id: v4(),@@ -56,6 +57,7 @@ export const prefillWorkflowCommandMenuItems = async ({workspaceCustomFlatApplication.universalIdentifier,workspaceId,workflowVersionId: quickLeadWorkflowVersionId,+ coreWorkflowVersionId: coreQuickLeadWorkflowVersionId,frontComponentId: null,frontComponentUniversalIdentifier: null,engineComponentKey: EngineComponentKey.TRIGGER_WORKFLOW_VERSION,diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.tsindex f66768b7dfa..321af956898 100644--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts@@ -244,6 +244,7 @@ export const prefillWorkflows = async (name: 'Quick Lead',lastPublishedVersionId: quickLeadWorkflowVersionId,workspaceWorkflowId: quickLeadWorkflowId,+ lastPublishedCoreWorkflowVersionId: coreQuickLeadWorkflowVersionId,},{id: coreCreateCompanyWorkflowId,@@ -253,6 +254,7 @@ export const prefillWorkflows = async (name: 'Create company when adding a new person',lastPublishedVersionId: createCompanyWorkflowVersionId,workspaceWorkflowId: createCompanyWorkflowId,+ lastPublishedCoreWorkflowVersionId: coreCreateCompanyWorkflowVersionId,},]).execute();diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/command-menu-item/create-standard-command-menu-item-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/command-menu-item/create-standard-command-menu-item-flat-metadata.util.tsindex 8798f5f8ede..b184dc0052d 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/command-menu-item/create-standard-command-menu-item-flat-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/command-menu-item/create-standard-command-menu-item-flat-metadata.util.ts@@ -75,6 +75,7 @@ export const createStandardCommandMenuItemFlatMetadata = ({: null,hotKeys: definition.hotKeys ? [...definition.hotKeys] : null,workflowVersionId: null,+ coreWorkflowVersionId: null,availabilityObjectMetadataId: resolvedObjectMetadataId,availabilityObjectMetadataUniversalIdentifier:resolvedObjectMetadataUniversalIdentifier,diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/workspace-services/workflow-trigger.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/workspace-services/workflow-trigger.workspace-service.tsindex ba2b51fc657..322ef03193e 100644--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/workspace-services/workflow-trigger.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/workspace-services/workflow-trigger.workspace-service.ts@@ -284,11 +284,7 @@ export class WorkflowTriggerWorkspaceService {);}- await this.createOrUpdateCommandMenuItem(- workflow,- workflowVersion,- workspaceId,- );+ let mirroredCoreWorkflowVersionIdForCommandMenuItem: string | null = null;await this.workspaceOrmManager.runInWorkspaceTransaction(async (transactionScope) => {@@ -352,6 +348,9 @@ export class WorkflowTriggerWorkspaceService {transactionScope,);+ mirroredCoreWorkflowVersionIdForCommandMenuItem =+ mirroredCoreWorkflowVersionId;+await this.enableAutomatedTrigger(workflowVersion, workspaceId, {transactionScope,coreWorkflowVersionId: mirroredCoreWorkflowVersionId,@@ -359,6 +358,13 @@ export class WorkflowTriggerWorkspaceService {},);+ await this.createOrUpdateCommandMenuItem(+ workflow,+ workflowVersion,+ workspaceId,+ mirroredCoreWorkflowVersionIdForCommandMenuItem,+ );+await this.workflowVersionCoreSyncService.invalidateAutomatedTriggerMaps(workspaceId,);@@ -473,6 +479,7 @@ export class WorkflowTriggerWorkspaceService {workflow: WorkflowWorkspaceEntity,workflowVersion: WorkflowVersionWorkspaceEntity,workspaceId: string,+ mirroredCoreWorkflowVersionId: string | null,) {assertWorkflowVersionTriggerIsDefined(workflowVersion);@@ -510,6 +517,10 @@ export class WorkflowTriggerWorkspaceService {await this.commandMenuItemService.create({workflowVersionId: workflowVersion.id,+ coreWorkflowVersionId:+ mirroredCoreWorkflowVersionId ??+ workflowVersion.coreWorkflowVersionId ??+ undefined,engineComponentKey: EngineComponentKey.TRIGGER_WORKFLOW_VERSION,label,shortLabel: label,diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-lifecycle-core-mirror.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-lifecycle-core-mirror.integration-spec.tsindex 55fb0083e60..cbc4d675ef3 100644--- a/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-lifecycle-core-mirror.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-lifecycle-core-mirror.integration-spec.ts@@ -118,6 +118,28 @@ describe('workflow lifecycle core mirror with an active version (e2e)', () => {}});+ it('points the core workflow at the core id of the published version', async () => {+ const rows = await global.testDataSource.query(+ `SELECT cw."lastPublishedCoreWorkflowVersionId" AS "coreVersionId",+ published.id IS NOT NULL AS "resolves"+ FROM core."workflow" cw+ LEFT JOIN core."workflowVersion" published+ ON published.id = cw."lastPublishedCoreWorkflowVersionId"+ WHERE cw."workspaceId" = $1+ AND cw.id IN (+ SELECT cv."coreWorkflowId"+ FROM core."workflowVersion" cv+ WHERE cv."workspaceId" = $1+ AND cv."workflowId" = $2+ AND cv."coreWorkflowId" IS NOT NULL+ )`,+ [SEED_APPLE_WORKSPACE_ID, workflowId],+ );++ expect(typeof rows[0]?.coreVersionId).toBe('string');+ expect(rows[0]?.resolves).toBe(true);+ });+it('removes the core version row on delete, recreates it on restore, removes it on destroy', async () => {// the v1 version created with the workflow is mirrored to coreexpect(await coreVersionRowCount()).toBeGreaterThan(0);