The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Validate junction relation target settings (#25108)
Félix Malfait2a4fd729d725
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.tsindex 28818b08f47..c367420c04e 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts@@ -1,8 +1,6 @@import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';-import {- generateDepthRecordGqlFieldsFromFields,- type GenerateDepthRecordGqlFieldsFromFields,-} from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields';+import { type GenerateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields';+import { generateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields';import { FieldMetadataType } from 'twenty-shared/types';type GetTimelineActivityRecordGqlFieldsParams = Pick<diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields.tsnew file mode 100644index 00000000000..2ceda9fd5a6--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields.ts@@ -0,0 +1,22 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';++export type GenerateDepthRecordGqlFieldsFromFields = {+ objectMetadataItems: Pick<+ EnrichedObjectMetadataItem,+ | 'id'+ | 'fields'+ | 'labelIdentifierFieldMetadataId'+ | 'imageIdentifierFieldMetadataId'+ | 'nameSingular'+ | 'namePlural'+ >[];+ // Required to resolve the junction records held by the reverse side of a junction+ sourceObjectMetadataItem?: Pick<EnrichedObjectMetadataItem, 'id'>;+ fields: Pick<+ FieldMetadataItem,+ 'id' | 'name' | 'type' | 'settings' | 'morphRelations' | 'relation'+ >[];+ depth: 0 | 1;+ shouldOnlyLoadRelationIdentifiers?: boolean;+};diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/generateDepthRecordGqlFieldsFromFields.test.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/generateDepthRecordGqlFieldsFromFields.test.tsnew file mode 100644index 00000000000..707d090f41c--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/generateDepthRecordGqlFieldsFromFields.test.ts@@ -0,0 +1,35 @@+import { generateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';++describe('generateDepthRecordGqlFieldsFromFields', () => {+ it('does not query pivots for an invalid configured junction', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });++ if (!taskTargetsField.relation) {+ throw new Error('Task targets relation not found');+ }++ const invalidTaskTargetsField = {+ ...taskTargetsField,+ settings: {+ ...taskTargetsField.settings,+ junctionTargetFieldId: taskTargetsField.relation.targetFieldMetadata.id,+ },+ };++ expect(+ generateDepthRecordGqlFieldsFromFields({+ objectMetadataItems: getTestEnrichedObjectMetadataItemsMock(),+ sourceObjectMetadataItem: taskMetadata,+ fields: [invalidTaskTargetsField],+ depth: 1,+ }),+ ).not.toHaveProperty('taskTargets');+ });+});diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields.tsindex 22b0fdd4aa1..b527de2c711 100644--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields.ts+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields.ts@@ -1,35 +1,16 @@import { FieldMetadataType, RelationType } from 'twenty-shared/types';-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { type GenerateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields';import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';import { buildIdentifierGqlFields } from '@/object-record/graphql/record-gql-fields/utils/buildIdentifierGqlFields';import { generateJunctionRelationGqlFields } from '@/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields';+import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';import { getReverseJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getReverseJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import {computeMorphRelationGqlFieldName,isDefined,} from 'twenty-shared/utils';-export type GenerateDepthRecordGqlFieldsFromFields = {- objectMetadataItems: Pick<- EnrichedObjectMetadataItem,- | 'id'- | 'fields'- | 'labelIdentifierFieldMetadataId'- | 'imageIdentifierFieldMetadataId'- | 'nameSingular'- | 'namePlural'- >[];- // Required to resolve the junction records held by the reverse side of a junction- sourceObjectMetadataItem?: Pick<EnrichedObjectMetadataItem, 'id'>;- fields: Pick<- FieldMetadataItem,- 'id' | 'name' | 'type' | 'settings' | 'morphRelations' | 'relation'- >[];- depth: 0 | 1;- shouldOnlyLoadRelationIdentifiers?: boolean;-};-export const generateDepthRecordGqlFieldsFromFields = ({objectMetadataItems,sourceObjectMetadataItem,@@ -59,6 +40,23 @@ export const generateDepthRecordGqlFieldsFromFields = ({);}+ const junctionConfig = getJunctionConfig({+ settings: fieldMetadata.settings,+ relationObjectMetadataId: targetObjectMetadataItem.id,+ relationTargetFieldMetadataId:+ fieldMetadata.relation?.targetFieldMetadata.id,+ sourceObjectMetadataId:+ fieldMetadata.relation?.sourceObjectMetadata.id,+ objectMetadataItems,+ });++ if (+ isDefined(junctionConfig) &&+ !isUsableJunctionConfig(junctionConfig)+ ) {+ return recordGqlFields;+ }+const reverseJunctionConfig = getReverseJunctionConfig({junctionObjectMetadataId: targetObjectMetadataItem.id,sourceObjectMetadataId: sourceObjectMetadataItem?.id,@@ -80,15 +78,13 @@ export const generateDepthRecordGqlFieldsFromFields = ({};}- const junctionGqlFields = generateJunctionRelationGqlFields({- fieldMetadataItem: fieldMetadata,- objectMetadataItems,- });-- if (isDefined(junctionGqlFields) && depth === 1) {+ if (isUsableJunctionConfig(junctionConfig) && depth === 1) {return {...recordGqlFields,- [fieldMetadata.name]: junctionGqlFields,+ [fieldMetadata.name]: generateJunctionRelationGqlFields({+ junctionConfig,+ objectMetadataItems,+ }),};}diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.tsindex 892e7e56f59..58bb68c80cd 100644--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts@@ -1,10 +1,8 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';import { buildIdentifierGqlFields } from '@/object-record/graphql/record-gql-fields/utils/buildIdentifierGqlFields';-import {- getJunctionConfig,- type JunctionObjectMetadataItem,-} from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { type JunctionObjectMetadataItem } from '@/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem';+import { type ValidJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig';import { FieldMetadataType } from 'twenty-shared/types';import {computeMorphRelationGqlFieldName,@@ -17,7 +15,7 @@ type JunctionFieldMetadataItem = Pick<>;type GenerateJunctionRelationGqlFieldsArgs = {- fieldMetadataItem: JunctionFieldMetadataItem;+ junctionConfig: ValidJunctionConfig;objectMetadataItems: JunctionObjectMetadataItem[];};@@ -83,22 +81,9 @@ const buildTargetFieldGqlFields = (};export const generateJunctionRelationGqlFields = ({- fieldMetadataItem,+ junctionConfig,objectMetadataItems,-}: GenerateJunctionRelationGqlFieldsArgs): RecordGqlFields | null => {- const junctionConfig = getJunctionConfig({- settings: fieldMetadataItem.settings,- relationObjectMetadataId:- fieldMetadataItem.relation?.targetObjectMetadata.id ?? '',- relationTargetFieldMetadataId:- fieldMetadataItem.relation?.targetFieldMetadata.id,- objectMetadataItems,- });-- if (!isDefined(junctionConfig)) {- return null;- }-+}: GenerateJunctionRelationGqlFieldsArgs): RecordGqlFields => {const { junctionObjectMetadata, targetFields } = junctionConfig;const junctionTargetFields = targetFields.reduce<RecordGqlFields>(diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsxindex c9c83eb8f2d..8f9ccfec20e 100644--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx@@ -15,6 +15,7 @@ import { type FieldDefinition } from '@/object-record/record-field/ui/types/Fielimport { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';import { getJunctionRelationPickerData } from '@/object-record/record-field/ui/utils/junction/getJunctionRelationPickerData';import { getSourceJoinColumnName } from '@/object-record/record-field/ui/utils/junction/getSourceJoinColumnName';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';import { useMultipleRecordPickerOpen } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen';import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';@@ -80,7 +81,9 @@ export const RecordDetailRelationSectionDropdownToMany = ({recordId,});- const isJunctionRelation = isDefined(junctionConfig);+ const isJunctionRelation = isUsableJunctionConfig(junctionConfig);+ const isInvalidJunctionRelation =+ isDefined(junctionConfig) && !isJunctionRelation;const firstJunctionTargetField =junctionConfig && !junctionConfig.isMorphRelation@@ -336,6 +339,10 @@ export const RecordDetailRelationSectionDropdownToMany = ({[isJunctionRelation, updateJunctionRelationFromCell, updateRelation],);+ if (isInvalidJunctionRelation) {+ return null;+ }+return (<DropdowndropdownId={dropdownId}diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/utils/__tests__/categorizeRelationFields.test.ts b/packages/twenty-front/src/modules/object-record/record-field-list/utils/__tests__/categorizeRelationFields.test.tsindex 9a263fc2714..2992ffc68af 100644--- a/packages/twenty-front/src/modules/object-record/record-field-list/utils/__tests__/categorizeRelationFields.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-field-list/utils/__tests__/categorizeRelationFields.test.ts@@ -23,4 +23,36 @@ describe('categorizeRelationFields', () => {boxedRelationFields: [],});});++ it('does not expose an invalid configured junction as a regular relation', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });++ if (!taskTargetsField.relation) {+ throw new Error('Task targets relation not found');+ }++ const invalidTaskTargetsField = {+ ...taskTargetsField,+ settings: {+ ...taskTargetsField.settings,+ junctionTargetFieldId: taskTargetsField.relation.targetFieldMetadata.id,+ },+ };++ expect(+ categorizeRelationFields({+ relationFields: [invalidTaskTargetsField],+ objectMetadataItems: getTestEnrichedObjectMetadataItemsMock(),+ objectPermissionsByObjectMetadataId: {},+ }),+ ).toEqual({+ inlineRelationFields: [],+ junctionRelationFields: [],+ boxedRelationFields: [],+ });+ });});diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/utils/categorizeRelationFields.ts b/packages/twenty-front/src/modules/object-record/record-field-list/utils/categorizeRelationFields.tsindex 3dccb788f92..dfc702f4484 100644--- a/packages/twenty-front/src/modules/object-record/record-field-list/utils/categorizeRelationFields.ts+++ b/packages/twenty-front/src/modules/object-record/record-field-list/utils/categorizeRelationFields.ts@@ -2,6 +2,7 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIteimport { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { type ObjectPermissions } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -64,8 +65,11 @@ export const categorizeRelationFields = ({});if (isDefined(junctionConfig)) {- inlineRelationFields.push(field);- junctionRelationFields.push(field);+ if (isUsableJunctionConfig(junctionConfig)) {+ inlineRelationFields.push(field);+ junctionRelationFields.push(field);+ }+continue;}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useOpenFieldInputEditMode.test.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useOpenFieldInputEditMode.test.tsxnew file mode 100644index 00000000000..e3ce9c144d0--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useOpenFieldInputEditMode.test.tsx@@ -0,0 +1,167 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';+import { useOpenFieldInputEditMode } from '@/object-record/record-field/ui/hooks/useOpenFieldInputEditMode';+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';+import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';+import { useOpenFieldWidgetFieldInputEditMode } from '@/page-layout/widgets/field/hooks/useOpenFieldWidgetFieldInputEditMode';+import { act, renderHook } from '@testing-library/react';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';++const mockOpenJunctionRelationFieldInput = jest.fn();+const mockOpenRelationFromManyFieldInput = jest.fn();+const mockOpenRelationToOneFieldInput = jest.fn();+const mockOpenMorphRelationOneToManyFieldInput = jest.fn();+const mockOpenMorphRelationManyToOneFieldInput = jest.fn();+const mockPushFocusItemToFocusStack = jest.fn();+const mockRemoveFocusItemFromFocusStackById = jest.fn();++const mockObjectMetadataItems = getTestEnrichedObjectMetadataItemsMock();+const mockTaskMetadata = getMockObjectMetadataItemOrThrow('task');+const mockTaskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: mockTaskMetadata,+ fieldName: 'taskTargets',+});++if (!mockTaskTargetsField.relation) {+ throw new Error('Task targets relation not found');+}++const mockInvalidTaskTargetsField = {+ ...mockTaskTargetsField,+ settings: {+ ...mockTaskTargetsField.settings,+ junctionTargetFieldId: mockTaskTargetsField.relation.targetFieldMetadata.id,+ },+} as FieldMetadataItem;+const mockInvalidFieldDefinition = formatFieldMetadataItemAsFieldDefinition({+ field: mockInvalidTaskTargetsField,+ objectMetadataItem: mockTaskMetadata,+}) as FieldDefinition<FieldRelationMetadata>;++jest.mock('jotai', () => ({+ useStore: () => ({+ get: () => mockObjectMetadataItems,+ }),+}));++jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({+ useObjectMetadataItems: () => ({+ objectMetadataItems: mockObjectMetadataItems,+ }),+}));++jest.mock('@/object-metadata/states/objectMetadataItemsSelector', () => ({+ objectMetadataItemsSelector: { atom: 'object-metadata-items-atom' },+}));++jest.mock('@/object-record/hooks/useUpdateOneRecord', () => ({+ useUpdateOneRecord: () => ({ updateOneRecord: jest.fn() }),+}));++jest.mock(+ '@/object-record/record-field/ui/hooks/useOpenJunctionRelationFieldInput',+ () => ({+ useOpenJunctionRelationFieldInput: () => ({+ openJunctionRelationFieldInput: mockOpenJunctionRelationFieldInput,+ }),+ }),+);++jest.mock(+ '@/object-record/record-field/ui/meta-types/input/hooks/useOpenFilesFieldInput',+ () => ({+ useOpenFilesFieldInput: () => ({ openFilesFieldInput: jest.fn() }),+ }),+);++jest.mock(+ '@/object-record/record-field/ui/meta-types/input/hooks/useOpenRelationFromManyFieldInput',+ () => ({+ useOpenRelationFromManyFieldInput: () => ({+ openRelationFromManyFieldInput: mockOpenRelationFromManyFieldInput,+ }),+ }),+);++jest.mock(+ '@/object-record/record-field/ui/meta-types/input/hooks/useOpenRelationToOneFieldInput',+ () => ({+ useOpenRelationToOneFieldInput: () => ({+ openRelationToOneFieldInput: mockOpenRelationToOneFieldInput,+ }),+ }),+);++jest.mock(+ '@/object-record/record-field/ui/meta-types/input/hooks/useOpenMorphRelationOneToManyFieldInput',+ () => ({+ useOpenMorphRelationOneToManyFieldInput: () => ({+ openMorphRelationOneToManyFieldInput:+ mockOpenMorphRelationOneToManyFieldInput,+ }),+ }),+);++jest.mock(+ '@/object-record/record-field/ui/meta-types/input/hooks/useOpenMorphRelationManyToOneFieldInput',+ () => ({+ useOpenMorphRelationManyToOneFieldInput: () => ({+ openMorphRelationManyToOneFieldInput:+ mockOpenMorphRelationManyToOneFieldInput,+ }),+ }),+);++jest.mock('@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack', () => ({+ usePushFocusItemToFocusStack: () => ({+ pushFocusItemToFocusStack: mockPushFocusItemToFocusStack,+ }),+}));++jest.mock(+ '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById',+ () => ({+ useRemoveFocusItemFromFocusStackById: () => ({+ removeFocusItemFromFocusStackById: mockRemoveFocusItemFromFocusStackById,+ }),+ }),+);++jest.mock(+ '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow',+ () => ({+ useAvailableComponentInstanceIdOrThrow: () => 'field-widget-instance-id',+ }),+);++describe('invalid configured junction edit mode', () => {+ beforeEach(() => {+ jest.clearAllMocks();+ });++ it.each([+ {+ name: 'table field',+ useOpenEditMode: useOpenFieldInputEditMode,+ },+ {+ name: 'field widget',+ useOpenEditMode: useOpenFieldWidgetFieldInputEditMode,+ },+ ])('does not open an editor from a $name', ({ useOpenEditMode }) => {+ const { result } = renderHook(() => useOpenEditMode());++ act(() => {+ result.current.openFieldInput({+ fieldDefinition: mockInvalidFieldDefinition,+ recordId: 'task-record-id',+ });+ });++ expect(mockOpenJunctionRelationFieldInput).not.toHaveBeenCalled();+ expect(mockOpenRelationFromManyFieldInput).not.toHaveBeenCalled();+ expect(mockPushFocusItemToFocusStack).not.toHaveBeenCalled();+ });+});diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenFieldInputEditMode.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenFieldInputEditMode.tsindex b0a13d30eab..01581f34c93 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenFieldInputEditMode.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenFieldInputEditMode.ts@@ -15,6 +15,7 @@ import { isFieldMorphRelationOneToMany } from '@/object-record/record-field/ui/timport { isFieldRelationManyToOne } from '@/object-record/record-field/ui/types/guards/isFieldRelationManyToOne';import { isFieldRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldRelationOneToMany';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';@@ -62,10 +63,8 @@ export const useOpenFieldInputEditMode = () => {({ nameSingular }) =>nameSingular === fieldDefinition.metadata.objectMetadataNameSingular,)?.id;- const fieldHasJunctionConfig =- isFieldRelationOneToMany(fieldDefinition) &&- isDefined(- getJunctionConfig({+ const junctionConfig = isFieldRelationOneToMany(fieldDefinition)+ ? getJunctionConfig({settings: fieldDefinition.metadata.settings,relationObjectMetadataId:fieldDefinition.metadata.relationObjectMetadataId,@@ -73,8 +72,8 @@ export const useOpenFieldInputEditMode = () => {fieldDefinition.metadata.relationFieldMetadataId,sourceObjectMetadataId,objectMetadataItems,- }),- );+ })+ : null;if (isFieldFiles(fieldDefinition)) {const objectMetadataItem = objectMetadataItems.find(@@ -107,12 +106,18 @@ export const useOpenFieldInputEditMode = () => {}}- if (isFieldRelationOneToMany(fieldDefinition) && fieldHasJunctionConfig) {- openJunctionRelationFieldInput({- fieldDefinition,- recordId,- prefix,- });+ if (+ isFieldRelationOneToMany(fieldDefinition) &&+ isDefined(junctionConfig)+ ) {+ if (isUsableJunctionConfig(junctionConfig)) {+ openJunctionRelationFieldInput({+ fieldDefinition,+ recordId,+ prefix,+ });+ }+return;}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationFieldInput.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationFieldInput.tsindex 678366179c9..6f3e367b319 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationFieldInput.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationFieldInput.ts@@ -7,6 +7,7 @@ import {} from '@/object-record/record-field/ui/types/FieldMetadata';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';import { getJunctionRelationPickerData } from '@/object-record/record-field/ui/utils/junction/getJunctionRelationPickerData';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { useMultipleRecordPickerOpen } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen';import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState';@@ -18,7 +19,6 @@ import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushimport { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';import { useStore } from 'jotai';import { useCallback } from 'react';-import { isDefined } from 'twenty-shared/utils';export const useOpenJunctionRelationFieldInput = () => {const { performSearch } = useMultipleRecordPickerPerformSearch();@@ -56,16 +56,12 @@ export const useOpenJunctionRelationFieldInput = () => {objectMetadataItems,});- if (!isDefined(junctionConfig)) {+ if (!isUsableJunctionConfig(junctionConfig)) {return;}const { targetFields } = junctionConfig;- if (targetFields.length === 0) {- return;- }-const resolvedRecordPickerInstanceId =recordPickerInstanceId ??getRecordFieldInputInstanceId({diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useUpdateJunctionRelationFromCell.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useUpdateJunctionRelationFromCell.tsindex 0e52b8bae8f..deeae87ca44 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useUpdateJunctionRelationFromCell.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useUpdateJunctionRelationFromCell.ts@@ -19,6 +19,7 @@ import { findJunctionRecordByTargetId } from '@/object-record/record-field/ui/utimport { findTargetFieldInfo } from '@/object-record/record-field/ui/utils/junction/findTargetFieldInfo';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';import { getSourceJoinColumnName } from '@/object-record/record-field/ui/utils/junction/getSourceJoinColumnName';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { searchRecordStoreFamilyState } from '@/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState';import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';@@ -73,6 +74,7 @@ export const useUpdateJunctionRelationFromCell = ({const targetFields = junctionConfig?.targetFields;if (+ !isUsableJunctionConfig(junctionConfig) ||!isDefined(junctionObjectMetadata) ||!isDefined(sourceFieldOnJunction) ||!isDefined(targetFields) ||@@ -305,15 +307,8 @@ export const useUpdateJunctionRelationFromCell = ({],);- const validJunctionConfig =- isDefined(junctionConfig) &&- isDefined(sourceFieldOnJunction) &&- junctionConfig.targetFields.length > 0- ? junctionConfig- : null;-return {updateJunctionRelationFromCell,- junctionConfig: validJunctionConfig,+ junctionConfig,};};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/RelationFromManyFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/RelationFromManyFieldDisplay.tsxindex 9246c0b96c2..e5ed8bfcae9 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/RelationFromManyFieldDisplay.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/RelationFromManyFieldDisplay.tsx@@ -9,6 +9,7 @@ import { useRelationFromManyFieldDisplay } from '@/object-record/record-field/uiimport { extractTargetRecordsFromJunction } from '@/object-record/record-field/ui/utils/junction/extractTargetRecordsFromJunction';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';import { getReverseJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getReverseJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';import { styled } from '@linaria/react';@@ -70,6 +71,10 @@ export const RelationFromManyFieldDisplay = () => {}if (isDefined(junctionConfig)) {+ if (!isUsableJunctionConfig(junctionConfig)) {+ return null;+ }+const { targetFields } = junctionConfig;if (targetFields.length === 0) {diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsxindex 618107c219a..42b62d98876 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsx@@ -16,6 +16,7 @@ import { recordFieldInputLayoutDirectionComponentState } from '@/object-record/rimport { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';import { getSourceJoinColumnName } from '@/object-record/record-field/ui/utils/junction/getSourceJoinColumnName';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState';@@ -64,7 +65,9 @@ export const RelationOneToManyFieldInput = () => {recordId,});- const isJunctionRelation = isDefined(junctionConfig);+ const isJunctionRelation = isUsableJunctionConfig(junctionConfig);+ const isInvalidJunctionRelation =+ isDefined(junctionConfig) && !isJunctionRelation;const junctionTargetObjectMetadata = (() => {if (!junctionConfig || junctionConfig.isMorphRelation) {@@ -243,6 +246,10 @@ export const RelationOneToManyFieldInput = () => {? junctionTargetObjectMetadata.id: relationObjectMetadataItem.id;+ if (isInvalidJunctionRelation) {+ return null;+ }+return (<MultipleRecordPickerfocusId={instanceId}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/getJunctionConfig.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/getJunctionConfig.test.tsindex 88d3a86fa6c..a9205298aa1 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/getJunctionConfig.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/getJunctionConfig.test.ts@@ -9,9 +9,13 @@ const createMockRelation = (targetObjectId: string,targetObjectName: string,type: RelationType = RelationType.MANY_TO_ONE,+ sourceFieldMetadataId = 'source-field-id',): FieldMetadataItemRelation => ({type,- sourceFieldMetadata: { id: 'source-field-id', name: 'sourceField' },+ sourceFieldMetadata: {+ id: sourceFieldMetadataId,+ name: 'sourceField',+ },targetFieldMetadata: {id: 'target-field-id',name: 'targetField',@@ -95,6 +99,14 @@ describe('getJunctionConfig', () => {const morphTargetField = createMockField({id: 'morph-target-field-id',type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [+ createMockRelation(+ 'target-object-id',+ 'targetObject',+ RelationType.MANY_TO_ONE,+ 'morph-target-field-id',+ ),+ ],});const labelIdentifierField = createMockField({id: 'label-identifier-field-id',@@ -178,15 +190,23 @@ describe('getJunctionConfig', () => {});expect(result).not.toBeNull();+ expect(result!.isValid).toBe(true);expect(result!.isMorphRelation).toBe(false);expect(result!.targetFields).toHaveLength(1);expect(result!.targetFields[0].name).toBe('company');});- it('should return null when target field not found', () => {+ it('should return an invalid junction when configured target field is not found', () => {+ const inferredMorphTarget = createMockField({+ id: 'legacy-inferred-morph-target-id',+ type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [+ createMockRelation('target-object-id', 'targetObject'),+ ],+ });const junctionObject = createMockObjectMetadata({id: 'junction-id',- fields: [],+ fields: [inferredMorphTarget],});const result = getJunctionConfig({@@ -195,10 +215,10 @@ describe('getJunctionConfig', () => {objectMetadataItems: [junctionObject],});- expect(result).toBeNull();+ expect(result).toMatchObject({ isValid: false, targetFields: [] });});- it('should return null for regular relation without relation property', () => {+ it('should return an invalid junction for a configured relation without relation metadata', () => {const targetField = createMockField({id: 'target-field-id',name: 'company',@@ -216,7 +236,7 @@ describe('getJunctionConfig', () => {objectMetadataItems: [junctionObject],});- expect(result).toBeNull();+ expect(result).toMatchObject({ isValid: false, targetFields: [] });});it('should handle MORPH_RELATION field referenced by ID', () => {@@ -224,6 +244,9 @@ describe('getJunctionConfig', () => {id: 'morph-field-id',name: 'linkedObject',type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [+ createMockRelation('target-object-id', 'targetObject'),+ ],});const junctionObject = createMockObjectMetadata({id: 'junction-id',@@ -237,11 +260,58 @@ describe('getJunctionConfig', () => {});expect(result).not.toBeNull();+ expect(result!.isValid).toBe(true);expect(result!.isMorphRelation).toBe(true);expect(result!.targetFields).toHaveLength(1);expect(result!.targetFields[0].name).toBe('linkedObject');});+ it('returns an invalid junction instead of falling back for a one-to-many morph target', () => {+ const morphField = createMockField({+ id: 'morph-field-id',+ type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [+ createMockRelation(+ 'target-object-id',+ 'targetObject',+ RelationType.ONE_TO_MANY,+ ),+ ],+ });+ const junctionObject = createMockObjectMetadata({+ id: 'junction-id',+ fields: [morphField],+ });++ expect(+ getJunctionConfig({+ settings: { junctionTargetFieldId: 'morph-field-id' },+ relationObjectMetadataId: 'junction-id',+ objectMetadataItems: [junctionObject],+ }),+ ).toMatchObject({ isValid: false, targetFields: [] });+ });++ it('returns an invalid junction instead of falling back when source and target are the same field', () => {+ const sourceField = createMockField({+ id: 'source-field-id',+ relation: createMockRelation('source-object-id', 'sourceObject'),+ });+ const junctionObject = createMockObjectMetadata({+ id: 'junction-id',+ fields: [sourceField],+ });++ expect(+ getJunctionConfig({+ settings: { junctionTargetFieldId: 'source-field-id' },+ relationObjectMetadataId: 'junction-id',+ relationTargetFieldMetadataId: 'source-field-id',+ objectMetadataItems: [junctionObject],+ }),+ ).toMatchObject({ isValid: false, targetFields: [] });+ });+it('should find sourceField excluding the target field', () => {const sourceField = createMockField({id: 'source-field',@@ -284,6 +354,7 @@ describe('getJunctionConfig', () => {name: 'company',morphId: 'morph-group-1',type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [createMockRelation('company-metadata-id', 'company')],});const junctionObject = createMockObjectMetadata({id: 'junction-id',diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionObjectMetadataIds.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionObjectMetadataIds.test.tsnew file mode 100644index 00000000000..00b351dd93e--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionObjectMetadataIds.test.ts@@ -0,0 +1,48 @@+import { getJunctionObjectMetadataIds } from '@/object-record/record-field/ui/utils/junction/getJunctionObjectMetadataIds';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';++describe('getJunctionObjectMetadataIds', () => {+ const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();+ const taskObjectMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetObjectMetadata =+ getMockObjectMetadataItemOrThrow('taskTarget');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskObjectMetadata,+ fieldName: 'taskTargets',+ });++ it('includes objects reached through a valid junction configuration', () => {+ expect(getJunctionObjectMetadataIds(objectMetadataItems)).toContain(+ taskTargetObjectMetadata.id,+ );+ });++ it('does not make an invalid configured target eligible for junction cascade deletion', () => {+ const objectMetadataItemsWithInvalidTaskJunction = objectMetadataItems.map(+ (objectMetadataItem) =>+ objectMetadataItem.id === taskObjectMetadata.id+ ? {+ ...objectMetadataItem,+ fields: objectMetadataItem.fields.map((field) =>+ field.id === taskTargetsField.id+ ? {+ ...field,+ settings: {+ ...field.settings,+ junctionTargetFieldId:+ field.relation?.targetFieldMetadata.id,+ },+ }+ : field,+ ),+ }+ : objectMetadataItem,+ );++ expect(+ getJunctionObjectMetadataIds(objectMetadataItemsWithInvalidTaskJunction),+ ).not.toContain(taskTargetObjectMetadata.id);+ });+});diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/isValidJunctionTargetField.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/isValidJunctionTargetField.test.tsnew file mode 100644index 00000000000..9a5352b4600--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/isValidJunctionTargetField.test.ts@@ -0,0 +1,121 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { type FieldMetadataItemRelation } from '@/object-metadata/types/FieldMetadataItemRelation';+import { isValidJunctionTargetField } from '@/object-record/record-field/ui/utils/junction/isValidJunctionTargetField';+import { FieldMetadataType } from 'twenty-shared/types';+import { RelationType } from '~/generated-metadata/graphql';++const createRelation = ({+ sourceFieldMetadataId,+ type = RelationType.MANY_TO_ONE,+}: {+ sourceFieldMetadataId: string;+ type?: RelationType;+}): FieldMetadataItemRelation => ({+ type,+ sourceFieldMetadata: {+ id: sourceFieldMetadataId,+ name: sourceFieldMetadataId,+ },+ targetFieldMetadata: { id: 'target-field-id', name: 'targetField' },+ sourceObjectMetadata: {+ id: 'junction-object-id',+ nameSingular: 'junctionObject',+ namePlural: 'junctionObjects',+ },+ targetObjectMetadata: {+ id: 'target-object-id',+ nameSingular: 'targetObject',+ namePlural: 'targetObjects',+ },+});++const createField = (+ overrides: Partial<FieldMetadataItem>,+): FieldMetadataItem =>+ ({+ id: 'field-id',+ name: 'field',+ type: FieldMetadataType.RELATION,+ ...overrides,+ }) as FieldMetadataItem;++describe('isValidJunctionTargetField', () => {+ it('accepts a many-to-one relation', () => {+ const field = createField({+ relation: createRelation({ sourceFieldMetadataId: 'field-id' }),+ });++ expect(isValidJunctionTargetField({ fieldMetadataItem: field })).toBe(true);+ });++ it('rejects a one-to-many relation', () => {+ const field = createField({+ relation: createRelation({+ sourceFieldMetadataId: 'field-id',+ type: RelationType.ONE_TO_MANY,+ }),+ });++ expect(isValidJunctionTargetField({ fieldMetadataItem: field })).toBe(+ false,+ );+ });++ it('accepts a morph relation when every target is many-to-one', () => {+ const field = createField({+ type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [+ createRelation({ sourceFieldMetadataId: 'morph-field-a' }),+ createRelation({ sourceFieldMetadataId: 'morph-field-b' }),+ ],+ });++ expect(isValidJunctionTargetField({ fieldMetadataItem: field })).toBe(true);+ });++ it('rejects a one-to-many morph relation', () => {+ const field = createField({+ type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [+ createRelation({+ sourceFieldMetadataId: 'morph-field-a',+ type: RelationType.ONE_TO_MANY,+ }),+ ],+ });++ expect(isValidJunctionTargetField({ fieldMetadataItem: field })).toBe(+ false,+ );+ });++ it('rejects the source field itself', () => {+ const field = createField({+ relation: createRelation({ sourceFieldMetadataId: 'field-id' }),+ });++ expect(+ isValidJunctionTargetField({+ fieldMetadataItem: field,+ sourceFieldMetadataId: 'field-id',+ }),+ ).toBe(false);+ });++ it('rejects a morph group containing the source field', () => {+ const field = createField({+ type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [+ createRelation({ sourceFieldMetadataId: 'morph-field-a' }),+ createRelation({ sourceFieldMetadataId: 'source-field-id' }),+ ],+ });++ expect(+ isValidJunctionTargetField({+ fieldMetadataItem: field,+ sourceFieldMetadataId: 'source-field-id',+ }),+ ).toBe(false);+ });+});diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getFieldRelations.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getFieldRelations.tsnew file mode 100644index 00000000000..851f98a13da--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getFieldRelations.ts@@ -0,0 +1,11 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { isDefined } from 'twenty-shared/utils';++export const getFieldRelations = (+ fieldMetadataItem: Pick<FieldMetadataItem, 'relation' | 'morphRelations'>,+) => [+ ...(isDefined(fieldMetadataItem.relation)+ ? [fieldMetadataItem.relation]+ : []),+ ...(fieldMetadataItem.morphRelations ?? []),+];diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionConfig.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionConfig.tsindex c2a2639d06f..0c84c730d69 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionConfig.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionConfig.ts@@ -1,25 +1,10 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { type JunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/JunctionConfig';+import { type JunctionObjectMetadataItem } from '@/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem';import { FieldMetadataType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { hasJunctionTargetFieldId } from './hasJunctionTargetFieldId';--export type JunctionObjectMetadataItem = Pick<- EnrichedObjectMetadataItem,- | 'id'- | 'fields'- | 'labelIdentifierFieldMetadataId'- | 'imageIdentifierFieldMetadataId'- | 'nameSingular'- | 'namePlural'->;--export type JunctionConfig = {- junctionObjectMetadata: JunctionObjectMetadataItem;- targetFields: FieldMetadataItem[];- sourceField?: FieldMetadataItem;- isMorphRelation: boolean;-};+import { isValidJunctionTargetField } from './isValidJunctionTargetField';type GetJunctionConfigArgs = {settings: FieldMetadataItem['settings'] | undefined;@@ -73,7 +58,8 @@ export const getJunctionConfig = ({);};- const configuredTargetField = hasJunctionTargetFieldId(settings)+ const hasConfiguredTargetField = hasJunctionTargetFieldId(settings);+ const configuredTargetField = hasConfiguredTargetField? junctionObjectMetadata.fields.find((field) => field.id === settings.junctionTargetFieldId,)@@ -85,10 +71,16 @@ export const getJunctionConfig = ({: undefined;const sourceField =relationSourceField ?? findSourceField(configuredTargetField?.id);+ const invalidConfiguredJunction: JunctionConfig = {+ junctionObjectMetadata,+ targetFields: [],+ isMorphRelation: false,+ isValid: false,+ };// Legacy workspaces can lack the target marker. Only infer a pure junction:// an unlabeled intermediate record with exactly one morph target.- const inferredMorphTargetFields = isDefined(configuredTargetField)+ const inferredMorphTargetFields = hasConfiguredTargetField? []: junctionObjectMetadata.fields.filter((field) => field.type === FieldMetadataType.MORPH_RELATION,@@ -106,19 +98,25 @@ export const getJunctionConfig = ({: undefined);if (!isDefined(targetField)) {- return null;+ return hasConfiguredTargetField ? invalidConfiguredJunction : null;}- const isMorphRelation = targetField.type === FieldMetadataType.MORPH_RELATION;-- if (!isMorphRelation && !isDefined(targetField.relation)) {- return null;+ if (+ !isValidJunctionTargetField({+ fieldMetadataItem: targetField,+ sourceFieldMetadataId: relationTargetFieldMetadataId,+ })+ ) {+ return hasConfiguredTargetField ? invalidConfiguredJunction : null;}+ const isMorphRelation = targetField.type === FieldMetadataType.MORPH_RELATION;+return {junctionObjectMetadata,targetFields: [targetField],sourceField,isMorphRelation,+ isValid: true,};};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionObjectMetadataIds.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionObjectMetadataIds.tsindex 6beb7cc4f63..ca2eaadd2bc 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionObjectMetadataIds.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionObjectMetadataIds.ts@@ -1,7 +1,6 @@-import {- getJunctionConfig,- type JunctionObjectMetadataItem,-} from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';+import { type JunctionObjectMetadataItem } from '@/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem';import { isDefined } from 'twenty-shared/utils';// A junction object carries no marker of its own, so the relation graph is walked to@@ -12,19 +11,19 @@ export const getJunctionObjectMetadataIds = (new Set(objectMetadataItems.flatMap((objectMetadataItem) =>objectMetadataItem.fields- .filter((field) =>- isDefined(- getJunctionConfig({- settings: field.settings,- relationObjectMetadataId:- field.relation?.targetObjectMetadata.id ?? '',- relationTargetFieldMetadataId:- field.relation?.targetFieldMetadata.id,- sourceObjectMetadataId: objectMetadataItem.id,- objectMetadataItems,- }),- ),- )+ .filter((field) => {+ const junctionConfig = getJunctionConfig({+ settings: field.settings,+ relationObjectMetadataId:+ field.relation?.targetObjectMetadata.id ?? '',+ relationTargetFieldMetadataId:+ field.relation?.targetFieldMetadata.id,+ sourceObjectMetadataId: objectMetadataItem.id,+ objectMetadataItems,+ });++ return isUsableJunctionConfig(junctionConfig);+ }).map((junctionField) => junctionField.relation?.targetObjectMetadata.id).filter(isDefined),),diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getObjectMorphJunctionConfig.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getObjectMorphJunctionConfig.tsindex 2c583a960f8..2f39fa6d243 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getObjectMorphJunctionConfig.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getObjectMorphJunctionConfig.ts@@ -1,11 +1,10 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import {- getJunctionConfig,- type JunctionConfig,-} from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';import { getSourceJoinColumnName } from '@/object-record/record-field/ui/utils/junction/getSourceJoinColumnName';import { isConfiguredJunctionRelationField } from '@/object-record/record-field/ui/utils/junction/isConfiguredJunctionRelationField';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';+import { type JunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/JunctionConfig';import { isDefined } from 'twenty-shared/utils';type ObjectMorphJunctionConfig = JunctionConfig & {@@ -39,7 +38,8 @@ export const getObjectMorphJunctionConfig = ({});if (- !junctionConfig?.isMorphRelation ||+ !isUsableJunctionConfig(junctionConfig) ||+ !junctionConfig.isMorphRelation ||!isDefined(junctionConfig.sourceField)) {continue;diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getReverseJunctionConfig.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getReverseJunctionConfig.tsindex 1e0a92064fe..5f2b7500799 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getReverseJunctionConfig.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getReverseJunctionConfig.ts@@ -1,8 +1,7 @@-import {- getJunctionConfig,- type JunctionObjectMetadataItem,-} from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';import { getTargetObjectMetadataIdsFromField } from '@/object-record/record-field/ui/utils/junction/getTargetObjectMetadataIdsFromField';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';+import { type JunctionObjectMetadataItem } from '@/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem';import { isDefined } from 'twenty-shared/utils';type ReverseJunctionConfig = {@@ -49,7 +48,10 @@ export const getReverseJunctionConfig = ({objectMetadataItems,});- if (!isDefined(junctionConfig?.sourceField)) {+ if (+ !isUsableJunctionConfig(junctionConfig) ||+ !isDefined(junctionConfig.sourceField)+ ) {continue;}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/isJunctionRelationForbidden.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/isJunctionRelationForbidden.tsindex 1685678db3a..20e97bfeef8 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/isJunctionRelationForbidden.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/isJunctionRelationForbidden.ts@@ -2,11 +2,11 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIteimport { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';import { getTargetObjectMetadataIdsFromField } from '@/object-record/record-field/ui/utils/junction/getTargetObjectMetadataIdsFromField';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';+import { type JunctionObjectMetadataItem } from '@/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem';import { type ObjectPermissions } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { type JunctionObjectMetadataItem } from './getJunctionConfig';-type ObjectPermissionsByObjectMetadataId = Record<string,ObjectPermissions & { objectMetadataId: string }@@ -45,6 +45,10 @@ export const isJunctionRelationForbidden = ({return false;}+ if (!isUsableJunctionConfig(junctionConfig)) {+ return true;+ }+const junctionPermissions = getObjectPermissionsForObject(objectPermissionsByObjectMetadataId,junctionObjectMetadataId,diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/isUsableJunctionConfig.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/isUsableJunctionConfig.tsnew file mode 100644index 00000000000..b3e38be44e6--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/isUsableJunctionConfig.ts@@ -0,0 +1,4 @@+export const isUsableJunctionConfig = <Config extends { isValid: boolean }>(+ junctionConfig: Config | null | undefined,+): junctionConfig is Config & { isValid: true } =>+ junctionConfig?.isValid === true;diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/isValidJunctionTargetField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/isValidJunctionTargetField.tsnew file mode 100644index 00000000000..0bc489e1ec2--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/isValidJunctionTargetField.ts@@ -0,0 +1,26 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { getFieldRelations } from '@/object-record/record-field/ui/utils/junction/getFieldRelations';+import { RelationType } from '~/generated-metadata/graphql';++export const isValidJunctionTargetField = ({+ fieldMetadataItem,+ sourceFieldMetadataId,+}: {+ fieldMetadataItem: FieldMetadataItem;+ sourceFieldMetadataId?: string;+}): boolean => {+ // The server validates universal flat metadata in+ // validateJunctionTargetSettings. Keep relation direction and source-group+ // exclusion aligned there when this resolved GraphQL representation changes.+ const relations = getFieldRelations(fieldMetadataItem);++ return (+ relations.length > 0 &&+ relations.every(({ type }) => type === RelationType.MANY_TO_ONE) &&+ fieldMetadataItem.id !== sourceFieldMetadataId &&+ relations.every(+ ({ sourceFieldMetadata }) =>+ sourceFieldMetadata.id !== sourceFieldMetadataId,+ )+ );+};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/JunctionConfig.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/JunctionConfig.tsnew file mode 100644index 00000000000..801de0b04f1--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/JunctionConfig.ts@@ -0,0 +1,13 @@+import { type ValidJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig';++type InvalidJunctionConfig = Pick<+ ValidJunctionConfig,+ 'junctionObjectMetadata'+> & {+ targetFields: [];+ sourceField?: never;+ isMorphRelation: false;+ isValid: false;+};++export type JunctionConfig = ValidJunctionConfig | InvalidJunctionConfig;diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem.tsnew file mode 100644index 00000000000..665ede385a4--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem.ts@@ -0,0 +1,11 @@+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';++export type JunctionObjectMetadataItem = Pick<+ EnrichedObjectMetadataItem,+ | 'id'+ | 'fields'+ | 'labelIdentifierFieldMetadataId'+ | 'imageIdentifierFieldMetadataId'+ | 'nameSingular'+ | 'namePlural'+>;diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig.tsnew file mode 100644index 00000000000..5cda424d6eb--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig.ts@@ -0,0 +1,10 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { type JunctionObjectMetadataItem } from '@/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem';++export type ValidJunctionConfig = {+ junctionObjectMetadata: JunctionObjectMetadataItem;+ targetFields: FieldMetadataItem[];+ sourceField?: FieldMetadataItem;+ isMorphRelation: boolean;+ isValid: true;+};diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextGeneric.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextGeneric.tsxindex 1a51efebcac..2a9999a27dc 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextGeneric.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextGeneric.tsx@@ -8,6 +8,7 @@ import { isFieldRelationManyToOne } from '@/object-record/record-field/ui/types/import { isFieldRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldRelationOneToMany';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';import { getTargetObjectMetadataIdsFromField } from '@/object-record/record-field/ui/utils/junction/getTargetObjectMetadataIdsFromField';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';import { useRecordTableRowContextOrThrow } from '@/object-record/record-table/contexts/RecordTableRowContext';@@ -47,6 +48,7 @@ export const RecordTableCellFieldContextGeneric = ({useGetIsMetadataItemFromStandardApplication();let hasObjectReadPermissions = objectPermissions.canReadObjectRecords;+ let isInvalidJunctionRelation = false;// todo @guillim : adjust this to handle morph relations permissions displayif (@@ -74,6 +76,12 @@ export const RecordTableCellFieldContextGeneric = ({});if (isDefined(junctionConfig)) {+ isInvalidJunctionRelation = !isUsableJunctionConfig(junctionConfig);++ if (isInvalidJunctionRelation) {+ hasObjectReadPermissions = false;+ }+const targetObjectMetadataIds = junctionConfig.targetFields.flatMap(getTargetObjectMetadataIdsFromField,);@@ -108,6 +116,7 @@ export const RecordTableCellFieldContextGeneric = ({displayedMaxRows: 1,isRecordFieldReadOnly:isRecordTableCellsNonEditable ||+ isInvalidJunctionRelation ||isRecordFieldReadOnly({isRecordReadOnly: isRecordReadOnly ?? false,isSystemObject: objectMetadataItem.isSystem,diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/isFieldCellSupported.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/isFieldCellSupported.test.tsnew file mode 100644index 00000000000..801e601206b--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/isFieldCellSupported.test.ts@@ -0,0 +1,37 @@+import { isFieldCellSupported } from '@/object-record/utils/isFieldCellSupported';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';++describe('isFieldCellSupported', () => {+ const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });++ it('supports a valid configured junction field', () => {+ expect(isFieldCellSupported(taskTargetsField, objectMetadataItems)).toBe(+ true,+ );+ });++ it('does not advertise an invalid configured junction as editable', () => {+ if (!taskTargetsField.relation) {+ throw new Error('Task targets relation not found');+ }++ const invalidTaskTargetsField = {+ ...taskTargetsField,+ settings: {+ ...taskTargetsField.settings,+ junctionTargetFieldId: taskTargetsField.relation.targetFieldMetadata.id,+ },+ };++ expect(+ isFieldCellSupported(invalidTaskTargetsField, objectMetadataItems),+ ).toBe(false);+ });+});diff --git a/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts b/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.tsindex a9efa4b8bc3..3d53d25c4bf 100644--- a/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts+++ b/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts@@ -3,6 +3,7 @@ import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/Enricheimport { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField';import { isObjectMetadataAvailableForRelation } from '@/object-metadata/utils/isObjectMetadataAvailableForRelation';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { isDefined } from 'twenty-shared/utils';import { FieldMetadataType } from '~/generated-metadata/graphql';@@ -40,7 +41,7 @@ export const isFieldCellSupported = (});if (isDefined(junctionConfig)) {- return true;+ return isUsableJunctionConfig(junctionConfig);}if (!fieldMetadataItem.relation || !relationObjectMetadataItem) {diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsxindex efc9328b949..371c9c9445c 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx@@ -7,6 +7,7 @@ import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isimport { isFieldRichText } from '@/object-record/record-field/ui/types/guards/isFieldRichText';import { isFieldText } from '@/object-record/record-field/ui/types/guards/isFieldText';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';import { useResolveFieldMetadataIdFromNameOrId } from '@/page-layout/hooks/useResolveFieldMetadataIdFromNameOrId';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';@@ -125,19 +126,21 @@ export const FieldWidget = ({ widget }: FieldWidgetProps) => {}if (isFieldRelation(fieldDefinition)) {- const isJunctionRelation = isDefined(- getJunctionConfig({- settings: fieldDefinition.metadata.settings,- relationObjectMetadataId:- fieldDefinition.metadata.relationObjectMetadataId,- relationTargetFieldMetadataId:- fieldDefinition.metadata.relationFieldMetadataId,- sourceObjectMetadataId: objectMetadataItem.id,- objectMetadataItems,- }),- );+ const junctionConfig = getJunctionConfig({+ settings: fieldDefinition.metadata.settings,+ relationObjectMetadataId:+ fieldDefinition.metadata.relationObjectMetadataId,+ relationTargetFieldMetadataId:+ fieldDefinition.metadata.relationFieldMetadataId,+ sourceObjectMetadataId: objectMetadataItem.id,+ objectMetadataItems,+ });++ if (isDefined(junctionConfig)) {+ if (!isUsableJunctionConfig(junctionConfig)) {+ return null;+ }- if (isJunctionRelation) {if (fieldDisplayMode === FieldDisplayMode.CARD) {return (<FieldWidgetJunctionRelationCarddiff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsxindex 4f33584a04a..dd32b32e986 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsx@@ -18,6 +18,7 @@ import { type FieldDefinition } from '@/object-record/record-field/ui/types/Fielimport { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';import { extractTargetRecordsFromJunction } from '@/object-record/record-field/ui/utils/junction/extractTargetRecordsFromJunction';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';import { FieldWidgetShowMoreButton } from '@/page-layout/widgets/field/components/FieldWidgetShowMoreButton';import { FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardInitialVisibleItems';@@ -121,7 +122,7 @@ export const FieldWidgetJunctionRelationCard = ({objectMetadataItems,});- if (!isDefined(junctionConfig)) {+ if (!isUsableJunctionConfig(junctionConfig)) {return null;}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationField.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationField.tsxindex 152ee4ff893..590456f91c9 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationField.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationField.tsx@@ -4,6 +4,7 @@ import { type FieldDefinition } from '@/object-record/record-field/ui/types/Fielimport { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';import { extractTargetRecordsFromJunction } from '@/object-record/record-field/ui/utils/junction/extractTargetRecordsFromJunction';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';import { styled } from '@linaria/react';import { isDefined } from 'twenty-shared/utils';@@ -46,7 +47,7 @@ export const FieldWidgetJunctionRelationField = ({objectMetadataItems,});- if (!isDefined(junctionConfig)) {+ if (!isUsableJunctionConfig(junctionConfig)) {return null;}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.tsindex 1f4797bf554..01317bbaaa0 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.ts@@ -5,6 +5,7 @@ import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordimport { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { useFieldWidgetFieldDefinition } from '@/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition';@@ -60,18 +61,16 @@ export const useFieldWidgetActionVisibility = ({widget.configuration.nestedRelationFieldMetadataId,);- const isJunctionRelation = isDefined(- isDefined(relationMetadata)- ? getJunctionConfig({- settings: relationMetadata.settings,- relationObjectMetadataId: relationMetadata.relationObjectMetadataId,- relationTargetFieldMetadataId:- relationMetadata.relationFieldMetadataId,- sourceObjectMetadataId: objectMetadataItem.id,- objectMetadataItems,- })- : null,- );+ const junctionConfig = isDefined(relationMetadata)+ ? getJunctionConfig({+ settings: relationMetadata.settings,+ relationObjectMetadataId: relationMetadata.relationObjectMetadataId,+ relationTargetFieldMetadataId: relationMetadata.relationFieldMetadataId,+ sourceObjectMetadataId: objectMetadataItem.id,+ objectMetadataItems,+ })+ : null;+ const isJunctionRelation = isDefined(junctionConfig);const showSeeAll =isOneToManyRelation && !isNestedRelationWidget && !isJunctionRelation;@@ -96,7 +95,10 @@ export const useFieldWidgetActionVisibility = ({// The read-only chain already hides edit during layout customization// (useIsRecordReadOnly returns true then); the explicit check states the// rule here instead of leaving it implicit.- const showEdit = !isPageLayoutInEditMode && !isFieldReadOnly;+ const showEdit =+ !isPageLayoutInEditMode &&+ !isFieldReadOnly &&+ (!isDefined(junctionConfig) || isUsableJunctionConfig(junctionConfig));return { showSeeAll, showEdit };};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useOpenFieldWidgetFieldInputEditMode.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useOpenFieldWidgetFieldInputEditMode.tsindex 7e6632a5843..247bb6e88d8 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useOpenFieldWidgetFieldInputEditMode.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useOpenFieldWidgetFieldInputEditMode.ts@@ -13,6 +13,7 @@ import { isFieldMorphRelationOneToMany } from '@/object-record/record-field/ui/timport { isFieldRelationManyToOne } from '@/object-record/record-field/ui/types/guards/isFieldRelationManyToOne';import { isFieldRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldRelationOneToMany';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';@@ -49,10 +50,8 @@ export const useOpenFieldWidgetFieldInputEditMode = () => {fieldDefinition: FieldDefinition<FieldMetadata>;recordId: string;}) => {- if (- isFieldRelationOneToMany(fieldDefinition) &&- isDefined(- getJunctionConfig({+ const junctionConfig = isFieldRelationOneToMany(fieldDefinition)+ ? getJunctionConfig({settings: fieldDefinition.metadata.settings,relationObjectMetadataId:fieldDefinition.metadata.relationObjectMetadataId,@@ -64,14 +63,21 @@ export const useOpenFieldWidgetFieldInputEditMode = () => {fieldDefinition.metadata.objectMetadataNameSingular,)?.id,objectMetadataItems,- }),- )+ })+ : null;++ if (+ isFieldRelationOneToMany(fieldDefinition) &&+ isDefined(junctionConfig)) {- openJunctionRelationFieldInput({- fieldDefinition,- recordId,- recordPickerInstanceId: instanceId,- });+ if (isUsableJunctionConfig(junctionConfig)) {+ openJunctionRelationFieldInput({+ fieldDefinition,+ recordId,+ recordPickerInstanceId: instanceId,+ });+ }+return;}diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationFormCard.tsxindex 2218ecd7f3c..63592536dfb 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationFormCard.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationFormCard.tsx@@ -135,6 +135,7 @@ export const SettingsDataModelFieldRelationFormCard = ({{isJunctionRelationsEnabled && (<SettingsDataModelFieldRelationJunctionFormobjectNameSingular={objectNameSingular}+ existingFieldMetadataId={existingFieldMetadataId}/>)}</>diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationJunctionForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationJunctionForm.tsxindex 4597a72bfab..08abde0e975 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationJunctionForm.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationJunctionForm.tsx@@ -6,6 +6,8 @@ import { IconLink } from 'twenty-ui/icon';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';+import { isValidJunctionTargetField } from '@/object-record/record-field/ui/utils/junction/isValidJunctionTargetField';import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSelect';import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';import { Select } from '@/ui/input/components/Select';@@ -16,10 +18,12 @@ import { type SettingsDataModelFieldEditFormValues } from '~/pages/settings/datatype SettingsDataModelFieldRelationJunctionFormProps = {objectNameSingular: string;+ existingFieldMetadataId: string;};export const SettingsDataModelFieldRelationJunctionForm = ({objectNameSingular,+ existingFieldMetadataId,}: SettingsDataModelFieldRelationJunctionFormProps) => {const { t } = useLingui();const { watch, setValue } =@@ -31,6 +35,8 @@ export const SettingsDataModelFieldRelationJunctionForm = ({useObjectMetadataItem({ objectNameSingular });const { objectMetadataItems } = useObjectMetadataItems();+ const { fieldMetadataItem: existingFieldMetadataItem } =+ useFieldMetadataItemById(existingFieldMetadataId);const relationType = watch('relationType') ?? RelationType.ONE_TO_MANY;const targetObjectIds = watch('morphRelationObjectMetadataIds') ?? [];@@ -54,6 +60,12 @@ export const SettingsDataModelFieldRelationJunctionForm = ({}const sourceObjectMetadataId = sourceObjectMetadataItem?.id;+ const sourceFieldMetadataId =+ existingFieldMetadataItem?.relation?.targetFieldMetadata.id ??+ existingFieldMetadataItem?.morphRelations?.find(+ ({ targetObjectMetadata }) =>+ targetObjectMetadata.id === junctionObjectMetadataItem.id,+ )?.targetFieldMetadata.id;// Self-referential relations cannot be junction objectsif (sourceObjectMetadataId === junctionObjectMetadataItem.id) {@@ -61,51 +73,41 @@ export const SettingsDataModelFieldRelationJunctionForm = ({}const junctionFieldOptions: { label: string; value: string }[] = [];-- // Add MORPH_RELATION fields (use first field of each morphId group)- // morphRelations already contains all targets, so any sibling worksconst morphIdsSeen = new Set<string>();- junctionObjectMetadataItem.fields- .filter(- (field) =>- field.type === FieldMetadataType.MORPH_RELATION &&- isDefined(field.morphId),- )- .forEach((field) => {- if (!morphIdsSeen.has(field.morphId!)) {- morphIdsSeen.add(field.morphId!);- junctionFieldOptions.push({- label: `${field.label} (polymorphic)`,- value: field.id,- });- }- });+ for (const field of junctionObjectMetadataItem.fields) {+ if (+ !isValidJunctionTargetField({+ fieldMetadataItem: field,+ sourceFieldMetadataId,+ })+ ) {+ continue;+ }- junctionObjectMetadataItem.fields- .filter((field) => {- if (- field.type !== FieldMetadataType.RELATION ||- field.relation?.type !== RelationType.MANY_TO_ONE- ) {- return false;+ if (+ field.type === FieldMetadataType.MORPH_RELATION &&+ isDefined(field.morphId)+ ) {+ if (morphIdsSeen.has(field.morphId)) {+ continue;}- return (- !isDefined(sourceObjectMetadataId) ||- field.relation?.targetObjectMetadata.id !== sourceObjectMetadataId- );- })- .forEach((field) => {- junctionFieldOptions.push({- label: field.label,- value: field.id,- });- });+ morphIdsSeen.add(field.morphId);+ }- if (junctionFieldOptions.length === 0) {- return null;+ junctionFieldOptions.push({+ label: `${field.label}${field.type === FieldMetadataType.MORPH_RELATION ? ' (polymorphic)' : ''}`,+ value: field.id,+ });}const isJunctionConfigEnabled = isDefined(junctionTargetFieldId);+ const isConfiguredTargetValid = junctionFieldOptions.some(+ ({ value }) => value === junctionTargetFieldId,+ );++ if (junctionFieldOptions.length === 0 && !isJunctionConfigEnabled) {+ return null;+ }const handleJunctionToggle = (checked: boolean) => {if (checked && junctionFieldOptions.length > 0) {@@ -154,11 +156,11 @@ export const SettingsDataModelFieldRelationJunctionForm = ({description={t`Build many-to-many relations`}checked={isJunctionConfigEnabled}onChange={handleJunctionToggle}- divider={isJunctionConfigEnabled}+ divider={isJunctionConfigEnabled && junctionFieldOptions.length > 0}advancedMode/>- {isJunctionConfigEnabled && (+ {isJunctionConfigEnabled && junctionFieldOptions.length > 0 && (<SettingsOptionCardContentSelecttitle={t`Target relation on Junction Object`}description={t`Skip the junction object (similar to many-to-many relations)`}@@ -168,6 +170,14 @@ export const SettingsDataModelFieldRelationJunctionForm = ({selectSizeVariant="small"dropdownWidth={120}value={junctionTargetFieldId}+ emptyOption={+ !isConfiguredTargetValid && isDefined(junctionTargetFieldId)+ ? {+ label: t`Select a valid target`,+ value: junctionTargetFieldId,+ }+ : undefined+ }options={junctionFieldOptions}onChange={handleSelectionChange}/>diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-junction-target-settings.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-junction-target-settings.util.spec.tsnew file mode 100644index 00000000000..eb3a4a7cd72--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-junction-target-settings.util.spec.ts@@ -0,0 +1,140 @@+import { FieldMetadataType, RelationType } from 'twenty-shared/types';++import { type FlatFieldMetadataValidationError } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata-validation-error.type';+import { validateJunctionTargetSettings } from 'src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-junction-target-settings.util';+import { type UniversalFlatEntityMaps } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-entity-maps.type';+import { type UniversalFlatFieldMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-field-metadata.type';++const JUNCTION_OBJECT_ID = 'junction-object-id';+const SOURCE_FIELD_ID = 'source-field-id';+const TARGET_FIELD_ID = 'target-field-id';++const createRelationField = ({+ universalIdentifier,+ type = FieldMetadataType.RELATION,+ relationType = RelationType.MANY_TO_ONE,+ morphId = null,+}: {+ universalIdentifier: string;+ type?: FieldMetadataType.RELATION | FieldMetadataType.MORPH_RELATION;+ relationType?: RelationType;+ morphId?: string | null;+}): UniversalFlatFieldMetadata =>+ ({+ universalIdentifier,+ objectMetadataUniversalIdentifier: JUNCTION_OBJECT_ID,+ type,+ morphId,+ universalSettings: { relationType },+ }) as UniversalFlatFieldMetadata;++const createJunctionField = ({+ sourceFieldUniversalIdentifier = SOURCE_FIELD_ID,+ targetFieldUniversalIdentifier = TARGET_FIELD_ID,+}: {+ sourceFieldUniversalIdentifier?: string;+ targetFieldUniversalIdentifier?: string;+} = {}): UniversalFlatFieldMetadata<FieldMetadataType.RELATION> =>+ ({+ universalIdentifier: 'junction-field-id',+ objectMetadataUniversalIdentifier: 'source-object-id',+ relationTargetObjectMetadataUniversalIdentifier: JUNCTION_OBJECT_ID,+ relationTargetFieldMetadataUniversalIdentifier:+ sourceFieldUniversalIdentifier,+ type: FieldMetadataType.RELATION,+ morphId: null,+ universalSettings: {+ relationType: RelationType.ONE_TO_MANY,+ junctionTargetFieldUniversalIdentifier: targetFieldUniversalIdentifier,+ },+ }) as UniversalFlatFieldMetadata<FieldMetadataType.RELATION>;++const createFieldMaps = (+ ...fields: UniversalFlatFieldMetadata[]+): UniversalFlatEntityMaps<UniversalFlatFieldMetadata> => ({+ byUniversalIdentifier: Object.fromEntries(+ fields.map((field) => [field.universalIdentifier, field]),+ ),+});++const errorMessages = (errors: FlatFieldMetadataValidationError[]) =>+ errors.map(({ message }) => message);++describe('validateJunctionTargetSettings', () => {+ it('accepts a many-to-one morph target', () => {+ const sourceField = createRelationField({+ universalIdentifier: SOURCE_FIELD_ID,+ });+ const targetField = createRelationField({+ universalIdentifier: TARGET_FIELD_ID,+ type: FieldMetadataType.MORPH_RELATION,+ morphId: 'target-morph-id',+ });++ expect(+ validateJunctionTargetSettings({+ universalFlatFieldMetadata: createJunctionField(),+ flatFieldMetadataMaps: createFieldMaps(sourceField, targetField),+ }),+ ).toEqual([]);+ });++ it('rejects a one-to-many morph target', () => {+ const targetField = createRelationField({+ universalIdentifier: TARGET_FIELD_ID,+ type: FieldMetadataType.MORPH_RELATION,+ relationType: RelationType.ONE_TO_MANY,+ morphId: 'target-morph-id',+ });++ expect(+ errorMessages(+ validateJunctionTargetSettings({+ universalFlatFieldMetadata: createJunctionField(),+ flatFieldMetadataMaps: createFieldMaps(targetField),+ }),+ ),+ ).toEqual([+ `Junction target field ${TARGET_FIELD_ID} is not a MANY_TO_ONE relation`,+ ]);+ });++ it('rejects the source field as the target', () => {+ const sourceField = createRelationField({+ universalIdentifier: SOURCE_FIELD_ID,+ });++ expect(+ errorMessages(+ validateJunctionTargetSettings({+ universalFlatFieldMetadata: createJunctionField({+ targetFieldUniversalIdentifier: SOURCE_FIELD_ID,+ }),+ flatFieldMetadataMaps: createFieldMaps(sourceField),+ }),+ ),+ ).toEqual(['Junction source and target fields must be different']);+ });++ it('rejects another member of the source morph group as the target', () => {+ const sourceField = createRelationField({+ universalIdentifier: SOURCE_FIELD_ID,+ type: FieldMetadataType.MORPH_RELATION,+ morphId: 'source-morph-id',+ });+ const targetField = createRelationField({+ universalIdentifier: TARGET_FIELD_ID,+ type: FieldMetadataType.MORPH_RELATION,+ morphId: 'source-morph-id',+ });++ expect(+ errorMessages(+ validateJunctionTargetSettings({+ universalFlatFieldMetadata: createJunctionField(),+ flatFieldMetadataMaps: createFieldMaps(sourceField, targetField),+ }),+ ),+ ).toEqual(['Junction source and target fields must be different']);+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-junction-target-settings.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-junction-target-settings.util.tsindex 594d3b03787..b6b22e4c970 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-junction-target-settings.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-junction-target-settings.util.ts@@ -1,6 +1,6 @@import { type MessageDescriptor } from '@lingui/core';import { msg } from '@lingui/core/macro';-import { FieldMetadataType, RelationType } from 'twenty-shared/types';+import { RelationType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { FieldMetadataExceptionCode } from 'src/engine/metadata-modules/field-metadata/field-metadata.exception';@@ -60,18 +60,22 @@ export const validateJunctionTargetSettings = ({];}- const targetField =+ const findFieldByUniversalIdentifier = (universalIdentifier: string) =>(isDefined(remainingFlatFieldMetadataMaps)? findFlatEntityByUniversalIdentifier({- universalIdentifier: junctionTargetFieldUniversalIdentifier,+ universalIdentifier,flatEntityMaps: remainingFlatFieldMetadataMaps,}): undefined) ??findFlatEntityByUniversalIdentifier({- universalIdentifier: junctionTargetFieldUniversalIdentifier,+ universalIdentifier,flatEntityMaps: flatFieldMetadataMaps,});+ const targetField = findFieldByUniversalIdentifier(+ junctionTargetFieldUniversalIdentifier,+ );+if (!isDefined(targetField)) {return [createError(@@ -108,9 +112,31 @@ export const validateJunctionTargetSettings = ({];}- // MORPH_RELATION fields are polymorphic and don't require MANY_TO_ONE check- if (targetField.type === FieldMetadataType.MORPH_RELATION) {- return [];+ // The frontend mirrors the direction and source-group checks in+ // isValidJunctionTargetField after resolving GraphQL relation groups. These+ // representations use different identifiers, so update both together.+ const sourceFieldUniversalIdentifier =+ universalFlatFieldMetadata.relationTargetFieldMetadataUniversalIdentifier;+ const sourceField = isDefined(sourceFieldUniversalIdentifier)+ ? findFieldByUniversalIdentifier(sourceFieldUniversalIdentifier)+ : undefined;+ const targetsSourceMorphRelation =+ isDefined(sourceField) &&+ isDefined(sourceField.morphId) &&+ sourceField.morphId === targetField.morphId;++ if (+ junctionTargetFieldUniversalIdentifier === sourceFieldUniversalIdentifier ||+ targetsSourceMorphRelation+ ) {+ return [+ createError(+ FieldMetadataExceptionCode.INVALID_FIELD_INPUT,+ 'Junction source and target fields must be different',+ msg`Junction source and target fields must be different`,+ junctionTargetFieldUniversalIdentifier,+ ),+ ];}if (targetField.universalSettings.relationType !== RelationType.MANY_TO_ONE) {