fix: many fields in an object (#10061)
Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
@ -10,4 +10,5 @@ export const settings: Settings = {
|
||||
maxFileSize: '10MB',
|
||||
},
|
||||
minLengthOfStringForDuplicateCheck: 3,
|
||||
maxVisibleViewFields: 30,
|
||||
};
|
||||
|
||||
@ -12,4 +12,5 @@ export interface Settings {
|
||||
maxFileSize: `${number}MB`;
|
||||
};
|
||||
minLengthOfStringForDuplicateCheck: number;
|
||||
maxVisibleViewFields: number;
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
import DataLoader from 'dataloader';
|
||||
|
||||
import {
|
||||
FieldMetadataLoaderPayload,
|
||||
RelationLoaderPayload,
|
||||
RelationMetadataLoaderPayload,
|
||||
} from 'src/engine/dataloaders/dataloader.service';
|
||||
@ -23,4 +24,9 @@ export interface IDataloaders {
|
||||
targetFieldMetadata: FieldMetadataEntity;
|
||||
}
|
||||
>;
|
||||
|
||||
fieldMetadataLoader: DataLoader<
|
||||
FieldMetadataLoaderPayload,
|
||||
FieldMetadataEntity[]
|
||||
>;
|
||||
}
|
||||
|
||||
@ -3,9 +3,11 @@ import { Injectable } from '@nestjs/common';
|
||||
import DataLoader from 'dataloader';
|
||||
|
||||
import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
|
||||
import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
|
||||
|
||||
import { IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
|
||||
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
|
||||
import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
|
||||
import { FieldMetadataRelationService } from 'src/engine/metadata-modules/field-metadata/relation/field-metadata-relation.service';
|
||||
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
|
||||
import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
|
||||
@ -31,20 +33,28 @@ export type RelationLoaderPayload = {
|
||||
>;
|
||||
};
|
||||
|
||||
export type FieldMetadataLoaderPayload = {
|
||||
workspaceId: string;
|
||||
objectMetadata: Pick<ObjectMetadataInterface, 'id'>;
|
||||
};
|
||||
|
||||
@Injectable()
|
||||
export class DataloaderService {
|
||||
constructor(
|
||||
private readonly relationMetadataService: RelationMetadataService,
|
||||
private readonly fieldMetadataRelationService: FieldMetadataRelationService,
|
||||
private readonly fieldMetadataService: FieldMetadataService,
|
||||
) {}
|
||||
|
||||
createLoaders(): IDataloaders {
|
||||
const relationMetadataLoader = this.createRelationMetadataLoader();
|
||||
const relationLoader = this.createRelationLoader();
|
||||
const fieldMetadataLoader = this.createFieldMetadataLoader();
|
||||
|
||||
return {
|
||||
relationMetadataLoader,
|
||||
relationLoader,
|
||||
fieldMetadataLoader,
|
||||
};
|
||||
}
|
||||
|
||||
@ -92,4 +102,23 @@ export class DataloaderService {
|
||||
return fieldMetadataRelationCollection;
|
||||
});
|
||||
}
|
||||
|
||||
private createFieldMetadataLoader() {
|
||||
return new DataLoader<FieldMetadataLoaderPayload, FieldMetadataEntity[]>(
|
||||
async (dataLoaderParams: FieldMetadataLoaderPayload[]) => {
|
||||
const workspaceId = dataLoaderParams[0].workspaceId;
|
||||
const objectMetadataItems = dataLoaderParams.map(
|
||||
(dataLoaderParam) => dataLoaderParam.objectMetadata,
|
||||
);
|
||||
|
||||
const fieldMetadataCollection =
|
||||
await this.fieldMetadataService.getFieldMetadataItemsByBatch(
|
||||
objectMetadataItems.map((item) => item.id),
|
||||
workspaceId,
|
||||
);
|
||||
|
||||
return fieldMetadataCollection;
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,6 +9,7 @@ import { DataSource, FindOneOptions, In, Repository } from 'typeorm';
|
||||
import { v4 as uuidV4, v4 } from 'uuid';
|
||||
|
||||
import { TypeORMService } from 'src/database/typeorm/typeorm.service';
|
||||
import { settings } from 'src/engine/constants/settings';
|
||||
import { generateMessageId } from 'src/engine/core-modules/i18n/utils/generateMessageId';
|
||||
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
|
||||
import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
|
||||
@ -860,6 +861,8 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
|
||||
`SELECT * FROM ${dataSourceMetadata.schema}."viewField"
|
||||
WHERE "viewId" = '${view[0].id}'`,
|
||||
)) as ViewFieldWorkspaceEntity[];
|
||||
const isVisible =
|
||||
existingViewFields.length < settings.maxVisibleViewFields;
|
||||
|
||||
const createdFieldIsAlreadyInView = existingViewFields.some(
|
||||
(existingViewField) =>
|
||||
@ -882,7 +885,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
|
||||
("fieldMetadataId", "position", "isVisible", "size", "viewId")
|
||||
VALUES ('${createdFieldMetadata.id}', '${
|
||||
lastPosition + 1
|
||||
}', true, 180, '${view[0].id}')`,
|
||||
}', ${isVisible}, 180, '${view[0].id}')`,
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -895,4 +898,20 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
|
||||
await workspaceQueryRunner.release();
|
||||
}
|
||||
}
|
||||
|
||||
async getFieldMetadataItemsByBatch(
|
||||
objectMetadataIds: string[],
|
||||
workspaceId: string,
|
||||
) {
|
||||
const fieldMetadataItems = await this.fieldMetadataRepository.find({
|
||||
where: { objectMetadataId: In(objectMetadataIds), workspaceId },
|
||||
});
|
||||
|
||||
return objectMetadataIds.map((objectMetadataId) =>
|
||||
fieldMetadataItems.filter(
|
||||
(fieldMetadataItem) =>
|
||||
fieldMetadataItem.objectMetadataId === objectMetadataId,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,9 +12,11 @@ import { SettingsFeatures } from 'twenty-shared';
|
||||
|
||||
import { I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.type';
|
||||
import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
import { IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
|
||||
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
|
||||
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
|
||||
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
|
||||
import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
|
||||
import { DeleteOneObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/delete-object.input';
|
||||
import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
|
||||
import {
|
||||
@ -104,4 +106,26 @@ export class ObjectMetadataResolver {
|
||||
objectMetadataGraphqlApiExceptionHandler(error);
|
||||
}
|
||||
}
|
||||
|
||||
@ResolveField(() => [FieldMetadataDTO], { nullable: false })
|
||||
async fieldsList(
|
||||
@AuthWorkspace() workspace: Workspace,
|
||||
@Parent() objectMetadata: ObjectMetadataDTO,
|
||||
@Context() context: { loaders: IDataloaders },
|
||||
): Promise<FieldMetadataDTO[]> {
|
||||
try {
|
||||
const fieldMetadataItems = await context.loaders.fieldMetadataLoader.load(
|
||||
{
|
||||
objectMetadata,
|
||||
workspaceId: workspace.id,
|
||||
},
|
||||
);
|
||||
|
||||
return fieldMetadataItems;
|
||||
} catch (error) {
|
||||
objectMetadataGraphqlApiExceptionHandler(error);
|
||||
|
||||
return [];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user