rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fixed issue when importing plaintext file

Browse Source
This commit is contained in:
Aman Harwara
2023-11-24 19:53:33 +05:30
parent 6a5cbc8006
commit 1f81cadcfc
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/ui-services/src/Import/PlaintextConverter/PlaintextConverter.ts
View File

@@ -27,8 +27,6 @@ export class PlaintextConverter {
const createdAtDate = file.lastModified ? new Date(file.lastModified) : new Date() const createdAtDate = file.lastModified ? new Date(file.lastModified) : new Date()
const updatedAtDate = file.lastModified ? new Date(file.lastModified) : new Date() const updatedAtDate = file.lastModified ? new Date(file.lastModified) : new Date()
const shouldConvertToSuper = file.type === 'text/markdown' && isEntitledToSuper
return { return {
created_at: createdAtDate, created_at: createdAtDate,
created_at_timestamp: createdAtDate.getTime(), created_at_timestamp: createdAtDate.getTime(),
@@ -38,9 +36,7 @@ export class PlaintextConverter {
content_type: ContentType.TYPES.Note, content_type: ContentType.TYPES.Note,
content: { content: {
title: name, title: name,
text: shouldConvertToSuper text: isEntitledToSuper ? this.superConverterService.convertOtherFormatToSuperString(content, 'md') : content,
? this.superConverterService.convertOtherFormatToSuperString(content, 'md')
: content,
references: [], references: [],
...(isEntitledToSuper ...(isEntitledToSuper
? { ? {

5
packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx
View File

@@ -1,5 +1,5 @@
import { createHeadlessEditor } from '@lexical/headless' import { createHeadlessEditor } from '@lexical/headless'
import { $convertToMarkdownString, $convertFromMarkdownString } from '@lexical/markdown' import { $convertToMarkdownString } from '@lexical/markdown'
import { FileItem, GenerateUuid, PrefKey, PrefValue, SuperConverterServiceInterface } from '@standardnotes/snjs' import { FileItem, GenerateUuid, PrefKey, PrefValue, SuperConverterServiceInterface } from '@standardnotes/snjs'
import { import {
$createParagraphNode, $createParagraphNode,
@@ -19,6 +19,7 @@ import { $createFileExportNode } from '../Lexical/Nodes/FileExportNode'
import { $createInlineFileNode, $isInlineFileNode, InlineFileNode } from '../Plugins/InlineFilePlugin/InlineFileNode' import { $createInlineFileNode, $isInlineFileNode, InlineFileNode } from '../Plugins/InlineFilePlugin/InlineFileNode'
import { $createFileNode } from '../Plugins/EncryptedFilePlugin/Nodes/FileUtils' import { $createFileNode } from '../Plugins/EncryptedFilePlugin/Nodes/FileUtils'
import { RemoteImageNode } from '../Plugins/RemoteImagePlugin/RemoteImageNode' import { RemoteImageNode } from '../Plugins/RemoteImagePlugin/RemoteImageNode'
import { $convertFromMarkdownString } from '../Lexical/Utils/MarkdownImport'
export class HeadlessSuperConverter implements SuperConverterServiceInterface { export class HeadlessSuperConverter implements SuperConverterServiceInterface {
private importEditor: LexicalEditor private importEditor: LexicalEditor
private exportEditor: LexicalEditor private exportEditor: LexicalEditor
@@ -218,7 +219,7 @@ export class HeadlessSuperConverter implements SuperConverterServiceInterface {
this.importEditor.update( this.importEditor.update(
() => { () => {
try { try {
$convertFromMarkdownString(otherFormatString, MarkdownTransformers) $convertFromMarkdownString(otherFormatString, MarkdownTransformers, undefined, true)
} catch (error) { } catch (error) {
console.error(error) console.error(error)
didThrow = true didThrow = true