diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts index cffb55eac..44852d244 100644 --- a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts +++ b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts @@ -467,7 +467,7 @@ export const SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS = { subFieldLabel: COMPOSITE_FIELD_SUB_FIELD_LABELS[FieldMetadataType.RICH_TEXT_V2] .markdown, - isImportable: false, + isImportable: true, isFilterable: false, isIncludedInUniqueConstraint: false, }, diff --git a/packages/twenty-front/src/modules/spreadsheet-import/constants/SpreadsheetImportCreateRecordsBatchSize.ts b/packages/twenty-front/src/modules/spreadsheet-import/constants/SpreadsheetImportCreateRecordsBatchSize.ts index c8e8c2250..a61619b4e 100644 --- a/packages/twenty-front/src/modules/spreadsheet-import/constants/SpreadsheetImportCreateRecordsBatchSize.ts +++ b/packages/twenty-front/src/modules/spreadsheet-import/constants/SpreadsheetImportCreateRecordsBatchSize.ts @@ -1 +1 @@ -export const SpreadsheetImportCreateRecordsBatchSize = 500; +export const SpreadsheetImportCreateRecordsBatchSize = 200; diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/hooks/useDownloadFakeRecords.ts b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/hooks/useDownloadFakeRecords.ts index 5aa53b3ab..4c02ac94d 100644 --- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/hooks/useDownloadFakeRecords.ts +++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/hooks/useDownloadFakeRecords.ts @@ -39,6 +39,7 @@ export const useDownloadFakeRecords = () => { break; } + case FieldMetadataType.RICH_TEXT_V2: case FieldMetadataType.ACTOR: case FieldMetadataType.EMAILS: case FieldMetadataType.CURRENCY: diff --git a/packages/twenty-server/src/engine/core-modules/record-transformer/services/record-input-transformer.service.ts b/packages/twenty-server/src/engine/core-modules/record-transformer/services/record-input-transformer.service.ts index 7aa94c6d6..6a992fb55 100644 --- a/packages/twenty-server/src/engine/core-modules/record-transformer/services/record-input-transformer.service.ts +++ b/packages/twenty-server/src/engine/core-modules/record-transformer/services/record-input-transformer.service.ts @@ -99,13 +99,13 @@ export class RecordInputTransformerService { let convertedMarkdown: string | null = null; try { - convertedMarkdown = parsedValue.blocknote + convertedMarkdown = isDefined(parsedValue.blocknote) ? await serverBlockNoteEditor.blocksToMarkdownLossy( JSON.parse(parsedValue.blocknote), ) : null; } catch { - convertedMarkdown = parsedValue.blocknote; + convertedMarkdown = parsedValue.blocknote || null; } const convertedBlocknote = parsedValue.markdown diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/rich-text-v2.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/rich-text-v2.composite-type.ts index 03ea508f6..3792d7c77 100644 --- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/rich-text-v2.composite-type.ts +++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/rich-text-v2.composite-type.ts @@ -1,5 +1,5 @@ -import { z } from 'zod'; import { FieldMetadataType } from 'twenty-shared/types'; +import { z } from 'zod'; import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface'; @@ -21,8 +21,9 @@ export const richTextV2CompositeType: CompositeType = { ], }; +// with import only markdown subfield is filled, then blocknote is undefined export const richTextV2ValueSchema = z.object({ - blocknote: z.string().nullable(), + blocknote: z.string().nullable().optional(), markdown: z.string().nullable(), });