admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve performance on findMany queries (#4334)

Browse Source 
* Improve performance on findMany queries

* Fix
This commit is contained in:
Charles Bochet
2024-03-06 13:59:42 +01:00
committed by GitHub
parent b2210bd418
commit e7857d7fa3
9 changed files with 64 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/twenty-front/src/modules/activities/hooks/useActivities.ts
View File

@ -69,6 +69,7 @@ export const useActivities = ({
useFindManyRecords<Activity>({ useFindManyRecords<Activity>({
skip: skipActivities, skip: skipActivities,
objectNameSingular: CoreObjectNameSingular.Activity, objectNameSingular: CoreObjectNameSingular.Activity,
depth: 3,
filter, filter,
orderBy: activitiesOrderByVariables, orderBy: activitiesOrderByVariables,
onCompleted: useRecoilCallback( onCompleted: useRecoilCallback(

123
packages/twenty-front/src/modules/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery.ts
View File

@ -10,17 +10,11 @@ export const useMapFieldMetadataToGraphQLQuery = () => {
const mapFieldMetadataToGraphQLQuery = ({ const mapFieldMetadataToGraphQLQuery = ({
field, field,
maxDepthForRelations = 2, depth = 2,
onlyTypenameAndIdOnDeepestRelationFields = false,
}: { }: {
field: FieldMetadataItem; field: FieldMetadataItem;
maxDepthForRelations?: number; depth?: number;
onlyTypenameAndIdOnDeepestRelationFields?: boolean;
}): any => { }): any => {
if (maxDepthForRelations <= 0) {
return '';
}
// TODO: parse // TODO: parse
const fieldType = field.type as FieldType; const fieldType = field.type as FieldType;
@ -50,26 +44,23 @@ export const useMapFieldMetadataToGraphQLQuery = () => {
(field.toRelationMetadata as any)?.fromObjectMetadata?.id, (field.toRelationMetadata as any)?.fromObjectMetadata?.id,
); );
let subfieldQuery = ''; if (depth > 1) {
return `${field.name}
if (maxDepthForRelations > 0) { {
subfieldQuery = `${(relationMetadataItem?.fields ?? []) __typename
.map((field) => id
mapFieldMetadataToGraphQLQuery({ ${(relationMetadataItem?.fields ?? [])
field, .map((field) =>
maxDepthForRelations: maxDepthForRelations - 1, mapFieldMetadataToGraphQLQuery({
onlyTypenameAndIdOnDeepestRelationFields, field,
}), depth: depth - 1,
) }),
.join('\n')}`; )
.join('\n')}
}`;
} else {
return '';
} }
return `${field.name}
{
__typename
id
${subfieldQuery}
}`;
} else if ( } else if (
fieldType === 'RELATION' && fieldType === 'RELATION' &&
field.toRelationMetadata?.relationType === 'ONE_TO_ONE' field.toRelationMetadata?.relationType === 'ONE_TO_ONE'
@ -80,26 +71,23 @@ export const useMapFieldMetadataToGraphQLQuery = () => {
(field.toRelationMetadata as any)?.fromObjectMetadata?.id, (field.toRelationMetadata as any)?.fromObjectMetadata?.id,
); );
let subfieldQuery = ''; if (depth > 1) {
return `${field.name}
if (maxDepthForRelations > 0) { {
subfieldQuery = `${(relationMetadataItem?.fields ?? []) __typename
.map((field) => id
mapFieldMetadataToGraphQLQuery({ ${(relationMetadataItem?.fields ?? [])
field, .map((field) =>
maxDepthForRelations: maxDepthForRelations - 1, mapFieldMetadataToGraphQLQuery({
onlyTypenameAndIdOnDeepestRelationFields, field,
}), depth: depth - 1,
) }),
.join('\n')}`; )
.join('\n')}
}`;
} else {
return '';
} }
return `${field.name}
{
__typename
id
${subfieldQuery}
}`;
} else if ( } else if (
fieldType === 'RELATION' && fieldType === 'RELATION' &&
field.fromRelationMetadata?.relationType === 'ONE_TO_MANY' field.fromRelationMetadata?.relationType === 'ONE_TO_MANY'
@ -110,30 +98,27 @@ export const useMapFieldMetadataToGraphQLQuery = () => {
(field.fromRelationMetadata as any)?.toObjectMetadata?.id, (field.fromRelationMetadata as any)?.toObjectMetadata?.id,
); );
let subfieldQuery = ''; if (depth > 1) {
return `${field.name}
if (maxDepthForRelations > 0) { {
subfieldQuery = `${(relationMetadataItem?.fields ?? []) edges {
.map((field) => node {
mapFieldMetadataToGraphQLQuery({ __typename
field, id
maxDepthForRelations: maxDepthForRelations - 1, ${(relationMetadataItem?.fields ?? [])
onlyTypenameAndIdOnDeepestRelationFields, .map((field) =>
}), mapFieldMetadataToGraphQLQuery({
) field,
.join('\n')}`; depth: depth - 1,
} }),
)
return `${field.name} .join('\n')}
{ }
edges {
node {
__typename
id
${subfieldQuery}
} }
} }`;
}`; } else {
return '';
}
} else if (fieldType === 'LINK') { } else if (fieldType === 'LINK') {
return ` return `
${field.name} ${field.name}

2
packages/twenty-front/src/modules/object-record/cache/hooks/useAddRecordInCache.ts vendored
View File

@ -36,7 +36,7 @@ export const useAddRecordInCache = ({
.map((field) => .map((field) =>
mapFieldMetadataToGraphQLQuery({ mapFieldMetadataToGraphQLQuery({
field, field,
maxDepthForRelations: MAX_QUERY_DEPTH_FOR_CACHE_INJECTION, depth: MAX_QUERY_DEPTH_FOR_CACHE_INJECTION,
}), }),
) )
.join('\n')} .join('\n')}

2
packages/twenty-front/src/modules/object-record/hooks/useGenerateFindDuplicateRecordsQuery.ts
View File

@ -29,7 +29,7 @@ export const useGenerateFindDuplicateRecordsQuery = () => {
.map((field) => .map((field) =>
mapFieldMetadataToGraphQLQuery({ mapFieldMetadataToGraphQLQuery({
field, field,
maxDepthForRelations: depth, depth,
}), }),
) )
.join('\n')} .join('\n')}

2
packages/twenty-front/src/modules/object-record/hooks/useGenerateFindManyRecordsForMultipleMetadataItemsQuery.ts
View File

@ -74,7 +74,7 @@ export const useGenerateFindManyRecordsForMultipleMetadataItemsQuery = ({
.map((field) => .map((field) =>
mapFieldMetadataToGraphQLQuery({ mapFieldMetadataToGraphQLQuery({
field, field,
maxDepthForRelations: depth, depth,
}), }),
) )
.join('\n')} .join('\n')}

2
packages/twenty-front/src/modules/object-record/hooks/useGenerateFindManyRecordsQuery.ts
View File

@ -31,7 +31,7 @@ export const useGenerateFindManyRecordsQuery = () => {
.map((field) => .map((field) =>
mapFieldMetadataToGraphQLQuery({ mapFieldMetadataToGraphQLQuery({
field, field,
maxDepthForRelations: depth, depth,
}), }),
) )
.join('\n')} .join('\n')}

2
packages/twenty-front/src/modules/object-record/hooks/useGenerateFindOneRecordQuery.ts
View File

@ -28,7 +28,7 @@ export const useGenerateFindOneRecordQuery = () => {
.map((field) => .map((field) =>
mapFieldMetadataToGraphQLQuery({ mapFieldMetadataToGraphQLQuery({
field, field,
maxDepthForRelations: depth, depth,
}), }),
) )
.join('\n')} .join('\n')}

5
packages/twenty-front/tsconfig.app.json
View File

@ -9,7 +9,8 @@
"**/*.spec.tsx", "**/*.spec.tsx",
"**/*.test.tsx", "**/*.test.tsx",
"jest.config.ts", "jest.config.ts",
"tsup.config.ts" "tsup.config.ts",
"tsup.ui.index.tsx"
], ],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
} }

2
packages/twenty-front/tsup.ui.index.tsx
View File

@ -28,7 +28,7 @@ export * from './src/modules/ui/input/button/components/FloatingButtonGroup'
export * from './src/modules/ui/input/button/components/FloatingIconButton' export * from './src/modules/ui/input/button/components/FloatingIconButton'
export * from './src/modules/ui/input/button/components/FloatingIconButtonGroup' export * from './src/modules/ui/input/button/components/FloatingIconButtonGroup'
export * from './src/modules/ui/input/button/components/LightButton' export * from './src/modules/ui/input/button/components/LightButton'
export * from '@/ui/navigation/link/components/ActionLink.tsx' export * from './src/modules/ui/navigation/link/components/ActionLink.tsx'
export * from './src/modules/ui/input/button/components/LightIconButton' export * from './src/modules/ui/input/button/components/LightIconButton'
export * from './src/modules/ui/input/button/components/MainButton' export * from './src/modules/ui/input/button/components/MainButton'
export * from './src/modules/ui/input/button/components/RoundedIconButton' export * from './src/modules/ui/input/button/components/RoundedIconButton'