From fc23ffc89f7c2b6ede89c6a2a620053a6adbd844 Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Thu, 3 Mar 2022 10:57:59 +0900
Subject: [PATCH 1/3] Move the import button to the left

---
 frontend/pages/projects/_id/upload/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/pages/projects/_id/upload/index.vue b/frontend/pages/projects/_id/upload/index.vue
index ca9b1c7f..37c5148d 100644
--- a/frontend/pages/projects/_id/upload/index.vue
+++ b/frontend/pages/projects/_id/upload/index.vue
@@ -81,9 +81,8 @@
       ></v-data-table>
     </v-card-text>
     <v-card-actions>
-      <v-spacer />
       <v-btn
-        class='text-capitalize me-2 primary'
+        class='text-capitalize ms-2 primary'
         :disabled="isDisabled"
         @click="importDataset"
       >

From 1eec4b9c624a61b795fc25a5852a16439163992a Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Thu, 3 Mar 2022 11:10:37 +0900
Subject: [PATCH 2/3] Move the dataset import page to the dataset directory

---
 .../projects/_id/{upload/index.vue => dataset/import.vue}    | 0
 frontend/pages/projects/_id/dataset/index.vue                | 5 +----
 2 files changed, 1 insertion(+), 4 deletions(-)
 rename frontend/pages/projects/_id/{upload/index.vue => dataset/import.vue} (100%)

diff --git a/frontend/pages/projects/_id/upload/index.vue b/frontend/pages/projects/_id/dataset/import.vue
similarity index 100%
rename from frontend/pages/projects/_id/upload/index.vue
rename to frontend/pages/projects/_id/dataset/import.vue
diff --git a/frontend/pages/projects/_id/dataset/index.vue b/frontend/pages/projects/_id/dataset/index.vue
index 11650dad..d29bc224 100644
--- a/frontend/pages/projects/_id/dataset/index.vue
+++ b/frontend/pages/projects/_id/dataset/index.vue
@@ -2,7 +2,7 @@
   <v-card>
     <v-card-title v-if="isProjectAdmin">
       <action-menu
-        @upload="upload"
+        @upload="$router.push('dataset/import')"
         @download="dialogDownload=true"
       />
       <v-btn
@@ -173,9 +173,6 @@ export default Vue.extend({
       this.dialogDeleteAll = false
       this.selected = []
     },
-    upload() {
-      this.$router.push(`/projects/${this.projectId}/upload`)
-    },
     updateQuery(query: object) {
       this.$router.push(query)
     },

From 02ff753cb59fb764af366cc41ce44c9105acce86 Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Thu, 3 Mar 2022 11:29:40 +0900
Subject: [PATCH 3/3] Move the dataset page after successful import

---
 frontend/pages/projects/_id/dataset/import.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/pages/projects/_id/dataset/import.vue b/frontend/pages/projects/_id/dataset/import.vue
index 37c5148d..05921b65 100644
--- a/frontend/pages/projects/_id/dataset/import.vue
+++ b/frontend/pages/projects/_id/dataset/import.vue
@@ -59,8 +59,8 @@
         :accepted-file-types="acceptedFileTypes"
         :server="server"
         :files="myFiles"
-        @processfile="handleFilePondProcessfile"
-        @removefile="handleFilePondRemovefile"
+        @processfile="handleFilePondProcessFile"
+        @removefile="handleFilePondRemoveFile"
       />
       <file-pond
         v-if="selected && acceptedFileTypes === '*'"
@@ -70,8 +70,8 @@
         :allow-multiple="true"
         :server="server"
         :files="myFiles"
-        @processfile="handleFilePondProcessfile"
-        @removefile="handleFilePondRemovefile"
+        @processfile="handleFilePondProcessFile"
+        @removefile="handleFilePondRemoveFile"
       />
       <v-data-table
         v-if="errors.length > 0"
@@ -219,12 +219,12 @@ export default {
   },
 
   methods: {
-    handleFilePondProcessfile(error, file) {
+    handleFilePondProcessFile(error, file) {
       console.log(error)
       this.uploadedFiles.push(file)
       this.$nextTick()
     },
-    handleFilePondRemovefile(error, file) {
+    handleFilePondRemoveFile(error, file) {
       console.log(error)
       const index = this.uploadedFiles.findIndex(item => item.id === file.id)
       if (index > -1) {
@@ -251,6 +251,9 @@ export default {
             this.myFiles = []
             this.uploadedFiles = []
             this.isImporting = false
+            if (this.errors.length === 0) {
+              this.$router.push(`/projects/${this.$route.params.id}/dataset`)
+            }
           }
         }
   		}, 3000)