Elgato_dark/twenty
1
0
Fork 0
mirror of https://github.com/twentyhq/twenty synced 2026-04-21 13:37:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

shouldIncludeRecordPageLayouts deprecation (#19774)

Browse source 
## Context
Deprecating shouldIncludeRecordPageLayouts in preparation for page
layout release.

See new workspace with standard page layout from standard app
<img width="570" height="682" alt="Screenshot 2026-04-16 at 18 35 23"
src="https://github.com/user-attachments/assets/bf7fa621-d40d-4c29-8d96-537c58b3eb40"
/>
This commit is contained in:
Weiko 2026-04-17 13:32:10 +02:00 committed by GitHub
parent 76ea0f37ed
commit 5cd8b7899d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 31 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/twenty-e2e-testing/tests/create-record.spec.ts
View file

@ -64,7 +64,7 @@ test('Create and update record', async ({ page }) => {
await lastNameInput.press('Enter');
// Focus on recordFieldList
const recordFieldList = page.getByTestId('person-widget-fields');
const recordFieldList = page.getByTestId('record-fields-widget');
await expect(recordFieldList).toBeVisible();
await recordFieldList.getByText('Emails').first().click();

5
packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx
View file

@ -67,6 +67,9 @@ export const WidgetCardShell = ({
}: WidgetCardShellProps) => {
const { theme } = useContext(ThemeContext);
const dataTestId =
widget.type === WidgetType.FIELDS ? 'record-fields-widget' : widget.id;
return (
<WidgetComponentInstanceContext.Provider value={{ instanceId: widget.id }}>
<WidgetCard
@ -81,7 +84,7 @@ export const WidgetCardShell = ({
onMouseEnter={onMouseEnter}
onMouseLeave={onMouseLeave}
data-widget-id={widget.id}
data-testid={widget.id}
data-testid={dataTestId}
className="widget"
>
{showHeader && (

1
packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500001000-add-compose-email-command-menu-item.command.ts
View file

@ -65,7 +65,6 @@ export class AddComposeEmailCommandMenuItemCommand extends ActiveOrSuspendedWork
const { allFlatEntityMaps: standardAllFlatEntityMaps } =
computeTwentyStandardApplicationAllFlatEntityMaps({
shouldIncludeRecordPageLayouts: true,
now: new Date().toISOString(),
workspaceId,
twentyStandardApplicationId: twentyStandardFlatApplication.id,

1
packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500006000-deduplicate-engine-commands.command.ts
View file

@ -76,7 +76,6 @@ export class DeduplicateEngineCommandsCommand extends ActiveOrSuspendedWorkspace
const { allFlatEntityMaps: standardAllFlatEntityMaps } =
computeTwentyStandardApplicationAllFlatEntityMaps({
shouldIncludeRecordPageLayouts: true,
now: new Date().toISOString(),
workspaceId,
twentyStandardApplicationId: twentyStandardFlatApplication.id,

1
packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500007000-fix-select-all-command-menu-items.command.ts
View file

@ -55,7 +55,6 @@ export class FixSelectAllCommandMenuItemsCommand extends ActiveOrSuspendedWorksp
const { allFlatEntityMaps: standardAllFlatEntityMaps } =
computeTwentyStandardApplicationAllFlatEntityMaps({
shouldIncludeRecordPageLayouts: true,
now: new Date().toISOString(),
workspaceId,
twentyStandardApplicationId: twentyStandardFlatApplication.id,

1
packages/twenty-server/src/database/commands/upgrade-version-command/1-22/1-22-workspace-command-1775500016000-add-send-email-record-selection-command-menu-items.command.ts
View file

@ -73,7 +73,6 @@ export class AddSendEmailRecordSelectionCommandMenuItemsCommand extends ActiveOr
const { allFlatEntityMaps: standardAllFlatEntityMaps } =
computeTwentyStandardApplicationAllFlatEntityMaps({
shouldIncludeRecordPageLayouts: true,
now: new Date().toISOString(),
workspaceId,
twentyStandardApplicationId: twentyStandardFlatApplication.id,

1
packages/twenty-server/src/database/commands/upgrade-version-command/1-22/1-22-workspace-command-1780000002000-backfill-standard-skills.command.ts
View file

@ -48,7 +48,6 @@ export class BackfillStandardSkillsCommand extends ActiveOrSuspendedWorkspaceCom
const { allFlatEntityMaps: standardAllFlatEntityMaps } =
computeTwentyStandardApplicationAllFlatEntityMaps({
shouldIncludeRecordPageLayouts: true,
now: new Date().toISOString(),
workspaceId,
twentyStandardApplicationId: twentyStandardFlatApplication.id,

1
packages/twenty-server/src/database/commands/upgrade-version-command/1-22/1-22-workspace-command-1780000003000-fix-merge-command-select-all.command.ts
View file

@ -53,7 +53,6 @@ export class FixMergeCommandSelectAllCommand extends ActiveOrSuspendedWorkspaceC
const { allFlatEntityMaps: standardAllFlatEntityMaps } =
computeTwentyStandardApplicationAllFlatEntityMaps({
shouldIncludeRecordPageLayouts: true,
now: new Date().toISOString(),
workspaceId,
twentyStandardApplicationId: twentyStandardFlatApplication.id,

1
packages/twenty-server/src/database/commands/upgrade-version-command/1-23/1-23-workspace-command-1780000001500-backfill-record-page-layouts.command.ts
View file

@ -240,7 +240,6 @@ export class BackfillRecordPageLayoutsCommand extends ActiveOrSuspendedWorkspace
}): Promise<void> {
const { allFlatEntityMaps: standardMaps } =
computeTwentyStandardApplicationAllFlatEntityMaps({
shouldIncludeRecordPageLayouts: true,
now: new Date().toISOString(),
workspaceId,
twentyStandardApplicationId: twentyStandardFlatApplication.id,

1
packages/twenty-server/src/database/commands/upgrade-version-command/1-23/1-23-workspace-command-1780000005000-update-global-object-context-command-menu-items.command.ts
View file

@ -58,7 +58,6 @@ export class UpdateGlobalObjectContextCommandMenuItemsCommand extends ActiveOrSu
const { allFlatEntityMaps: standardAllFlatEntityMaps } =
computeTwentyStandardApplicationAllFlatEntityMaps({
shouldIncludeRecordPageLayouts: true,
now: new Date().toISOString(),
workspaceId,
twentyStandardApplicationId: twentyStandardFlatApplication.id,

8
packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
View file

@ -230,14 +230,16 @@ export class ConfigVariables {
@ValidateIf((env) => env.AUTH_MICROSOFT_ENABLED)
AUTH_MICROSOFT_APIS_CALLBACK_URL: string;
/**
* @deprecated Use is now GA - record page layouts are always seeded
*/
@ConfigVariablesMetadata({
group: ConfigVariablesGroup.ADVANCED_SETTINGS,
description:
'Enable or disable the seeding of standard record page layouts',
description: 'Deprecated - record page layouts are now always seeded (GA)',
type: ConfigVariableType.BOOLEAN,
})
@IsOptional()
SHOULD_SEED_STANDARD_RECORD_PAGE_LAYOUTS = false;
SHOULD_SEED_STANDARD_RECORD_PAGE_LAYOUTS = true;
@ConfigVariablesMetadata({
group: ConfigVariablesGroup.MICROSOFT_AUTH,

7
packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/services/twenty-standard-application.service.ts
View file

@ -1,7 +1,6 @@
import { Injectable } from '@nestjs/common';
import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
import { getSubFlatEntityMapsByApplicationIdsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/get-sub-flat-entity-maps-by-application-ids-or-throw.util';
@ -18,7 +17,6 @@ import { FromToAllUniversalFlatEntityMaps } from 'src/engine/workspace-manager/w
export class TwentyStandardApplicationService {
constructor(
private readonly applicationService: ApplicationService,
private readonly twentyConfigService: TwentyConfigService,
private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
@ -41,10 +39,6 @@ export class TwentyStandardApplicationService {
'featureFlagsMap',
]);
const shouldIncludeRecordPageLayouts = this.twentyConfigService.get(
'SHOULD_SEED_STANDARD_RECORD_PAGE_LAYOUTS',
);
const {
allFlatEntityMaps: toTwentyStandardAllFlatEntityMaps,
idByUniversalIdentifierByMetadataName,
@ -52,7 +46,6 @@ export class TwentyStandardApplicationService {
now: new Date().toISOString(),
workspaceId,
twentyStandardApplicationId: twentyStandardFlatApplication.id,
shouldIncludeRecordPageLayouts,
});
const fromToAllFlatEntityMaps: FromToAllUniversalFlatEntityMaps = {};

18
packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-tab/build-standard-flat-page-layout-tab-metadata-maps.util.ts
View file

@ -2,10 +2,7 @@ import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-enti
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type';
import {
STANDARD_PAGE_LAYOUTS,
STANDARD_RECORD_PAGE_LAYOUTS,
} from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout.constant';
import { STANDARD_PAGE_LAYOUTS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout.constant';
import { type StandardPageLayoutTabConfig } from 'src/engine/workspace-manager/twenty-standard-application/utils/page-layout-config/standard-page-layout-config.type';
import {
type CreateStandardPageLayoutTabArgs,
@ -15,28 +12,17 @@ import {
export type BuildStandardFlatPageLayoutTabMetadataMapsArgs = Omit<
CreateStandardPageLayoutTabArgs,
'context'
> & {
shouldIncludeRecordPageLayouts?: boolean;
};
>;
export const buildStandardFlatPageLayoutTabMetadataMaps = ({
now,
workspaceId,
twentyStandardApplicationId,
standardPageLayoutMetadataRelatedEntityIds,
shouldIncludeRecordPageLayouts,
}: BuildStandardFlatPageLayoutTabMetadataMapsArgs): FlatEntityMaps<FlatPageLayoutTab> => {
const allPageLayoutTabMetadatas: FlatPageLayoutTab[] = [];
const recordPageLayoutNames = Object.keys(STANDARD_RECORD_PAGE_LAYOUTS);
for (const layoutName of Object.keys(STANDARD_PAGE_LAYOUTS)) {
if (
!shouldIncludeRecordPageLayouts &&
recordPageLayoutNames.includes(layoutName)
) {
continue;
}
const layout = STANDARD_PAGE_LAYOUTS[
layoutName as keyof typeof STANDARD_PAGE_LAYOUTS
] as { tabs: Record<string, StandardPageLayoutTabConfig> };

8
packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-widget/build-standard-flat-page-layout-widget-metadata-maps.util.ts
View file

@ -23,9 +23,7 @@ import { findObjectNameByUniversalIdentifier } from 'src/engine/workspace-manage
export type BuildStandardFlatPageLayoutWidgetMetadataMapsArgs = Omit<
CreateStandardPageLayoutWidgetArgs,
'context'
> & {
shouldIncludeRecordPageLayouts?: boolean;
};
>;
const RECORD_PAGE_LAYOUT_WIDGET_TYPES = [
WidgetType.FIELDS,
@ -336,9 +334,7 @@ export const buildStandardFlatPageLayoutWidgetMetadataMaps = (
): FlatEntityMaps<FlatPageLayoutWidget> => {
const allWidgetMetadatas: FlatPageLayoutWidget[] = [
...computeMyFirstDashboardWidgets(args),
...(args.shouldIncludeRecordPageLayouts
? computeRecordPageWidgets(args)
: []),
...computeRecordPageWidgets(args),
];
let flatPageLayoutWidgetMaps = createEmptyFlatEntityMaps();

19
packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout/build-standard-flat-page-layout-metadata-maps.util.ts
View file

@ -2,33 +2,20 @@ import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-enti
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';
import { STANDARD_RECORD_PAGE_LAYOUTS } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout.constant';
import { type CreateStandardPageLayoutArgs } from 'src/engine/workspace-manager/twenty-standard-application/utils/page-layout/create-standard-page-layout-flat-metadata.util';
import { STANDARD_FLAT_PAGE_LAYOUT_BUILDERS_BY_LAYOUT_NAME } from 'src/engine/workspace-manager/twenty-standard-application/utils/page-layout/standard-flat-page-layout-builders.constant';
export type BuildStandardFlatPageLayoutMetadataMapsArgs = Omit<
CreateStandardPageLayoutArgs,
'context'
> & {
shouldIncludeRecordPageLayouts?: boolean;
};
>;
export const buildStandardFlatPageLayoutMetadataMaps = (
args: BuildStandardFlatPageLayoutMetadataMapsArgs,
): FlatEntityMaps<FlatPageLayout> => {
const recordPageLayoutNames = Object.keys(STANDARD_RECORD_PAGE_LAYOUTS);
const layoutEntries = Object.entries(
const allPageLayoutMetadatas: FlatPageLayout[] = Object.values(
STANDARD_FLAT_PAGE_LAYOUT_BUILDERS_BY_LAYOUT_NAME,
).filter(
([layoutName]) =>
args.shouldIncludeRecordPageLayouts ||
!recordPageLayoutNames.includes(layoutName),
);
const allPageLayoutMetadatas: FlatPageLayout[] = layoutEntries.map(
([, builder]) => builder(args),
);
).map((builder) => builder(args));
let flatPageLayoutMaps = createEmptyFlatEntityMaps();

8
packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant.ts
View file

@ -28,14 +28,12 @@ export type ComputeTwentyStandardApplicationAllFlatEntityMapsArgs = {
now: string;
workspaceId: string;
twentyStandardApplicationId: string;
shouldIncludeRecordPageLayouts?: boolean;
};
export const computeTwentyStandardApplicationAllFlatEntityMaps = ({
now,
workspaceId,
twentyStandardApplicationId,
shouldIncludeRecordPageLayouts,
}: ComputeTwentyStandardApplicationAllFlatEntityMapsArgs): {
allFlatEntityMaps: TwentyStandardAllFlatEntityMaps;
// TODO remove once all metadatas has fully been universal migrated
@ -84,7 +82,6 @@ export const computeTwentyStandardApplicationAllFlatEntityMaps = ({
standardObjectMetadataRelatedEntityIds,
twentyStandardApplicationId,
workspaceId,
shouldIncludeRecordPageLayouts,
});
const flatViewGroupMaps = buildStandardFlatViewGroupMetadataMaps({
@ -108,7 +105,6 @@ export const computeTwentyStandardApplicationAllFlatEntityMaps = ({
standardObjectMetadataRelatedEntityIds,
twentyStandardApplicationId,
workspaceId,
shouldIncludeRecordPageLayouts,
});
const flatViewFilterMaps = buildStandardFlatViewFilterMetadataMaps({
@ -134,7 +130,6 @@ export const computeTwentyStandardApplicationAllFlatEntityMaps = ({
standardObjectMetadataRelatedEntityIds,
twentyStandardApplicationId,
workspaceId,
shouldIncludeRecordPageLayouts,
});
const flatRoleMaps = buildStandardFlatRoleMetadataMaps({
@ -172,7 +167,6 @@ export const computeTwentyStandardApplicationAllFlatEntityMaps = ({
twentyStandardApplicationId,
standardObjectMetadataRelatedEntityIds,
standardPageLayoutMetadataRelatedEntityIds,
shouldIncludeRecordPageLayouts,
});
const flatPageLayoutTabMaps = buildStandardFlatPageLayoutTabMetadataMaps({
@ -180,7 +174,6 @@ export const computeTwentyStandardApplicationAllFlatEntityMaps = ({
workspaceId,
twentyStandardApplicationId,
standardPageLayoutMetadataRelatedEntityIds,
shouldIncludeRecordPageLayouts,
});
const flatPageLayoutWidgetMaps =
@ -190,7 +183,6 @@ export const computeTwentyStandardApplicationAllFlatEntityMaps = ({
twentyStandardApplicationId,
standardObjectMetadataRelatedEntityIds,
standardPageLayoutMetadataRelatedEntityIds,
shouldIncludeRecordPageLayouts,
});
const flatNavigationMenuItemMaps = buildStandardFlatNavigationMenuItemMaps({

15
packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/build-standard-flat-view-field-group-metadata-maps.util.ts
View file

@ -58,18 +58,11 @@ const STANDARD_FLAT_VIEW_FIELD_GROUP_METADATA_BUILDERS_BY_OBJECT_NAME = {
export type BuildStandardFlatViewFieldGroupMetadataMapsArgs = Omit<
CreateStandardViewFieldGroupArgs,
'context' | 'objectName'
> & {
shouldIncludeRecordPageLayouts?: boolean;
};
export const buildStandardFlatViewFieldGroupMetadataMaps = ({
shouldIncludeRecordPageLayouts,
...args
}: BuildStandardFlatViewFieldGroupMetadataMapsArgs): FlatEntityMaps<FlatViewFieldGroup> => {
if (!shouldIncludeRecordPageLayouts) {
return createEmptyFlatEntityMaps();
}
>;
export const buildStandardFlatViewFieldGroupMetadataMaps = (
args: BuildStandardFlatViewFieldGroupMetadataMapsArgs,
): FlatEntityMaps<FlatViewFieldGroup> => {
const allViewFieldGroupMetadatas: FlatViewFieldGroup[] = (
Object.keys(
STANDARD_FLAT_VIEW_FIELD_GROUP_METADATA_BUILDERS_BY_OBJECT_NAME,

23
packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/build-standard-flat-view-field-metadata-maps.util.ts
View file

@ -1,5 +1,3 @@
import { isDefined } from 'twenty-shared/utils';
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
@ -78,14 +76,11 @@ const STANDARD_FLAT_VIEW_FIELD_METADATA_BUILDERS_BY_OBJECT_NAME = {
export type BuildStandardFlatViewFieldMetadataMapsArgs = Omit<
CreateStandardViewFieldArgs,
'context' | 'objectName'
> & {
shouldIncludeRecordPageLayouts?: boolean;
};
>;
export const buildStandardFlatViewFieldMetadataMaps = ({
shouldIncludeRecordPageLayouts,
...args
}: BuildStandardFlatViewFieldMetadataMapsArgs): FlatEntityMaps<FlatViewField> => {
export const buildStandardFlatViewFieldMetadataMaps = (
args: BuildStandardFlatViewFieldMetadataMapsArgs,
): FlatEntityMaps<FlatViewField> => {
const allViewFieldMetadatas: FlatViewField[] = (
Object.keys(
STANDARD_FLAT_VIEW_FIELD_METADATA_BUILDERS_BY_OBJECT_NAME,
@ -99,15 +94,7 @@ export const buildStandardFlatViewFieldMetadataMaps = ({
objectName,
});
return Object.values(result).filter(
(viewField) =>
shouldIncludeRecordPageLayouts ||
isDefined(
args.dependencyFlatEntityMaps.flatViewMaps.byUniversalIdentifier[
viewField.viewUniversalIdentifier
],
),
);
return Object.values(result);
});
let flatViewFieldMaps = createEmptyFlatEntityMaps();

18
packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view/build-standard-flat-view-metadata-maps.util.ts
View file

@ -1,5 +1,3 @@
import { ViewType } from 'twenty-shared/types';
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
@ -78,14 +76,11 @@ const STANDARD_FLAT_VIEW_METADATA_BUILDERS_BY_OBJECT_NAME = {
export type BuildStandardFlatViewMetadataMapsArgs = Omit<
CreateStandardViewArgs,
'context' | 'objectName'
> & {
shouldIncludeRecordPageLayouts?: boolean;
};
>;
export const buildStandardFlatViewMetadataMaps = ({
shouldIncludeRecordPageLayouts,
...args
}: BuildStandardFlatViewMetadataMapsArgs): FlatEntityMaps<FlatView> => {
export const buildStandardFlatViewMetadataMaps = (
args: BuildStandardFlatViewMetadataMapsArgs,
): FlatEntityMaps<FlatView> => {
const allViewMetadatas: FlatView[] = (
Object.keys(
STANDARD_FLAT_VIEW_METADATA_BUILDERS_BY_OBJECT_NAME,
@ -99,10 +94,7 @@ export const buildStandardFlatViewMetadataMaps = ({
objectName,
});
return Object.values(result).filter(
(view) =>
shouldIncludeRecordPageLayouts || view.type !== ViewType.FIELDS_WIDGET,
);
return Object.values(result);
});
let flatViewMaps = createEmptyFlatEntityMaps();