The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Resolve reverse junction relations directionally (#25113)
Félix Malfait32a5ebce3944
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getFieldMetadataItemByIdOrThrow.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getFieldMetadataItemByIdOrThrow.test.tsnew file mode 100644index 00000000000..afa829c73f1--- /dev/null+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getFieldMetadataItemByIdOrThrow.test.ts@@ -0,0 +1,33 @@+import { getFieldMetadataItemByIdOrThrow } from '@/object-metadata/utils/getFieldMetadataItemByIdOrThrow';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';++describe('getFieldMetadataItemByIdOrThrow', () => {+ it('returns a merged morph field for one of its physical member IDs', () => {+ const taskTargetObjectMetadata =+ getMockObjectMetadataItemOrThrow('taskTarget');+ const targetMorphField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskTargetObjectMetadata,+ fieldName: 'target',+ });+ const morphMemberId = targetMorphField.morphRelations?.find(+ ({ sourceFieldMetadata }) =>+ sourceFieldMetadata.id !== targetMorphField.id,+ )?.sourceFieldMetadata.id;++ if (!morphMemberId) {+ throw new Error('Non-representative task target morph member not found');+ }++ expect(+ getFieldMetadataItemByIdOrThrow({+ fieldMetadataId: morphMemberId,+ objectMetadataItems: getTestEnrichedObjectMetadataItemsMock(),+ }),+ ).toMatchObject({+ objectMetadataItem: { nameSingular: 'taskTarget' },+ fieldMetadataItem: { id: targetMorphField.id, name: 'target' },+ });+ });+});diff --git a/packages/twenty-front/src/modules/object-metadata/utils/doesFieldMetadataItemMatchFieldMetadataId.ts b/packages/twenty-front/src/modules/object-metadata/utils/doesFieldMetadataItemMatchFieldMetadataId.tsnew file mode 100644index 00000000000..247a3dae499--- /dev/null+++ b/packages/twenty-front/src/modules/object-metadata/utils/doesFieldMetadataItemMatchFieldMetadataId.ts@@ -0,0 +1,13 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';++export const doesFieldMetadataItemMatchFieldMetadataId = ({+ fieldMetadataItem,+ fieldMetadataId,+}: {+ fieldMetadataItem: FieldMetadataItem;+ fieldMetadataId: string;+}): boolean =>+ fieldMetadataItem.id === fieldMetadataId ||+ (fieldMetadataItem.morphRelations ?? []).some(+ ({ sourceFieldMetadata }) => sourceFieldMetadata.id === fieldMetadataId,+ );diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getFieldMetadataItemByIdOrThrow.ts b/packages/twenty-front/src/modules/object-metadata/utils/getFieldMetadataItemByIdOrThrow.tsindex 3870964eb79..179935931a9 100644--- a/packages/twenty-front/src/modules/object-metadata/utils/getFieldMetadataItemByIdOrThrow.ts+++ b/packages/twenty-front/src/modules/object-metadata/utils/getFieldMetadataItemByIdOrThrow.ts@@ -1,4 +1,5 @@import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { doesFieldMetadataItemMatchFieldMetadataId } from '@/object-metadata/utils/doesFieldMetadataItemMatchFieldMetadataId';import { CustomError, isDefined } from 'twenty-shared/utils';type GetFieldMetadataItemByIdParams = {@@ -13,30 +14,24 @@ export const getFieldMetadataItemByIdOrThrow = ({fieldMetadataId,objectMetadataItems,}: GetFieldMetadataItemByIdParams) => {- const objectMetadataItem = objectMetadataItems.find((objectMetadataItem) =>- objectMetadataItem.fields.some((field) => field.id === fieldMetadataId),- );-- if (!isDefined(objectMetadataItem)) {- throw new CustomError(- `Object metadata item not found for field id ${fieldMetadataId}`,- FIELD_METADATA_ITEM_NOT_FOUND_ERROR_CODE,+ for (const objectMetadataItem of objectMetadataItems) {+ const fieldMetadataItem = objectMetadataItem.fields.find((field) =>+ doesFieldMetadataItemMatchFieldMetadataId({+ fieldMetadataItem: field,+ fieldMetadataId,+ }),);- }- const fieldMetadataItem = objectMetadataItem.fields.find(- (field) => field.id === fieldMetadataId,- );-- if (!isDefined(fieldMetadataItem)) {- throw new CustomError(- `Field metadata item not found for field id ${fieldMetadataId}`,- FIELD_METADATA_ITEM_NOT_FOUND_ERROR_CODE,- );+ if (isDefined(fieldMetadataItem)) {+ return {+ fieldMetadataItem,+ objectMetadataItem,+ };+ }}- return {- fieldMetadataItem,- objectMetadataItem,- };+ throw new CustomError(+ `Object metadata item not found for field id ${fieldMetadataId}`,+ FIELD_METADATA_ITEM_NOT_FOUND_ERROR_CODE,+ );};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 b527de2c711..1d665d5efed 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@@ -3,9 +3,7 @@ import { type GenerateDepthRecordGqlFieldsFromFields } from '@/object-record/graimport { 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';import {computeMorphRelationGqlFieldName,isDefined,@@ -40,45 +38,22 @@ export const generateDepthRecordGqlFieldsFromFields = ({);}- const junctionConfig = getJunctionConfig({+ const junctionConfig = resolveJunctionConfig({settings: fieldMetadata.settings,relationObjectMetadataId: targetObjectMetadataItem.id,relationTargetFieldMetadataId:fieldMetadata.relation?.targetFieldMetadata.id,sourceObjectMetadataId:+ sourceObjectMetadataItem?.id ??fieldMetadata.relation?.sourceObjectMetadata.id,objectMetadataItems,});- if (- isDefined(junctionConfig) &&- !isUsableJunctionConfig(junctionConfig)- ) {+ if (isDefined(junctionConfig) && !junctionConfig.isValid) {return recordGqlFields;}- const reverseJunctionConfig = getReverseJunctionConfig({- junctionObjectMetadataId: targetObjectMetadataItem.id,- sourceObjectMetadataId: sourceObjectMetadataItem?.id,- objectMetadataItems,- });-- if (isDefined(reverseJunctionConfig) && depth === 1) {- return {- ...recordGqlFields,- [fieldMetadata.name]: {- ...buildIdentifierGqlFields(- reverseJunctionConfig.junctionObjectMetadata,- ),- [reverseJunctionConfig.relationFieldName]:- buildIdentifierGqlFields(- reverseJunctionConfig.relatedObjectMetadata,- ),- },- };- }-- if (isUsableJunctionConfig(junctionConfig) && depth === 1) {+ if (junctionConfig?.isValid === true && depth === 1) {return {...recordGqlFields,[fieldMetadata.name]: generateJunctionRelationGqlFields({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 2992ffc68af..540a59ef8a3 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@@ -55,4 +55,24 @@ describe('categorizeRelationFields', () => {boxedRelationFields: [],});});++ it('categorizes an editable inverse junction as an inline junction', () => {+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: rocketMetadata,+ fieldName: 'taskTargets',+ });++ expect(+ categorizeRelationFields({+ relationFields: [taskTargetsField],+ objectMetadataItems: getTestEnrichedObjectMetadataItemsMock(),+ objectPermissionsByObjectMetadataId: {},+ }),+ ).toEqual({+ inlineRelationFields: [taskTargetsField],+ junctionRelationFields: [taskTargetsField],+ 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 dfc702f4484..6e83ffc1629 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@@ -1,8 +1,8 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';import { type ObjectPermissions } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -56,7 +56,7 @@ export const categorizeRelationFields = ({const boxedRelationFields: FieldMetadataItem[] = [];for (const field of relationFields) {- const junctionConfig = getJunctionConfig({+ const junctionConfig = resolveJunctionConfig({settings: field.settings,relationObjectMetadataId: field.relation?.targetObjectMetadata.id ?? '',relationTargetFieldMetadataId: field.relation?.targetFieldMetadata.id,diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/useRelevantRecordsGqlFields.ts b/packages/twenty-front/src/modules/object-record/record-field/hooks/useRelevantRecordsGqlFields.tsindex 3eeb5b5ad55..6e46b19fd9a 100644--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/useRelevantRecordsGqlFields.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/useRelevantRecordsGqlFields.ts@@ -4,6 +4,7 @@ import { getImageIdentifierFieldMetadataItem } from '@/object-metadata/utils/getimport { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';import { hasObjectMetadataItemPositionField } from '@/object-metadata/utils/hasObjectMetadataItemPositionField';import { generateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields';+import { getFieldRelations } from '@/object-record/record-field/ui/utils/junction/getFieldRelations';import { getJunctionObjectMetadataIds } from '@/object-record/record-field/ui/utils/junction/getJunctionObjectMetadataIds';import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';@@ -66,6 +67,7 @@ export const useRelevantRecordsGqlFields = ({const allDepthOneGqlFields = generateDepthRecordGqlFieldsFromFields({objectMetadataItems,+ sourceObjectMetadataItem: objectMetadataItem,fields: fieldMetadataItemsToUse,depth: 1,});@@ -79,8 +81,8 @@ export const useRelevantRecordsGqlFields = ({objectMetadataItems,sourceObjectMetadataItem: objectMetadataItem,fields: objectMetadataItem.fields.filter((fieldMetadataItem) =>- junctionObjectMetadataIds.has(- fieldMetadataItem.relation?.targetObjectMetadata.id ?? '',+ getFieldRelations(fieldMetadataItem).some((relation) =>+ junctionObjectMetadataIds.has(relation.targetObjectMetadata.id),),),depth: 1,@@ -102,8 +104,8 @@ export const useRelevantRecordsGqlFields = ({? { [imageIdentifierFieldMetadataItem.name]: true }: {}),...(hasPosition ? { position: true } : {}),- ...junctionRelationGqlFields,...allDepthOneGqlFields,+ ...junctionRelationGqlFields,createdAt: true,updatedAt: true,deletedAt: true,diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useUpdateJunctionRelationFromCell.test.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useUpdateJunctionRelationFromCell.test.tsxnew file mode 100644index 00000000000..2893b311f0e--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useUpdateJunctionRelationFromCell.test.tsx@@ -0,0 +1,176 @@+import { type ReactNode } from 'react';+import { act, renderHook } from '@testing-library/react';+import { createStore, Provider as JotaiProvider } from 'jotai';++import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';+import { useCreateManyRecords } from '@/object-record/hooks/useCreateManyRecords';+import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';+import { useUpdateJunctionRelationFromCell } from '@/object-record/record-field/ui/hooks/useUpdateJunctionRelationFromCell';+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';+import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';+import { searchRecordStoreFamilyState } from '@/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState';+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';++jest.mock('@/object-metadata/hooks/useObjectMetadataItems');+jest.mock('@/object-record/hooks/useCreateManyRecords', () => ({+ useCreateManyRecords: jest.fn(),+}));+jest.mock('@/object-record/hooks/useDeleteOneRecord', () => ({+ useDeleteOneRecord: jest.fn(),+}));++const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();+const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+const taskMetadata = getMockObjectMetadataItemOrThrow('task');+const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: rocketMetadata,+ fieldName: 'taskTargets',+});+const fieldDefinition = formatFieldMetadataItemAsFieldDefinition({+ field: taskTargetsField,+ objectMetadataItem: rocketMetadata,+}) as FieldDefinition<FieldRelationMetadata>;++const mockCreateManyRecords = jest.fn();+const mockDeleteOneRecord = jest.fn();++const createWrapper = (store: ReturnType<typeof createStore>) =>+ function Wrapper({ children }: { children: ReactNode }) {+ return <JotaiProvider store={store}>{children}</JotaiProvider>;+ };++describe('useUpdateJunctionRelationFromCell', () => {+ beforeEach(() => {+ jest.clearAllMocks();++ jest.mocked(useObjectMetadataItems).mockReturnValue({+ objectMetadataItems,+ });+ jest.mocked(useCreateManyRecords).mockReturnValue({+ createManyRecords: mockCreateManyRecords,+ } as ReturnType<typeof useCreateManyRecords>);+ jest.mocked(useDeleteOneRecord).mockReturnValue({+ deleteOneRecord: mockDeleteOneRecord,+ } as ReturnType<typeof useDeleteOneRecord>);+ });++ it('creates a pivot from the source record to the selected terminal record', async () => {+ const store = createStore();+ const sourceRecordId = 'rocket-id';+ const targetRecordId = 'task-id';++ store.set(recordStoreFamilyState.atomFamily(sourceRecordId), {+ id: sourceRecordId,+ __typename: 'Rocket',+ taskTargets: [],+ });+ store.set(searchRecordStoreFamilyState.atomFamily(targetRecordId), {+ recordId: targetRecordId,+ label: 'Prepare launch',+ objectLabelSingular: 'Task',+ objectNameSingular: 'task',+ tsRank: 1,+ tsRankCD: 1,+ record: {+ id: targetRecordId,+ __typename: 'Task',+ title: 'Prepare launch',+ },+ });+ mockCreateManyRecords.mockResolvedValue([+ {+ id: 'persisted-task-target-id',+ __typename: 'TaskTarget',+ },+ ]);++ const { result } = renderHook(+ () =>+ useUpdateJunctionRelationFromCell({+ fieldMetadataItem: taskTargetsField,+ fieldDefinition,+ recordId: sourceRecordId,+ }),+ { wrapper: createWrapper(store) },+ );++ expect(result.current.junctionConfig).toMatchObject({+ direction: 'reverse',+ targetFields: [{ name: 'task' }],+ });++ await act(async () => {+ await result.current.updateJunctionRelationFromCell({+ morphItem: {+ recordId: targetRecordId,+ objectMetadataId: taskMetadata.id,+ isSelected: true,+ isMatchingSearchFilter: true,+ },+ });+ });++ expect(mockCreateManyRecords).toHaveBeenCalledWith({+ recordsToCreate: [+ {+ targetRocketId: sourceRecordId,+ taskId: targetRecordId,+ },+ ],+ upsert: true,+ });+ });++ it('deletes the pivot instead of detaching or updating it', async () => {+ const store = createStore();+ const sourceRecordId = 'rocket-id';+ const targetRecordId = 'task-id';++ store.set(recordStoreFamilyState.atomFamily(sourceRecordId), {+ id: sourceRecordId,+ __typename: 'Rocket',+ taskTargets: [+ {+ id: 'task-target-id',+ __typename: 'TaskTarget',+ task: {+ id: targetRecordId,+ __typename: 'Task',+ },+ },+ ],+ });+ mockDeleteOneRecord.mockResolvedValue({+ id: 'task-target-id',+ __typename: 'TaskTarget',+ });++ const { result } = renderHook(+ () =>+ useUpdateJunctionRelationFromCell({+ fieldMetadataItem: taskTargetsField,+ fieldDefinition,+ recordId: sourceRecordId,+ }),+ { wrapper: createWrapper(store) },+ );++ await act(async () => {+ await result.current.updateJunctionRelationFromCell({+ morphItem: {+ recordId: targetRecordId,+ objectMetadataId: taskMetadata.id,+ isSelected: false,+ isMatchingSearchFilter: true,+ },+ });+ });++ expect(mockDeleteOneRecord).toHaveBeenCalledWith('task-target-id');+ expect(mockCreateManyRecords).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 01581f34c93..0a6de6e1c47 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@@ -14,8 +14,8 @@ import { isFieldMorphRelationManyToOne } from '@/object-record/record-field/ui/timport { isFieldMorphRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelationOneToMany';import { 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';@@ -64,7 +64,7 @@ export const useOpenFieldInputEditMode = () => {nameSingular === fieldDefinition.metadata.objectMetadataNameSingular,)?.id;const junctionConfig = isFieldRelationOneToMany(fieldDefinition)- ? getJunctionConfig({+ ? resolveJunctionConfig({settings: fieldDefinition.metadata.settings,relationObjectMetadataId:fieldDefinition.metadata.relationObjectMetadataId,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 6f3e367b319..4330a6b54db 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@@ -5,9 +5,9 @@ import {type FieldRelationMetadata,type FieldRelationValue,} 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';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';@@ -46,7 +46,7 @@ export const useOpenJunctionRelationFieldInput = () => {fieldDefinition.metadata.objectMetadataNameSingular,)?.id;- const junctionConfig = getJunctionConfig({+ const junctionConfig = resolveJunctionConfig({settings: fieldDefinition.metadata.settings,relationObjectMetadataId:fieldDefinition.metadata.relationObjectMetadataId,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 deeae87ca44..1fe43809d93 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@@ -17,9 +17,9 @@ import {} from '@/object-record/record-field/ui/types/FieldMetadata';import { findJunctionRecordByTargetId } from '@/object-record/record-field/ui/utils/junction/findJunctionRecordByTargetId';import { 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';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';@@ -43,7 +43,7 @@ export const useUpdateJunctionRelationFromCell = ({item.nameSingular === fieldDefinition.metadata.objectMetadataNameSingular,);- const junctionConfig = getJunctionConfig({+ const junctionConfig = resolveJunctionConfig({settings: fieldMetadataItem.settings,relationObjectMetadataId: fieldDefinition.metadata.relationObjectMetadataId,relationTargetFieldMetadataId: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 e5ed8bfcae9..efaf4b8ba94 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@@ -7,25 +7,12 @@ import { useFieldFocus } from '@/object-record/record-field/ui/hooks/useFieldFocimport { MAX_RELATION_CHIPS_DISPLAYED_INLINE } from '@/object-record/record-field/ui/meta-types/display/constants/MaxRelationChipsDisplayedInline';import { useRelationFromManyFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useRelationFromManyFieldDisplay';import { 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';-import { styled } from '@linaria/react';import { isArray } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';-import { themeCssVariables } from 'twenty-ui/theme-constants';--const StyledContainer = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[1]};- justify-content: flex-start;- max-width: 100%;- overflow: hidden;- width: 100%;-`;export const RelationFromManyFieldDisplay = () => {const { fieldValue, fieldDefinition, generateRecordChipData } =@@ -43,7 +30,7 @@ export const RelationFromManyFieldDisplay = () => {(item) => item.nameSingular === objectMetadataNameSingular,)?.id;- const junctionConfig = getJunctionConfig({+ const junctionConfig = resolveJunctionConfig({settings: fieldDefinition.metadata.settings,relationObjectMetadataId: fieldDefinition.metadata.relationObjectMetadataId,relationTargetFieldMetadataId:@@ -52,12 +39,6 @@ export const RelationFromManyFieldDisplay = () => {objectMetadataItems,});- const reverseJunctionConfig = getReverseJunctionConfig({- junctionObjectMetadataId: fieldDefinition.metadata.relationObjectMetadataId,- sourceObjectMetadataId,- objectMetadataItems,- });-if (!isDefined(fieldValue)) {return null;}@@ -122,47 +103,6 @@ export const RelationFromManyFieldDisplay = () => {);}- if (isDefined(reverseJunctionConfig)) {- const chips = fieldValue- .map((junctionRecord) => {- const relatedRecord =- junctionRecord?.[reverseJunctionConfig.relationFieldName];-- if (!isDefined(junctionRecord) || !isDefined(relatedRecord)) {- return undefined;- }-- return (- <RecordChip- key={junctionRecord.id}- objectNameSingular={- reverseJunctionConfig.relatedObjectMetadata.nameSingular- }- record={relatedRecord}- forceDisableClick={disableChipClick}- />- );- })- .filter(isDefined);-- if (isFocused) {- return (- <ExpandableList- isChipCountDisplayed- maxInlineCount={MAX_RELATION_CHIPS_DISPLAYED_INLINE}- >- {chips}- </ExpandableList>- );- }-- return (- <StyledContainer>- {chips.slice(0, MAX_RELATION_CHIPS_DISPLAYED_INLINE)}- </StyledContainer>- );- }-return (<ExpandableListisChipCountDisplayed={isFocused}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 42b62d98876..1fabdf9c88f 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,7 +16,6 @@ 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';@@ -65,9 +64,8 @@ export const RelationOneToManyFieldInput = () => {recordId,});- const isJunctionRelation = isUsableJunctionConfig(junctionConfig);- const isInvalidJunctionRelation =- isDefined(junctionConfig) && !isJunctionRelation;+ const isJunctionRelation = junctionConfig?.isValid === true;+ const isInvalidJunctionRelation = junctionConfig?.isValid === false;const junctionTargetObjectMetadata = (() => {if (!junctionConfig || junctionConfig.isMorphRelation) {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 a9205298aa1..f0c8fa787e5 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@@ -266,6 +266,91 @@ describe('getJunctionConfig', () => {expect(result!.targetFields[0].name).toBe('linkedObject');});+ it('should resolve a merged morph field referenced through another member ID', () => {+ const morphField = createMockField({+ id: 'morph-representative-field-id',+ name: 'linkedObject',+ type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [+ createMockRelation(+ 'first-target-object-id',+ 'firstTargetObject',+ RelationType.MANY_TO_ONE,+ 'morph-representative-field-id',+ ),+ createMockRelation(+ 'second-target-object-id',+ 'secondTargetObject',+ RelationType.MANY_TO_ONE,+ 'configured-morph-member-field-id',+ ),+ ],+ });+ const junctionObject = createMockObjectMetadata({+ id: 'junction-id',+ fields: [morphField],+ });++ expect(+ getJunctionConfig({+ settings: {+ junctionTargetFieldId: 'configured-morph-member-field-id',+ },+ relationObjectMetadataId: 'junction-id',+ objectMetadataItems: [junctionObject],+ }),+ ).toMatchObject({+ isValid: true,+ isMorphRelation: true,+ targetFields: [{ id: 'morph-representative-field-id' }],+ });+ });++ it('should resolve a merged morph source field referenced through another member ID', () => {+ const morphSourceField = createMockField({+ id: 'morph-source-representative-field-id',+ name: 'target',+ type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [+ createMockRelation(+ 'first-source-object-id',+ 'firstSourceObject',+ RelationType.MANY_TO_ONE,+ 'morph-source-representative-field-id',+ ),+ createMockRelation(+ 'second-source-object-id',+ 'secondSourceObject',+ RelationType.MANY_TO_ONE,+ 'relation-target-morph-member-field-id',+ ),+ ],+ });+ const targetField = createMockField({+ id: 'target-field-id',+ name: 'task',+ relation: createMockRelation('task-object-id', 'task'),+ });+ const junctionObject = createMockObjectMetadata({+ id: 'junction-id',+ fields: [morphSourceField, targetField],+ });++ expect(+ getJunctionConfig({+ settings: { junctionTargetFieldId: 'target-field-id' },+ relationObjectMetadataId: 'junction-id',+ relationTargetFieldMetadataId:+ 'relation-target-morph-member-field-id',+ objectMetadataItems: [junctionObject],+ }),+ ).toMatchObject({+ isValid: true,+ sourceField: { id: 'morph-source-representative-field-id' },+ targetFields: [{ id: 'target-field-id' }],+ });+ });+it('returns an invalid junction instead of falling back for a one-to-many morph target', () => {const morphField = createMockField({id: 'morph-field-id',diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionRelationPickerData.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionRelationPickerData.test.tsindex d40c640d5ef..4bc01fab52b 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionRelationPickerData.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionRelationPickerData.test.ts@@ -1,6 +1,7 @@import { getJunctionRelationPickerData } from '@/object-record/record-field/ui/utils/junction/getJunctionRelationPickerData';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';import { getObjectMorphJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getObjectMorphJunctionConfig';+import { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';@@ -126,4 +127,60 @@ describe('getJunctionRelationPickerData', () => {companyObjectMetadata.id,]);});++ it('uses terminal records when editing the inverse side of a junction', () => {+ const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();+ const rocketObjectMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const taskObjectMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetObjectMetadata =+ getMockObjectMetadataItemOrThrow('taskTarget');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: rocketObjectMetadata,+ fieldName: 'taskTargets',+ });++ const junctionConfig = resolveJunctionConfig({+ settings: taskTargetsField.settings,+ relationObjectMetadataId:+ taskTargetsField.relation?.targetObjectMetadata.id ?? '',+ relationTargetFieldMetadataId:+ taskTargetsField.relation?.targetFieldMetadata.id,+ sourceObjectMetadataId: rocketObjectMetadata.id,+ objectMetadataItems,+ });++ expect(junctionConfig?.direction).toBe('reverse');++ if (junctionConfig === null) {+ throw new Error('Reverse task junction config not found');+ }++ const { pickableMorphItems, searchableObjectMetadataItems } =+ getJunctionRelationPickerData({+ junctionRecords: [+ {+ id: 'task-target-id',+ __typename: 'TaskTarget',+ task: { id: 'task-id' },+ },+ ],+ targetFields: junctionConfig.targetFields,+ objectMetadataItems,+ });++ expect(pickableMorphItems).toEqual([+ {+ recordId: 'task-id',+ objectMetadataId: taskObjectMetadata.id,+ isSelected: true,+ isMatchingSearchFilter: true,+ },+ ]);+ expect(searchableObjectMetadataItems.map(({ id }) => id)).toEqual([+ taskObjectMetadata.id,+ ]);+ expect(searchableObjectMetadataItems.map(({ id }) => id)).not.toContain(+ taskTargetObjectMetadata.id,+ );+ });});diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getObjectMorphJunctionConfig.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getObjectMorphJunctionConfig.test.tsindex 0872e8308dd..1b8541c7248 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getObjectMorphJunctionConfig.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getObjectMorphJunctionConfig.test.ts@@ -88,6 +88,63 @@ describe('getObjectMorphJunctionConfig', () => {});});+ it('resolves a target setting that references a non-representative morph member', () => {+ const taskObjectMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetObjectMetadata =+ getMockObjectMetadataItemOrThrow('taskTarget');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskObjectMetadata,+ fieldName: 'taskTargets',+ });+ const targetMorphField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskTargetObjectMetadata,+ fieldName: 'target',+ });+ const nonRepresentativeMorphMemberId =+ targetMorphField.morphRelations?.find(+ ({ sourceFieldMetadata }) =>+ sourceFieldMetadata.id !== targetMorphField.id,+ )?.sourceFieldMetadata.id;++ if (!nonRepresentativeMorphMemberId) {+ throw new Error('Non-representative task target morph member not found');+ }++ const taskWithPhysicalMorphMemberSetting = {+ ...taskObjectMetadata,+ fields: taskObjectMetadata.fields.map((field) =>+ field.id === taskTargetsField.id+ ? {+ ...field,+ settings: {+ ...field.settings,+ junctionTargetFieldId: nonRepresentativeMorphMemberId,+ },+ }+ : field,+ ),+ };+ const metadataWithPhysicalMorphMemberSetting = objectMetadataItems.map(+ (item) =>+ item.id === taskObjectMetadata.id+ ? taskWithPhysicalMorphMemberSetting+ : item,+ );++ expect(+ getObjectMorphJunctionConfig({+ objectMetadata: taskWithPhysicalMorphMemberSetting,+ objectMetadataItems: metadataWithPhysicalMorphMemberSetting,+ }),+ ).toMatchObject({+ junctionObjectMetadata: { nameSingular: 'taskTarget' },+ junctionField: { name: 'taskTargets' },+ sourceField: { name: 'task' },+ sourceJoinColumnName: 'taskId',+ isMorphRelation: true,+ });+ });+it('does not guess between unconfigured morph junctions', () => {const taskObjectMetadata = getMockObjectMetadataItemOrThrow('task');const taskTargetsField = getMockFieldMetadataItemOrThrow({diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getReverseJunctionConfig.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getReverseJunctionConfig.test.tsdeleted file mode 100644index ff3960a8bf2..00000000000--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getReverseJunctionConfig.test.ts+++ /dev/null@@ -1,80 +0,0 @@-import { generateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields';-import { getReverseJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getReverseJunctionConfig';-import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';-import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';-import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';--describe('getReverseJunctionConfig', () => {- const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();- const companyMetadata = getMockObjectMetadataItemOrThrow('company');- const noteTargetMetadata = getMockObjectMetadataItemOrThrow('noteTarget');- const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');-- it.each([- {- junctionObjectMetadataId: noteTargetMetadata.id,- relatedObjectNameSingular: 'note',- relationFieldName: 'note',- },- {- junctionObjectMetadataId: taskTargetMetadata.id,- relatedObjectNameSingular: 'task',- relationFieldName: 'task',- },- ])(- 'resolves $relatedObjectNameSingular through configured junction metadata',- ({- junctionObjectMetadataId,- relatedObjectNameSingular,- relationFieldName,- }) => {- const result = getReverseJunctionConfig({- junctionObjectMetadataId,- sourceObjectMetadataId: companyMetadata.id,- objectMetadataItems,- });-- expect(result).toMatchObject({- junctionObjectMetadata: { id: junctionObjectMetadataId },- relatedObjectMetadata: {- nameSingular: relatedObjectNameSingular,- },- relationFieldName,- });- },- );-- it('returns null when no configured junction targets the source object', () => {- expect(- getReverseJunctionConfig({- junctionObjectMetadataId: noteTargetMetadata.id,- sourceObjectMetadataId: 'unsupported-object-id',- objectMetadataItems,- }),- ).toBeNull();- });-- it('generates reverse relation fields without activity-specific names', () => {- const noteTargetsField = getMockFieldMetadataItemOrThrow({- objectMetadataItem: companyMetadata,- fieldName: 'noteTargets',- });-- const result = generateDepthRecordGqlFieldsFromFields({- objectMetadataItems,- sourceObjectMetadataItem: companyMetadata,- fields: [noteTargetsField],- depth: 1,- });-- expect(result).toMatchObject({- noteTargets: {- id: true,- note: {- id: true,- title: true,- },- },- });- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/isJunctionRelationForbidden.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/isJunctionRelationForbidden.test.tsnew file mode 100644index 00000000000..b3b114d66d0--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/isJunctionRelationForbidden.test.ts@@ -0,0 +1,27 @@+import { isJunctionRelationForbidden } from '@/object-record/record-field/ui/utils/junction/isJunctionRelationForbidden';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';++describe('isJunctionRelationForbidden', () => {+ it.each(['taskTargets', 'noteTargets'])(+ 'does not forbid Opportunity.%s when junction objects are readable',+ (fieldName) => {+ const opportunityMetadata =+ getMockObjectMetadataItemOrThrow('opportunity');+ const fieldMetadataItem = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: opportunityMetadata,+ fieldName,+ });++ expect(+ isJunctionRelationForbidden({+ fieldMetadataItem,+ sourceObjectMetadataId: opportunityMetadata.id,+ objectMetadataItems: getTestEnrichedObjectMetadataItemsMock(),+ objectPermissionsByObjectMetadataId: {},+ }),+ ).toBe(false);+ },+ );+});diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/resolveJunctionConfig.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/resolveJunctionConfig.test.tsnew file mode 100644index 00000000000..221716cbd71--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/resolveJunctionConfig.test.ts@@ -0,0 +1,450 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { generateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields';+import { getJunctionObjectMetadataIds } from '@/object-record/record-field/ui/utils/junction/getJunctionObjectMetadataIds';+import { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';+import { FieldMetadataType, RelationType } from 'twenty-shared/types';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';++describe('resolveJunctionConfig', () => {+ const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();++ const resolveField = (+ objectMetadataItem: EnrichedObjectMetadataItem,+ fieldName: string,+ metadataItems = objectMetadataItems,+ ) => {+ const field = getMockFieldMetadataItemOrThrow({+ objectMetadataItem,+ fieldName,+ });++ return resolveJunctionConfig({+ settings: field.settings,+ relationObjectMetadataId: field.relation?.targetObjectMetadata.id ?? '',+ relationTargetFieldMetadataId: field.relation?.targetFieldMetadata.id,+ sourceObjectMetadataId: objectMetadataItem.id,+ objectMetadataItems: metadataItems,+ });+ };++ it('keeps the configured owning side as forward', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');++ expect(resolveField(taskMetadata, 'taskTargets')).toMatchObject({+ direction: 'forward',+ junctionObjectMetadata: { nameSingular: 'taskTarget' },+ sourceField: { name: 'task' },+ targetFields: [{ name: 'target' }],+ isMorphRelation: true,+ });+ });++ it('normalizes the inverse side to edit terminal records', () => {+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');++ expect(resolveField(rocketMetadata, 'taskTargets')).toMatchObject({+ direction: 'reverse',+ junctionObjectMetadata: { nameSingular: 'taskTarget' },+ sourceField: { name: 'target' },+ targetFields: [{ name: 'task' }],+ isMorphRelation: false,+ });+ });++ it('normalizes compatible configured owners into one reverse morph target', () => {+ const petMetadata = getMockObjectMetadataItemOrThrow('pet');+ const petMetadataWithoutLocalJunctionMarker = {+ ...petMetadata,+ fields: petMetadata.fields.map((field) =>+ field.name === 'caretakers' ? { ...field, settings: undefined } : field,+ ),+ };+ const metadataWithoutLocalJunctionMarker = objectMetadataItems.map((item) =>+ item.id === petMetadata.id ? petMetadataWithoutLocalJunctionMarker : item,+ );++ expect(+ resolveField(+ petMetadataWithoutLocalJunctionMarker,+ 'caretakers',+ metadataWithoutLocalJunctionMarker,+ ),+ ).toMatchObject({+ direction: 'reverse',+ sourceField: { name: 'pet' },+ targetFields: [{ name: 'caretaker' }],+ isMorphRelation: true,+ });+ });++ it('discovers a configured morph field owning the junction', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });++ if (!taskTargetsField.relation) {+ throw new Error('Task targets relation not found');+ }++ const morphOwningField = {+ ...taskTargetsField,+ type: FieldMetadataType.MORPH_RELATION,+ relation: undefined,+ morphRelations: [taskTargetsField.relation],+ } as FieldMetadataItem;+ const metadataWithMorphOwner = objectMetadataItems.map((item) =>+ item.id === taskMetadata.id+ ? {+ ...item,+ fields: item.fields.map((field) =>+ field.id === taskTargetsField.id ? morphOwningField : field,+ ),+ }+ : item,+ );+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');++ expect(+ resolveField(rocketMetadata, 'taskTargets', metadataWithMorphOwner),+ ).toMatchObject({+ direction: 'reverse',+ junctionObjectMetadata: { nameSingular: 'taskTarget' },+ sourceField: { name: 'target' },+ targetFields: [{ name: 'task' }],+ isMorphRelation: false,+ });+ expect(getJunctionObjectMetadataIds(metadataWithMorphOwner)).toContain(+ taskTargetsField.relation.targetObjectMetadata.id,+ );+ });++ it('prefers an explicit forward configuration when both directions match', () => {+ const personMetadata = getMockObjectMetadataItemOrThrow('person');++ expect(resolveField(personMetadata, 'previousCompanies')).toMatchObject({+ direction: 'forward',+ sourceField: { name: 'person' },+ targetFields: [{ name: 'company' }],+ });+ });++ it('returns null for a direct relation', () => {+ const personMetadata = getMockObjectMetadataItemOrThrow('person');++ expect(resolveField(personMetadata, 'company')).toBeNull();+ });++ it('ignores owner-shaped fields not referenced by the junction inverse edge', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const metadataWithUnreferencedOwner = objectMetadataItems.map((item) =>+ item.id === taskMetadata.id+ ? {+ ...item,+ fields: [+ ...item.fields,+ {+ ...taskTargetsField,+ id: 'duplicate-task-targets-field-id',+ name: 'duplicateTaskTargets',+ },+ ],+ }+ : item,+ );++ expect(+ resolveField(+ rocketMetadata,+ 'taskTargets',+ metadataWithUnreferencedOwner,+ ),+ ).toMatchObject({+ direction: 'reverse',+ isValid: true,+ junctionObjectMetadata: { nameSingular: 'taskTarget' },+ sourceField: { name: 'target' },+ targetFields: [{ name: 'task' }],+ });++ const rocketTaskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: rocketMetadata,+ fieldName: 'taskTargets',+ });++ expect(+ generateDepthRecordGqlFieldsFromFields({+ objectMetadataItems: metadataWithUnreferencedOwner,+ sourceObjectMetadataItem: rocketMetadata,+ fields: [rocketTaskTargetsField],+ depth: 1,+ }),+ ).toHaveProperty('taskTargets');+ });++ it('fails closed when a configured owning field is invalid', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });++ const configuredTargetFieldId =+ taskTargetsField.settings?.junctionTargetFieldId;++ if (typeof configuredTargetFieldId !== 'string') {+ throw new Error('Task target junction configuration not found');+ }++ const metadataWithInvalidOwner = objectMetadataItems.map((item) =>+ item.id === taskTargetMetadata.id+ ? {+ ...item,+ fields: item.fields.map((field) =>+ field.id === configuredTargetFieldId+ ? {+ ...field,+ type: FieldMetadataType.TEXT,+ relation: undefined,+ morphRelations: undefined,+ }+ : field,+ ),+ }+ : item,+ );++ expect(+ resolveField(rocketMetadata, 'taskTargets', metadataWithInvalidOwner),+ ).toMatchObject({+ isValid: false,+ junctionObjectMetadata: { nameSingular: 'taskTarget' },+ targetFields: [],+ });+ expect(+ getJunctionObjectMetadataIds(metadataWithInvalidOwner),+ ).not.toContain(taskTargetMetadata.id);+ });++ it('fails closed when a reverse owner points to a missing target field', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });+ const metadataWithStaleOwner = objectMetadataItems.map((item) =>+ item.id === taskMetadata.id+ ? {+ ...item,+ fields: item.fields.map((field) =>+ field.id === taskTargetsField.id+ ? {+ ...field,+ settings: {+ ...field.settings,+ junctionTargetFieldId: 'missing-target-field-id',+ },+ }+ : field,+ ),+ }+ : item,+ );++ expect(+ resolveField(rocketMetadata, 'taskTargets', metadataWithStaleOwner),+ ).toMatchObject({+ direction: 'reverse',+ isValid: false,+ targetFields: [],+ });+ });++ it('keeps morph terminal semantics when the owning-side source is morph', () => {+ const sourceObject = {+ id: 'source-object-id',+ nameSingular: 'sourceObject',+ namePlural: 'sourceObjects',+ };+ const ownerObject = {+ id: 'owner-object-id',+ nameSingular: 'ownerObject',+ namePlural: 'ownerObjects',+ };+ const junctionObject = {+ id: 'junction-object-id',+ nameSingular: 'junctionObject',+ namePlural: 'junctionObjects',+ };+ const inverseSourceField = {+ id: 'inverse-source-field-id',+ name: 'junctionObjects',+ type: FieldMetadataType.RELATION,+ settings: { relationType: RelationType.ONE_TO_MANY },+ relation: {+ type: RelationType.ONE_TO_MANY,+ sourceObjectMetadata: sourceObject,+ targetObjectMetadata: junctionObject,+ sourceFieldMetadata: {+ id: 'inverse-source-field-id',+ name: 'junctionObjects',+ },+ targetFieldMetadata: {+ id: 'junction-source-field-id',+ name: 'sourceObject',+ },+ },+ } as FieldMetadataItem;+ const morphOwnerField = {+ id: 'junction-owner-field-id',+ name: 'ownerObject',+ type: FieldMetadataType.MORPH_RELATION,+ morphRelations: [+ {+ type: RelationType.MANY_TO_ONE,+ sourceObjectMetadata: junctionObject,+ targetObjectMetadata: ownerObject,+ sourceFieldMetadata: {+ id: 'junction-owner-field-id',+ name: 'ownerObject',+ },+ targetFieldMetadata: {+ id: 'owner-junction-field-id',+ name: 'junctionObjects',+ },+ },+ ],+ } as FieldMetadataItem;+ const junctionSourceField = {+ id: 'junction-source-field-id',+ name: 'sourceObject',+ type: FieldMetadataType.RELATION,+ relation: {+ type: RelationType.MANY_TO_ONE,+ sourceObjectMetadata: junctionObject,+ targetObjectMetadata: sourceObject,+ sourceFieldMetadata: {+ id: 'junction-source-field-id',+ name: 'sourceObject',+ },+ targetFieldMetadata: {+ id: 'inverse-source-field-id',+ name: 'junctionObjects',+ },+ },+ } as FieldMetadataItem;+ const ownerJunctionField = {+ id: 'owner-junction-field-id',+ name: 'junctionObjects',+ type: FieldMetadataType.RELATION,+ settings: {+ relationType: RelationType.ONE_TO_MANY,+ junctionTargetFieldId: junctionSourceField.id,+ },+ relation: {+ type: RelationType.ONE_TO_MANY,+ sourceObjectMetadata: ownerObject,+ targetObjectMetadata: junctionObject,+ sourceFieldMetadata: {+ id: 'owner-junction-field-id',+ name: 'junctionObjects',+ },+ targetFieldMetadata: {+ id: morphOwnerField.id,+ name: morphOwnerField.name,+ },+ },+ } as FieldMetadataItem;+ const labelIdentifierField = {+ id: 'junction-label-field-id',+ name: 'id',+ type: FieldMetadataType.UUID,+ } as FieldMetadataItem;+ const metadataItems = [+ { ...sourceObject, fields: [inverseSourceField] },+ { ...ownerObject, fields: [ownerJunctionField] },+ {+ ...junctionObject,+ labelIdentifierFieldMetadataId: labelIdentifierField.id,+ fields: [labelIdentifierField, morphOwnerField, junctionSourceField],+ },+ ] as EnrichedObjectMetadataItem[];++ const resolverArgs = {+ settings: inverseSourceField.settings,+ relationObjectMetadataId: junctionObject.id,+ relationTargetFieldMetadataId: junctionSourceField.id,+ sourceObjectMetadataId: sourceObject.id,+ };++ expect(+ resolveJunctionConfig({+ ...resolverArgs,+ objectMetadataItems: metadataItems,+ }),+ ).toMatchObject({+ direction: 'reverse',+ sourceField: { id: junctionSourceField.id },+ targetFields: [{ id: morphOwnerField.id }],+ isMorphRelation: true,+ });++ const metadataWithUnreferencedOwner = metadataItems.map((item) =>+ item.id === ownerObject.id+ ? {+ ...item,+ fields: [+ ...item.fields,+ {+ ...ownerJunctionField,+ id: 'duplicate-owner-junction-field-id',+ name: 'duplicateJunctionObjects',+ },+ ],+ }+ : item,+ );++ expect(+ resolveJunctionConfig({+ ...resolverArgs,+ objectMetadataItems: metadataWithUnreferencedOwner,+ }),+ ).toMatchObject({+ direction: 'reverse',+ isValid: true,+ junctionObjectMetadata: { id: junctionObject.id },+ sourceField: { id: junctionSourceField.id },+ targetFields: [{ id: morphOwnerField.id }],+ isMorphRelation: true,+ });+ });++ it('keeps an explicit junction fail-closed when target metadata is absent', () => {+ expect(+ resolveJunctionConfig({+ settings: { junctionTargetFieldId: 'missing-target-field-id' },+ relationObjectMetadataId: 'missing-junction-object-id',+ sourceObjectMetadataId: 'source-object-id',+ objectMetadataItems: [],+ }),+ ).toEqual({+ targetFields: [],+ isMorphRelation: false,+ direction: 'forward',+ isValid: false,+ });+ });+});diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/resolveReverseJunctionConfig.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/resolveReverseJunctionConfig.test.tsnew file mode 100644index 00000000000..201ac3de03c--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/resolveReverseJunctionConfig.test.ts@@ -0,0 +1,625 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { generateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields';+import { resolveReverseJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveReverseJunctionConfig';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { RelationType } from 'twenty-shared/types';++const cloneRelationPair = ({+ ownerField,+ junctionField,+ ownerFieldId,+ junctionFieldId,+ ownerFieldSettings,+}: {+ ownerField: FieldMetadataItem;+ junctionField: FieldMetadataItem;+ ownerFieldId: string;+ junctionFieldId: string;+ ownerFieldSettings: FieldMetadataItem['settings'];+}) => {+ const ownerRelation = ownerField.relation;+ const junctionRelation = junctionField.relation;++ if (!ownerRelation || !junctionRelation) {+ throw new Error('Relation pair not found');+ }++ return {+ ownerField: {+ ...ownerField,+ id: ownerFieldId,+ settings: ownerFieldSettings,+ relation: {+ ...ownerRelation,+ sourceFieldMetadata: {+ ...ownerRelation.sourceFieldMetadata,+ id: ownerFieldId,+ },+ targetFieldMetadata: {+ ...ownerRelation.targetFieldMetadata,+ id: junctionFieldId,+ },+ },+ },+ junctionField: {+ ...junctionField,+ id: junctionFieldId,+ relation: {+ ...junctionRelation,+ sourceFieldMetadata: {+ ...junctionRelation.sourceFieldMetadata,+ id: junctionFieldId,+ },+ targetFieldMetadata: {+ ...junctionRelation.targetFieldMetadata,+ id: ownerFieldId,+ },+ },+ },+ };+};++describe('resolveReverseJunctionConfig', () => {+ const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();+ const companyMetadata = getMockObjectMetadataItemOrThrow('company');++ it.each([+ {+ reverseFieldName: 'noteTargets',+ junctionObjectNameSingular: 'noteTarget',+ targetFieldName: 'note',+ },+ {+ reverseFieldName: 'taskTargets',+ junctionObjectNameSingular: 'taskTarget',+ targetFieldName: 'task',+ },+ ])(+ 'normalizes $reverseFieldName into source and target fields',+ ({ reverseFieldName, junctionObjectNameSingular, targetFieldName }) => {+ const reverseField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: companyMetadata,+ fieldName: reverseFieldName,+ });+ const junctionObjectMetadata = getMockObjectMetadataItemOrThrow(+ junctionObjectNameSingular,+ );++ const result = resolveReverseJunctionConfig({+ junctionObjectMetadataId: junctionObjectMetadata.id,+ relationTargetFieldMetadataId:+ reverseField.relation?.targetFieldMetadata.id,+ sourceObjectMetadataId: companyMetadata.id,+ objectMetadataItems,+ });++ expect(result).toMatchObject({+ status: 'resolved',+ junctionConfig: {+ junctionObjectMetadata: { id: junctionObjectMetadata.id },+ sourceField: { id: reverseField.relation?.targetFieldMetadata.id },+ targetFields: [{ name: targetFieldName }],+ isMorphRelation: false,+ },+ });+ },+ );++ it('resolves a merged morph relation through its physical member ID', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');+ const targetField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskTargetMetadata,+ fieldName: 'target',+ });+ const rocketTargetMemberId = targetField.morphRelations?.find(+ (relation) =>+ relation.targetObjectMetadata.id === rocketMetadata.id &&+ relation.sourceFieldMetadata.id !== targetField.id,+ )?.sourceFieldMetadata.id;+ const configuredTargetMemberId = targetField.morphRelations?.find(+ (relation) => relation.sourceFieldMetadata.id !== rocketTargetMemberId,+ )?.sourceFieldMetadata.id;+ const mismatchedTargetMemberId = targetField.morphRelations?.find(+ (relation) =>+ relation.sourceFieldMetadata.id !== rocketTargetMemberId &&+ relation.sourceFieldMetadata.id !== targetField.id,+ )?.sourceFieldMetadata.id;++ if (+ !rocketTargetMemberId ||+ !configuredTargetMemberId ||+ !mismatchedTargetMemberId+ ) {+ throw new Error('Task target morph members not found');+ }++ const metadataWithPhysicalMorphMemberSetting = objectMetadataItems.map(+ (item) =>+ item.id === taskMetadata.id+ ? {+ ...item,+ fields: item.fields.map((field) =>+ field.id === taskTargetsField.id+ ? {+ ...field,+ settings: {+ ...field.settings,+ junctionTargetFieldId: configuredTargetMemberId,+ },+ }+ : field,+ ),+ }+ : item,+ );++ expect(+ resolveReverseJunctionConfig({+ junctionObjectMetadataId: taskTargetMetadata.id,+ relationTargetFieldMetadataId: rocketTargetMemberId,+ sourceObjectMetadataId: rocketMetadata.id,+ objectMetadataItems: metadataWithPhysicalMorphMemberSetting,+ }),+ ).toMatchObject({+ status: 'resolved',+ junctionConfig: {+ sourceField: { id: targetField.id },+ targetFields: [{ name: 'task' }],+ isConfiguredOnOwningSide: true,+ },+ });++ expect(+ resolveReverseJunctionConfig({+ junctionObjectMetadataId: taskTargetMetadata.id,+ relationTargetFieldMetadataId: mismatchedTargetMemberId,+ sourceObjectMetadataId: rocketMetadata.id,+ objectMetadataItems: metadataWithPhysicalMorphMemberSetting,+ }),+ ).toEqual({ status: 'invalid' });+ });++ it('returns not-found when no junction targets the source object', () => {+ expect(+ resolveReverseJunctionConfig({+ junctionObjectMetadataId:+ getMockObjectMetadataItemOrThrow('noteTarget').id,+ relationTargetFieldMetadataId: 'unsupported-target-field-id',+ sourceObjectMetadataId: 'unsupported-object-id',+ objectMetadataItems,+ }),+ ).toEqual({ status: 'not-found' });+ });++ it('collapses distinct owning-object branches of the same morph field', () => {+ const petMetadata = getMockObjectMetadataItemOrThrow('pet');+ const caretakersField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: petMetadata,+ fieldName: 'caretakers',+ });+ const petCareAgreementMetadata =+ getMockObjectMetadataItemOrThrow('petCareAgreement');++ expect(+ resolveReverseJunctionConfig({+ junctionObjectMetadataId: petCareAgreementMetadata.id,+ relationTargetFieldMetadataId:+ caretakersField.relation?.targetFieldMetadata.id,+ sourceObjectMetadataId: petMetadata.id,+ objectMetadataItems,+ }),+ ).toMatchObject({+ status: 'resolved',+ junctionConfig: {+ sourceField: { name: 'pet' },+ targetFields: [{ name: 'caretaker' }],+ isMorphRelation: true,+ },+ });+ });++ it('ignores an invalid configuration for another inverse field on the same junction', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const rocketTaskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: rocketMetadata,+ fieldName: 'taskTargets',+ });+ const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');+ const taskField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskTargetMetadata,+ fieldName: 'task',+ });+ const stalePair = cloneRelationPair({+ ownerField: taskTargetsField,+ junctionField: taskField,+ ownerFieldId: 'stale-task-targets-field-id',+ junctionFieldId: 'stale-task-field-id',+ ownerFieldSettings: {+ junctionTargetFieldId: 'missing-target-field-id',+ },+ });++ const objectMetadataItemsWithUnrelatedInvalidConfig =+ objectMetadataItems.map((item) => {+ if (item.id === taskMetadata.id) {+ return {+ ...item,+ fields: [+ ...item.fields.map((field) =>+ field.id === taskTargetsField.id+ ? { ...field, settings: undefined }+ : field,+ ),+ stalePair.ownerField,+ ],+ };+ }++ return item.id === taskTargetMetadata.id+ ? { ...item, fields: [...item.fields, stalePair.junctionField] }+ : item;+ });++ expect(+ resolveReverseJunctionConfig({+ junctionObjectMetadataId: taskTargetMetadata.id,+ relationTargetFieldMetadataId:+ rocketTaskTargetsField.relation?.targetFieldMetadata.id,+ sourceObjectMetadataId: rocketMetadata.id,+ objectMetadataItems: objectMetadataItemsWithUnrelatedInvalidConfig,+ }),+ ).toMatchObject({+ status: 'resolved',+ junctionConfig: {+ sourceField: { name: 'target' },+ targetFields: [{ name: 'task' }],+ },+ });+ });++ it('ignores an owner-shaped field that is not the declared inverse edge', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const rocketTaskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: rocketMetadata,+ fieldName: 'taskTargets',+ });+ const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');++ if (!taskTargetsField.relation || !rocketTaskTargetsField.relation) {+ throw new Error('Task targets relation not found');+ }++ const taskTargetsRelation = taskTargetsField.relation;+ const rocketTaskTargetsRelation = rocketTaskTargetsField.relation;+ const objectMetadataItemsWithUnreferencedDuplicate =+ objectMetadataItems.map((item) =>+ item.id === taskMetadata.id+ ? {+ ...item,+ fields: [+ ...item.fields,+ {+ ...taskTargetsField,+ id: 'unreferenced-task-targets-field-id',+ name: 'unreferencedTaskTargets',+ relation: {+ ...taskTargetsRelation,+ sourceFieldMetadata: {+ ...taskTargetsRelation.sourceFieldMetadata,+ id: 'unreferenced-task-targets-field-id',+ name: 'unreferencedTaskTargets',+ },+ },+ },+ ],+ }+ : item,+ );++ expect(+ resolveReverseJunctionConfig({+ junctionObjectMetadataId: taskTargetMetadata.id,+ relationTargetFieldMetadataId:+ rocketTaskTargetsRelation.targetFieldMetadata.id,+ sourceObjectMetadataId: rocketMetadata.id,+ objectMetadataItems: objectMetadataItemsWithUnreferencedDuplicate,+ }),+ ).toMatchObject({+ status: 'resolved',+ junctionConfig: {+ sourceField: { name: 'target' },+ targetFields: [{ name: 'task' }],+ isConfiguredOnOwningSide: true,+ },+ });+ });++ it('returns ambiguous when two declared inverse edges target the same reverse field', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const rocketTaskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: rocketMetadata,+ fieldName: 'taskTargets',+ });+ const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');+ const taskField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskTargetMetadata,+ fieldName: 'task',+ });++ const duplicateOwnerFieldId = 'duplicate-task-targets-field-id';+ const duplicateJunctionFieldId = 'duplicate-task-field-id';+ const duplicatePair = cloneRelationPair({+ ownerField: taskTargetsField,+ junctionField: taskField,+ ownerFieldId: duplicateOwnerFieldId,+ junctionFieldId: duplicateJunctionFieldId,+ ownerFieldSettings: taskTargetsField.settings,+ });+ const metadataWithTwoDeclaredInverseEdges = objectMetadataItems.map(+ (item) => {+ if (item.id === taskMetadata.id) {+ return {+ ...item,+ fields: [...item.fields, duplicatePair.ownerField],+ };+ }++ if (item.id === taskTargetMetadata.id) {+ return {+ ...item,+ fields: [...item.fields, duplicatePair.junctionField],+ };+ }++ return item;+ },+ );++ expect(+ resolveReverseJunctionConfig({+ junctionObjectMetadataId: taskTargetMetadata.id,+ relationTargetFieldMetadataId:+ rocketTaskTargetsField.relation?.targetFieldMetadata.id,+ sourceObjectMetadataId: rocketMetadata.id,+ objectMetadataItems: metadataWithTwoDeclaredInverseEdges,+ }),+ ).toEqual({ status: 'ambiguous' });+ });++ it('returns invalid instead of falling back when the only configured target is stale', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const rocketTaskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: rocketMetadata,+ fieldName: 'taskTargets',+ });+ const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');+ const metadataWithStaleTarget = objectMetadataItems.map((item) =>+ item.id === taskMetadata.id+ ? {+ ...item,+ fields: item.fields.map((field) =>+ field.id === taskTargetsField.id+ ? {+ ...field,+ settings: {+ ...field.settings,+ junctionTargetFieldId: 'missing-target-field-id',+ },+ }+ : field,+ ),+ }+ : item,+ );++ expect(+ resolveReverseJunctionConfig({+ junctionObjectMetadataId: taskTargetMetadata.id,+ relationTargetFieldMetadataId:+ rocketTaskTargetsField.relation?.targetFieldMetadata.id,+ sourceObjectMetadataId: rocketMetadata.id,+ objectMetadataItems: metadataWithStaleTarget,+ }),+ ).toEqual({ status: 'invalid' });+ });++ it('returns invalid when a candidate no longer points to its declared endpoints', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const rocketTaskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: rocketMetadata,+ fieldName: 'taskTargets',+ });+ const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');+ const taskTargetSourceFieldId =+ taskTargetsField.relation?.targetFieldMetadata.id;+ const taskTargetTargetFieldId =+ rocketTaskTargetsField.relation?.targetFieldMetadata.id;+ const metadataWithInvalidSourceEndpoint = objectMetadataItems.map((item) =>+ item.id === taskTargetMetadata.id+ ? {+ ...item,+ fields: item.fields.map((field) =>+ field.id === taskTargetSourceFieldId && field.relation+ ? {+ ...field,+ relation: {+ ...field.relation,+ targetObjectMetadata: {+ ...field.relation.targetObjectMetadata,+ id: 'missing-owner-object-id',+ },+ },+ }+ : field,+ ),+ }+ : item,+ );+ const metadataWithInvalidSourceOwnership = objectMetadataItems.map((item) =>+ item.id === taskTargetMetadata.id+ ? {+ ...item,+ fields: item.fields.map((field) =>+ field.id === taskTargetSourceFieldId && field.relation+ ? {+ ...field,+ relation: {+ ...field.relation,+ sourceObjectMetadata: {+ ...field.relation.sourceObjectMetadata,+ id: 'misowned-junction-object-id',+ },+ },+ }+ : field,+ ),+ }+ : item,+ );+ const metadataWithInvalidTargetEndpoint = objectMetadataItems.map((item) =>+ item.id === taskTargetMetadata.id+ ? {+ ...item,+ fields: item.fields.map((field) =>+ field.id === taskTargetTargetFieldId+ ? {+ ...field,+ morphRelations: field.morphRelations?.map((relation) =>+ relation.targetObjectMetadata.id === rocketMetadata.id+ ? {+ ...relation,+ targetObjectMetadata: {+ ...relation.targetObjectMetadata,+ id: 'missing-source-object-id',+ },+ }+ : relation,+ ),+ }+ : field,+ ),+ }+ : item,+ );+ const resolverArgs = {+ junctionObjectMetadataId: taskTargetMetadata.id,+ relationTargetFieldMetadataId: taskTargetTargetFieldId,+ sourceObjectMetadataId: rocketMetadata.id,+ };++ for (const metadataItems of [+ metadataWithInvalidSourceEndpoint,+ metadataWithInvalidSourceOwnership,+ metadataWithInvalidTargetEndpoint,+ ]) {+ expect(+ resolveReverseJunctionConfig({+ ...resolverArgs,+ objectMetadataItems: metadataItems,+ }),+ ).toEqual({ status: 'invalid' });+ }+ });++ it('returns invalid when the normalized target is not many-to-one', () => {+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');+ const taskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: taskMetadata,+ fieldName: 'taskTargets',+ });+ const rocketMetadata = getMockObjectMetadataItemOrThrow('rocket');+ const rocketTaskTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: rocketMetadata,+ fieldName: 'taskTargets',+ });+ const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');+ const taskTargetSourceFieldId =+ taskTargetsField.relation?.targetFieldMetadata.id;+ const metadataWithInvalidNormalizedTarget = objectMetadataItems.map(+ (item) =>+ item.id === taskTargetMetadata.id+ ? {+ ...item,+ fields: item.fields.map((field) =>+ field.id === taskTargetSourceFieldId && field.relation+ ? {+ ...field,+ relation: {+ ...field.relation,+ type: RelationType.ONE_TO_MANY,+ },+ }+ : field,+ ),+ }+ : item,+ );++ expect(+ resolveReverseJunctionConfig({+ junctionObjectMetadataId: taskTargetMetadata.id,+ relationTargetFieldMetadataId:+ rocketTaskTargetsField.relation?.targetFieldMetadata.id,+ sourceObjectMetadataId: rocketMetadata.id,+ objectMetadataItems: metadataWithInvalidNormalizedTarget,+ }),+ ).toEqual({ status: 'invalid' });+ });++ it('generates reverse relation fields without activity-specific names', () => {+ const noteTargetsField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: companyMetadata,+ fieldName: 'noteTargets',+ });++ const result = generateDepthRecordGqlFieldsFromFields({+ objectMetadataItems,+ sourceObjectMetadataItem: companyMetadata,+ fields: [noteTargetsField],+ depth: 1,+ });++ expect(result).toMatchObject({+ noteTargets: {+ id: true,+ note: {+ id: true,+ title: true,+ },+ },+ });+ });+});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 0c84c730d69..aa47d9d6cdc 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,4 +1,5 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { doesFieldMetadataItemMatchFieldMetadataId } from '@/object-metadata/utils/doesFieldMetadataItemMatchFieldMetadataId';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';@@ -29,6 +30,14 @@ export const getJunctionConfig = ({return null;}+ const findFieldById = (fieldMetadataId: string) =>+ junctionObjectMetadata.fields.find((fieldMetadataItem) =>+ doesFieldMetadataItemMatchFieldMetadataId({+ fieldMetadataItem,+ fieldMetadataId,+ }),+ );+const findSourceField = (excludeFieldId?: string,): FieldMetadataItem | undefined => {@@ -60,14 +69,10 @@ export const getJunctionConfig = ({const hasConfiguredTargetField = hasJunctionTargetFieldId(settings);const configuredTargetField = hasConfiguredTargetField- ? junctionObjectMetadata.fields.find(- (field) => field.id === settings.junctionTargetFieldId,- )+ ? findFieldById(settings.junctionTargetFieldId): undefined;const relationSourceField = isDefined(relationTargetFieldMetadataId)- ? junctionObjectMetadata.fields.find(- (field) => field.id === relationTargetFieldMetadataId,- )+ ? findFieldById(relationTargetFieldMetadataId): undefined;const sourceField =relationSourceField ?? findSourceField(configuredTargetField?.id);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 ca2eaadd2bc..937029faa5b 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,7 @@import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { getFieldRelations } from '@/object-record/record-field/ui/utils/junction/getFieldRelations';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// collect every object resolved as a junction.@@ -10,21 +10,20 @@ export const getJunctionObjectMetadataIds = (): Set<string> =>new Set(objectMetadataItems.flatMap((objectMetadataItem) =>- objectMetadataItem.fields- .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),+ objectMetadataItem.fields.flatMap((field) =>+ getFieldRelations(field)+ .filter((relation) =>+ isUsableJunctionConfig(+ getJunctionConfig({+ settings: field.settings,+ relationObjectMetadataId: relation.targetObjectMetadata.id,+ relationTargetFieldMetadataId: relation.targetFieldMetadata.id,+ sourceObjectMetadataId: objectMetadataItem.id,+ objectMetadataItems,+ }),+ ),+ )+ .map((relation) => relation.targetObjectMetadata.id),+ ),),);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.tsdeleted file mode 100644index 5f2b7500799..00000000000--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getReverseJunctionConfig.ts+++ /dev/null@@ -1,76 +0,0 @@-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 = {- junctionObjectMetadata: JunctionObjectMetadataItem;- relatedObjectMetadata: JunctionObjectMetadataItem;- relationFieldName: string;-};--type GetReverseJunctionConfigArgs = {- junctionObjectMetadataId?: string;- sourceObjectMetadataId?: string;- objectMetadataItems: JunctionObjectMetadataItem[];-};--// Only the owning side of a junction carries the junction settings, so reaching the owner-// from one of its targets means looking for the object whose junction field points here.-export const getReverseJunctionConfig = ({- junctionObjectMetadataId,- sourceObjectMetadataId,- objectMetadataItems,-}: GetReverseJunctionConfigArgs): ReverseJunctionConfig | null => {- if (- !isDefined(junctionObjectMetadataId) ||- !isDefined(sourceObjectMetadataId)- ) {- return null;- }-- for (const relatedObjectMetadata of objectMetadataItems) {- for (const forwardJunctionField of relatedObjectMetadata.fields) {- if (- forwardJunctionField.relation?.targetObjectMetadata.id !==- junctionObjectMetadataId- ) {- continue;- }-- const junctionConfig = getJunctionConfig({- settings: forwardJunctionField.settings,- relationObjectMetadataId: junctionObjectMetadataId,- relationTargetFieldMetadataId:- forwardJunctionField.relation?.targetFieldMetadata.id,- sourceObjectMetadataId: relatedObjectMetadata.id,- objectMetadataItems,- });-- if (- !isUsableJunctionConfig(junctionConfig) ||- !isDefined(junctionConfig.sourceField)- ) {- continue;- }-- const targetsSourceObject = junctionConfig.targetFields.some(- (targetField) =>- getTargetObjectMetadataIdsFromField(targetField).includes(- sourceObjectMetadataId,- ),- );-- if (targetsSourceObject) {- return {- junctionObjectMetadata: junctionConfig.junctionObjectMetadata,- relatedObjectMetadata,- relationFieldName: junctionConfig.sourceField.name,- };- }- }- }-- return null;-};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 20e97bfeef8..96abad2dafe 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@@ -1,9 +1,9 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';import { type ObjectPermissions } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -32,7 +32,7 @@ export const isJunctionRelationForbidden = ({return false;}- const junctionConfig = getJunctionConfig({+ const junctionConfig = resolveJunctionConfig({settings: fieldMetadataItem.settings,relationObjectMetadataId: junctionObjectMetadataId,relationTargetFieldMetadataId: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.tsindex 0bc489e1ec2..de60b5d4237 100644--- 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.ts@@ -1,5 +1,7 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { doesFieldMetadataItemMatchFieldMetadataId } from '@/object-metadata/utils/doesFieldMetadataItemMatchFieldMetadataId';import { getFieldRelations } from '@/object-record/record-field/ui/utils/junction/getFieldRelations';+import { isDefined } from 'twenty-shared/utils';import { RelationType } from '~/generated-metadata/graphql';export const isValidJunctionTargetField = ({@@ -17,10 +19,10 @@ export const isValidJunctionTargetField = ({return (relations.length > 0 &&relations.every(({ type }) => type === RelationType.MANY_TO_ONE) &&- fieldMetadataItem.id !== sourceFieldMetadataId &&- relations.every(- ({ sourceFieldMetadata }) =>- sourceFieldMetadata.id !== sourceFieldMetadataId,- )+ (!isDefined(sourceFieldMetadataId) ||+ !doesFieldMetadataItemMatchFieldMetadataId({+ fieldMetadataItem,+ fieldMetadataId: sourceFieldMetadataId,+ })));};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/resolveJunctionConfig.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/resolveJunctionConfig.tsnew file mode 100644index 00000000000..c2c33db86ac--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/resolveJunctionConfig.ts@@ -0,0 +1,139 @@+import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { resolveReverseJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveReverseJunctionConfig';+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 { type ValidResolvedJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig';+import { hasJunctionTargetFieldId } from '@/object-record/record-field/ui/utils/junction/hasJunctionTargetFieldId';+import { isDefined } from 'twenty-shared/utils';++type JunctionDirection = 'forward' | 'reverse';++type InvalidResolvedJunctionConfig = {+ junctionObjectMetadata?: JunctionObjectMetadataItem;+ targetFields: [];+ sourceField?: never;+ isMorphRelation: false;+ direction: JunctionDirection;+ isValid: false;+};++type ResolvedJunctionConfig =+ | ValidResolvedJunctionConfig+ | InvalidResolvedJunctionConfig;++type ResolveJunctionConfigArgs = Parameters<typeof getJunctionConfig>[0];++const toValidResolvedJunctionConfig = (+ junctionConfig: ValidJunctionConfig,+ direction: JunctionDirection,+): ValidResolvedJunctionConfig => ({+ junctionObjectMetadata: junctionConfig.junctionObjectMetadata,+ sourceField: junctionConfig.sourceField,+ targetFields: junctionConfig.targetFields,+ isMorphRelation: junctionConfig.isMorphRelation,+ direction,+ isValid: true,+});++const getInvalidResolvedJunctionConfig = ({+ junctionObjectMetadataId,+ direction,+ objectMetadataItems,+}: {+ junctionObjectMetadataId: string;+ direction: JunctionDirection;+ objectMetadataItems: JunctionObjectMetadataItem[];+}): InvalidResolvedJunctionConfig => {+ const junctionObjectMetadata = objectMetadataItems.find(+ ({ id }) => id === junctionObjectMetadataId,+ );++ return {+ ...(isDefined(junctionObjectMetadata) ? { junctionObjectMetadata } : {}),+ targetFields: [],+ isMorphRelation: false,+ direction,+ isValid: false,+ };+};++export const resolveJunctionConfig = ({+ settings,+ relationObjectMetadataId,+ relationTargetFieldMetadataId,+ sourceObjectMetadataId,+ objectMetadataItems,+}: ResolveJunctionConfigArgs): ResolvedJunctionConfig | null => {+ const forwardJunctionConfig = getJunctionConfig({+ settings,+ relationObjectMetadataId,+ relationTargetFieldMetadataId,+ sourceObjectMetadataId,+ objectMetadataItems,+ });++ const isConfiguredOnCurrentField = hasJunctionTargetFieldId(settings);++ if (isConfiguredOnCurrentField) {+ if (forwardJunctionConfig?.isValid) {+ return toValidResolvedJunctionConfig(forwardJunctionConfig, 'forward');+ }++ return getInvalidResolvedJunctionConfig({+ junctionObjectMetadataId: relationObjectMetadataId,+ direction: 'forward',+ objectMetadataItems,+ });+ }++ const reverseJunctionResolution = resolveReverseJunctionConfig({+ junctionObjectMetadataId: relationObjectMetadataId,+ relationTargetFieldMetadataId,+ sourceObjectMetadataId,+ objectMetadataItems,+ });++ if (+ reverseJunctionResolution.status === 'ambiguous' ||+ reverseJunctionResolution.status === 'invalid'+ ) {+ return getInvalidResolvedJunctionConfig({+ junctionObjectMetadataId: relationObjectMetadataId,+ direction: 'reverse',+ objectMetadataItems,+ });+ }++ const reverseJunctionConfig =+ reverseJunctionResolution.status === 'resolved'+ ? reverseJunctionResolution.junctionConfig+ : null;++ if (reverseJunctionConfig?.isConfiguredOnOwningSide) {+ return toValidResolvedJunctionConfig(reverseJunctionConfig, 'reverse');+ }++ if (isDefined(forwardJunctionConfig) && isDefined(reverseJunctionConfig)) {+ return getInvalidResolvedJunctionConfig({+ junctionObjectMetadataId: relationObjectMetadataId,+ direction: 'reverse',+ objectMetadataItems,+ });+ }++ if (isDefined(forwardJunctionConfig)) {+ return !forwardJunctionConfig.isValid+ ? getInvalidResolvedJunctionConfig({+ junctionObjectMetadataId: relationObjectMetadataId,+ direction: 'forward',+ objectMetadataItems,+ })+ : toValidResolvedJunctionConfig(forwardJunctionConfig, 'forward');+ }++ if (isDefined(reverseJunctionConfig)) {+ return toValidResolvedJunctionConfig(reverseJunctionConfig, 'reverse');+ }++ return null;+};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/resolveReverseJunctionConfig.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/resolveReverseJunctionConfig.tsnew file mode 100644index 00000000000..20d6e5fcd28--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/resolveReverseJunctionConfig.ts@@ -0,0 +1,279 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { type FieldMetadataItemRelation } from '@/object-metadata/types/FieldMetadataItemRelation';+import { doesFieldMetadataItemMatchFieldMetadataId } from '@/object-metadata/utils/doesFieldMetadataItemMatchFieldMetadataId';+import { getFieldRelations } from '@/object-record/record-field/ui/utils/junction/getFieldRelations';+import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { hasJunctionTargetFieldId } from '@/object-record/record-field/ui/utils/junction/hasJunctionTargetFieldId';+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';+import { isValidJunctionTargetField } from '@/object-record/record-field/ui/utils/junction/isValidJunctionTargetField';+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 { isDefined } from 'twenty-shared/utils';++type ReverseJunctionConfig = ValidJunctionConfig & {+ isConfiguredOnOwningSide: boolean;+};++type ReverseJunctionConfigResolution =+ | { status: 'resolved'; junctionConfig: ReverseJunctionConfig }+ | { status: 'ambiguous' }+ | { status: 'invalid' }+ | { status: 'not-found' };++type ResolveReverseJunctionConfigArgs = {+ junctionObjectMetadataId?: string;+ relationTargetFieldMetadataId?: string;+ sourceObjectMetadataId?: string;+ objectMetadataItems: JunctionObjectMetadataItem[];+};++const matchesFieldId = (field: FieldMetadataItem, fieldMetadataId: string) =>+ doesFieldMetadataItemMatchFieldMetadataId({+ fieldMetadataItem: field,+ fieldMetadataId,+ });++const findFieldById = (fields: FieldMetadataItem[], fieldMetadataId: string) =>+ fields.find((field) => matchesFieldId(field, fieldMetadataId));++const findRelationByFieldId = (+ field: FieldMetadataItem,+ fieldMetadataId: string,+ targetObjectMetadataId: string,+) =>+ getFieldRelations(field).find(+ (relation) =>+ relation.targetObjectMetadata.id === targetObjectMetadataId &&+ (field.id === fieldMetadataId ||+ relation.sourceFieldMetadata.id === fieldMetadataId),+ );++const findReciprocalField = ({+ junctionField,+ junctionRelation,+ junctionObjectMetadataId,+ objectMetadataItems,+}: {+ junctionField: FieldMetadataItem;+ junctionRelation: FieldMetadataItemRelation;+ junctionObjectMetadataId: string;+ objectMetadataItems: JunctionObjectMetadataItem[];+}) => {+ const objectMetadataItem = objectMetadataItems.find(+ ({ id }) => id === junctionRelation.targetObjectMetadata.id,+ );+ const fieldMetadataItem = isDefined(objectMetadataItem)+ ? findFieldById(+ objectMetadataItem.fields,+ junctionRelation.targetFieldMetadata.id,+ )+ : undefined;+ const reciprocalRelation = isDefined(fieldMetadataItem)+ ? findRelationByFieldId(+ fieldMetadataItem,+ junctionRelation.targetFieldMetadata.id,+ junctionObjectMetadataId,+ )+ : undefined;++ return isDefined(objectMetadataItem) &&+ isDefined(fieldMetadataItem) &&+ isDefined(reciprocalRelation) &&+ junctionRelation.sourceObjectMetadata.id === junctionObjectMetadataId &&+ reciprocalRelation.sourceObjectMetadata.id === objectMetadataItem.id &&+ matchesFieldId(junctionField, reciprocalRelation.targetFieldMetadata.id)+ ? { objectMetadataItem, fieldMetadataItem }+ : undefined;+};++// Junction relation metadata already names its inverse field. Following those+// edges keeps unrelated fields elsewhere in the workspace out of resolution.+export const resolveReverseJunctionConfig = ({+ junctionObjectMetadataId,+ relationTargetFieldMetadataId,+ sourceObjectMetadataId,+ objectMetadataItems,+}: ResolveReverseJunctionConfigArgs): ReverseJunctionConfigResolution => {+ if (+ !isDefined(junctionObjectMetadataId) ||+ !isDefined(relationTargetFieldMetadataId) ||+ !isDefined(sourceObjectMetadataId)+ ) {+ return { status: 'not-found' };+ }++ const junctionObjectMetadata = objectMetadataItems.find(+ ({ id }) => id === junctionObjectMetadataId,+ );+ const reverseSourceField = isDefined(junctionObjectMetadata)+ ? findFieldById(+ junctionObjectMetadata.fields,+ relationTargetFieldMetadataId,+ )+ : undefined;++ if (!isDefined(junctionObjectMetadata) || !isDefined(reverseSourceField)) {+ return { status: 'not-found' };+ }++ const declaredInverseEdges = junctionObjectMetadata.fields.flatMap(+ (targetField) =>+ targetField.id === reverseSourceField.id+ ? []+ : getFieldRelations(targetField).map((relation) => ({+ targetField,+ relation,+ owner: findReciprocalField({+ junctionField: targetField,+ junctionRelation: relation,+ junctionObjectMetadataId,+ objectMetadataItems,+ }),+ })),+ );++ if (!isValidJunctionTargetField({ fieldMetadataItem: reverseSourceField })) {+ const hasConfiguredOwner = declaredInverseEdges.some(+ ({ owner }) =>+ isDefined(owner) &&+ hasJunctionTargetFieldId(owner.fieldMetadataItem.settings) &&+ matchesFieldId(+ reverseSourceField,+ owner.fieldMetadataItem.settings.junctionTargetFieldId,+ ),+ );++ return hasConfiguredOwner ? { status: 'invalid' } : { status: 'not-found' };+ }++ const reverseSourceRelation = findRelationByFieldId(+ reverseSourceField,+ relationTargetFieldMetadataId,+ sourceObjectMetadataId,+ );++ if (!isDefined(reverseSourceRelation)) {+ return { status: 'invalid' };+ }++ if (+ !isDefined(+ findReciprocalField({+ junctionField: reverseSourceField,+ junctionRelation: reverseSourceRelation,+ junctionObjectMetadataId,+ objectMetadataItems,+ }),+ )+ ) {+ return { status: 'invalid' };+ }++ const configuredCandidates = new Map<string, ReverseJunctionConfig>();+ const inferredCandidates = new Map<string, ReverseJunctionConfig>();+ let hasInvalidConfiguredCandidate = false;+ let hasInvalidConfiguredCandidateForRequestedReverse = false;+ let hasBrokenDeclaredInverseEdge = false;++ for (const { targetField, relation, owner } of declaredInverseEdges) {+ const isValidTargetField = isValidJunctionTargetField({+ fieldMetadataItem: targetField,+ sourceFieldMetadataId: relationTargetFieldMetadataId,+ });++ if (!isDefined(owner)) {+ hasBrokenDeclaredInverseEdge ||= isValidTargetField;+ continue;+ }++ const isConfiguredOnOwningSide = hasJunctionTargetFieldId(+ owner.fieldMetadataItem.settings,+ );+ const isConfiguredForRequestedReverse =+ isConfiguredOnOwningSide &&+ matchesFieldId(+ reverseSourceField,+ owner.fieldMetadataItem.settings.junctionTargetFieldId,+ );+ const markInvalidConfiguredCandidate = () => {+ hasInvalidConfiguredCandidate ||= isConfiguredOnOwningSide;+ hasInvalidConfiguredCandidateForRequestedReverse ||=+ isConfiguredForRequestedReverse;+ };++ const junctionConfig = getJunctionConfig({+ settings: owner.fieldMetadataItem.settings,+ relationObjectMetadataId: junctionObjectMetadataId,+ relationTargetFieldMetadataId: relation.sourceFieldMetadata.id,+ sourceObjectMetadataId: owner.objectMetadataItem.id,+ objectMetadataItems,+ });++ if (+ !isUsableJunctionConfig(junctionConfig) ||+ !isDefined(junctionConfig.sourceField)+ ) {+ markInvalidConfiguredCandidate();+ continue;+ }++ if (+ !junctionConfig.targetFields.some(+ (field) => field.id === reverseSourceField.id,+ )+ ) {+ continue;+ }++ if (+ !isValidTargetField ||+ junctionConfig.sourceField.id !== targetField.id+ ) {+ markInvalidConfiguredCandidate();+ continue;+ }++ const reverseJunctionConfig: ReverseJunctionConfig = {+ junctionObjectMetadata,+ sourceField: reverseSourceField,+ targetFields: [targetField],+ isMorphRelation: targetField.type === FieldMetadataType.MORPH_RELATION,+ isValid: true,+ isConfiguredOnOwningSide,+ };++ (isConfiguredOnOwningSide ? configuredCandidates : inferredCandidates).set(+ targetField.id,+ reverseJunctionConfig,+ );+ }++ if (hasInvalidConfiguredCandidateForRequestedReverse) {+ return { status: 'invalid' };+ }++ if (configuredCandidates.size > 1) {+ return { status: 'ambiguous' };+ }++ const configuredCandidate = configuredCandidates.values().next().value;++ if (isDefined(configuredCandidate)) {+ return { status: 'resolved', junctionConfig: configuredCandidate };+ }++ if (inferredCandidates.size > 1) {+ return { status: 'ambiguous' };+ }++ const inferredCandidate = inferredCandidates.values().next().value;++ if (isDefined(inferredCandidate)) {+ return { status: 'resolved', junctionConfig: inferredCandidate };+ }++ return hasInvalidConfiguredCandidate || hasBrokenDeclaredInverseEdge+ ? { status: 'invalid' }+ : { status: 'not-found' };+};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig.tsnew file mode 100644index 00000000000..64c359a3453--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig.ts@@ -0,0 +1,6 @@+import { type ValidJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig';++export type ValidResolvedJunctionConfig = ValidJunctionConfig & {+ direction: 'forward' | 'reverse';+ 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 2a9999a27dc..6aa9b0a4464 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@@ -6,9 +6,9 @@ import { type RecordField } from '@/object-record/record-field/types/RecordFieldimport { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';import { 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 { getTargetObjectMetadataIdsFromField } from '@/object-record/record-field/ui/utils/junction/getTargetObjectMetadataIdsFromField';import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';+import { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';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';@@ -66,7 +66,7 @@ export const RecordTableCellFieldContextGeneric = ({hasObjectReadPermissions = relationObjectPermissions.canReadObjectRecords;if (hasObjectReadPermissions) {- const junctionConfig = getJunctionConfig({+ const junctionConfig = resolveJunctionConfig({settings: fieldDefinition.metadata.settings,relationObjectMetadataId,relationTargetFieldMetadataId:diff --git a/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts b/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.tsindex 3d53d25c4bf..ef9a4625f3b 100644--- a/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts+++ b/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts@@ -2,8 +2,8 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIteimport { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';import { isDefined } from 'twenty-shared/utils';import { FieldMetadataType } from '~/generated-metadata/graphql';@@ -30,7 +30,7 @@ export const isFieldCellSupported = (// A junction object is a system object on purpose, so the relation holding its records// is still cell-supported even though relations to system objects are not.- const junctionConfig = getJunctionConfig({+ const junctionConfig = resolveJunctionConfig({settings: fieldMetadataItem.settings,relationObjectMetadataId: relationObjectMetadataItemId ?? '',relationTargetFieldMetadataId: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 371c9c9445c..1aab6ed354c 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@@ -6,8 +6,8 @@ import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guarimport { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';import { 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';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';@@ -126,7 +126,7 @@ export const FieldWidget = ({ widget }: FieldWidgetProps) => {}if (isFieldRelation(fieldDefinition)) {- const junctionConfig = getJunctionConfig({+ const junctionConfig = resolveJunctionConfig({settings: fieldDefinition.metadata.settings,relationObjectMetadataId:fieldDefinition.metadata.relationObjectMetadataId,@@ -147,7 +147,7 @@ export const FieldWidget = ({ widget }: FieldWidgetProps) => {fieldDefinition={fieldDefinition}relationValue={record}isInSidePanel={isInSidePanel}- sourceObjectMetadataId={objectMetadataItem.id}+ junctionConfig={junctionConfig}/>);}@@ -163,10 +163,9 @@ export const FieldWidget = ({ widget }: FieldWidgetProps) => {return (<FieldWidgetJunctionRelationField- fieldDefinition={fieldDefinition}relationValue={record}isInSidePanel={isInSidePanel}- sourceObjectMetadataId={objectMetadataItem.id}+ junctionConfig={junctionConfig}/>);}diff --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 dd32b32e986..c5093afd9e9 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@@ -17,8 +17,7 @@ import { usePersistField } from '@/object-record/record-field/ui/hooks/usePersisimport { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';import { 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 { type ValidResolvedJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig';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';@@ -38,14 +37,14 @@ type FieldWidgetJunctionRelationCardProps = {fieldDefinition: FieldDefinition<FieldRelationMetadata>;relationValue: any;isInSidePanel: boolean;- sourceObjectMetadataId: string;+ junctionConfig: ValidResolvedJunctionConfig;};export const FieldWidgetJunctionRelationCard = ({fieldDefinition,relationValue,isInSidePanel,- sourceObjectMetadataId,+ junctionConfig,}: FieldWidgetJunctionRelationCardProps) => {const widget = useCurrentWidget();@@ -71,8 +70,6 @@ export const FieldWidgetJunctionRelationCard = ({);};- const fieldMetadata = fieldDefinition.metadata;-const { objectMetadataItems } = useObjectMetadataItems();const { objectMetadataItem } = useObjectMetadataItem({@@ -114,18 +111,6 @@ export const FieldWidgetJunctionRelationCard = ({});};- const junctionConfig = getJunctionConfig({- settings: fieldMetadata.settings,- relationObjectMetadataId: fieldMetadata.relationObjectMetadataId,- relationTargetFieldMetadataId: fieldMetadata.relationFieldMetadataId,- sourceObjectMetadataId,- objectMetadataItems,- });-- if (!isUsableJunctionConfig(junctionConfig)) {- return null;- }-const junctionRecords = Array.isArray(relationValue) ? relationValue : [];const extractedRecords = extractTargetRecordsFromJunction({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 590456f91c9..c76dc31ff09 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@@ -1,10 +1,7 @@import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { RecordChip } from '@/object-record/components/RecordChip';-import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';-import { 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 { type ValidResolvedJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig';import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';import { styled } from '@linaria/react';import { isDefined } from 'twenty-shared/utils';@@ -23,34 +20,18 @@ const StyledRelationChipsContainer = styled.div``;type FieldWidgetJunctionRelationFieldProps = {- fieldDefinition: FieldDefinition<FieldRelationMetadata>;relationValue: any;isInSidePanel: boolean;- sourceObjectMetadataId: string;+ junctionConfig: ValidResolvedJunctionConfig;};export const FieldWidgetJunctionRelationField = ({- fieldDefinition,relationValue,isInSidePanel,- sourceObjectMetadataId,+ junctionConfig,}: FieldWidgetJunctionRelationFieldProps) => {const { objectMetadataItems } = useObjectMetadataItems();- const fieldMetadata = fieldDefinition.metadata;-- const junctionConfig = getJunctionConfig({- settings: fieldMetadata.settings,- relationObjectMetadataId: fieldMetadata.relationObjectMetadataId,- relationTargetFieldMetadataId: fieldMetadata.relationFieldMetadataId,- sourceObjectMetadataId,- objectMetadataItems,- });-- if (!isUsableJunctionConfig(junctionConfig)) {- return null;- }-const junctionRecords = Array.isArray(relationValue) ? relationValue : [];const extractedRecords = extractTargetRecordsFromJunction({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 01317bbaaa0..e3cff0e9111 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@@ -4,8 +4,8 @@ import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissionsimport { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';import { 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { useFieldWidgetFieldDefinition } from '@/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition';@@ -62,7 +62,7 @@ export const useFieldWidgetActionVisibility = ({);const junctionConfig = isDefined(relationMetadata)- ? getJunctionConfig({+ ? resolveJunctionConfig({settings: relationMetadata.settings,relationObjectMetadataId: relationMetadata.relationObjectMetadataId,relationTargetFieldMetadataId: relationMetadata.relationFieldMetadataId,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 247bb6e88d8..e310a50c37b 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@@ -12,8 +12,8 @@ import { isFieldMorphRelationManyToOne } from '@/object-record/record-field/ui/timport { isFieldMorphRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelationOneToMany';import { 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 { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';@@ -51,7 +51,7 @@ export const useOpenFieldWidgetFieldInputEditMode = () => {recordId: string;}) => {const junctionConfig = isFieldRelationOneToMany(fieldDefinition)- ? getJunctionConfig({+ ? resolveJunctionConfig({settings: fieldDefinition.metadata.settings,relationObjectMetadataId:fieldDefinition.metadata.relationObjectMetadataId,diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressSettingsFormCard.tsxindex 37f6577bc33..9c508d40266 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressSettingsFormCard.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressSettingsFormCard.tsx@@ -6,7 +6,7 @@ import {import { SettingsDataModelFieldPreviewWidget } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget';import { useFormContext } from 'react-hook-form';import { FieldMetadataType } from '~/generated-metadata/graphql';-import { type SettingsDataModelFieldEditFormValues } from '~/pages/settings/data-model/SettingsObjectFieldEdit';+import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';type SettingsDataModelFieldAddressSettingsFormCardProps = {disabled?: boolean;diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanSettingsFormCard.tsxindex fc6d5338e84..2332fad62af 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanSettingsFormCard.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanSettingsFormCard.tsx@@ -7,7 +7,7 @@ import {} from '@/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm';import { SettingsDataModelFieldPreviewWidget } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget';import { FieldMetadataType } from 'twenty-shared/types';-import { type SettingsDataModelFieldEditFormValues } from '~/pages/settings/data-model/SettingsObjectFieldEdit';+import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';type SettingsDataModelFieldBooleanSettingsFormCardProps = {existingFieldMetadataId: string;diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsxindex b36b0b5d54c..a9aef649663 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx@@ -1,29 +1,13 @@-import omit from 'lodash.omit';-import { z } from 'zod';-import { SettingsDataModelPreviewFormCard } from '@/settings/data-model/components/SettingsDataModelPreviewFormCard';-import { SETTINGS_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsFieldTypeConfigs';-import { settingsDataModelFieldAddressFormSchema } from '@/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressForm';import { SettingsDataModelFieldAddressSettingsFormCard } from '@/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressSettingsFormCard';-import { settingsDataModelFieldBooleanFormSchema } from '@/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm';import { SettingsDataModelFieldBooleanSettingsFormCard } from '@/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanSettingsFormCard';import { SettingsDataModelFieldIsUniqueForm } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldIsUniqueForm';import { SettingsDataModelFieldMaxValuesForm } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldMaxValuesForm';-import { settingsDataModelFieldTextFormSchema } from '@/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextForm';import { SettingsDataModelFieldTextSettingsFormCard } from '@/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextSettingsFormCard';-import { settingsDataModelFieldCurrencyFormSchema } from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm';import { SettingsDataModelFieldCurrencySettingsFormCard } from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencySettingsFormCard';-import { settingsDataModelFieldDateFormSchema } from '@/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm';import { SettingsDataModelFieldDateSettingsFormCard } from '@/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateSettingsFormCard';-import { settingsDataModelFieldMorphRelationFormSchema } from '@/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationForm';-import { settingsDataModelFieldNumberFormSchema } from '@/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberForm';import { SettingsDataModelFieldNumberSettingsFormCard } from '@/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberSettingsFormCard';-import { settingsDataModelFieldPhonesFormSchema } from '@/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesForm';import { SettingsDataModelFieldPhonesSettingsFormCard } from '@/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesSettingsFormCard';-import {- settingsDataModelFieldMultiSelectFormSchema,- settingsDataModelFieldSelectFormSchema,-} from '@/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm';import { SettingsDataModelFieldSelectSettingsFormCard } from '@/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectSettingsFormCard';import { SettingsDataModelFieldPreviewWidget } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget';@@ -31,154 +15,9 @@ import { Separator } from '@/settings/components/Separator';import { SettingsDataModelFieldLinksVariantForm } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldLinksVariantForm';import { SettingsDataModelFieldOnClickActionForm } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldOnClickActionForm';import { SettingsDataModelFieldRelationFormCard } from '@/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationFormCard';-import { mergeSettingsSchemas } from '@/settings/data-model/fields/forms/utils/mergeSettingsSchema';-import { settingsDataModelFieldLinksVariantSchema } from '@/settings/data-model/fields/forms/utils/settingsDataModelFieldLinksVariantSchema';-import { settingsDataModelFieldMaxValuesSchema } from '@/settings/data-model/fields/forms/utils/settingsDataModelFieldMaxValuesSchema';-import { settingsDataModelFieldOnClickActionSchema } from '@/settings/data-model/fields/forms/utils/settingsDataModelFieldOnClickActionSchema';import { useFormContext } from 'react-hook-form';import { FieldMetadataType } from '~/generated-metadata/graphql';-import { type SettingsDataModelFieldEditFormValues } from '~/pages/settings/data-model/SettingsObjectFieldEdit';--const isUniqueFieldFormSchema = z.object({- isUnique: z.boolean().nullable().default(false),-});--const booleanFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.BOOLEAN) })- .extend(settingsDataModelFieldBooleanFormSchema.shape);--const currencyFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.CURRENCY) })- .extend(settingsDataModelFieldCurrencyFormSchema.shape);--const dateFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.DATE) })- .extend(settingsDataModelFieldDateFormSchema.shape)- .extend(isUniqueFieldFormSchema.shape);--const dateTimeFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.DATE_TIME) })- .extend(settingsDataModelFieldDateFormSchema.shape)- .extend(isUniqueFieldFormSchema.shape);--const relationFieldFormSchema = z- .object({- type: z.literal(FieldMetadataType.RELATION),- })- .extend(settingsDataModelFieldMorphRelationFormSchema.shape);--const morphRelationFieldFormSchema = z- .object({- type: z.literal(FieldMetadataType.MORPH_RELATION),- })- .extend(settingsDataModelFieldMorphRelationFormSchema.shape);--const selectFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.SELECT) })- .extend(settingsDataModelFieldSelectFormSchema.shape);--const multiSelectFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.MULTI_SELECT) })- .extend(settingsDataModelFieldMultiSelectFormSchema.shape);--const numberFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.NUMBER) })- .extend(settingsDataModelFieldNumberFormSchema.shape)- .extend(isUniqueFieldFormSchema.shape);--const textFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.TEXT) })- .extend(settingsDataModelFieldTextFormSchema.shape)- .extend(isUniqueFieldFormSchema.shape);--const addressFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.ADDRESS) })- .extend(settingsDataModelFieldAddressFormSchema.shape);--const phonesFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.PHONES) })- .extend(settingsDataModelFieldPhonesFormSchema.shape)- .extend(isUniqueFieldFormSchema.shape);--const emailsFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.EMAILS) })- .merge(- mergeSettingsSchemas(- settingsDataModelFieldMaxValuesSchema,- settingsDataModelFieldOnClickActionSchema,- ),- )- .extend(isUniqueFieldFormSchema.shape);--const linksFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.LINKS) })- .merge(- mergeSettingsSchemas(- settingsDataModelFieldMaxValuesSchema,- settingsDataModelFieldOnClickActionSchema,- settingsDataModelFieldLinksVariantSchema,- ),- )- .extend(isUniqueFieldFormSchema.shape);--const arrayFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.ARRAY) })- .merge(mergeSettingsSchemas(settingsDataModelFieldMaxValuesSchema))- .extend(isUniqueFieldFormSchema.shape);--const filesFieldFormSchema = z- .object({ type: z.literal(FieldMetadataType.FILES) })- .merge(mergeSettingsSchemas(settingsDataModelFieldMaxValuesSchema));--const otherFieldsFormSchema = z- .object({- type: z.enum(- Object.keys(- omit(SETTINGS_FIELD_TYPE_CONFIGS, [- FieldMetadataType.BOOLEAN,- FieldMetadataType.CURRENCY,- FieldMetadataType.RELATION,- FieldMetadataType.MORPH_RELATION,- FieldMetadataType.SELECT,- FieldMetadataType.MULTI_SELECT,- FieldMetadataType.DATE,- FieldMetadataType.DATE_TIME,- FieldMetadataType.NUMBER,- FieldMetadataType.ADDRESS,- FieldMetadataType.PHONES,- FieldMetadataType.TEXT,- FieldMetadataType.EMAILS,- FieldMetadataType.LINKS,- FieldMetadataType.ARRAY,- FieldMetadataType.FILES,- ]),- ) as [FieldMetadataType, ...FieldMetadataType[]],- ),- })- .extend(isUniqueFieldFormSchema.shape);--export const settingsDataModelFieldSettingsFormSchema = z.discriminatedUnion(- 'type',- [- booleanFieldFormSchema,- currencyFieldFormSchema,- dateFieldFormSchema,- dateTimeFieldFormSchema,- relationFieldFormSchema,- morphRelationFieldFormSchema,- selectFieldFormSchema,- multiSelectFieldFormSchema,- numberFieldFormSchema,- textFieldFormSchema,- addressFieldFormSchema,- phonesFieldFormSchema,- emailsFieldFormSchema,- linksFieldFormSchema,- arrayFieldFormSchema,- filesFieldFormSchema,- otherFieldsFormSchema,- ],-);+import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';type SettingsDataModelFieldSettingsFormCardProps = {existingFieldMetadataId: string;diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencySettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencySettingsFormCard.tsxindex aaf1eae0512..b4ce8549a7b 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencySettingsFormCard.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencySettingsFormCard.tsx@@ -7,7 +7,7 @@ import {} from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm';import { SettingsDataModelFieldPreviewWidget } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget';import { FieldMetadataType } from 'twenty-shared/types';-import { type SettingsDataModelFieldEditFormValues } from '~/pages/settings/data-model/SettingsObjectFieldEdit';+import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';type SettingsDataModelFieldCurrencySettingsFormCardProps = {disabled?: boolean;diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateSettingsFormCard.tsxindex acd0c2c1bb5..88794df39a9 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateSettingsFormCard.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateSettingsFormCard.tsx@@ -9,7 +9,7 @@ import {} from '@/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm';import { SettingsDataModelFieldPreviewWidget } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget';import { type FieldMetadataType } from 'twenty-shared/types';-import { type SettingsDataModelFieldEditFormValues } from '~/pages/settings/data-model/SettingsObjectFieldEdit';+import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';type SettingsDataModelFieldDateSettingsFormCardProps = {disabled?: boolean;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 63592536dfb..874e442a5a4 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@@ -19,7 +19,7 @@ import {RelationType,FeatureFlagKey,} from '~/generated-metadata/graphql';-import { type SettingsDataModelFieldEditFormValues } from '~/pages/settings/data-model/SettingsObjectFieldEdit';+import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';type SettingsDataModelFieldRelationFormCardProps = {existingFieldMetadataId: string;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 08abde0e975..e54cf1db045 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@@ -7,6 +7,7 @@ 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 { doesFieldMetadataItemMatchFieldMetadataId } from '@/object-metadata/utils/doesFieldMetadataItemMatchFieldMetadataId';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';@@ -14,7 +15,7 @@ import { Select } from '@/ui/input/components/Select';import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/states/isAdvancedModeEnabledState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { RelationType } from '~/generated-metadata/graphql';-import { type SettingsDataModelFieldEditFormValues } from '~/pages/settings/data-model/SettingsObjectFieldEdit';+import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';type SettingsDataModelFieldRelationJunctionFormProps = {objectNameSingular: string;@@ -101,8 +102,16 @@ export const SettingsDataModelFieldRelationJunctionForm = ({}const isJunctionConfigEnabled = isDefined(junctionTargetFieldId);+ const selectedJunctionTargetFieldId = isDefined(junctionTargetFieldId)+ ? (junctionObjectMetadataItem.fields.find((fieldMetadataItem) =>+ doesFieldMetadataItemMatchFieldMetadataId({+ fieldMetadataItem,+ fieldMetadataId: junctionTargetFieldId,+ }),+ )?.id ?? junctionTargetFieldId)+ : undefined;const isConfiguredTargetValid = junctionFieldOptions.some(- ({ value }) => value === junctionTargetFieldId,+ ({ value }) => value === selectedJunctionTargetFieldId,);if (junctionFieldOptions.length === 0 && !isJunctionConfigEnabled) {@@ -169,12 +178,12 @@ export const SettingsDataModelFieldRelationJunctionForm = ({dropdownId="junction-target-field-select"selectSizeVariant="small"dropdownWidth={120}- value={junctionTargetFieldId}+ value={selectedJunctionTargetFieldId}emptyOption={!isConfiguredTargetValid && isDefined(junctionTargetFieldId)? {label: t`Select a valid target`,- value: junctionTargetFieldId,+ value: selectedJunctionTargetFieldId,}: undefined}diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesSettingsFormCard.tsxindex 8f127a693e8..89d66459d16 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesSettingsFormCard.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesSettingsFormCard.tsx@@ -11,7 +11,7 @@ import {import { SettingsDataModelFieldPreviewWidget } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget';import { useFormContext } from 'react-hook-form';import { FieldMetadataType } from 'twenty-shared/types';-import { type SettingsDataModelFieldEditFormValues } from '~/pages/settings/data-model/SettingsObjectFieldEdit';+import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';type SettingsDataModelFieldPhonesSettingsFormCardProps = {disabled?: boolean;diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectSettingsFormCard.tsxindex 71691738e47..5d9d83f3082 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectSettingsFormCard.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectSettingsFormCard.tsx@@ -9,7 +9,7 @@ import {} from '@/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm';import { SettingsDataModelFieldPreviewWidget } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget';import { type FieldMetadataType } from 'twenty-shared/types';-import { type SettingsDataModelFieldEditFormValues } from '~/pages/settings/data-model/SettingsObjectFieldEdit';+import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';type SettingsDataModelFieldSelectOrMultiSelectFormValues = z.infer<| typeof settingsDataModelFieldSelectFormSchemadiff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsDataModelFieldSettingsFormSchema.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsDataModelFieldSettingsFormSchema.tsnew file mode 100644index 00000000000..1cad6a6fc5d--- /dev/null+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsDataModelFieldSettingsFormSchema.ts@@ -0,0 +1,162 @@+import omit from 'lodash.omit';+import { z } from 'zod';++import { SETTINGS_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsFieldTypeConfigs';+import { settingsDataModelFieldAddressFormSchema } from '@/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressForm';+import { settingsDataModelFieldBooleanFormSchema } from '@/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm';+import { settingsDataModelFieldTextFormSchema } from '@/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextForm';+import { settingsDataModelFieldCurrencyFormSchema } from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm';+import { settingsDataModelFieldDateFormSchema } from '@/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm';+import { settingsDataModelFieldMorphRelationFormSchema } from '@/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationForm';+import { settingsDataModelFieldNumberFormSchema } from '@/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberForm';+import { settingsDataModelFieldPhonesFormSchema } from '@/settings/data-model/fields/forms/phones/components/SettingsDataModelFieldPhonesForm';+import {+ settingsDataModelFieldMultiSelectFormSchema,+ settingsDataModelFieldSelectFormSchema,+} from '@/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm';+import { mergeSettingsSchemas } from '@/settings/data-model/fields/forms/utils/mergeSettingsSchema';+import { settingsDataModelFieldLinksVariantSchema } from '@/settings/data-model/fields/forms/utils/settingsDataModelFieldLinksVariantSchema';+import { settingsDataModelFieldMaxValuesSchema } from '@/settings/data-model/fields/forms/utils/settingsDataModelFieldMaxValuesSchema';+import { settingsDataModelFieldOnClickActionSchema } from '@/settings/data-model/fields/forms/utils/settingsDataModelFieldOnClickActionSchema';+import { FieldMetadataType } from '~/generated-metadata/graphql';++const isUniqueFieldFormSchema = z.object({+ isUnique: z.boolean().nullable().default(false),+});++const booleanFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.BOOLEAN) })+ .extend(settingsDataModelFieldBooleanFormSchema.shape);++const currencyFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.CURRENCY) })+ .extend(settingsDataModelFieldCurrencyFormSchema.shape);++const dateFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.DATE) })+ .extend(settingsDataModelFieldDateFormSchema.shape)+ .extend(isUniqueFieldFormSchema.shape);++const dateTimeFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.DATE_TIME) })+ .extend(settingsDataModelFieldDateFormSchema.shape)+ .extend(isUniqueFieldFormSchema.shape);++const relationFieldFormSchema = z+ .object({+ type: z.literal(FieldMetadataType.RELATION),+ })+ .extend(settingsDataModelFieldMorphRelationFormSchema.shape);++const morphRelationFieldFormSchema = z+ .object({+ type: z.literal(FieldMetadataType.MORPH_RELATION),+ })+ .extend(settingsDataModelFieldMorphRelationFormSchema.shape);++const selectFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.SELECT) })+ .extend(settingsDataModelFieldSelectFormSchema.shape);++const multiSelectFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.MULTI_SELECT) })+ .extend(settingsDataModelFieldMultiSelectFormSchema.shape);++const numberFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.NUMBER) })+ .extend(settingsDataModelFieldNumberFormSchema.shape)+ .extend(isUniqueFieldFormSchema.shape);++const textFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.TEXT) })+ .extend(settingsDataModelFieldTextFormSchema.shape)+ .extend(isUniqueFieldFormSchema.shape);++const addressFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.ADDRESS) })+ .extend(settingsDataModelFieldAddressFormSchema.shape);++const phonesFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.PHONES) })+ .extend(settingsDataModelFieldPhonesFormSchema.shape)+ .extend(isUniqueFieldFormSchema.shape);++const emailsFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.EMAILS) })+ .merge(+ mergeSettingsSchemas(+ settingsDataModelFieldMaxValuesSchema,+ settingsDataModelFieldOnClickActionSchema,+ ),+ )+ .extend(isUniqueFieldFormSchema.shape);++const linksFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.LINKS) })+ .merge(+ mergeSettingsSchemas(+ settingsDataModelFieldMaxValuesSchema,+ settingsDataModelFieldOnClickActionSchema,+ settingsDataModelFieldLinksVariantSchema,+ ),+ )+ .extend(isUniqueFieldFormSchema.shape);++const arrayFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.ARRAY) })+ .merge(mergeSettingsSchemas(settingsDataModelFieldMaxValuesSchema))+ .extend(isUniqueFieldFormSchema.shape);++const filesFieldFormSchema = z+ .object({ type: z.literal(FieldMetadataType.FILES) })+ .merge(mergeSettingsSchemas(settingsDataModelFieldMaxValuesSchema));++const otherFieldsFormSchema = z+ .object({+ type: z.enum(+ Object.keys(+ omit(SETTINGS_FIELD_TYPE_CONFIGS, [+ FieldMetadataType.BOOLEAN,+ FieldMetadataType.CURRENCY,+ FieldMetadataType.RELATION,+ FieldMetadataType.MORPH_RELATION,+ FieldMetadataType.SELECT,+ FieldMetadataType.MULTI_SELECT,+ FieldMetadataType.DATE,+ FieldMetadataType.DATE_TIME,+ FieldMetadataType.NUMBER,+ FieldMetadataType.ADDRESS,+ FieldMetadataType.PHONES,+ FieldMetadataType.TEXT,+ FieldMetadataType.EMAILS,+ FieldMetadataType.LINKS,+ FieldMetadataType.ARRAY,+ FieldMetadataType.FILES,+ ]),+ ) as [FieldMetadataType, ...FieldMetadataType[]],+ ),+ })+ .extend(isUniqueFieldFormSchema.shape);++export const settingsDataModelFieldSettingsFormSchema = z.discriminatedUnion(+ 'type',+ [+ booleanFieldFormSchema,+ currencyFieldFormSchema,+ dateFieldFormSchema,+ dateTimeFieldFormSchema,+ relationFieldFormSchema,+ morphRelationFieldFormSchema,+ selectFieldFormSchema,+ multiSelectFieldFormSchema,+ numberFieldFormSchema,+ textFieldFormSchema,+ addressFieldFormSchema,+ phonesFieldFormSchema,+ emailsFieldFormSchema,+ linksFieldFormSchema,+ arrayFieldFormSchema,+ filesFieldFormSchema,+ otherFieldsFormSchema,+ ],+);diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema.tsindex 69fbdacd604..26ec5a25327 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema.ts+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema.ts@@ -1,6 +1,6 @@import { settingsDataModelFieldDescriptionFormSchema } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldDescriptionForm';import { settingsDataModelFieldIconLabelFormSchema } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm';-import { settingsDataModelFieldSettingsFormSchema } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard';+import { settingsDataModelFieldSettingsFormSchema } from '@/settings/data-model/fields/forms/validation-schemas/settingsDataModelFieldSettingsFormSchema';import { isDefined } from 'twenty-shared/utils';import { z } from 'zod';import { FieldMetadataType } from '~/generated-metadata/graphql';diff --git a/packages/twenty-front/src/modules/settings/data-model/types/SettingsDataModelFieldEditFormValues.ts b/packages/twenty-front/src/modules/settings/data-model/types/SettingsDataModelFieldEditFormValues.tsnew file mode 100644index 00000000000..f61dd2173fb--- /dev/null+++ b/packages/twenty-front/src/modules/settings/data-model/types/SettingsDataModelFieldEditFormValues.ts@@ -0,0 +1,8 @@+import type { settingsFieldFormSchema } from '@/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema';+import { type z } from 'zod';++// TODO: Remove `any` once every field-settings form uses the discriminated schema.+export type SettingsDataModelFieldEditFormValues = z.infer<+ ReturnType<typeof settingsFieldFormSchema>+> &+ any;diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useChartSettingsValues.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useChartSettingsValues.tsindex 1ed8a0c7b59..131563ff1c2 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useChartSettingsValues.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useChartSettingsValues.ts@@ -1,9 +1,9 @@+import { doesFieldMetadataItemMatchFieldMetadataId } from '@/object-metadata/utils/doesFieldMetadataItemMatchFieldMetadataId';import { CHART_NUMBER_FORMAT_DEFAULT } from '@/page-layout/widgets/graph/constants/ChartNumberFormatDefault';import { useGraphGroupBySortOptionLabels } from '@/side-panel/pages/page-layout/hooks/useGraphGroupBySortOptionLabels';import { useGraphXSortOptionLabels } from '@/side-panel/pages/page-layout/hooks/useGraphXSortOptionLabels';import { type ChartConfiguration } from '@/side-panel/pages/page-layout/types/ChartConfiguration';import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';-import { findChartGroupByFieldMetadataItem } from '@/side-panel/pages/page-layout/utils/findChartGroupByFieldMetadataItem';import { getChartAxisNameDisplayOptions } from '@/side-panel/pages/page-layout/utils/getChartAxisNameDisplayOptions';import { getChartFilterRulesCount } from '@/side-panel/pages/page-layout/utils/getChartFilterRulesCount';import { getChartNumberFormatLabel } from '@/side-panel/pages/page-layout/utils/getChartNumberFormatLabel';@@ -54,6 +54,14 @@ export const useChartSettingsValues = ({const isPieChart = configuration.__typename === 'PieChartConfiguration';+ const findGroupByField = (fieldMetadataId: string) =>+ objectMetadataItem?.fields.find((fieldMetadataItem) =>+ doesFieldMetadataItemMatchFieldMetadataId({+ fieldMetadataItem,+ fieldMetadataId,+ }),+ );+let groupByFieldXId: string | undefined;let groupByFieldYId: string | undefined;let groupBySubFieldNameX: CompositeFieldSubFieldName | undefined;@@ -77,17 +85,11 @@ export const useChartSettingsValues = ({}const groupByFieldX = isDefined(groupByFieldXId)- ? findChartGroupByFieldMetadataItem({- fields: objectMetadataItem?.fields,- fieldMetadataId: groupByFieldXId,- })+ ? findGroupByField(groupByFieldXId): undefined;const groupByFieldY = isDefined(groupByFieldYId)- ? findChartGroupByFieldMetadataItem({- fields: objectMetadataItem?.fields,- fieldMetadataId: groupByFieldYId,- })+ ? findGroupByField(groupByFieldYId): undefined;const groupBySubFieldNameXLabel =@@ -208,10 +210,7 @@ export const useChartSettingsValues = ({}case CHART_CONFIGURATION_SETTING_IDS.DATA_ON_DISPLAY_PIE_CHART: {const pieChartGroupByField = isDefined(finalGroupByFieldYId)- ? findChartGroupByFieldMetadataItem({- fields: objectMetadataItem?.fields,- fieldMetadataId: finalGroupByFieldYId,- })+ ? findGroupByField(finalGroupByFieldYId): undefined;const pieChartGroupBySubFieldNameLabel =isDefined(finalGroupBySubFieldNameY) &&diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/findChartGroupByFieldMetadataItem.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/findChartGroupByFieldMetadataItem.tsdeleted file mode 100644index 86a37383418..00000000000--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/findChartGroupByFieldMetadataItem.ts+++ /dev/null@@ -1,17 +0,0 @@-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';--export const findChartGroupByFieldMetadataItem = ({- fields,- fieldMetadataId,-}: {- fields: FieldMetadataItem[] | undefined;- fieldMetadataId: string;-}): FieldMetadataItem | undefined =>- fields?.find(- (field) =>- field.id === fieldMetadataId ||- (field.morphRelations ?? []).some(- (morphRelation) =>- morphRelation.sourceFieldMetadata.id === fieldMetadataId,- ),- );diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsxindex 726e8b1a818..599859287b1 100644--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx@@ -3,7 +3,6 @@ import omit from 'lodash.omit';import { useEffect, useState } from 'react';import { FormProvider, useForm } from 'react-hook-form';import { useNavigate, useParams } from 'react-router-dom';-import { type z } from 'zod';import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';@@ -14,7 +13,7 @@ import { formatFieldMetadataItemInput } from '@/object-metadata/utils/formatFielimport { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';-import { getReverseJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getReverseJunctionConfig';+import { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { FIELD_NAME_MAXIMUM_LENGTH } from '@/settings/data-model/constants/FieldNameMaximumLength';@@ -23,6 +22,7 @@ import { SettingsTranslationsButton } from '@/settings/translations/components/Simport { SettingsDataModelFieldIconLabelForm } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm';import { SettingsDataModelFieldSettingsFormCard } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard';import { settingsFieldFormSchema } from '@/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema';+import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';@@ -46,12 +46,6 @@ import { useNavigateApp } from '~/hooks/useNavigateApp';import { useNavigateSettings } from '~/hooks/useNavigateSettings';import { getFieldMetadataItemInitialValues } from '~/pages/settings/data-model/utils/getFieldMetadataItemInitialValues';-//TODO: fix this type-export type SettingsDataModelFieldEditFormValues = z.infer<- ReturnType<typeof settingsFieldFormSchema>-> &- any;-const DELETE_FIELD_MODAL_ID = 'delete-field-confirmation-modal';const StyledDangerButtons = styled.div`display: flex;@@ -109,14 +103,16 @@ export const SettingsObjectFieldEdit = () => {fieldMetadataItem.name === newNameDuringSave,);- const isReverseJunctionRelation = isDefined(- getReverseJunctionConfig({- junctionObjectMetadataId:- fieldMetadataItem?.relation?.targetObjectMetadata.id,+ const isReverseJunctionRelation =+ resolveJunctionConfig({+ settings: fieldMetadataItem?.settings,+ relationObjectMetadataId:+ fieldMetadataItem?.relation?.targetObjectMetadata.id ?? '',+ relationTargetFieldMetadataId:+ fieldMetadataItem?.relation?.targetFieldMetadata.id,sourceObjectMetadataId: objectMetadataItem?.id,objectMetadataItems,- }),- );+ })?.direction === 'reverse';const getRelationMetadata = useGetRelationMetadata();const { updateOneFieldMetadataItem } = useUpdateOneFieldMetadataItem();diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.tsindex 2d75e44b49d..e4841bfa654 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.ts@@ -10,6 +10,7 @@ import { ConfigureTimelineActivityHappensAtCommand } from 'src/database/commandsimport { PinAskAiCommandMenuItemCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787938100000-pin-ask-ai-command-menu-item.command';import { ReownObjectNavigationCommandMenuItemsCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788166853000-reown-object-navigation-command-menu-items.command';import { ProvisionMissingObjectNavigationCommandMenuItemsCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788181550000-provision-missing-object-navigation-command-menu-items.command';+import { EnableStandardActivityTargetFieldsCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788197000000-enable-standard-activity-target-fields.command';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { CommandMenuItemEntity } from 'src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity';import { WorkspaceSchemaManagerModule } from 'src/engine/twenty-orm/workspace-schema-manager/workspace-schema-manager.module';@@ -36,6 +37,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspacePinAskAiCommandMenuItemCommand,ReownObjectNavigationCommandMenuItemsCommand,ProvisionMissingObjectNavigationCommandMenuItemsCommand,+ EnableStandardActivityTargetFieldsCommand,],})export class V2_38_UpgradeVersionCommandModule {}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788197000000-enable-standard-activity-target-fields.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788197000000-enable-standard-activity-target-fields.command.tsnew file mode 100644index 00000000000..295e2e1db86--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788197000000-enable-standard-activity-target-fields.command.ts@@ -0,0 +1,82 @@+import { Command } from 'nest-commander';+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';+import { isDefined } from 'twenty-shared/utils';++import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';++const ACTIVITY_TARGET_FIELD_UNIVERSAL_IDENTIFIERS = [+ STANDARD_OBJECTS.company.fields.taskTargets.universalIdentifier,+ STANDARD_OBJECTS.company.fields.noteTargets.universalIdentifier,+ STANDARD_OBJECTS.person.fields.taskTargets.universalIdentifier,+ STANDARD_OBJECTS.person.fields.noteTargets.universalIdentifier,+ STANDARD_OBJECTS.opportunity.fields.taskTargets.universalIdentifier,+ STANDARD_OBJECTS.opportunity.fields.noteTargets.universalIdentifier,+];++@RegisteredWorkspaceCommand('2.38.0', 1788197000000)+@Command({+ name: 'upgrade:2-38:enable-standard-activity-target-fields',+ description:+ 'Make the standard company, person, and opportunity task/note target fields editable in the generic record UI',+})+export class EnableStandardActivityTargetFieldsCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly applicationService: ApplicationService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace({+ workspaceId,+ dataSource,+ options,+ }: RunOnWorkspaceArgs): Promise<void> {+ if (!isDefined(dataSource)) {+ this.logger.warn(`No data source for workspace ${workspaceId}, skipping`);++ return;+ }++ if (options.dryRun) {+ this.logger.log(+ `[DRY RUN] Would make standard activity target fields editable for workspace ${workspaceId}`,+ );++ return;+ }++ const { twentyStandardFlatApplication } =+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(+ { workspaceId },+ );++ const updateResult = await dataSource.query<[unknown[], number]>(+ `UPDATE "core"."fieldMetadata"+ SET "isUIEditable" = true, "updatedAt" = now()+ WHERE "workspaceId" = $1+ AND "applicationId" = $2+ AND "universalIdentifier" = ANY($3::uuid[])+ AND "isUIEditable" = false`,+ [+ workspaceId,+ twentyStandardFlatApplication.id,+ ACTIVITY_TARGET_FIELD_UNIVERSAL_IDENTIFIERS,+ ],+ );++ await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [+ 'flatFieldMetadataMaps',+ ]);++ this.logger.log(+ `Made ${updateResult[1]} standard activity target field(s) editable for workspace ${workspaceId}`,+ );+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/__tests__/2-38-workspace-command-1788197000000-enable-standard-activity-target-fields.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/__tests__/2-38-workspace-command-1788197000000-enable-standard-activity-target-fields.command.spec.tsnew file mode 100644index 00000000000..d3067613646--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/__tests__/2-38-workspace-command-1788197000000-enable-standard-activity-target-fields.command.spec.ts@@ -0,0 +1,105 @@+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';++import { type WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { EnableStandardActivityTargetFieldsCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1788197000000-enable-standard-activity-target-fields.command';+import { type ApplicationService } from 'src/engine/core-modules/application/application.service';+import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';++const WORKSPACE_ID = '00000000-0000-4000-8000-000000000001';+const STANDARD_APPLICATION_ID = '00000000-0000-4000-8000-000000000002';+const EXPECTED_FIELD_UNIVERSAL_IDENTIFIERS = [+ STANDARD_OBJECTS.company.fields.taskTargets.universalIdentifier,+ STANDARD_OBJECTS.company.fields.noteTargets.universalIdentifier,+ STANDARD_OBJECTS.person.fields.taskTargets.universalIdentifier,+ STANDARD_OBJECTS.person.fields.noteTargets.universalIdentifier,+ STANDARD_OBJECTS.opportunity.fields.taskTargets.universalIdentifier,+ STANDARD_OBJECTS.opportunity.fields.noteTargets.universalIdentifier,+];++const buildCommand = ({+ invalidateAndRecompute,+}: {+ invalidateAndRecompute: ReturnType<typeof jest.fn>;+}) =>+ new EnableStandardActivityTargetFieldsCommand(+ {} as WorkspaceIteratorService,+ {+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow: jest+ .fn()+ .mockResolvedValue({+ twentyStandardFlatApplication: { id: STANDARD_APPLICATION_ID },+ }),+ } as unknown as ApplicationService,+ { invalidateAndRecompute } as unknown as WorkspaceCacheService,+ );++const runCommand = async ({+ command,+ query,+ dryRun = false,+}: {+ command: EnableStandardActivityTargetFieldsCommand;+ query: ReturnType<typeof jest.fn>;+ dryRun?: boolean;+}) =>+ command.runOnWorkspace({+ workspaceId: WORKSPACE_ID,+ dataSource: { query } as never,+ options: { dryRun },+ index: 0,+ total: 1,+ });++describe('EnableStandardActivityTargetFieldsCommand', () => {+ it('updates only the six standard inverse fields in the workspace standard application', async () => {+ const query = jest.fn().mockResolvedValue([[], 6]);+ const invalidateAndRecompute = jest.fn().mockResolvedValue(undefined);+ const command = buildCommand({ invalidateAndRecompute });++ await runCommand({ command, query });++ expect(query).toHaveBeenCalledTimes(1);+ expect(query.mock.calls[0][1]).toEqual([+ WORKSPACE_ID,+ STANDARD_APPLICATION_ID,+ EXPECTED_FIELD_UNIVERSAL_IDENTIFIERS,+ ]);+ expect(invalidateAndRecompute).toHaveBeenCalledWith(WORKSPACE_ID, [+ 'flatFieldMetadataMaps',+ ]);+ });++ it('is safe to rerun after the fields have already converged', async () => {+ const query = jest+ .fn()+ .mockResolvedValueOnce([[], 6])+ .mockResolvedValueOnce([[], 0]);+ const invalidateAndRecompute = jest.fn().mockResolvedValue(undefined);+ const command = buildCommand({ invalidateAndRecompute });++ jest.spyOn(command['logger'], 'log').mockImplementation();++ await runCommand({ command, query });+ await runCommand({ command, query });++ expect(query).toHaveBeenCalledTimes(2);+ expect(query.mock.calls[1]).toEqual(query.mock.calls[0]);+ expect(invalidateAndRecompute).toHaveBeenCalledTimes(2);+ expect(command['logger'].log).toHaveBeenLastCalledWith(+ `Made 0 standard activity target field(s) editable for workspace ${WORKSPACE_ID}`,+ );+ });++ it('does not read or write metadata during a dry run', async () => {+ const query = jest.fn();+ const invalidateAndRecompute = jest.fn();+ const command = buildCommand({ invalidateAndRecompute });++ jest.spyOn(command['logger'], 'log').mockImplementation();++ await runCommand({ command, query, dryRun: true });++ expect(query).not.toHaveBeenCalled();+ expect(invalidateAndRecompute).not.toHaveBeenCalled();+ });+});diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/compute-activity-target-standard-metadata.spec.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/compute-activity-target-standard-metadata.spec.tsnew file mode 100644index 00000000000..c940f031c4c--- /dev/null+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/compute-activity-target-standard-metadata.spec.ts@@ -0,0 +1,50 @@+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';++import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant';++const WORKSPACE_ID = '20202020-1111-4111-8111-111111111111';+const TWENTY_STANDARD_APPLICATION_ID = '20202020-2222-4222-8222-222222222222';+const NOW = '2024-01-01T00:00:00.000Z';++describe('Activity target standard metadata build', () => {+ const { allFlatEntityMaps } =+ computeTwentyStandardApplicationAllFlatEntityMaps({+ now: NOW,+ workspaceId: WORKSPACE_ID,+ twentyStandardApplicationId: TWENTY_STANDARD_APPLICATION_ID,+ });++ it.each([+ {+ field: STANDARD_OBJECTS.company.fields.taskTargets,+ fieldName: 'company.taskTargets',+ },+ {+ field: STANDARD_OBJECTS.company.fields.noteTargets,+ fieldName: 'company.noteTargets',+ },+ {+ field: STANDARD_OBJECTS.person.fields.taskTargets,+ fieldName: 'person.taskTargets',+ },+ {+ field: STANDARD_OBJECTS.person.fields.noteTargets,+ fieldName: 'person.noteTargets',+ },+ {+ field: STANDARD_OBJECTS.opportunity.fields.taskTargets,+ fieldName: 'opportunity.taskTargets',+ },+ {+ field: STANDARD_OBJECTS.opportunity.fields.noteTargets,+ fieldName: 'opportunity.noteTargets',+ },+ ])('marks $fieldName as UI-editable', ({ field }) => {+ const fieldMetadata =+ allFlatEntityMaps.flatFieldMetadataMaps.byUniversalIdentifier[+ field.universalIdentifier+ ];++ expect(fieldMetadata?.isUIEditable).toBe(true);+ });+});diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-company-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-company-standard-flat-field-metadata.util.tsindex 52f1ffd69cf..7089a5c80b4 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-company-standard-flat-field-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-company-standard-flat-field-metadata.util.ts@@ -440,7 +440,6 @@ export const buildCompanyStandardFlatFieldMetadatas = ({),icon: STANDARD_RELATION_FIELD_PROPERTIES_BY_RELATION_OBJECT.taskTarget.icon,- isUIEditable: false,isNullable: true,targetObjectName: 'taskTarget',targetFieldName: 'targetCompany',@@ -472,7 +471,6 @@ export const buildCompanyStandardFlatFieldMetadatas = ({),icon: STANDARD_RELATION_FIELD_PROPERTIES_BY_RELATION_OBJECT.noteTarget.icon,- isUIEditable: false,isNullable: true,targetObjectName: 'noteTarget',targetFieldName: 'targetCompany',diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-opportunity-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-opportunity-standard-flat-field-metadata.util.tsindex 9f9cecdc605..880e70414e7 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-opportunity-standard-flat-field-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-opportunity-standard-flat-field-metadata.util.ts@@ -462,7 +462,6 @@ export const buildOpportunityStandardFlatFieldMetadatas = ({),icon: STANDARD_RELATION_FIELD_PROPERTIES_BY_RELATION_OBJECT.taskTarget.icon,- isUIEditable: false,isNullable: true,targetObjectName: 'taskTarget',targetFieldName: 'targetOpportunity',@@ -494,7 +493,6 @@ export const buildOpportunityStandardFlatFieldMetadatas = ({),icon: STANDARD_RELATION_FIELD_PROPERTIES_BY_RELATION_OBJECT.noteTarget.icon,- isUIEditable: false,isNullable: true,targetObjectName: 'noteTarget',targetFieldName: 'targetOpportunity',diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-person-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-person-standard-flat-field-metadata.util.tsindex 4dea1034d5b..27664680876 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-person-standard-flat-field-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-person-standard-flat-field-metadata.util.ts@@ -472,7 +472,6 @@ export const buildPersonStandardFlatFieldMetadatas = ({),icon: STANDARD_RELATION_FIELD_PROPERTIES_BY_RELATION_OBJECT.taskTarget.icon,- isUIEditable: false,isNullable: true,targetObjectName: 'taskTarget',targetFieldName: 'targetPerson',@@ -504,7 +503,6 @@ export const buildPersonStandardFlatFieldMetadatas = ({),icon: STANDARD_RELATION_FIELD_PROPERTIES_BY_RELATION_OBJECT.noteTarget.icon,- isUIEditable: false,isNullable: true,targetObjectName: 'noteTarget',targetFieldName: 'targetPerson',