diff --git a/packages/twenty-e2e-testing/tests/create-record.spec.ts b/packages/twenty-e2e-testing/tests/create-record.spec.ts index 3a97e925aa..40d3823f45 100644 --- a/packages/twenty-e2e-testing/tests/create-record.spec.ts +++ b/packages/twenty-e2e-testing/tests/create-record.spec.ts @@ -58,7 +58,7 @@ test('Create and update record', async ({ page }) => { await lastNameInput.press('Enter'); // Focus on recordFieldList - const recordFieldList = page.getByTestId('record-fields-list-container'); + const recordFieldList = page.getByTestId('person-widget-fields'); await expect(recordFieldList).toBeVisible(); await recordFieldList.getByText('Emails').first().click(); @@ -106,10 +106,11 @@ test('Create and update record', async ({ page }) => { recordFieldList.getByText('Work Preference').first().click({force: true}); // Fill company relation - const companyRelationHeader = page.getByTestId('company-relation'); - await expect(companyRelationHeader).toBeVisible(); + const companyRelationWidget = page.getByTestId(/dynamic-relation-widget-.+-Company/); + await expect(companyRelationWidget).toBeVisible(); - await companyRelationHeader.locator('.tabler-icon-pencil').click(); + await companyRelationWidget.hover(); + await companyRelationWidget.locator('.tabler-icon-pencil').click(); await page.getByRole('textbox', { name: 'Search' }).fill('Goog'); await expect(page.getByRole('option', { name: 'Google' })).toBeVisible(); const [updatePersonResponse] = await Promise.all([ diff --git a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutWithRelationWidgets.ts b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutWithRelationWidgets.ts index 1f4928faa1..2d1507da5e 100644 --- a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutWithRelationWidgets.ts +++ b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutWithRelationWidgets.ts @@ -15,7 +15,7 @@ const createRelationFieldWidget = ( tabId: string, ): PageLayoutWidget => ({ __typename: 'PageLayoutWidget' as const, - id: `dynamic-relation-widget-${field.id}`, + id: `dynamic-relation-widget-${field.id}-${field.label}`, pageLayoutTabId: tabId, title: field.label, type: WidgetType.FIELD, diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsx index 43c0ad29bc..e1201589a1 100644 --- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsx +++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsx @@ -139,6 +139,7 @@ export const WidgetRenderer = ({ widget }: WidgetRendererProps) => { onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave} data-widget-id={widget.id} + data-testid={widget.id} className="widget" > {showHeader && ( diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts index e73899c0e5..bd74d95dc1 100644 --- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts +++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts @@ -39,7 +39,7 @@ export const seedFeatureFlags = async ({ { key: FeatureFlagKey.IS_RECORD_PAGE_LAYOUT_ENABLED, workspaceId: workspaceId, - value: false, + value: true, }, { key: FeatureFlagKey.IS_PUBLIC_DOMAIN_ENABLED, diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts index 48651d321c..47f2df843e 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts @@ -3,4 +3,5 @@ import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/featu export const DEFAULT_FEATURE_FLAGS = [ FeatureFlagKey.IS_TIMELINE_ACTIVITY_MIGRATED, FeatureFlagKey.IS_ATTACHMENT_MIGRATED, + FeatureFlagKey.IS_RECORD_PAGE_LAYOUT_ENABLED, ] as const satisfies FeatureFlagKey[];