The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Model the object navigation command menu item target as a foreign key (#24690)
Paul Rastoin9364bccbeddb
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 47892019c45..48076304258 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -116,6 +116,7 @@ type CommandMenuItem {hotKeys: [String!]conditionalAvailabilityExpression: StringavailabilityObjectMetadataId: UUID+ navigationTargetObjectMetadataId: UUIDpageLayoutId: UUIDuniversalIdentifier: UUIDapplicationId: UUID@@ -212,7 +213,7 @@ type PathCommandMenuItemPayload {}type ObjectMetadataCommandMenuItemPayload {- objectMetadataItemId: UUID!+ objectMetadataItemId: UUID! @deprecated(reason: "Use CommandMenuItem.navigationTargetObjectMetadataId instead, which is the modelled relation. This variant is dual-written and kept for backward compatibility.")}type LogicFunction {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 2a671dc263d..0d4499fd374 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -115,6 +115,7 @@ export interface CommandMenuItem {hotKeys?: Scalars['String'][]conditionalAvailabilityExpression?: Scalars['String']availabilityObjectMetadataId?: Scalars['UUID']+ navigationTargetObjectMetadataId?: Scalars['UUID']pageLayoutId?: Scalars['UUID']universalIdentifier?: Scalars['UUID']applicationId?: Scalars['UUID']@@ -136,6 +137,7 @@ export interface PathCommandMenuItemPayload {}export interface ObjectMetadataCommandMenuItemPayload {+ /** @deprecated Use CommandMenuItem.navigationTargetObjectMetadataId instead, which is the modelled relation. This variant is dual-written and kept for backward compatibility. */objectMetadataItemId: Scalars['UUID']__typename: 'ObjectMetadataCommandMenuItemPayload'}@@ -3417,6 +3419,7 @@ export interface CommandMenuItemGenqlSelection{hotKeys?: boolean | numberconditionalAvailabilityExpression?: boolean | numberavailabilityObjectMetadataId?: boolean | number+ navigationTargetObjectMetadataId?: boolean | numberpageLayoutId?: boolean | numberuniversalIdentifier?: boolean | numberapplicationId?: boolean | number@@ -3440,6 +3443,7 @@ export interface PathCommandMenuItemPayloadGenqlSelection{}export interface ObjectMetadataCommandMenuItemPayloadGenqlSelection{+ /** @deprecated Use CommandMenuItem.navigationTargetObjectMetadataId instead, which is the modelled relation. This variant is dual-written and kept for backward compatibility. */objectMetadataItemId?: boolean | number__typename?: boolean | number__scalar?: boolean | numberdiff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex 9ada371db43..a991226e0a6 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -367,6 +367,9 @@ export default {"availabilityObjectMetadataId": [3],+ "navigationTargetObjectMetadataId": [+ 3+ ],"pageLayoutId": [3],diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex c320e279b0a..3356c4781df 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -1014,6 +1014,7 @@ export type CommandMenuItem = {isActive: Scalars['Boolean']['output'];isPinned: Scalars['Boolean']['output'];label: Scalars['String']['output'];+ navigationTargetObjectMetadataId?: Maybe<Scalars['UUID']['output']>;pageLayoutId?: Maybe<Scalars['UUID']['output']>;payload?: Maybe<CommandMenuItemPayload>;position: Scalars['Float']['output'];@@ -4249,6 +4250,7 @@ export type ObjectIndexMetadatasConnection = {export type ObjectMetadataCommandMenuItemPayload = {__typename?: 'ObjectMetadataCommandMenuItemPayload';+ /** @deprecated Use CommandMenuItem.navigationTargetObjectMetadataId instead, which is the modelled relation. This variant is dual-written and kept for backward compatibility. */objectMetadataItemId: Scalars['UUID']['output'];};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 c1938c224fa..438a7e36f86 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@@ -241,6 +241,8 @@ export class RefactorNavigationCommandsCommand extends ProvisionedWorkspaceCommaworkflowVersionId: null,availabilityObjectMetadataId: null,availabilityObjectMetadataUniversalIdentifier: null,+ navigationTargetObjectMetadataId: null,+ navigationTargetObjectMetadataUniversalIdentifier: null,pageLayoutId: null,pageLayoutUniversalIdentifier: null,isActive: true,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 0e4a53121d8..e1785a1b99a 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@@ -69,6 +69,8 @@ const buildDiscardDraftWorkflowCommandMenuItem = ({availabilityObjectMetadataId: 'workflow-object-metadata-id',availabilityObjectMetadataUniversalIdentifier:DISCARD_DRAFT_WORKFLOW_DEFINITION.availabilityObjectMetadataUniversalIdentifier,+ navigationTargetObjectMetadataId: null,+ navigationTargetObjectMetadataUniversalIdentifier: null,pageLayoutId: null,pageLayoutUniversalIdentifier: null,isActive: true,diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-instance-command-fast-1787573269955-add-command-menu-item-target-object-metadata.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-instance-command-fast-1787573269955-add-command-menu-item-target-object-metadata.tsnew file mode 100644index 00000000000..3cdf7a8ec93--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-instance-command-fast-1787573269955-add-command-menu-item-target-object-metadata.ts@@ -0,0 +1,53 @@+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';++const ENGINE_KEY_COHERENCE_CHECK_NAME = 'CHK_CMD_MENU_ITEM_ENGINE_KEY_COHERENCE';++const PREVIOUS_ENGINE_KEY_COHERENCE_CHECK = `("engineComponentKey" = 'TRIGGER_WORKFLOW_VERSION' AND "workflowVersionId" IS NOT NULL AND "frontComponentId" IS NULL AND "payload" IS NULL) OR ("engineComponentKey" = 'FRONT_COMPONENT_RENDERER' AND "frontComponentId" IS NOT NULL AND "workflowVersionId" IS NULL AND "payload" IS NULL) OR ("engineComponentKey" = 'NAVIGATION' AND "payload" IS NOT NULL AND "workflowVersionId" IS NULL AND "frontComponentId" IS NULL) OR ("engineComponentKey" NOT IN ('TRIGGER_WORKFLOW_VERSION', 'FRONT_COMPONENT_RENDERER', 'NAVIGATION') AND "workflowVersionId" IS NULL AND "frontComponentId" IS NULL AND "payload" IS NULL)`;++// The NAVIGATION branch stays permissive: object keyed rows only carry the+// target once the 2-35 backfill has run everywhere, and path based rows never do+const ENGINE_KEY_COHERENCE_CHECK = `("engineComponentKey" = 'TRIGGER_WORKFLOW_VERSION' AND "workflowVersionId" IS NOT NULL AND "frontComponentId" IS NULL AND "payload" IS NULL AND "navigationTargetObjectMetadataId" IS NULL) OR ("engineComponentKey" = 'FRONT_COMPONENT_RENDERER' AND "frontComponentId" IS NOT NULL AND "workflowVersionId" IS NULL AND "payload" IS NULL AND "navigationTargetObjectMetadataId" IS NULL) OR ("engineComponentKey" = 'NAVIGATION' AND "payload" IS NOT NULL AND "workflowVersionId" IS NULL AND "frontComponentId" IS NULL) OR ("engineComponentKey" NOT IN ('TRIGGER_WORKFLOW_VERSION', 'FRONT_COMPONENT_RENDERER', 'NAVIGATION') AND "workflowVersionId" IS NULL AND "frontComponentId" IS NULL AND "payload" IS NULL AND "navigationTargetObjectMetadataId" IS NULL)`;++@RegisteredInstanceCommand('2.35.0', 1787573269955)+export class AddCommandMenuItemTargetObjectMetadataFastInstanceCommand+ implements FastInstanceCommand+{+ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ 'ALTER TABLE "core"."commandMenuItem" ADD "navigationTargetObjectMetadataId" uuid',+ );+ await queryRunner.query(+ `ALTER TABLE "core"."commandMenuItem" DROP CONSTRAINT IF EXISTS "${ENGINE_KEY_COHERENCE_CHECK_NAME}"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."commandMenuItem" ADD CONSTRAINT "${ENGINE_KEY_COHERENCE_CHECK_NAME}" CHECK (${ENGINE_KEY_COHERENCE_CHECK})`,+ );+ await queryRunner.query(+ 'CREATE INDEX "IDX_COMMAND_MENU_ITEM_NAVIGATION_TARGET_OBJECT_METADATA_ID" ON "core"."commandMenuItem" ("navigationTargetObjectMetadataId")',+ );+ await queryRunner.query(+ 'ALTER TABLE "core"."commandMenuItem" ADD CONSTRAINT "FK_29d15e273efc5804c653dc5ab93" FOREIGN KEY ("navigationTargetObjectMetadataId") REFERENCES "core"."objectMetadata"("id") ON DELETE CASCADE ON UPDATE NO ACTION',+ );+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ 'ALTER TABLE "core"."commandMenuItem" DROP CONSTRAINT "FK_29d15e273efc5804c653dc5ab93"',+ );+ await queryRunner.query(+ 'DROP INDEX "core"."IDX_COMMAND_MENU_ITEM_NAVIGATION_TARGET_OBJECT_METADATA_ID"',+ );+ await queryRunner.query(+ `ALTER TABLE "core"."commandMenuItem" DROP CONSTRAINT IF EXISTS "${ENGINE_KEY_COHERENCE_CHECK_NAME}"`,+ );+ await queryRunner.query(+ 'ALTER TABLE "core"."commandMenuItem" DROP COLUMN "navigationTargetObjectMetadataId"',+ );+ await queryRunner.query(+ `ALTER TABLE "core"."commandMenuItem" ADD CONSTRAINT "${ENGINE_KEY_COHERENCE_CHECK_NAME}" CHECK (${PREVIOUS_ENGINE_KEY_COHERENCE_CHECK})`,+ );+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-upgrade-version-command.module.tsindex 8be5078b07b..2907ad8ee50 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-upgrade-version-command.module.ts@@ -2,8 +2,10 @@ import { Module } from '@nestjs/common';import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';import { RepairAttachmentTimelineActivityTypesCommand } from 'src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787561579075-repair-attachment-timeline-activity-types.command';+import { BackfillCommandMenuItemTargetObjectMetadataCommand } from 'src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787572700000-backfill-command-menu-item-target-object-metadata.command';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';@Module({@@ -11,8 +13,12 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceApplicationModule,WorkspaceCacheModule,WorkspaceIteratorModule,+ WorkspaceMigrationRunnerModule,WorkspaceMigrationModule,],- providers: [RepairAttachmentTimelineActivityTypesCommand],+ providers: [+ RepairAttachmentTimelineActivityTypesCommand,+ BackfillCommandMenuItemTargetObjectMetadataCommand,+ ],})export class V2_35_UpgradeVersionCommandModule {}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787572700000-backfill-command-menu-item-target-object-metadata.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787572700000-backfill-command-menu-item-target-object-metadata.command.tsnew file mode 100644index 00000000000..ca537e5d376--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787572700000-backfill-command-menu-item-target-object-metadata.command.ts@@ -0,0 +1,107 @@+import { Command } from 'nest-commander';++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 { computeObjectNavigationTargetBackfill } from 'src/database/commands/upgrade-version-command/2-35/utils/compute-object-navigation-target-backfill.util';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';++@RegisteredWorkspaceCommand('2.35.0', 1787572700000)+@Command({+ name: 'upgrade:2-35:backfill-command-menu-item-target-object-metadata',+ description:+ 'Derive commandMenuItem.navigationTargetObjectMetadataId from the object navigation payload',+})+export class BackfillCommandMenuItemTargetObjectMetadataCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly applicationService: ApplicationService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace({+ workspaceId,+ options,+ }: RunOnWorkspaceArgs): Promise<void> {+ const isDryRun = options.dryRun ?? false;++ const { flatCommandMenuItemMaps, flatObjectMetadataMaps } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatCommandMenuItemMaps',+ 'flatObjectMetadataMaps',+ ]);++ const { flatCommandMenuItemsToUpdate, flatCommandMenuItemsToDelete } =+ computeObjectNavigationTargetBackfill({+ flatCommandMenuItemMaps,+ flatObjectMetadataMaps,+ now: new Date().toISOString(),+ });++ if (flatCommandMenuItemsToDelete.length > 0) {+ this.logger.warn(+ `${isDryRun ? '[DRY RUN] Would delete' : 'Deleting'} ${flatCommandMenuItemsToDelete.length} orphaned navigation command menu item(s) in workspace ${workspaceId}, their payload points at a missing object: ${flatCommandMenuItemsToDelete.map(({ id }) => id).join(', ')}`,+ );+ }++ if (+ flatCommandMenuItemsToUpdate.length === 0 &&+ flatCommandMenuItemsToDelete.length === 0+ ) {+ this.logger.log(+ `Navigation command menu item targets already backfilled for workspace ${workspaceId}`,+ );++ return;+ }++ this.logger.log(+ `${isDryRun ? '[DRY RUN] Would backfill' : 'Backfilling'} ${flatCommandMenuItemsToUpdate.length} navigation command menu item target(s) for workspace ${workspaceId}`,+ );++ if (isDryRun) {+ return;+ }++ const { twentyStandardFlatApplication } =+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(+ { workspaceId },+ );++ const validateAndBuildResult =+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(+ {+ allFlatEntityOperationByMetadataName: {+ commandMenuItem: {+ flatEntityToCreate: [],+ flatEntityToDelete: flatCommandMenuItemsToDelete,+ flatEntityToUpdate: flatCommandMenuItemsToUpdate,+ },+ },+ workspaceId,+ applicationUniversalIdentifier:+ twentyStandardFlatApplication.universalIdentifier,+ },+ );++ if (validateAndBuildResult.status === 'fail') {+ this.logger.error(+ `Failed to backfill navigation command menu item targets:\n${JSON.stringify(validateAndBuildResult, null, 2)}`,+ );++ throw new Error(+ `Failed to backfill navigation command menu item targets for workspace ${workspaceId}`,+ );+ }++ this.logger.log(+ `Successfully backfilled ${flatCommandMenuItemsToUpdate.length} and deleted ${flatCommandMenuItemsToDelete.length} navigation command menu item(s) for workspace ${workspaceId}`,+ );+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/add-command-menu-item-target-object-metadata-upgrade-command-name.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/add-command-menu-item-target-object-metadata-upgrade-command-name.constant.tsnew file mode 100644index 00000000000..c87a0982fbe--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/add-command-menu-item-target-object-metadata-upgrade-command-name.constant.ts@@ -0,0 +1,2 @@+export const ADD_COMMAND_MENU_ITEM_TARGET_OBJECT_METADATA_UPGRADE_COMMAND_NAME =+ '2.35.0_AddCommandMenuItemTargetObjectMetadataFastInstanceCommand_1787573269955';diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/utils/__tests__/compute-object-navigation-target-backfill.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/utils/__tests__/compute-object-navigation-target-backfill.util.spec.tsnew file mode 100644index 00000000000..52354815971--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/utils/__tests__/compute-object-navigation-target-backfill.util.spec.ts@@ -0,0 +1,172 @@+import { computeObjectNavigationTargetBackfill } from 'src/database/commands/upgrade-version-command/2-35/utils/compute-object-navigation-target-backfill.util';+import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';+import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';++const NOW = '2026-08-24T00:00:00.000Z';++const COMPANY_OBJECT_ID = '20202020-0000-0000-0000-00000000c0c0';+const COMPANY_OBJECT_UNIVERSAL_IDENTIFIER =+ '20202020-1111-1111-1111-11111111c0c0';++const buildFlatCommandMenuItem = (+ overrides: Partial<FlatCommandMenuItem> & Pick<FlatCommandMenuItem, 'id'>,+): FlatCommandMenuItem =>+ ({+ universalIdentifier: overrides.id,+ engineComponentKey: EngineComponentKey.NAVIGATION,+ payload: { objectMetadataItemId: COMPANY_OBJECT_ID },+ navigationTargetObjectMetadataId: null,+ navigationTargetObjectMetadataUniversalIdentifier: null,+ updatedAt: '2026-01-01T00:00:00.000Z',+ ...overrides,+ }) as FlatCommandMenuItem;++const buildFlatCommandMenuItemMaps = (+ flatCommandMenuItems: FlatCommandMenuItem[],+): FlatEntityMaps<FlatCommandMenuItem> => ({+ byUniversalIdentifier: Object.fromEntries(+ flatCommandMenuItems.map((item) => [item.universalIdentifier, item]),+ ),+ universalIdentifierById: Object.fromEntries(+ flatCommandMenuItems.map((item) => [item.id, item.universalIdentifier]),+ ),+ universalIdentifiersByApplicationId: {},+});++const flatObjectMetadataMaps = {+ byUniversalIdentifier: {+ [COMPANY_OBJECT_UNIVERSAL_IDENTIFIER]: {+ id: COMPANY_OBJECT_ID,+ universalIdentifier: COMPANY_OBJECT_UNIVERSAL_IDENTIFIER,+ },+ },+ universalIdentifierById: {+ [COMPANY_OBJECT_ID]: COMPANY_OBJECT_UNIVERSAL_IDENTIFIER,+ },+ universalIdentifiersByApplicationId: {},+} as unknown as FlatEntityMaps<FlatObjectMetadata>;++describe('computeObjectNavigationTargetBackfill', () => {+ it('derives the target from the object navigation payload', () => {+ const backfill = computeObjectNavigationTargetBackfill({+ flatCommandMenuItemMaps: buildFlatCommandMenuItemMaps([+ buildFlatCommandMenuItem({ id: 'command-1' }),+ ]),+ flatObjectMetadataMaps,+ now: NOW,+ });++ expect(backfill.flatCommandMenuItemsToUpdate).toHaveLength(1);+ expect(backfill.flatCommandMenuItemsToUpdate[0]).toMatchObject({+ id: 'command-1',+ navigationTargetObjectMetadataId: COMPANY_OBJECT_ID,+ navigationTargetObjectMetadataUniversalIdentifier:+ COMPANY_OBJECT_UNIVERSAL_IDENTIFIER,+ updatedAt: NOW,+ });+ });++ it('is idempotent once the target column is set', () => {+ const backfill = computeObjectNavigationTargetBackfill({+ flatCommandMenuItemMaps: buildFlatCommandMenuItemMaps([+ buildFlatCommandMenuItem({+ id: 'command-1',+ navigationTargetObjectMetadataId: COMPANY_OBJECT_ID,+ navigationTargetObjectMetadataUniversalIdentifier:+ COMPANY_OBJECT_UNIVERSAL_IDENTIFIER,+ }),+ ]),+ flatObjectMetadataMaps,+ now: NOW,+ });++ expect(backfill.flatCommandMenuItemsToUpdate).toEqual([]);+ });++ it('leaves a path-based navigation command untouched', () => {+ const backfill = computeObjectNavigationTargetBackfill({+ flatCommandMenuItemMaps: buildFlatCommandMenuItemMaps([+ buildFlatCommandMenuItem({+ id: 'command-1',+ payload: { path: '/settings' },+ }),+ ]),+ flatObjectMetadataMaps,+ now: NOW,+ });++ expect(backfill.flatCommandMenuItemsToUpdate).toEqual([]);+ expect(backfill.flatCommandMenuItemsToDelete).toEqual([]);+ });++ it('leaves a non navigation command untouched', () => {+ const backfill = computeObjectNavigationTargetBackfill({+ flatCommandMenuItemMaps: buildFlatCommandMenuItemMaps([+ buildFlatCommandMenuItem({+ id: 'command-1',+ engineComponentKey: EngineComponentKey.FRONT_COMPONENT_RENDERER,+ }),+ ]),+ flatObjectMetadataMaps,+ now: NOW,+ });++ expect(backfill.flatCommandMenuItemsToUpdate).toEqual([]);+ });++ it('deletes a command whose payload points at a missing object', () => {+ const backfill = computeObjectNavigationTargetBackfill({+ flatCommandMenuItemMaps: buildFlatCommandMenuItemMaps([+ buildFlatCommandMenuItem({+ id: 'command-1',+ payload: { objectMetadataItemId: 'deleted-object' },+ }),+ ]),+ flatObjectMetadataMaps,+ now: NOW,+ });++ expect(backfill.flatCommandMenuItemsToUpdate).toEqual([]);+ expect(backfill.flatCommandMenuItemsToDelete.map(({ id }) => id)).toEqual([+ 'command-1',+ ]);+ });++ it('backfills every command targeting the same object', () => {+ const backfill = computeObjectNavigationTargetBackfill({+ flatCommandMenuItemMaps: buildFlatCommandMenuItemMaps([+ buildFlatCommandMenuItem({ id: 'command-1' }),+ buildFlatCommandMenuItem({ id: 'command-2' }),+ ]),+ flatObjectMetadataMaps,+ now: NOW,+ });++ expect(backfill.flatCommandMenuItemsToUpdate.map(({ id }) => id)).toEqual([+ 'command-1',+ 'command-2',+ ]);+ });++ it('backfills a command pointing at an object another command already targets', () => {+ const backfill = computeObjectNavigationTargetBackfill({+ flatCommandMenuItemMaps: buildFlatCommandMenuItemMaps([+ buildFlatCommandMenuItem({+ id: 'command-1',+ navigationTargetObjectMetadataId: COMPANY_OBJECT_ID,+ navigationTargetObjectMetadataUniversalIdentifier:+ COMPANY_OBJECT_UNIVERSAL_IDENTIFIER,+ }),+ buildFlatCommandMenuItem({ id: 'command-2' }),+ ]),+ flatObjectMetadataMaps,+ now: NOW,+ });++ expect(backfill.flatCommandMenuItemsToUpdate.map(({ id }) => id)).toEqual([+ 'command-2',+ ]);+ });+});diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/utils/compute-object-navigation-target-backfill.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/utils/compute-object-navigation-target-backfill.util.tsnew file mode 100644index 00000000000..a0c162ab839--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/utils/compute-object-navigation-target-backfill.util.ts@@ -0,0 +1,62 @@+import { isDefined } from 'twenty-shared/utils';++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 FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';++export type ObjectNavigationTargetBackfill = {+ flatCommandMenuItemsToUpdate: FlatCommandMenuItem[];+ flatCommandMenuItemsToDelete: FlatCommandMenuItem[];+};++export const computeObjectNavigationTargetBackfill = ({+ flatCommandMenuItemMaps,+ flatObjectMetadataMaps,+ now,+}: {+ flatCommandMenuItemMaps: FlatEntityMaps<FlatCommandMenuItem>;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;+ now: string;+}): ObjectNavigationTargetBackfill => {+ const backfill: ObjectNavigationTargetBackfill = {+ flatCommandMenuItemsToUpdate: [],+ flatCommandMenuItemsToDelete: [],+ };++ for (const flatCommandMenuItem of Object.values(+ flatCommandMenuItemMaps.byUniversalIdentifier,+ ).filter(isDefined)) {+ if (+ flatCommandMenuItem.engineComponentKey !== EngineComponentKey.NAVIGATION ||+ isDefined(flatCommandMenuItem.navigationTargetObjectMetadataId) ||+ !isObjectMetadataCommandMenuItemPayload(flatCommandMenuItem.payload)+ ) {+ continue;+ }++ const flatObjectMetadata = findFlatEntityByIdInFlatEntityMaps({+ flatEntityId: flatCommandMenuItem.payload.objectMetadataItemId,+ flatEntityMaps: flatObjectMetadataMaps,+ });++ // The object is gone, so the command can only ever be a no-op in the menu.+ // The new foreign key is what stops these accumulating from now on+ if (!isDefined(flatObjectMetadata)) {+ backfill.flatCommandMenuItemsToDelete.push(flatCommandMenuItem);+ continue;+ }++ backfill.flatCommandMenuItemsToUpdate.push({+ ...flatCommandMenuItem,+ navigationTargetObjectMetadataId: flatObjectMetadata.id,+ navigationTargetObjectMetadataUniversalIdentifier:+ flatObjectMetadata.universalIdentifier,+ updatedAt: now,+ });+ }++ return backfill;+};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 aed2ca0dd65..6174f2b8493 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@@ -155,6 +155,7 @@ import { AddTimelineActivityRoutingFastInstanceCommand } from 'src/database/commimport { AddTimelineActivityTypeReplacementFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608314-add-timeline-activity-type-replacement';import { TimelineActivityTypeOverridableEntityFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608315-timeline-activity-type-overridable-entity';import { EnforceTimelineActivityTypeEmitUniquenessFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608316-enforce-timeline-activity-type-emit-uniqueness';+import { AddCommandMenuItemTargetObjectMetadataFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-35/2-35-instance-command-fast-1787573269955-add-command-menu-item-target-object-metadata';export const INSTANCE_COMMANDS = [AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,@@ -312,4 +313,5 @@ export const INSTANCE_COMMANDS = [AddTimelineActivityTypeReplacementFastInstanceCommand,TimelineActivityTypeOverridableEntityFastInstanceCommand,EnforceTimelineActivityTypeEmitUniquenessFastInstanceCommand,+ AddCommandMenuItemTargetObjectMetadataFastInstanceCommand,];diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.tsindex 80adb57c8af..6a2f9496d1d 100644--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.ts+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.ts@@ -157,6 +157,7 @@ export const mockPersonFlatObjectMetadata = (universalIdentifier: objectMetadataId,indexMetadataIds: [],searchFieldMetadataIds: [],+ commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],fieldIds: mockFieldMetadatas.map((field) => field.id),@@ -183,6 +184,7 @@ export const mockPersonFlatObjectMetadata = (fieldPermissionUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier: null,imageIdentifierFieldMetadataUniversalIdentifier: 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 f1a1443e7f9..28f83b1ab20 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@@ -40,6 +40,7 @@ export const fromCommandMenuItemManifestToUniversalFlatCommandMenuItem = ({commandMenuItemManifest.frontComponentUniversalIdentifier,availabilityObjectMetadataUniversalIdentifier:commandMenuItemManifest.availabilityObjectUniversalIdentifier ?? null,+ navigationTargetObjectMetadataUniversalIdentifier: null,engineComponentKey: EngineComponentKey.FRONT_COMPONENT_RENDERER,payload: null,hotKeys: null,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util.tsindex 3fcb3eb7beb..a204b1c70af 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util.ts@@ -39,6 +39,7 @@ export const fromObjectManifestToUniversalFlatObjectMetadata = ({fieldUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ commandMenuItemUniversalIdentifiers: [],objectPermissionUniversalIdentifiers: [],fieldPermissionUniversalIdentifiers: [],viewUniversalIdentifiers: [],diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.tsindex 3c7f6387b3d..e646d5dfd6e 100644--- a/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.ts@@ -31,6 +31,7 @@ const mockObjectMetadata: FlatObjectMetadata = {isSearchable: true,indexMetadataIds: [],searchFieldMetadataIds: [],+ commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],fieldIds: [],@@ -58,6 +59,7 @@ const mockObjectMetadata: FlatObjectMetadata = {pageLayoutUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier: null,imageIdentifierFieldMetadataUniversalIdentifier: null,};diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto.tsindex 2a43de359d5..a24f6a1de52 100644--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto.ts@@ -92,6 +92,11 @@ export class CommandMenuItemDTO {@Field(() => UUIDScalarType, { nullable: true })availabilityObjectMetadataId?: string;+ @IsUUID()+ @IsOptional()+ @Field(() => UUIDScalarType, { nullable: true })+ navigationTargetObjectMetadataId?: string;+@IsUUID()@IsOptional()@Field(() => UUIDScalarType, { nullable: true })diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/object-metadata-command-menu-item-payload.dto.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/object-metadata-command-menu-item-payload.dto.tsindex 33e565c1f44..9d6abeb22f4 100644--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/object-metadata-command-menu-item-payload.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/object-metadata-command-menu-item-payload.dto.ts@@ -8,6 +8,9 @@ import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/export class ObjectMetadataCommandMenuItemPayloadDTO {@IsUUID()@IsNotEmpty()- @Field(() => UUIDScalarType)+ @Field(() => UUIDScalarType, {+ deprecationReason:+ 'Use CommandMenuItem.navigationTargetObjectMetadataId instead, which is the modelled relation. This variant is dual-written and kept for backward compatibility.',+ })objectMetadataItemId: string;}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 8556535d7c5..b3e53adf281 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@@ -1,3 +1,4 @@+import { type SerializedRelation } from 'twenty-shared/types';import {Check,Column,@@ -10,11 +11,11 @@ import {type Relation,UpdateDateColumn,} from 'typeorm';-import { type SerializedRelation } from 'twenty-shared/types';+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 { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';import { type CommandMenuItemPayload } from 'src/engine/metadata-modules/command-menu-item/dtos/command-menu-item-payload.union';-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 { CommandMenuItemAvailabilityType } from 'src/engine/metadata-modules/command-menu-item/enums/command-menu-item-availability-type.enum';import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';import { FrontComponentEntity } from 'src/engine/metadata-modules/front-component/entities/front-component.entity';@@ -51,9 +52,12 @@ export type CommandMenuItemOverrides = {'pageLayoutId','workspaceId',])+@Index('IDX_COMMAND_MENU_ITEM_NAVIGATION_TARGET_OBJECT_METADATA_ID', [+ 'navigationTargetObjectMetadataId',+])@Check('CHK_CMD_MENU_ITEM_ENGINE_KEY_COHERENCE',- `("engineComponentKey" = 'TRIGGER_WORKFLOW_VERSION' AND "workflowVersionId" IS NOT NULL AND "frontComponentId" IS NULL AND "payload" IS NULL) OR ("engineComponentKey" = 'FRONT_COMPONENT_RENDERER' AND "frontComponentId" IS NOT NULL AND "workflowVersionId" IS NULL AND "payload" IS NULL) OR ("engineComponentKey" = 'NAVIGATION' AND "payload" IS NOT NULL AND "workflowVersionId" IS NULL AND "frontComponentId" IS NULL) OR ("engineComponentKey" NOT IN ('TRIGGER_WORKFLOW_VERSION', 'FRONT_COMPONENT_RENDERER', 'NAVIGATION') AND "workflowVersionId" IS NULL AND "frontComponentId" IS NULL AND "payload" IS NULL)`,+ `("engineComponentKey" = 'TRIGGER_WORKFLOW_VERSION' AND "workflowVersionId" IS NOT NULL AND "frontComponentId" IS NULL AND "payload" IS NULL AND "navigationTargetObjectMetadataId" IS NULL) OR ("engineComponentKey" = 'FRONT_COMPONENT_RENDERER' AND "frontComponentId" IS NOT NULL AND "workflowVersionId" IS NULL AND "payload" IS NULL AND "navigationTargetObjectMetadataId" IS NULL) OR ("engineComponentKey" = 'NAVIGATION' AND "payload" IS NOT NULL AND "workflowVersionId" IS NULL AND "frontComponentId" IS NULL) OR ("engineComponentKey" NOT IN ('TRIGGER_WORKFLOW_VERSION', 'FRONT_COMPONENT_RENDERER', 'NAVIGATION') AND "workflowVersionId" IS NULL AND "frontComponentId" IS NULL AND "payload" IS NULL AND "navigationTargetObjectMetadataId" IS NULL)`,)export class CommandMenuItemEntityextends OverridableEntity<CommandMenuItemOverrides>@@ -120,6 +124,21 @@ export class CommandMenuItemEntity@JoinColumn({ name: 'availabilityObjectMetadataId' })availabilityObjectMetadata: Relation<ObjectMetadataEntity> | null;+ // Dual-written with payload.objectMetadataItemId until https://github.com/twentyhq/core-team-issues/issues/2794+ @WasIntroducedInUpgrade({+ upgradeCommandName:+ ADD_COMMAND_MENU_ITEM_TARGET_OBJECT_METADATA_UPGRADE_COMMAND_NAME,+ })+ @Column({ nullable: true, type: 'uuid' })+ navigationTargetObjectMetadataId: string | null;++ @ManyToOne(() => ObjectMetadataEntity, {+ onDelete: 'CASCADE',+ nullable: true,+ })+ @JoinColumn({ name: 'navigationTargetObjectMetadataId' })+ navigationTargetObjectMetadata: Relation<ObjectMetadataEntity> | null;+@Column({ nullable: true, type: 'uuid' })pageLayoutId: string | null;diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-navigation-flat-command-menu-item.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-navigation-flat-command-menu-item.util.spec.tsindex 5fbe8c54722..e3e8da9eeb9 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-navigation-flat-command-menu-item.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-navigation-flat-command-menu-item.util.spec.ts@@ -62,6 +62,15 @@ describe('buildNavigationFlatCommandMenuItem', () => {expect(result.payload).toEqual({ objectMetadataItemId: 'obj-id-1' });});+ it('should set the target object metadata foreign key alongside the payload', () => {+ const result = buildNavigationFlatCommandMenuItem(baseArgs);++ expect(result.navigationTargetObjectMetadataId).toBe('obj-id-1');+ expect(result.navigationTargetObjectMetadataUniversalIdentifier).toBe(+ 'obj-universal-1',+ );+ });+it('should include shortcut in hotKeys when shortcut is defined', () => {const result = buildNavigationFlatCommandMenuItem(baseArgs);diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util.tsindex 91ee91c35b3..4af140a9176 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util.ts@@ -103,6 +103,9 @@ export const buildNavigationFlatCommandMenuItem = ({frontComponentUniversalIdentifier: null,engineComponentKey: EngineComponentKey.NAVIGATION,payload: { objectMetadataItemId: objectMetadata.id },+ navigationTargetObjectMetadataId: objectMetadata.id,+ navigationTargetObjectMetadataUniversalIdentifier:+ objectMetadata.universalIdentifier,hotKeys: isDefined(objectMetadata.shortcut)? ['G', objectMetadata.shortcut]: null,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 6c6446eab9b..2a090f0ecbd 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@@ -4,6 +4,7 @@ import { type FlatApplication } from 'src/engine/core-modules/application/types/import { type CreateCommandMenuItemInput } from 'src/engine/metadata-modules/command-menu-item/dtos/create-command-menu-item.input';import { CommandMenuItemAvailabilityType } from 'src/engine/metadata-modules/command-menu-item/enums/command-menu-item-availability-type.enum';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';@@ -26,10 +27,22 @@ export const fromCreateCommandMenuItemInputToFlatCommandMenuItemToCreate = ({const id = uuidv4();const now = new Date().toISOString();+ const payload =+ createCommandMenuItemInput.engineComponentKey ===+ EngineComponentKey.NAVIGATION+ ? (createCommandMenuItemInput.payload ?? null)+ : null;++ const navigationTargetObjectMetadataId =+ isObjectMetadataCommandMenuItemPayload(payload)+ ? payload.objectMetadataItemId+ : null;+const {availabilityObjectMetadataUniversalIdentifier,frontComponentUniversalIdentifier,pageLayoutUniversalIdentifier,+ navigationTargetObjectMetadataUniversalIdentifier,} = resolveEntityRelationUniversalIdentifiers({metadataName: 'commandMenuItem',foreignKeyValues: {@@ -37,6 +50,7 @@ export const fromCreateCommandMenuItemInputToFlatCommandMenuItemToCreate = ({createCommandMenuItemInput.availabilityObjectMetadataId,frontComponentId: createCommandMenuItemInput.frontComponentId,pageLayoutId: createCommandMenuItemInput.pageLayoutId,+ navigationTargetObjectMetadataId,},flatEntityMaps: {flatObjectMetadataMaps,@@ -57,11 +71,7 @@ export const fromCreateCommandMenuItemInputToFlatCommandMenuItemToCreate = ({shortLabel: createCommandMenuItemInput.shortLabel ?? null,position: createCommandMenuItemInput.position ?? 0,isPinned: createCommandMenuItemInput.isPinned ?? false,- payload:- createCommandMenuItemInput.engineComponentKey ===- EngineComponentKey.NAVIGATION- ? (createCommandMenuItemInput.payload ?? null)- : null,+ payload,hotKeys: createCommandMenuItemInput.hotKeys ?? null,availabilityType:createCommandMenuItemInput.availabilityType ??@@ -71,6 +81,8 @@ export const fromCreateCommandMenuItemInputToFlatCommandMenuItemToCreate = ({conditionalAvailabilityExpression:createCommandMenuItemInput.conditionalAvailabilityExpression ?? null,availabilityObjectMetadataUniversalIdentifier,+ navigationTargetObjectMetadataId,+ navigationTargetObjectMetadataUniversalIdentifier,pageLayoutId: createCommandMenuItemInput.pageLayoutId ?? null,pageLayoutUniversalIdentifier,workspaceId,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-flat-command-menu-item-to-command-menu-item-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-flat-command-menu-item-to-command-menu-item-dto.util.tsindex 488cc2a0411..3a613f55467 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-flat-command-menu-item-to-command-menu-item-dto.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-flat-command-menu-item-to-command-menu-item-dto.util.ts@@ -29,6 +29,9 @@ export const fromFlatCommandMenuItemToCommandMenuItemDto = (undefined,availabilityObjectMetadataId:effectiveFlatCommandMenuItem.availabilityObjectMetadataId ?? undefined,+ navigationTargetObjectMetadataId:+ effectiveFlatCommandMenuItem.navigationTargetObjectMetadataId ??+ undefined,pageLayoutId: effectiveFlatCommandMenuItem.pageLayoutId ?? undefined,workspaceId: effectiveFlatCommandMenuItem.workspaceId,applicationId: effectiveFlatCommandMenuItem.applicationId ?? undefined,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snapindex a49230c9fee..77238de855c 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap@@ -43,6 +43,7 @@ exports[`ALL_UNIVERSAL_FLAT_ENTITY_PROPERTIES_TO_COMPARE_AND_STRINGIFY should ma"availabilityType","conditionalAvailabilityExpression","availabilityObjectMetadataUniversalIdentifier",+ "navigationTargetObjectMetadataUniversalIdentifier","engineComponentKey","payload","hotKeys",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 8a3c203d739..c171487c973 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@@ -1243,6 +1243,11 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {universalProperty: 'availabilityObjectMetadataUniversalIdentifier',isOverridable: true,},+ navigationTargetObjectMetadataId: {+ toCompare: true,+ toStringify: false,+ universalProperty: 'navigationTargetObjectMetadataUniversalIdentifier',+ },createdAt: {toCompare: false,toStringify: false,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-foreign-key.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-foreign-key.constant.tsindex 216fa28af04..bea56b6cada 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-foreign-key.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-foreign-key.constant.ts@@ -47,6 +47,9 @@ export const ALL_MANY_TO_ONE_METADATA_FOREIGN_KEY = {availabilityObjectMetadata: {foreignKey: 'availabilityObjectMetadataId',},+ navigationTargetObjectMetadata: {+ foreignKey: 'navigationTargetObjectMetadataId',+ },frontComponent: {foreignKey: 'frontComponentId',},diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.tsindex 3ac164cab9c..896646820e5 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.ts@@ -79,6 +79,13 @@ export const ALL_MANY_TO_ONE_METADATA_RELATIONS = {isNullable: true,universalForeignKey: 'availabilityObjectMetadataUniversalIdentifier',},+ navigationTargetObjectMetadata: {+ metadataName: 'objectMetadata',+ foreignKey: 'navigationTargetObjectMetadataId',+ inverseOneToManyProperty: 'commandMenuItems',+ isNullable: true,+ universalForeignKey: 'navigationTargetObjectMetadataUniversalIdentifier',+ },frontComponent: {metadataName: 'frontComponent',foreignKey: 'frontComponentId',diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-one-to-many-metadata-relations.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-one-to-many-metadata-relations.constant.tsindex da00e22f427..a1c0152d1fb 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-one-to-many-metadata-relations.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-one-to-many-metadata-relations.constant.ts@@ -130,6 +130,12 @@ export const ALL_ONE_TO_MANY_METADATA_RELATIONS = {flatEntityForeignKeyAggregator: 'pageLayoutIds',universalFlatEntityForeignKeyAggregator: 'pageLayoutUniversalIdentifiers',},+ commandMenuItems: {+ metadataName: 'commandMenuItem',+ flatEntityForeignKeyAggregator: 'commandMenuItemIds',+ universalFlatEntityForeignKeyAggregator:+ 'commandMenuItemUniversalIdentifiers',+ },},view: {viewFields: {diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.tsindex 144b5c95f27..22cb96165d6 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import { CommandMenuItemEntity } from 'src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';import { WorkspaceFlatFieldMetadataMapCacheService } from 'src/engine/metadata-modules/flat-field-metadata/services/workspace-flat-field-metadata-map-cache.service';@@ -80,6 +81,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheFrontComponentEntity,SearchFieldMetadataEntity,TimelineActivityTypeEntity,+ CommandMenuItemEntity,]),],providers: [@@ -124,6 +126,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheprovideWorkspaceScopedRepository(RowLevelPermissionPredicateEntity),provideWorkspaceScopedRepository(RowLevelPermissionPredicateGroupEntity),provideWorkspaceScopedRepository(TimelineActivityTypeEntity),+ provideWorkspaceScopedRepository(CommandMenuItemEntity),],exports: [WorkspaceManyOrAllFlatEntityMapsCacheService,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/get-metadata-related-metadata-names.util.spec.ts.snap b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/get-metadata-related-metadata-names.util.spec.ts.snapindex fe3282ebec0..2a96b84fb2a 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/get-metadata-related-metadata-names.util.spec.ts.snap+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/get-metadata-related-metadata-names.util.spec.ts.snap@@ -63,6 +63,7 @@ exports[`getMetadataRelatedMetadataNames should return related metadata names fo"view","searchFieldMetadata","pageLayout",+ "commandMenuItem",]`;diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/sort-metadata-names-children-first.util.spec.ts.snap b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/sort-metadata-names-children-first.util.spec.ts.snapindex 0c72070ce2f..0b9118ff95b 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/sort-metadata-names-children-first.util.spec.ts.snap+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/sort-metadata-names-children-first.util.spec.ts.snap@@ -3,9 +3,9 @@exports[`sortMetadataNamesChildrenFirst should return metadata names sorted with children first (most manyToOne relations first) 1`] = `["rowLevelPermissionPredicate",+ "commandMenuItem","navigationMenuItem","viewFilter",- "commandMenuItem","fieldPermission","searchFieldMetadata","viewField",diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.tsindex a500e2b4f8b..db827888ac3 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts@@ -26,6 +26,7 @@ export const getFlatObjectMetadataMock = (fieldPermissionIds: [],fieldIds: [],pageLayoutIds: [],+ commandMenuItemIds: [],description: 'default flat object metadata description',icon: 'icon',writability: MetadataWritability.OPEN,@@ -62,6 +63,7 @@ export const getFlatObjectMetadataMock = (indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],pageLayoutUniversalIdentifiers: [],+ commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier:labelIdentifierFieldMetadataId,imageIdentifierFieldMetadataUniversalIdentifier:diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service.tsindex fc7663688b6..6e4f6d7f5a2 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service.ts@@ -6,6 +6,7 @@ import { Repository } from 'typeorm';import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import { CommandMenuItemEntity } from 'src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';@@ -46,6 +47,8 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCachePrprivate readonly searchFieldMetadataRepository: WorkspaceScopedRepository<SearchFieldMetadataEntity>,@InjectWorkspaceScopedRepository(PageLayoutEntity)private readonly pageLayoutRepository: WorkspaceScopedRepository<PageLayoutEntity>,+ @InjectWorkspaceScopedRepository(CommandMenuItemEntity)+ private readonly commandMenuItemRepository: WorkspaceScopedRepository<CommandMenuItemEntity>,) {super();}@@ -62,6 +65,7 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCacheProbjectPermissions,searchFieldMetadatas,pageLayouts,+ commandMenuItems,] = await Promise.all([this.objectMetadataRepository.find({where: { workspaceId },@@ -96,6 +100,14 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCachePrselect: ['id', 'universalIdentifier', 'objectMetadataId'],withDeleted: true,}),+ this.commandMenuItemRepository.find(workspaceId, {+ select: [+ 'id',+ 'universalIdentifier',+ 'navigationTargetObjectMetadataId',+ ],+ withDeleted: true,+ }),]);const [@@ -105,6 +117,7 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCacheProbjectPermissionsByObjectId,searchFieldMetadatasByObjectId,pageLayoutsByObjectId,+ commandMenuItemsByObjectId,] = ([{@@ -131,6 +144,10 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCachePrentities: pageLayouts,foreignKey: 'objectMetadataId',},+ {+ entities: commandMenuItems,+ foreignKey: 'navigationTargetObjectMetadataId',+ },] as const).map(regroupEntitiesByRelatedEntityId);@@ -153,6 +170,8 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCachePrsearchFieldMetadatas:searchFieldMetadatasByObjectId.get(objectMetadataEntity.id) || [],pageLayouts: pageLayoutsByObjectId.get(objectMetadataEntity.id) || [],+ commandMenuItems:+ commandMenuItemsByObjectId.get(objectMetadataEntity.id) || [],},applicationIdToUniversalIdentifierMap,fieldMetadataIdToUniversalIdentifierMap,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.tsindex 630498e5cc3..a2a62cc0619 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts@@ -88,6 +88,7 @@ export const fromCreateObjectInputToFlatObjectMetadataAndFlatFieldMetadatasToCreindexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],pageLayoutUniversalIdentifiers: [],+ commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier,imageIdentifierFieldMetadataUniversalIdentifier: null,};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.tsindex baff24b157b..b826618f4ac 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts@@ -106,5 +106,11 @@ export const fromObjectMetadataEntityToFlatObjectMetadata = (pageLayoutUniversalIdentifiers: objectMetadataEntity.pageLayouts.map(({ universalIdentifier }) => universalIdentifier,),+ commandMenuItemIds:+ objectMetadataEntity.commandMenuItems?.map(({ id }) => id) ?? [],+ commandMenuItemUniversalIdentifiers:+ objectMetadataEntity.commandMenuItems?.map(+ ({ universalIdentifier }) => universalIdentifier,+ ) ?? [],};};diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.tsindex 85eb1ab94a2..a0fd1d2bccc 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts@@ -18,6 +18,7 @@ import { DROP_METADATA_STANDARD_OVERRIDES_COLUMN_UPGRADE_COMMAND_NAME } from 'srimport { type WorkspaceEntityDuplicateCriteria } from 'src/engine/api/graphql/workspace-query-builder/types/workspace-entity-duplicate-criteria.type';import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';import { WasRemovedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-removed-in-upgrade.decorator';+import { CommandMenuItemEntity } from 'src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';import { RENAME_IS_UI_READ_ONLY_TO_IS_UI_EDITABLE_UPGRADE_COMMAND_NAME } from 'src/engine/metadata-modules/object-metadata/constants/rename-is-ui-read-only-to-is-ui-editable-upgrade-command-name.constant';@@ -229,4 +230,10 @@ export class ObjectMetadataEntity},)pageLayouts: Relation<PageLayoutEntity[]>;++ @OneToMany(+ () => CommandMenuItemEntity,+ (commandMenuItem) => commandMenuItem.navigationTargetObjectMetadata,+ )+ commandMenuItems: Relation<CommandMenuItemEntity[]>;}diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.tsindex 62efaa7294a..d78ea62f0cf 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.ts@@ -30,6 +30,7 @@ describe('getColumnNameToFieldMetadataIdMap', () => {universalIdentifier: 'test-object-id',indexMetadataIds: [],searchFieldMetadataIds: [],+ commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],fieldIds,@@ -57,6 +58,7 @@ describe('getColumnNameToFieldMetadataIdMap', () => {pageLayoutUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier: null,imageIdentifierFieldMetadataUniversalIdentifier: null,});diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.tsindex e5536560171..9a13542e728 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.ts@@ -30,6 +30,7 @@ describe('getFieldMetadataIdToColumnNamesMap', () => {universalIdentifier: 'test-object-id',indexMetadataIds: [],searchFieldMetadataIds: [],+ commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],fieldIds,@@ -57,6 +58,7 @@ describe('getFieldMetadataIdToColumnNamesMap', () => {pageLayoutUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier: null,imageIdentifierFieldMetadataUniversalIdentifier: null,});diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.tsindex d424230c336..41827f971b5 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts@@ -31,6 +31,7 @@ describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => {universalIdentifier: 'test-object-id',indexMetadataIds: [],searchFieldMetadataIds: [],+ commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],fieldIds,@@ -58,6 +59,7 @@ describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => {pageLayoutUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier: null,imageIdentifierFieldMetadataUniversalIdentifier: null,});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 5c3b0ac3290..9007e96d65f 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@@ -87,6 +87,8 @@ export const prefillFrontComponentCommandMenuItems = async ({conditionalAvailabilityExpression: null,availabilityObjectMetadataId: null,availabilityObjectMetadataUniversalIdentifier: null,+ navigationTargetObjectMetadataId: null,+ navigationTargetObjectMetadataUniversalIdentifier: null,payload: null,hotKeys: null,pageLayoutId: definition.pageLayoutId ?? 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 3ab4090cc24..c02f38c3a46 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@@ -68,6 +68,8 @@ export const prefillWorkflowCommandMenuItems = async ({conditionalAvailabilityExpression: null,availabilityObjectMetadataId: null,availabilityObjectMetadataUniversalIdentifier: null,+ navigationTargetObjectMetadataId: null,+ navigationTargetObjectMetadataUniversalIdentifier: null,payload: null,hotKeys: null,pageLayoutId: null,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 eb85c3116c5..3916179b05e 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@@ -74,6 +74,8 @@ export const createStandardCommandMenuItemFlatMetadata = ({availabilityObjectMetadataId: resolvedObjectMetadataId,availabilityObjectMetadataUniversalIdentifier:resolvedObjectMetadataUniversalIdentifier,+ navigationTargetObjectMetadataId: null,+ navigationTargetObjectMetadataUniversalIdentifier: null,pageLayoutId: null,pageLayoutUniversalIdentifier: null,isActive: true,diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.tsindex 965cdf37b4b..bbd6fe31161 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.ts@@ -112,6 +112,7 @@ export const createStandardObjectFlatMetadata = <fieldIds: [],indexMetadataIds: [],searchFieldMetadataIds: [],+ commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],viewIds: [],@@ -128,6 +129,7 @@ export const createStandardObjectFlatMetadata = <indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],pageLayoutUniversalIdentifiers: [],+ commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier,imageIdentifierFieldMetadataUniversalIdentifier,};diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/__tests__/__snapshots__/all-universal-flat-entity-foreign-key-aggregator-properties.constant.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/__tests__/__snapshots__/all-universal-flat-entity-foreign-key-aggregator-properties.constant.spec.ts.snapindex 2a7792d8999..6f2ceb506f5 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/__tests__/__snapshots__/all-universal-flat-entity-foreign-key-aggregator-properties.constant.spec.ts.snap+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/__tests__/__snapshots__/all-universal-flat-entity-foreign-key-aggregator-properties.constant.spec.ts.snap@@ -30,6 +30,7 @@ exports[`ALL_UNIVERSAL_FLAT_ENTITY_FOREIGN_KEY_AGGREGATOR_PROPERTIES should matc"viewUniversalIdentifiers","searchFieldMetadataUniversalIdentifiers","pageLayoutUniversalIdentifiers",+ "commandMenuItemUniversalIdentifiers",],"objectPermission": [],"pageLayout": [diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/__snapshots__/delete-flat-entity-foreign-key-aggregators.util.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/__snapshots__/delete-flat-entity-foreign-key-aggregators.util.spec.ts.snapindex a6a8c31f51d..49e4e143fa3 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/__snapshots__/delete-flat-entity-foreign-key-aggregators.util.spec.ts.snap+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/__snapshots__/delete-flat-entity-foreign-key-aggregators.util.spec.ts.snap@@ -45,6 +45,7 @@ exports[`deleteFlatEntityForeignKeyAggregators should strip raw workspace-scoped{"applicationUniversalIdentifier": "application-universal-identifier","color": null,+ "commandMenuItemUniversalIdentifiers": [],"createdAt": "2024-01-01T00:00:00.000Z","description": "default flat object metadata description","duplicateCriteria": null,diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-command-menu-item-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-command-menu-item-validator.service.tsindex 2be0bb5303e..6998ecf5516 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-command-menu-item-validator.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-command-menu-item-validator.service.ts@@ -18,6 +18,9 @@ import { type UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manexport class FlatCommandMenuItemValidatorService {public validateFlatCommandMenuItemCreation({flatEntityToValidate: flatCommandMenuItem,+ optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {+ flatObjectMetadataMaps,+ },}: UniversalFlatEntityValidationArgs<typeof ALL_METADATA_NAME.commandMenuItem>): FailedFlatEntityValidation<'commandMenuItem', 'create'> {@@ -54,6 +57,25 @@ export class FlatCommandMenuItemValidatorService {validationResult,});+ if (+ isDefined(+ flatCommandMenuItem.navigationTargetObjectMetadataUniversalIdentifier,+ ) &&+ !isDefined(+ findFlatEntityByUniversalIdentifier({+ universalIdentifier:+ flatCommandMenuItem.navigationTargetObjectMetadataUniversalIdentifier,+ flatEntityMaps: flatObjectMetadataMaps,+ }),+ )+ ) {+ validationResult.errors.push({+ code: CommandMenuItemExceptionCode.INVALID_COMMAND_MENU_ITEM_INPUT,+ message: t`Navigation target object metadata not found`,+ userFriendlyMessage: msg`Navigation target object not found`,+ });+ }+return validationResult;}diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/command-menu-item/services/create-command-menu-item-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/command-menu-item/services/create-command-menu-item-action-handler.service.tsindex 4a7074c0f4f..d41f16e0f45 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/command-menu-item/services/create-command-menu-item-action-handler.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/command-menu-item/services/create-command-menu-item-action-handler.service.ts@@ -32,12 +32,16 @@ export class CreateCommandMenuItemActionHandlerService extends WorkspaceMigratioflatApplication,workspaceId,}: WorkspaceMigrationActionRunnerArgs<UniversalCreateCommandMenuItemAction>): Promise<FlatCreateCommandMenuItemAction> {- const { availabilityObjectMetadataId, frontComponentId, pageLayoutId } =- resolveUniversalRelationIdentifiersToIds({- flatEntityMaps: allFlatEntityMaps,- metadataName: action.metadataName,- universalForeignKeyValues: action.flatEntity,- });+ const {+ availabilityObjectMetadataId,+ frontComponentId,+ pageLayoutId,+ navigationTargetObjectMetadataId,+ } = resolveUniversalRelationIdentifiersToIds({+ flatEntityMaps: allFlatEntityMaps,+ metadataName: action.metadataName,+ universalForeignKeyValues: action.flatEntity,+ });const overrides = isDefined(action.flatEntity.universalOverrides)? fromUniversalOverridesToCommandMenuItemOverrides({@@ -59,6 +63,7 @@ export class CreateCommandMenuItemActionHandlerService extends WorkspaceMigratioavailabilityObjectMetadataId,frontComponentId,pageLayoutId,+ navigationTargetObjectMetadataId,overrides,applicationId: flatApplication.id,id: action.id ?? v4(),diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.tsindex ddf70ce4292..0f17640fc0e 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.ts@@ -117,6 +117,7 @@ export const fromUniversalFlatObjectMetadataToFlatObjectMetadata = ({viewIds: [],indexMetadataIds: [],searchFieldMetadataIds: [],+ commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],pageLayoutIds: [],