Skip to content

The open alternative to Salesforce, designed for AI.

Move the object navigation command menu item into the metadata side-effect engine (#23795)

Paul Rastoin4f3fb7c29295
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.ts
index 438a7e36f86..09e91ba87ae 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
@@ -3,9 +3,13 @@ import { InjectDataSource } from '@nestjs/typeorm';
import { Command } from 'nest-commander';
import { isDefined } from 'twenty-shared/utils';
import { DataSource } from 'typeorm';
-import { v4, v5 } from 'uuid';
+import { v4 } from 'uuid';
import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import {
+ buildLegacyNavigationFlatCommandMenuItem,
+ getLegacyNavigationCommandUniversalIdentifier,
+} from 'src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util';
import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
import {
type RunOnWorkspaceArgs,
@@ -17,13 +21,7 @@ import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/deco
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 {
- buildNavigationFlatCommandMenuItem,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
- NAVIGATION_INTERPOLATED_ICON,
- NAVIGATION_INTERPOLATED_LABEL,
- NAVIGATION_INTERPOLATED_SHORT_LABEL,
-} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+import { NAVIGATION_INTERPOLATED_ICON, NAVIGATION_INTERPOLATED_LABEL, NAVIGATION_INTERPOLATED_SHORT_LABEL } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
import { seedCompareObjectMetadataForNavigationPosition } from 'src/engine/metadata-modules/flat-command-menu-item/utils/seed-compare-object-metadata-for-navigation-position.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { STANDARD_COMMAND_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant';
@@ -183,9 +181,8 @@ export class RefactorNavigationCommandsCommand extends ProvisionedWorkspaceComma
const flatCommandMenuItemsToCreate: FlatCommandMenuItem[] = [];
for (const objectMetadata of activeObjects) {
- const universalIdentifier = v5(
+ const universalIdentifier = getLegacyNavigationCommandUniversalIdentifier(
objectMetadata.universalIdentifier,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
);
if (existingNavigationUniversalIdentifiers.has(universalIdentifier)) {
@@ -193,7 +190,7 @@ export class RefactorNavigationCommandsCommand extends ProvisionedWorkspaceComma
}
flatCommandMenuItemsToCreate.push(
- buildNavigationFlatCommandMenuItem({
+ buildLegacyNavigationFlatCommandMenuItem({
objectMetadata,
commandMenuItemId: v4(),
applicationId: twentyStandardFlatApplication.id,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-10/utils/__tests__/build-navigation-command-menu-item-operations-or-throw.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-10/utils/__tests__/build-navigation-command-menu-item-operations-or-throw.util.spec.ts
index 35cae2d219e..e728df282e9 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-10/utils/__tests__/build-navigation-command-menu-item-operations-or-throw.util.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-10/utils/__tests__/build-navigation-command-menu-item-operations-or-throw.util.spec.ts
@@ -1,12 +1,11 @@
import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
-import { v5 } from 'uuid';
import { buildNavigationCommandMenuItemOperationsOrThrow } from 'src/database/commands/upgrade-version-command/2-10/utils/build-navigation-command-menu-item-operations-or-throw.util';
-import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
import {
- buildNavigationFlatCommandMenuItem,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
-} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+ buildLegacyNavigationFlatCommandMenuItem,
+ getLegacyNavigationCommandUniversalIdentifier,
+} from 'src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.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 { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
@@ -43,7 +42,7 @@ const buildExistingNavigationItem = ({
nameSingular: string;
position: number;
}): FlatCommandMenuItem =>
- buildNavigationFlatCommandMenuItem({
+ buildLegacyNavigationFlatCommandMenuItem({
objectMetadata: {
id: objectId,
universalIdentifier: objectUniversalIdentifier,
@@ -78,7 +77,7 @@ describe('buildNavigationCommandMenuItemOperationsOrThrow', () => {
expect(result.flatEntityToCreate).toHaveLength(1);
expect(result.flatEntityToCreate[0].universalIdentifier).toBe(
- v5('call-recording', NAVIGATION_COMMAND_UUID_NAMESPACE),
+ getLegacyNavigationCommandUniversalIdentifier('call-recording'),
);
expect(result.flatEntityToCreate[0].position).toBe(0);
expect(result.flatEntityToCreate[0].payload).toEqual({
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-10/utils/build-navigation-command-menu-item-operations-or-throw.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-10/utils/build-navigation-command-menu-item-operations-or-throw.util.ts
index b0bb1458baa..b3ecbb8d799 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-10/utils/build-navigation-command-menu-item-operations-or-throw.util.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-10/utils/build-navigation-command-menu-item-operations-or-throw.util.ts
@@ -1,13 +1,13 @@
import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
import { isDefined } from 'twenty-shared/utils';
-import { v4, v5 } from 'uuid';
+import { v4 } from 'uuid';
-import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
import {
- buildNavigationConditionalAvailabilityExpression,
- buildNavigationFlatCommandMenuItem,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
-} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+ buildLegacyNavigationFlatCommandMenuItem,
+ getLegacyNavigationCommandUniversalIdentifier,
+} from 'src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util';
+import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
+import { buildNavigationConditionalAvailabilityExpression } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type FlatEntityToCreateDeleteUpdate } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-to-create-delete-update.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -43,10 +43,10 @@ export const buildNavigationCommandMenuItemOperationsOrThrow = ({
) + 1;
for (const objectMetadata of objectMetadatasForNavigation) {
- const commandMenuItemUniversalIdentifier = v5(
- objectMetadata.universalIdentifier,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
- );
+ const commandMenuItemUniversalIdentifier =
+ getLegacyNavigationCommandUniversalIdentifier(
+ objectMetadata.universalIdentifier,
+ );
if (
!objectMetadata.isActive ||
@@ -60,7 +60,7 @@ export const buildNavigationCommandMenuItemOperationsOrThrow = ({
}
flatEntityToCreate.push(
- buildNavigationFlatCommandMenuItem({
+ buildLegacyNavigationFlatCommandMenuItem({
objectMetadata,
commandMenuItemId: v4(),
applicationId,
@@ -74,10 +74,10 @@ export const buildNavigationCommandMenuItemOperationsOrThrow = ({
}
for (const renamedCollisionObjectMetadata of renamedCollisionObjectMetadatas) {
- const renamedNavigationCommandMenuItemUniversalIdentifier = v5(
- renamedCollisionObjectMetadata.universalIdentifier,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
- );
+ const renamedNavigationCommandMenuItemUniversalIdentifier =
+ getLegacyNavigationCommandUniversalIdentifier(
+ renamedCollisionObjectMetadata.universalIdentifier,
+ );
const staleNavigationCommandMenuItem =
existingFlatCommandMenuItemMaps.byUniversalIdentifier[
renamedNavigationCommandMenuItemUniversalIdentifier
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-17/utils/__tests__/build-call-recording-navigation-command-menu-item-availability-expression-sync-operations.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-17/utils/__tests__/build-call-recording-navigation-command-menu-item-availability-expression-sync-operations.util.spec.ts
index 980d61ce455..191442f0544 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-17/utils/__tests__/build-call-recording-navigation-command-menu-item-availability-expression-sync-operations.util.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-17/utils/__tests__/build-call-recording-navigation-command-menu-item-availability-expression-sync-operations.util.spec.ts
@@ -7,7 +7,7 @@ import {
LEGACY_CALL_RECORDING_NAVIGATION_AVAILABILITY_EXPRESSION,
} from 'src/database/commands/upgrade-version-command/2-17/utils/build-call-recording-navigation-command-menu-item-availability-expression-sync-operations.util';
import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
-import { buildNavigationFlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+import { buildLegacyNavigationFlatCommandMenuItem } from 'src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -80,7 +80,7 @@ const buildCallRecordingNavigationCommandMenuItem = ({
}: {
conditionalAvailabilityExpression: string | null;
}): FlatCommandMenuItem => ({
- ...buildNavigationFlatCommandMenuItem({
+ ...buildLegacyNavigationFlatCommandMenuItem({
objectMetadata: {
id: 'call-recording-object-metadata-id',
universalIdentifier: STANDARD_OBJECTS.callRecording.universalIdentifier,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-17/utils/build-call-recording-navigation-command-menu-item-availability-expression-sync-operations.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-17/utils/build-call-recording-navigation-command-menu-item-availability-expression-sync-operations.util.ts
index 4cf2b7863e2..5972b62b197 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-17/utils/build-call-recording-navigation-command-menu-item-availability-expression-sync-operations.util.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-17/utils/build-call-recording-navigation-command-menu-item-availability-expression-sync-operations.util.ts
@@ -1,9 +1,8 @@
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { isDefined } from 'twenty-shared/utils';
-import { v5 } from 'uuid';
+import { getLegacyNavigationCommandUniversalIdentifier } from 'src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util';
import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
-import { NAVIGATION_COMMAND_UUID_NAMESPACE } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type FlatEntityToCreateDeleteUpdate } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-to-create-delete-update.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -17,10 +16,10 @@ export const CALL_RECORDING_NAVIGATION_AVAILABILITY_EXPRESSION =
const CALL_RECORDING_OBJECT_UNIVERSAL_IDENTIFIER =
STANDARD_OBJECTS.callRecording.universalIdentifier;
-const CALL_RECORDING_NAVIGATION_COMMAND_MENU_ITEM_UNIVERSAL_IDENTIFIER = v5(
- CALL_RECORDING_OBJECT_UNIVERSAL_IDENTIFIER,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
-);
+const CALL_RECORDING_NAVIGATION_COMMAND_MENU_ITEM_UNIVERSAL_IDENTIFIER =
+ getLegacyNavigationCommandUniversalIdentifier(
+ CALL_RECORDING_OBJECT_UNIVERSAL_IDENTIFIER,
+ );
export const buildCallRecordingNavigationCommandMenuItemAvailabilityExpressionSyncOperations =
({
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-33/2-33-workspace-command-1787127900000-migrate-command-menu-item-labels-to-placeholders.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-33/2-33-workspace-command-1787127900000-migrate-command-menu-item-labels-to-placeholders.command.ts
index 052deda60c9..07a93f757a5 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-33/2-33-workspace-command-1787127900000-migrate-command-menu-item-labels-to-placeholders.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-33/2-33-workspace-command-1787127900000-migrate-command-menu-item-labels-to-placeholders.command.ts
@@ -8,11 +8,7 @@ import { ApplicationService } from 'src/engine/core-modules/application/applicat
import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
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 {
- NAVIGATION_INTERPOLATED_ICON,
- NAVIGATION_INTERPOLATED_LABEL,
- NAVIGATION_INTERPOLATED_SHORT_LABEL,
-} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+import { NAVIGATION_INTERPOLATED_ICON, NAVIGATION_INTERPOLATED_LABEL, NAVIGATION_INTERPOLATED_SHORT_LABEL } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
import { STANDARD_COMMAND_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant';
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';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-37/utils/__tests__/compute-settings-navigation-display-field-restore.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-37/utils/__tests__/compute-settings-navigation-display-field-restore.util.spec.ts
index 2eebd115231..0e0f9368c56 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-37/utils/__tests__/compute-settings-navigation-display-field-restore.util.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-37/utils/__tests__/compute-settings-navigation-display-field-restore.util.spec.ts
@@ -1,10 +1,6 @@
import { computeSettingsNavigationDisplayFieldRestore } from 'src/database/commands/upgrade-version-command/2-37/utils/compute-settings-navigation-display-field-restore.util';
import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
-import {
- NAVIGATION_INTERPOLATED_ICON,
- NAVIGATION_INTERPOLATED_LABEL,
- NAVIGATION_INTERPOLATED_SHORT_LABEL,
-} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+import { NAVIGATION_INTERPOLATED_ICON, NAVIGATION_INTERPOLATED_LABEL, NAVIGATION_INTERPOLATED_SHORT_LABEL } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.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 { STANDARD_COMMAND_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.ts
index 59c08f8cfc2..2d75e44b49d 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.ts
@@ -1,4 +1,5 @@
import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';
import { NormalizeCompanyDomainNamesCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787935130000-normalize-company-domain-names.command';
@@ -7,7 +8,10 @@ import { EnableEditLayoutAcrossAppCommand } from 'src/database/commands/upgrade-
import { BackfillLinkedTimelineActivityHappensAtCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787914663665-backfill-linked-timeline-activity-happens-at.command';
import { ConfigureTimelineActivityHappensAtCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787918663365-configure-timeline-activity-happens-at.command';
import { PinAskAiCommandMenuItemCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787938100000-pin-ask-ai-command-menu-item.command';
+import { ReownObjectNavigationCommandMenuItemsCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788166853000-reown-object-navigation-command-menu-items.command';
+import { ProvisionMissingObjectNavigationCommandMenuItemsCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788181550000-provision-missing-object-navigation-command-menu-items.command';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
+import { CommandMenuItemEntity } from 'src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity';
import { WorkspaceSchemaManagerModule } from 'src/engine/twenty-orm/workspace-schema-manager/workspace-schema-manager.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';
@@ -16,6 +20,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
@Module({
imports: [
ApplicationModule,
+ TypeOrmModule.forFeature([CommandMenuItemEntity]),
WorkspaceCacheModule,
WorkspaceIteratorModule,
WorkspaceMigrationModule,
@@ -29,6 +34,8 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
BackfillLinkedTimelineActivityHappensAtCommand,
ConfigureTimelineActivityHappensAtCommand,
PinAskAiCommandMenuItemCommand,
+ ReownObjectNavigationCommandMenuItemsCommand,
+ ProvisionMissingObjectNavigationCommandMenuItemsCommand,
],
})
export class V2_38_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788166853000-reown-object-navigation-command-menu-items.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788166853000-reown-object-navigation-command-menu-items.command.ts
new file mode 100644
index 00000000000..1ab9166b3f3
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788166853000-reown-object-navigation-command-menu-items.command.ts
@@ -0,0 +1,173 @@
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Command } from 'nest-commander';
+import { getSystemNavigationCommandMenuItemUniversalIdentifier } from 'twenty-shared/application';
+import { isDefined } from 'twenty-shared/utils';
+import { Repository } 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 { invalidateCommandMenuItemReownCache } from 'src/database/commands/upgrade-version-command/2-38/utils/invalidate-command-menu-item-reown-cache.util';
+import { getLegacyNavigationCommandUniversalIdentifier } from 'src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { CommandMenuItemEntity } from 'src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity';
+import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service';
+
+type ReownUpdate = {
+ id: string;
+ update: {
+ universalIdentifier?: string;
+ isSystemSideEffect?: boolean;
+ };
+};
+
+@RegisteredWorkspaceCommand('2.38.0', 1788166853000)
+@Command({
+ name: 'upgrade:2-38:reown-object-navigation-command-menu-items',
+ description:
+ 'Move the object navigation command menu items off the retired v5 namespace derivation, which was keyed on the object alone, onto the derived (application, object) universal identifier. Walks objects rather than command menu items and takes only the row sitting on the legacy identifier of the object and belonging to the same application as that object, so a command an application authored for an object is never adopted. Only universalIdentifier changes, plus isSystemSideEffect for rows the 2.12 backfill left false because they belong to the workspace custom application: position, isPinned, hotKeys and overrides are untouched so the re-own is workspace-invisible. Idempotent, since a converged object no longer has a row on its legacy identifier. A derived identifier already held by another row keeps its holder, the legacy row keeps its identifier with a warning, and the flag is still reconciled.',
+})
+export class ReownObjectNavigationCommandMenuItemsCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
+ // eslint-disable-next-line twenty/prefer-workspace-scoped-repository
+ @InjectRepository(CommandMenuItemEntity)
+ private readonly commandMenuItemRepository: Repository<CommandMenuItemEntity>,
+ ) {
+ 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 commandMenuItemUpdates = this.computeReownUpdates({
+ workspaceId,
+ flatCommandMenuItemMaps,
+ flatObjectMetadataMaps,
+ });
+
+ if (commandMenuItemUpdates.length === 0) {
+ this.logger.log(
+ `No object navigation command menu item to re-own for workspace ${workspaceId}`,
+ );
+
+ return;
+ }
+
+ this.logger.log(
+ `${isDryRun ? '[DRY RUN] ' : ''}Re-owning ${commandMenuItemUpdates.length} object navigation command menu item(s) for workspace ${workspaceId}`,
+ );
+
+ if (isDryRun) {
+ return;
+ }
+
+ await this.commandMenuItemRepository.manager.transaction(
+ async (entityManager) => {
+ const transactionalCommandMenuItemRepository =
+ entityManager.getRepository(CommandMenuItemEntity);
+
+ for (const { id, update } of commandMenuItemUpdates) {
+ await transactionalCommandMenuItemRepository.update(
+ { id, workspaceId },
+ update,
+ );
+ }
+ },
+ );
+
+ await invalidateCommandMenuItemReownCache({
+ workspaceId,
+ workspaceMigrationRunnerService: this.workspaceMigrationRunnerService,
+ });
+
+ this.logger.log(
+ `Re-owned ${commandMenuItemUpdates.length} object navigation command menu item(s) for workspace ${workspaceId}`,
+ );
+ }
+
+ private computeReownUpdates({
+ workspaceId,
+ flatCommandMenuItemMaps,
+ flatObjectMetadataMaps,
+ }: {
+ workspaceId: string;
+ flatCommandMenuItemMaps: AllFlatEntityMaps['flatCommandMenuItemMaps'];
+ flatObjectMetadataMaps: AllFlatEntityMaps['flatObjectMetadataMaps'];
+ }): ReownUpdate[] {
+ const commandMenuItemUpdates: ReownUpdate[] = [];
+
+ for (const flatObjectMetadata of Object.values(
+ flatObjectMetadataMaps.byUniversalIdentifier,
+ )) {
+ if (!isDefined(flatObjectMetadata)) {
+ continue;
+ }
+
+ const legacyFlatCommandMenuItem =
+ flatCommandMenuItemMaps.byUniversalIdentifier[
+ getLegacyNavigationCommandUniversalIdentifier(
+ flatObjectMetadata.universalIdentifier,
+ )
+ ];
+
+ if (
+ !isDefined(legacyFlatCommandMenuItem) ||
+ legacyFlatCommandMenuItem.applicationUniversalIdentifier !==
+ flatObjectMetadata.applicationUniversalIdentifier
+ ) {
+ continue;
+ }
+
+ const derivedUniversalIdentifier =
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier:
+ flatObjectMetadata.applicationUniversalIdentifier,
+ objectUniversalIdentifier: flatObjectMetadata.universalIdentifier,
+ });
+
+ const update: ReownUpdate['update'] = {};
+
+ if (!legacyFlatCommandMenuItem.isSystemSideEffect) {
+ update.isSystemSideEffect = true;
+ }
+
+ if (
+ isDefined(
+ flatCommandMenuItemMaps.byUniversalIdentifier[
+ derivedUniversalIdentifier
+ ],
+ )
+ ) {
+ this.logger.warn(
+ `Derived identifier ${derivedUniversalIdentifier} of navigation command menu item ${legacyFlatCommandMenuItem.id} is already held by another command menu item in workspace ${workspaceId}, keeping its identifier`,
+ );
+ } else {
+ update.universalIdentifier = derivedUniversalIdentifier;
+ }
+
+ if (Object.keys(update).length > 0) {
+ commandMenuItemUpdates.push({
+ id: legacyFlatCommandMenuItem.id,
+ update,
+ });
+ }
+ }
+
+ return commandMenuItemUpdates;
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788181550000-provision-missing-object-navigation-command-menu-items.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788181550000-provision-missing-object-navigation-command-menu-items.command.ts
new file mode 100644
index 00000000000..f1b44f8e833
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788181550000-provision-missing-object-navigation-command-menu-items.command.ts
@@ -0,0 +1,209 @@
+import { Command } from 'nest-commander';
+import { getSystemNavigationCommandMenuItemUniversalIdentifier } from 'twenty-shared/application';
+import { isDefined } from 'twenty-shared/utils';
+
+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 { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { buildObjectNavigationUniversalFlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
+import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+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';
+import { type UniversalFlatCommandMenuItem } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-command-menu-item.type';
+
+@RegisteredWorkspaceCommand('2.38.0', 1788181550000)
+@Command({
+ name: 'upgrade:2-38:provision-missing-object-navigation-command-menu-items',
+ description:
+ 'Provision the navigation command menu item of every object that has none. Objects installed through an application manifest never got one: objectNavigationCommandOnCreate noops on that path because the manifest mints entity ids after side-effect expansion and the NAVIGATION payload needs the object id (the dual write tracked by core-team-issues#2794). Scoped to application-installed objects: twenty-standard seeds its own through the from/to sync it owns, and workspace-custom objects go through the API path where the create handler already provisions. Mints exactly what the create handler mints, under the application owning the object, one migration per application, with isActive mirroring the object so an inactive object gets a disabled command. Skips any object that already has a command menu item targeting it, so it is idempotent and leaves rows the 2-38 re-own could not converge alone. Runs after that re-own so a converged row is recognised by its derived identifier.',
+})
+export class ProvisionMissingObjectNavigationCommandMenuItemsCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly applicationService: ApplicationService,
+ 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 { twentyStandardFlatApplication, workspaceCustomFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ );
+
+ const flatCommandMenuItemsToCreateByApplication =
+ this.computeFlatCommandMenuItemsToCreateByApplication({
+ flatCommandMenuItemMaps,
+ flatObjectMetadataMaps,
+ excludedApplicationUniversalIdentifiers: new Set([
+ twentyStandardFlatApplication.universalIdentifier,
+ workspaceCustomFlatApplication.universalIdentifier,
+ ]),
+ });
+
+ if (flatCommandMenuItemsToCreateByApplication.size === 0) {
+ this.logger.log(
+ `Every object already has a navigation command menu item in workspace ${workspaceId}`,
+ );
+
+ return;
+ }
+
+ const totalCount = [
+ ...flatCommandMenuItemsToCreateByApplication.values(),
+ ].reduce((count, flatCommandMenuItems) => count + flatCommandMenuItems.length, 0);
+
+ this.logger.log(
+ `${isDryRun ? '[DRY RUN] ' : ''}Provisioning ${totalCount} missing object navigation command menu item(s) across ${flatCommandMenuItemsToCreateByApplication.size} application(s) for workspace ${workspaceId}`,
+ );
+
+ if (isDryRun) {
+ return;
+ }
+
+ for (const [
+ applicationUniversalIdentifier,
+ flatCommandMenuItemsToCreate,
+ ] of flatCommandMenuItemsToCreateByApplication) {
+ const result =
+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
+ {
+ isSystemBuild: true,
+ workspaceId,
+ applicationUniversalIdentifier,
+ allFlatEntityOperationByMetadataName: {
+ commandMenuItem: {
+ flatEntityToCreate: flatCommandMenuItemsToCreate,
+ flatEntityToUpdate: [],
+ flatEntityToDelete: [],
+ },
+ } as never,
+ },
+ );
+
+ if (result.status === 'fail') {
+ this.logger.error(
+ `Failed to provision navigation command menu item(s) for application ${applicationUniversalIdentifier} in workspace ${workspaceId}:\n${JSON.stringify(result, null, 2)}`,
+ );
+
+ throw new Error(
+ `Failed to provision navigation command menu item(s) for workspace ${workspaceId}`,
+ );
+ }
+ }
+
+ this.logger.log(
+ `Provisioned ${totalCount} object navigation command menu item(s) for workspace ${workspaceId}`,
+ );
+ }
+
+ private computeFlatCommandMenuItemsToCreateByApplication({
+ flatCommandMenuItemMaps,
+ flatObjectMetadataMaps,
+ excludedApplicationUniversalIdentifiers,
+ }: {
+ flatCommandMenuItemMaps: AllFlatEntityMaps['flatCommandMenuItemMaps'];
+ flatObjectMetadataMaps: AllFlatEntityMaps['flatObjectMetadataMaps'];
+ excludedApplicationUniversalIdentifiers: Set<string>;
+ }): Map<string, UniversalFlatCommandMenuItem[]> {
+ const flatCommandMenuItemsToCreateByApplication = new Map<
+ string,
+ UniversalFlatCommandMenuItem[]
+ >();
+
+ const maxPosition = Object.values(
+ flatCommandMenuItemMaps.byUniversalIdentifier,
+ )
+ .filter(isDefined)
+ .reduce(
+ (max, flatCommandMenuItem) =>
+ Math.max(max, flatCommandMenuItem.position),
+ -1,
+ );
+
+ let nextPosition = maxPosition + 1;
+ const now = new Date().toISOString();
+
+ for (const flatObjectMetadata of Object.values(
+ flatObjectMetadataMaps.byUniversalIdentifier,
+ )) {
+ if (
+ !isDefined(flatObjectMetadata) ||
+ excludedApplicationUniversalIdentifiers.has(
+ flatObjectMetadata.applicationUniversalIdentifier,
+ )
+ ) {
+ continue;
+ }
+
+ const objectAlreadyHasNavigationCommandMenuItem =
+ flatObjectMetadata.commandMenuItemUniversalIdentifiers.some(
+ (universalIdentifier) =>
+ isDefined(
+ flatCommandMenuItemMaps.byUniversalIdentifier[universalIdentifier],
+ ),
+ );
+
+ const derivedUniversalIdentifier =
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier:
+ flatObjectMetadata.applicationUniversalIdentifier,
+ objectUniversalIdentifier: flatObjectMetadata.universalIdentifier,
+ });
+
+ if (
+ objectAlreadyHasNavigationCommandMenuItem ||
+ isDefined(
+ flatCommandMenuItemMaps.byUniversalIdentifier[
+ derivedUniversalIdentifier
+ ],
+ )
+ ) {
+ continue;
+ }
+
+ const flatCommandMenuItemToCreate =
+ buildObjectNavigationUniversalFlatCommandMenuItem({
+ objectMetadata: {
+ id: flatObjectMetadata.id,
+ universalIdentifier: flatObjectMetadata.universalIdentifier,
+ nameSingular: flatObjectMetadata.nameSingular,
+ shortcut: flatObjectMetadata.shortcut,
+ isActive: flatObjectMetadata.isActive,
+ },
+ applicationUniversalIdentifier:
+ flatObjectMetadata.applicationUniversalIdentifier,
+ position: nextPosition++,
+ now,
+ });
+
+ const existing =
+ flatCommandMenuItemsToCreateByApplication.get(
+ flatObjectMetadata.applicationUniversalIdentifier,
+ ) ?? [];
+
+ existing.push(flatCommandMenuItemToCreate);
+ flatCommandMenuItemsToCreateByApplication.set(
+ flatObjectMetadata.applicationUniversalIdentifier,
+ existing,
+ );
+ }
+
+ return flatCommandMenuItemsToCreateByApplication;
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/__tests__/2-38-workspace-command-1788166853000-reown-object-navigation-command-menu-items.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/__tests__/2-38-workspace-command-1788166853000-reown-object-navigation-command-menu-items.command.spec.ts
new file mode 100644
index 00000000000..d66d31d6c1e
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/__tests__/2-38-workspace-command-1788166853000-reown-object-navigation-command-menu-items.command.spec.ts
@@ -0,0 +1,252 @@
+import { getSystemNavigationCommandMenuItemUniversalIdentifier } from 'twenty-shared/application';
+
+import { type WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { getLegacyNavigationCommandUniversalIdentifier } from 'src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util';
+import { ReownObjectNavigationCommandMenuItemsCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788166853000-reown-object-navigation-command-menu-items.command';
+import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
+import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { type WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service';
+
+const WORKSPACE_ID = '20202020-0000-4000-8000-000000000001';
+const APPLICATION_UNIVERSAL_IDENTIFIER =
+ '20202020-0000-4000-8000-0000000000ad';
+const OBJECT_ID = '20202020-0000-4000-8000-0000000000b1';
+const OBJECT_UNIVERSAL_IDENTIFIER = '20202020-0000-4000-8000-0000000000bb';
+
+const DERIVED_UNIVERSAL_IDENTIFIER = getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+});
+
+const LEGACY_UNIVERSAL_IDENTIFIER = getLegacyNavigationCommandUniversalIdentifier(
+ OBJECT_UNIVERSAL_IDENTIFIER,
+);
+
+type WorkspaceCommandMenuItem = {
+ id: string;
+ universalIdentifier: string;
+ applicationUniversalIdentifier?: string;
+ engineComponentKey?: EngineComponentKey;
+ payload?: object | null;
+ navigationTargetObjectMetadataUniversalIdentifier?: string | null;
+ isSystemSideEffect?: boolean;
+};
+
+const buildFlatCommandMenuItem = (
+ commandMenuItem: WorkspaceCommandMenuItem,
+) => ({
+ engineComponentKey: EngineComponentKey.NAVIGATION,
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ payload: { objectMetadataItemId: OBJECT_ID },
+ navigationTargetObjectMetadataUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ ...commandMenuItem,
+});
+
+const buildByUniversalIdentifierMap = <
+ T extends { universalIdentifier: string },
+>(
+ flatEntities: T[],
+) => ({
+ byUniversalIdentifier: Object.fromEntries(
+ flatEntities.map((flatEntity) => [
+ flatEntity.universalIdentifier,
+ flatEntity,
+ ]),
+ ),
+});
+
+describe('ReownObjectNavigationCommandMenuItemsCommand', () => {
+ let command: ReownObjectNavigationCommandMenuItemsCommand;
+ let getOrRecomputeMock: jest.Mock;
+ let invalidateCacheMock: jest.Mock;
+ let commandMenuItemUpdateMock: jest.Mock;
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+
+ getOrRecomputeMock = jest.fn();
+ invalidateCacheMock = jest.fn().mockResolvedValue(undefined);
+ commandMenuItemUpdateMock = jest.fn().mockResolvedValue(undefined);
+
+ const entityManagerMock = {
+ getRepository: () => ({ update: commandMenuItemUpdateMock }),
+ };
+
+ const commandMenuItemRepositoryMock = {
+ manager: {
+ transaction: jest.fn(
+ async (callback: (entityManager: unknown) => Promise<void>) =>
+ callback(entityManagerMock),
+ ),
+ },
+ };
+
+ command = new ReownObjectNavigationCommandMenuItemsCommand(
+ {} as WorkspaceIteratorService,
+ {
+ getOrRecompute: getOrRecomputeMock,
+ } as unknown as WorkspaceCacheService,
+ {
+ invalidateCache: invalidateCacheMock,
+ } as unknown as WorkspaceMigrationRunnerService,
+ commandMenuItemRepositoryMock as never,
+ );
+ });
+
+ const mockWorkspaceCache = (
+ commandMenuItems: ReturnType<typeof buildFlatCommandMenuItem>[],
+ ) => {
+ getOrRecomputeMock.mockResolvedValue({
+ flatCommandMenuItemMaps: buildByUniversalIdentifierMap(commandMenuItems),
+ flatObjectMetadataMaps: {
+ ...buildByUniversalIdentifierMap([
+ {
+ universalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ },
+ ]),
+ universalIdentifierById: { [OBJECT_ID]: OBJECT_UNIVERSAL_IDENTIFIER },
+ },
+ });
+ };
+
+ const runOnWorkspace = (dryRun = false) =>
+ command.runOnWorkspace({
+ workspaceId: WORKSPACE_ID,
+ options: { dryRun },
+ index: 0,
+ total: 1,
+ });
+
+ it('re-owns a legacy-identifier navigation command onto the derived identifier', async () => {
+ mockWorkspaceCache([
+ buildFlatCommandMenuItem({
+ id: 'command-id',
+ universalIdentifier: LEGACY_UNIVERSAL_IDENTIFIER,
+ }),
+ ]);
+
+ await runOnWorkspace();
+
+ expect(commandMenuItemUpdateMock).toHaveBeenCalledTimes(1);
+ expect(commandMenuItemUpdateMock).toHaveBeenCalledWith(
+ { id: 'command-id', workspaceId: WORKSPACE_ID },
+ { universalIdentifier: DERIVED_UNIVERSAL_IDENTIFIER },
+ );
+ expect(invalidateCacheMock).toHaveBeenCalledTimes(1);
+ });
+
+ it('also reconciles the flag when a legacy row carries isSystemSideEffect false', async () => {
+ mockWorkspaceCache([
+ buildFlatCommandMenuItem({
+ id: 'command-id',
+ universalIdentifier: LEGACY_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: false,
+ }),
+ ]);
+
+ await runOnWorkspace();
+
+ expect(commandMenuItemUpdateMock).toHaveBeenCalledWith(
+ { id: 'command-id', workspaceId: WORKSPACE_ID },
+ {
+ universalIdentifier: DERIVED_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ },
+ );
+ });
+
+ it('is a noop for rows already holding their derived identifier', async () => {
+ mockWorkspaceCache([
+ buildFlatCommandMenuItem({
+ id: 'command-id',
+ universalIdentifier: DERIVED_UNIVERSAL_IDENTIFIER,
+ }),
+ ]);
+
+ await runOnWorkspace();
+
+ expect(commandMenuItemUpdateMock).not.toHaveBeenCalled();
+ expect(invalidateCacheMock).not.toHaveBeenCalled();
+ });
+
+ it('skips path-based NAVIGATION commands and rows whose object is missing', async () => {
+ mockWorkspaceCache([
+ buildFlatCommandMenuItem({
+ id: 'path-command-id',
+ universalIdentifier: 'path-identifier',
+ payload: { path: '/settings/profile' },
+ navigationTargetObjectMetadataUniversalIdentifier: null,
+ }),
+ buildFlatCommandMenuItem({
+ id: 'orphan-command-id',
+ universalIdentifier: 'orphan-identifier',
+ payload: { objectMetadataItemId: 'missing-object-id' },
+ navigationTargetObjectMetadataUniversalIdentifier:
+ 'missing-object-universal-identifier',
+ }),
+ ]);
+
+ await runOnWorkspace();
+
+ expect(commandMenuItemUpdateMock).not.toHaveBeenCalled();
+ });
+
+ it('skips the re-own when the derived identifier is already held by another row', async () => {
+ mockWorkspaceCache([
+ buildFlatCommandMenuItem({
+ id: 'legacy-command-id',
+ universalIdentifier: LEGACY_UNIVERSAL_IDENTIFIER,
+ }),
+ buildFlatCommandMenuItem({
+ id: 'holder-command-id',
+ universalIdentifier: DERIVED_UNIVERSAL_IDENTIFIER,
+ payload: { path: '/unrelated' },
+ navigationTargetObjectMetadataUniversalIdentifier: null,
+ }),
+ ]);
+
+ await runOnWorkspace();
+
+ expect(commandMenuItemUpdateMock).not.toHaveBeenCalled();
+ });
+
+ it('still reconciles ownership when the derived identifier is already held by another row', async () => {
+ mockWorkspaceCache([
+ buildFlatCommandMenuItem({
+ id: 'legacy-command-id',
+ universalIdentifier: LEGACY_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: false,
+ }),
+ buildFlatCommandMenuItem({
+ id: 'holder-command-id',
+ universalIdentifier: DERIVED_UNIVERSAL_IDENTIFIER,
+ payload: { path: '/unrelated' },
+ navigationTargetObjectMetadataUniversalIdentifier: null,
+ }),
+ ]);
+
+ await runOnWorkspace();
+
+ expect(commandMenuItemUpdateMock).toHaveBeenCalledTimes(1);
+ expect(commandMenuItemUpdateMock).toHaveBeenCalledWith(
+ { id: 'legacy-command-id', workspaceId: WORKSPACE_ID },
+ { isSystemSideEffect: true },
+ );
+ });
+
+ it('does not write anything in dry-run mode', async () => {
+ mockWorkspaceCache([
+ buildFlatCommandMenuItem({
+ id: 'command-id',
+ universalIdentifier: LEGACY_UNIVERSAL_IDENTIFIER,
+ }),
+ ]);
+
+ await runOnWorkspace(true);
+
+ expect(commandMenuItemUpdateMock).not.toHaveBeenCalled();
+ expect(invalidateCacheMock).not.toHaveBeenCalled();
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/invalidate-command-menu-item-reown-cache.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/invalidate-command-menu-item-reown-cache.util.ts
new file mode 100644
index 00000000000..d9cf10a3b13
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/invalidate-command-menu-item-reown-cache.util.ts
@@ -0,0 +1,23 @@
+import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
+import { getMetadataRelatedMetadataNames } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-related-metadata-names.util';
+import { type WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service';
+
+export const invalidateCommandMenuItemReownCache = async ({
+ workspaceId,
+ workspaceMigrationRunnerService,
+}: {
+ workspaceId: string;
+ workspaceMigrationRunnerService: WorkspaceMigrationRunnerService;
+}): Promise<void> => {
+ const reownedMetadataRelatedNames = [
+ 'commandMenuItem',
+ ...getMetadataRelatedMetadataNames('commandMenuItem'),
+ ] as const;
+
+ await workspaceMigrationRunnerService.invalidateCache({
+ allFlatEntityMapsKeys: [
+ ...new Set(reownedMetadataRelatedNames.map(getMetadataFlatEntityMapsKey)),
+ ],
+ workspaceId,
+ });
+};
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.ts
new file mode 100644
index 00000000000..1635546541b
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/utils/build-legacy-navigation-flat-command-menu-item.util.ts
@@ -0,0 +1,83 @@
+import { isDefined } from 'twenty-shared/utils';
+import { v5 } from 'uuid';
+
+import { CommandMenuItemAvailabilityType } from 'twenty-shared/types';
+import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
+import { NAVIGATION_INTERPOLATED_ICON, NAVIGATION_INTERPOLATED_LABEL, NAVIGATION_INTERPOLATED_SHORT_LABEL, buildNavigationConditionalAvailabilityExpression } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
+import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
+
+export const LEGACY_NAVIGATION_COMMAND_UUID_NAMESPACE =
+ 'b31830da-2ae0-48eb-a915-12fa4ab96dd3';
+
+export const getLegacyNavigationCommandUniversalIdentifier = (
+ objectUniversalIdentifier: string,
+): string =>
+ v5(objectUniversalIdentifier, LEGACY_NAVIGATION_COMMAND_UUID_NAMESPACE);
+
+export const buildLegacyNavigationFlatCommandMenuItem = ({
+ objectMetadata,
+ commandMenuItemId,
+ applicationId,
+ applicationUniversalIdentifier,
+ workspaceId,
+ position,
+ now,
+}: {
+ objectMetadata: {
+ id: string;
+ universalIdentifier: string;
+ nameSingular: string;
+ shortcut: string | null;
+ };
+ commandMenuItemId: string;
+ applicationId: string;
+ applicationUniversalIdentifier: string;
+ workspaceId: string;
+ position: number;
+ now: string;
+}): FlatCommandMenuItem => {
+ const universalIdentifier = getLegacyNavigationCommandUniversalIdentifier(
+ objectMetadata.universalIdentifier,
+ );
+
+ const conditionalAvailabilityExpression =
+ buildNavigationConditionalAvailabilityExpression({
+ universalIdentifier: objectMetadata.universalIdentifier,
+ nameSingular: objectMetadata.nameSingular,
+ });
+
+ return {
+ id: commandMenuItemId,
+ universalIdentifier,
+ applicationId,
+ applicationUniversalIdentifier,
+ workspaceId,
+ label: NAVIGATION_INTERPOLATED_LABEL,
+ shortLabel: NAVIGATION_INTERPOLATED_SHORT_LABEL,
+ icon: NAVIGATION_INTERPOLATED_ICON,
+ position,
+ isPinned: false,
+ availabilityType: CommandMenuItemAvailabilityType.GLOBAL,
+ conditionalAvailabilityExpression,
+ frontComponentId: null,
+ frontComponentUniversalIdentifier: null,
+ engineComponentKey: EngineComponentKey.NAVIGATION,
+ payload: { objectMetadataItemId: objectMetadata.id },
+ navigationTargetObjectMetadataId: null,
+ navigationTargetObjectMetadataUniversalIdentifier: null,
+ hotKeys: isDefined(objectMetadata.shortcut)
+ ? ['G', objectMetadata.shortcut]
+ : null,
+ workflowVersionId: null,
+ availabilityObjectMetadataId: null,
+ availabilityObjectMetadataUniversalIdentifier: null,
+ pageLayoutId: null,
+ pageLayoutUniversalIdentifier: null,
+ isActive: true,
+ isSystemSideEffect: true,
+ overrides: null,
+ universalOverrides: null,
+ createdAt: now,
+ updatedAt: now,
+ };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/__tests__/interpolate-navigation-command-menu-item-field.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/__tests__/interpolate-navigation-command-menu-item-field.util.spec.ts
index a933056e88f..39a3325a1d2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/__tests__/interpolate-navigation-command-menu-item-field.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/__tests__/interpolate-navigation-command-menu-item-field.util.spec.ts
@@ -5,7 +5,7 @@ import {
NAVIGATION_INTERPOLATED_ICON,
NAVIGATION_INTERPOLATED_LABEL,
NAVIGATION_INTERPOLATED_SHORT_LABEL,
-} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
const mockI18nInstance = {
_: (messageId: string) => messageId,
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-object-navigation-flat-command-menu-item.util.spec.ts
similarity index 59%
rename from packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-navigation-flat-command-menu-item.util.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-flat-command-menu-item.util.spec.ts
index c36c6e80444..ea51226926f 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-object-navigation-flat-command-menu-item.util.spec.ts
@@ -1,69 +1,84 @@
+import { getSystemNavigationCommandMenuItemUniversalIdentifier } from 'twenty-shared/application';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { v5 } from 'uuid';
import { CommandMenuItemAvailabilityType } from 'twenty-shared/types';
import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
import {
- buildNavigationConditionalAvailabilityExpression,
- buildNavigationFlatCommandMenuItem,
NAVIGATION_INTERPOLATED_ICON,
NAVIGATION_INTERPOLATED_LABEL,
NAVIGATION_INTERPOLATED_SHORT_LABEL,
-} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
+import { buildObjectNavigationFlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-flat-command-menu-item.util';
-const NAVIGATION_COMMAND_UUID_NAMESPACE =
- 'b31830da-2ae0-48eb-a915-12fa4ab96dd3';
+const APPLICATION_UNIVERSAL_IDENTIFIER = 'a1a2a3a4-a5a6-4000-8000-000000000001';
+const OTHER_APPLICATION_UNIVERSAL_IDENTIFIER =
+ 'a1a2a3a4-a5a6-4000-8000-000000000002';
const baseObjectMetadata = {
id: 'obj-id-1',
universalIdentifier: 'obj-universal-1',
nameSingular: 'person',
shortcut: 'P',
+ isActive: true,
};
const baseArgs = {
objectMetadata: baseObjectMetadata,
commandMenuItemId: 'cmd-id-1',
applicationId: 'app-id-1',
- applicationUniversalIdentifier: 'app-universal-1',
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
workspaceId: 'ws-id-1',
position: 5,
now: '2026-01-01T00:00:00.000Z',
};
-describe('buildNavigationFlatCommandMenuItem', () => {
- it('should produce a deterministic universalIdentifier via UUID v5', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+describe('buildObjectNavigationFlatCommandMenuItem', () => {
+ it('should derive the universalIdentifier from the application and the object', () => {
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
- const expectedUniversalIdentifier = v5(
- baseObjectMetadata.universalIdentifier,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
- );
+ const expectedUniversalIdentifier =
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier:
+ baseArgs.applicationUniversalIdentifier,
+ objectUniversalIdentifier: baseObjectMetadata.universalIdentifier,
+ });
expect(result.universalIdentifier).toBe(expectedUniversalIdentifier);
});
+ it('should derive different universalIdentifiers for different applications', () => {
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
+ const otherApplicationResult = buildObjectNavigationFlatCommandMenuItem({
+ ...baseArgs,
+ applicationUniversalIdentifier: OTHER_APPLICATION_UNIVERSAL_IDENTIFIER,
+ });
+
+ expect(result.universalIdentifier).not.toBe(
+ otherApplicationResult.universalIdentifier,
+ );
+ });
+
it('should set label and shortLabel as interpolation templates', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.label).toBe(NAVIGATION_INTERPOLATED_LABEL);
expect(result.shortLabel).toBe(NAVIGATION_INTERPOLATED_SHORT_LABEL);
});
it('should set icon as interpolation template', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.icon).toBe(NAVIGATION_INTERPOLATED_ICON);
});
it('should set payload with objectMetadataItemId', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.payload).toEqual({ objectMetadataItemId: 'obj-id-1' });
});
it('should set the target object metadata foreign key alongside the payload', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.navigationTargetObjectMetadataId).toBe('obj-id-1');
expect(result.navigationTargetObjectMetadataUniversalIdentifier).toBe(
@@ -72,13 +87,13 @@ describe('buildNavigationFlatCommandMenuItem', () => {
});
it('should include shortcut in hotKeys when shortcut is defined', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.hotKeys).toEqual(['G', 'P']);
});
it('should set hotKeys to null when shortcut is null', () => {
- const result = buildNavigationFlatCommandMenuItem({
+ const result = buildObjectNavigationFlatCommandMenuItem({
...baseArgs,
objectMetadata: { ...baseObjectMetadata, shortcut: null },
});
@@ -87,7 +102,7 @@ describe('buildNavigationFlatCommandMenuItem', () => {
});
it('should use the provided id, applicationId, workspaceId, and position', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.id).toBe('cmd-id-1');
expect(result.applicationId).toBe('app-id-1');
@@ -96,19 +111,21 @@ describe('buildNavigationFlatCommandMenuItem', () => {
});
it('should set applicationUniversalIdentifier from the provided argument', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
- expect(result.applicationUniversalIdentifier).toBe('app-universal-1');
+ expect(result.applicationUniversalIdentifier).toBe(
+ APPLICATION_UNIVERSAL_IDENTIFIER,
+ );
});
it('should set engineComponentKey to NAVIGATION', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.engineComponentKey).toBe(EngineComponentKey.NAVIGATION);
});
it('should set availabilityType to GLOBAL', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.availabilityType).toBe(
CommandMenuItemAvailabilityType.GLOBAL,
@@ -116,7 +133,7 @@ describe('buildNavigationFlatCommandMenuItem', () => {
});
it('should set conditionalAvailabilityExpression based on nameSingular', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.conditionalAvailabilityExpression).toBe(
'targetObjectReadPermissions.person',
@@ -124,7 +141,7 @@ describe('buildNavigationFlatCommandMenuItem', () => {
});
it('should additionally gate conditionalAvailabilityExpression behind the feature flag for feature-flagged objects', () => {
- const result = buildNavigationFlatCommandMenuItem({
+ const result = buildObjectNavigationFlatCommandMenuItem({
...baseArgs,
objectMetadata: {
...baseObjectMetadata,
@@ -140,13 +157,13 @@ describe('buildNavigationFlatCommandMenuItem', () => {
});
it('should set isPinned to false', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.isPinned).toBe(false);
});
it('should set null fields correctly', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.frontComponentId).toBeNull();
expect(result.frontComponentUniversalIdentifier).toBeNull();
@@ -156,41 +173,9 @@ describe('buildNavigationFlatCommandMenuItem', () => {
});
it('should set createdAt and updatedAt from the now parameter', () => {
- const result = buildNavigationFlatCommandMenuItem(baseArgs);
+ const result = buildObjectNavigationFlatCommandMenuItem(baseArgs);
expect(result.createdAt).toBe('2026-01-01T00:00:00.000Z');
expect(result.updatedAt).toBe('2026-01-01T00:00:00.000Z');
});
});
-
-describe('buildNavigationConditionalAvailabilityExpression', () => {
- it('gates a feature-flagged standard object behind both the flag and read permission', () => {
- expect(
- buildNavigationConditionalAvailabilityExpression({
- universalIdentifier:
- STANDARD_OBJECTS.messageCampaign.universalIdentifier,
- nameSingular: 'messageCampaign',
- }),
- ).toBe(
- 'featureFlags.IS_EMAIL_GROUP_ENABLED and targetObjectReadPermissions.messageCampaign',
- );
- });
-
- it('returns only the read-permission expression for non-gated objects', () => {
- expect(
- buildNavigationConditionalAvailabilityExpression({
- universalIdentifier: 'obj-universal-1',
- nameSingular: 'person',
- }),
- ).toBe('targetObjectReadPermissions.person');
- });
-
- it('does not gate a custom object that reuses a feature-flagged object name', () => {
- expect(
- buildNavigationConditionalAvailabilityExpression({
- universalIdentifier: 'custom-object-universal-id',
- nameSingular: 'messageCampaign',
- }),
- ).toBe('targetObjectReadPermissions.messageCampaign');
- });
-});
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.ts
new file mode 100644
index 00000000000..85334b8ad7c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.ts
@@ -0,0 +1,35 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+
+import { buildNavigationConditionalAvailabilityExpression } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
+
+describe('buildNavigationConditionalAvailabilityExpression', () => {
+ it('gates a feature-flagged standard object behind both the flag and read permission', () => {
+ expect(
+ buildNavigationConditionalAvailabilityExpression({
+ universalIdentifier:
+ STANDARD_OBJECTS.messageCampaign.universalIdentifier,
+ nameSingular: 'messageCampaign',
+ }),
+ ).toBe(
+ 'featureFlags.IS_EMAIL_GROUP_ENABLED and targetObjectReadPermissions.messageCampaign',
+ );
+ });
+
+ it('returns only the read-permission expression for non-gated objects', () => {
+ expect(
+ buildNavigationConditionalAvailabilityExpression({
+ universalIdentifier: 'obj-universal-1',
+ nameSingular: 'person',
+ }),
+ ).toBe('targetObjectReadPermissions.person');
+ });
+
+ it('does not gate a custom object that reuses a feature-flagged object name', () => {
+ expect(
+ buildNavigationConditionalAvailabilityExpression({
+ universalIdentifier: 'custom-object-universal-id',
+ nameSingular: 'messageCampaign',
+ }),
+ ).toBe('targetObjectReadPermissions.messageCampaign');
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-flat-command-menu-item.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-flat-command-menu-item.util.ts
new file mode 100644
index 00000000000..2fca1a60a24
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-flat-command-menu-item.util.ts
@@ -0,0 +1,41 @@
+import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
+import { buildObjectNavigationUniversalFlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
+
+export const buildObjectNavigationFlatCommandMenuItem = ({
+ objectMetadata,
+ commandMenuItemId,
+ applicationId,
+ applicationUniversalIdentifier,
+ workspaceId,
+ position,
+ now,
+}: {
+ objectMetadata: {
+ id: string;
+ universalIdentifier: string;
+ nameSingular: string;
+ shortcut: string | null;
+ isActive: boolean;
+ };
+ commandMenuItemId: string;
+ applicationId: string;
+ applicationUniversalIdentifier: string;
+ workspaceId: string;
+ position: number;
+ now: string;
+}): FlatCommandMenuItem => ({
+ ...buildObjectNavigationUniversalFlatCommandMenuItem({
+ objectMetadata,
+ applicationUniversalIdentifier,
+ position,
+ now,
+ }),
+ id: commandMenuItemId,
+ applicationId,
+ workspaceId,
+ frontComponentId: null,
+ navigationTargetObjectMetadataId: objectMetadata.id,
+ availabilityObjectMetadataId: null,
+ pageLayoutId: null,
+ overrides: null,
+});
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-object-navigation-universal-flat-command-menu-item.util.ts
similarity index 80%
rename from packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts
index 10650267d5e..36b4728a4a4 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-object-navigation-universal-flat-command-menu-item.util.ts
@@ -1,4 +1,5 @@
import { msg } from '@lingui/core/macro';
+import { getSystemNavigationCommandMenuItemUniversalIdentifier } from 'twenty-shared/application';
import { getMetadataLabelPlaceholder } from 'twenty-shared/i18n';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import {
@@ -6,14 +7,10 @@ import {
FeatureFlagKey,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { v5 } from 'uuid';
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 { i18nLabel } from 'src/engine/workspace-manager/twenty-standard-application/utils/i18n-label.util';
-
-export const NAVIGATION_COMMAND_UUID_NAMESPACE =
- 'b31830da-2ae0-48eb-a915-12fa4ab96dd3';
+import { type UniversalFlatCommandMenuItem } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-command-menu-item.type';
// The stored label is the source message; the target object's label stays a
// placeholder filled at read time for the reader's locale.
@@ -55,12 +52,9 @@ export const buildNavigationConditionalAvailabilityExpression = ({
: targetObjectReadPermissionExpression;
};
-export const buildNavigationFlatCommandMenuItem = ({
+export const buildObjectNavigationUniversalFlatCommandMenuItem = ({
objectMetadata,
- commandMenuItemId,
- applicationId,
applicationUniversalIdentifier,
- workspaceId,
position,
now,
}: {
@@ -69,18 +63,18 @@ export const buildNavigationFlatCommandMenuItem = ({
universalIdentifier: string;
nameSingular: string;
shortcut: string | null;
+ isActive: boolean;
};
- commandMenuItemId: string;
- applicationId: string;
applicationUniversalIdentifier: string;
- workspaceId: string;
position: number;
now: string;
-}): FlatCommandMenuItem => {
- const universalIdentifier = v5(
- objectMetadata.universalIdentifier,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
- );
+}): UniversalFlatCommandMenuItem => {
+ const universalIdentifier =
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
+ objectUniversalIdentifier: objectMetadata.universalIdentifier,
+ });
const conditionalAvailabilityExpression =
buildNavigationConditionalAvailabilityExpression({
@@ -89,11 +83,8 @@ export const buildNavigationFlatCommandMenuItem = ({
});
return {
- id: commandMenuItemId,
universalIdentifier,
- applicationId,
applicationUniversalIdentifier,
- workspaceId,
label: NAVIGATION_INTERPOLATED_LABEL,
shortLabel: NAVIGATION_INTERPOLATED_SHORT_LABEL,
icon: NAVIGATION_INTERPOLATED_ICON,
@@ -101,24 +92,19 @@ export const buildNavigationFlatCommandMenuItem = ({
isPinned: false,
availabilityType: CommandMenuItemAvailabilityType.GLOBAL,
conditionalAvailabilityExpression,
- frontComponentId: null,
frontComponentUniversalIdentifier: null,
engineComponentKey: EngineComponentKey.NAVIGATION,
payload: { objectMetadataItemId: objectMetadata.id },
- navigationTargetObjectMetadataId: objectMetadata.id,
navigationTargetObjectMetadataUniversalIdentifier:
objectMetadata.universalIdentifier,
hotKeys: isDefined(objectMetadata.shortcut)
? ['G', objectMetadata.shortcut]
: null,
workflowVersionId: null,
- availabilityObjectMetadataId: null,
availabilityObjectMetadataUniversalIdentifier: null,
- pageLayoutId: null,
pageLayoutUniversalIdentifier: null,
- isActive: true,
+ isActive: objectMetadata.isActive,
isSystemSideEffect: true,
- overrides: null,
universalOverrides: null,
createdAt: now,
updatedAt: now,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-side-effect-companion-metadata-names.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-side-effect-companion-metadata-names.constant.ts
index bc4ef025543..159660f27d5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-side-effect-companion-metadata-names.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-side-effect-companion-metadata-names.constant.ts
@@ -19,6 +19,7 @@ export const ALL_METADATA_SIDE_EFFECT_COMPANION_METADATA_NAMES = {
'pageLayout',
'pageLayoutTab',
'pageLayoutWidget',
+ 'commandMenuItem',
],
} as const satisfies Partial<
Record<AllMetadataName, readonly AllMetadataName[]>
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/metadata-side-effect-handlers.module.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/metadata-side-effect-handlers.module.ts
index daf825bb85d..6397c4267dc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/metadata-side-effect-handlers.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/metadata-side-effect-handlers.module.ts
@@ -9,6 +9,8 @@ import { FieldUniqueBackingIndexOnDeleteSideEffectHandlerService } from 'src/eng
import { FieldUniqueBackingIndexOnUpdateSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/field-metadata/services/field-unique-backing-index-on-update-side-effect-handler.service';
import { ObjectIndexViewLabelIdentifierOnUpdateSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-index-view-label-identifier-on-update-side-effect-handler.service';
import { ObjectIndexViewOnCreateSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-index-view-on-create-side-effect-handler.service';
+import { ObjectNavigationCommandOnCreateSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-create-side-effect-handler.service';
+import { ObjectNavigationCommandOnUpdateSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-update-side-effect-handler.service';
import { ObjectRecordPageLabelIdentifierOnUpdateSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-record-page-label-identifier-on-update-side-effect-handler.service';
import { ObjectRecordPageOnCreateSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-record-page-on-create-side-effect-handler.service';
import { ObjectSearchVectorOnCreateSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-search-vector-on-create-side-effect-handler.service';
@@ -30,6 +32,8 @@ import { ObjectSystemSideEffectsOnDeleteSideEffectHandlerService } from 'src/eng
ObjectSystemFieldsOnCreateSideEffectHandlerService,
ObjectIndexViewOnCreateSideEffectHandlerService,
ObjectRecordPageOnCreateSideEffectHandlerService,
+ ObjectNavigationCommandOnCreateSideEffectHandlerService,
+ ObjectNavigationCommandOnUpdateSideEffectHandlerService,
ObjectSystemRelationsOnCreateSideEffectHandlerService,
ObjectSystemRelationsOnUpdateSideEffectHandlerService,
ObjectSearchVectorOnCreateSideEffectHandlerService,
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/__tests__/object-navigation-command-on-create-side-effect-handler.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/__tests__/object-navigation-command-on-create-side-effect-handler.service.spec.ts
new file mode 100644
index 00000000000..cb8eb3f0ea3
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/__tests__/object-navigation-command-on-create-side-effect-handler.service.spec.ts
@@ -0,0 +1,269 @@
+import { getSystemNavigationCommandMenuItemUniversalIdentifier } from 'twenty-shared/application';
+
+import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
+import { type AllFlatEntityOperationRecordByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-operation-record-by-metadata-name.type';
+import { ObjectNavigationCommandOnCreateSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-create-side-effect-handler.service';
+import { type BuildSideEffectsArgs } from 'src/engine/metadata-modules/metadata-side-effect/interfaces/base-metadata-side-effect-handler.service';
+
+const APPLICATION_UNIVERSAL_IDENTIFIER = 'a1a2a3a4-a5a6-4000-8000-000000000001';
+const OTHER_APPLICATION_UNIVERSAL_IDENTIFIER =
+ 'a1a2a3a4-a5a6-4000-8000-000000000002';
+const OBJECT_UNIVERSAL_IDENTIFIER = 'b1b2b3b4-b5b6-4000-8000-000000000001';
+const OTHER_OBJECT_UNIVERSAL_IDENTIFIER =
+ 'b1b2b3b4-b5b6-4000-8000-000000000002';
+const OBJECT_ID = 'c1c2c3c4-c5c6-4000-8000-000000000001';
+const OTHER_OBJECT_ID = 'c1c2c3c4-c5c6-4000-8000-000000000002';
+
+const DERIVED_UNIVERSAL_IDENTIFIER =
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier:
+ APPLICATION_UNIVERSAL_IDENTIFIER,
+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ });
+
+type ObjectMetadataOverrides = Partial<{
+ id: string | undefined;
+ universalIdentifier: string;
+ applicationUniversalIdentifier: string;
+ isActive: boolean;
+ nameSingular: string;
+ shortcut: string | null;
+ commandMenuItemUniversalIdentifiers: string[];
+}>;
+
+const buildFlatObjectMetadata = (overrides: ObjectMetadataOverrides = {}) => ({
+ id: OBJECT_ID,
+ universalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ isActive: true,
+ nameSingular: 'ticket',
+ shortcut: 'T',
+ commandMenuItemUniversalIdentifiers: [],
+ ...overrides,
+});
+
+const buildArgs = ({
+ flatObjectMetadata = buildFlatObjectMetadata(),
+ otherFlatObjectMetadatasInBatch = [],
+ pendingFlatCommandMenuItems = [],
+ syncedFlatCommandMenuItems = [],
+}: {
+ flatObjectMetadata?: ReturnType<typeof buildFlatObjectMetadata>;
+ otherFlatObjectMetadatasInBatch?: ReturnType<
+ typeof buildFlatObjectMetadata
+ >[];
+ pendingFlatCommandMenuItems?: object[];
+ syncedFlatCommandMenuItems?: {
+ universalIdentifier: string;
+ position: number;
+ }[];
+} = {}): BuildSideEffectsArgs<'objectMetadata'> =>
+ ({
+ flatEntity: flatObjectMetadata,
+ allFlatEntityOperationRecordByMetadataName: {
+ objectMetadata: {
+ flatEntityToCreate: Object.fromEntries(
+ [flatObjectMetadata, ...otherFlatObjectMetadatasInBatch].map(
+ (batchFlatObjectMetadata) => [
+ batchFlatObjectMetadata.universalIdentifier,
+ batchFlatObjectMetadata,
+ ],
+ ),
+ ),
+ flatEntityToUpdate: {},
+ flatEntityToDelete: {},
+ },
+ ...(pendingFlatCommandMenuItems.length > 0 && {
+ commandMenuItem: {
+ flatEntityToCreate: Object.fromEntries(
+ pendingFlatCommandMenuItems.map((pendingFlatCommandMenuItem) => [
+ (pendingFlatCommandMenuItem as { universalIdentifier: string })
+ .universalIdentifier,
+ pendingFlatCommandMenuItem,
+ ]),
+ ),
+ flatEntityToUpdate: {},
+ flatEntityToDelete: {},
+ },
+ }),
+ } as unknown as AllFlatEntityOperationRecordByMetadataName,
+ relatedFlatEntityMaps: {
+ flatCommandMenuItemMaps: {
+ byUniversalIdentifier: Object.fromEntries(
+ syncedFlatCommandMenuItems.map((syncedFlatCommandMenuItem) => [
+ syncedFlatCommandMenuItem.universalIdentifier,
+ syncedFlatCommandMenuItem,
+ ]),
+ ),
+ },
+ },
+ context: {},
+ }) as unknown as BuildSideEffectsArgs<'objectMetadata'>;
+
+describe('ObjectNavigationCommandOnCreateSideEffectHandlerService', () => {
+ const handler =
+ new (ObjectNavigationCommandOnCreateSideEffectHandlerService as unknown as new () => ObjectNavigationCommandOnCreateSideEffectHandlerService)();
+
+ const expectSuccess = (
+ result: ReturnType<typeof handler.buildSideEffects>,
+ ) => {
+ if (result.status !== 'success') {
+ throw new Error(`expected success, got ${result.status}`);
+ }
+
+ return result;
+ };
+
+ it('provisions the navigation command with the derived (application, object) identifier and denormalized fields', () => {
+ const result = expectSuccess(handler.buildSideEffects(buildArgs()));
+
+ const created = Object.values(
+ result.operations.commandMenuItem?.flatEntityToCreate ?? {},
+ );
+
+ expect(created).toHaveLength(1);
+
+ const [navigationCommand] = created as unknown as [
+ {
+ universalIdentifier: string;
+ applicationUniversalIdentifier: string;
+ engineComponentKey: EngineComponentKey;
+ payload: unknown;
+ hotKeys: string[] | null;
+ conditionalAvailabilityExpression: string | null;
+ isSystemSideEffect: boolean;
+ position: number;
+ },
+ ];
+
+ expect(navigationCommand.universalIdentifier).toBe(
+ DERIVED_UNIVERSAL_IDENTIFIER,
+ );
+ expect(navigationCommand.applicationUniversalIdentifier).toBe(
+ APPLICATION_UNIVERSAL_IDENTIFIER,
+ );
+ expect(navigationCommand.engineComponentKey).toBe(
+ EngineComponentKey.NAVIGATION,
+ );
+ expect(navigationCommand.payload).toEqual({
+ objectMetadataItemId: OBJECT_ID,
+ });
+ expect(navigationCommand.hotKeys).toEqual(['G', 'T']);
+ expect(navigationCommand.conditionalAvailabilityExpression).toBe(
+ 'targetObjectReadPermissions.ticket',
+ );
+ expect(navigationCommand.isSystemSideEffect).toBe(true);
+ expect(navigationCommand.position).toBe(0);
+ });
+
+ it('derives the identifier from the owning application, so an app-owned object gets an app-owned command', () => {
+ const result = expectSuccess(
+ handler.buildSideEffects(
+ buildArgs({
+ flatObjectMetadata: buildFlatObjectMetadata({
+ applicationUniversalIdentifier:
+ OTHER_APPLICATION_UNIVERSAL_IDENTIFIER,
+ }),
+ }),
+ ),
+ );
+
+ const [navigationCommand] = Object.values(
+ result.operations.commandMenuItem?.flatEntityToCreate ?? {},
+ ) as unknown as [{ universalIdentifier: string }];
+
+ expect(navigationCommand.universalIdentifier).toBe(
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier:
+ OTHER_APPLICATION_UNIVERSAL_IDENTIFIER,
+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ }),
+ );
+ expect(navigationCommand.universalIdentifier).not.toBe(
+ DERIVED_UNIVERSAL_IDENTIFIER,
+ );
+ });
+
+ it('provisions a disabled command when the object is created inactive', () => {
+ const result = expectSuccess(
+ handler.buildSideEffects(
+ buildArgs({
+ flatObjectMetadata: buildFlatObjectMetadata({ isActive: false }),
+ }),
+ ),
+ );
+
+ const [navigationCommand] = Object.values(
+ result.operations.commandMenuItem?.flatEntityToCreate ?? {},
+ ) as unknown as [{ isActive: boolean }];
+
+ expect(navigationCommand.isActive).toBe(false);
+ });
+
+ it('noops when the object create carries no workspace id (manifest sync path)', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ flatObjectMetadata: buildFlatObjectMetadata({ id: undefined }),
+ }),
+ );
+
+ expect(result.status).toBe('noop');
+ });
+
+ it('appends after the synced maximum position', () => {
+ const result = expectSuccess(
+ handler.buildSideEffects(
+ buildArgs({
+ syncedFlatCommandMenuItems: [
+ { universalIdentifier: 'existing-command', position: 41 } as never,
+ ],
+ }),
+ ),
+ );
+
+ const [navigationCommand] = Object.values(
+ result.operations.commandMenuItem?.flatEntityToCreate ?? {},
+ ) as unknown as [{ position: number }];
+
+ expect(navigationCommand.position).toBe(42);
+ });
+
+ it('derives distinct deterministic positions for objects created in the same batch', () => {
+ const firstFlatObjectMetadata = buildFlatObjectMetadata();
+ const secondFlatObjectMetadata = buildFlatObjectMetadata({
+ id: OTHER_OBJECT_ID,
+ universalIdentifier: OTHER_OBJECT_UNIVERSAL_IDENTIFIER,
+ nameSingular: 'invoice',
+ shortcut: null,
+ });
+
+ const firstResult = expectSuccess(
+ handler.buildSideEffects(
+ buildArgs({
+ flatObjectMetadata: firstFlatObjectMetadata,
+ otherFlatObjectMetadatasInBatch: [secondFlatObjectMetadata],
+ }),
+ ),
+ );
+ const secondResult = expectSuccess(
+ handler.buildSideEffects({
+ ...buildArgs({
+ flatObjectMetadata: firstFlatObjectMetadata,
+ otherFlatObjectMetadatasInBatch: [secondFlatObjectMetadata],
+ }),
+ flatEntity:
+ secondFlatObjectMetadata as unknown as BuildSideEffectsArgs<'objectMetadata'>['flatEntity'],
+ }),
+ );
+
+ const [firstNavigationCommand] = Object.values(
+ firstResult.operations.commandMenuItem?.flatEntityToCreate ?? {},
+ ) as unknown as [{ position: number }];
+ const [secondNavigationCommand] = Object.values(
+ secondResult.operations.commandMenuItem?.flatEntityToCreate ?? {},
+ ) as unknown as [{ position: number }];
+
+ expect(firstNavigationCommand.position).toBe(0);
+ expect(secondNavigationCommand.position).toBe(1);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/__tests__/object-navigation-command-on-update-side-effect-handler.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/__tests__/object-navigation-command-on-update-side-effect-handler.service.spec.ts
new file mode 100644
index 00000000000..b241c702419
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/__tests__/object-navigation-command-on-update-side-effect-handler.service.spec.ts
@@ -0,0 +1,346 @@
+import { getSystemNavigationCommandMenuItemUniversalIdentifier } from 'twenty-shared/application';
+
+import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
+import { type AllFlatEntityOperationRecordByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-operation-record-by-metadata-name.type';
+import { ObjectNavigationCommandOnUpdateSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-update-side-effect-handler.service';
+import { type BuildSideEffectsArgs } from 'src/engine/metadata-modules/metadata-side-effect/interfaces/base-metadata-side-effect-handler.service';
+
+const APPLICATION_UNIVERSAL_IDENTIFIER = 'a1a2a3a4-a5a6-4000-8000-000000000001';
+const OBJECT_UNIVERSAL_IDENTIFIER = 'b1b2b3b4-b5b6-4000-8000-000000000001';
+const OBJECT_ID = 'c1c2c3c4-c5c6-4000-8000-000000000001';
+
+const DERIVED_UNIVERSAL_IDENTIFIER =
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier:
+ APPLICATION_UNIVERSAL_IDENTIFIER,
+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ });
+const LEGACY_UNIVERSAL_IDENTIFIER = 'legacy-v5-derived-identifier';
+
+const buildFlatObjectMetadata = (
+ overrides: Partial<{
+ isActive: boolean;
+ nameSingular: string;
+ shortcut: string | null;
+ commandMenuItemUniversalIdentifiers: string[];
+ }> = {},
+) => ({
+ id: OBJECT_ID,
+ universalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ isActive: true,
+ nameSingular: 'ticket',
+ shortcut: 'T',
+ commandMenuItemUniversalIdentifiers: [DERIVED_UNIVERSAL_IDENTIFIER],
+ ...overrides,
+});
+
+const buildNavigationCommand = (
+ overrides: Partial<{
+ universalIdentifier: string;
+ isActive: boolean;
+ conditionalAvailabilityExpression: string;
+ hotKeys: string[] | null;
+ payload: object;
+ isSystemSideEffect: boolean;
+ }> = {},
+) => ({
+ universalIdentifier: DERIVED_UNIVERSAL_IDENTIFIER,
+ engineComponentKey: EngineComponentKey.NAVIGATION,
+ payload: { objectMetadataItemId: OBJECT_ID },
+ isSystemSideEffect: true,
+ isActive: true,
+ conditionalAvailabilityExpression: 'targetObjectReadPermissions.ticket',
+ hotKeys: ['G', 'T'],
+ position: 7,
+ ...overrides,
+});
+
+const buildArgs = ({
+ updatedFlatObjectMetadata,
+ existingFlatObjectMetadata = buildFlatObjectMetadata(),
+ syncedFlatCommandMenuItems = [],
+ pendingFlatCommandMenuItems = [],
+}: {
+ updatedFlatObjectMetadata: ReturnType<typeof buildFlatObjectMetadata>;
+ existingFlatObjectMetadata?: ReturnType<typeof buildFlatObjectMetadata>;
+ syncedFlatCommandMenuItems?: object[];
+ pendingFlatCommandMenuItems?: object[];
+}): BuildSideEffectsArgs<'objectMetadata'> =>
+ ({
+ flatEntity: updatedFlatObjectMetadata,
+ allFlatEntityOperationRecordByMetadataName: {
+ objectMetadata: {
+ flatEntityToCreate: {},
+ flatEntityToUpdate: {
+ [updatedFlatObjectMetadata.universalIdentifier]:
+ updatedFlatObjectMetadata,
+ },
+ flatEntityToDelete: {},
+ },
+ ...(pendingFlatCommandMenuItems.length > 0 && {
+ commandMenuItem: {
+ flatEntityToCreate: Object.fromEntries(
+ pendingFlatCommandMenuItems.map((pendingFlatCommandMenuItem) => [
+ (pendingFlatCommandMenuItem as { universalIdentifier: string })
+ .universalIdentifier,
+ pendingFlatCommandMenuItem,
+ ]),
+ ),
+ flatEntityToUpdate: {},
+ flatEntityToDelete: {},
+ },
+ }),
+ } as unknown as AllFlatEntityOperationRecordByMetadataName,
+ relatedFlatEntityMaps: {
+ flatObjectMetadataMaps: {
+ byUniversalIdentifier: {
+ [existingFlatObjectMetadata.universalIdentifier]:
+ existingFlatObjectMetadata,
+ },
+ },
+ flatCommandMenuItemMaps: {
+ byUniversalIdentifier: Object.fromEntries(
+ syncedFlatCommandMenuItems.map((syncedFlatCommandMenuItem) => [
+ (syncedFlatCommandMenuItem as { universalIdentifier: string })
+ .universalIdentifier,
+ syncedFlatCommandMenuItem,
+ ]),
+ ),
+ },
+ },
+ context: {},
+ }) as unknown as BuildSideEffectsArgs<'objectMetadata'>;
+
+describe('ObjectNavigationCommandOnUpdateSideEffectHandlerService', () => {
+ const handler =
+ new (ObjectNavigationCommandOnUpdateSideEffectHandlerService as unknown as new () => ObjectNavigationCommandOnUpdateSideEffectHandlerService)();
+
+ const expectSuccess = (
+ result: ReturnType<typeof handler.buildSideEffects>,
+ ) => {
+ if (result.status !== 'success') {
+ throw new Error(`expected success, got ${result.status}`);
+ }
+
+ return result;
+ };
+
+ it('noops when a watched field changed but the recomputed command already matches the synced row', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata({ shortcut: 'U' }),
+ syncedFlatCommandMenuItems: [
+ buildNavigationCommand({ hotKeys: ['G', 'U'] }),
+ ],
+ }),
+ );
+
+ expect(result.status).toBe('noop');
+ });
+
+ it('noops when none of isActive, nameSingular or shortcut changed', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata(),
+ syncedFlatCommandMenuItems: [buildNavigationCommand()],
+ }),
+ );
+
+ expect(result.status).toBe('noop');
+ });
+
+ it('soft-disables the command when the object is deactivated', () => {
+ const result = expectSuccess(
+ handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata({
+ isActive: false,
+ }),
+ syncedFlatCommandMenuItems: [buildNavigationCommand()],
+ }),
+ ),
+ );
+
+ const updated = result.operations.commandMenuItem?.flatEntityToUpdate ?? {};
+
+ expect(Object.keys(updated)).toEqual([DERIVED_UNIVERSAL_IDENTIFIER]);
+ expect(
+ (updated[DERIVED_UNIVERSAL_IDENTIFIER] as { isActive: boolean }).isActive,
+ ).toBe(false);
+ });
+
+ it('reactivates the command when the object is enabled', () => {
+ const result = expectSuccess(
+ handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata(),
+ existingFlatObjectMetadata: buildFlatObjectMetadata({
+ isActive: false,
+ }),
+ syncedFlatCommandMenuItems: [
+ buildNavigationCommand({ isActive: false }),
+ ],
+ }),
+ ),
+ );
+
+ const updated = result.operations.commandMenuItem?.flatEntityToUpdate ?? {};
+
+ expect(
+ (updated[DERIVED_UNIVERSAL_IDENTIFIER] as { isActive: boolean }).isActive,
+ ).toBe(true);
+ });
+
+ it('recomputes conditionalAvailabilityExpression when nameSingular changes, keeping the identifier', () => {
+ const result = expectSuccess(
+ handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata({
+ nameSingular: 'renamedTicket',
+ }),
+ syncedFlatCommandMenuItems: [buildNavigationCommand()],
+ }),
+ ),
+ );
+
+ const updated = result.operations.commandMenuItem?.flatEntityToUpdate ?? {};
+
+ expect(Object.keys(updated)).toEqual([DERIVED_UNIVERSAL_IDENTIFIER]);
+ expect(
+ (
+ updated[DERIVED_UNIVERSAL_IDENTIFIER] as {
+ conditionalAvailabilityExpression: string;
+ }
+ ).conditionalAvailabilityExpression,
+ ).toBe('targetObjectReadPermissions.renamedTicket');
+ });
+
+ it('recomputes hotKeys when the shortcut changes', () => {
+ const result = expectSuccess(
+ handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata({
+ shortcut: 'K',
+ }),
+ syncedFlatCommandMenuItems: [buildNavigationCommand()],
+ }),
+ ),
+ );
+
+ const updated = result.operations.commandMenuItem?.flatEntityToUpdate ?? {};
+
+ expect(
+ (updated[DERIVED_UNIVERSAL_IDENTIFIER] as { hotKeys: string[] | null })
+ .hotKeys,
+ ).toEqual(['G', 'K']);
+ });
+
+ it('clears hotKeys when the shortcut is removed', () => {
+ const result = expectSuccess(
+ handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata({
+ shortcut: null,
+ }),
+ syncedFlatCommandMenuItems: [buildNavigationCommand()],
+ }),
+ ),
+ );
+
+ const updated = result.operations.commandMenuItem?.flatEntityToUpdate ?? {};
+
+ expect(
+ (updated[DERIVED_UNIVERSAL_IDENTIFIER] as { hotKeys: string[] | null })
+ .hotKeys,
+ ).toBeNull();
+ });
+
+ it('noops on a command still holding a legacy identifier, until the 2-38 re-own converges it', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata({
+ isActive: false,
+ commandMenuItemUniversalIdentifiers: [LEGACY_UNIVERSAL_IDENTIFIER],
+ }),
+ existingFlatObjectMetadata: buildFlatObjectMetadata({
+ commandMenuItemUniversalIdentifiers: [LEGACY_UNIVERSAL_IDENTIFIER],
+ }),
+ syncedFlatCommandMenuItems: [
+ buildNavigationCommand({
+ universalIdentifier: LEGACY_UNIVERSAL_IDENTIFIER,
+ }),
+ ],
+ }),
+ );
+
+ expect(result.status).toBe('noop');
+ });
+
+ it('noops when the object has no navigation command, as manifest-created objects do', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata(),
+ existingFlatObjectMetadata: buildFlatObjectMetadata({
+ isActive: false,
+ }),
+ syncedFlatCommandMenuItems: [],
+ }),
+ );
+
+ expect(result.status).toBe('noop');
+ });
+
+ it('leaves a caller-authored command targeting the same object alone, since it does not hold the derived identifier', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata({
+ nameSingular: 'renamedTicket',
+ commandMenuItemUniversalIdentifiers: ['app-authored-identifier'],
+ }),
+ existingFlatObjectMetadata: buildFlatObjectMetadata({
+ commandMenuItemUniversalIdentifiers: ['app-authored-identifier'],
+ }),
+ syncedFlatCommandMenuItems: [
+ buildNavigationCommand({
+ universalIdentifier: 'app-authored-identifier',
+ isSystemSideEffect: false,
+ }),
+ ],
+ }),
+ );
+
+ expect(result.status).toBe('noop');
+ });
+
+ it('noops when the derived identifier is held by a row the engine does not own', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata({
+ nameSingular: 'renamedTicket',
+ }),
+ syncedFlatCommandMenuItems: [
+ buildNavigationCommand({ isSystemSideEffect: false }),
+ ],
+ }),
+ );
+
+ expect(result.status).toBe('noop');
+ });
+
+ it('fails when the existing object cannot be resolved', () => {
+ const args = buildArgs({
+ updatedFlatObjectMetadata: buildFlatObjectMetadata({ isActive: false }),
+ });
+
+ (
+ args.relatedFlatEntityMaps as unknown as {
+ flatObjectMetadataMaps: { byUniversalIdentifier: object };
+ }
+ ).flatObjectMetadataMaps.byUniversalIdentifier = {};
+
+ const result = handler.buildSideEffects(args);
+
+ expect(result.status).toBe('fail');
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/__tests__/object-system-side-effects-on-delete-side-effect-handler.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/__tests__/object-system-side-effects-on-delete-side-effect-handler.service.spec.ts
new file mode 100644
index 00000000000..316c3a0f074
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/__tests__/object-system-side-effects-on-delete-side-effect-handler.service.spec.ts
@@ -0,0 +1,461 @@
+import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
+import { ObjectSystemSideEffectsOnDeleteSideEffectHandlerService } from 'src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-system-side-effects-on-delete-side-effect-handler.service';
+import { type BuildSideEffectsArgs } from 'src/engine/metadata-modules/metadata-side-effect/interfaces/base-metadata-side-effect-handler.service';
+
+const APPLICATION_UNIVERSAL_IDENTIFIER = 'a0a0a0a0-a0a0-4000-8000-000000000001';
+const OBJECT_ID = 'b0b0b0b0-b0b0-4000-8000-000000000001';
+const OBJECT_UNIVERSAL_IDENTIFIER = 'b1b2b3b4-b5b6-4000-8000-000000000001';
+const OTHER_OBJECT_UNIVERSAL_IDENTIFIER =
+ 'c1c2c3c4-c5c6-4000-8000-000000000001';
+const OTHER_OBJECT_ID = 'b0b0b0b0-b0b0-4000-8000-000000000002';
+
+const SYSTEM_FIELD_UNIVERSAL_IDENTIFIER =
+ 'd1d2d3d4-d5d6-4000-8000-000000000001';
+const AUTHOR_FIELD_UNIVERSAL_IDENTIFIER =
+ 'd1d2d3d4-d5d6-4000-8000-000000000002';
+const FORWARD_FIELD_UNIVERSAL_IDENTIFIER =
+ 'd1d2d3d4-d5d6-4000-8000-000000000003';
+const REVERSE_FIELD_UNIVERSAL_IDENTIFIER =
+ 'd1d2d3d4-d5d6-4000-8000-000000000004';
+const GIN_INDEX_UNIVERSAL_IDENTIFIER = 'e1e2e3e4-e5e6-4000-8000-000000000001';
+const REVERSE_INDEX_UNIVERSAL_IDENTIFIER =
+ 'e1e2e3e4-e5e6-4000-8000-000000000002';
+const SEARCH_FIELD_METADATA_UNIVERSAL_IDENTIFIER =
+ 'f1f2f3f4-f5f6-4000-8000-000000000001';
+const INDEX_VIEW_UNIVERSAL_IDENTIFIER = 'a1a2a3a4-a5a6-4000-8000-000000000001';
+const INDEX_VIEW_FIELD_UNIVERSAL_IDENTIFIER =
+ 'a1a2a3a4-a5a6-4000-8000-000000000002';
+const CALLER_VIEW_UNIVERSAL_IDENTIFIER = 'a1a2a3a4-a5a6-4000-8000-000000000003';
+const CALLER_VIEW_FIELD_UNIVERSAL_IDENTIFIER =
+ 'a1a2a3a4-a5a6-4000-8000-000000000004';
+
+type FieldFixture = {
+ universalIdentifier: string;
+ isSystemSideEffect: boolean;
+ objectMetadataUniversalIdentifier?: string;
+ relationTargetFieldMetadataUniversalIdentifier?: string | null;
+ viewFieldUniversalIdentifiers?: string[];
+};
+
+type ViewFixture = {
+ universalIdentifier: string;
+ isSystemSideEffect: boolean;
+ viewFieldUniversalIdentifiers?: string[];
+ viewFieldGroupUniversalIdentifiers?: string[];
+};
+
+const buildFieldMetadataMaps = (fields: FieldFixture[]) => ({
+ byUniversalIdentifier: Object.fromEntries(
+ fields.map((field) => [
+ field.universalIdentifier,
+ {
+ objectMetadataUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ relationTargetFieldMetadataUniversalIdentifier: null,
+ viewFieldUniversalIdentifiers: [],
+ ...field,
+ },
+ ]),
+ ),
+});
+
+const buildArgs = ({
+ fieldUniversalIdentifiers = [],
+ indexMetadataUniversalIdentifiers = [],
+ searchFieldMetadataUniversalIdentifiers = [],
+ viewUniversalIdentifiers = [],
+ pageLayoutUniversalIdentifiers = [],
+ commandMenuItemUniversalIdentifiers = [],
+ relatedFlatEntityMaps = {},
+}: {
+ fieldUniversalIdentifiers?: string[];
+ indexMetadataUniversalIdentifiers?: string[];
+ searchFieldMetadataUniversalIdentifiers?: string[];
+ viewUniversalIdentifiers?: string[];
+ pageLayoutUniversalIdentifiers?: string[];
+ commandMenuItemUniversalIdentifiers?: string[];
+ relatedFlatEntityMaps?: object;
+}): BuildSideEffectsArgs<'objectMetadata'> =>
+ ({
+ flatEntity: {
+ id: OBJECT_ID,
+ universalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ fieldUniversalIdentifiers,
+ indexMetadataUniversalIdentifiers,
+ searchFieldMetadataUniversalIdentifiers,
+ viewUniversalIdentifiers,
+ pageLayoutUniversalIdentifiers,
+ commandMenuItemUniversalIdentifiers,
+ },
+ allFlatEntityOperationRecordByMetadataName: {},
+ relatedFlatEntityMaps: {
+ flatObjectMetadataMaps: { byUniversalIdentifier: {} },
+ flatFieldMetadataMaps: { byUniversalIdentifier: {} },
+ flatIndexMaps: { byUniversalIdentifier: {} },
+ flatSearchFieldMetadataMaps: { byUniversalIdentifier: {} },
+ flatViewMaps: { byUniversalIdentifier: {} },
+ flatViewFieldMaps: { byUniversalIdentifier: {} },
+ flatViewFieldGroupMaps: { byUniversalIdentifier: {} },
+ flatPageLayoutMaps: { byUniversalIdentifier: {} },
+ flatPageLayoutTabMaps: { byUniversalIdentifier: {} },
+ flatPageLayoutWidgetMaps: { byUniversalIdentifier: {} },
+ flatCommandMenuItemMaps: { byUniversalIdentifier: {} },
+ ...relatedFlatEntityMaps,
+ },
+ context: {},
+ }) as unknown as BuildSideEffectsArgs<'objectMetadata'>;
+
+describe('ObjectSystemSideEffectsOnDeleteSideEffectHandlerService', () => {
+ const handler =
+ new (ObjectSystemSideEffectsOnDeleteSideEffectHandlerService as unknown as new () => ObjectSystemSideEffectsOnDeleteSideEffectHandlerService)();
+
+ it('should cascade-delete engine-owned fields, indexes and searchFieldMetadata while leaving author fields untouched', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ fieldUniversalIdentifiers: [
+ SYSTEM_FIELD_UNIVERSAL_IDENTIFIER,
+ AUTHOR_FIELD_UNIVERSAL_IDENTIFIER,
+ ],
+ indexMetadataUniversalIdentifiers: [GIN_INDEX_UNIVERSAL_IDENTIFIER],
+ searchFieldMetadataUniversalIdentifiers: [
+ SEARCH_FIELD_METADATA_UNIVERSAL_IDENTIFIER,
+ ],
+ relatedFlatEntityMaps: {
+ flatFieldMetadataMaps: buildFieldMetadataMaps([
+ {
+ universalIdentifier: SYSTEM_FIELD_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ },
+ {
+ universalIdentifier: AUTHOR_FIELD_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: false,
+ },
+ ]),
+ flatIndexMaps: {
+ byUniversalIdentifier: {
+ [GIN_INDEX_UNIVERSAL_IDENTIFIER]: {
+ universalIdentifier: GIN_INDEX_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ objectMetadataUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ universalFlatIndexFieldMetadatas: [],
+ },
+ },
+ },
+ flatSearchFieldMetadataMaps: {
+ byUniversalIdentifier: {
+ [SEARCH_FIELD_METADATA_UNIVERSAL_IDENTIFIER]: {
+ universalIdentifier: SEARCH_FIELD_METADATA_UNIVERSAL_IDENTIFIER,
+ },
+ },
+ },
+ },
+ }),
+ );
+
+ expect(result.status).toBe('success');
+
+ if (result.status !== 'success') {
+ throw new Error('expected success');
+ }
+
+ const deletedFieldUniversalIdentifiers = Object.keys(
+ result.operations.fieldMetadata?.flatEntityToDelete ?? {},
+ );
+
+ expect(deletedFieldUniversalIdentifiers).toEqual([
+ SYSTEM_FIELD_UNIVERSAL_IDENTIFIER,
+ ]);
+ expect(deletedFieldUniversalIdentifiers).not.toContain(
+ AUTHOR_FIELD_UNIVERSAL_IDENTIFIER,
+ );
+ expect(
+ Object.keys(result.operations.index?.flatEntityToDelete ?? {}),
+ ).toEqual([GIN_INDEX_UNIVERSAL_IDENTIFIER]);
+ expect(
+ Object.keys(
+ result.operations.searchFieldMetadata?.flatEntityToDelete ?? {},
+ ),
+ ).toEqual([SEARCH_FIELD_METADATA_UNIVERSAL_IDENTIFIER]);
+ });
+
+ it('should cascade-delete the default-relation reverse morph field on a standard object and its join-column index', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ fieldUniversalIdentifiers: [FORWARD_FIELD_UNIVERSAL_IDENTIFIER],
+ relatedFlatEntityMaps: {
+ flatObjectMetadataMaps: {
+ byUniversalIdentifier: {
+ [OTHER_OBJECT_UNIVERSAL_IDENTIFIER]: {
+ universalIdentifier: OTHER_OBJECT_UNIVERSAL_IDENTIFIER,
+ indexMetadataUniversalIdentifiers: [
+ REVERSE_INDEX_UNIVERSAL_IDENTIFIER,
+ ],
+ },
+ },
+ },
+ flatFieldMetadataMaps: buildFieldMetadataMaps([
+ {
+ universalIdentifier: FORWARD_FIELD_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ relationTargetFieldMetadataUniversalIdentifier:
+ REVERSE_FIELD_UNIVERSAL_IDENTIFIER,
+ },
+ {
+ universalIdentifier: REVERSE_FIELD_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ objectMetadataUniversalIdentifier:
+ OTHER_OBJECT_UNIVERSAL_IDENTIFIER,
+ },
+ ]),
+ flatIndexMaps: {
+ byUniversalIdentifier: {
+ [REVERSE_INDEX_UNIVERSAL_IDENTIFIER]: {
+ universalIdentifier: REVERSE_INDEX_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ objectMetadataUniversalIdentifier:
+ OTHER_OBJECT_UNIVERSAL_IDENTIFIER,
+ universalFlatIndexFieldMetadatas: [
+ {
+ fieldMetadataUniversalIdentifier:
+ REVERSE_FIELD_UNIVERSAL_IDENTIFIER,
+ },
+ ],
+ },
+ },
+ },
+ },
+ }),
+ );
+
+ expect(result.status).toBe('success');
+
+ if (result.status !== 'success') {
+ throw new Error('expected success');
+ }
+
+ expect(
+ Object.keys(result.operations.fieldMetadata?.flatEntityToDelete ?? {}),
+ ).toEqual([
+ FORWARD_FIELD_UNIVERSAL_IDENTIFIER,
+ REVERSE_FIELD_UNIVERSAL_IDENTIFIER,
+ ]);
+ expect(
+ Object.keys(result.operations.index?.flatEntityToDelete ?? {}),
+ ).toEqual([REVERSE_INDEX_UNIVERSAL_IDENTIFIER]);
+ });
+
+ it('should not delete entities the object aggregators do not reference', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ relatedFlatEntityMaps: {
+ flatFieldMetadataMaps: buildFieldMetadataMaps([
+ {
+ universalIdentifier: SYSTEM_FIELD_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ objectMetadataUniversalIdentifier:
+ OTHER_OBJECT_UNIVERSAL_IDENTIFIER,
+ },
+ ]),
+ },
+ }),
+ );
+
+ expect(result.status).toBe('noop');
+ });
+
+ it('should cascade-delete the engine-owned INDEX view and its view fields while leaving a caller-owned view untouched', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ viewUniversalIdentifiers: [
+ INDEX_VIEW_UNIVERSAL_IDENTIFIER,
+ CALLER_VIEW_UNIVERSAL_IDENTIFIER,
+ ],
+ relatedFlatEntityMaps: {
+ flatViewMaps: {
+ byUniversalIdentifier: Object.fromEntries(
+ (
+ [
+ {
+ universalIdentifier: INDEX_VIEW_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ viewFieldUniversalIdentifiers: [
+ INDEX_VIEW_FIELD_UNIVERSAL_IDENTIFIER,
+ ],
+ },
+ {
+ universalIdentifier: CALLER_VIEW_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: false,
+ viewFieldUniversalIdentifiers: [
+ CALLER_VIEW_FIELD_UNIVERSAL_IDENTIFIER,
+ ],
+ },
+ ] satisfies ViewFixture[]
+ ).map((view) => [
+ view.universalIdentifier,
+ { viewFieldGroupUniversalIdentifiers: [], ...view },
+ ]),
+ ),
+ },
+ flatViewFieldMaps: {
+ byUniversalIdentifier: {
+ [INDEX_VIEW_FIELD_UNIVERSAL_IDENTIFIER]: {
+ universalIdentifier: INDEX_VIEW_FIELD_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ },
+ [CALLER_VIEW_FIELD_UNIVERSAL_IDENTIFIER]: {
+ universalIdentifier: CALLER_VIEW_FIELD_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: false,
+ },
+ },
+ },
+ },
+ }),
+ );
+
+ expect(result.status).toBe('success');
+
+ if (result.status !== 'success') {
+ throw new Error('expected success');
+ }
+
+ expect(
+ Object.keys(result.operations.view?.flatEntityToDelete ?? {}),
+ ).toEqual([INDEX_VIEW_UNIVERSAL_IDENTIFIER]);
+ expect(
+ Object.keys(result.operations.viewField?.flatEntityToDelete ?? {}),
+ ).toEqual([INDEX_VIEW_FIELD_UNIVERSAL_IDENTIFIER]);
+ });
+
+ it('should cascade-delete a system view field of a deleted field even when it lives on another object view', () => {
+ const OTHER_OBJECT_VIEW_FIELD_UNIVERSAL_IDENTIFIER =
+ 'a1a2a3a4-a5a6-4000-8000-000000000006';
+
+ const result = handler.buildSideEffects(
+ buildArgs({
+ fieldUniversalIdentifiers: [FORWARD_FIELD_UNIVERSAL_IDENTIFIER],
+ relatedFlatEntityMaps: {
+ flatFieldMetadataMaps: buildFieldMetadataMaps([
+ {
+ universalIdentifier: FORWARD_FIELD_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ relationTargetFieldMetadataUniversalIdentifier:
+ REVERSE_FIELD_UNIVERSAL_IDENTIFIER,
+ },
+ {
+ universalIdentifier: REVERSE_FIELD_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ objectMetadataUniversalIdentifier:
+ OTHER_OBJECT_UNIVERSAL_IDENTIFIER,
+ viewFieldUniversalIdentifiers: [
+ OTHER_OBJECT_VIEW_FIELD_UNIVERSAL_IDENTIFIER,
+ ],
+ },
+ ]),
+ flatViewFieldMaps: {
+ byUniversalIdentifier: {
+ [OTHER_OBJECT_VIEW_FIELD_UNIVERSAL_IDENTIFIER]: {
+ universalIdentifier:
+ OTHER_OBJECT_VIEW_FIELD_UNIVERSAL_IDENTIFIER,
+ isSystemSideEffect: true,
+ },
+ },
+ },
+ },
+ }),
+ );
+
+ expect(result.status).toBe('success');
+
+ if (result.status !== 'success') {
+ throw new Error('expected success');
+ }
+
+ expect(result.operations.view).toBeUndefined();
+ expect(
+ Object.keys(result.operations.viewField?.flatEntityToDelete ?? {}),
+ ).toEqual([OTHER_OBJECT_VIEW_FIELD_UNIVERSAL_IDENTIFIER]);
+ });
+
+ it('should cascade-delete the engine-owned navigation command from the object aggregator, whatever its identifier', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ commandMenuItemUniversalIdentifiers: [
+ 'legacy-navigation-command-identifier',
+ ],
+ relatedFlatEntityMaps: {
+ flatCommandMenuItemMaps: {
+ byUniversalIdentifier: {
+ 'legacy-navigation-command-identifier': {
+ universalIdentifier: 'legacy-navigation-command-identifier',
+ isSystemSideEffect: true,
+ engineComponentKey: EngineComponentKey.NAVIGATION,
+ payload: { objectMetadataItemId: OBJECT_ID },
+ },
+ },
+ },
+ },
+ }),
+ );
+
+ expect(result.status).toBe('success');
+
+ if (result.status !== 'success') {
+ throw new Error('expected success');
+ }
+
+ expect(
+ Object.keys(result.operations.commandMenuItem?.flatEntityToDelete ?? {}),
+ ).toEqual(['legacy-navigation-command-identifier']);
+ });
+
+ it('should spare a non-system command menu item held by the object aggregator', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ commandMenuItemUniversalIdentifiers: [
+ 'caller-authored-navigation-identifier',
+ ],
+ relatedFlatEntityMaps: {
+ flatCommandMenuItemMaps: {
+ byUniversalIdentifier: {
+ 'caller-authored-navigation-identifier': {
+ universalIdentifier: 'caller-authored-navigation-identifier',
+ isSystemSideEffect: false,
+ engineComponentKey: EngineComponentKey.NAVIGATION,
+ payload: { objectMetadataItemId: OBJECT_ID },
+ },
+ },
+ },
+ },
+ }),
+ );
+
+ expect(result.status).toBe('noop');
+ });
+
+ it('should spare command menu items the object aggregator does not reference', () => {
+ const result = handler.buildSideEffects(
+ buildArgs({
+ relatedFlatEntityMaps: {
+ flatCommandMenuItemMaps: {
+ byUniversalIdentifier: {
+ 'go-to-settings-identifier': {
+ universalIdentifier: 'go-to-settings-identifier',
+ isSystemSideEffect: true,
+ engineComponentKey: EngineComponentKey.NAVIGATION,
+ payload: { path: '/settings/profile' },
+ },
+ 'other-object-navigation-identifier': {
+ universalIdentifier: 'other-object-navigation-identifier',
+ isSystemSideEffect: true,
+ engineComponentKey: EngineComponentKey.NAVIGATION,
+ payload: { objectMetadataItemId: OTHER_OBJECT_ID },
+ },
+ },
+ },
+ },
+ }),
+ );
+
+ expect(result.status).toBe('noop');
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-create-side-effect-handler.service.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-create-side-effect-handler.service.ts
new file mode 100644
index 00000000000..470b03fa25a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-create-side-effect-handler.service.ts
@@ -0,0 +1,80 @@
+import { Injectable } from '@nestjs/common';
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { buildObjectNavigationUniversalFlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
+import {
+ type BuildSideEffectsArgs,
+ MetadataSideEffectHandler,
+} from 'src/engine/metadata-modules/metadata-side-effect/interfaces/base-metadata-side-effect-handler.service';
+import { type MetadataSideEffectResult } from 'src/engine/metadata-modules/metadata-side-effect/types/metadata-side-effect-result.type';
+import { type UniversalFlatObjectMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-object-metadata.type';
+
+@Injectable()
+export class ObjectNavigationCommandOnCreateSideEffectHandlerService extends MetadataSideEffectHandler(
+ {
+ operation: 'create',
+ metadataName: 'objectMetadata',
+ name: 'objectNavigationCommandOnCreate',
+ description:
+ 'When an object is created, provision its singleton "Go to" navigation command menu item (engineComponentKey NAVIGATION, an { objectMetadataItemId } payload and the matching navigationTargetObjectMetadataId), isSystemSideEffect so the engine owns its lifecycle, and isActive mirrors the object so an object created inactive gets a disabled command rather than none. Label, shortLabel and icon are interpolation templates resolved from the object at render time, the availability expression gates on the object read permission plus a feature flag for gated standard objects, and hotKeys derive from the object shortcut. The identifier is name-free and keyed on (application, object), so an object rename keeps the same command. Position is derived from the synced maximum plus the object index in the creation batch, so batch object creation never double-books a position. Noops when the object create carries no workspace id (the manifest sync path mints entity ids after side-effect expansion). twenty-standard is not concerned: it synchronizes through the from/to migration path, which never runs the side-effect engine, and seeds one navigation command per active object itself.',
+ },
+) {
+ buildSideEffects({
+ flatEntity,
+ allFlatEntityOperationRecordByMetadataName,
+ relatedFlatEntityMaps,
+ }: BuildSideEffectsArgs<'objectMetadata'>): MetadataSideEffectResult {
+ const sourceFlatObjectMetadata = flatEntity as UniversalFlatObjectMetadata &
+ Partial<{ id: string }>;
+
+ if (!isDefined(sourceFlatObjectMetadata.id)) {
+ return { status: 'noop' };
+ }
+
+ const syncedMaxPosition = Object.values(
+ relatedFlatEntityMaps.flatCommandMenuItemMaps.byUniversalIdentifier,
+ )
+ .filter(isDefined)
+ .reduce(
+ (maxPosition, flatCommandMenuItem) =>
+ Math.max(maxPosition, flatCommandMenuItem.position),
+ -1,
+ );
+
+ const indexInBatch = Math.max(
+ Object.keys(
+ allFlatEntityOperationRecordByMetadataName.objectMetadata
+ ?.flatEntityToCreate ?? {},
+ ).indexOf(sourceFlatObjectMetadata.universalIdentifier),
+ 0,
+ );
+
+ const navigationFlatCommandMenuItemToCreate =
+ buildObjectNavigationUniversalFlatCommandMenuItem({
+ objectMetadata: {
+ id: sourceFlatObjectMetadata.id,
+ universalIdentifier: sourceFlatObjectMetadata.universalIdentifier,
+ nameSingular: sourceFlatObjectMetadata.nameSingular,
+ shortcut: sourceFlatObjectMetadata.shortcut,
+ isActive: sourceFlatObjectMetadata.isActive,
+ },
+ applicationUniversalIdentifier:
+ sourceFlatObjectMetadata.applicationUniversalIdentifier,
+ position: syncedMaxPosition + 1 + indexInBatch,
+ now: new Date().toISOString(),
+ });
+
+ return {
+ status: 'success',
+ operations: {
+ commandMenuItem: {
+ flatEntityToCreate: {
+ [navigationFlatCommandMenuItemToCreate.universalIdentifier]:
+ navigationFlatCommandMenuItemToCreate,
+ },
+ },
+ },
+ };
+ }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-update-side-effect-handler.service.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-update-side-effect-handler.service.ts
new file mode 100644
index 00000000000..abbaf30bfdd
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-update-side-effect-handler.service.ts
@@ -0,0 +1,133 @@
+import { msg, t } from '@lingui/core/macro';
+import { Injectable } from '@nestjs/common';
+
+import { getSystemNavigationCommandMenuItemUniversalIdentifier } from 'twenty-shared/application';
+import { isDefined } from 'twenty-shared/utils';
+
+import { buildNavigationConditionalAvailabilityExpression } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
+import { type MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type';
+import { type MetadataUniversalFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-universal-flat-entity.type';
+import { MetadataSideEffectExceptionCode } from 'src/engine/metadata-modules/metadata-side-effect/exceptions/metadata-side-effect-exception-code';
+import {
+ type BuildSideEffectsArgs,
+ MetadataSideEffectHandler,
+} from 'src/engine/metadata-modules/metadata-side-effect/interfaces/base-metadata-side-effect-handler.service';
+import { type MetadataSideEffectResult } from 'src/engine/metadata-modules/metadata-side-effect/types/metadata-side-effect-result.type';
+
+@Injectable()
+export class ObjectNavigationCommandOnUpdateSideEffectHandlerService extends MetadataSideEffectHandler(
+ {
+ operation: 'update',
+ metadataName: 'objectMetadata',
+ name: 'objectNavigationCommandOnUpdate',
+ description:
+ 'When an object is updated, keep its navigation command menu item in sync with the fields it denormalizes: follow an isActive toggle (deactivate soft-disables rather than deletes, the correct semantics for an overridable entity), recompute conditionalAvailabilityExpression when nameSingular changes (the expression embeds nameSingular, so a rename would otherwise leave the permission gate pointing at a name that no longer exists), and recompute hotKeys when the shortcut changes. The command is resolved by its derived (application, object) identifier, so a workspace whose rows the 2-38 re-own has not converged yet keeps the stale expression until that command runs rather than being reconciled here. Only an engine-owned command is touched. Noops when none of isActive, nameSingular or shortcut changed and when the resulting state already matches.',
+ },
+) {
+ buildSideEffects({
+ flatEntity: updatedFlatObjectMetadata,
+ relatedFlatEntityMaps,
+ }: BuildSideEffectsArgs<'objectMetadata'>): MetadataSideEffectResult {
+ const existingFlatObjectMetadata =
+ relatedFlatEntityMaps.flatObjectMetadataMaps.byUniversalIdentifier[
+ updatedFlatObjectMetadata.universalIdentifier
+ ];
+
+ if (!isDefined(existingFlatObjectMetadata)) {
+ return {
+ status: 'fail',
+ type: 'update',
+ metadataName: 'objectMetadata',
+ flatEntityMinimalInformation: {
+ universalIdentifier: updatedFlatObjectMetadata.universalIdentifier,
+ } as Partial<MetadataFlatEntity<'objectMetadata'>>,
+ errors: [
+ {
+ code: MetadataSideEffectExceptionCode.SIDE_EFFECT_PARENT_METADATA_NOT_FOUND,
+ message: t`Could not resolve the existing object to reconcile its navigation command menu item`,
+ userFriendlyMessage: msg`The object to update could not be found to reconcile its navigation command`,
+ },
+ ],
+ };
+ }
+
+ const isActiveChanged =
+ updatedFlatObjectMetadata.isActive !==
+ existingFlatObjectMetadata.isActive;
+ const nameSingularChanged =
+ updatedFlatObjectMetadata.nameSingular !==
+ existingFlatObjectMetadata.nameSingular;
+ const shortcutChanged =
+ updatedFlatObjectMetadata.shortcut !==
+ existingFlatObjectMetadata.shortcut;
+
+ if (!isActiveChanged && !nameSingularChanged && !shortcutChanged) {
+ return { status: 'noop' };
+ }
+
+ const existingNavigationFlatCommandMenuItem =
+ relatedFlatEntityMaps.flatCommandMenuItemMaps.byUniversalIdentifier[
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier:
+ existingFlatObjectMetadata.applicationUniversalIdentifier,
+ objectUniversalIdentifier:
+ existingFlatObjectMetadata.universalIdentifier,
+ })
+ ];
+
+ if (
+ !isDefined(existingNavigationFlatCommandMenuItem) ||
+ existingNavigationFlatCommandMenuItem.isSystemSideEffect !== true
+ ) {
+ return { status: 'noop' };
+ }
+
+ const navigationFlatCommandMenuItemToUpdate = {
+ ...existingNavigationFlatCommandMenuItem,
+ ...(isActiveChanged
+ ? { isActive: updatedFlatObjectMetadata.isActive }
+ : {}),
+ ...(nameSingularChanged
+ ? {
+ conditionalAvailabilityExpression:
+ buildNavigationConditionalAvailabilityExpression({
+ universalIdentifier:
+ updatedFlatObjectMetadata.universalIdentifier,
+ nameSingular: updatedFlatObjectMetadata.nameSingular,
+ }),
+ }
+ : {}),
+ ...(shortcutChanged
+ ? {
+ hotKeys: isDefined(updatedFlatObjectMetadata.shortcut)
+ ? ['G', updatedFlatObjectMetadata.shortcut]
+ : null,
+ }
+ : {}),
+ };
+
+ const hasChanges = (
+ ['isActive', 'conditionalAvailabilityExpression', 'hotKeys'] as const
+ ).some(
+ (property) =>
+ JSON.stringify(navigationFlatCommandMenuItemToUpdate[property]) !==
+ JSON.stringify(existingNavigationFlatCommandMenuItem[property]),
+ );
+
+ if (!hasChanges) {
+ return { status: 'noop' };
+ }
+
+ return {
+ status: 'success',
+ operations: {
+ commandMenuItem: {
+ flatEntityToUpdate: {
+ [navigationFlatCommandMenuItemToUpdate.universalIdentifier]:
+ navigationFlatCommandMenuItemToUpdate as unknown as MetadataUniversalFlatEntity<'commandMenuItem'>,
+ },
+ },
+ },
+ };
+ }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-system-side-effects-on-delete-side-effect-handler.service.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-system-side-effects-on-delete-side-effect-handler.service.ts
index 94e2416f9c2..f5122bc3eee 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-system-side-effects-on-delete-side-effect-handler.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-system-side-effects-on-delete-side-effect-handler.service.ts
@@ -24,7 +24,8 @@ type FlatEntityToDelete<
| 'viewFieldGroup'
| 'pageLayout'
| 'pageLayoutTab'
- | 'pageLayoutWidget',
+ | 'pageLayoutWidget'
+ | 'commandMenuItem',
> = Record<string, MetadataUniversalFlatEntity<TMetadataName>>;
@Injectable()
@@ -34,7 +35,7 @@ export class ObjectSystemSideEffectsOnDeleteSideEffectHandlerService extends Met
metadataName: 'objectMetadata',
name: 'objectSystemSideEffectsOnDelete',
description:
- 'When an object is deleted, cascade-delete its engine-owned side effects: the reserved system fields, the default relation fields (forward field on the deleted object and reverse morph field on the standard object), every system index (reverse join-column indexes, the GIN searchVector index), its searchFieldMetadata rows, its engine-owned views (the INDEX table view and the FIELDS_WIDGET record-page view) with their view fields and view field groups, and its engine-owned record-page layout stack (pageLayout, pageLayoutTab, pageLayoutWidget). View fields of the deleted system fields are cascaded too even when they live on another object view, which happens for the reverse relation fields. Every lookup walks a foreign key aggregator down from the deleted object (its fields, indexes, searchFieldMetadatas, views, then their view fields and groups, then its page layouts, their tabs and widgets) and indexes into the flat entity maps. The engine is the sole authority for isSystemSideEffect entities on delete: the API object delete transpiler cascades only user-authored fields and indexes and emits nothing for the layout stack, and manifest deletion inference excludes these entities entirely, so without these buckets the layout stack would only ever disappear through raw DB foreign key cascade, behind the engine back. Caller-provided defaults (e.g. the name field) are NOT engine-owned and are deleted through normal deletion inference / the object delete transpiler.',
+ 'When an object is deleted, cascade-delete its engine-owned side effects: the reserved system fields, the default relation fields (forward field on the deleted object and reverse morph field on the standard object), every system index (reverse join-column indexes, the GIN searchVector index), its searchFieldMetadata rows, its engine-owned views (the INDEX table view and the FIELDS_WIDGET record-page view) with their view fields and view field groups, its engine-owned record-page layout stack (pageLayout, pageLayoutTab, pageLayoutWidget), and its engine-owned navigation command menu item (provisioned by objectNavigationCommandOnCreate). View fields of the deleted system fields are cascaded too even when they live on another object view, which happens for the reverse relation fields. Every lookup walks a foreign key aggregator down from the deleted object (its fields, indexes, searchFieldMetadatas, views, then their view fields and groups, then its page layouts, their tabs and widgets, and its command menu items) and indexes into the flat entity maps. The engine is the sole authority for isSystemSideEffect entities on delete: the API object delete transpiler cascades only user-authored fields and indexes and emits nothing for the layout stack, and manifest deletion inference excludes these entities entirely, so without these buckets the layout stack would only ever disappear through raw DB foreign key cascade, behind the engine back. Caller-provided defaults (e.g. the name field) are NOT engine-owned and are deleted through normal deletion inference / the object delete transpiler.',
},
) {
buildSideEffects({
@@ -88,6 +89,10 @@ export class ObjectSystemSideEffectsOnDeleteSideEffectHandlerService extends Met
relatedFlatEntityMaps,
flatPageLayoutTabsToDelete: Object.values(pageLayoutTabToDelete),
}),
+ commandMenuItem: this.computeCommandMenuItemToDelete({
+ flatObjectMetadata,
+ relatedFlatEntityMaps,
+ }),
};
const operations = Object.fromEntries(
@@ -287,6 +292,35 @@ export class ObjectSystemSideEffectsOnDeleteSideEffectHandlerService extends Met
return viewToDelete;
}
+ private computeCommandMenuItemToDelete({
+ flatObjectMetadata,
+ relatedFlatEntityMaps,
+ }: {
+ flatObjectMetadata: MetadataUniversalFlatEntity<'objectMetadata'>;
+ relatedFlatEntityMaps: RelatedFlatEntityMaps;
+ }): FlatEntityToDelete<'commandMenuItem'> {
+ const commandMenuItemToDelete: FlatEntityToDelete<'commandMenuItem'> = {};
+
+ for (const commandMenuItemUniversalIdentifier of flatObjectMetadata.commandMenuItemUniversalIdentifiers) {
+ const flatCommandMenuItem =
+ relatedFlatEntityMaps.flatCommandMenuItemMaps.byUniversalIdentifier[
+ commandMenuItemUniversalIdentifier
+ ];
+
+ if (
+ !isDefined(flatCommandMenuItem) ||
+ flatCommandMenuItem.isSystemSideEffect !== true
+ ) {
+ continue;
+ }
+
+ commandMenuItemToDelete[flatCommandMenuItem.universalIdentifier] =
+ flatCommandMenuItem;
+ }
+
+ return commandMenuItemToDelete;
+ }
+
private computeViewFieldToDelete({
relatedFlatEntityMaps,
flatViewsToDelete,
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
index 8209bdd81d0..0ac9d887af7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
@@ -3,15 +3,10 @@ import { InjectRepository } from '@nestjs/typeorm';
import { fromArrayToUniqueKeyRecord, isDefined } from 'twenty-shared/utils';
import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';
-import { v4, v5 } from 'uuid';
+import { v4 } from 'uuid';
import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
-import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
-import {
- buildNavigationFlatCommandMenuItem,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
-} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
@@ -58,7 +53,7 @@ export class ObjectMetadataService {
updateObjectInput: UpdateOneObjectInput;
ownerFlatApplication?: FlatApplication;
}): Promise<FlatObjectMetadata> {
- const { workspaceCustomFlatApplication, twentyStandardFlatApplication } =
+ const { workspaceCustomFlatApplication } =
await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
{ workspaceId },
);
@@ -72,7 +67,6 @@ export class ObjectMetadataService {
flatFieldMetadataMaps: existingFlatFieldMetadataMaps,
flatViewFieldMaps: existingFlatViewFieldMaps,
flatViewMaps: existingFlatViewMaps,
- flatCommandMenuItemMaps: existingFlatCommandMenuItemMaps,
flatSearchFieldMetadataMaps: existingFlatSearchFieldMetadataMaps,
} = await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
{
@@ -83,7 +77,6 @@ export class ObjectMetadataService {
'flatFieldMetadataMaps',
'flatViewFieldMaps',
'flatViewMaps',
- 'flatCommandMenuItemMaps',
'flatSearchFieldMetadataMaps',
],
},
@@ -106,37 +99,8 @@ export class ObjectMetadataService {
flatSearchFieldMetadataMaps: existingFlatSearchFieldMetadataMaps,
});
- const existingFlatObjectMetadata = findFlatEntityByIdInFlatEntityMaps({
- flatEntityMaps: existingFlatObjectMetadataMaps,
- flatEntityId: updateObjectInput.id,
- });
-
const isActiveChangeDefined = isDefined(updateObjectInput.update.isActive);
- const isBeingEnabled =
- isActiveChangeDefined &&
- updateObjectInput.update.isActive === true &&
- isDefined(existingFlatObjectMetadata) &&
- !existingFlatObjectMetadata.isActive;
-
- const isBeingDisabled =
- isActiveChangeDefined &&
- updateObjectInput.update.isActive === false &&
- isDefined(existingFlatObjectMetadata) &&
- existingFlatObjectMetadata.isActive;
-
- const { commandMenuItemsToCreate, commandMenuItemsToUpdate } =
- this.computeCommandMenuItemChangesForActiveToggle({
- isBeingEnabled,
- isBeingDisabled,
- existingFlatObjectMetadata,
- flatCommandMenuItemMaps: existingFlatCommandMenuItemMaps,
- workspaceId,
- applicationId: resolvedOwnerFlatApplication.id,
- applicationUniversalIdentifier:
- resolvedOwnerFlatApplication.universalIdentifier,
- });
-
const validateAndBuildResult =
await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
{
@@ -166,11 +130,6 @@ export class ObjectMetadataService {
flatEntityToDelete: [],
flatEntityToUpdate: [],
},
- commandMenuItem: {
- flatEntityToCreate: [],
- flatEntityToDelete: [],
- flatEntityToUpdate: commandMenuItemsToUpdate,
- },
},
workspaceId,
isSystemBuild: false,
@@ -186,31 +145,6 @@ export class ObjectMetadataService {
);
}
- if (commandMenuItemsToCreate.length > 0) {
- const commandMenuItemMigrationResult =
- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
- {
- allFlatEntityOperationByMetadataName: {
- commandMenuItem: {
- flatEntityToCreate: commandMenuItemsToCreate,
- flatEntityToDelete: [],
- flatEntityToUpdate: [],
- },
- },
- workspaceId,
- applicationUniversalIdentifier:
- twentyStandardFlatApplication.universalIdentifier,
- },
- );
-
- if (commandMenuItemMigrationResult.status === 'fail') {
- throw new WorkspaceMigrationBuilderException(
- commandMenuItemMigrationResult,
- 'Multiple validation errors occurred while updating command menu items',
- );
- }
- }
-
const { flatObjectMetadataMaps: recomputedFlatObjectMetadataMaps } =
await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
{
@@ -300,12 +234,7 @@ export class ObjectMetadataService {
)
).workspaceCustomFlatApplication;
- const {
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- flatIndexMaps,
- flatCommandMenuItemMaps,
- } =
+ const { flatObjectMetadataMaps, flatFieldMetadataMaps, flatIndexMaps } =
await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
{
workspaceId,
@@ -313,7 +242,6 @@ export class ObjectMetadataService {
'flatObjectMetadataMaps',
'flatIndexMaps',
'flatFieldMetadataMaps',
- 'flatCommandMenuItemMaps',
],
},
);
@@ -395,16 +323,6 @@ export class ObjectMetadataService {
}),
);
- const flatCommandMenuItemsToDelete = flatObjectMetadatasToDelete
- .map((flatObjectMetadataToDelete) =>
- this.findNavigationCommandMenuItemForObject({
- objectUniversalIdentifier:
- flatObjectMetadataToDelete.universalIdentifier,
- flatCommandMenuItemMaps,
- }),
- )
- .filter(isDefined);
-
const validateAndBuildResult =
await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
{
@@ -424,11 +342,6 @@ export class ObjectMetadataService {
flatEntityToDelete: flatFieldMetadatasToDelete,
flatEntityToUpdate: [],
},
- commandMenuItem: {
- flatEntityToCreate: [],
- flatEntityToDelete: flatCommandMenuItemsToDelete,
- flatEntityToUpdate: [],
- },
},
workspaceId,
isSystemBuild,
@@ -481,25 +394,6 @@ export class ObjectMetadataService {
workspaceCustomFlatApplication.universalIdentifier,
});
- const { flatCommandMenuItemMaps } =
- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId,
- flatMapsKeys: ['flatCommandMenuItemMaps'],
- },
- );
-
- const flatCommandMenuItemToCreate = this.buildFlatNavigationCommandMenuItem(
- {
- objectMetadata: flatObjectMetadataToCreate,
- workspaceId,
- applicationId: resolvedOwnerFlatApplication.id,
- applicationUniversalIdentifier:
- resolvedOwnerFlatApplication.universalIdentifier,
- flatCommandMenuItemMaps,
- },
- );
-
const validateAndBuildResult =
await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
{
@@ -519,11 +413,6 @@ export class ObjectMetadataService {
flatEntityToDelete: [],
flatEntityToUpdate: [],
},
- commandMenuItem: {
- flatEntityToCreate: [flatCommandMenuItemToCreate],
- flatEntityToDelete: [],
- flatEntityToUpdate: [],
- },
...(isDefined(flatNavigationMenuItemToCreate)
? {
navigationMenuItem: {
@@ -630,153 +519,6 @@ export class ObjectMetadataService {
};
}
- private buildFlatNavigationCommandMenuItem({
- objectMetadata,
- workspaceId,
- applicationId,
- applicationUniversalIdentifier,
- flatCommandMenuItemMaps,
- }: {
- objectMetadata: {
- id: string;
- universalIdentifier: string;
- labelPlural: string;
- icon: string | null;
- nameSingular: string;
- shortcut: string | null;
- };
- workspaceId: string;
- applicationId: string;
- applicationUniversalIdentifier: string;
- flatCommandMenuItemMaps: {
- byUniversalIdentifier: Record<string, FlatCommandMenuItem | undefined>;
- };
- }): FlatCommandMenuItem {
- const existingItems = Object.values(
- flatCommandMenuItemMaps.byUniversalIdentifier,
- ).filter(isDefined);
-
- const nextPosition =
- existingItems.length > 0
- ? Math.max(...existingItems.map((item) => item.position)) + 1
- : 0;
-
- return buildNavigationFlatCommandMenuItem({
- objectMetadata,
- commandMenuItemId: v4(),
- applicationId,
- applicationUniversalIdentifier,
- workspaceId,
- position: nextPosition,
- now: new Date().toISOString(),
- });
- }
-
- private findNavigationCommandMenuItemForObject({
- objectUniversalIdentifier,
- flatCommandMenuItemMaps,
- }: {
- objectUniversalIdentifier: string;
- flatCommandMenuItemMaps: {
- byUniversalIdentifier: Record<string, FlatCommandMenuItem | undefined>;
- };
- }): FlatCommandMenuItem | undefined {
- const commandMenuItemUniversalIdentifier = v5(
- objectUniversalIdentifier,
- NAVIGATION_COMMAND_UUID_NAMESPACE,
- );
-
- return findFlatEntityByUniversalIdentifier({
- flatEntityMaps: flatCommandMenuItemMaps,
- universalIdentifier: commandMenuItemUniversalIdentifier,
- });
- }
-
- private computeCommandMenuItemChangesForActiveToggle({
- isBeingEnabled,
- isBeingDisabled,
- existingFlatObjectMetadata,
- flatCommandMenuItemMaps,
- workspaceId,
- applicationId,
- applicationUniversalIdentifier,
- }: {
- isBeingEnabled: boolean;
- isBeingDisabled: boolean;
- existingFlatObjectMetadata: FlatObjectMetadata | undefined;
- flatCommandMenuItemMaps: {
- byUniversalIdentifier: Record<string, FlatCommandMenuItem | undefined>;
- };
- workspaceId: string;
- applicationId: string;
- applicationUniversalIdentifier: string;
- }): {
- commandMenuItemsToCreate: FlatCommandMenuItem[];
- commandMenuItemsToUpdate: FlatCommandMenuItem[];
- } {
- if (!isDefined(existingFlatObjectMetadata)) {
- return { commandMenuItemsToCreate: [], commandMenuItemsToUpdate: [] };
- }
-
- const now = new Date().toISOString();
-
- if (isBeingEnabled) {
- const existingCommandMenuItem =
- this.findNavigationCommandMenuItemForObject({
- objectUniversalIdentifier:
- existingFlatObjectMetadata.universalIdentifier,
- flatCommandMenuItemMaps,
- });
-
- if (!isDefined(existingCommandMenuItem)) {
- return {
- commandMenuItemsToCreate: [
- this.buildFlatNavigationCommandMenuItem({
- objectMetadata: existingFlatObjectMetadata,
- workspaceId,
- applicationId,
- applicationUniversalIdentifier,
- flatCommandMenuItemMaps,
- }),
- ],
- commandMenuItemsToUpdate: [],
- };
- }
-
- if (!existingCommandMenuItem.isActive) {
- return {
- commandMenuItemsToCreate: [],
- commandMenuItemsToUpdate: [
- { ...existingCommandMenuItem, isActive: true, updatedAt: now },
- ],
- };
- }
- }
-
- if (isBeingDisabled) {
- const commandMenuItemToDeactivate =
- this.findNavigationCommandMenuItemForObject({
- objectUniversalIdentifier:
- existingFlatObjectMetadata.universalIdentifier,
- flatCommandMenuItemMaps,
- });
-
- if (
- isDefined(commandMenuItemToDeactivate) &&
- commandMenuItemToDeactivate.isActive
- ) {
- return {
- commandMenuItemsToCreate: [],
- commandMenuItemsToUpdate: [
- { ...commandMenuItemToDeactivate, isActive: false, updatedAt: now },
- ],
- };
- }
- }
-
- return { commandMenuItemsToCreate: [], commandMenuItemsToUpdate: [] };
- }
-
public async findOneWithinWorkspace(
workspaceId: string,
options: FindOneOptions<ObjectMetadataEntity>,
diff --git a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/interpolate-navigation-command-menu-item-event.util.spec.ts b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/interpolate-navigation-command-menu-item-event.util.spec.ts
index 950c7db4da7..8cea1580fb8 100644
--- a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/interpolate-navigation-command-menu-item-event.util.spec.ts
+++ b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/interpolate-navigation-command-menu-item-event.util.spec.ts
@@ -7,7 +7,7 @@ import {
NAVIGATION_INTERPOLATED_ICON,
NAVIGATION_INTERPOLATED_LABEL,
NAVIGATION_INTERPOLATED_SHORT_LABEL,
-} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { interpolateNavigationCommandMenuItemEvent } from 'src/engine/subscriptions/metadata-event/utils/interpolate-navigation-command-menu-item-event.util';
import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/__tests__/standard-command-menu-item-placeholders.spec.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/__tests__/standard-command-menu-item-placeholders.spec.ts
index a40b6b764c2..18e495d10bf 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/__tests__/standard-command-menu-item-placeholders.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/__tests__/standard-command-menu-item-placeholders.spec.ts
@@ -5,7 +5,7 @@ import {
NAVIGATION_INTERPOLATED_ICON,
NAVIGATION_INTERPOLATED_LABEL,
NAVIGATION_INTERPOLATED_SHORT_LABEL,
-} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+} from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util';
import { INDEX_VIEW_NAME } from 'src/engine/metadata-modules/view/constants/index-view-name.constant';
import { STANDARD_COMMAND_MENU_ITEMS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant';
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts
index 8fa0535d258..26740633d43 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts
@@ -1,9 +1,9 @@
import { msg } from '@lingui/core/macro';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { CommandMenuItemAvailabilityType } from 'twenty-shared/types';
import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
import { i18nLabel } from 'src/engine/workspace-manager/twenty-standard-application/utils/i18n-label.util';
+import { CommandMenuItemAvailabilityType } from 'twenty-shared/types';
export const STANDARD_COMMAND_MENU_ITEMS = {
navigateToNextRecord: {
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/command-menu-item/build-standard-flat-command-menu-item-maps.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/command-menu-item/build-standard-flat-command-menu-item-maps.util.ts
index fcc92c67d7a..ccf0a778399 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/command-menu-item/build-standard-flat-command-menu-item-maps.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/command-menu-item/build-standard-flat-command-menu-item-maps.util.ts
@@ -3,7 +3,7 @@ import { isDefined } from 'twenty-shared/utils';
import { v4 } from 'uuid';
import { type FlatCommandMenuItemMaps } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item-maps.type';
-import { buildNavigationFlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-navigation-flat-command-menu-item.util';
+import { buildObjectNavigationFlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-flat-command-menu-item.util';
import { seedCompareObjectMetadataForNavigationPosition } from 'src/engine/metadata-modules/flat-command-menu-item/utils/seed-compare-object-metadata-for-navigation-position.util';
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
@@ -69,7 +69,7 @@ export const buildStandardFlatCommandMenuItemMaps = ({
for (const flatObject of activeObjects) {
const position = nextPosition++;
- const navigationItem = buildNavigationFlatCommandMenuItem({
+ const navigationItem = buildObjectNavigationFlatCommandMenuItem({
objectMetadata: flatObject,
commandMenuItemId: v4(),
applicationId: twentyStandardApplicationId,
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.ts
index 6998ecf5516..826fa2d9e0b 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
@@ -20,6 +20,7 @@ export class FlatCommandMenuItemValidatorService {
flatEntityToValidate: flatCommandMenuItem,
optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
flatObjectMetadataMaps,
+ flatCommandMenuItemMaps: optimisticFlatCommandMenuItemMaps,
},
}: UniversalFlatEntityValidationArgs<
typeof ALL_METADATA_NAME.commandMenuItem
@@ -59,23 +60,26 @@ export class FlatCommandMenuItemValidatorService {
if (
isDefined(
- flatCommandMenuItem.navigationTargetObjectMetadataUniversalIdentifier,
- ) &&
- !isDefined(
findFlatEntityByUniversalIdentifier({
- universalIdentifier:
- flatCommandMenuItem.navigationTargetObjectMetadataUniversalIdentifier,
- flatEntityMaps: flatObjectMetadataMaps,
+ universalIdentifier: flatCommandMenuItem.universalIdentifier,
+ flatEntityMaps: optimisticFlatCommandMenuItemMaps,
}),
)
) {
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`,
+ message: t`Command menu item with same universal identifier already exists`,
+ userFriendlyMessage: msg`Command menu item already exists`,
});
}
+ this.validateNavigationTarget({
+ navigationTargetObjectMetadataUniversalIdentifier:
+ flatCommandMenuItem.navigationTargetObjectMetadataUniversalIdentifier,
+ flatObjectMetadataMaps,
+ validationResult,
+ });
+
return validationResult;
}
@@ -116,6 +120,7 @@ export class FlatCommandMenuItemValidatorService {
flatEntityUpdate,
optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
flatCommandMenuItemMaps: optimisticFlatCommandMenuItemMaps,
+ flatObjectMetadataMaps,
},
}: FlatEntityUpdateValidationArgs<
typeof ALL_METADATA_NAME.commandMenuItem
@@ -171,9 +176,52 @@ export class FlatCommandMenuItemValidatorService {
validationResult,
});
+ this.validateNavigationTarget({
+ navigationTargetObjectMetadataUniversalIdentifier:
+ flatEntityUpdate.navigationTargetObjectMetadataUniversalIdentifier !==
+ undefined
+ ? flatEntityUpdate.navigationTargetObjectMetadataUniversalIdentifier
+ : fromFlatCommandMenuItem.navigationTargetObjectMetadataUniversalIdentifier,
+ flatObjectMetadataMaps,
+ validationResult,
+ });
+
return validationResult;
}
+ private validateNavigationTarget({
+ navigationTargetObjectMetadataUniversalIdentifier,
+ flatObjectMetadataMaps,
+ validationResult,
+ }: {
+ navigationTargetObjectMetadataUniversalIdentifier: string | null;
+ flatObjectMetadataMaps: UniversalFlatEntityValidationArgs<
+ typeof ALL_METADATA_NAME.commandMenuItem
+ >['optimisticFlatEntityMapsAndRelatedFlatEntityMaps']['flatObjectMetadataMaps'];
+ validationResult: FailedFlatEntityValidation<
+ 'commandMenuItem',
+ 'create' | 'update'
+ >;
+ }): void {
+ if (!isDefined(navigationTargetObjectMetadataUniversalIdentifier)) {
+ return;
+ }
+
+ const navigationTargetFlatObjectMetadata =
+ findFlatEntityByUniversalIdentifier({
+ universalIdentifier: navigationTargetObjectMetadataUniversalIdentifier,
+ flatEntityMaps: flatObjectMetadataMaps,
+ });
+
+ if (!isDefined(navigationTargetFlatObjectMetadata)) {
+ 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`,
+ });
+ }
+ }
+
private validateEngineComponentKeyCoherence({
engineComponentKey,
workflowVersionId,
diff --git a/packages/twenty-server/test/integration/metadata/suites/object-metadata/command-menu-item-side-effect-on-object-metadata.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/object-metadata/command-menu-item-side-effect-on-object-metadata.integration-spec.ts
index fc82c2d8da4..9df9dbf3895 100644
--- a/packages/twenty-server/test/integration/metadata/suites/object-metadata/command-menu-item-side-effect-on-object-metadata.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/object-metadata/command-menu-item-side-effect-on-object-metadata.integration-spec.ts
@@ -26,6 +26,7 @@ const COMMAND_MENU_ITEM_GQL_FIELDS = `
label
icon
isActive
+ conditionalAvailabilityExpression
payload {
... on PathCommandMenuItemPayload {
path
@@ -210,6 +211,70 @@ describe('Command menu item side effect on object metadata', () => {
).toEqual(expect.objectContaining({ isActive: false }));
});
+ it('should recompute the availability expression when the object is renamed, keeping the same command', async () => {
+ const {
+ data: { createOneObject },
+ } = await createOneObjectMetadata({
+ expectToFail: false,
+ input: createObjectInput,
+ gqlFields: 'id',
+ });
+
+ createdObjectMetadataId = createOneObject.id;
+
+ const {
+ data: { commandMenuItems: itemsBeforeRename },
+ } = await findCommandMenuItems({
+ expectToFail: false,
+ input: undefined,
+ gqlFields: COMMAND_MENU_ITEM_GQL_FIELDS,
+ });
+
+ const navigationItemBeforeRename = findNavigationCommandMenuItemForObject(
+ itemsBeforeRename,
+ createdObjectMetadataId,
+ );
+
+ expect(navigationItemBeforeRename).toEqual(
+ expect.objectContaining({
+ conditionalAvailabilityExpression: `targetObjectReadPermissions.${createObjectInput.nameSingular}`,
+ }),
+ );
+
+ const renamedNameSingular = `renamedItem${uniqueSuffix}`;
+
+ await updateOneObjectMetadata({
+ expectToFail: false,
+ input: {
+ idToUpdate: createdObjectMetadataId,
+ updatePayload: {
+ nameSingular: renamedNameSingular,
+ namePlural: `renamedItems${uniqueSuffix}`,
+ },
+ },
+ });
+
+ const {
+ data: { commandMenuItems: itemsAfterRename },
+ } = await findCommandMenuItems({
+ expectToFail: false,
+ input: undefined,
+ gqlFields: COMMAND_MENU_ITEM_GQL_FIELDS,
+ });
+
+ const navigationItemAfterRename = findNavigationCommandMenuItemForObject(
+ itemsAfterRename,
+ createdObjectMetadataId,
+ );
+
+ expect(navigationItemAfterRename).toEqual(
+ expect.objectContaining({
+ id: navigationItemBeforeRename?.id,
+ conditionalAvailabilityExpression: `targetObjectReadPermissions.${renamedNameSingular}`,
+ }),
+ );
+ });
+
it('should reactivate the navigation command menu item when a disabled object is re-enabled', async () => {
const {
data: { createOneObject },
diff --git a/packages/twenty-shared/src/application/deterministic-identifier/__tests__/get-command-menu-item-universal-identifier.util.spec.ts b/packages/twenty-shared/src/application/deterministic-identifier/__tests__/get-command-menu-item-universal-identifier.util.spec.ts
deleted file mode 100644
index b7260aab95d..00000000000
--- a/packages/twenty-shared/src/application/deterministic-identifier/__tests__/get-command-menu-item-universal-identifier.util.spec.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import {
- getGlobalCommandMenuItemUniversalIdentifier,
- getGlobalObjectContextCommandMenuItemUniversalIdentifier,
- getNavigationCommandUniversalIdentifier,
- getRecordSelectionCommandMenuItemUniversalIdentifier,
-} from '@/application/deterministic-identifier/get-command-menu-item-universal-identifier.util';
-
-const APP = '11111111-1111-4111-8111-111111111111';
-const OBJECT = '22222222-2222-4222-8222-222222222222';
-
-describe('getGlobalCommandMenuItemUniversalIdentifier', () => {
- it('derives a deterministic id from the engineComponentKey within GLOBAL', () => {
- expect(
- getGlobalCommandMenuItemUniversalIdentifier({
- applicationUniversalIdentifier: APP,
- engineComponentKey: 'EXPORT_RECORDS',
- }),
- ).toBe('bba78a2e-c117-52af-b25d-126702e8cf57');
- });
-});
-
-describe('getGlobalObjectContextCommandMenuItemUniversalIdentifier', () => {
- it('derives a deterministic id from the engineComponentKey within GLOBAL_OBJECT_CONTEXT', () => {
- expect(
- getGlobalObjectContextCommandMenuItemUniversalIdentifier({
- applicationUniversalIdentifier: APP,
- engineComponentKey: 'CREATE_NEW_RECORD',
- }),
- ).toBe('77fb3fcd-ee35-50ea-9c3c-ab95cef5e0e2');
- });
-});
-
-describe('getRecordSelectionCommandMenuItemUniversalIdentifier', () => {
- it('includes the target object when scoped to one', () => {
- expect(
- getRecordSelectionCommandMenuItemUniversalIdentifier({
- applicationUniversalIdentifier: APP,
- engineComponentKey: 'COMPOSE_EMAIL',
- objectUniversalIdentifier: OBJECT,
- }),
- ).toBe('dd10a2b1-229b-572a-a887-ea20e487cfd3');
- });
-
- it('omits the object for object-agnostic record-selection commands', () => {
- expect(
- getRecordSelectionCommandMenuItemUniversalIdentifier({
- applicationUniversalIdentifier: APP,
- engineComponentKey: 'DELETE_RECORDS',
- }),
- ).toBe('36b20ed1-6172-5da5-9a21-58de9c8acb22');
- });
-});
-
-describe('getNavigationCommandUniversalIdentifier', () => {
- it('derives a deterministic id from the navigation role within its object', () => {
- expect(
- getNavigationCommandUniversalIdentifier({
- applicationUniversalIdentifier: APP,
- objectUniversalIdentifier: OBJECT,
- }),
- ).toBe('ec4626f3-3170-5ddc-a309-bdf2a18d4e84');
- });
-});
diff --git a/packages/twenty-shared/src/application/deterministic-identifier/__tests__/get-system-navigation-command-menu-item-universal-identifier.util.spec.ts b/packages/twenty-shared/src/application/deterministic-identifier/__tests__/get-system-navigation-command-menu-item-universal-identifier.util.spec.ts
new file mode 100644
index 00000000000..97e9054fd4f
--- /dev/null
+++ b/packages/twenty-shared/src/application/deterministic-identifier/__tests__/get-system-navigation-command-menu-item-universal-identifier.util.spec.ts
@@ -0,0 +1,15 @@
+import { getSystemNavigationCommandMenuItemUniversalIdentifier } from '@/application/deterministic-identifier/get-system-navigation-command-menu-item-universal-identifier.util';
+
+const APP = '11111111-1111-4111-8111-111111111111';
+const OBJECT = '22222222-2222-4222-8222-222222222222';
+
+describe('getSystemNavigationCommandMenuItemUniversalIdentifier', () => {
+ it('derives a deterministic id from the navigation role within its object', () => {
+ expect(
+ getSystemNavigationCommandMenuItemUniversalIdentifier({
+ objectMetadataApplicationUniversalIdentifier: APP,
+ objectUniversalIdentifier: OBJECT,
+ }),
+ ).toBe('ec4626f3-3170-5ddc-a309-bdf2a18d4e84');
+ });
+});
diff --git a/packages/twenty-shared/src/application/deterministic-identifier/get-command-menu-item-universal-identifier.util.ts b/packages/twenty-shared/src/application/deterministic-identifier/get-command-menu-item-universal-identifier.util.ts
deleted file mode 100644
index df019546b0f..00000000000
--- a/packages/twenty-shared/src/application/deterministic-identifier/get-command-menu-item-universal-identifier.util.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { computeDeterministicUuid } from '@/application/deterministic-identifier/compute-deterministic-uuid.util';
-
-const NAVIGATION_COMMAND_DISCRIMINATOR = 'navigation';
-
-// A command menu item is identified by its availabilityType + engineComponentKey
-// (the same engineComponentKey is reused across availability types and, for
-// RECORD_SELECTION, across objects). One util per availabilityType, prefixed by
-// the type, with the target object added only for RECORD_SELECTION.
-
-export const getGlobalCommandMenuItemUniversalIdentifier = ({
- applicationUniversalIdentifier,
- engineComponentKey,
-}: {
- applicationUniversalIdentifier: string;
- engineComponentKey: string;
-}): string =>
- computeDeterministicUuid({
- entityNamespace: 'commandMenuItem',
- value: `GLOBAL:${engineComponentKey}`,
- applicationUniversalIdentifier,
- });
-
-// GLOBAL_OBJECT_CONTEXT: a command whose object is resolved at runtime (not stored),
-// identified by its engineComponentKey.
-export const getGlobalObjectContextCommandMenuItemUniversalIdentifier = ({
- applicationUniversalIdentifier,
- engineComponentKey,
-}: {
- applicationUniversalIdentifier: string;
- engineComponentKey: string;
-}): string =>
- computeDeterministicUuid({
- entityNamespace: 'commandMenuItem',
- value: `GLOBAL_OBJECT_CONTEXT:${engineComponentKey}`,
- applicationUniversalIdentifier,
- });
-
-// RECORD_SELECTION: a command acting on selected records; the same engineComponentKey
-// is replicated per object, so the target object is part of the identity
-// (null/absent for the object-agnostic record-selection commands).
-export const getRecordSelectionCommandMenuItemUniversalIdentifier = ({
- applicationUniversalIdentifier,
- engineComponentKey,
- objectUniversalIdentifier,
-}: {
- applicationUniversalIdentifier: string;
- engineComponentKey: string;
- objectUniversalIdentifier?: string | null;
-}): string =>
- computeDeterministicUuid({
- entityNamespace: 'commandMenuItem',
- value: `RECORD_SELECTION:${engineComponentKey}:${objectUniversalIdentifier ?? ''}`,
- applicationUniversalIdentifier,
- });
-
-export const getNavigationCommandUniversalIdentifier = ({
- applicationUniversalIdentifier,
- objectUniversalIdentifier,
-}: {
- applicationUniversalIdentifier: string;
- objectUniversalIdentifier: string;
-}): string =>
- computeDeterministicUuid({
- entityNamespace: 'commandMenuItem',
- value: `${objectUniversalIdentifier}:${NAVIGATION_COMMAND_DISCRIMINATOR}`,
- applicationUniversalIdentifier,
- });
diff --git a/packages/twenty-shared/src/application/deterministic-identifier/get-system-navigation-command-menu-item-universal-identifier.util.ts b/packages/twenty-shared/src/application/deterministic-identifier/get-system-navigation-command-menu-item-universal-identifier.util.ts
new file mode 100644
index 00000000000..13aab8d6195
--- /dev/null
+++ b/packages/twenty-shared/src/application/deterministic-identifier/get-system-navigation-command-menu-item-universal-identifier.util.ts
@@ -0,0 +1,17 @@
+import { computeDeterministicUuid } from '@/application/deterministic-identifier/compute-deterministic-uuid.util';
+
+const NAVIGATION_COMMAND_DISCRIMINATOR = 'navigation';
+
+export const getSystemNavigationCommandMenuItemUniversalIdentifier = ({
+ objectMetadataApplicationUniversalIdentifier,
+ objectUniversalIdentifier,
+}: {
+ objectMetadataApplicationUniversalIdentifier: string;
+ objectUniversalIdentifier: string;
+}): string =>
+ computeDeterministicUuid({
+ entityNamespace: 'commandMenuItem',
+ value: `${objectUniversalIdentifier}:${NAVIGATION_COMMAND_DISCRIMINATOR}`,
+ applicationUniversalIdentifier:
+ objectMetadataApplicationUniversalIdentifier,
+ });
diff --git a/packages/twenty-shared/src/application/index.ts b/packages/twenty-shared/src/application/index.ts
index 7a790ad1d55..0a406b7af3f 100644
--- a/packages/twenty-shared/src/application/index.ts
+++ b/packages/twenty-shared/src/application/index.ts
@@ -49,12 +49,6 @@ export { computeDeterministicUuid } from './deterministic-identifier/compute-det
export type { DeterministicEntityNamespace } from './deterministic-identifier/deterministic-entity-namespace.type';
export { getAgentUniversalIdentifier } from './deterministic-identifier/get-agent-universal-identifier.util';
export { getApplicationVariableUniversalIdentifier } from './deterministic-identifier/get-application-variable-universal-identifier.util';
-export {
- getGlobalCommandMenuItemUniversalIdentifier,
- getGlobalObjectContextCommandMenuItemUniversalIdentifier,
- getRecordSelectionCommandMenuItemUniversalIdentifier,
- getNavigationCommandUniversalIdentifier,
-} from './deterministic-identifier/get-command-menu-item-universal-identifier.util';
export { getConnectionProviderUniversalIdentifier } from './deterministic-identifier/get-connection-provider-universal-identifier.util';
export { getFieldPermissionUniversalIdentifier } from './deterministic-identifier/get-field-permission-universal-identifier.util';
export { getFieldUniversalIdentifier } from './deterministic-identifier/get-field-universal-identifier.util';
@@ -77,6 +71,7 @@ export { getRoleUniversalIdentifier } from './deterministic-identifier/get-role-
export { getSearchFieldUniversalIdentifier } from './deterministic-identifier/get-search-field-universal-identifier.util';
export { getSelectOptionUniversalIdentifier } from './deterministic-identifier/get-select-option-universal-identifier.util';
export { getSkillUniversalIdentifier } from './deterministic-identifier/get-skill-universal-identifier.util';
+export { getSystemNavigationCommandMenuItemUniversalIdentifier } from './deterministic-identifier/get-system-navigation-command-menu-item-universal-identifier.util';
export { getSystemPageLayoutTabUniversalIdentifier } from './deterministic-identifier/get-system-page-layout-tab-universal-identifier.util';
export { getSystemPageLayoutWidgetUniversalIdentifier } from './deterministic-identifier/get-system-page-layout-widget-universal-identifier.util';
export { getSystemRecordPageLayoutUniversalIdentifier } from './deterministic-identifier/get-system-record-page-layout-universal-identifier.util';