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

fix: multiple twenty orm issues & show an example of use (#5439)

Browse Source 
This PR is fixing some issues and adding enhancement in TwentyORM:

- [x] Composite fields in nested relations are not formatted properly
- [x] Passing operators like `Any` in `where` condition is breaking the
query
- [x] Ability to auto load workspace-entities based on a regex path

I've also introduced an example of use for `CalendarEventService`:


https://github.com/twentyhq/twenty/pull/5439/files#diff-3a7dffc0dea57345d10e70c648e911f98fe237248bcea124dafa9c8deb1db748R15
This commit is contained in:
Jérémy M
2024-05-20 11:01:47 +02:00
committed by GitHub
parent 81e8f49033
commit 8b5f79ddbf
147 changed files with 1108 additions and 1101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/twenty-server/src/modules/view/standard-objects/view-field.object-metadata.ts → packages/twenty-server/src/modules/view/standard-objects/view-field.workspace-entity.ts
View File

@ -5,11 +5,11 @@ import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field
import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
import { VIEW_FIELD_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.object-metadata';
import { ViewWorkspaceEntity } from 'src/modules/view/standard-objects/view.workspace-entity';
@WorkspaceEntity({
standardId: STANDARD_OBJECT_IDS.viewField,
@ -21,7 +21,7 @@ import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.objec
})
@WorkspaceIsNotAuditLogged()
@WorkspaceIsSystem()
export class ViewFieldObjectMetadata extends BaseWorkspaceEntity {
export class ViewFieldWorkspaceEntity extends BaseWorkspaceEntity {
@WorkspaceField({
standardId: VIEW_FIELD_STANDARD_FIELD_IDS.fieldMetadataId,
type: FieldMetadataType.UUID,
@ -67,10 +67,10 @@ export class ViewFieldObjectMetadata extends BaseWorkspaceEntity {
label: 'View',
description: 'View Field related view',
icon: 'IconLayoutCollage',
inverseSideTarget: () => ViewObjectMetadata,
inverseSideTarget: () => ViewWorkspaceEntity,
inverseSideFieldKey: 'viewFields',
joinColumn: 'viewId',
})
@WorkspaceIsNullable()
view?: ViewObjectMetadata;
view?: ViewWorkspaceEntity;
}

10
packages/twenty-server/src/modules/view/standard-objects/view-filter.object-metadata.ts → packages/twenty-server/src/modules/view/standard-objects/view-filter.workspace-entity.ts
View File

@ -3,9 +3,9 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { VIEW_FILTER_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.object-metadata';
import { ViewWorkspaceEntity } from 'src/modules/view/standard-objects/view.workspace-entity';
import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
@ -23,7 +23,7 @@ import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-
})
@WorkspaceIsNotAuditLogged()
@WorkspaceIsSystem()
export class ViewFilterObjectMetadata extends BaseWorkspaceEntity {
export class ViewFilterWorkspaceEntity extends BaseWorkspaceEntity {
@WorkspaceField({
standardId: VIEW_FILTER_STANDARD_FIELD_IDS.fieldMetadataId,
type: FieldMetadataType.UUID,
@ -64,9 +64,9 @@ export class ViewFilterObjectMetadata extends BaseWorkspaceEntity {
description: 'View Filter related view',
icon: 'IconLayoutCollage',
joinColumn: 'viewId',
inverseSideTarget: () => ViewObjectMetadata,
inverseSideTarget: () => ViewWorkspaceEntity,
inverseSideFieldKey: 'viewFilters',
})
@WorkspaceIsNullable()
view: Relation<ViewObjectMetadata>;
view: Relation<ViewWorkspaceEntity>;
}

10
packages/twenty-server/src/modules/view/standard-objects/view-sort.object-metadata.ts → packages/twenty-server/src/modules/view/standard-objects/view-sort.workspace-entity.ts
View File

@ -3,9 +3,9 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { VIEW_SORT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.object-metadata';
import { ViewWorkspaceEntity } from 'src/modules/view/standard-objects/view.workspace-entity';
import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
@ -23,7 +23,7 @@ import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metad
})
@WorkspaceIsNotAuditLogged()
@WorkspaceIsSystem()
export class ViewSortObjectMetadata extends BaseWorkspaceEntity {
export class ViewSortWorkspaceEntity extends BaseWorkspaceEntity {
@WorkspaceField({
standardId: VIEW_SORT_STANDARD_FIELD_IDS.fieldMetadataId,
type: FieldMetadataType.UUID,
@ -49,9 +49,9 @@ export class ViewSortObjectMetadata extends BaseWorkspaceEntity {
description: 'View Sort related view',
icon: 'IconLayoutCollage',
joinColumn: 'viewId',
inverseSideTarget: () => ViewObjectMetadata,
inverseSideTarget: () => ViewWorkspaceEntity,
inverseSideFieldKey: 'viewSorts',
})
@WorkspaceIsNullable()
view: Relation<ViewObjectMetadata>;
view: Relation<ViewWorkspaceEntity>;
}

22
packages/twenty-server/src/modules/view/standard-objects/view.object-metadata.ts → packages/twenty-server/src/modules/view/standard-objects/view.workspace-entity.ts
View File

@ -7,11 +7,11 @@ import {
} from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
import { VIEW_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
import { ViewFieldObjectMetadata } from 'src/modules/view/standard-objects/view-field.object-metadata';
import { ViewFilterObjectMetadata } from 'src/modules/view/standard-objects/view-filter.object-metadata';
import { ViewSortObjectMetadata } from 'src/modules/view/standard-objects/view-sort.object-metadata';
import { ViewFieldWorkspaceEntity } from 'src/modules/view/standard-objects/view-field.workspace-entity';
import { ViewFilterWorkspaceEntity } from 'src/modules/view/standard-objects/view-filter.workspace-entity';
import { ViewSortWorkspaceEntity } from 'src/modules/view/standard-objects/view-sort.workspace-entity';
import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
@ -28,7 +28,7 @@ import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-re
})
@WorkspaceIsNotAuditLogged()
@WorkspaceIsSystem()
export class ViewObjectMetadata extends BaseWorkspaceEntity {
export class ViewWorkspaceEntity extends BaseWorkspaceEntity {
@WorkspaceField({
standardId: VIEW_STANDARD_FIELD_IDS.name,
type: FieldMetadataType.TEXT,
@ -105,11 +105,11 @@ export class ViewObjectMetadata extends BaseWorkspaceEntity {
label: 'View Fields',
description: 'View Fields',
icon: 'IconTag',
inverseSideTarget: () => ViewFieldObjectMetadata,
inverseSideTarget: () => ViewFieldWorkspaceEntity,
onDelete: RelationOnDeleteAction.SET_NULL,
})
@WorkspaceIsNullable()
viewFields: Relation<ViewFieldObjectMetadata[]>;
viewFields: Relation<ViewFieldWorkspaceEntity[]>;
@WorkspaceRelation({
standardId: VIEW_STANDARD_FIELD_IDS.viewFilters,
@ -117,11 +117,11 @@ export class ViewObjectMetadata extends BaseWorkspaceEntity {
label: 'View Filters',
description: 'View Filters',
icon: 'IconFilterBolt',
inverseSideTarget: () => ViewFilterObjectMetadata,
inverseSideTarget: () => ViewFilterWorkspaceEntity,
onDelete: RelationOnDeleteAction.SET_NULL,
})
@WorkspaceIsNullable()
viewFilters: Relation<ViewFilterObjectMetadata[]>;
viewFilters: Relation<ViewFilterWorkspaceEntity[]>;
@WorkspaceRelation({
standardId: VIEW_STANDARD_FIELD_IDS.viewSorts,
@ -129,9 +129,9 @@ export class ViewObjectMetadata extends BaseWorkspaceEntity {
label: 'View Sorts',
description: 'View Sorts',
icon: 'IconArrowsSort',
inverseSideTarget: () => ViewSortObjectMetadata,
inverseSideTarget: () => ViewSortWorkspaceEntity,
onDelete: RelationOnDeleteAction.SET_NULL,
})
@WorkspaceIsNullable()
viewSorts: Relation<ViewSortObjectMetadata[]>;
viewSorts: Relation<ViewSortWorkspaceEntity[]>;
}