From 7f9f60b1c542aabbd720d40f51ae44d17e83b35d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 21 Oct 2022 13:59:02 +0800
Subject: [PATCH] refactor(nc-gui): merge parseAndExtractStreamData to
 parseAndExtractData

---
 .../nc-gui/components/dlg/QuickImport.vue     | 37 +++----------------
 1 file changed, 5 insertions(+), 32 deletions(-)

diff --git a/packages/nc-gui/components/dlg/QuickImport.vue b/packages/nc-gui/components/dlg/QuickImport.vue
index b1d5ed31e4..2b0b869c4e 100644
--- a/packages/nc-gui/components/dlg/QuickImport.vue
+++ b/packages/nc-gui/components/dlg/QuickImport.vue
@@ -147,7 +147,7 @@ async function handlePreImport() {
 
   if (activeKey.value === 'uploadTab') {
     if (isImportTypeCsv.value) {
-      await parseAndExtractStreamData(importState.fileList as streamImportFileList)
+      await parseAndExtractData(importState.fileList as streamImportFileList)
     } else {
       await parseAndExtractData((importState.fileList as importFileList)[0].data)
     }
@@ -179,37 +179,10 @@ async function handleImport() {
   dialogShow.value = false
 }
 
-async function parseAndExtractStreamData(val: UploadFile[]) {
-  try {
-    templateData.value = null
-    importData.value = null
-    importColumns.value = []
-
-    templateGenerator = getAdapter(val)
-
-    if (!templateGenerator) {
-      message.error(t('msg.error.templateGeneratorNotFound'))
-      return
-    }
-
-    await templateGenerator.init()
-
-    templateGenerator.parse(() => {
-      templateData.value = templateGenerator!.getTemplate()
-      // TODO(import): remove
-      // templateData.value.tables[0].table_name = populateUniqueTableName()
-      if (importOnly) importColumns.value = templateGenerator!.getColumns()
-      importData.value = templateGenerator!.getData()
-      templateEditorModal.value = true
-      isParsingData.value = false
-      preImportLoading.value = false
-    })
-  } catch (e: any) {
-    message.error(await extractSdkResponseErrorMsg(e))
-  }
-}
-
-async function parseAndExtractData(val: string | ArrayBuffer) {
+// UploadFile[] for csv import (streaming)
+// ArrayBuffer for excel import
+// string for json import
+async function parseAndExtractData(val: UploadFile[] | ArrayBuffer | string) {
   try {
     templateData.value = null
     importData.value = null