From fac82200d185746f0d2c924ee91e0dab28e2f131 Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Wed, 29 Dec 2021 06:58:58 +0530
Subject: [PATCH] refactor: minor ui improvements to import steps

---
 .../hoppscotch-app/assets/icons/upload.svg    |   5 +
 .../components/collections/ImportExport.vue   | 195 ++++++------------
 .../helpers/import-export/import/hopp.ts      |   2 +-
 .../helpers/import-export/steps.ts            |   2 +-
 packages/hoppscotch-app/locales/en.json       |   1 +
 5 files changed, 76 insertions(+), 129 deletions(-)
 create mode 100644 packages/hoppscotch-app/assets/icons/upload.svg

diff --git a/packages/hoppscotch-app/assets/icons/upload.svg b/packages/hoppscotch-app/assets/icons/upload.svg
new file mode 100644
index 000000000..150713a88
--- /dev/null
+++ b/packages/hoppscotch-app/assets/icons/upload.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"></path>
+  <polyline points="17 8 12 3 7 8"></polyline>
+  <line x1="12" y1="3" x2="12" y2="15"></line>
+</svg>
\ No newline at end of file
diff --git a/packages/hoppscotch-app/components/collections/ImportExport.vue b/packages/hoppscotch-app/components/collections/ImportExport.vue
index 64e66af57..c0bc74b55 100644
--- a/packages/hoppscotch-app/components/collections/ImportExport.vue
+++ b/packages/hoppscotch-app/components/collections/ImportExport.vue
@@ -6,6 +6,13 @@
     @close="hideModal"
   >
     <template #actions>
+      <ButtonSecondary
+        v-if="importerType > 0"
+        v-tippy="{ theme: 'tooltip' }"
+        :title="t('action.go_back')"
+        svg="arrow-left"
+        @click.native="importerType = 0"
+      />
       <ButtonSecondary
         v-if="mode == 'import_from_my_collections'"
         v-tippy="{ theme: 'tooltip' }"
@@ -20,24 +27,38 @@
       />
     </template>
     <template #body>
-      <div v-for="(step, index) in importerSteps" :key="`step-${index}`">
-        {{ step }}
+      <div v-if="importerType > 0" class="flex flex-col px-2">
+        <div v-for="(step, index) in importerSteps" :key="`step-${index}`">
+          <div
+            v-if="step.name === 'FILE_OR_URL_IMPORT'"
+            class="flex space-y-4 flex-col"
+          >
+            <p>{{ t("import.json_description") }}</p>
+            <label for="inputChooseFileToImportFrom" class="bg-pink-200">
+              bbb
+            </label>
+            <SmartIcon name="upload" />
+            {{ t("action.choose_file") }}
+            <input
+              id="inputChooseFileToImportFrom"
+              ref="inputChooseFileToImportFrom"
+              name="inputChooseFileToImportFrom"
+              class="input"
+              type="file"
+              :accept="step.metadata.acceptedFileTypes"
+              @change="importFromJSON"
+            />
+            <ButtonPrimary :label="t('import.title')" />
+          </div>
+        </div>
       </div>
-      <div v-if="importerType > 0">start steps</div>
-      <div v-if="mode == 'import_export'" class="flex flex-col space-y-2 px-2">
+      <div v-else class="flex flex-col px-2">
         <SmartExpand>
           <template #body>
             <SmartItem
               svg="folder-plus"
               :label="t('import.json')"
-              @click.native="openDialogChooseFileToImportFrom"
-            />
-            <input
-              ref="inputChooseFileToImportFrom"
-              class="input"
-              type="file"
-              accept="application/json"
-              @change="importFromJSON"
+              @click.native="importerType = 1"
             />
             <SmartItem
               v-if="collectionsType.type == 'team-collections'"
@@ -60,51 +81,44 @@
             <SmartItem svg="file" :label="t('import.from_openapi')" />
             <SmartItem svg="insomnia" :label="t('import.from_insomnia')" />
             <SmartItem svg="postman" :label="t('import.from_postman')" />
-            <input
-              ref="inputChooseFileToReplaceWith"
-              class="input"
-              type="file"
-              accept="application/json"
-              @change="replaceWithJSON"
+            <hr />
+            <SmartItem
+              v-tippy="{ theme: 'tooltip' }"
+              :title="t('action.download_file')"
+              svg="download"
+              :label="t('export.as_json')"
+              @click.native="exportJSON"
             />
+            <span
+              v-tippy="{ theme: 'tooltip' }"
+              :title="
+                !currentUser
+                  ? `${t('export.require_github')}`
+                  : currentUser.provider !== 'github.com'
+                  ? `${t('export.require_github')}`
+                  : undefined
+              "
+              class="flex"
+            >
+              <SmartItem
+                :disabled="
+                  !currentUser
+                    ? true
+                    : currentUser.provider !== 'github.com'
+                    ? true
+                    : false
+                "
+                svg="github"
+                :label="t('export.create_secret_gist')"
+                @click.native="
+                  () => {
+                    createCollectionGist()
+                  }
+                "
+              />
+            </span>
           </template>
         </SmartExpand>
