From a48c9293f6c5a7bb72a93945245fe72795ca0ade Mon Sep 17 00:00:00 2001 From: Weiko Date: Fri, 8 Dec 2023 16:33:34 +0100 Subject: [PATCH] Fix missing isNullable (#2892) * Fix missing isNullable * fix --- .../workspace-sync-metadata/decorators/metadata.decorator.ts | 2 +- .../standard-objects/activity-target.object-metadata.ts | 1 + .../standard-objects/activity.object-metadata.ts | 1 + .../standard-objects/attachment.object-metadata.ts | 1 + .../standard-objects/comment.object-metadata.ts | 1 + .../standard-objects/favorite.object-metadata.ts | 3 +++ .../standard-objects/opportunity.object-metadata.ts | 1 + 7 files changed, 9 insertions(+), 1 deletion(-) diff --git a/server/src/workspace/workspace-sync-metadata/decorators/metadata.decorator.ts b/server/src/workspace/workspace-sync-metadata/decorators/metadata.decorator.ts index 894f45de1..66a48717f 100644 --- a/server/src/workspace/workspace-sync-metadata/decorators/metadata.decorator.ts +++ b/server/src/workspace/workspace-sync-metadata/decorators/metadata.decorator.ts @@ -144,7 +144,7 @@ function generateFieldMetadata( name: fieldKey, ...metadata, targetColumnMap: targetColumnMap, - isNullable, + isNullable: metadata.type === FieldMetadataType.RELATION ? true : isNullable, isSystem, isCustom: false, options: null, // TODO: handle options + stringify for the diff. diff --git a/server/src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata.ts b/server/src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata.ts index 50567a996..0602ae0ba 100644 --- a/server/src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata.ts +++ b/server/src/workspace/workspace-sync-metadata/standard-objects/activity-target.object-metadata.ts @@ -26,6 +26,7 @@ export class ActivityTargetObjectMetadata extends BaseObjectMetadata { icon: 'IconNotes', joinColumn: 'activityId', }) + @IsNullable() activity: ActivityObjectMetadata; @FieldMetadata({ diff --git a/server/src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata.ts b/server/src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata.ts index ed8877205..a276428fe 100644 --- a/server/src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata.ts +++ b/server/src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata.ts @@ -131,5 +131,6 @@ export class ActivityObjectMetadata extends BaseObjectMetadata { icon: 'IconUserCircle', joinColumn: 'assigneeId', }) + @IsNullable() assignee: WorkspaceMemberObjectMetadata; } diff --git a/server/src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata.ts b/server/src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata.ts index 52bf5e30b..7220de35b 100644 --- a/server/src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata.ts +++ b/server/src/workspace/workspace-sync-metadata/standard-objects/attachment.object-metadata.ts @@ -60,6 +60,7 @@ export class AttachmentObjectMetadata extends BaseObjectMetadata { icon: 'IconNotes', joinColumn: 'activityId', }) + @IsNullable() activity: ActivityObjectMetadata; @FieldMetadata({ diff --git a/server/src/workspace/workspace-sync-metadata/standard-objects/comment.object-metadata.ts b/server/src/workspace/workspace-sync-metadata/standard-objects/comment.object-metadata.ts index 4326b454c..06df486ba 100644 --- a/server/src/workspace/workspace-sync-metadata/standard-objects/comment.object-metadata.ts +++ b/server/src/workspace/workspace-sync-metadata/standard-objects/comment.object-metadata.ts @@ -3,6 +3,7 @@ import { ObjectMetadata, IsSystem, FieldMetadata, + IsNullable, } from 'src/workspace/workspace-sync-metadata/decorators/metadata.decorator'; import { ActivityObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/activity.object-metadata'; import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata'; diff --git a/server/src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata.ts b/server/src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata.ts index c2c500002..aba76eb95 100644 --- a/server/src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata.ts +++ b/server/src/workspace/workspace-sync-metadata/standard-objects/favorite.object-metadata.ts @@ -3,6 +3,7 @@ import { ObjectMetadata, IsSystem, FieldMetadata, + IsNullable, } from 'src/workspace/workspace-sync-metadata/decorators/metadata.decorator'; import { BaseObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/base.object-metadata'; import { CompanyObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/company.object-metadata'; @@ -44,6 +45,7 @@ export class FavoriteObjectMetadata extends BaseObjectMetadata { icon: 'IconUser', joinColumn: 'personId', }) + @IsNullable() person: PersonObjectMetadata; @FieldMetadata({ @@ -53,5 +55,6 @@ export class FavoriteObjectMetadata extends BaseObjectMetadata { icon: 'IconBuildingSkyscraper', joinColumn: 'companyId', }) + @IsNullable() company: CompanyObjectMetadata; } diff --git a/server/src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata.ts b/server/src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata.ts index b983df1b1..601e2b627 100644 --- a/server/src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata.ts +++ b/server/src/workspace/workspace-sync-metadata/standard-objects/opportunity.object-metadata.ts @@ -75,6 +75,7 @@ export class OpportunityObjectMetadata extends BaseObjectMetadata { icon: 'IconUser', joinColumn: 'personId', }) + @IsNullable() person: PersonObjectMetadata; @FieldMetadata({