From 5038c36df420704d9fe60ecf289043e904322ef1 Mon Sep 17 00:00:00 2001 From: Weiko Date: Thu, 23 Nov 2023 23:30:53 +0100 Subject: [PATCH] Update seed default values (#2681) * Update seed default values * Update seed default values * Update seed default values * remove allowImpersonation in workspaceMembers * remove USD from currencyCode defaultValue * fix tests --- server/src/core/auth/auth.resolver.spec.ts | 2 +- .../core/auth/services/auth.service.spec.ts | 4 +-- .../core/auth/services/token.service.spec.ts | 4 +-- .../core/user/services/user.service.spec.ts | 2 +- .../services/workspace.service.spec.ts | 2 +- .../metadata/field-metadata/activity.ts | 6 ++-- .../metadata/field-metadata/api-key.ts | 2 +- .../metadata/field-metadata/company.ts | 4 +-- .../metadata/field-metadata/opportunity.ts | 4 +-- .../metadata/field-metadata/person.ts | 8 ++--- .../metadata/field-metadata/view-field.ts | 4 +-- .../metadata/field-metadata/view-filter.ts | 6 ++-- .../metadata/field-metadata/view-sort.ts | 6 ++-- .../metadata/field-metadata/view.ts | 6 ++-- .../field-metadata/workspace-member.ts | 5 ++- .../workspace/workspaceMember.ts | 4 --- ...rt-field-metadata-to-column-action.spec.ts | 2 +- .../migrations/1697618009-addCompanyTable.ts | 2 ++ .../migrations/1697618011-addViewTable.ts | 5 ++- .../1697618012-addViewFieldTable.ts | 3 +- .../1697618013-addViewFilterTable.ts | 3 +- .../migrations/1697618014-addViewSortTable.ts | 3 +- .../migrations/1697618016-addActivityTable.ts | 3 ++ .../1697618021-addOpportunityTable.ts | 1 + .../1697618026-addWorspaceMemberTable.ts | 8 ++--- .../standard-objects/activity.ts | 4 ++- .../standard-objects/api-key.ts | 1 + .../standard-objects/comment.ts | 24 +++++++------- .../standard-objects/company.ts | 2 ++ .../standard-objects/opportunity.ts | 3 +- .../standard-objects/person.ts | 4 +++ .../standard-objects/view-field.ts | 3 +- .../standard-objects/view-filter.ts | 3 +- .../standard-objects/view-sort.ts | 3 +- .../standard-objects/view.ts | 3 +- .../standard-objects/workspace-member.ts | 4 ++- .../workspace-manager.service.ts | 32 +++++++++---------- .../src/workspace/workspace.factory.spec.ts | 5 +++ 38 files changed, 97 insertions(+), 93 deletions(-) diff --git a/server/src/core/auth/auth.resolver.spec.ts b/server/src/core/auth/auth.resolver.spec.ts index 8d3b5b724..5ab085903 100644 --- a/server/src/core/auth/auth.resolver.spec.ts +++ b/server/src/core/auth/auth.resolver.spec.ts @@ -16,7 +16,7 @@ describe('AuthResolver', () => { providers: [ AuthResolver, { - provide: getRepositoryToken(Workspace), + provide: getRepositoryToken(Workspace, 'core'), useValue: {}, }, { diff --git a/server/src/core/auth/services/auth.service.spec.ts b/server/src/core/auth/services/auth.service.spec.ts index 45db1d84f..d1d46d9c5 100644 --- a/server/src/core/auth/services/auth.service.spec.ts +++ b/server/src/core/auth/services/auth.service.spec.ts @@ -34,11 +34,11 @@ describe('AuthService', () => { useValue: {}, }, { - provide: getRepositoryToken(Workspace), + provide: getRepositoryToken(Workspace, 'core'), useValue: {}, }, { - provide: getRepositoryToken(User), + provide: getRepositoryToken(User, 'core'), useValue: {}, }, ], diff --git a/server/src/core/auth/services/token.service.spec.ts b/server/src/core/auth/services/token.service.spec.ts index c3ad50d3b..b36b18fdb 100644 --- a/server/src/core/auth/services/token.service.spec.ts +++ b/server/src/core/auth/services/token.service.spec.ts @@ -24,11 +24,11 @@ describe('TokenService', () => { useValue: {}, }, { - provide: getRepositoryToken(User), + provide: getRepositoryToken(User, 'core'), useValue: {}, }, { - provide: getRepositoryToken(RefreshToken), + provide: getRepositoryToken(RefreshToken, 'core'), useValue: {}, }, ], diff --git a/server/src/core/user/services/user.service.spec.ts b/server/src/core/user/services/user.service.spec.ts index 92de42d5b..fd59dc7d2 100644 --- a/server/src/core/user/services/user.service.spec.ts +++ b/server/src/core/user/services/user.service.spec.ts @@ -15,7 +15,7 @@ describe('UserService', () => { providers: [ UserService, { - provide: getRepositoryToken(User), + provide: getRepositoryToken(User, 'core'), useValue: {}, }, { diff --git a/server/src/core/workspace/services/workspace.service.spec.ts b/server/src/core/workspace/services/workspace.service.spec.ts index e7a7411f7..3920b20ba 100644 --- a/server/src/core/workspace/services/workspace.service.spec.ts +++ b/server/src/core/workspace/services/workspace.service.spec.ts @@ -14,7 +14,7 @@ describe('WorkspaceService', () => { providers: [ WorkspaceService, { - provide: getRepositoryToken(Workspace), + provide: getRepositoryToken(Workspace, 'core'), useValue: {}, }, { diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/activity.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/activity.ts index 9746416de..dd48cb84f 100644 --- a/server/src/database/typeorm-seeds/metadata/field-metadata/activity.ts +++ b/server/src/database/typeorm-seeds/metadata/field-metadata/activity.ts @@ -124,7 +124,7 @@ export const seedActivityFieldMetadata = async ( icon: 'IconNotes', isNullable: true, isSystem: false, - defaultValue: undefined, + defaultValue: { value: '' }, }, // Scalar fields @@ -144,7 +144,7 @@ export const seedActivityFieldMetadata = async ( icon: 'IconList', isNullable: true, isSystem: false, - defaultValue: undefined, + defaultValue: { value: '' }, }, { id: SeedActivityFieldMetadataIds.Type, @@ -162,7 +162,7 @@ export const seedActivityFieldMetadata = async ( icon: 'IconCheckbox', isNullable: false, isSystem: false, - defaultValue: undefined, + defaultValue: { value: 'Note' }, }, { id: SeedActivityFieldMetadataIds.ReminderAt, diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/api-key.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/api-key.ts index ed815c36e..fc6b499ce 100644 --- a/server/src/database/typeorm-seeds/metadata/field-metadata/api-key.ts +++ b/server/src/database/typeorm-seeds/metadata/field-metadata/api-key.ts @@ -113,7 +113,7 @@ export const seedApiKeyFieldMetadata = async ( icon: 'IconLink', isNullable: true, isSystem: false, - defaultValue: undefined, + defaultValue: { value: '' }, }, { id: SeedApiKeyFieldMetadataIds.ExpiresAt, diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/company.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/company.ts index e7f771c85..0b55c5ac5 100644 --- a/server/src/database/typeorm-seeds/metadata/field-metadata/company.ts +++ b/server/src/database/typeorm-seeds/metadata/field-metadata/company.ts @@ -147,7 +147,7 @@ export const seedCompanyFieldMetadata = async ( icon: 'IconLink', isNullable: true, isSystem: false, - defaultValue: undefined, + defaultValue: { value: '' }, }, { id: SeedCompanyFieldMetadataIds.Address, @@ -165,7 +165,7 @@ export const seedCompanyFieldMetadata = async ( icon: 'IconMap', isNullable: true, isSystem: false, - defaultValue: undefined, + defaultValue: { value: '' }, }, { id: SeedCompanyFieldMetadataIds.Employees, diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/opportunity.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/opportunity.ts index 32bf63f57..9dce3226c 100644 --- a/server/src/database/typeorm-seeds/metadata/field-metadata/opportunity.ts +++ b/server/src/database/typeorm-seeds/metadata/field-metadata/opportunity.ts @@ -155,11 +155,11 @@ export const seedOpportunityFieldMetadata = async ( targetColumnMap: { value: 'probability', }, - description: 'Opportunity amount', + description: 'Opportunity probability', icon: 'IconProgressCheck', isNullable: true, isSystem: false, - defaultValue: undefined, + defaultValue: { value: '0' }, }, // Relationships { diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/person.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/person.ts index a0fbc51f9..fa9090c4f 100644 --- a/server/src/database/typeorm-seeds/metadata/field-metadata/person.ts +++ b/server/src/database/typeorm-seeds/metadata/field-metadata/person.ts @@ -204,7 +204,7 @@ export const seedPersonFieldMetadata = async ( icon: 'IconBriefcase', isNullable: true, isSystem: false, - defaultValue: undefined, + defaultValue: { value: '' }, }, { id: SeedPersonFieldMetadataIds.Phone, @@ -222,7 +222,7 @@ export const seedPersonFieldMetadata = async ( icon: 'IconPhone', isNullable: true, isSystem: false, - defaultValue: undefined, + defaultValue: { value: '' }, }, { id: SeedPersonFieldMetadataIds.City, @@ -240,7 +240,7 @@ export const seedPersonFieldMetadata = async ( icon: 'IconMap', isNullable: true, isSystem: false, - defaultValue: undefined, + defaultValue: { value: '' }, }, { id: SeedPersonFieldMetadataIds.AvatarUrl, @@ -258,7 +258,7 @@ export const seedPersonFieldMetadata = async ( icon: 'IconFileUpload', isNullable: true, isSystem: true, - defaultValue: undefined, + defaultValue: { value: '' }, }, // Relationships diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/view-field.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/view-field.ts index 2dbc7062e..58db83d23 100644 --- a/server/src/database/typeorm-seeds/metadata/field-metadata/view-field.ts +++ b/server/src/database/typeorm-seeds/metadata/field-metadata/view-field.ts @@ -106,7 +106,7 @@ export const seedViewFieldFieldMetadata = async ( isCustom: false, workspaceId: SeedWorkspaceId, isActive: true, - type: FieldMetadataType.TEXT, + type: FieldMetadataType.UUID, name: 'fieldMetadataId', label: 'Field Metadata Id', targetColumnMap: { @@ -116,7 +116,7 @@ export const seedViewFieldFieldMetadata = async ( icon: 'IconTag', isNullable: false, isSystem: false, - defaultValue: { value: '' }, + defaultValue: undefined, }, { id: SeedViewFieldFieldMetadataIds.View, diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/view-filter.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/view-filter.ts index 0ae7c1ba0..463cf9b3f 100644 --- a/server/src/database/typeorm-seeds/metadata/field-metadata/view-filter.ts +++ b/server/src/database/typeorm-seeds/metadata/field-metadata/view-filter.ts @@ -106,7 +106,7 @@ export const seedViewFilterFieldMetadata = async ( isCustom: false, workspaceId: SeedWorkspaceId, isActive: true, - type: FieldMetadataType.TEXT, + type: FieldMetadataType.UUID, name: 'fieldMetadataId', label: 'Field Metadata Id', targetColumnMap: { @@ -116,7 +116,7 @@ export const seedViewFilterFieldMetadata = async ( icon: null, isNullable: false, isSystem: false, - defaultValue: { value: '' }, + defaultValue: undefined, }, { id: SeedViewFilterFieldMetadataIds.View, @@ -124,7 +124,7 @@ export const seedViewFilterFieldMetadata = async ( isCustom: false, workspaceId: SeedWorkspaceId, isActive: true, - type: FieldMetadataType.TEXT, + type: FieldMetadataType.UUID, name: 'viewId', label: 'View Id', targetColumnMap: {}, diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/view-sort.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/view-sort.ts index 94db8fb08..d90bd4842 100644 --- a/server/src/database/typeorm-seeds/metadata/field-metadata/view-sort.ts +++ b/server/src/database/typeorm-seeds/metadata/field-metadata/view-sort.ts @@ -104,7 +104,7 @@ export const seedViewSortFieldMetadata = async ( isCustom: false, workspaceId: SeedWorkspaceId, isActive: true, - type: FieldMetadataType.TEXT, + type: FieldMetadataType.UUID, name: 'fieldMetadataId', label: 'Field Metadata Id', targetColumnMap: { @@ -114,7 +114,7 @@ export const seedViewSortFieldMetadata = async ( icon: null, isNullable: false, isSystem: false, - defaultValue: { value: '' }, + defaultValue: undefined, }, { id: SeedViewSortFieldMetadataIds.View, @@ -122,7 +122,7 @@ export const seedViewSortFieldMetadata = async ( isCustom: false, workspaceId: SeedWorkspaceId, isActive: true, - type: FieldMetadataType.TEXT, + type: FieldMetadataType.UUID, name: 'viewId', label: 'View Id', targetColumnMap: {}, diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/view.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/view.ts index 797ec2924..237300d7b 100644 --- a/server/src/database/typeorm-seeds/metadata/field-metadata/view.ts +++ b/server/src/database/typeorm-seeds/metadata/field-metadata/view.ts @@ -124,7 +124,7 @@ export const seedViewFieldMetadata = async ( isCustom: false, workspaceId: SeedWorkspaceId, isActive: true, - type: FieldMetadataType.TEXT, + type: FieldMetadataType.UUID, name: 'objectMetadataId', label: 'Object Metadata Id', targetColumnMap: { @@ -134,7 +134,7 @@ export const seedViewFieldMetadata = async ( icon: null, isNullable: false, isSystem: false, - defaultValue: { value: '' }, + defaultValue: undefined, }, { id: SeedViewFieldMetadataIds.Type, @@ -152,7 +152,7 @@ export const seedViewFieldMetadata = async ( icon: null, isNullable: false, isSystem: false, - defaultValue: { value: '' }, + defaultValue: { value: 'table' }, }, { id: SeedViewFieldMetadataIds.ViewFields, diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/workspace-member.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/workspace-member.ts index b020b1698..19d68c3fb 100644 --- a/server/src/database/typeorm-seeds/metadata/field-metadata/workspace-member.ts +++ b/server/src/database/typeorm-seeds/metadata/field-metadata/workspace-member.ts @@ -15,7 +15,6 @@ export enum SeedWorkspaceMemberFieldMetadataIds { AvatarUrl = '20202020-7ba6-40d5-934b-17146183a212', Locale = '20202020-10f6-4df9-8d6f-a760b65bd800', ColorScheme = '20202020-83f2-4c5f-96b0-0c51ecc160e3', - AllowImpersonation = '20202020-bb19-44a1-8156-8866f87a5f42', UserId = '20202020-f2c1-4ca1-9ca5-7b9d5cc87eb0', AuthoredActivities = '20202020-37a0-4db4-9c9f-fd3e3f4e47fc', AssignedActivities = '20202020-ac05-44b9-9526-764dd5ce14e2', @@ -178,7 +177,7 @@ export const seedWorkspaceMemberFieldMetadata = async ( icon: 'IconColorSwatch', isNullable: true, isSystem: false, - defaultValue: undefined, + defaultValue: { value: 'Light' }, }, { id: SeedWorkspaceMemberFieldMetadataIds.Locale, @@ -196,7 +195,7 @@ export const seedWorkspaceMemberFieldMetadata = async ( icon: 'IconLanguage', isNullable: false, isSystem: false, - defaultValue: { value: 'fr' }, + defaultValue: { value: 'en' }, }, // Relationships diff --git a/server/src/database/typeorm-seeds/workspace/workspaceMember.ts b/server/src/database/typeorm-seeds/workspace/workspaceMember.ts index 03e8508f8..b093e4d1b 100644 --- a/server/src/database/typeorm-seeds/workspace/workspaceMember.ts +++ b/server/src/database/typeorm-seeds/workspace/workspaceMember.ts @@ -23,7 +23,6 @@ export const seedWorkspaceMember = async ( 'nameLastName', 'locale', 'colorScheme', - 'allowImpersonation', 'userId', ]) .orIgnore() @@ -34,7 +33,6 @@ export const seedWorkspaceMember = async ( nameLastName: 'Apple', locale: 'en', colorScheme: 'Light', - allowImpersonation: true, userId: SeedUserIds.Tim, }, { @@ -43,7 +41,6 @@ export const seedWorkspaceMember = async ( nameLastName: 'Ive', locale: 'en', colorScheme: 'Light', - allowImpersonation: true, userId: SeedUserIds.Jony, }, { @@ -52,7 +49,6 @@ export const seedWorkspaceMember = async ( nameLastName: 'Shiler', locale: 'en', colorScheme: 'Light', - allowImpersonation: true, userId: SeedUserIds.Phil, }, ]) diff --git a/server/src/metadata/field-metadata/utils/__tests__/convert-field-metadata-to-column-action.spec.ts b/server/src/metadata/field-metadata/utils/__tests__/convert-field-metadata-to-column-action.spec.ts index 1242c025e..70193aeb0 100644 --- a/server/src/metadata/field-metadata/utils/__tests__/convert-field-metadata-to-column-action.spec.ts +++ b/server/src/metadata/field-metadata/utils/__tests__/convert-field-metadata-to-column-action.spec.ts @@ -56,7 +56,7 @@ describe('convertFieldMetadataToColumnActions', () => { { action: 'CREATE', columnName: 'moneyAmountMicros', - columnType: 'integer', + columnType: 'numeric', defaultValue: 100 * 1_000_000, }, { diff --git a/server/src/metadata/workspace-migration/migrations/1697618009-addCompanyTable.ts b/server/src/metadata/workspace-migration/migrations/1697618009-addCompanyTable.ts index 5e52a2ee5..5d5cfa900 100644 --- a/server/src/metadata/workspace-migration/migrations/1697618009-addCompanyTable.ts +++ b/server/src/metadata/workspace-migration/migrations/1697618009-addCompanyTable.ts @@ -22,11 +22,13 @@ export const addCompanyTable: WorkspaceMigrationTableAction[] = [ columnName: 'domainName', columnType: 'varchar', action: WorkspaceMigrationColumnActionType.CREATE, + defaultValue: "''", }, { columnName: 'address', columnType: 'varchar', action: WorkspaceMigrationColumnActionType.CREATE, + defaultValue: "''", }, { columnName: 'employees', diff --git a/server/src/metadata/workspace-migration/migrations/1697618011-addViewTable.ts b/server/src/metadata/workspace-migration/migrations/1697618011-addViewTable.ts index 9cad19a51..9ce8c6c28 100644 --- a/server/src/metadata/workspace-migration/migrations/1697618011-addViewTable.ts +++ b/server/src/metadata/workspace-migration/migrations/1697618011-addViewTable.ts @@ -20,15 +20,14 @@ export const addViewTable: WorkspaceMigrationTableAction[] = [ }, { columnName: 'objectMetadataId', - columnType: 'varchar', + columnType: 'uuid', action: WorkspaceMigrationColumnActionType.CREATE, - defaultValue: "''", }, { columnName: 'type', columnType: 'varchar', action: WorkspaceMigrationColumnActionType.CREATE, - defaultValue: "''", + defaultValue: "'table'", }, ], }, diff --git a/server/src/metadata/workspace-migration/migrations/1697618012-addViewFieldTable.ts b/server/src/metadata/workspace-migration/migrations/1697618012-addViewFieldTable.ts index 60a93fb9a..443e20530 100644 --- a/server/src/metadata/workspace-migration/migrations/1697618012-addViewFieldTable.ts +++ b/server/src/metadata/workspace-migration/migrations/1697618012-addViewFieldTable.ts @@ -14,9 +14,8 @@ export const addViewFieldTable: WorkspaceMigrationTableAction[] = [ columns: [ { columnName: 'fieldMetadataId', - columnType: 'varchar', + columnType: 'uuid', action: WorkspaceMigrationColumnActionType.CREATE, - defaultValue: "''", }, { columnName: 'position', diff --git a/server/src/metadata/workspace-migration/migrations/1697618013-addViewFilterTable.ts b/server/src/metadata/workspace-migration/migrations/1697618013-addViewFilterTable.ts index 6ec9d268b..bff4a37c2 100644 --- a/server/src/metadata/workspace-migration/migrations/1697618013-addViewFilterTable.ts +++ b/server/src/metadata/workspace-migration/migrations/1697618013-addViewFilterTable.ts @@ -14,9 +14,8 @@ export const addViewFilterTable: WorkspaceMigrationTableAction[] = [ columns: [ { columnName: 'fieldMetadataId', - columnType: 'varchar', + columnType: 'uuid', action: WorkspaceMigrationColumnActionType.CREATE, - defaultValue: "''", }, { columnName: 'operand', diff --git a/server/src/metadata/workspace-migration/migrations/1697618014-addViewSortTable.ts b/server/src/metadata/workspace-migration/migrations/1697618014-addViewSortTable.ts index 6d93e1b9a..bc2563149 100644 --- a/server/src/metadata/workspace-migration/migrations/1697618014-addViewSortTable.ts +++ b/server/src/metadata/workspace-migration/migrations/1697618014-addViewSortTable.ts @@ -14,9 +14,8 @@ export const addViewSortTable: WorkspaceMigrationTableAction[] = [ columns: [ { columnName: 'fieldMetadataId', - columnType: 'varchar', + columnType: 'uuid', action: WorkspaceMigrationColumnActionType.CREATE, - defaultValue: "''", }, { columnName: 'direction', diff --git a/server/src/metadata/workspace-migration/migrations/1697618016-addActivityTable.ts b/server/src/metadata/workspace-migration/migrations/1697618016-addActivityTable.ts index d4d80dc13..68c8f10ed 100644 --- a/server/src/metadata/workspace-migration/migrations/1697618016-addActivityTable.ts +++ b/server/src/metadata/workspace-migration/migrations/1697618016-addActivityTable.ts @@ -16,16 +16,19 @@ export const addActivityTable: WorkspaceMigrationTableAction[] = [ columnName: 'title', columnType: 'varchar', action: WorkspaceMigrationColumnActionType.CREATE, + defaultValue: "''", }, { columnName: 'body', columnType: 'varchar', action: WorkspaceMigrationColumnActionType.CREATE, + defaultValue: "''", }, { columnName: 'type', columnType: 'varchar', action: WorkspaceMigrationColumnActionType.CREATE, + defaultValue: "'Note'", }, { columnName: 'reminderAt', diff --git a/server/src/metadata/workspace-migration/migrations/1697618021-addOpportunityTable.ts b/server/src/metadata/workspace-migration/migrations/1697618021-addOpportunityTable.ts index 02a6c28bf..7ee2d19e8 100644 --- a/server/src/metadata/workspace-migration/migrations/1697618021-addOpportunityTable.ts +++ b/server/src/metadata/workspace-migration/migrations/1697618021-addOpportunityTable.ts @@ -26,6 +26,7 @@ export const addOpportunityTable: WorkspaceMigrationTableAction[] = [ columnName: 'probability', columnType: 'varchar', action: WorkspaceMigrationColumnActionType.CREATE, + defaultValue: "'0'", }, { columnName: 'closeDate', diff --git a/server/src/metadata/workspace-migration/migrations/1697618026-addWorspaceMemberTable.ts b/server/src/metadata/workspace-migration/migrations/1697618026-addWorspaceMemberTable.ts index b47cac69d..48f851664 100644 --- a/server/src/metadata/workspace-migration/migrations/1697618026-addWorspaceMemberTable.ts +++ b/server/src/metadata/workspace-migration/migrations/1697618026-addWorspaceMemberTable.ts @@ -33,17 +33,13 @@ export const addWorkspaceMemberTable: WorkspaceMigrationTableAction[] = [ columnName: 'colorScheme', columnType: 'varchar', action: WorkspaceMigrationColumnActionType.CREATE, + defaultValue: "'Light'", }, { columnName: 'locale', columnType: 'varchar', action: WorkspaceMigrationColumnActionType.CREATE, - defaultValue: "'fr'", - }, - { - columnName: 'allowImpersonation', - columnType: 'boolean', - action: WorkspaceMigrationColumnActionType.CREATE, + defaultValue: "'en'", }, { columnName: 'userId', diff --git a/server/src/workspace/workspace-manager/standard-objects/activity.ts b/server/src/workspace/workspace-manager/standard-objects/activity.ts index d0b2b85c2..62bd3bb99 100644 --- a/server/src/workspace/workspace-manager/standard-objects/activity.ts +++ b/server/src/workspace/workspace-manager/standard-objects/activity.ts @@ -24,6 +24,7 @@ const activityMetadata = { description: 'Activity title', icon: 'IconNotes', isNullable: true, + defaultValue: { value: '' }, }, { isCustom: false, @@ -37,6 +38,7 @@ const activityMetadata = { description: 'Activity body', icon: 'IconList', isNullable: true, + defaultValue: { value: '' }, }, { isCustom: false, @@ -50,6 +52,7 @@ const activityMetadata = { description: 'Activity type', icon: 'IconCheckbox', isNullable: false, + defaultValue: { value: 'Note' }, }, { isCustom: false, @@ -148,7 +151,6 @@ const activityMetadata = { icon: undefined, isNullable: false, isSystem: true, - defaultValue: undefined, }, { isCustom: false, diff --git a/server/src/workspace/workspace-manager/standard-objects/api-key.ts b/server/src/workspace/workspace-manager/standard-objects/api-key.ts index a2edcc667..417448829 100644 --- a/server/src/workspace/workspace-manager/standard-objects/api-key.ts +++ b/server/src/workspace/workspace-manager/standard-objects/api-key.ts @@ -23,6 +23,7 @@ const apiKeyMetadata = { description: 'ApiKey name', icon: 'IconLink', isNullable: false, + defaultValue: { value: '' }, }, { isCustom: false, diff --git a/server/src/workspace/workspace-manager/standard-objects/comment.ts b/server/src/workspace/workspace-manager/standard-objects/comment.ts index fd25f947b..cc56c59c8 100644 --- a/server/src/workspace/workspace-manager/standard-objects/comment.ts +++ b/server/src/workspace/workspace-manager/standard-objects/comment.ts @@ -25,6 +25,18 @@ const commentMetadata = { isNullable: false, defaultValue: { value: '' }, }, + { + isCustom: false, + isActive: true, + type: FieldMetadataType.UUID, + name: 'authorId', + label: 'Author', + targetColumnMap: {}, + description: 'Comment author', + icon: 'IconCircleUser', + isNullable: true, + isSystem: true, + }, // Relations { isCustom: false, @@ -37,18 +49,6 @@ const commentMetadata = { icon: 'IconCircleUser', isNullable: true, }, - { - isCustom: false, - isActive: true, - type: FieldMetadataType.RELATION, - name: 'authorId', - label: 'Author', - targetColumnMap: {}, - description: 'Comment author', - icon: 'IconCircleUser', - isNullable: true, - isSystem: true, - }, { isCustom: false, isActive: true, diff --git a/server/src/workspace/workspace-manager/standard-objects/company.ts b/server/src/workspace/workspace-manager/standard-objects/company.ts index e28607eec..3a3221caf 100644 --- a/server/src/workspace/workspace-manager/standard-objects/company.ts +++ b/server/src/workspace/workspace-manager/standard-objects/company.ts @@ -38,6 +38,7 @@ const companyMetadata = { 'The company website URL. We use this url to fetch the company icon', icon: 'IconLink', isNullable: true, + defaultValue: { value: '' }, }, { isCustom: false, @@ -51,6 +52,7 @@ const companyMetadata = { description: 'The company address', icon: 'IconMap', isNullable: true, + defaultValue: { value: '' }, }, { isCustom: false, diff --git a/server/src/workspace/workspace-manager/standard-objects/opportunity.ts b/server/src/workspace/workspace-manager/standard-objects/opportunity.ts index 32bb2b33b..2739e1804 100644 --- a/server/src/workspace/workspace-manager/standard-objects/opportunity.ts +++ b/server/src/workspace/workspace-manager/standard-objects/opportunity.ts @@ -47,9 +47,10 @@ const opportunityMetadata = { targetColumnMap: { value: 'probability', }, - description: 'Opportunity amount', + description: 'Opportunity probability', icon: 'IconProgressCheck', isNullable: true, + defaultValue: { value: '0' }, }, // Relations { diff --git a/server/src/workspace/workspace-manager/standard-objects/person.ts b/server/src/workspace/workspace-manager/standard-objects/person.ts index bd4f0efc6..6384cc694 100644 --- a/server/src/workspace/workspace-manager/standard-objects/person.ts +++ b/server/src/workspace/workspace-manager/standard-objects/person.ts @@ -78,6 +78,7 @@ const personMetadata = { description: 'Contact’s job title', icon: 'IconBriefcase', isNullable: true, + defaultValue: { value: '' }, }, { isCustom: false, @@ -91,6 +92,7 @@ const personMetadata = { description: 'Contact’s phone number', icon: 'IconPhone', isNullable: true, + defaultValue: { value: '' }, }, { isCustom: false, @@ -104,6 +106,7 @@ const personMetadata = { description: 'Contact’s city', icon: 'IconMap', isNullable: true, + defaultValue: { value: '' }, }, { isCustom: false, @@ -118,6 +121,7 @@ const personMetadata = { icon: 'IconFileUpload', isNullable: true, isSystem: true, + defaultValue: { value: '' }, }, // Relations { diff --git a/server/src/workspace/workspace-manager/standard-objects/view-field.ts b/server/src/workspace/workspace-manager/standard-objects/view-field.ts index 4dc58fc5d..b8fd48157 100644 --- a/server/src/workspace/workspace-manager/standard-objects/view-field.ts +++ b/server/src/workspace/workspace-manager/standard-objects/view-field.ts @@ -14,7 +14,7 @@ const viewFieldMetadata = { { isCustom: false, isActive: true, - type: FieldMetadataType.TEXT, + type: FieldMetadataType.UUID, name: 'fieldMetadataId', label: 'Field Metadata Id', targetColumnMap: { @@ -23,7 +23,6 @@ const viewFieldMetadata = { description: 'View Field target field', icon: 'IconTag', isNullable: false, - defaultValue: { value: '' }, }, { isCustom: false, diff --git a/server/src/workspace/workspace-manager/standard-objects/view-filter.ts b/server/src/workspace/workspace-manager/standard-objects/view-filter.ts index 33382e6d4..57442ed1b 100644 --- a/server/src/workspace/workspace-manager/standard-objects/view-filter.ts +++ b/server/src/workspace/workspace-manager/standard-objects/view-filter.ts @@ -14,7 +14,7 @@ const viewFilterMetadata = { { isCustom: false, isActive: true, - type: FieldMetadataType.TEXT, + type: FieldMetadataType.UUID, name: 'fieldMetadataId', label: 'Field Metadata Id', targetColumnMap: { @@ -23,7 +23,6 @@ const viewFilterMetadata = { description: 'View Filter target field', icon: null, isNullable: false, - defaultValue: { value: '' }, }, { isCustom: false, diff --git a/server/src/workspace/workspace-manager/standard-objects/view-sort.ts b/server/src/workspace/workspace-manager/standard-objects/view-sort.ts index 87338f562..6ddbb58ce 100644 --- a/server/src/workspace/workspace-manager/standard-objects/view-sort.ts +++ b/server/src/workspace/workspace-manager/standard-objects/view-sort.ts @@ -14,7 +14,7 @@ const viewSortMetadata = { { isCustom: false, isActive: true, - type: FieldMetadataType.TEXT, + type: FieldMetadataType.UUID, name: 'fieldMetadataId', label: 'Field Metadata Id', targetColumnMap: { @@ -23,7 +23,6 @@ const viewSortMetadata = { description: 'View Sort target field', icon: null, isNullable: false, - defaultValue: { value: '' }, }, { isCustom: false, diff --git a/server/src/workspace/workspace-manager/standard-objects/view.ts b/server/src/workspace/workspace-manager/standard-objects/view.ts index 1cbefc2ef..66a5c1d18 100644 --- a/server/src/workspace/workspace-manager/standard-objects/view.ts +++ b/server/src/workspace/workspace-manager/standard-objects/view.ts @@ -24,7 +24,7 @@ const viewMetadata = { defaultValue: { value: '' }, }, { - type: FieldMetadataType.TEXT, + type: FieldMetadataType.UUID, name: 'objectMetadataId', label: 'Object Metadata Id', targetColumnMap: { @@ -33,7 +33,6 @@ const viewMetadata = { description: 'View target object', icon: null, isNullable: false, - defaultValue: { value: '' }, }, { type: FieldMetadataType.TEXT, diff --git a/server/src/workspace/workspace-manager/standard-objects/workspace-member.ts b/server/src/workspace/workspace-manager/standard-objects/workspace-member.ts index b308360c4..a7d167cbd 100644 --- a/server/src/workspace/workspace-manager/standard-objects/workspace-member.ts +++ b/server/src/workspace/workspace-manager/standard-objects/workspace-member.ts @@ -38,6 +38,7 @@ const workspaceMemberMetadata = { description: 'Preferred color scheme', icon: 'IconColorSwatch', isNullable: false, + defaultValue: { value: 'Light' }, }, { isCustom: false, @@ -51,7 +52,7 @@ const workspaceMemberMetadata = { description: 'Preferred language', icon: 'IconLanguage', isNullable: false, - defaultValue: { value: 'fr' }, + defaultValue: { value: 'en' }, }, { isCustom: false, @@ -66,6 +67,7 @@ const workspaceMemberMetadata = { icon: 'IconFileUpload', isNullable: true, isSystem: false, + defaultValue: { value: '' }, }, { isCustom: false, diff --git a/server/src/workspace/workspace-manager/workspace-manager.service.ts b/server/src/workspace/workspace-manager/workspace-manager.service.ts index 71af9bf38..bab8173d2 100644 --- a/server/src/workspace/workspace-manager/workspace-manager.service.ts +++ b/server/src/workspace/workspace-manager/workspace-manager.service.ts @@ -81,23 +81,21 @@ export class WorkspaceManagerService { workspaceId: string, ): Promise { const createdObjectMetadata = await this.objectMetadataService.createMany( - Object.values(standardObjectsMetadata).map( - (objectMetadata: ObjectMetadataEntity) => ({ - ...objectMetadata, - dataSourceId, - workspaceId, - isCustom: false, - isActive: true, - fields: [...basicFieldsMetadata, ...objectMetadata.fields].map( - (field) => ({ - ...field, - workspaceId, - isCustom: false, - isActive: true, - }), - ), - }), - ), + Object.values(standardObjectsMetadata).map((objectMetadata: any) => ({ + ...objectMetadata, + dataSourceId, + workspaceId, + isCustom: false, + isActive: true, + fields: [...basicFieldsMetadata, ...objectMetadata.fields].map( + (field) => ({ + ...field, + workspaceId, + isCustom: false, + isActive: true, + }), + ), + })), ); await this.relationMetadataService.createMany( diff --git a/server/src/workspace/workspace.factory.spec.ts b/server/src/workspace/workspace.factory.spec.ts index 93e7e0631..610906909 100644 --- a/server/src/workspace/workspace.factory.spec.ts +++ b/server/src/workspace/workspace.factory.spec.ts @@ -3,6 +3,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { DataSourceService } from 'src/metadata/data-source/data-source.service'; import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service'; import { WorkspaceSchemaStorageService } from 'src/workspace/workspace-schema-storage/workspace-schema-storage.service'; +import { ScalarsExplorerService } from 'src/workspace/services/scalars-explorer.service'; import { WorkspaceFactory } from './workspace.factory'; @@ -24,6 +25,10 @@ describe('WorkspaceFactory', () => { provide: ObjectMetadataService, useValue: {}, }, + { + provide: ScalarsExplorerService, + useValue: {}, + }, { provide: WorkspaceGraphQLSchemaFactory, useValue: {},