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

fix: sync metadata shouldn't remove non custom fields (#3750)

Browse Source 
* fix: sync metadata shouldn't remove non custom fields

* fix: filter out custom relations
This commit is contained in:
Jérémy M
2024-02-01 14:25:50 +01:00
committed by GitHub
parent bd5d930be2
commit 8abd5be4b5
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/twenty-server/src/workspace/workspace-sync-metadata/comparators/workspace-field.comparator.ts
View File

@ -39,8 +39,11 @@ export class WorkspaceFieldComparator {
string, string,
Partial<PartialFieldMetadata> Partial<PartialFieldMetadata>
> = {}; > = {};
// Double security to only compare non-custom fields
const filteredOriginalFieldCollection =
originalObjectMetadata.fields.filter((field) => !field.isCustom);
const originalFieldMetadataMap = transformMetadataForComparison( const originalFieldMetadataMap = transformMetadataForComparison(
originalObjectMetadata.fields, filteredOriginalFieldCollection,
{ {
propertiesToIgnore: fieldPropertiesToIgnore, propertiesToIgnore: fieldPropertiesToIgnore,
propertiesToStringify: fieldPropertiesToStringify, propertiesToStringify: fieldPropertiesToStringify,

6
packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-sync-object-metadata.service.ts
View File

@ -43,7 +43,11 @@ export class WorkspaceSyncObjectMetadataService {
// Retrieve object metadata collection from DB // Retrieve object metadata collection from DB
const originalObjectMetadataCollection = const originalObjectMetadataCollection =
await objectMetadataRepository.find({ await objectMetadataRepository.find({
where: { workspaceId: context.workspaceId, isCustom: false }, where: {
workspaceId: context.workspaceId,
isCustom: false,
fields: { isCustom: false },
},
relations: ['dataSource', 'fields'], relations: ['dataSource', 'fields'],
}); });

12
packages/twenty-server/src/workspace/workspace-sync-metadata/services/workspace-sync-relation-metadata.service.ts
View File

@ -44,7 +44,11 @@ export class WorkspaceSyncRelationMetadataService {
// Retrieve object metadata collection from DB // Retrieve object metadata collection from DB
const originalObjectMetadataCollection = const originalObjectMetadataCollection =
await objectMetadataRepository.find({ await objectMetadataRepository.find({
where: { workspaceId: context.workspaceId, isCustom: false }, where: {
workspaceId: context.workspaceId,
isCustom: false,
fields: { isCustom: false },
},
relations: ['dataSource', 'fields'], relations: ['dataSource', 'fields'],
}); });
@ -58,10 +62,12 @@ export class WorkspaceSyncRelationMetadataService {
); );
// Retrieve relation metadata collection from DB // Retrieve relation metadata collection from DB
// TODO: filter out custom relations once isCustom has been added to relationMetadata table
const originalRelationMetadataCollection = const originalRelationMetadataCollection =
await relationMetadataRepository.find({ await relationMetadataRepository.find({
where: { workspaceId: context.workspaceId }, where: {
workspaceId: context.workspaceId,
fromFieldMetadata: { isCustom: false },
},
}); });
// Create standard relation metadata collection // Create standard relation metadata collection