From 335e6a3ff32b4598fe72a293c24811ae076b0ccc Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 13 Nov 2023 07:25:15 +0100
Subject: [PATCH] Display warning in UI when providing wrong separator
---
.../_database_id/table/_table_id/import.vue | 2 +-
.../database/_database_id/table/import.vue | 26 ++++++++++++++++---
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/dbrepo-ui/pages/database/_database_id/table/_table_id/import.vue b/dbrepo-ui/pages/database/_database_id/table/_table_id/import.vue
index 7539b4a73a..e15c0894f2 100644
--- a/dbrepo-ui/pages/database/_database_id/table/_table_id/import.vue
+++ b/dbrepo-ui/pages/database/_database_id/table/_table_id/import.vue
@@ -133,7 +133,7 @@ export default {
},
tableImport: {
location: null,
- quote: null,
+ quote: '"',
false_element: null,
true_element: null,
null_element: null,
diff --git a/dbrepo-ui/pages/database/_database_id/table/import.vue b/dbrepo-ui/pages/database/_database_id/table/import.vue
index 190c558cbc..aa68beb8be 100644
--- a/dbrepo-ui/pages/database/_database_id/table/import.vue
+++ b/dbrepo-ui/pages/database/_database_id/table/import.vue
@@ -132,6 +132,19 @@
</v-stepper-step>
<v-stepper-content step="3">
<v-form ref="form" v-model="validStep3" @submit.prevent="submit">
+ <v-row dense>
+ <v-col cols="8">
+ <v-alert
+ v-if="warnAnalyseSeparator"
+ border="left"
+ color="warning">
+ We analysed your .csv/.tsv file and found that the separator you provided
+ <code>{{ tableImport.separator }}</code> is not correct, the separator
+ <code>{{ suggestedAnalyseSeparator }}</code> is more likely to be correct. If you really want to import
+ the .csv/.tsv file still, click "continue".
+ </v-alert>
+ </v-col>
+ </v-row>
<v-row dense>
<v-col cols="8">
<v-file-input
@@ -240,7 +253,7 @@ export default {
},
tableImport: {
location: null,
- quote: null,
+ quote: '"',
false_element: null,
true_element: null,
null_element: null,
@@ -251,6 +264,8 @@ export default {
loadingUpload: false,
loadingAnalyse: false,
loadingImage: false,
+ warnAnalyseSeparator: false,
+ suggestedAnalyseSeparator: null,
url: null,
columns: [],
newTableId: 42 // FIXME ???
@@ -331,7 +346,7 @@ export default {
this.loadingAnalyse = true
AnalyseService.determineDataTypes(path)
.then((analysis) => {
- const { columns } = analysis
+ const { columns, separator } = analysis
const dataTypes = QueryMapper.mySql8DataTypes()
this.tableCreate.columns = Object.entries(columns)
.map(([key, val]) => {
@@ -347,7 +362,12 @@ export default {
}
})
this.tableImport.location = path
- this.step = 4
+ if (separator !== this.tableImport.separator) {
+ this.warnAnalyseSeparator = true
+ this.suggestedAnalyseSeparator = separator
+ } else {
+ this.step = 4
+ }
})
.finally(() => {
this.loadingAnalyse = false
--
GitLab