Skip to content

The open alternative to Salesforce, designed for AI.

Fix record gql fields typing (#27069)

BOHEUS96b34236f422
diff --git a/packages/twenty-front/src/modules/activities/graphql/operation-signatures/factories/createOneActivityOperationSignatureFactory.ts b/packages/twenty-front/src/modules/activities/graphql/operation-signatures/factories/createOneActivityOperationSignatureFactory.ts
index fce5e33ecf9..449bcc702a6 100644
--- a/packages/twenty-front/src/modules/activities/graphql/operation-signatures/factories/createOneActivityOperationSignatureFactory.ts
+++ b/packages/twenty-front/src/modules/activities/graphql/operation-signatures/factories/createOneActivityOperationSignatureFactory.ts
@@ -1,10 +1,41 @@
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import {
+ CoreObjectNameSingular,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { type RecordGqlOperationSignatureFactory } from '@/object-record/graphql/types/RecordGqlOperationSignatureFactory';
type CreateOneActivityOperationSignatureFactory = {
objectNameSingular: CoreObjectNameSingular;
};
+const NOTE_RECORD_GQL_FIELDS: RecordGqlFields = {
+ id: true,
+ __typename: true,
+ createdAt: true,
+ updatedAt: true,
+ attachments: true,
+ bodyV2: true,
+ title: true,
+};
+
+const TASK_RECORD_GQL_FIELDS: RecordGqlFields = {
+ id: true,
+ __typename: true,
+ createdAt: true,
+ updatedAt: true,
+ assigneeId: true,
+ assignee: {
+ id: true,
+ name: true,
+ __typename: true,
+ },
+ attachments: true,
+ bodyV2: true,
+ title: true,
+ status: true,
+ dueAt: true,
+};
+
export const createOneActivityOperationSignatureFactory: RecordGqlOperationSignatureFactory<
CreateOneActivityOperationSignatureFactory
> = ({ objectNameSingular }: CreateOneActivityOperationSignatureFactory) =>
@@ -12,34 +43,10 @@ export const createOneActivityOperationSignatureFactory: RecordGqlOperationSigna
? {
objectNameSingular: CoreObjectNameSingular.Note,
variables: {},
- fields: {
- id: true,
- __typename: true,
- createdAt: true,
- updatedAt: true,
- attachments: true,
- bodyV2: true,
- title: true,
- },
+ fields: NOTE_RECORD_GQL_FIELDS,
}
: {
objectNameSingular: CoreObjectNameSingular.Task,
variables: {},
- fields: {
- id: true,
- __typename: true,
- createdAt: true,
- updatedAt: true,
- assigneeId: true,
- assignee: {
- id: true,
- name: true,
- __typename: true,
- },
- attachments: true,
- bodyV2: true,
- title: true,
- status: true,
- dueAt: true,
- },
+ fields: TASK_RECORD_GQL_FIELDS,
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts
index e61a2d4951c..27c42053d2c 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts
@@ -1,7 +1,6 @@
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields, FieldMetadataType } from 'twenty-shared/types';
import { type GenerateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields';
import { generateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields';
-import { FieldMetadataType } from 'twenty-shared/types';
type GetTimelineActivityRecordGqlFieldsParams = Pick<
GenerateDepthRecordGqlFieldsFromFields,
diff --git a/packages/twenty-front/src/modules/ai/constants/AgentChatThreadListRecordGqlFields.ts b/packages/twenty-front/src/modules/ai/constants/AgentChatThreadListRecordGqlFields.ts
index cfd4becbf9a..d33d46782b4 100644
--- a/packages/twenty-front/src/modules/ai/constants/AgentChatThreadListRecordGqlFields.ts
+++ b/packages/twenty-front/src/modules/ai/constants/AgentChatThreadListRecordGqlFields.ts
@@ -1,3 +1,5 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
+
export const AGENT_CHAT_THREAD_LIST_RECORD_GQL_FIELDS = {
id: true,
title: true,
@@ -29,4 +31,4 @@ export const AGENT_CHAT_THREAD_LIST_RECORD_GQL_FIELDS = {
lastMentionedAt: true,
updatedAt: true,
},
-};
+} satisfies RecordGqlFields;
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAiChatThreadRecordTargets.ts b/packages/twenty-front/src/modules/ai/hooks/useAiChatThreadRecordTargets.ts
index 2a1b704cd1f..d358dcd9bfa 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAiChatThreadRecordTargets.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAiChatThreadRecordTargets.ts
@@ -1,6 +1,9 @@
import uniqBy from 'lodash.uniqby';
import { useCallback, useMemo } from 'react';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import {
+ CoreObjectNameSingular,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { useAttachChatThreadToRecord } from '@/ai/hooks/useAttachChatThreadToRecord';
@@ -41,7 +44,7 @@ export const useAiChatThreadRecordTargets = ({
? objectMorphJunctionConfig
: null;
- const recordGqlFields = useMemo(
+ const recordGqlFields = useMemo<RecordGqlFields>(
() => ({
id: true,
...(isDefined(junctionConfig)
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAttachChatThreadToRecord.ts b/packages/twenty-front/src/modules/ai/hooks/useAttachChatThreadToRecord.ts
index 2194ac6ac6d..b583c390fd7 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAttachChatThreadToRecord.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAttachChatThreadToRecord.ts
@@ -1,4 +1,7 @@
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import {
+ CoreObjectNameSingular,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/components/feedback';
@@ -13,7 +16,7 @@ import { useRefetchAggregateQueries } from '@/object-record/hooks/useRefetchAggr
import { useObjectMorphJunctionConfig } from '@/object-record/record-field/ui/hooks/useObjectMorphJunctionConfig';
import { findTargetFieldInfo } from '@/object-record/record-field/ui/utils/junction/findTargetFieldInfo';
-const EXISTING_LINK_GQL_FIELDS = { id: true };
+const EXISTING_LINK_GQL_FIELDS = { id: true } satisfies RecordGqlFields;
export const useAttachChatThreadToRecord = () => {
const { enqueueToast } = useToast();
diff --git a/packages/twenty-front/src/modules/ai/hooks/useChatThreadsForRecord.ts b/packages/twenty-front/src/modules/ai/hooks/useChatThreadsForRecord.ts
index ae805d6ee3f..59f8a0d8e03 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useChatThreadsForRecord.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useChatThreadsForRecord.ts
@@ -2,6 +2,7 @@ import uniqBy from 'lodash.uniqby';
import { useCallback, useMemo } from 'react';
import {
CoreObjectNameSingular,
+ type RecordGqlFields,
type RecordGqlOperationOrderBy,
} from 'twenty-shared/types';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
@@ -36,7 +37,7 @@ const CHAT_THREADS_FOR_RECORD_GQL_FIELDS = {
workspaceMemberId: true,
pendingQuestionMessageId: true,
},
-};
+} satisfies RecordGqlFields;
// Link events carry no conversation, so new links are read back.
const LINK_OPERATION_TYPES: ObjectRecordOperation['type'][] = [
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts
index b8f37ac8ade..9c769a7936b 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts
@@ -74,7 +74,7 @@ describe('shouldFieldBeQueried', () => {
it('should be queried if object', () => {
const res = shouldFieldBeQueried({
- recordGqlFields: { fieldName: { subFieldName: false } },
+ recordGqlFields: { fieldName: { subFieldName: true } },
fieldMetadata: {
name: 'fieldName',
type: FieldMetadataType.RELATION,
@@ -87,21 +87,6 @@ describe('shouldFieldBeQueried', () => {
expect(res).toBe(true);
});
- it('should not be queried if false', () => {
- const res = shouldFieldBeQueried({
- gqlField: 'fieldName',
- fieldMetadata: {
- name: 'fieldName',
- type: FieldMetadataType.RELATION,
- settings: {
- relationType: RelationType.ONE_TO_MANY,
- },
- },
- recordGqlFields: { fieldName: false },
- });
- expect(res).toBe(false);
- });
-
it('should not be queried if absent', () => {
const res = shouldFieldBeQueried({
gqlField: 'fieldName',
@@ -112,7 +97,7 @@ describe('shouldFieldBeQueried', () => {
relationType: RelationType.ONE_TO_MANY,
},
},
- recordGqlFields: { otherFieldName: false },
+ recordGqlFields: { otherFieldName: true },
});
expect(res).toBe(false);
});
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/generateCreateOneRecordMutation.ts b/packages/twenty-front/src/modules/object-metadata/utils/generateCreateOneRecordMutation.ts
index 35653d337b8..bda6563f841 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/generateCreateOneRecordMutation.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/generateCreateOneRecordMutation.ts
@@ -5,7 +5,7 @@ import { getCreateOneRecordMutationResponseField } from '@/object-record/utils/g
import { gql } from '@apollo/client';
import {
type ObjectPermissions,
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
} from 'twenty-shared/types';
import { capitalize } from 'twenty-shared/utils';
@@ -17,7 +17,7 @@ export const generateCreateOneRecordMutation = ({
}: {
objectMetadataItem: EnrichedObjectMetadataItem;
objectMetadataItems: EnrichedObjectMetadataItem[];
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
objectPermissionsByObjectMetadataId: Record<
string,
ObjectPermissions & { objectMetadataId: string }
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/generateUpdateOneRecordMutation.ts b/packages/twenty-front/src/modules/object-metadata/utils/generateUpdateOneRecordMutation.ts
index 1201a2b615e..a5e74b2127d 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/generateUpdateOneRecordMutation.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/generateUpdateOneRecordMutation.ts
@@ -5,7 +5,7 @@ import { getUpdateOneRecordMutationResponseField } from '@/object-record/utils/g
import { gql } from '@apollo/client';
import {
type ObjectPermissions,
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
} from 'twenty-shared/types';
import { capitalize } from 'twenty-shared/utils';
@@ -18,7 +18,7 @@ export const generateUpdateOneRecordMutation = ({
}: {
objectMetadataItem: EnrichedObjectMetadataItem;
objectMetadataItems: EnrichedObjectMetadataItem[];
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
computeReferences: boolean;
objectPermissionsByObjectMetadataId: Record<
string,
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
index c52c6496ded..2320cde0203 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
@@ -3,13 +3,13 @@ import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObje
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
-import { isNonCompositeField } from '@/object-record/object-filter-dropdown/utils/isNonCompositeField';
import {
+ type RecordGqlFields,
FieldMetadataType,
type ObjectPermissions,
RelationType,
} from 'twenty-shared/types';
+import { isNonCompositeField } from '@/object-record/object-filter-dropdown/utils/isNonCompositeField';
import {
computeMorphRelationGqlFieldName,
computeRelationGqlFieldJoinColumnName,
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/mapObjectMetadataToGraphQLQuery.ts b/packages/twenty-front/src/modules/object-metadata/utils/mapObjectMetadataToGraphQLQuery.ts
index 5c62566ba5a..07f05219c31 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/mapObjectMetadataToGraphQLQuery.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapObjectMetadataToGraphQLQuery.ts
@@ -3,13 +3,13 @@ import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObject
import { getRelationIdFieldNames } from '@/object-metadata/utils/getRelationIdFieldNames';
import { mapFieldMetadataToGraphQLQuery } from '@/object-metadata/utils/mapFieldMetadataToGraphQLQuery';
import { shouldFieldBeQueried } from '@/object-metadata/utils/shouldFieldBeQueried';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
-import { isRecordGqlFieldsNode } from '@/object-record/graphql/utils/isRecordGraphlFieldsNode';
import {
+ type RecordGqlFields,
FieldMetadataType,
RelationType,
type ObjectPermissions,
} from 'twenty-shared/types';
+import { isRecordGqlFieldsNode } from '@/object-record/graphql/utils/isRecordGraphlFieldsNode';
import {
computeMorphRelationGqlFieldName,
isDefined,
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts b/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
index a21b9bacf81..2619ab5b68f 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
@@ -1,4 +1,4 @@
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { getRelationIdFieldNames } from '@/object-metadata/utils/getRelationIdFieldNames';
@@ -18,7 +18,7 @@ export const shouldFieldBeQueried = ({
'name' | 'type' | 'settings' | 'morphRelations'
>;
objectRecord?: ObjectRecord;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
}): any => {
const isJoinColumn: boolean =
(isFieldRelation(fieldMetadata) || isFieldMorphRelation(fieldMetadata)) &&
@@ -36,11 +36,7 @@ export const shouldFieldBeQueried = ({
return true;
}
- if (
- isDefined(recordGqlFields) &&
- isDefined(recordGqlFields[gqlField]) &&
- recordGqlFields[gqlField] !== false
- ) {
+ if (isDefined(recordGqlFields?.[gqlField])) {
return true;
}
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useGetRecordFromCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useGetRecordFromCache.ts
index 61b4f6a10fc..c77b1b3167b 100644
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useGetRecordFromCache.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/hooks/useGetRecordFromCache.ts
@@ -5,7 +5,7 @@ import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadata
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { getRecordFromCache } from '@/object-record/cache/utils/getRecordFromCache';
import { useGenerateDepthRecordGqlFieldsFromObject } from '@/object-record/graphql/record-gql-fields/hooks/useGenerateDepthRecordGqlFieldsFromObject';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache.ts
index a67708ce897..d545d58d1ff 100644
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache.ts
@@ -3,7 +3,10 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMeta
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getRecordConnectionFromRecords } from '@/object-record/cache/utils/getRecordConnectionFromRecords';
-import { type RecordGqlOperationVariables } from 'twenty-shared/types';
+import {
+ type RecordGqlOperationVariables,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { generateFindManyRecordsQuery } from '@/object-record/utils/generateFindManyRecordsQuery';
@@ -28,7 +31,7 @@ export const useUpsertFindManyRecordsQueryInCache = ({
}: {
queryVariables: RecordGqlOperationVariables;
objectRecordsToOverwrite: T[];
- recordGqlFields?: Record<string, any>;
+ recordGqlFields?: RecordGqlFields;
computeReferences?: boolean;
}) => {
const findManyRecordsQueryForCacheOverwrite = generateFindManyRecordsQuery({
diff --git a/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindOneRecordQueryInCache.ts b/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindOneRecordQueryInCache.ts
index 3ffe7bf664b..1cd34ca0b63 100644
--- a/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindOneRecordQueryInCache.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/hooks/useUpsertFindOneRecordQueryInCache.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
@@ -9,7 +10,7 @@ export const useUpsertFindOneRecordQueryInCache = ({
withSoftDeleted = false,
}: {
objectMetadataItem: EnrichedObjectMetadataItem;
- recordGqlFields: Record<string, any>;
+ recordGqlFields: RecordGqlFields;
withSoftDeleted?: boolean;
}) => {
const apolloCoreClient = useApolloCoreClient();
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/filterRecordOnGqlFields.test.ts b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/filterRecordOnGqlFields.test.ts
index fd81b2b09e0..b5b2758be04 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/filterRecordOnGqlFields.test.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/filterRecordOnGqlFields.test.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { filterRecordOnGqlFields } from '@/object-record/cache/utils/filterRecordOnGqlFields';
describe('filterRecordOnGqlFields', () => {
@@ -10,7 +11,7 @@ describe('filterRecordOnGqlFields', () => {
phone: '123-456-7890',
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
id: true,
name: true,
};
@@ -23,50 +24,6 @@ describe('filterRecordOnGqlFields', () => {
});
});
- it('should exclude fields with false values', () => {
- const record = {
- id: '1',
- __typename: 'Person',
- name: 'John',
- email: '[email protected]',
- };
-
- const recordGqlFields = {
- id: true,
- name: false,
- email: true,
- };
-
- const result = filterRecordOnGqlFields({ record, recordGqlFields });
-
- expect(result).toEqual({
- id: '1',
- email: '[email protected]',
- });
- });
-
- it('should exclude fields with undefined values', () => {
- const record = {
- id: '1',
- __typename: 'Person',
- name: 'John',
- email: '[email protected]',
- };
-
- const recordGqlFields = {
- id: true,
- name: undefined,
- email: true,
- };
-
- const result = filterRecordOnGqlFields({ record, recordGqlFields });
-
- expect(result).toEqual({
- id: '1',
- email: '[email protected]',
- });
- });
-
it('should handle composite fields with RecordGqlFields', () => {
const record = {
id: '1',
@@ -78,7 +35,7 @@ describe('filterRecordOnGqlFields', () => {
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
id: true,
fullName: {
firstName: true,
@@ -108,7 +65,7 @@ describe('filterRecordOnGqlFields', () => {
],
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
id: true,
name: true,
employees: {
@@ -136,7 +93,7 @@ describe('filterRecordOnGqlFields', () => {
company: null,
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
id: true,
company: {
id: true,
@@ -159,7 +116,7 @@ describe('filterRecordOnGqlFields', () => {
company: undefined,
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
id: true,
company: {
id: true,
@@ -201,7 +158,7 @@ describe('filterRecordOnGqlFields', () => {
},
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
id: true,
company: {
id: true,
@@ -249,7 +206,7 @@ describe('filterRecordOnGqlFields', () => {
tags: ['tag1', 'tag2', 'tag3'],
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
id: true,
tags: true,
};
@@ -273,7 +230,7 @@ describe('filterRecordOnGqlFields', () => {
],
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
id: true,
employees: {
id: true,
@@ -296,7 +253,7 @@ describe('filterRecordOnGqlFields', () => {
name: 'John',
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
email: true,
phone: true,
};
@@ -316,7 +273,7 @@ describe('filterRecordOnGqlFields', () => {
address: 'NYC',
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
id: true,
email: true,
};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordNodeFromRecord.test.ts b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordNodeFromRecord.test.ts
index 27bab8eff1a..c499816657c 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordNodeFromRecord.test.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordNodeFromRecord.test.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { mockedPersonRecords } from '~/testing/mock-data/generated/data/people/mock-people-data';
@@ -24,7 +25,7 @@ describe('getRecordNodeFromRecord', () => {
throw new Error('Object metadata item not found');
}
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
name: true,
company: true,
};
@@ -66,7 +67,7 @@ describe('getRecordNodeFromRecord', () => {
throw new Error('Object metadata item not found');
}
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
name: true,
company: true,
};
@@ -117,7 +118,7 @@ describe('getRecordNodeFromRecord', () => {
...peopleMock[0],
[oneToManyRelationField.name]: null,
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
name: true,
[oneToManyRelationField.name]: true,
};
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/filterRecordOnGqlFields.ts b/packages/twenty-front/src/modules/object-record/cache/utils/filterRecordOnGqlFields.ts
index 267ada29252..d45538a175b 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/filterRecordOnGqlFields.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/filterRecordOnGqlFields.ts
@@ -1,4 +1,4 @@
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { isObject } from '@sniptt/guards';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
@@ -14,7 +14,7 @@ export const filterRecordOnGqlFields = ({
.map(([key, value]) => {
const gqlFieldValue = recordGqlFields[key];
- if (!isDefined(gqlFieldValue) || gqlFieldValue === false) {
+ if (!isDefined(gqlFieldValue)) {
return undefined;
}
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromRecords.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromRecords.ts
index 181904cb332..47b90e7c64c 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordConnectionFromRecords.ts
@@ -3,7 +3,7 @@ import { getEmptyPageInfo } from '@/object-record/cache/utils/getEmptyPageInfo';
import { getRecordEdgeFromRecord } from '@/object-record/cache/utils/getRecordEdgeFromRecord';
import { type RecordGqlConnectionEdgesRequired } from '@/object-record/graphql/types/RecordGqlConnectionEdgesRequired';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { getConnectionTypename } from 'twenty-shared/utils';
export const getRecordConnectionFromRecords = <T extends ObjectRecord>({
@@ -21,7 +21,7 @@ export const getRecordConnectionFromRecords = <T extends ObjectRecord>({
'fields' | 'namePlural' | 'nameSingular'
>;
records: T[];
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
withPageInfo?: boolean;
isRootLevel?: boolean;
computeReferences?: boolean;
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordEdgeFromRecord.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordEdgeFromRecord.ts
index 6f5c8c73cc8..ae46c4b701e 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordEdgeFromRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordEdgeFromRecord.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getEdgeTypename } from 'twenty-shared/utils';
import { getRecordNodeFromRecord } from '@/object-record/cache/utils/getRecordNodeFromRecord';
@@ -17,7 +18,7 @@ export const getRecordEdgeFromRecord = <T extends ObjectRecord>({
EnrichedObjectMetadataItem,
'fields' | 'namePlural' | 'nameSingular'
>;
- recordGqlFields?: Record<string, any>;
+ recordGqlFields?: RecordGqlFields;
computeReferences?: boolean;
isRootLevel?: boolean;
record: T;
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordFromCache.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordFromCache.ts
index 423ba6a697c..75f09da9e9e 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordFromCache.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordFromCache.ts
@@ -3,10 +3,12 @@ import { type ApolloCache, gql } from '@apollo/client';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import {
+ type RecordGqlFields,
+ type ObjectPermissions,
+} from 'twenty-shared/types';
import { generateDepthRecordGqlFieldsFromObject } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromObject';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { type ObjectPermissions } from 'twenty-shared/types';
import { capitalize, isDefined, isEmptyObject } from 'twenty-shared/utils';
export type GetRecordFromCacheArgs = {
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
index 8e711e8d3ad..4b12a7cfcf6 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { isNull, isUndefined } from '@sniptt/guards';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
@@ -30,7 +31,7 @@ export const getRecordNodeFromRecord = <T extends ObjectRecord>({
EnrichedObjectMetadataItem,
'fields' | 'namePlural' | 'nameSingular'
>;
- recordGqlFields?: Record<string, any>;
+ recordGqlFields?: RecordGqlFields;
computeReferences?: boolean;
isRootLevel?: boolean;
record: T | null;
@@ -50,7 +51,10 @@ export const getRecordNodeFromRecord = <T extends ObjectRecord>({
const nestedRecord = Object.fromEntries(
Object.entries(record)
.map(([gqlField, value]) => {
- if (isDefined(recordGqlFields) && !recordGqlFields[gqlField]) {
+ if (
+ isDefined(recordGqlFields) &&
+ !isDefined(recordGqlFields[gqlField])
+ ) {
return undefined;
}
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/updateRecordFromCache.ts b/packages/twenty-front/src/modules/object-record/cache/utils/updateRecordFromCache.ts
index 7d1dac82e9d..e09f5310d68 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/updateRecordFromCache.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/updateRecordFromCache.ts
@@ -4,10 +4,12 @@ import gql from 'graphql-tag';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
import { getRecordNodeFromRecord } from '@/object-record/cache/utils/getRecordNodeFromRecord';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import {
+ type RecordGqlFields,
+ type ObjectPermissions,
+} from 'twenty-shared/types';
import { type RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { type ObjectPermissions } from 'twenty-shared/types';
import { capitalize, isDefined } from 'twenty-shared/utils';
export const updateRecordFromCache = <T extends ObjectRecord>({
diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/types/RecordGqlFields.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/types/RecordGqlFields.ts
deleted file mode 100644
index 5c2b33b1680..00000000000
--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/types/RecordGqlFields.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export type RecordGqlFields = {
- [k: string]: boolean | RecordGqlFields | undefined;
-};
diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/__snapshots__/generateDepthRecordGqlFieldsFromRecord.test.ts.snap b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/__snapshots__/generateDepthRecordGqlFieldsFromRecord.test.ts.snap
index 99058fea3eb..3a5817a7c87 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/__snapshots__/generateDepthRecordGqlFieldsFromRecord.test.ts.snap
+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/__snapshots__/generateDepthRecordGqlFieldsFromRecord.test.ts.snap
@@ -1,97 +1,18 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
-exports[`generateDepthRecordGqlFieldsFromRecord should generate depth one record gql fields from empty record 1`] = `
-{
- "accountOwner": false,
- "accountOwnerId": false,
- "address": false,
- "annualRecurringRevenue": false,
- "attachments": false,
- "caredForPets": false,
- "createdAt": false,
- "createdBy": false,
- "deletedAt": false,
- "domainName": false,
- "employees": false,
- "id": false,
- "idealCustomerProfile": false,
- "introVideo": false,
- "linkedinLink": false,
- "name": false,
- "noteTargets": false,
- "opportunities": false,
- "people": false,
- "position": false,
- "previousEmployees": false,
- "searchVector": false,
- "tagline": false,
- "taskTargets": false,
- "timelineActivities": false,
- "updatedAt": false,
- "updatedBy": false,
- "visaSponsorship": false,
- "workPolicy": false,
- "xLink": false,
-}
-`;
+exports[`generateDepthRecordGqlFieldsFromRecord should generate depth one record gql fields from empty record 1`] = `{}`;
exports[`generateDepthRecordGqlFieldsFromRecord should generate depth one record gql fields from record with some fields 1`] = `
{
- "accountOwner": false,
- "accountOwnerId": false,
- "address": false,
- "annualRecurringRevenue": false,
- "attachments": false,
- "caredForPets": false,
- "createdAt": false,
- "createdBy": false,
- "deletedAt": false,
"domainName": true,
- "employees": false,
"id": true,
- "idealCustomerProfile": false,
- "introVideo": false,
- "linkedinLink": false,
"name": true,
- "noteTargets": false,
- "opportunities": false,
- "people": false,
- "position": false,
- "previousEmployees": false,
- "searchVector": false,
- "tagline": false,
- "taskTargets": false,
- "timelineActivities": false,
- "updatedAt": false,
- "updatedBy": false,
- "visaSponsorship": false,
- "workPolicy": false,
- "xLink": false,
}
`;
exports[`generateDepthRecordGqlFieldsFromRecord should generate depth zero record gql fields from record with some fields 1`] = `
{
- "accountOwnerId": false,
- "address": false,
- "annualRecurringRevenue": false,
- "createdAt": false,
- "createdBy": false,
- "deletedAt": false,
- "domainName": false,
- "employees": false,
"id": true,
- "idealCustomerProfile": false,
- "introVideo": false,
- "linkedinLink": false,
"name": true,
- "position": false,
- "searchVector": false,
- "tagline": false,
- "updatedAt": false,
- "updatedBy": false,
- "visaSponsorship": false,
- "workPolicy": false,
- "xLink": false,
}
`;
diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/buildIdentifierGqlFields.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/buildIdentifierGqlFields.ts
index 8b95cd4c10a..7155ef23b8f 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/buildIdentifierGqlFields.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/buildIdentifierGqlFields.ts
@@ -1,7 +1,7 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getImageIdentifierFieldMetadataItem } from '@/object-metadata/utils/getImageIdentifierFieldMetadataItem';
import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
export const buildIdentifierGqlFields = (
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.ts
index 1d665d5efed..36b8a356cde 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields.ts
@@ -1,6 +1,9 @@
-import { FieldMetadataType, RelationType } from 'twenty-shared/types';
+import {
+ FieldMetadataType,
+ RelationType,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { type GenerateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
import { buildIdentifierGqlFields } from '@/object-record/graphql/record-gql-fields/utils/buildIdentifierGqlFields';
import { generateJunctionRelationGqlFields } from '@/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields';
import { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';
diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromRecord.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromRecord.ts
index d88384a3b27..ffe3a55da54 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromRecord.ts
@@ -1,4 +1,4 @@
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields } from 'twenty-shared/types';
import {
generateDepthRecordGqlFieldsFromObject,
type GenerateDepthRecordGqlFields,
@@ -20,15 +20,10 @@ export const generateDepthRecordGqlFieldsFromRecord = ({
objectMetadataItems,
depth,
});
- const recordKeys = Object.keys(record);
- return Object.keys(depthRecordGqlFields).reduce<RecordGqlFields>(
- (acc, key) => {
- return {
- ...acc,
- [key]: recordKeys.includes(key),
- };
- },
- depthRecordGqlFields,
+ return Object.fromEntries(
+ Object.keys(depthRecordGqlFields)
+ .filter((key) => Object.hasOwn(record, key))
+ .map((key) => [key, true]),
);
};
diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts
index 58bb68c80cd..414532d01b5 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts
@@ -1,9 +1,8 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields, FieldMetadataType } from 'twenty-shared/types';
import { buildIdentifierGqlFields } from '@/object-record/graphql/record-gql-fields/utils/buildIdentifierGqlFields';
import { type JunctionObjectMetadataItem } from '@/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem';
import { type ValidJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig';
-import { FieldMetadataType } from 'twenty-shared/types';
import {
computeMorphRelationGqlFieldName,
isDefined,
diff --git a/packages/twenty-front/src/modules/object-record/graphql/utils/extractOrderByFieldNames.ts b/packages/twenty-front/src/modules/object-record/graphql/utils/extractOrderByFieldNames.ts
index 105c28ee466..4498048de68 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/utils/extractOrderByFieldNames.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/utils/extractOrderByFieldNames.ts
@@ -1,12 +1,15 @@
-import { type RecordGqlOperationOrderBy } from 'twenty-shared/types';
+import {
+ type RecordGqlFields,
+ type RecordGqlOperationOrderBy,
+} from 'twenty-shared/types';
import { isPlainObject } from 'twenty-shared/utils';
import { isOrderByDirection } from '@/object-record/graphql/utils/isOrderByDirection';
export const extractOrderByFieldNames = (
orderBy: RecordGqlOperationOrderBy,
-): Record<string, boolean | Record<string, boolean>> => {
- const gqlFields: Record<string, boolean | Record<string, boolean>> = {
+): RecordGqlFields => {
+ const gqlFields: RecordGqlFields = {
id: true,
};
@@ -15,7 +18,7 @@ export const extractOrderByFieldNames = (
if (isOrderByDirection(value)) {
gqlFields[fieldName] = true;
} else if (isPlainObject(value)) {
- const subFields: Record<string, boolean> = {};
+ const subFields: RecordGqlFields = {};
for (const [subFieldName, subValue] of Object.entries(
value as Record<string, unknown>,
diff --git a/packages/twenty-front/src/modules/object-record/graphql/utils/isRecordGraphlFieldsNode.ts b/packages/twenty-front/src/modules/object-record/graphql/utils/isRecordGraphlFieldsNode.ts
index 55a77621ff3..6594dd5c522 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/utils/isRecordGraphlFieldsNode.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/utils/isRecordGraphlFieldsNode.ts
@@ -1,4 +1,4 @@
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
export const isRecordGqlFieldsNode = (
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecordsQuery.ts
index 87c9bcc05ad..d7e882c0c6a 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecordsQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecordsQuery.ts
@@ -1,5 +1,5 @@
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { type RecordGqlFieldsAggregate } from '@/object-record/graphql/types/RecordGqlFieldsAggregate';
import { type ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
import { generateAggregateQuery } from '@/object-record/utils/generateAggregateQuery';
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts
index fd560d3bacf..0cd884fd1e5 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts
@@ -24,7 +24,7 @@ import { type RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode'
import { getCreateManyRecordsMutationResponseField } from '@/object-record/utils/getCreateManyRecordsMutationResponseField';
import { sanitizeRecordInput } from '@/object-record/utils/sanitizeRecordInput';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
type PartialObjectRecordWithId = Partial<ObjectRecord> & {
@@ -37,7 +37,7 @@ type PartialObjectRecordWithOptionalId = Partial<ObjectRecord> & {
export type useCreateManyRecordsProps = {
objectNameSingular: string;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
skipPostOptimisticEffect?: boolean;
shouldMatchRootQueryFilter?: boolean;
shouldRefetchAggregateQueries?: boolean;
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsMutation.ts
index 2d8c47ada2a..263eb56b2c3 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsMutation.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsMutation.ts
@@ -5,7 +5,7 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMeta
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { getCreateManyRecordsMutationResponseField } from '@/object-record/utils/getCreateManyRecordsMutationResponseField';
import { capitalize, isDefined } from 'twenty-shared/utils';
@@ -15,7 +15,7 @@ export const useCreateManyRecordsMutation = ({
recordGqlFields,
}: {
objectNameSingular: string;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
}) => {
const { objectMetadataItem } = useObjectMetadataItem({
objectNameSingular,
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecord.ts
index 34002485fe1..01eca4571f9 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecord.ts
@@ -20,7 +20,7 @@ import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useU
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import {
type ObjectRecord as ObjectRecordShared,
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
} from 'twenty-shared/types';
import { type BaseObjectRecord } from '@/object-record/types/BaseObjectRecord';
@@ -34,7 +34,7 @@ import { CustomError, isDefined } from 'twenty-shared/utils';
type useCreateOneRecordProps = {
objectNameSingular: string;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
skipPostOptimisticEffect?: boolean;
shouldMatchRootQueryFilter?: boolean;
};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordMutation.ts
index ac16cf1031d..54f80cdaa5f 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordMutation.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordMutation.ts
@@ -3,7 +3,7 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMeta
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { generateCreateOneRecordMutation } from '@/object-metadata/utils/generateCreateOneRecordMutation';
import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { isDefined } from 'twenty-shared/utils';
@@ -12,7 +12,7 @@ export const useCreateOneRecordMutation = ({
recordGqlFields,
}: {
objectNameSingular: string;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
}) => {
const { objectMetadataItem } = useObjectMetadataItem({
objectNameSingular,
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts
index 08e066f3c7b..36fe0011871 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { triggerUpdateRecordOptimisticEffectByBatch } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffectByBatch';
import { dispatchObjectRecordOperationBrowserEvent } from '@/browser-event/utils/dispatchObjectRecordOperationBrowserEvent';
import { apiConfigState } from '@/client-config/states/apiConfigState';
@@ -92,7 +93,7 @@ export const useDeleteManyRecords = ({
const cachedRecordsNode: RecordGqlNode[] = [];
const computedOptimisticRecordsNode: RecordGqlNode[] = [];
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
deletedAt: true,
};
cachedRecords.forEach((cachedRecord) => {
@@ -156,7 +157,7 @@ export const useDeleteManyRecords = ({
const cachedRecordsNode: RecordGqlNode[] = [];
const computedOptimisticRecordsNode: RecordGqlNode[] = [];
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
deletedAt: true,
};
cachedRecords.forEach((cachedRecord) => {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecord.ts
index f107401fcb0..42f6f52f2dd 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecord.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { useCallback } from 'react';
import { triggerUpdateRecordOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect';
@@ -80,7 +81,7 @@ export const useDeleteOneRecord = ({
isDefined(cachedRecordNode);
if (shouldHandleOptimisticCache) {
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
deletedAt: true,
};
updateRecordFromCache({
@@ -133,7 +134,7 @@ export const useDeleteOneRecord = ({
throw error;
}
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
deletedAt: true,
};
updateRecordFromCache({
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts b/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts
index 881819541f0..68485207726 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts
@@ -20,7 +20,7 @@ import { type OnFindManyRecordsCompleted } from '@/object-record/types/OnFindMan
import { filterUniqueRecordEdgesByCursor } from '@/object-record/utils/filterUniqueRecordEdgesByCursor';
import { getQueryIdentifier } from '@/object-record/utils/getQueryIdentifier';
import {
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
type RecordGqlOperationVariables,
} from 'twenty-shared/types';
@@ -40,7 +40,7 @@ export type UseFindManyRecordsParams<T> = ObjectMetadataItemIdentifier &
RecordGqlOperationVariables & {
onCompleted?: OnFindManyRecordsCompleted<T>;
skip?: boolean;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
fetchPolicy?: WatchQueryFetchPolicy;
};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts
index cad25751701..c2ffe23b2bc 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts
@@ -17,7 +17,7 @@ import { type OnFindManyRecordsCompleted } from '@/object-record/types/OnFindMan
import { getQueryIdentifier } from '@/object-record/utils/getQueryIdentifier';
import {
type RecordGqlOperationFilter,
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
type RecordGqlOperationVariables,
} from 'twenty-shared/types';
@@ -28,7 +28,7 @@ export type UseFindManyRecordsParams<T> = ObjectMetadataItemIdentifier &
onError?: (error?: Error) => void;
onCompleted?: OnFindManyRecordsCompleted<T>;
skip?: boolean;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
fetchPolicy?: WatchQueryFetchPolicy;
withSoftDeleted?: boolean;
};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecordsQuery.ts
index 6297a60ec71..92f36d9f1aa 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecordsQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecordsQuery.ts
@@ -7,7 +7,7 @@ import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions
import { generateFindManyRecordsQuery } from '@/object-record/utils/generateFindManyRecordsQuery';
import {
type QueryCursorDirection,
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
} from 'twenty-shared/types';
export const useFindManyRecordsQuery = ({
@@ -17,7 +17,7 @@ export const useFindManyRecordsQuery = ({
cursorDirection = 'after',
}: {
objectNameSingular: string;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
computeReferences?: boolean;
cursorDirection?: QueryCursorDirection;
}) => {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
index 892da72469e..fbdd0f427ee 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
@@ -10,7 +10,7 @@ import { type RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode'
import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
import { useCanReadObjectRecordsOrSharedRecords } from '@/object-record/record-sharing/hooks/useCanReadObjectRecordsOrSharedRecords';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
export const useFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
@@ -21,7 +21,7 @@ export const useFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
withSoftDeleted = false,
}: ObjectMetadataItemIdentifier & {
objectRecordId: string | undefined;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
skip?: boolean;
withSoftDeleted?: boolean;
}) => {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts
index ded90daf129..9c6e5f367e5 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts
@@ -5,7 +5,7 @@ import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadata
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { capitalize } from 'twenty-shared/utils';
@@ -15,7 +15,7 @@ export const useFindOneRecordQuery = ({
withSoftDeleted = false,
}: {
objectNameSingular: string;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
withSoftDeleted?: boolean;
}) => {
const { objectMetadataItem } = useObjectMetadataItem({
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useGroupByRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useGroupByRecordsQuery.ts
index 72a7e65f82d..c42a49098e3 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useGroupByRecordsQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useGroupByRecordsQuery.ts
@@ -3,7 +3,7 @@ import { useMemo } from 'react';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { generateGroupByRecordsQuery } from '@/object-record/utils/generateGroupByRecordsQuery';
@@ -13,7 +13,7 @@ export const useGroupByRecordsQuery = ({
computeReferences,
}: {
objectNameSingular: string;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
computeReferences?: boolean;
}) => {
const { objectMetadataItem } = useObjectMetadataItem({
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useIncrementalDeleteManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useIncrementalDeleteManyRecords.ts
index b6365fa6849..6525033c029 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useIncrementalDeleteManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useIncrementalDeleteManyRecords.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { triggerUpdateRecordOptimisticEffectByBatch } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffectByBatch';
import { dispatchObjectRecordOperationBrowserEvent } from '@/browser-event/utils/dispatchObjectRecordOperationBrowserEvent';
import { useRemoveNavigationMenuItemByTargetRecordId } from '@/navigation-menu-item/common/hooks/useRemoveNavigationMenuItemByTargetRecordId';
@@ -79,7 +80,7 @@ export const useIncrementalDeleteManyRecords = <T>({
const cachedRecordsNode: RecordGqlNode[] = [];
const computedOptimisticRecordsNode: RecordGqlNode[] = [];
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
deletedAt: true,
};
@@ -182,7 +183,7 @@ export const useIncrementalDeleteManyRecords = <T>({
throw error;
}
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
deletedAt: true,
};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useLazyFetchMoreRecordsWithPagination.ts b/packages/twenty-front/src/modules/object-record/hooks/useLazyFetchMoreRecordsWithPagination.ts
index d181ef7bc23..cf384882f60 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useLazyFetchMoreRecordsWithPagination.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useLazyFetchMoreRecordsWithPagination.ts
@@ -20,7 +20,7 @@ import { type OnFindManyRecordsCompleted } from '@/object-record/types/OnFindMan
import { filterUniqueRecordEdgesByCursor } from '@/object-record/utils/filterUniqueRecordEdgesByCursor';
import { getQueryIdentifier } from '@/object-record/utils/getQueryIdentifier';
import {
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
type RecordGqlOperationVariables,
} from 'twenty-shared/types';
@@ -38,7 +38,7 @@ export type UseFindManyRecordsParams<T> = ObjectMetadataItemIdentifier &
RecordGqlOperationVariables & {
onCompleted?: OnFindManyRecordsCompleted<T>;
skip?: boolean;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
fetchPolicy?: WatchQueryFetchPolicy;
};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts
index c1e11746e11..628f2ab3e9a 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts
@@ -6,12 +6,12 @@ import { type ObjectMetadataItemIdentifier } from '@/object-metadata/types/Objec
import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
import { useGenerateDepthRecordGqlFieldsFromObject } from '@/object-record/graphql/record-gql-fields/hooks/useGenerateDepthRecordGqlFieldsFromObject';
import { type RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode';
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
type UseLazyFindOneRecordParams = ObjectMetadataItemIdentifier & {
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
withSoftDeleted?: boolean;
fetchPolicy?: WatchQueryFetchPolicy;
};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useMergeManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useMergeManyRecords.ts
index 458c8a7bd71..f1baf3d2811 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useMergeManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useMergeManyRecords.ts
@@ -10,7 +10,7 @@ import { useMergeManyRecordsMutation } from '@/object-record/hooks/useMergeManyR
import { useRefetchAggregateQueries } from '@/object-record/hooks/useRefetchAggregateQueries';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { getMergeManyRecordsMutationResponseField } from '@/object-record/utils/getMergeManyRecordsMutationResponseField';
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { getOperationName } from '~/utils/getOperationName';
export type MergeManySettings = {
@@ -19,7 +19,7 @@ export type MergeManySettings = {
export type UseMergeManyRecordsProps = {
objectNameSingular: string;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
};
export const useMergeManyRecords = <
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useMergeManyRecordsMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useMergeManyRecordsMutation.ts
index e15e60969fe..95f3a38a10d 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useMergeManyRecordsMutation.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useMergeManyRecordsMutation.ts
@@ -6,7 +6,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
import { useGenerateDepthRecordGqlFieldsFromObject } from '@/object-record/graphql/record-gql-fields/hooks/useGenerateDepthRecordGqlFieldsFromObject';
-import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { getMergeManyRecordsMutationResponseField } from '@/object-record/utils/getMergeManyRecordsMutationResponseField';
import { capitalize, isDefined } from 'twenty-shared/utils';
@@ -16,7 +16,7 @@ export const useMergeManyRecordsMutation = ({
recordGqlFields,
}: {
objectNameSingular: string;
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
}) => {
const { objectMetadataItem } = useObjectMetadataItem({
objectNameSingular,
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecords.ts
index 6bc2543bec8..5da2b697dbc 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecords.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { triggerUpdateRecordOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect';
import { apiConfigState } from '@/client-config/states/apiConfigState';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
@@ -106,7 +107,7 @@ export const useRestoreManyRecords = ({
isDefined(optimisticRecordWithConnection) &&
isDefined(cachedRecordWithConnection)
) {
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
deletedAt: true,
};
updateRecordFromCache({
@@ -167,7 +168,7 @@ export const useRestoreManyRecords = ({
isDefined(optimisticRecordWithConnection) &&
isDefined(cachedRecordWithConnection)
) {
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
deletedAt: true,
};
updateRecordFromCache({
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useUpdateManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useUpdateManyRecords.ts
index 6a3246ebaf6..5102db2a4d6 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useUpdateManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useUpdateManyRecords.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { triggerUpdateRecordOptimisticEffectByBatch } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffectByBatch';
import { apiConfigState } from '@/client-config/states/apiConfigState';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
@@ -26,7 +27,7 @@ import { sleep } from '~/utils/sleep';
type UseUpdateManyRecordsProps = {
objectNameSingular: string;
- recordGqlFields?: Record<string, any>;
+ recordGqlFields?: RecordGqlFields;
};
export type UpdateManyRecordsProps<T extends ObjectRecord = ObjectRecord> = {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecord.ts
index d51161409a0..ae7c3d492a9 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecord.ts
@@ -9,7 +9,7 @@ import { getRecordFromCache } from '@/object-record/cache/utils/getRecordFromCac
import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
import { getRecordNodeFromRecord } from '@/object-record/cache/utils/getRecordNodeFromRecord';
import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordFromCache';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { generateDepthRecordGqlFieldsFromObject } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromObject';
import { generateDepthRecordGqlFieldsFromRecord } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromRecord';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
@@ -201,7 +201,7 @@ export const useUpdateOneRecord = () => {
optimisticRecordInput,
).filter((diffKey) => !cachedRecordKeys.has(diffKey));
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
...generateDepthRecordGqlFieldsFromRecord({
objectMetadataItem,
objectMetadataItems,
diff --git a/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/__tests__/useCombinedFindManyRecords.test.tsx b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/__tests__/useCombinedFindManyRecords.test.tsx
index bc6aa414311..0b271e661ab 100644
--- a/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/__tests__/useCombinedFindManyRecords.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/__tests__/useCombinedFindManyRecords.test.tsx
@@ -1,9 +1,11 @@
import { gql } from '@apollo/client';
import { renderHook, waitFor } from '@testing-library/react';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import {
+ type RecordGqlFields,
+ type RecordGqlOperationSignature,
+} from 'twenty-shared/types';
import { setTestObjectMetadataItemsInMetadataStore } from '~/testing/utils/setTestObjectMetadataItemsInMetadataStore';
-import { type RecordGqlOperationSignature } from 'twenty-shared/types';
import { useCombinedFindManyRecords } from '@/object-record/multiple-objects/hooks/useCombinedFindManyRecords';
import { useGenerateCombinedFindManyRecordsQuery } from '@/object-record/multiple-objects/hooks/useGenerateCombinedFindManyRecordsQuery';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
diff --git a/packages/twenty-front/src/modules/object-record/multiple-objects/utils/__tests__/generateCombinedFindManyRecordsQueryVariables.test.ts b/packages/twenty-front/src/modules/object-record/multiple-objects/utils/__tests__/generateCombinedFindManyRecordsQueryVariables.test.ts
index 95b6b4442fe..40bbdd116fe 100644
--- a/packages/twenty-front/src/modules/object-record/multiple-objects/utils/__tests__/generateCombinedFindManyRecordsQueryVariables.test.ts
+++ b/packages/twenty-front/src/modules/object-record/multiple-objects/utils/__tests__/generateCombinedFindManyRecordsQueryVariables.test.ts
@@ -1,5 +1,7 @@
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
-import { type RecordGqlOperationSignature } from 'twenty-shared/types';
+import {
+ type RecordGqlFields,
+ type RecordGqlOperationSignature,
+} from 'twenty-shared/types';
import { generateCombinedFindManyRecordsQueryVariables } from '@/object-record/multiple-objects/utils/generateCombinedFindManyRecordsQueryVariables';
describe('useCombinedFindManyRecordsQueryVariables', () => {
@@ -45,7 +47,7 @@ describe('useCombinedFindManyRecordsQueryVariables', () => {
fields: {
id: true,
name: true,
- } as RecordGqlFields,
+ } satisfies RecordGqlFields,
variables: {
filter: { id: { eq: '123' } },
orderBy: [{ createdAt: 'AscNullsLast' }],
@@ -77,7 +79,7 @@ describe('useCombinedFindManyRecordsQueryVariables', () => {
fields: {
id: true,
name: true,
- } as RecordGqlFields,
+ } satisfies RecordGqlFields,
variables: {
filter: { id: { eq: '123' } },
orderBy: [{ createdAt: 'AscNullsLast' }],
@@ -103,7 +105,7 @@ describe('useCombinedFindManyRecordsQueryVariables', () => {
objectNameSingular: 'person',
fields: {
id: true,
- } as RecordGqlFields,
+ } satisfies RecordGqlFields,
variables: {
filter: { id: { eq: '123' } },
limit: 10,
@@ -117,7 +119,7 @@ describe('useCombinedFindManyRecordsQueryVariables', () => {
objectNameSingular: 'company',
fields: {
id: true,
- } as RecordGqlFields,
+ } satisfies RecordGqlFields,
variables: {
filter: { name: { eq: 'Twenty' } },
limit: 20,
@@ -152,7 +154,7 @@ describe('useCombinedFindManyRecordsQueryVariables', () => {
objectNameSingular: 'person',
fields: {
id: true,
- } as RecordGqlFields,
+ } satisfies RecordGqlFields,
variables: {},
},
];
@@ -170,7 +172,7 @@ describe('useCombinedFindManyRecordsQueryVariables', () => {
objectNameSingular: 'person',
fields: {
id: true,
- } as RecordGqlFields,
+ } satisfies RecordGqlFields,
variables: {
cursorFilter: {
cursor: 'cursor123',
diff --git a/packages/twenty-front/src/modules/object-record/record-aggregate/utils/generateGroupsRecordsGroupByQuery.ts b/packages/twenty-front/src/modules/object-record/record-aggregate/utils/generateGroupsRecordsGroupByQuery.ts
index f7916402780..dd574e00ec0 100644
--- a/packages/twenty-front/src/modules/object-record/record-aggregate/utils/generateGroupsRecordsGroupByQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/record-aggregate/utils/generateGroupsRecordsGroupByQuery.ts
@@ -5,7 +5,7 @@ import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObje
import { getGroupByQueryResultGqlFieldName } from '@/page-layout/utils/getGroupByQueryResultGqlFieldName';
import {
type ObjectPermissions,
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
} from 'twenty-shared/types';
import { capitalize } from 'twenty-shared/utils';
@@ -18,7 +18,7 @@ export const generateGroupsRecordsGroupByQuery = ({
}: {
objectMetadataItems: EnrichedObjectMetadataItem[];
objectMetadataItem: EnrichedObjectMetadataItem;
- recordGqlFields: RecordGqlOperationGqlRecordFields;
+ recordGqlFields: RecordGqlFields;
computeReferences?: boolean;
objectPermissionsByObjectMetadataId: Record<
string,
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.ts
index e250e9feceb..6c4f4603b80 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
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getImageIdentifierFieldMetadataItem } from '@/object-metadata/utils/getImageIdentifierFieldMetadataItem';
@@ -20,7 +21,7 @@ type UseRecordsUsefulGqlFields = {
export const useRelevantRecordsGqlFields = ({
objectMetadataItem,
additionalFieldMetadataIds = [],
-}: UseRecordsUsefulGqlFields) => {
+}: UseRecordsUsefulGqlFields): RecordGqlFields => {
const visibleRecordFields = useAtomComponentSelectorValue(
visibleRecordFieldsComponentSelector,
);
diff --git a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPagePagination.ts b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPagePagination.ts
index 76f6ba366eb..c433ce2ce18 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPagePagination.ts
+++ b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPagePagination.ts
@@ -20,7 +20,11 @@ import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavi
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useQueryVariablesFromParentView } from '@/views/hooks/useQueryVariablesFromParentView';
-import { AppPath, SidePanelPages } from 'twenty-shared/types';
+import {
+ AppPath,
+ type RecordGqlFields,
+ SidePanelPages,
+} from 'twenty-shared/types';
import { combineFilters, getAppPath, isDefined } from 'twenty-shared/utils';
export const useRecordShowPagePagination = (
@@ -121,7 +125,7 @@ export const useRecordShowPagePagination = (
const baseNeighborOptions = {
skip: skipNeighborQueries,
objectNameSingular,
- recordGqlFields: { id: true },
+ recordGqlFields: { id: true } satisfies RecordGqlFields,
withSoftDeleted,
limit: 1,
};
diff --git a/packages/twenty-front/src/modules/object-record/record-store/hooks/useUpsertRecordsInStore.ts b/packages/twenty-front/src/modules/object-record/record-store/hooks/useUpsertRecordsInStore.ts
index da4ac1b0bd5..bae9906680f 100644
--- a/packages/twenty-front/src/modules/object-record/record-store/hooks/useUpsertRecordsInStore.ts
+++ b/packages/twenty-front/src/modules/object-record/record-store/hooks/useUpsertRecordsInStore.ts
@@ -1,5 +1,5 @@
import { filterRecordOnGqlFields } from '@/object-record/cache/utils/filterRecordOnGqlFields';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { useCallback } from 'react';
diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts
index 805390b66a1..94b80b13a1d 100644
--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts
@@ -2,6 +2,7 @@ import {
MetadataReadability,
ObjectOpenRecordIn,
ObjectSharingReach,
+ type RecordGqlFields,
} from 'twenty-shared/types';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { generateAggregateQuery } from '@/object-record/utils/generateAggregateQuery';
@@ -37,10 +38,9 @@ describe('generateAggregateQuery', () => {
readability: MetadataReadability.OPEN,
};
- const mockRecordGqlFields = {
+ const mockRecordGqlFields: RecordGqlFields = {
id: true,
name: true,
- address: false,
createdAt: true,
};
@@ -85,7 +85,7 @@ describe('generateAggregateQuery', () => {
readability: MetadataReadability.OPEN,
};
- const mockRecordGqlFields = {
+ const mockRecordGqlFields: RecordGqlFields = {
id: true,
};
diff --git a/packages/twenty-front/src/modules/object-record/utils/generateAggregateQuery.ts b/packages/twenty-front/src/modules/object-record/utils/generateAggregateQuery.ts
index aae7337b8f5..8b65cb8bf7b 100644
--- a/packages/twenty-front/src/modules/object-record/utils/generateAggregateQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/generateAggregateQuery.ts
@@ -1,7 +1,7 @@
import gql from 'graphql-tag';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
+import { type RecordGqlFields } from 'twenty-shared/types';
import { getAggregateQueryName } from '@/object-record/utils/getAggregateQueryName';
import { capitalize } from 'twenty-shared/utils';
@@ -12,10 +12,7 @@ export const generateAggregateQuery = ({
objectMetadataItem: EnrichedObjectMetadataItem;
recordGqlFields: RecordGqlFields;
}) => {
- const selectedFields = Object.entries(recordGqlFields)
- .filter(([_, shouldBeQueried]) => Boolean(shouldBeQueried))
- .map(([fieldName]) => fieldName)
- .join('\n ');
+ const selectedFields = Object.keys(recordGqlFields).join('\n ');
return gql`
query ${getAggregateQueryName(objectMetadataItem.namePlural)}($filter: ${capitalize(
diff --git a/packages/twenty-front/src/modules/object-record/utils/generateFindManyRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/utils/generateFindManyRecordsQuery.ts
index 11c7fff93e1..a5295a3a053 100644
--- a/packages/twenty-front/src/modules/object-record/utils/generateFindManyRecordsQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/generateFindManyRecordsQuery.ts
@@ -5,7 +5,7 @@ import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObje
import {
type ObjectPermissions,
type QueryCursorDirection,
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
} from 'twenty-shared/types';
import { capitalize } from 'twenty-shared/utils';
@@ -19,7 +19,7 @@ export const generateFindManyRecordsQuery = ({
}: {
objectMetadataItem: EnrichedObjectMetadataItem;
objectMetadataItems: EnrichedObjectMetadataItem[];
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
computeReferences?: boolean;
cursorDirection?: QueryCursorDirection;
objectPermissionsByObjectMetadataId: Record<
diff --git a/packages/twenty-front/src/modules/object-record/utils/generateGroupByRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/utils/generateGroupByRecordsQuery.ts
index a5018e7125d..e58fe9317b5 100644
--- a/packages/twenty-front/src/modules/object-record/utils/generateGroupByRecordsQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/generateGroupByRecordsQuery.ts
@@ -4,7 +4,7 @@ import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/Enriche
import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
import {
type ObjectPermissions,
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
} from 'twenty-shared/types';
import { capitalize } from 'twenty-shared/utils';
@@ -17,7 +17,7 @@ export const generateGroupByRecordsQuery = ({
}: {
objectMetadataItem: EnrichedObjectMetadataItem;
objectMetadataItems: EnrichedObjectMetadataItem[];
- recordGqlFields?: RecordGqlOperationGqlRecordFields;
+ recordGqlFields?: RecordGqlFields;
computeReferences?: boolean;
objectPermissionsByObjectMetadataId: Record<
string,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForWidget.ts b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForWidget.ts
index 807eb425566..97c95e2396e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForWidget.ts
@@ -7,17 +7,14 @@ import { type WidgetAccessDenialInfo } from '@/page-layout/widgets/types/WidgetA
import { useCallback, useMemo } from 'react';
import {
CoreObjectNameSingular,
- type RecordGqlOperationGqlRecordFields,
+ type RecordGqlFields,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
const CALL_RECORDING_RECORD_FIELDS_BY_WIDGET_KIND = {
summary: { id: true, status: true, summary: true },
transcript: { id: true, status: true, transcript: true },
-} as const satisfies Record<
- CallRecordingWidgetKind,
- RecordGqlOperationGqlRecordFields
->;
+} as const satisfies Record<CallRecordingWidgetKind, RecordGqlFields>;
export const useCallRecordingForWidget = ({
kind,
@@ -48,7 +45,7 @@ export const useCallRecordingForWidget = ({
const isTranscriptRestricted = isFieldRestricted('transcript');
// Requesting a field the role cannot read fails the whole query.
- const recordGqlFields = useMemo(
+ const recordGqlFields = useMemo<RecordGqlFields>(
() =>
kind === 'transcript'
? {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/usePreviewRecord.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/usePreviewRecord.ts
index 71dd7ab1232..97ba0f046ca 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/usePreviewRecord.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/usePreviewRecord.ts
@@ -1,5 +1,8 @@
import { useLabelIdentifierFieldMetadataItem } from '@/object-metadata/hooks/useLabelIdentifierFieldMetadataItem';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import {
+ CoreObjectNameSingular,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { isFieldValueEmpty } from '@/object-record/record-field/ui/utils/isFieldValueEmpty';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
@@ -22,7 +25,7 @@ export const usePreviewRecord = ({
const skip = skipFromProps || !labelIdentifierFieldMetadataItem;
- let recordGqlFields: Record<string, boolean> | undefined = undefined;
+ let recordGqlFields: RecordGqlFields | undefined = undefined;
if (objectNameSingular === CoreObjectNameSingular.NoteTarget)
recordGqlFields = { id: true, note: true };
if (objectNameSingular === CoreObjectNameSingular.TaskTarget)
diff --git a/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseDeleteEvents.ts b/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseDeleteEvents.ts
index 5247ceb82a8..ef2bc094dc6 100644
--- a/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseDeleteEvents.ts
+++ b/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseDeleteEvents.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { triggerUpdateRecordOptimisticEffectByBatch } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffectByBatch';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { objectMetadataItemsWithFieldsSelector } from '@/object-metadata/states/objectMetadataItemsWithFieldsSelector';
@@ -68,7 +69,7 @@ export const useTriggerOptimisticEffectFromSseDeleteEvents = () => {
}
for (const recordAfterDelete of recordsAfterDelete) {
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
deletedAt: true,
};
diff --git a/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseRestoreEvents.ts b/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseRestoreEvents.ts
index e9f4e06accc..3460c7ae7a8 100644
--- a/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseRestoreEvents.ts
+++ b/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseRestoreEvents.ts
@@ -1,3 +1,4 @@
+import { type RecordGqlFields } from 'twenty-shared/types';
import { triggerUpdateRecordOptimisticEffectByBatch } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffectByBatch';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { objectMetadataItemsWithFieldsSelector } from '@/object-metadata/states/objectMetadataItemsWithFieldsSelector';
@@ -66,7 +67,7 @@ export const useTriggerOptimisticEffectFromSseRestoreEvents = () => {
}
for (const recordAfterRestore of recordsAfterRestore) {
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
deletedAt: true,
};
diff --git a/packages/twenty-front/src/modules/validation-rules/utils/buildValidationRulePreviewRelationGqlFields.ts b/packages/twenty-front/src/modules/validation-rules/utils/buildValidationRulePreviewRelationGqlFields.ts
index 1bb15b68553..2ecd305ef31 100644
--- a/packages/twenty-front/src/modules/validation-rules/utils/buildValidationRulePreviewRelationGqlFields.ts
+++ b/packages/twenty-front/src/modules/validation-rules/utils/buildValidationRulePreviewRelationGqlFields.ts
@@ -1,8 +1,9 @@
-import { type ValidationRuleFieldDescriptor } from 'twenty-shared/types';
+import {
+ type ValidationRuleFieldDescriptor,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';
-
export const buildValidationRulePreviewRelationGqlFields = ({
bindingPaths,
fields,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges.ts
index 10dc4eb43a2..53dee0bd4d7 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useApplyWorkflowVersionStepChanges.ts
@@ -2,7 +2,10 @@ import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnab
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import {
+ CoreObjectNameSingular,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordFromCache';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
@@ -73,7 +76,7 @@ export const useApplyWorkflowVersionStepChanges = (instanceId?: string) => {
.trigger,
} as WorkflowVersion;
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
steps: true,
trigger: true,
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowRunStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowRunStep.ts
index aa5faaf5d34..58adbbd9bec 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowRunStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowRunStep.ts
@@ -8,7 +8,10 @@ import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions
import { UPDATE_WORKFLOW_RUN_STEP } from '@/workflow/graphql/mutations/updateWorkflowRunStep';
import { type WorkflowRun, type WorkflowStep } from '@/workflow/types/Workflow';
import { useMutation } from '@apollo/client/react';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import {
+ CoreObjectNameSingular,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/components/feedback';
import {
@@ -75,7 +78,7 @@ export const useUpdateWorkflowRunStep = () => {
},
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
state: true,
};
updateRecordFromCache({
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts
index e9bbdf600b1..ef21b2d7e13 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateWorkflowVersionStep.ts
@@ -17,7 +17,10 @@ import {
} from '@/workflow/types/Workflow';
import { useStepsOutputSchema } from '@/workflow/workflow-variables/hooks/useStepsOutputSchema';
import { useMutation } from '@apollo/client/react';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import {
+ CoreObjectNameSingular,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/components/feedback';
import {
@@ -117,7 +120,7 @@ export const useUpdateWorkflowVersionStep = (instanceId?: string) => {
}),
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
steps: true,
};
updateRecordFromCache({
diff --git a/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts
index 423c0f81602..06cd162b71c 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts
@@ -13,7 +13,10 @@ import { isDefined } from 'twenty-shared/utils';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import {
+ CoreObjectNameSingular,
+ type RecordGqlFields,
+} from 'twenty-shared/types';
import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordFromCache';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
@@ -130,7 +133,7 @@ export const useTidyUpWorkflowVersion = (instanceId?: string) => {
steps: updatedSteps,
};
- const recordGqlFields = {
+ const recordGqlFields: RecordGqlFields = {
trigger: true,
steps: true,
};
diff --git a/packages/twenty-shared/src/types/RecordGqlFields.ts b/packages/twenty-shared/src/types/RecordGqlFields.ts
new file mode 100644
index 00000000000..f7ebc2ecb14
--- /dev/null
+++ b/packages/twenty-shared/src/types/RecordGqlFields.ts
@@ -0,0 +1,3 @@
+export type RecordGqlFields = {
+ [fieldName: string]: true | RecordGqlFields;
+};
diff --git a/packages/twenty-shared/src/types/RecordGqlFieldsDeprecated.ts b/packages/twenty-shared/src/types/RecordGqlFieldsDeprecated.ts
deleted file mode 100644
index e8672467d9e..00000000000
--- a/packages/twenty-shared/src/types/RecordGqlFieldsDeprecated.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type RecordGqlFieldsDeprecated = Record<string, any>;
diff --git a/packages/twenty-shared/src/types/RecordGqlOperationGqlRecordFields.ts b/packages/twenty-shared/src/types/RecordGqlOperationGqlRecordFields.ts
deleted file mode 100644
index de49b0c2560..00000000000
--- a/packages/twenty-shared/src/types/RecordGqlOperationGqlRecordFields.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { type RecordGqlFieldsDeprecated } from './RecordGqlFieldsDeprecated';
-
-export type RecordGqlOperationGqlRecordFields = RecordGqlFieldsDeprecated;
diff --git a/packages/twenty-shared/src/types/RecordGqlOperationSignature.ts b/packages/twenty-shared/src/types/RecordGqlOperationSignature.ts
index 3e9d7654253..1046a051a93 100644
--- a/packages/twenty-shared/src/types/RecordGqlOperationSignature.ts
+++ b/packages/twenty-shared/src/types/RecordGqlOperationSignature.ts
@@ -1,8 +1,8 @@
-import { type RecordGqlOperationGqlRecordFields } from './RecordGqlOperationGqlRecordFields';
+import { type RecordGqlFields } from './RecordGqlFields';
import { type RecordGqlOperationVariables } from './RecordGqlOperationVariables';
export type RecordGqlOperationSignature = {
objectNameSingular: string;
variables: RecordGqlOperationVariables;
- fields?: RecordGqlOperationGqlRecordFields;
+ fields?: RecordGqlFields;
};
diff --git a/packages/twenty-shared/src/types/index.ts b/packages/twenty-shared/src/types/index.ts
index 1e3dafe43cc..fd60d49798f 100644
--- a/packages/twenty-shared/src/types/index.ts
+++ b/packages/twenty-shared/src/types/index.ts
@@ -259,7 +259,7 @@ export type { PartialFieldMetadataItemOption } from './PartialFieldMetadataOptio
export type { QueryCursorDirection } from './QueryCursorDirection';
export { RecordFilterGroupLogicalOperator } from './RecordFilterGroupLogicalOperator';
export type { RecordFilterValueDependencies } from './RecordFilterValueDependencies';
-export type { RecordGqlFieldsDeprecated } from './RecordGqlFieldsDeprecated';
+export type { RecordGqlFields } from './RecordGqlFields';
export type {
UUIDFilterValue,
IsFilter,
@@ -294,7 +294,6 @@ export type {
LeafObjectRecordFilter,
RecordGqlOperationFilter,
} from './RecordGqlOperationFilter';
-export type { RecordGqlOperationGqlRecordFields } from './RecordGqlOperationGqlRecordFields';
export type { RecordGqlOperationOrderBy } from './RecordGqlOperationOrderBy';
export type { RecordGqlOperationSignature } from './RecordGqlOperationSignature';
export type { RecordGqlOperationVariables } from './RecordGqlOperationVariables';