From 6d03a8ad1799bfc9dd9c5ddc6494d20152588102 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Thu, 7 Dec 2023 22:05:29 +0530 Subject: [PATCH] refactor: handle uploading imported evernote attachments note-by-note instead of all at once --- packages/ui-services/src/Import/Importer.ts | 5 +---- .../SuperEditor/Tools/HeadlessSuperConverter.tsx | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/ui-services/src/Import/Importer.ts b/packages/ui-services/src/Import/Importer.ts index 18b9c184c..a4fc6c87f 100644 --- a/packages/ui-services/src/Import/Importer.ts +++ b/packages/ui-services/src/Import/Importer.ts @@ -176,10 +176,7 @@ export class Importer { } async getPayloadsFromFile(file: File, type: string): Promise { - const isEntitledToSuper = - this.features.getFeatureStatus( - NativeFeatureIdentifier.create(NativeFeatureIdentifier.TYPES.SuperEditor).getValue(), - ) === FeatureStatus.Entitled + const isEntitledToSuper = this.isEntitledToSuper() if (type === 'super' && !isEntitledToSuper) { throw new Error('Importing Super notes requires a subscription') diff --git a/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx b/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx index bf1ef9f99..1fc8f83d3 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx @@ -279,8 +279,8 @@ export class HeadlessSuperConverter implements SuperConverterServiceInterface { resolve() return } - Promise.all( - concatenatedNodes.map(async (node) => { + ;(async () => { + for (const node of concatenatedNodes) { const blob = await fetch(node.__src).then((response) => response.blob()) const name = $isInlineFileNode(node) ? node.__fileName : node.__alt const mimeType = $isInlineFileNode(node) ? node.__mimeType : node.__src.split(';')[0].split(':')[1] @@ -303,8 +303,8 @@ export class HeadlessSuperConverter implements SuperConverterServiceInterface { ) await linkFile(uploadedFile) - }), - ) + } + })() .then(() => resolve()) .catch(console.error) },