The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Declare navigation menu items as children of object, view and page layout so their cache follows deletions (#26141)
Paul Rastoinb3228542d3d0
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.tsindex 23767fd9d1f..b70e7a959f0 100644--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.ts+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.ts@@ -158,6 +158,7 @@ export const mockPersonFlatObjectMetadata = (universalIdentifier: objectMetadataId,indexMetadataIds: [],searchFieldMetadataIds: [],+ navigationMenuItemIds: [],commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],@@ -187,6 +188,7 @@ export const mockPersonFlatObjectMetadata = (fieldPermissionUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier: null,imageIdentifierFieldMetadataUniversalIdentifier: null,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-flat-view-to-view-manifest.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-flat-view-to-view-manifest.util.spec.tsindex 3c8fea28741..2e2702c630d 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-flat-view-to-view-manifest.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-flat-view-to-view-manifest.util.spec.ts@@ -182,6 +182,7 @@ describe('fromFlatViewToViewManifest', () => {viewFilterGroupUniversalIdentifiers: [],viewGroupUniversalIdentifiers: [],viewFieldGroupUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],viewSortUniversalIdentifiers: [],createdAt: NOW,updatedAt: NOW,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util.tsindex 2ef9ca82085..0e5b5f33dd4 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-object-manifest-to-universal-flat-object-metadata.util.ts@@ -46,6 +46,7 @@ export const fromObjectManifestToUniversalFlatObjectMetadata = ({fieldUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],commandMenuItemUniversalIdentifiers: [],objectPermissionUniversalIdentifiers: [],fieldPermissionUniversalIdentifiers: [],diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-manifest-to-universal-flat-page-layout.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-manifest-to-universal-flat-page-layout.util.tsindex 6ca9b56fdb5..4f45d74218e 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-manifest-to-universal-flat-page-layout.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-manifest-to-universal-flat-page-layout.util.ts@@ -22,6 +22,7 @@ export const fromPageLayoutManifestToUniversalFlatPageLayout = ({defaultTabToFocusOnMobileAndSidePanelUniversalIdentifier:pageLayoutManifest.defaultTabToFocusOnMobileAndSidePanelUniversalIdentifier ??null,+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [],isSystemSideEffect: false,isFirstTabPinned: true,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-manifest-to-universal-flat-view.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-manifest-to-universal-flat-view.util.tsindex 4f118263d4f..687a5bc3489 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-manifest-to-universal-flat-view.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-manifest-to-universal-flat-view.util.ts@@ -52,6 +52,7 @@ export const fromViewManifestToUniversalFlatView = ({viewFilterGroupUniversalIdentifiers: [],viewGroupUniversalIdentifiers: [],viewFieldGroupUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],viewSortUniversalIdentifiers: [],createdAt: now,updatedAt: now,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.tsindex f3390324429..eaeca3de976 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts@@ -35,7 +35,9 @@ const PAGE_LAYOUT: FlatPageLayout = {objectMetadataUniversalIdentifier: null,defaultTabToFocusOnMobileAndSidePanelId: null,defaultTabToFocusOnMobileAndSidePanelUniversalIdentifier: null,+ navigationMenuItemIds: [],tabIds: [],+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [],isSystemSideEffect: false,isFirstTabPinned: true,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-page-layouts-manifest.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-page-layouts-manifest.util.spec.tsindex 30cb086a1d2..cc62758d92d 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-page-layouts-manifest.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-page-layouts-manifest.util.spec.ts@@ -153,6 +153,7 @@ const allPetsView: FlatView = {viewFilterIds: [],viewGroupIds: [],viewFilterGroupIds: [],+ navigationMenuItemIds: [],viewSortIds: [],};@@ -192,6 +193,7 @@ const buildFlatPageLayout = ({? `${pageLayoutManifest.objectUniversalIdentifier}-id`: null,defaultTabToFocusOnMobileAndSidePanelId: null,+ navigationMenuItemIds: [],tabIds: [],...flatPageLayoutProperties,});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-views-manifest.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-views-manifest.util.spec.tsindex a14c57f79bf..1f3c67f17c8 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-views-manifest.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-views-manifest.util.spec.ts@@ -196,6 +196,7 @@ const buildFlatView = ({viewFilterIds: [],viewGroupIds: [],viewFilterGroupIds: [],+ navigationMenuItemIds: [],viewSortIds: [],...flatViewProperties,});diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.tsindex 87f2318faa4..380f7f99f2d 100644--- a/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.ts@@ -32,6 +32,7 @@ const mockObjectMetadata: FlatObjectMetadata = {isSearchable: true,indexMetadataIds: [],searchFieldMetadataIds: [],+ navigationMenuItemIds: [],commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],@@ -62,6 +63,7 @@ const mockObjectMetadata: FlatObjectMetadata = {pageLayoutUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier: null,imageIdentifierFieldMetadataUniversalIdentifier: null,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.tsindex 896646820e5..fb570477074 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant.ts@@ -108,7 +108,7 @@ export const ALL_MANY_TO_ONE_METADATA_RELATIONS = {targetObjectMetadata: {metadataName: 'objectMetadata',foreignKey: 'targetObjectMetadataId',- inverseOneToManyProperty: null,+ inverseOneToManyProperty: 'navigationMenuItems',isNullable: true,universalForeignKey: 'targetObjectMetadataUniversalIdentifier',},@@ -122,14 +122,14 @@ export const ALL_MANY_TO_ONE_METADATA_RELATIONS = {view: {metadataName: 'view',foreignKey: 'viewId',- inverseOneToManyProperty: null,+ inverseOneToManyProperty: 'navigationMenuItems',isNullable: true,universalForeignKey: 'viewUniversalIdentifier',},pageLayout: {metadataName: 'pageLayout',foreignKey: 'pageLayoutId',- inverseOneToManyProperty: null,+ inverseOneToManyProperty: 'navigationMenuItems',isNullable: true,universalForeignKey: 'pageLayoutUniversalIdentifier',},diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-one-to-many-metadata-relations.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-one-to-many-metadata-relations.constant.tsindex a1c0152d1fb..d7db6ff2934 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-one-to-many-metadata-relations.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-one-to-many-metadata-relations.constant.ts@@ -136,6 +136,12 @@ export const ALL_ONE_TO_MANY_METADATA_RELATIONS = {universalFlatEntityForeignKeyAggregator:'commandMenuItemUniversalIdentifiers',},+ navigationMenuItems: {+ metadataName: 'navigationMenuItem',+ flatEntityForeignKeyAggregator: 'navigationMenuItemIds',+ universalFlatEntityForeignKeyAggregator:+ 'navigationMenuItemUniversalIdentifiers',+ },},view: {viewFields: {@@ -170,6 +176,12 @@ export const ALL_ONE_TO_MANY_METADATA_RELATIONS = {flatEntityForeignKeyAggregator: 'viewSortIds',universalFlatEntityForeignKeyAggregator: 'viewSortUniversalIdentifiers',},+ navigationMenuItems: {+ metadataName: 'navigationMenuItem',+ flatEntityForeignKeyAggregator: 'navigationMenuItemIds',+ universalFlatEntityForeignKeyAggregator:+ 'navigationMenuItemUniversalIdentifiers',+ },},viewField: {},viewFieldGroup: {@@ -240,6 +252,12 @@ export const ALL_ONE_TO_MANY_METADATA_RELATIONS = {flatEntityForeignKeyAggregator: 'tabIds',universalFlatEntityForeignKeyAggregator: 'tabUniversalIdentifiers',},+ navigationMenuItems: {+ metadataName: 'navigationMenuItem',+ flatEntityForeignKeyAggregator: 'navigationMenuItemIds',+ universalFlatEntityForeignKeyAggregator:+ 'navigationMenuItemUniversalIdentifiers',+ },},pageLayoutTab: {widgets: {diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/get-metadata-related-metadata-names.util.spec.ts.snap b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/get-metadata-related-metadata-names.util.spec.ts.snapindex 2a96b84fb2a..0d261de0aaa 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/get-metadata-related-metadata-names.util.spec.ts.snap+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/get-metadata-related-metadata-names.util.spec.ts.snap@@ -64,6 +64,7 @@ exports[`getMetadataRelatedMetadataNames should return related metadata names fo"searchFieldMetadata","pageLayout","commandMenuItem",+ "navigationMenuItem",]`;@@ -78,6 +79,7 @@ exports[`getMetadataRelatedMetadataNames should return related metadata names fo["objectMetadata","pageLayoutTab",+ "navigationMenuItem",]`;@@ -165,6 +167,7 @@ exports[`getMetadataRelatedMetadataNames should return related metadata names fo"viewGroup","viewFieldGroup","viewSort",+ "navigationMenuItem",]`;diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/sort-metadata-names-children-first.util.spec.ts.snap b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/sort-metadata-names-children-first.util.spec.ts.snapindex 0b9118ff95b..ad62468b064 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/sort-metadata-names-children-first.util.spec.ts.snap+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/__snapshots__/sort-metadata-names-children-first.util.spec.ts.snap@@ -15,7 +15,6 @@ exports[`sortMetadataNamesChildrenFirst should return metadata names sorted with"roleTarget","viewSort","index",- "pageLayout","rowLevelPermissionPredicateGroup","viewGroup","agent",@@ -23,6 +22,7 @@ exports[`sortMetadataNamesChildrenFirst should return metadata names sorted with"connectionProvider","frontComponent","logicFunction",+ "pageLayout","pageLayoutTab","skill","timelineActivityType",diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.tsindex 863d0be472a..1b00e348f1b 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts@@ -30,6 +30,7 @@ export const getFlatObjectMetadataMock = (fieldPermissionIds: [],fieldIds: [],pageLayoutIds: [],+ navigationMenuItemIds: [],commandMenuItemIds: [],description: 'default flat object metadata description',icon: 'icon',@@ -69,6 +70,7 @@ export const getFlatObjectMetadataMock = (indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],pageLayoutUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier:labelIdentifierFieldMetadataId,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service.tsindex 8cb5fc581b8..b3c79784ee6 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service.ts@@ -45,6 +45,10 @@ const FLAT_OBJECT_METADATA_ROWS_REQUIREMENT = {columns: ['id', 'universalIdentifier'],groupBy: ['navigationTargetObjectMetadataId'],},+ navigationMenuItem: {+ columns: ['id', 'universalIdentifier'],+ groupBy: ['targetObjectMetadataId'],+ },} as const;@Injectable()@@ -68,6 +72,7 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends MetadataFlatEntisearchFieldMetadata: searchFieldMetadatas,pageLayout: pageLayouts,commandMenuItem: commandMenuItems,+ navigationMenuItem: navigationMenuItems,} = rows;const applicationIdToUniversalIdentifierMap =@@ -104,6 +109,10 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends MetadataFlatEnticommandMenuItems.byNavigationTargetObjectMetadataId.get(objectMetadataEntity.id,) || [],+ navigationMenuItems:+ navigationMenuItems.byTargetObjectMetadataId.get(+ objectMetadataEntity.id,+ ) || [],},applicationIdToUniversalIdentifierMap,fieldMetadataIdToUniversalIdentifierMap,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.tsindex fe7a2f44a69..000bef8f85b 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts@@ -94,6 +94,7 @@ export const fromCreateObjectInputToFlatObjectMetadataAndFlatFieldMetadatasToCreindexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],pageLayoutUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier,imageIdentifierFieldMetadataUniversalIdentifier: null,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.tsindex b826618f4ac..e6ece3f34d9 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts@@ -112,5 +112,11 @@ export const fromObjectMetadataEntityToFlatObjectMetadata = (objectMetadataEntity.commandMenuItems?.map(({ universalIdentifier }) => universalIdentifier,) ?? [],+ navigationMenuItemIds:+ objectMetadataEntity.navigationMenuItems?.map(({ id }) => id) ?? [],+ navigationMenuItemUniversalIdentifiers:+ objectMetadataEntity.navigationMenuItems?.map(+ ({ universalIdentifier }) => universalIdentifier,+ ) ?? [],};};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service.tsindex 78bb501cc8b..da112bcad69 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service.ts@@ -16,6 +16,10 @@ const FLAT_PAGE_LAYOUT_ROWS_REQUIREMENT = {columns: ['id', 'universalIdentifier'],groupBy: ['pageLayoutId'],},+ navigationMenuItem: {+ columns: ['id', 'universalIdentifier'],+ groupBy: ['pageLayoutId'],+ },application: ['id', 'universalIdentifier'],objectMetadata: ['id', 'universalIdentifier'],} as const;@@ -33,6 +37,7 @@ export class WorkspaceFlatPageLayoutMapCacheService extends MetadataFlatEntityMaconst {pageLayout: pageLayouts,pageLayoutTab: pageLayoutTabs,+ navigationMenuItem: navigationMenuItems,application: applications,objectMetadata: objectMetadatas,} = rows;@@ -51,6 +56,8 @@ export class WorkspaceFlatPageLayoutMapCacheService extends MetadataFlatEntityMaentity: {...pageLayoutEntity,tabs: pageLayoutTabs.byPageLayoutId.get(pageLayoutEntity.id) || [],+ navigationMenuItems:+ navigationMenuItems.byPageLayoutId.get(pageLayoutEntity.id) || [],},applicationIdToUniversalIdentifierMap,objectMetadataIdToUniversalIdentifierMap,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/from-create-page-layout-input-to-flat-page-layout-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/from-create-page-layout-input-to-flat-page-layout-to-create.util.tsindex cec45a75486..a5d6eb5385f 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/from-create-page-layout-input-to-flat-page-layout-to-create.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/from-create-page-layout-input-to-flat-page-layout-to-create.util.ts@@ -53,7 +53,9 @@ export const fromCreatePageLayoutInputToFlatPageLayoutToCreate = ({universalIdentifier: pageLayoutId,applicationId: flatApplication.id,applicationUniversalIdentifier: flatApplication.universalIdentifier,+ navigationMenuItemIds: [],tabIds: [],+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [],defaultTabToFocusOnMobileAndSidePanelId: null,defaultTabToFocusOnMobileAndSidePanelUniversalIdentifier: null,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/transform-page-layout-entity-to-flat-page-layout.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/transform-page-layout-entity-to-flat-page-layout.util.tsindex 6aef2ee23ef..a988d0b3aac 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/transform-page-layout-entity-to-flat-page-layout.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/transform-page-layout-entity-to-flat-page-layout.util.ts@@ -77,6 +77,12 @@ export const transformPageLayoutEntityToFlatPageLayout = ({tabUniversalIdentifiers: pageLayoutEntity.tabs.map((tab) => tab.universalIdentifier,),+ navigationMenuItemIds:+ pageLayoutEntity.navigationMenuItems?.map(({ id }) => id) ?? [],+ navigationMenuItemUniversalIdentifiers:+ pageLayoutEntity.navigationMenuItems?.map(+ ({ universalIdentifier }) => universalIdentifier,+ ) ?? [],defaultTabToFocusOnMobileAndSidePanelUniversalIdentifier,};};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/services/workspace-flat-view-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/services/workspace-flat-view-map-cache.service.tsindex 71d3041b74c..90df1ff433a 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-view/services/workspace-flat-view-map-cache.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view/services/workspace-flat-view-map-cache.service.ts@@ -39,6 +39,10 @@ const FLAT_VIEW_ROWS_REQUIREMENT = {columns: ['id', 'universalIdentifier'],groupBy: ['viewId'],},+ navigationMenuItem: {+ columns: ['id', 'universalIdentifier'],+ groupBy: ['viewId'],+ },} as const;@Injectable()@@ -62,6 +66,7 @@ export class WorkspaceFlatViewMapCacheService extends MetadataFlatEntityMapsCachviewFilterGroup: viewFilterGroups,viewSort: viewSorts,viewFieldGroup: viewFieldGroups,+ navigationMenuItem: navigationMenuItems,} = rows;const applicationIdToUniversalIdentifierMap =@@ -83,6 +88,8 @@ export class WorkspaceFlatViewMapCacheService extends MetadataFlatEntityMapsCachviewFilterGroups: viewFilterGroups.byViewId.get(viewEntity.id) || [],viewSorts: viewSorts.byViewId.get(viewEntity.id) || [],viewFieldGroups: viewFieldGroups.byViewId.get(viewEntity.id) || [],+ navigationMenuItems:+ navigationMenuItems.byViewId.get(viewEntity.id) || [],},applicationIdToUniversalIdentifierMap,objectMetadataIdToUniversalIdentifierMap,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-create-view-input-to-flat-view-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-create-view-input-to-flat-view-to-create.util.tsindex f52acd890f4..d6cc4aa4195 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-create-view-input-to-flat-view-to-create.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-create-view-input-to-flat-view-to-create.util.ts@@ -98,6 +98,7 @@ export const fromCreateViewInputToFlatViewToCreate = ({viewGroupUniversalIdentifiers: [],viewFieldGroupUniversalIdentifiers: [],viewFilterGroupUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],viewSortUniversalIdentifiers: [],applicationUniversalIdentifier: flatApplication.universalIdentifier,};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-view-entity-to-flat-view.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-view-entity-to-flat-view.util.tsindex cf4df67928a..57ebb1148f8 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-view-entity-to-flat-view.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-view-entity-to-flat-view.util.ts@@ -63,5 +63,11 @@ export const fromViewEntityToFlatView = (viewEntity.viewSorts?.map(({ universalIdentifier }) => universalIdentifier,) ?? [],+ navigationMenuItemIds:+ viewEntity.navigationMenuItems?.map(({ id }) => id) ?? [],+ navigationMenuItemUniversalIdentifiers:+ viewEntity.navigationMenuItems?.map(+ ({ universalIdentifier }) => universalIdentifier,+ ) ?? [],};};diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-system-record-form-page-layout-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-system-record-form-page-layout-to-create.util.tsindex 2e5d92ff7ba..7815cd5c65b 100644--- a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-system-record-form-page-layout-to-create.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-system-record-form-page-layout-to-create.util.ts@@ -63,6 +63,7 @@ export const computeSystemRecordFormPageLayoutToCreate = ({type: PageLayoutType.RECORD_FORM,isFirstTabPinned: true,objectMetadataUniversalIdentifier: objectMetadata.universalIdentifier,+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [pageLayoutTabUniversalIdentifier],isSystemSideEffect: true,createdAt: now,diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-system-record-page-layout-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-system-record-page-layout-to-create.util.tsindex 23403553dfc..4705e66dafa 100644--- a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-system-record-page-layout-to-create.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-system-record-page-layout-to-create.util.ts@@ -147,6 +147,7 @@ export const computeSystemRecordPageLayoutToCreate = ({name: `Default ${objectMetadata.labelSingular} Layout`,type: PageLayoutType.RECORD_PAGE,objectMetadataUniversalIdentifier: objectMetadata.universalIdentifier,+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: pageLayoutTabs.map((tab) => tab.universalIdentifier,),diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.tsindex 3321555e3d2..9816efd3396 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts@@ -27,6 +27,7 @@ import { WasRemovedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/import { CommandMenuItemEntity } from 'src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';+import { NavigationMenuItemEntity } from 'src/engine/metadata-modules/navigation-menu-item/entities/navigation-menu-item.entity';import { RENAME_IS_UI_READ_ONLY_TO_IS_UI_EDITABLE_UPGRADE_COMMAND_NAME } from 'src/engine/metadata-modules/object-metadata/constants/rename-is-ui-read-only-to-is-ui-editable-upgrade-command-name.constant';import { type ObjectMetadataOverrides } from 'src/engine/metadata-modules/object-metadata/types/object-metadata-overrides.type';import { FieldPermissionEntity } from 'src/engine/metadata-modules/object-permission/field-permission/field-permission.entity';@@ -260,4 +261,10 @@ export class ObjectMetadataEntity(commandMenuItem) => commandMenuItem.navigationTargetObjectMetadata,)commandMenuItems: Relation<CommandMenuItemEntity[]>;++ @OneToMany(+ () => NavigationMenuItemEntity,+ (navigationMenuItem) => navigationMenuItem.targetObjectMetadata,+ )+ navigationMenuItems: Relation<NavigationMenuItemEntity[]>;}diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.tsindex f0d9493d551..5fb7fcfaddb 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts@@ -17,6 +17,7 @@ import {import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';import { ADD_IS_SYSTEM_SIDE_EFFECT_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-15/is-system-side-effect-upgrade-command-name.constant';import { ADD_PAGE_LAYOUT_IS_FIRST_TAB_PINNED_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-38/add-page-layout-is-first-tab-pinned-upgrade-command-name.constant';+import { NavigationMenuItemEntity } from 'src/engine/metadata-modules/navigation-menu-item/entities/navigation-menu-item.entity';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity';import { PageLayoutType } from 'twenty-shared/types';@@ -62,6 +63,12 @@ export class PageLayoutEntity})tabs: Relation<PageLayoutTabEntity[]>;+ @OneToMany(+ () => NavigationMenuItemEntity,+ (navigationMenuItem) => navigationMenuItem.pageLayout,+ )+ navigationMenuItems: Relation<NavigationMenuItemEntity[]>;+@Column({ nullable: true, type: 'uuid' })defaultTabToFocusOnMobileAndSidePanelId: string | null;diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/__tests__/page-layout-reset.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/__tests__/page-layout-reset.service.spec.tsindex 7cfc1a7d4d4..16f637e4edf 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/__tests__/page-layout-reset.service.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/__tests__/page-layout-reset.service.spec.ts@@ -50,7 +50,9 @@ describe('PageLayoutResetService', () => {objectMetadataUniversalIdentifier: null,defaultTabToFocusOnMobileAndSidePanelId: null,defaultTabToFocusOnMobileAndSidePanelUniversalIdentifier: null,+ navigationMenuItemIds: [],tabIds: [],+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [],isSystemSideEffect,isFirstTabPinned: false,diff --git a/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.tsindex fd50b77a5e1..aa7d7aef6fb 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts@@ -28,6 +28,7 @@ import { ADD_IS_SYSTEM_SIDE_EFFECT_UPGRADE_COMMAND_NAME } from 'src/database/comimport { ADD_VIEW_KANBAN_COLUMN_WIDTH_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-15/add-view-kanban-column-width-upgrade-command-name.constant';import { ADD_CALENDAR_END_FIELD_METADATA_ID_TO_VIEW_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-22/add-calendar-end-field-metadata-id-to-view-upgrade-command-name.constant';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';+import { NavigationMenuItemEntity } from 'src/engine/metadata-modules/navigation-menu-item/entities/navigation-menu-item.entity';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';import { ViewFieldGroupEntity } from 'src/engine/metadata-modules/view-field-group/entities/view-field-group.entity';import { ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';@@ -274,6 +275,12 @@ export class ViewEntity(viewFilterGroup) => viewFilterGroup.view,)viewFilterGroups: Relation<ViewFilterGroupEntity[]>;++ @OneToMany(+ () => NavigationMenuItemEntity,+ (navigationMenuItem) => navigationMenuItem.view,+ )+ navigationMenuItems: Relation<NavigationMenuItemEntity[]>;}const VIEW_OVERRIDABLE_COLUMNS_UPGRADE_COMMAND_NAME =diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/build-base-universal-flat-view.util.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/build-base-universal-flat-view.util.tsindex b764137a629..3b3f7cc48d9 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/utils/build-base-universal-flat-view.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/utils/build-base-universal-flat-view.util.ts@@ -61,6 +61,7 @@ export const buildBaseUniversalFlatView = ({viewFilterUniversalIdentifiers: [],viewGroupUniversalIdentifiers: [],viewFilterGroupUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],viewSortUniversalIdentifiers: [],applicationUniversalIdentifier,};diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.tsindex 42a794b07a8..cd3873b9e94 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.ts@@ -31,6 +31,7 @@ describe('getColumnNameToFieldMetadataIdMap', () => {universalIdentifier: 'test-object-id',indexMetadataIds: [],searchFieldMetadataIds: [],+ navigationMenuItemIds: [],commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],@@ -61,6 +62,7 @@ describe('getColumnNameToFieldMetadataIdMap', () => {pageLayoutUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier: null,imageIdentifierFieldMetadataUniversalIdentifier: null,diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.tsindex 2e90aa59314..8db49764ebd 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.ts@@ -31,6 +31,7 @@ describe('getFieldMetadataIdToColumnNamesMap', () => {universalIdentifier: 'test-object-id',indexMetadataIds: [],searchFieldMetadataIds: [],+ navigationMenuItemIds: [],commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],@@ -61,6 +62,7 @@ describe('getFieldMetadataIdToColumnNamesMap', () => {pageLayoutUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier: null,imageIdentifierFieldMetadataUniversalIdentifier: null,diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.tsindex acbd53b31ca..4634d9495f6 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts@@ -33,6 +33,7 @@ describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => {universalIdentifier: 'test-object-id',indexMetadataIds: [],searchFieldMetadataIds: [],+ navigationMenuItemIds: [],commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],@@ -63,6 +64,7 @@ describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => {pageLayoutUniversalIdentifiers: [],indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier: null,imageIdentifierFieldMetadataUniversalIdentifier: null,diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-data-seeds.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-data-seeds.util.tsindex 414beaa8d1e..a0d57438b82 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-data-seeds.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-data-seeds.util.ts@@ -29,7 +29,9 @@ export const getPageLayoutFlatEntitySeeds = ({type: PageLayoutType.DASHBOARD,objectMetadataId: null,objectMetadataUniversalIdentifier: null,+ navigationMenuItemIds: [],tabIds: [],+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [],defaultTabToFocusOnMobileAndSidePanelId: null,defaultTabToFocusOnMobileAndSidePanelUniversalIdentifier: null,@@ -52,7 +54,9 @@ export const getPageLayoutFlatEntitySeeds = ({type: PageLayoutType.DASHBOARD,objectMetadataId: null,objectMetadataUniversalIdentifier: null,+ navigationMenuItemIds: [],tabIds: [],+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [],defaultTabToFocusOnMobileAndSidePanelId: null,defaultTabToFocusOnMobileAndSidePanelUniversalIdentifier: null,@@ -75,7 +79,9 @@ export const getPageLayoutFlatEntitySeeds = ({type: PageLayoutType.DASHBOARD,objectMetadataId: null,objectMetadataUniversalIdentifier: null,+ navigationMenuItemIds: [],tabIds: [],+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [],defaultTabToFocusOnMobileAndSidePanelId: null,defaultTabToFocusOnMobileAndSidePanelUniversalIdentifier: null,@@ -101,7 +107,9 @@ export const getPageLayoutFlatEntitySeeds = ({type: PageLayoutType.STANDALONE_PAGE,objectMetadataId: null,objectMetadataUniversalIdentifier: null,+ navigationMenuItemIds: [],tabIds: [],+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [],defaultTabToFocusOnMobileAndSidePanelId: null,defaultTabToFocusOnMobileAndSidePanelUniversalIdentifier: null,diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.tsindex db8981ccad2..3aecc12eb94 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.ts@@ -152,6 +152,7 @@ export const createStandardObjectFlatMetadata = <fieldIds: [],indexMetadataIds: [],searchFieldMetadataIds: [],+ navigationMenuItemIds: [],commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],@@ -169,6 +170,7 @@ export const createStandardObjectFlatMetadata = <indexMetadataUniversalIdentifiers: [],searchFieldMetadataUniversalIdentifiers: [],pageLayoutUniversalIdentifiers: [],+ navigationMenuItemUniversalIdentifiers: [],commandMenuItemUniversalIdentifiers: [],labelIdentifierFieldMetadataUniversalIdentifier,imageIdentifierFieldMetadataUniversalIdentifier,diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout/compute-standard-record-form-flat-entities.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout/compute-standard-record-form-flat-entities.util.tsindex 0b2dc69c6a0..bb4bb56bf1f 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout/compute-standard-record-form-flat-entities.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout/compute-standard-record-form-flat-entities.util.ts@@ -206,7 +206,9 @@ export const computeStandardRecordFormFlatEntities = ({objectMetadataId: flatObjectMetadata.id,objectMetadataUniversalIdentifier: flatObjectMetadata.universalIdentifier,isSystemSideEffect: true,+ navigationMenuItemIds: [],tabIds: [pageLayoutTabId],+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [pageLayoutTabUniversalIdentifier],createdAt: now,updatedAt: now,diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout/create-standard-page-layout-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout/create-standard-page-layout-flat-metadata.util.tsindex 36fdbc166d5..21c0c2bb6ac 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout/create-standard-page-layout-flat-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout/create-standard-page-layout-flat-metadata.util.ts@@ -121,7 +121,9 @@ export const createStandardPageLayoutFlatMetadata = ({objectMetadataUniversalIdentifier: objectUniversalIdentifier,isSystemSideEffect: type === PageLayoutType.RECORD_PAGE,isFirstTabPinned: true,+ navigationMenuItemIds: [],tabIds: [],+ navigationMenuItemUniversalIdentifiers: [],tabUniversalIdentifiers: [],createdAt: now,updatedAt: now,diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view/create-standard-view-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view/create-standard-view-flat-metadata.util.tsindex 3911cf6c2e9..445a8736bdb 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view/create-standard-view-flat-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view/create-standard-view-flat-metadata.util.ts@@ -174,7 +174,9 @@ export const createStandardViewFlatMetadata = <viewGroupUniversalIdentifiers: [],viewFilterGroupIds: [],viewFilterGroupUniversalIdentifiers: [],+ navigationMenuItemIds: [],viewSortIds: [],+ navigationMenuItemUniversalIdentifiers: [],viewSortUniversalIdentifiers: [],createdAt: now,updatedAt: now,diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-build-orchestrator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-build-orchestrator.service.tsindex 2832396d582..3c6308c6274 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-build-orchestrator.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/workspace-migration-build-orchestrator.service.ts@@ -265,10 +265,6 @@ export class WorkspaceMigrationBuildOrchestratorService {ALL_METADATA_NAME.commandMenuItem,workspaceMigrationCommandMenuItemActionsBuilderService,),- createEntityActionsBuilderTask(- ALL_METADATA_NAME.navigationMenuItem,- workspaceMigrationNavigationMenuItemActionsBuilderService,- ),createEntityActionsBuilderTask(ALL_METADATA_NAME.pageLayout,workspaceMigrationPageLayoutActionsBuilderService,@@ -281,6 +277,10 @@ export class WorkspaceMigrationBuildOrchestratorService {ALL_METADATA_NAME.pageLayoutWidget,workspaceMigrationPageLayoutWidgetActionsBuilderService,),+ createEntityActionsBuilderTask(+ ALL_METADATA_NAME.navigationMenuItem,+ workspaceMigrationNavigationMenuItemActionsBuilderService,+ ),createEntityActionsBuilderTask(ALL_METADATA_NAME.webhook,workspaceMigrationWebhookActionsBuilderService,diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/__tests__/__snapshots__/all-universal-flat-entity-foreign-key-aggregator-properties.constant.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/__tests__/__snapshots__/all-universal-flat-entity-foreign-key-aggregator-properties.constant.spec.ts.snapindex 6f2ceb506f5..2a1518f5862 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/__tests__/__snapshots__/all-universal-flat-entity-foreign-key-aggregator-properties.constant.spec.ts.snap+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/__tests__/__snapshots__/all-universal-flat-entity-foreign-key-aggregator-properties.constant.spec.ts.snap@@ -31,10 +31,12 @@ exports[`ALL_UNIVERSAL_FLAT_ENTITY_FOREIGN_KEY_AGGREGATOR_PROPERTIES should matc"searchFieldMetadataUniversalIdentifiers","pageLayoutUniversalIdentifiers","commandMenuItemUniversalIdentifiers",+ "navigationMenuItemUniversalIdentifiers",],"objectPermission": [],"pageLayout": ["tabUniversalIdentifiers",+ "navigationMenuItemUniversalIdentifiers",],"pageLayoutTab": ["widgetUniversalIdentifiers",@@ -68,6 +70,7 @@ exports[`ALL_UNIVERSAL_FLAT_ENTITY_FOREIGN_KEY_AGGREGATOR_PROPERTIES should matc"viewGroupUniversalIdentifiers","viewFieldGroupUniversalIdentifiers","viewSortUniversalIdentifiers",+ "navigationMenuItemUniversalIdentifiers",],"viewField": [],"viewFieldGroup": [diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/__snapshots__/delete-flat-entity-foreign-key-aggregators.util.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/__snapshots__/delete-flat-entity-foreign-key-aggregators.util.spec.ts.snapindex 7b2844e2fe4..83aadd49036 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/__snapshots__/delete-flat-entity-foreign-key-aggregators.util.spec.ts.snap+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/__snapshots__/delete-flat-entity-foreign-key-aggregators.util.spec.ts.snap@@ -71,6 +71,7 @@ exports[`deleteFlatEntityForeignKeyAggregators should strip raw workspace-scoped"labelSingular": "default flat object metadata label singular","namePlural": "defaultflatObjectMetadataNamePlural","nameSingular": "defaultflatObjectMetadataNameSingular",+ "navigationMenuItemUniversalIdentifiers": [],"objectPermissionUniversalIdentifiers": [],"openRecordIn": "USER_CHOICE","overrides": null,diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-navigation-menu-item-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-navigation-menu-item-validator.service.tsindex 2b720fc08fb..67dea997b7a 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-navigation-menu-item-validator.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-navigation-menu-item-validator.service.ts@@ -7,6 +7,7 @@ import { isDefined } from 'twenty-shared/utils';import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';import { validateNavigationMenuItemTypeRequiredProperties } from 'src/engine/metadata-modules/flat-navigation-menu-item/validators/utils/validate-navigation-menu-item-type-required-properties.util';import { NavigationMenuItemExceptionCode } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.exception';+import { type MetadataUniversalFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-universal-flat-entity.type';import { type MetadataUniversalFlatEntityMaps } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/metadata-universal-flat-entity-maps.type';import { validateFlatEntityCircularDependency } from 'src/engine/workspace-manager/workspace-migration/utils/validate-flat-entity-circular-dependency.util';import {@@ -70,10 +71,64 @@ export class FlatNavigationMenuItemValidatorService {}}+ // Entering the flat maps resolves these references, so an unresolvable one+ // has to fail validation rather than throw there.+ private getUnresolvedReferenceValidationErrors({+ flatNavigationMenuItem,+ flatObjectMetadataMaps,+ flatViewMaps,+ }: {+ flatNavigationMenuItem: MetadataUniversalFlatEntity<'navigationMenuItem'>;+ flatObjectMetadataMaps: MetadataUniversalFlatEntityMaps<'objectMetadata'>;+ flatViewMaps: MetadataUniversalFlatEntityMaps<'view'>;+ }): FlatEntityValidationError<NavigationMenuItemExceptionCode>[] {+ const errors: FlatEntityValidationError<NavigationMenuItemExceptionCode>[] =+ [];++ const { targetObjectMetadataUniversalIdentifier, viewUniversalIdentifier } =+ flatNavigationMenuItem;++ if (+ isDefined(targetObjectMetadataUniversalIdentifier) &&+ !isDefined(+ findFlatEntityByUniversalIdentifier({+ universalIdentifier: targetObjectMetadataUniversalIdentifier,+ flatEntityMaps: flatObjectMetadataMaps,+ }),+ )+ ) {+ errors.push({+ code: NavigationMenuItemExceptionCode.INVALID_NAVIGATION_MENU_ITEM_INPUT,+ message: t`Target object metadata not found`,+ userFriendlyMessage: msg`Target object not found`,+ });+ }++ if (+ isDefined(viewUniversalIdentifier) &&+ !isDefined(+ findFlatEntityByUniversalIdentifier({+ universalIdentifier: viewUniversalIdentifier,+ flatEntityMaps: flatViewMaps,+ }),+ )+ ) {+ errors.push({+ code: NavigationMenuItemExceptionCode.INVALID_NAVIGATION_MENU_ITEM_INPUT,+ message: t`Target view not found`,+ userFriendlyMessage: msg`Target view not found`,+ });+ }++ return errors;+ }+public validateFlatNavigationMenuItemCreation({flatEntityToValidate: flatNavigationMenuItem,optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {flatNavigationMenuItemMaps: optimisticFlatNavigationMenuItemMaps,+ flatObjectMetadataMaps,+ flatViewMaps,},remainingFlatEntityMapsToValidate,}: UniversalFlatEntityValidationArgs<@@ -104,6 +159,11 @@ export class FlatNavigationMenuItemValidatorService {...validateNavigationMenuItemTypeRequiredProperties({flatNavigationMenuItem,}),+ ...this.getUnresolvedReferenceValidationErrors({+ flatNavigationMenuItem,+ flatObjectMetadataMaps,+ flatViewMaps,+ }),);if (isDefined(flatNavigationMenuItem.folderUniversalIdentifier)) {diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.tsindex 0f17640fc0e..e68e8243a3e 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.ts@@ -117,6 +117,7 @@ export const fromUniversalFlatObjectMetadataToFlatObjectMetadata = ({viewIds: [],indexMetadataIds: [],searchFieldMetadataIds: [],+ navigationMenuItemIds: [],commandMenuItemIds: [],objectPermissionIds: [],fieldPermissionIds: [],diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout/services/create-page-layout-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout/services/create-page-layout-action-handler.service.tsindex 66366c477ac..00cf1411a00 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout/services/create-page-layout-action-handler.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout/services/create-page-layout-action-handler.service.ts@@ -63,6 +63,7 @@ export class CreatePageLayoutActionHandlerService extends WorkspaceMigrationRunnapplicationId: flatApplication.id,id: action.id ?? v4(),workspaceId,+ navigationMenuItemIds: [],tabIds: [],...emptyUniversalForeignKeyAggregators,},diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view/services/create-view-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view/services/create-view-action-handler.service.tsindex 0316ed5bb9d..c3bd96355aa 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view/services/create-view-action-handler.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view/services/create-view-action-handler.service.ts@@ -74,6 +74,7 @@ export class CreateViewActionHandlerService extends WorkspaceMigrationRunnerActiviewGroupIds: [],viewFilterIds: [],viewFilterGroupIds: [],+ navigationMenuItemIds: [],viewSortIds: [],...emptyUniversalForeignKeyAggregators,},diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-sync-application-navigation-menu-item-validation.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-sync-application-navigation-menu-item-validation.integration-spec.ts.snapindex 6f577a64377..0e75e6be1c1 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-sync-application-navigation-menu-item-validation.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-sync-application-navigation-menu-item-validation.integration-spec.ts.snap@@ -198,6 +198,11 @@ exports[`Sync application should fail on invalid navigation menu items when sync"message": "A valid viewUniversalIdentifier is required for VIEW type","userFriendlyMessage": "A valid viewUniversalIdentifier is required for VIEW type",},+ {+ "code": "INVALID_NAVIGATION_MENU_ITEM_INPUT",+ "message": "Target view not found",+ "userFriendlyMessage": "Target view not found",+ },],"flatEntityMinimalInformation": {"name": "View with malformed identifier",@@ -235,6 +240,11 @@ exports[`Sync application should fail on invalid navigation menu items when sync"message": "A valid targetObjectMetadataUniversalIdentifier is required for OBJECT type","userFriendlyMessage": "A valid targetObjectMetadataUniversalIdentifier is required for OBJECT type",},+ {+ "code": "INVALID_NAVIGATION_MENU_ITEM_INPUT",+ "message": "Target object metadata not found",+ "userFriendlyMessage": "Target object not found",+ },],"flatEntityMinimalInformation": {"name": "Object with malformed target",diff --git a/packages/twenty-server/test/integration/metadata/suites/object-metadata/navigation-menu-items-on-object-metadata-deletion.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/object-metadata/navigation-menu-items-on-object-metadata-deletion.integration-spec.tsnew file mode 100644index 00000000000..18e4d66ba61--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/object-metadata/navigation-menu-items-on-object-metadata-deletion.integration-spec.ts@@ -0,0 +1,274 @@+import { faker } from '@faker-js/faker';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { createNavigationMenuItem } from 'test/integration/metadata/suites/navigation-menu-item/utils/create-navigation-menu-item.util';+import { deleteNavigationMenuItem } from 'test/integration/metadata/suites/navigation-menu-item/utils/delete-navigation-menu-item.util';+import { findNavigationMenuItems } from 'test/integration/metadata/suites/navigation-menu-item/utils/find-navigation-menu-items.util';+import { type CreateOneObjectFactoryInput } from 'test/integration/metadata/suites/object-metadata/utils/create-one-object-metadata-query-factory.util';+import { createOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/create-one-object-metadata.util';+import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata.util';+import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';+import { findViews } from 'test/integration/metadata/suites/view/utils/find-views.util';+import { jestExpectToBeDefined } from 'test/utils/jest-expect-to-be-defined.util.test';++import { type NavigationMenuItemDTO } from 'src/engine/metadata-modules/navigation-menu-item/dtos/navigation-menu-item.dto';++const NAVIGATION_MENU_ITEM_GQL_FIELDS = `+ id+ type+ targetObjectMetadataId+ targetRecordId+ viewId+ folderId+ position+`;++type NavigationMenuItemRow = {+ id: string;+ type: string;+};++const buildCreateObjectInput = (+ suffix: string,+): CreateOneObjectFactoryInput => ({+ namePlural: `navOrphans${suffix}`,+ nameSingular: `navOrphan${suffix}`,+ labelPlural: `Nav Orphans ${suffix}`,+ labelSingular: `Nav Orphan ${suffix}`,+ description: 'Object for navigation menu item deletion tests',+ icon: 'IconBox',+ isLabelSyncedWithName: false,+});++const findItemsReferencingObject = ({+ navigationMenuItems,+ objectMetadataId,+ viewIds,+}: {+ navigationMenuItems: NavigationMenuItemDTO[];+ objectMetadataId: string;+ viewIds: string[];+}) =>+ navigationMenuItems.filter(+ (item) =>+ item.targetObjectMetadataId === objectMetadataId ||+ (isDefined(item.viewId) && viewIds.includes(item.viewId)),+ );++const findRowsReferencingObject = async ({+ objectMetadataId,+ viewIds,+}: {+ objectMetadataId: string;+ viewIds: string[];+}): Promise<NavigationMenuItemRow[]> =>+ global.testDataSource.query(+ `SELECT id, type+ FROM core."navigationMenuItem"+ WHERE "targetObjectMetadataId" = $1 OR "viewId" = ANY($2::uuid[])`,+ [objectMetadataId, viewIds],+ );++const findExistingRowIds = async (ids: string[]): Promise<string[]> => {+ const rows: Pick<NavigationMenuItemRow, 'id'>[] =+ await global.testDataSource.query(+ `SELECT id FROM core."navigationMenuItem" WHERE id = ANY($1::uuid[])`,+ [ids],+ );++ return rows.map((row) => row.id);+};++const listNavigationMenuItems = async () => {+ const {+ data: { navigationMenuItems },+ } = await findNavigationMenuItems({+ expectToFail: false,+ input: undefined,+ gqlFields: NAVIGATION_MENU_ITEM_GQL_FIELDS,+ });++ return navigationMenuItems;+};++// The API and the table are asserted together so a failure shows both+// layers at once: rows left behind, or an API still serving rows that+// are gone.+const expectNoTraceOfObject = async ({+ objectMetadataId,+ viewIds,+}: {+ objectMetadataId: string;+ viewIds: string[];+}) => {+ const apiItems = findItemsReferencingObject({+ navigationMenuItems: await listNavigationMenuItems(),+ objectMetadataId,+ viewIds,+ }).map(({ id, type }) => ({ id, type }));++ const databaseRows = await findRowsReferencingObject({+ objectMetadataId,+ viewIds,+ });++ expect({ apiItems, databaseRows }).toEqual({+ apiItems: [],+ databaseRows: [],+ });+};++const createObjectWithNavigationMenuItems = async (suffix: string) => {+ const {+ data: { createOneObject },+ } = await createOneObjectMetadata({+ expectToFail: false,+ input: buildCreateObjectInput(suffix),+ gqlFields: 'id',+ });++ const objectMetadataId = createOneObject.id;++ const {+ data: { getViews },+ } = await findViews({+ objectMetadataId,+ gqlFields: 'id objectMetadataId',+ expectToFail: false,+ });++ const viewIds = getViews.map((view) => view.id);++ expect(viewIds.length).toBeGreaterThan(0);++ const {+ data: { createNavigationMenuItem: viewItem },+ } = await createNavigationMenuItem({+ expectToFail: false,+ input: { type: NavigationMenuItemType.VIEW, viewId: viewIds[0] },+ gqlFields: 'id',+ });++ const {+ data: { createNavigationMenuItem: recordItem },+ } = await createNavigationMenuItem({+ expectToFail: false,+ input: {+ type: NavigationMenuItemType.RECORD,+ targetRecordId: faker.string.uuid(),+ targetObjectMetadataId: objectMetadataId,+ },+ gqlFields: 'id',+ });++ const itemsBeforeDelete = findItemsReferencingObject({+ navigationMenuItems: await listNavigationMenuItems(),+ objectMetadataId,+ viewIds,+ });++ expect(itemsBeforeDelete.map((item) => item.type).sort()).toEqual(+ [+ NavigationMenuItemType.OBJECT,+ NavigationMenuItemType.RECORD,+ NavigationMenuItemType.VIEW,+ ].sort(),+ );++ return {+ objectMetadataId,+ viewIds,+ navigationMenuItemIds: [viewItem.id, recordItem.id],+ };+};++describe('Navigation menu items on object metadata deletion', () => {+ const uniqueSuffix = Date.now().toString().slice(-8);++ let objectMetadataIdsToCleanUp: string[] = [];+ let navigationMenuItemIdsToCleanUp: string[] = [];++ afterEach(async () => {+ for (const navigationMenuItemId of await findExistingRowIds(+ navigationMenuItemIdsToCleanUp,+ )) {+ await deleteNavigationMenuItem({+ input: { id: navigationMenuItemId },+ expectToFail: false,+ });+ }++ for (const objectMetadataId of objectMetadataIdsToCleanUp) {+ await updateOneObjectMetadata({+ input: {+ idToUpdate: objectMetadataId,+ updatePayload: { isActive: false },+ },+ });++ await deleteOneObjectMetadata({+ input: { idToDelete: objectMetadataId },+ });+ }++ objectMetadataIdsToCleanUp = [];+ navigationMenuItemIdsToCleanUp = [];+ });++ it('should stop returning the navigation menu items of an active object deleted through the API, and keep the items of a live object', async () => {+ const deleted = await createObjectWithNavigationMenuItems(uniqueSuffix);+ const live = await createObjectWithNavigationMenuItems(+ `${uniqueSuffix}Live`,+ );++ objectMetadataIdsToCleanUp = [live.objectMetadataId];+ navigationMenuItemIdsToCleanUp = [+ ...deleted.navigationMenuItemIds,+ ...live.navigationMenuItemIds,+ ];++ await deleteOneObjectMetadata({+ input: { idToDelete: deleted.objectMetadataId },+ expectToFail: false,+ });++ await expectNoTraceOfObject(deleted);++ expect(+ findItemsReferencingObject({+ navigationMenuItems: await listNavigationMenuItems(),+ objectMetadataId: live.objectMetadataId,+ viewIds: live.viewIds,+ }),+ ).toHaveLength(3);+ });++ it('should stop returning the navigation menu items of an object deactivated then deleted through the API', async () => {+ const deleted = await createObjectWithNavigationMenuItems(+ `${uniqueSuffix}Off`,+ );++ navigationMenuItemIdsToCleanUp = deleted.navigationMenuItemIds;++ const {+ data: { updateOneObject },+ } = await updateOneObjectMetadata({+ input: {+ idToUpdate: deleted.objectMetadataId,+ updatePayload: { isActive: false },+ },+ gqlFields: 'id isActive',+ expectToFail: false,+ });++ jestExpectToBeDefined(updateOneObject);+ expect(updateOneObject.isActive).toBe(false);++ await deleteOneObjectMetadata({+ input: { idToDelete: deleted.objectMetadataId },+ expectToFail: false,+ });++ await expectNoTraceOfObject(deleted);+ });+});diff --git a/packages/twenty-server/test/integration/metadata/suites/view/navigation-menu-items-on-view-destroy.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/view/navigation-menu-items-on-view-destroy.integration-spec.tsnew file mode 100644index 00000000000..cb80e2a2113--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/view/navigation-menu-items-on-view-destroy.integration-spec.ts@@ -0,0 +1,130 @@+import { NavigationMenuItemType } from 'twenty-shared/types';+import { createNavigationMenuItem } from 'test/integration/metadata/suites/navigation-menu-item/utils/create-navigation-menu-item.util';+import { deleteNavigationMenuItem } from 'test/integration/metadata/suites/navigation-menu-item/utils/delete-navigation-menu-item.util';+import { findNavigationMenuItems } from 'test/integration/metadata/suites/navigation-menu-item/utils/find-navigation-menu-items.util';+import { createOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/create-one-object-metadata.util';+import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata.util';+import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';+import { createOneView } from 'test/integration/metadata/suites/view/utils/create-one-view.util';+import { destroyOneView } from 'test/integration/metadata/suites/view/utils/destroy-one-view.util';+import { isDefined } from 'twenty-shared/utils';++const NAVIGATION_MENU_ITEM_GQL_FIELDS = `+ id+ type+ viewId+`;++const findNavigationMenuItemRow = async (+ navigationMenuItemId: string,+): Promise<{ id: string }[]> =>+ global.testDataSource.query(+ `SELECT id FROM core."navigationMenuItem" WHERE id = $1`,+ [navigationMenuItemId],+ );++describe('Navigation menu items on view destroy', () => {+ const uniqueSuffix = Date.now().toString().slice(-8);++ let objectMetadataId: string | undefined = undefined;+ let navigationMenuItemId: string | undefined = undefined;++ beforeAll(async () => {+ const {+ data: { createOneObject },+ } = await createOneObjectMetadata({+ expectToFail: false,+ input: {+ namePlural: `viewOrphans${uniqueSuffix}`,+ nameSingular: `viewOrphan${uniqueSuffix}`,+ labelPlural: `View Orphans ${uniqueSuffix}`,+ labelSingular: `View Orphan ${uniqueSuffix}`,+ description: 'Object for navigation menu item view destroy tests',+ icon: 'IconBox',+ isLabelSyncedWithName: false,+ },+ gqlFields: 'id',+ });++ objectMetadataId = createOneObject.id;+ });++ afterAll(async () => {+ if (+ isDefined(navigationMenuItemId) &&+ (await findNavigationMenuItemRow(navigationMenuItemId)).length > 0+ ) {+ await deleteNavigationMenuItem({+ input: { id: navigationMenuItemId },+ expectToFail: false,+ });+ }++ if (!isDefined(objectMetadataId)) {+ return;+ }++ await updateOneObjectMetadata({+ input: {+ idToUpdate: objectMetadataId,+ updatePayload: { isActive: false },+ },+ });++ await deleteOneObjectMetadata({ input: { idToDelete: objectMetadataId } });+ });++ it('should stop returning a VIEW navigation menu item once its view is destroyed', async () => {+ if (!isDefined(objectMetadataId)) {+ throw new Error('Object metadata should have been created');+ }++ const {+ data: { createView },+ } = await createOneView({+ expectToFail: false,+ input: {+ name: `Extra view ${uniqueSuffix}`,+ objectMetadataId,+ icon: 'IconList',+ },+ gqlFields: 'id',+ });++ const {+ data: { createNavigationMenuItem: createdNavigationMenuItem },+ } = await createNavigationMenuItem({+ expectToFail: false,+ input: { type: NavigationMenuItemType.VIEW, viewId: createView.id },+ gqlFields: 'id',+ });++ navigationMenuItemId = createdNavigationMenuItem.id;++ const {+ data: { destroyView },+ } = await destroyOneView({+ viewId: createView.id,+ expectToFail: false,+ });++ expect(destroyView).toBe(true);++ const {+ data: { navigationMenuItems },+ } = await findNavigationMenuItems({+ expectToFail: false,+ input: undefined,+ gqlFields: NAVIGATION_MENU_ITEM_GQL_FIELDS,+ });++ // Asserted together so a failure shows both layers at once: rows left+ // behind, or an API still serving a row that is gone.+ expect({+ apiItems: navigationMenuItems+ .filter((item) => item.id === navigationMenuItemId)+ .map(({ id, type, viewId }) => ({ id, type, viewId })),+ databaseRows: await findNavigationMenuItemRow(navigationMenuItemId),+ }).toEqual({ apiItems: [], databaseRows: [] });+ });+});