Skip to content

Commit 227bf6c

Browse files
committed
Fix
1 parent e6bb684 commit 227bf6c

File tree

8 files changed

+40
-24
lines changed

8 files changed

+40
-24
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ import { CustomError, isDefined } from 'twenty-shared/utils';
1717

1818
type useAttachRelatedRecordFromRecordProps = {
1919
recordObjectNameSingular: string;
20+
relationTargetGQLfieldName: string;
2021
};
2122

2223
export const useAttachRelatedRecordFromRecord = ({
2324
recordObjectNameSingular,
25+
relationTargetGQLfieldName,
2426
}: useAttachRelatedRecordFromRecordProps) => {
2527
const apolloCoreClient = useApolloCoreClient();
2628
const { fieldDefinition } = useContext(FieldContext);
@@ -32,17 +34,16 @@ export const useAttachRelatedRecordFromRecord = ({
3234

3335
const { objectMetadataItems } = useObjectMetadataItems();
3436
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
37+
3538
const updateOneRecordAndAttachRelations = async ({
3639
recordId,
3740
relatedRecordId,
38-
relationTargetgqlfieldName,
3941
}: {
4042
recordId: string;
4143
relatedRecordId: string;
42-
relationTargetgqlfieldName: string;
4344
}) => {
4445
const fieldOnObject = objectMetadataItem.readableFields.find((field) => {
45-
return field.name === relationTargetgqlfieldName;
46+
return field.name === relationTargetGQLfieldName;
4647
});
4748

4849
const relatedRecordObjectNameSingular =
@@ -72,7 +73,7 @@ export const useAttachRelatedRecordFromRecord = ({
7273

7374
if (!fieldOnRelatedObject) {
7475
throw new CustomError(
75-
`Missing target field for ${relationTargetgqlfieldName}`,
76+
`Missing target field for ${relationTargetGQLfieldName}`,
7677
'MISSING_TARGET_FIELD',
7778
);
7879
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ import { isDefined } from 'twenty-shared/utils';
1616

1717
type useDetachRelatedRecordFromRecordProps = {
1818
recordObjectNameSingular: string;
19+
relationTargetGQLfieldName: string;
1920
};
2021

2122
export const useDetachRelatedRecordFromRecord = ({
2223
recordObjectNameSingular,
24+
relationTargetGQLfieldName,
2325
}: useDetachRelatedRecordFromRecordProps) => {
2426
const apolloCoreClient = useApolloCoreClient();
2527
const { fieldDefinition } = useContext(FieldContext);
@@ -36,14 +38,12 @@ export const useDetachRelatedRecordFromRecord = ({
3638
const updateOneRecordAndDetachRelations = async ({
3739
recordId,
3840
relatedRecordId,
39-
relationTargetgqlfieldName,
4041
}: {
4142
recordId: string;
4243
relatedRecordId: string;
43-
relationTargetgqlfieldName: string;
4444
}) => {
4545
const fieldOnObject = objectMetadataItem.readableFields.find((field) => {
46-
return field.name === relationTargetgqlfieldName;
46+
return field.name === relationTargetGQLfieldName;
4747
});
4848

4949
const relatedRecordObjectNameSingular =
@@ -82,7 +82,7 @@ export const useDetachRelatedRecordFromRecord = ({
8282
objectMetadataItem,
8383
cache: apolloCoreClient.cache,
8484
fieldModifiers: {
85-
[relationTargetgqlfieldName]: (
85+
[relationTargetGQLfieldName]: (
8686
fieldNameOnRecordObjectConnection,
8787
{ readField },
8888
) => {

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
22
import {
3-
type FieldMorphRelationMetadata,
4-
type FieldRelationMetadata,
3+
type FieldMorphRelationMetadata,
4+
type FieldRelationMetadata,
55
} from '@/object-record/record-field/ui/types/FieldMetadata';
66
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
77
import { computeMorphRelationFieldName } from 'twenty-shared/utils';
@@ -28,8 +28,10 @@ export const getTargetFieldMetadataName = ({
2828
return computeMorphRelationFieldName({
2929
fieldName: fieldDefinition.metadata.fieldName,
3030
relationType: fieldDefinition.metadata.relationType,
31-
targetObjectMetadataNameSingular: morphRelation.targetObjectMetadata.nameSingular,
32-
targetObjectMetadataNamePlural: morphRelation.targetObjectMetadata.namePlural,
31+
targetObjectMetadataNameSingular:
32+
morphRelation.targetObjectMetadata.nameSingular,
33+
targetObjectMetadataNamePlural:
34+
morphRelation.targetObjectMetadata.namePlural,
3335
});
3436
}
3537
};

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ export const useRecordFieldGqlFields = ({
6565
const computedFieldName = computeMorphRelationFieldName({
6666
fieldName: fieldMetadataItem.name,
6767
relationType: fieldMetadataItem.settings?.relationType,
68-
targetObjectMetadataNameSingular: morphRelation.targetObjectMetadata.nameSingular,
69-
targetObjectMetadataNamePlural: morphRelation.targetObjectMetadata.namePlural,
68+
targetObjectMetadataNameSingular:
69+
morphRelation.targetObjectMetadata.nameSingular,
70+
targetObjectMetadataNamePlural:
71+
morphRelation.targetObjectMetadata.namePlural,
7072
});
7173

7274
return [computedFieldName, true];

packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useUpdateRelationFromManyFieldInput.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ export const useUpdateRelationFromManyFieldInput = () => {
2626
useDetachRelatedRecordFromRecord({
2727
recordObjectNameSingular:
2828
fieldDefinition.metadata.objectMetadataNameSingular,
29+
relationTargetGQLfieldName: fieldDefinition.metadata.fieldName,
2930
});
3031

3132
const { updateOneRecordAndAttachRelations } =
3233
useAttachRelatedRecordFromRecord({
3334
recordObjectNameSingular:
3435
fieldDefinition.metadata.objectMetadataNameSingular,
36+
relationTargetGQLfieldName: fieldDefinition.metadata.fieldName,
3537
});
3638

3739
const updateRelation = useRecoilCallback(
@@ -40,18 +42,15 @@ export const useUpdateRelationFromManyFieldInput = () => {
4042
await updateOneRecordAndAttachRelations({
4143
recordId,
4244
relatedRecordId: morphItem.recordId,
43-
relationTargetgqlfieldName: fieldDefinition.metadata.fieldName,
4445
});
4546
} else {
4647
await updateOneRecordAndDetachRelations({
4748
recordId,
4849
relatedRecordId: morphItem.recordId,
49-
relationTargetgqlfieldName: fieldDefinition.metadata.fieldName,
5050
});
5151
}
5252
},
5353
[
54-
fieldDefinition.metadata.fieldName,
5554
recordId,
5655
updateOneRecordAndAttachRelations,
5756
updateOneRecordAndDetachRelations,

packages/twenty-front/src/modules/object-record/record-store/states/selectors/recordStoreMorphManyToOneValueWithObjectNameFamilySelector.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ export const recordStoreMorphManyToOneValueWithObjectNameFamilySelector =
2222
const fieldName = computeMorphRelationFieldName({
2323
fieldName: morphRelation.sourceFieldMetadata.name,
2424
relationType: morphRelation.type,
25-
targetObjectMetadataNameSingular: morphRelation.targetObjectMetadata.nameSingular,
26-
targetObjectMetadataNamePlural: morphRelation.targetObjectMetadata.namePlural,
25+
targetObjectMetadataNameSingular:
26+
morphRelation.targetObjectMetadata.nameSingular,
27+
targetObjectMetadataNamePlural:
28+
morphRelation.targetObjectMetadata.namePlural,
2729
});
2830
return {
2931
objectNameSingular:

packages/twenty-front/src/modules/object-record/utils/computeOptimisticRecordFromInput.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ export const computeOptimisticRecordFromInput = ({
5555
const computedFieldName = computeMorphRelationFieldName({
5656
fieldName: field.name,
5757
relationType: morphRelation.type,
58-
targetObjectMetadataNameSingular: morphRelation.targetObjectMetadata.nameSingular,
59-
targetObjectMetadataNamePlural: morphRelation.targetObjectMetadata.namePlural,
58+
targetObjectMetadataNameSingular:
59+
morphRelation.targetObjectMetadata.nameSingular,
60+
targetObjectMetadataNamePlural:
61+
morphRelation.targetObjectMetadata.namePlural,
6062
});
6163
return computedFieldName === recordKey.replace('Id', '');
6264
});

packages/twenty-shared/project.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"sourceRoot": "packages/twenty-shared/src",
55
"projectType": "library",
6-
"tags": ["scope:shared"],
6+
"tags": [
7+
"scope:shared"
8+
],
79
"targets": {
810
"build": {
9-
"dependsOn": ["generateBarrels", "^build"],
11+
"dependsOn": [
12+
"generateBarrels",
13+
"^build"
14+
],
1015
"outputs": [
1116
"{projectRoot}/dist",
1217
"{projectRoot}/ai/package.json",
@@ -30,7 +35,10 @@
3035
"generateBarrels": {
3136
"executor": "nx:run-commands",
3237
"cache": true,
33-
"inputs": ["production", "{projectRoot}/scripts/generateBarrels.ts"],
38+
"inputs": [
39+
"production",
40+
"{projectRoot}/scripts/generateBarrels.ts"
41+
],
3442
"outputs": [
3543
"{projectRoot}/src/index.ts",
3644
"{projectRoot}/src/*/index.ts",

0 commit comments

Comments
 (0)