Skip to content

Commit 1244dbd

Browse files
committed
Fix
1 parent 227bf6c commit 1244dbd

File tree

7 files changed

+15
-76
lines changed

7 files changed

+15
-76
lines changed

packages/twenty-front/src/modules/object-record/hooks/useAttachMorphRelatedRecordFromRecord.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ export const useAttachMorphRelatedRecordFromRecord = () => {
196196
objectMetadataItem: relatedObjectMetadataItem,
197197
targetObjectNameSingulars: [sourceObjectMetadataItemName],
198198
relatedRecordId: recordId,
199-
fieldDefinition: relatedRecordFieldDefinition,
200-
// recordGqlFields: gqlFields,
199+
// TODO
200+
targetGQLFieldName: fieldDefinition.metadata.fieldName,
201201
},
202202
];
203203

packages/twenty-front/src/modules/object-record/hooks/useAttachRelatedRecordFromRecord.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export const useAttachRelatedRecordFromRecord = ({
143143
objectMetadataItem: relatedObjectMetadataItem,
144144
targetObjectNameSingulars: [objectMetadataItem.nameSingular],
145145
relatedRecordId: recordId,
146-
fieldDefinition: relatedRecordFieldDefinition,
146+
targetGQLFieldName: relationTargetGQLfieldName,
147147
},
148148
];
149149

packages/twenty-front/src/modules/object-record/hooks/useDetachMorphRelatedRecordFromRecord.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ export const useDetachMorphRelatedRecordFromRecord = () => {
183183
objectMetadataItem: relatedObjectMetadataItem,
184184
targetObjectNameSingulars: [sourceObjectMetadataItemName],
185185
relatedRecordId: null,
186-
fieldDefinition: relatedRecordFieldDefinition,
186+
targetGQLFieldName: computedFieldName,
187187
},
188188
];
189189

packages/twenty-front/src/modules/object-record/hooks/useDetachRelatedRecordFromRecord.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export const useDetachRelatedRecordFromRecord = ({
114114
objectMetadataItem: relatedObjectMetadataItem,
115115
targetObjectNameSingulars: [objectMetadataItem.nameSingular],
116116
relatedRecordId: null,
117-
fieldDefinition: relatedRecordFieldDefinition,
117+
targetGQLFieldName: relationTargetGQLfieldName,
118118
},
119119
];
120120

packages/twenty-front/src/modules/object-record/hooks/useUpdateMultipleRecordsManyToOneObjects.ts

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ import { computeDepthOneRecordGqlFieldsFromRecord } from '@/object-record/graphq
1111
import { generateDepthOneRecordGqlFields } from '@/object-record/graphql/utils/generateDepthOneRecordGqlFields';
1212
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
1313
import { generateUpdateOneRecordMutation } from '@/object-record/multiple-objects/utils/generateUpdateOneRecordMutation';
14-
import { getTargetFieldMetadataName } from '@/object-record/multiple-objects/utils/getTargetFieldMetadataName';
15-
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
16-
import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
17-
import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelation';
18-
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
1914
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
2015
import { computeOptimisticRecordFromInput } from '@/object-record/utils/computeOptimisticRecordFromInput';
2116
import { getAggregateQueryName } from '@/object-record/utils/getAggregateQueryName';
@@ -31,8 +26,8 @@ type UpdateManyRecordArgs = {
3126
relatedRecordId: string | null;
3227
objectMetadataItem: ObjectMetadataItem;
3328
targetObjectNameSingulars: string[];
29+
targetGQLFieldName: string;
3430
recordGqlFields?: Record<string, any>;
35-
fieldDefinition: FieldDefinition<FieldMetadata>;
3631
};
3732

3833
export const useUpdateMultipleRecordsManyToOneObjects = () => {
@@ -50,9 +45,9 @@ export const useUpdateMultipleRecordsManyToOneObjects = () => {
5045
idToUpdate,
5146
objectMetadataItem: objectMetadataItemOfIdToUpdate,
5247
targetObjectNameSingulars,
53-
relatedRecordId,
48+
targetGQLFieldName,
5449
recordGqlFields,
55-
fieldDefinition,
50+
relatedRecordId,
5651
} of updatedManyRecordsArgs) {
5752
if (isNull(idToUpdate)) {
5853
throw new CustomError(`idToUpdate id is null`, 'ID_TO_UPDATE_IS_NULL');
@@ -73,16 +68,6 @@ export const useUpdateMultipleRecordsManyToOneObjects = () => {
7368
);
7469
}
7570

76-
if (
77-
!isFieldRelation(fieldDefinition) &&
78-
!isFieldMorphRelation(fieldDefinition)
79-
) {
80-
throw new CustomError(
81-
`Should never happen`,
82-
'TARGET_FIELD_NAME_NOT_FOUND',
83-
);
84-
}
85-
8671
const objectMetadataItemArray = objectMetadataItems.filter(
8772
(objectMetadataItem) =>
8873
targetObjectNameSingulars.includes(objectMetadataItem.nameSingular),
@@ -98,19 +83,7 @@ export const useUpdateMultipleRecordsManyToOneObjects = () => {
9883
const updateOneRecordInput: Record<string, string | null> = {};
9984

10085
for (const objectMetadataItem of objectMetadataItemArray) {
101-
const targetFieldName = getTargetFieldMetadataName({
102-
fieldDefinition,
103-
objectNameSingular: objectMetadataItem.nameSingular,
104-
});
105-
106-
if (!isDefined(targetFieldName)) {
107-
throw new CustomError(
108-
`Cannot find Target field name for the (morph) relation field ${fieldDefinition.metadata.fieldName} on ${objectMetadataItem.nameSingular}`,
109-
'TARGET_FIELD_NAME_NOT_FOUND',
110-
);
111-
}
112-
113-
updateOneRecordInput[`${targetFieldName}Id`] = null;
86+
updateOneRecordInput[`${targetGQLFieldName}Id`] = null;
11487

11588
if (!isDefined(relatedRecordId)) {
11689
continue;
@@ -125,7 +98,8 @@ export const useUpdateMultipleRecordsManyToOneObjects = () => {
12598
});
12699

127100
if (isDefined(cachedRelatedRecord)) {
128-
updateOneRecordInput[`${targetFieldName}Id`] = cachedRelatedRecord.id;
101+
updateOneRecordInput[`${targetGQLFieldName}Id`] =
102+
cachedRelatedRecord.id;
129103
}
130104
}
131105

packages/twenty-front/src/modules/object-record/multiple-objects/utils/getTargetFieldMetadataName.ts

Lines changed: 0 additions & 37 deletions
This file was deleted.

packages/twenty-front/src/modules/object-record/record-field/ui/hooks/usePersistFieldForMorphRelationManyToOne.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ export const usePersistFieldForMorphRelationManyToOne = () => {
4343
targetObjectNameSingulars,
4444
relatedRecordId: null,
4545
objectMetadataItem,
46-
fieldDefinition,
46+
// TODO
47+
targetGQLFieldName: fieldDefinition.metadata.fieldName,
4748
},
4849
]);
4950
return;
@@ -60,7 +61,8 @@ export const usePersistFieldForMorphRelationManyToOne = () => {
6061
targetObjectNameSingulars,
6162
relatedRecordId: recordFromPicker.id,
6263
objectMetadataItem,
63-
fieldDefinition,
64+
// TODO
65+
targetGQLFieldName: fieldDefinition.metadata.fieldName,
6466
},
6567
];
6668

0 commit comments

Comments
 (0)