-        <hr />
-        <SmartItem
-          v-tippy="{ theme: 'tooltip' }"
-          :title="t('action.download_file')"
-          svg="download"
-          :label="t('export.as_json')"
-          @click.native="exportJSON"
-        />
-        <span
-          v-tippy="{ theme: 'tooltip' }"
-          :title="
-            !currentUser
-              ? `${t('export.require_github')}`
-              : currentUser.provider !== 'github.com'
-              ? `${t('export.require_github')}`
-              : undefined
-          "
-          class="flex"
-        >
-          <SmartItem
-            :disabled="
-              !currentUser
-                ? true
-                : currentUser.provider !== 'github.com'
-                ? true
-                : false
-            "
-            svg="github"
-            :label="t('export.create_secret_gist')"
-            @click.native="
-              () => {
-                createCollectionGist()
-              }
-            "
-          />
-        </span>
       </div>
       <div
         v-if="mode == 'import_from_my_collections'"
@@ -208,7 +222,6 @@ const mySelectedCollectionID = ref(undefined)
 const collectionJson = ref("")
 
 // Template refs
-const inputChooseFileToReplaceWith = ref<HTMLInputElement>()
 const inputChooseFileToImportFrom = ref<HTMLInputElement>()
 
 const getJSONCollection = async () => {
@@ -302,16 +315,6 @@ const hideModal = () => {
   emit("hide-modal")
 }
 
-// const openDialogChooseFileToReplaceWith = () => {
-//   if (inputChooseFileToReplaceWith.value)
-//     inputChooseFileToReplaceWith.value.click()
-// }
-
-const openDialogChooseFileToImportFrom = () => {
-  if (inputChooseFileToImportFrom.value)
-    inputChooseFileToImportFrom.value.click()
-}
-
 const hasFolder = (item: { item?: any }) => {
   return Object.prototype.hasOwnProperty.call(item, "item")
 }
@@ -478,68 +481,6 @@ const parsePostmanRequest = ({
   return translateToNewRequest(pwRequest)
 }
 
-const replaceWithJSON = () => {
-  if (!inputChooseFileToReplaceWith.value) return
-
-  if (
-    !inputChooseFileToReplaceWith.value.files ||
-    inputChooseFileToReplaceWith.value.files.length === 0
-  ) {
-    toast.show(t("action.choose_file").toString())
-    return
-  }
-
-  const reader = new FileReader()
-
-  reader.onload = ({ target }) => {
-    const content = target!.result as string | null
-
-    if (!content) {
-      toast.show(t("action.choose_file").toString())
-      return
-    }
-
-    let collections = JSON.parse(content)
-
-    // TODO: File validation
-    if (collections[0]) {
-      const [name, folders, requests] = Object.keys(collections[0])
-      if (name === "name" && folders === "folders" && requests === "requests") {
-        // Do nothing
-      }
-    } else if (collections.info && collections.info.schema.includes("v2.1.0")) {
-      collections = [parsePostmanCollection(collections)]
-    } else {
-      failedImport()
-    }
-    if (props.collectionsType.type === "team-collections") {
-      teamUtils
-        .replaceWithJSON(
-          apolloClient,
-          collections,
-          props.collectionsType.selectedTeam.id
-        )
-        .then((status) => {
-          if (status) {
-            fileImported()
-          } else {
-            failedImport()
-          }
-        })
-        .catch((e) => {
-          console.error(e)
-          failedImport()
-        })
-    } else {
-      setRESTCollections(collections)
-      fileImported()
-    }
-  }
-
-  reader.readAsText(inputChooseFileToReplaceWith.value.files[0])
-  inputChooseFileToReplaceWith.value.value = ""
-}
-
 const isInsomniaCollection = (collection: any) => {
   if (typeof collection === "object") {
     return (
diff --git a/packages/hoppscotch-app/helpers/import-export/import/hopp.ts b/packages/hoppscotch-app/helpers/import-export/import/hopp.ts
index 9ee0d0f1c..65b5d2f34 100644
--- a/packages/hoppscotch-app/helpers/import-export/import/hopp.ts
+++ b/packages/hoppscotch-app/helpers/import-export/import/hopp.ts
@@ -11,7 +11,7 @@ export default defineImporter({
     step({
       stepName: "FILE_OR_URL_IMPORT",
       metadata: {
-        acceptedFileTypes: ["application/json"],
+        acceptedFileTypes: "application/json",
       },
     }),
   ] as const,
diff --git a/packages/hoppscotch-app/helpers/import-export/steps.ts b/packages/hoppscotch-app/helpers/import-export/steps.ts
index 989bb0c2e..cc54521c2 100644
--- a/packages/hoppscotch-app/helpers/import-export/steps.ts
+++ b/packages/hoppscotch-app/helpers/import-export/steps.ts
@@ -6,7 +6,7 @@ export type StepDefinition = {
   FILE_OR_URL_IMPORT: {
     returnType: string
     metadata: {
-      acceptedFileTypes: string[]
+      acceptedFileTypes: string
     }
   } // String content of the file/url
   TARGET_MY_COLLECTION: {
diff --git a/packages/hoppscotch-app/locales/en.json b/packages/hoppscotch-app/locales/en.json
index 9efd1bbfc..74bb74ebe 100644
--- a/packages/hoppscotch-app/locales/en.json
+++ b/packages/hoppscotch-app/locales/en.json
@@ -237,6 +237,7 @@
     "from_url": "Import from URL",
     "gist_url": "Enter Gist URL",
     "json": "Import from file",
+    "json_description": "Import collections from a Hoppscotch Collections JSON file",
     "title": "Import"
   },
   "layout": {