Skip to content

The open alternative to Salesforce, designed for AI.

Declare the objectMetadata -> pageLayout one-to-many so page layouts resolve through an aggregator (#24694)

Paul Rastoin85360a7fc0c9
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.ts
index 86a3acbdbb1..80adb57c8af 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
@@ -161,6 +161,7 @@ export const mockPersonFlatObjectMetadata = (
fieldPermissionIds: [],
fieldIds: mockFieldMetadatas.map((field) => field.id),
viewIds: [],
+ pageLayoutIds: [],
applicationId: 'test-application-id',
isLabelSyncedWithName: false,
createdAt: new Date().toISOString(),
@@ -177,6 +178,7 @@ export const mockPersonFlatObjectMetadata = (
(field) => field.universalIdentifier,
),
viewUniversalIdentifiers: [],
+ pageLayoutUniversalIdentifiers: [],
objectPermissionUniversalIdentifiers: [],
fieldPermissionUniversalIdentifiers: [],
indexMetadataUniversalIdentifiers: [],
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.ts
index 9ad2de5e89d..3fcb3eb7beb 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
@@ -42,6 +42,7 @@ export const fromObjectManifestToUniversalFlatObjectMetadata = ({
objectPermissionUniversalIdentifiers: [],
fieldPermissionUniversalIdentifiers: [],
viewUniversalIdentifiers: [],
+ pageLayoutUniversalIdentifiers: [],
labelIdentifierFieldMetadataUniversalIdentifier:
objectManifest.labelIdentifierFieldMetadataUniversalIdentifier,
imageIdentifierFieldMetadataUniversalIdentifier: null,
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.ts
index 5a82e738210..3c7f6387b3d 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
@@ -35,6 +35,7 @@ const mockObjectMetadata: FlatObjectMetadata = {
fieldPermissionIds: [],
fieldIds: [],
viewIds: [],
+ pageLayoutIds: [],
applicationId: 'test-application-id',
isLabelSyncedWithName: false,
createdAt: new Date().toISOString(),
@@ -54,6 +55,7 @@ const mockObjectMetadata: FlatObjectMetadata = {
objectPermissionUniversalIdentifiers: [],
fieldPermissionUniversalIdentifiers: [],
viewUniversalIdentifiers: [],
+ pageLayoutUniversalIdentifiers: [],
indexMetadataUniversalIdentifiers: [],
searchFieldMetadataUniversalIdentifiers: [],
labelIdentifierFieldMetadataUniversalIdentifier: 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.ts
index 1b798ad1f08..3ac164cab9c 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
@@ -384,7 +384,7 @@ export const ALL_MANY_TO_ONE_METADATA_RELATIONS = {
objectMetadata: {
metadataName: 'objectMetadata',
foreignKey: 'objectMetadataId',
- inverseOneToManyProperty: null,
+ inverseOneToManyProperty: 'pageLayouts',
isNullable: true,
universalForeignKey: 'objectMetadataUniversalIdentifier',
},
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.ts
index ab2ee268ff3..da00e22f427 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
@@ -125,6 +125,11 @@ export const ALL_ONE_TO_MANY_METADATA_RELATIONS = {
universalFlatEntityForeignKeyAggregator:
'searchFieldMetadataUniversalIdentifiers',
},
+ pageLayouts: {
+ metadataName: 'pageLayout',
+ flatEntityForeignKeyAggregator: 'pageLayoutIds',
+ universalFlatEntityForeignKeyAggregator: 'pageLayoutUniversalIdentifiers',
+ },
},
view: {
viewFields: {
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.snap
index 9ea774365bc..fe3282ebec0 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
@@ -62,6 +62,7 @@ exports[`getMetadataRelatedMetadataNames should return related metadata names fo
"fieldPermission",
"view",
"searchFieldMetadata",
+ "pageLayout",
]
`;
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.snap
index 6764540356b..0c72070ce2f 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
@@ -32,7 +32,7 @@ exports[`sortMetadataNamesChildrenFirst should return metadata names sorted with
"permissionFlag",
"view",
"fieldMetadata",
- "objectMetadata",
"role",
+ "objectMetadata",
]
`;
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.ts
index 4e919a6e0dc..a500e2b4f8b 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
@@ -25,6 +25,7 @@ export const getFlatObjectMetadataMock = (
objectPermissionIds: [],
fieldPermissionIds: [],
fieldIds: [],
+ pageLayoutIds: [],
description: 'default flat object metadata description',
icon: 'icon',
writability: MetadataWritability.OPEN,
@@ -60,6 +61,7 @@ export const getFlatObjectMetadataMock = (
viewUniversalIdentifiers: [],
indexMetadataUniversalIdentifiers: [],
searchFieldMetadataUniversalIdentifiers: [],
+ pageLayoutUniversalIdentifiers: [],
labelIdentifierFieldMetadataUniversalIdentifier:
labelIdentifierFieldMetadataId,
imageIdentifierFieldMetadataUniversalIdentifier:
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service.ts
index 999d7b7cde2..fc7663688b6 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
@@ -14,6 +14,7 @@ import { fromObjectMetadataEntityToFlatObjectMetadata } from 'src/engine/metadat
import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { ObjectPermissionEntity } from 'src/engine/metadata-modules/object-permission/object-permission.entity';
+import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity';
import { SearchFieldMetadataEntity } from 'src/engine/metadata-modules/search-field-metadata/search-field-metadata.entity';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
@@ -43,6 +44,8 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCachePr
private readonly objectPermissionRepository: WorkspaceScopedRepository<ObjectPermissionEntity>,
@InjectWorkspaceScopedRepository(SearchFieldMetadataEntity)
private readonly searchFieldMetadataRepository: WorkspaceScopedRepository<SearchFieldMetadataEntity>,
+ @InjectWorkspaceScopedRepository(PageLayoutEntity)
+ private readonly pageLayoutRepository: WorkspaceScopedRepository<PageLayoutEntity>,
) {
super();
}
@@ -58,6 +61,7 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCachePr
views,
objectPermissions,
searchFieldMetadatas,
+ pageLayouts,
] = await Promise.all([
this.objectMetadataRepository.find({
where: { workspaceId },
@@ -88,6 +92,10 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCachePr
this.searchFieldMetadataRepository.find(workspaceId, {
select: ['id', 'universalIdentifier', 'objectMetadataId'],
}),
+ this.pageLayoutRepository.find(workspaceId, {
+ select: ['id', 'universalIdentifier', 'objectMetadataId'],
+ withDeleted: true,
+ }),
]);
const [
@@ -96,6 +104,7 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCachePr
viewsByObjectId,
objectPermissionsByObjectId,
searchFieldMetadatasByObjectId,
+ pageLayoutsByObjectId,
] = (
[
{
@@ -118,6 +127,10 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCachePr
entities: searchFieldMetadatas,
foreignKey: 'objectMetadataId',
},
+ {
+ entities: pageLayouts,
+ foreignKey: 'objectMetadataId',
+ },
] as const
).map(regroupEntitiesByRelatedEntityId);
@@ -139,6 +152,7 @@ export class WorkspaceFlatObjectMetadataMapCacheService extends WorkspaceCachePr
objectPermissionsByObjectId.get(objectMetadataEntity.id) || [],
searchFieldMetadatas:
searchFieldMetadatasByObjectId.get(objectMetadataEntity.id) || [],
+ pageLayouts: pageLayoutsByObjectId.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.ts
index b25794b9947..630498e5cc3 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
@@ -87,6 +87,7 @@ export const fromCreateObjectInputToFlatObjectMetadataAndFlatFieldMetadatasToCre
viewUniversalIdentifiers: [],
indexMetadataUniversalIdentifiers: [],
searchFieldMetadataUniversalIdentifiers: [],
+ pageLayoutUniversalIdentifiers: [],
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.ts
index 3234cd77bc6..baff24b157b 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
@@ -81,6 +81,7 @@ export const fromObjectMetadataEntityToFlatObjectMetadata = (
),
fieldPermissionIds:
objectMetadataEntity.fieldPermissions?.map(({ id }) => id) ?? [],
+ pageLayoutIds: objectMetadataEntity.pageLayouts.map(({ id }) => id),
fieldUniversalIdentifiers: objectMetadataEntity.fields.map(
({ universalIdentifier }) => universalIdentifier,
),
@@ -102,5 +103,8 @@ export const fromObjectMetadataEntityToFlatObjectMetadata = (
objectMetadataEntity.fieldPermissions?.map(
({ universalIdentifier }) => universalIdentifier,
) ?? [],
+ pageLayoutUniversalIdentifiers: objectMetadataEntity.pageLayouts.map(
+ ({ universalIdentifier }) => universalIdentifier,
+ ),
};
};
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 e299761a419..94e2416f9c2 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
@@ -34,7 +34,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; page layouts have no aggregator on the object, so they are resolved by their objectMetadata reference) 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, 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.',
},
) {
buildSideEffects({
@@ -342,8 +342,6 @@ export class ObjectSystemSideEffectsOnDeleteSideEffectHandlerService extends Met
return viewFieldGroupToDelete;
}
- // Page layouts have no foreign key aggregator on the object flat entity, so
- // they are resolved by their objectMetadata reference.
private computePageLayoutToDelete({
flatObjectMetadata,
relatedFlatEntityMaps,
@@ -353,13 +351,14 @@ export class ObjectSystemSideEffectsOnDeleteSideEffectHandlerService extends Met
}): FlatEntityToDelete<'pageLayout'> {
const pageLayoutToDelete: FlatEntityToDelete<'pageLayout'> = {};
- for (const flatPageLayout of Object.values(
- relatedFlatEntityMaps.flatPageLayoutMaps.byUniversalIdentifier,
- )) {
+ for (const pageLayoutUniversalIdentifier of flatObjectMetadata.pageLayoutUniversalIdentifiers) {
+ const flatPageLayout =
+ relatedFlatEntityMaps.flatPageLayoutMaps.byUniversalIdentifier[
+ pageLayoutUniversalIdentifier
+ ];
+
if (
!isDefined(flatPageLayout) ||
- flatPageLayout.objectMetadataUniversalIdentifier !==
- flatObjectMetadata.universalIdentifier ||
flatPageLayout.isSystemSideEffect !== true
) {
continue;
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.ts
index d1c9f42d757..85eb1ab94a2 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
@@ -24,6 +24,7 @@ import { RENAME_IS_UI_READ_ONLY_TO_IS_UI_EDITABLE_UPGRADE_COMMAND_NAME } from 's
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';
import { ObjectPermissionEntity } from 'src/engine/metadata-modules/object-permission/object-permission.entity';
+import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity';
import { SearchFieldMetadataEntity } from 'src/engine/metadata-modules/search-field-metadata/search-field-metadata.entity';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
@@ -219,4 +220,13 @@ export class ObjectMetadataEntity
cascade: true,
})
views: Relation<ViewEntity[]>;
+
+ @OneToMany(
+ () => PageLayoutEntity,
+ (pageLayout) => pageLayout.objectMetadata,
+ {
+ cascade: true,
+ },
+ )
+ pageLayouts: Relation<PageLayoutEntity[]>;
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts
index b602a18e4bc..a40e97f15d4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts
@@ -7,8 +7,11 @@ import { ApplicationService } from 'src/engine/core-modules/application/applicat
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { findManyFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatPageLayoutTabMaps } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab-maps.type';
import { type FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget-maps.type';
+import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';
import { type FlatPageLayoutMaps } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout-maps.type';
import { compareFlatPageLayoutsByCreation } from 'src/engine/metadata-modules/page-layout/utils/compare-flat-page-layouts-by-creation.util';
import { fromCreatePageLayoutInputToFlatPageLayoutToCreate } from 'src/engine/metadata-modules/flat-page-layout/utils/from-create-page-layout-input-to-flat-page-layout-to-create.util';
@@ -85,27 +88,18 @@ export class PageLayoutService {
};
}): Promise<PageLayoutDTO[]> {
const {
+ flatObjectMetadataMaps,
flatPageLayoutMaps,
flatPageLayoutTabMaps,
flatPageLayoutWidgetMaps,
} = await this.getPageLayoutFlatEntityMaps(workspaceId);
- const activeLayouts = Object.values(
- flatPageLayoutMaps.byUniversalIdentifier,
- )
- .filter(isDefined)
- .filter((layout) => {
- const isNotDeleted = !isDefined(layout.deletedAt);
- const matchesObjectMetadataId = isNonEmptyString(objectMetadataId)
- ? layout.objectMetadataId === objectMetadataId
- : true;
- const matchesPageLayoutType = isDefined(pageLayoutType)
- ? layout.type === pageLayoutType
- : true;
-
- return isNotDeleted && matchesObjectMetadataId && matchesPageLayoutType;
- })
- .sort(compareFlatPageLayoutsByCreation);
+ const activeLayouts = this.findActiveFlatPageLayouts({
+ objectMetadataId,
+ pageLayoutType,
+ flatObjectMetadataMaps,
+ flatPageLayoutMaps,
+ });
return activeLayouts.map((layout) =>
fromFlatPageLayoutWithTabsAndWidgetsToPageLayoutDto(
@@ -130,27 +124,21 @@ export class PageLayoutService {
pagination: MetadataCursorPagination;
}): Promise<MetadataCursorPage<PageLayoutDTO> & { totalCount: number }> {
const {
+ flatObjectMetadataMaps,
flatPageLayoutMaps,
flatPageLayoutTabMaps,
flatPageLayoutWidgetMaps,
} = await this.getPageLayoutFlatEntityMaps(workspaceId);
- const activeLayouts = Object.values(
- flatPageLayoutMaps.byUniversalIdentifier,
- )
- .filter(isDefined)
- .filter(
- (layout) =>
- !isDefined(layout.deletedAt) &&
- (!isNonEmptyString(objectMetadataId) ||
- layout.objectMetadataId === objectMetadataId) &&
- (!isDefined(pageLayoutType) || layout.type === pageLayoutType),
- )
- .sort(compareFlatPageLayoutsByCreation);
+ const activeLayouts = this.findActiveFlatPageLayouts({
+ objectMetadataId,
+ pageLayoutType,
+ flatObjectMetadataMaps,
+ flatPageLayoutMaps,
+ });
const page = paginateMetadataOrderedItems({
items: activeLayouts,
pagination,
});
-
return {
...page,
items: page.items.map((layout) =>
@@ -207,6 +195,7 @@ export class PageLayoutService {
}
private async getPageLayoutFlatEntityMaps(workspaceId: string): Promise<{
+ flatObjectMetadataMaps: AllFlatEntityMaps['flatObjectMetadataMaps'];
flatPageLayoutMaps: FlatPageLayoutMaps;
flatPageLayoutTabMaps: FlatPageLayoutTabMaps;
flatPageLayoutWidgetMaps: FlatPageLayoutWidgetMaps;
@@ -215,6 +204,7 @@ export class PageLayoutService {
{
workspaceId,
flatMapsKeys: [
+ 'flatObjectMetadataMaps',
'flatPageLayoutMaps',
'flatPageLayoutTabMaps',
'flatPageLayoutWidgetMaps',
@@ -223,6 +213,60 @@ export class PageLayoutService {
);
}
+ private findActiveFlatPageLayouts({
+ objectMetadataId,
+ pageLayoutType,
+ flatObjectMetadataMaps,
+ flatPageLayoutMaps,
+ }: {
+ objectMetadataId?: string;
+ pageLayoutType?: PageLayoutType;
+ flatObjectMetadataMaps: AllFlatEntityMaps['flatObjectMetadataMaps'];
+ flatPageLayoutMaps: FlatPageLayoutMaps;
+ }): FlatPageLayout[] {
+ const candidateFlatPageLayouts = isNonEmptyString(objectMetadataId)
+ ? this.findFlatPageLayoutsByObjectMetadataId({
+ objectMetadataId,
+ flatObjectMetadataMaps,
+ flatPageLayoutMaps,
+ })
+ : Object.values(flatPageLayoutMaps.byUniversalIdentifier).filter(
+ isDefined,
+ );
+
+ return candidateFlatPageLayouts
+ .filter(
+ (layout) =>
+ !isDefined(layout.deletedAt) &&
+ (!isDefined(pageLayoutType) || layout.type === pageLayoutType),
+ )
+ .sort(compareFlatPageLayoutsByCreation);
+ }
+
+ private findFlatPageLayoutsByObjectMetadataId({
+ objectMetadataId,
+ flatObjectMetadataMaps,
+ flatPageLayoutMaps,
+ }: {
+ objectMetadataId: string;
+ flatObjectMetadataMaps: AllFlatEntityMaps['flatObjectMetadataMaps'];
+ flatPageLayoutMaps: FlatPageLayoutMaps;
+ }): FlatPageLayout[] {
+ const flatObjectMetadata = findFlatEntityByIdInFlatEntityMaps({
+ flatEntityId: objectMetadataId,
+ flatEntityMaps: flatObjectMetadataMaps,
+ });
+
+ if (!isDefined(flatObjectMetadata)) {
+ return [];
+ }
+
+ return findManyFlatEntityByIdInFlatEntityMaps({
+ flatEntityMaps: flatPageLayoutMaps,
+ flatEntityIds: flatObjectMetadata.pageLayoutIds,
+ });
+ }
+
async create({
createPageLayoutInput,
workspaceId,
diff --git a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts
index d52bbb8c168..dd2f7bc721a 100644
--- a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts
@@ -116,6 +116,7 @@ describe('WorkspaceEntityManager', () => {
objectPermissionIds: [],
fieldPermissionIds: [],
viewIds: [],
+ pageLayoutIds: [],
universalIdentifier: 'test-entity-id',
description: null,
imageIdentifierFieldMetadataId: null,
@@ -136,6 +137,7 @@ describe('WorkspaceEntityManager', () => {
objectPermissionUniversalIdentifiers: [],
fieldPermissionUniversalIdentifiers: [],
viewUniversalIdentifiers: [],
+ pageLayoutUniversalIdentifiers: [],
indexMetadataUniversalIdentifiers: [],
searchFieldMetadataUniversalIdentifiers: [],
labelIdentifierFieldMetadataUniversalIdentifier: null,
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.ts
index 1e6a2f54894..62efaa7294a 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
@@ -34,6 +34,7 @@ describe('getColumnNameToFieldMetadataIdMap', () => {
fieldPermissionIds: [],
fieldIds,
viewIds: [],
+ pageLayoutIds: [],
applicationId: 'test-application-id',
isLabelSyncedWithName: false,
createdAt: new Date().toISOString(),
@@ -53,6 +54,7 @@ describe('getColumnNameToFieldMetadataIdMap', () => {
objectPermissionUniversalIdentifiers: [],
fieldPermissionUniversalIdentifiers: [],
viewUniversalIdentifiers: [],
+ pageLayoutUniversalIdentifiers: [],
indexMetadataUniversalIdentifiers: [],
searchFieldMetadataUniversalIdentifiers: [],
labelIdentifierFieldMetadataUniversalIdentifier: 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.ts
index 5e68df77caf..e5536560171 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
@@ -34,6 +34,7 @@ describe('getFieldMetadataIdToColumnNamesMap', () => {
fieldPermissionIds: [],
fieldIds,
viewIds: [],
+ pageLayoutIds: [],
applicationId: 'test-application-id',
isLabelSyncedWithName: false,
createdAt: new Date().toISOString(),
@@ -53,6 +54,7 @@ describe('getFieldMetadataIdToColumnNamesMap', () => {
objectPermissionUniversalIdentifiers: [],
fieldPermissionUniversalIdentifiers: [],
viewUniversalIdentifiers: [],
+ pageLayoutUniversalIdentifiers: [],
indexMetadataUniversalIdentifiers: [],
searchFieldMetadataUniversalIdentifiers: [],
labelIdentifierFieldMetadataUniversalIdentifier: 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.ts
index 3f73ca7f8c7..d424230c336 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
@@ -35,6 +35,7 @@ describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => {
fieldPermissionIds: [],
fieldIds,
viewIds: [],
+ pageLayoutIds: [],
applicationId: 'test-application-id',
isLabelSyncedWithName: false,
createdAt: new Date().toISOString(),
@@ -54,6 +55,7 @@ describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => {
objectPermissionUniversalIdentifiers: [],
fieldPermissionUniversalIdentifiers: [],
viewUniversalIdentifiers: [],
+ pageLayoutUniversalIdentifiers: [],
indexMetadataUniversalIdentifiers: [],
searchFieldMetadataUniversalIdentifiers: [],
labelIdentifierFieldMetadataUniversalIdentifier: 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.ts
index 4430a544cf8..965cdf37b4b 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
@@ -115,6 +115,7 @@ export const createStandardObjectFlatMetadata = <
objectPermissionIds: [],
fieldPermissionIds: [],
viewIds: [],
+ pageLayoutIds: [],
createdAt: now,
updatedAt: now,
id: standardObjectMetadataRelatedEntityIds[nameSingular].id,
@@ -126,6 +127,7 @@ export const createStandardObjectFlatMetadata = <
viewUniversalIdentifiers: [],
indexMetadataUniversalIdentifiers: [],
searchFieldMetadataUniversalIdentifiers: [],
+ pageLayoutUniversalIdentifiers: [],
labelIdentifierFieldMetadataUniversalIdentifier,
imageIdentifierFieldMetadataUniversalIdentifier,
};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/__tests__/__snapshots__/all-universal-flat-entity-foreign-key-aggregator-properties.constant.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/__tests__/__snapshots__/all-universal-flat-entity-foreign-key-aggregator-properties.constant.spec.ts.snap
index 3af22af75e1..2a7792d8999 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
@@ -29,6 +29,7 @@ exports[`ALL_UNIVERSAL_FLAT_ENTITY_FOREIGN_KEY_AGGREGATOR_PROPERTIES should matc
"fieldPermissionUniversalIdentifiers",
"viewUniversalIdentifiers",
"searchFieldMetadataUniversalIdentifiers",
+ "pageLayoutUniversalIdentifiers",
],
"objectPermission": [],
"pageLayout": [
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/__snapshots__/delete-flat-entity-foreign-key-aggregators.util.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/__snapshots__/delete-flat-entity-foreign-key-aggregators.util.spec.ts.snap
index 3c7f582ae3d..a6a8c31f51d 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
"objectPermissionUniversalIdentifiers": [],
"openRecordIn": "USER_CHOICE",
"overrides": null,
+ "pageLayoutUniversalIdentifiers": [],
"searchFieldMetadataUniversalIdentifiers": [],
"shortcut": "shortcut",
"targetTableName": "",
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-validator.service.ts
index f48750b42cf..29416551246 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-validator.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-validator.service.ts
@@ -12,12 +12,16 @@ import { type UniversalFlatEntityValidationArgs } from 'src/engine/workspace-man
const PAGE_LAYOUT_EXCEPTION_CODE = {
PAGE_LAYOUT_NOT_FOUND: 'PAGE_LAYOUT_NOT_FOUND',
+ INVALID_PAGE_LAYOUT_DATA: 'INVALID_PAGE_LAYOUT_DATA',
} as const;
@Injectable()
export class FlatPageLayoutValidatorService {
public validateFlatPageLayoutCreation({
flatEntityToValidate: flatPageLayout,
+ optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
+ flatObjectMetadataMaps,
+ },
}: UniversalFlatEntityValidationArgs<
typeof ALL_METADATA_NAME.pageLayout
>): FailedFlatEntityValidation<'pageLayout', 'create'> {
@@ -30,6 +34,22 @@ export class FlatPageLayoutValidatorService {
type: 'create',
});
+ // Workspace-level layouts are not attached to any object
+ if (isDefined(flatPageLayout.objectMetadataUniversalIdentifier)) {
+ const optimisticFlatObjectMetadata = findFlatEntityByUniversalIdentifier({
+ universalIdentifier: flatPageLayout.objectMetadataUniversalIdentifier,
+ flatEntityMaps: flatObjectMetadataMaps,
+ });
+
+ if (!isDefined(optimisticFlatObjectMetadata)) {
+ validationResult.errors.push({
+ code: PAGE_LAYOUT_EXCEPTION_CODE.INVALID_PAGE_LAYOUT_DATA,
+ message: t`Object metadata not found`,
+ userFriendlyMessage: msg`Object metadata not found`,
+ });
+ }
+ }
+
return validationResult;
}
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.ts
index f5d9eda8bf7..ddf70ce4292 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
@@ -119,6 +119,7 @@ export const fromUniversalFlatObjectMetadataToFlatObjectMetadata = ({
searchFieldMetadataIds: [],
objectPermissionIds: [],
fieldPermissionIds: [],
+ pageLayoutIds: [],
...emptyUniversalForeignKeyAggregators,
};
};