Skip to content

Commit 7bafb80

Browse files
committed
Fix
1 parent 1244dbd commit 7bafb80

File tree

8 files changed

+10
-135
lines changed

8 files changed

+10
-135
lines changed

packages/twenty-front/src/modules/object-metadata/utils/mapObjectMetadataToGraphQLQuery.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const mapObjectMetadataToGraphQLQuery = ({
4343
return '';
4444
}
4545
}
46-
// if (objectMetadataItem.nameSingular === 'pet') debugger;
46+
4747
const manyToOneRelationFields = objectMetadataItem?.readableFields
4848
.filter((field) => field.isActive)
4949
.filter(
@@ -118,17 +118,10 @@ export const mapObjectMetadataToGraphQLQuery = ({
118118
}));
119119
});
120120

121-
const gqlFieldSet = new Set();
122121
const gqlFieldsWithFieldMetadata = [
123122
...activeReadableFields,
124123
...manyToOneRelationGqlFieldWithFieldMetadata,
125-
].filter((item) => {
126-
if (gqlFieldSet.has(item.gqlField)) {
127-
return false;
128-
}
129-
gqlFieldSet.add(item.gqlField);
130-
return true;
131-
});
124+
];
132125

133126
const gqlFieldWithFieldMetadataThatCouldBeQueried =
134127
gqlFieldsWithFieldMetadata.sort(

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldCont
99
import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelation';
1010
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
1111
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
12-
import { getMorphRelatedRecordFieldDefinition } from '@/object-record/utils/getMorphRelatedRecordFieldDefinition';
1312
import { useContext } from 'react';
1413
import { useRecoilCallback } from 'recoil';
1514
import { computeMorphRelationFieldName, isDefined } from 'twenty-shared/utils';
@@ -180,16 +179,6 @@ export const useAttachMorphRelatedRecordFromRecord = () => {
180179
fieldDefinition.metadata.morphRelations[0].sourceObjectMetadata
181180
.nameSingular;
182181

183-
const relatedRecordFieldDefinition =
184-
getMorphRelatedRecordFieldDefinition({
185-
fieldDefinition,
186-
relatedObjectMetadataItem,
187-
});
188-
189-
if (!isDefined(relatedRecordFieldDefinition)) {
190-
throw new Error('Could not find related record field definition');
191-
}
192-
193182
const updatedManyRecordsArgs = [
194183
{
195184
idToUpdate: relatedRecordId,

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { useUpdateMultipleRecordsManyToOneObjects } from '@/object-record/hooks/
1010
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
1111
import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
1212
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
13-
import { getRelatedRecordFieldDefinition } from '@/object-record/utils/getRelatedRecordFieldDefinition';
1413
import { useContext } from 'react';
1514
import { FieldMetadataType } from 'twenty-shared/types';
1615
import { CustomError, isDefined } from 'twenty-shared/utils';
@@ -128,15 +127,6 @@ export const useAttachRelatedRecordFromRecord = ({
128127
fieldDefinition,
129128
);
130129

131-
const relatedRecordFieldDefinition = getRelatedRecordFieldDefinition({
132-
fieldDefinition: fieldDefinition,
133-
relatedObjectMetadataItem,
134-
});
135-
136-
if (!isDefined(relatedRecordFieldDefinition)) {
137-
throw new Error('Could not find related record field definition');
138-
}
139-
140130
const updatedManyRecordsArgs = [
141131
{
142132
idToUpdate: relatedRecordId,

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldCont
1111
import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelation';
1212
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
1313
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
14-
import { getMorphRelatedRecordFieldDefinition } from '@/object-record/utils/getMorphRelatedRecordFieldDefinition';
1514
import { useContext } from 'react';
1615
import { useRecoilCallback } from 'recoil';
1716
import { computeMorphRelationFieldName, isDefined } from 'twenty-shared/utils';
@@ -167,16 +166,6 @@ export const useDetachMorphRelatedRecordFromRecord = () => {
167166
fieldDefinition.metadata.morphRelations[0].sourceObjectMetadata
168167
.nameSingular;
169168

170-
const relatedRecordFieldDefinition =
171-
getMorphRelatedRecordFieldDefinition({
172-
fieldDefinition,
173-
relatedObjectMetadataItem,
174-
});
175-
176-
if (!isDefined(relatedRecordFieldDefinition)) {
177-
throw new Error('Could not find related record field definition');
178-
}
179-
180169
const updatedManyRecordsArgs = [
181170
{
182171
idToUpdate: relatedRecordId,

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ import { useUpdateMultipleRecordsManyToOneObjects } from '@/object-record/hooks/
99
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
1010
import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
1111
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
12-
import { getRelatedRecordFieldDefinition } from '@/object-record/utils/getRelatedRecordFieldDefinition';
1312
import { useContext } from 'react';
1413
import { FieldMetadataType } from 'twenty-shared/types';
15-
import { isDefined } from 'twenty-shared/utils';
16-
1714
type useDetachRelatedRecordFromRecordProps = {
1815
recordObjectNameSingular: string;
1916
relationTargetGQLfieldName: string;
@@ -69,14 +66,6 @@ export const useDetachRelatedRecordFromRecord = ({
6966
isFieldRelation,
7067
fieldDefinition,
7168
);
72-
const relatedRecordFieldDefinition = getRelatedRecordFieldDefinition({
73-
fieldDefinition: fieldDefinition,
74-
relatedObjectMetadataItem,
75-
});
76-
77-
if (!isDefined(relatedRecordFieldDefinition)) {
78-
throw new Error('Could not find related record field definition');
79-
}
8069

8170
modifyRecordFromCache({
8271
objectMetadataItem,

packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { css, useTheme } from '@emotion/react';
1818
import styled from '@emotion/styled';
1919
import { isNonEmptyString } from '@sniptt/guards';
2020
import { useCallback, useId } from 'react';
21-
import { isDefined, isValidUuid } from 'twenty-shared/utils';
21+
import { CustomError, isDefined, isValidUuid } from 'twenty-shared/utils';
2222
import { IconChevronDown, IconForbid } from 'twenty-ui/display';
2323

2424
const StyledFormSelectContainer = styled(FormFieldInputInnerContainer)<{
@@ -90,6 +90,13 @@ export const FormSingleRecordPicker = ({
9090
value: defaultValue || '',
9191
};
9292

93+
if (objectNameSingulars.length === 0) {
94+
throw new CustomError(
95+
'Object is missing while building form single record picker',
96+
'FORM_SINGLE_RECORD_PICKER_OBJECT_NAME_SINGULAR_IS_MISSING',
97+
);
98+
}
99+
93100
const { record: selectedRecord } = useFindOneRecord({
94101
objectRecordId:
95102
isDefined(defaultValue) && !isStandaloneVariableString(defaultValue)

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

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

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

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

0 commit comments

Comments
 (0)