From 88d1ba0d0324c40f5d84fdb81634b1b9fe5ed47c Mon Sep 17 00:00:00 2001
From: florent <flavelle@neogeo.fr>
Date: Thu, 14 Apr 2022 11:02:53 +0200
Subject: [PATCH] minor fix
---
src/assets/js/utils.js | 4 +++-
src/components/Project/Detail/ProjectFeatureTypes.vue | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/assets/js/utils.js b/src/assets/js/utils.js
index 05a20057..4b01c67e 100644
--- a/src/assets/js/utils.js
+++ b/src/assets/js/utils.js
@@ -18,7 +18,9 @@ export function csvToJson(csv, delimiter) {
const result = [];
const allLines = csv.split('\n');
- const headers = allLines[0].split(delimiter);
+ const headers = allLines[0].split(delimiter).map(el => {
+ return el.replace('\r', '');
+ });
const [, ...lines] = allLines;
for (const line of lines) {
diff --git a/src/components/Project/Detail/ProjectFeatureTypes.vue b/src/components/Project/Detail/ProjectFeatureTypes.vue
index 744b1640..f6401e62 100644
--- a/src/components/Project/Detail/ProjectFeatureTypes.vue
+++ b/src/components/Project/Detail/ProjectFeatureTypes.vue
@@ -607,6 +607,9 @@ export default {
fr.result
.split('\n')[0]
.split(delimiter)
+ .map(el => {
+ return el.replace('\r', '');
+ })
.filter(el => {
return el === 'lat' || el === 'lon';
});
@@ -621,7 +624,6 @@ export default {
return !isNaN(el) && el.indexOf('.') != -1;
})
.filter(Boolean);
-
if (sampleLine.length > 1 && headersLine.length === 2) {
this.csvError = null;
this.csvImport = csvToJson(fr.result, delimiter);
--
GitLab