Merge pull request #1248 from EvanBldy/master

[csv] add missing sanitize for some csv import + stop removing ';' an…
cgwire · Nov 23, 2023 · 2717c70 · 2717c70
2 parents 7ed4489 + f55793f
commit 2717c70
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/components/pages/Breakdown.vue b/src/components/pages/Breakdown.vue
@@ -925,7 +925,8 @@ export default {
     uploadImportFile(data) {
       const formData = new FormData()
       const filename = 'import.csv'
-      const file = new File([data.join('\n')], filename, { type: 'text/csv' })
+      const csvContent = csv.turnEntriesToCsvString(data)
+      const file = new File([csvContent], filename, { type: 'text/csv' })
 
       formData.append('file', file)
 

diff --git a/src/components/pages/People.vue b/src/components/pages/People.vue
@@ -337,7 +337,8 @@ export default {
     uploadImportFile(data, toUpdate) {
       const formData = new FormData()
       const filename = 'import.csv'
-      const file = new File([data.join('\n')], filename, { type: 'text/csv' })
+      const csvContent = csv.turnEntriesToCsvString(data)
+      const file = new File([csvContent], filename, { type: 'text/csv' })
 
       formData.append('file', file)
       this.loading.importing = true

diff --git a/src/components/pages/TaskType.vue b/src/components/pages/TaskType.vue
@@ -1330,7 +1330,8 @@ export default {
     uploadImportFile(data) {
       const formData = new FormData()
       const filename = 'import.csv'
-      const file = new File([data.join('\n')], filename, { type: 'text/csv' })
+      const csvContent = csv.turnEntriesToCsvString(data)
+      const file = new File([csvContent], filename, { type: 'text/csv' })
 
       formData.append('file', file)
 

diff --git a/src/lib/csv.js b/src/lib/csv.js
@@ -113,9 +113,7 @@ const csv = {
     entries.forEach(infoArray => {
       const sanitizedCells = infoArray.map(cell => {
         const cellString = `${cell || ''}`
-        if (cellString.search('"') !== -1) {
-          return `${cellString.replace(/;/g, '')}`
-        } else return `"${cellString}"`
+        return `"${cellString.replace(/"/g, '""')}"`
       })
       const line = sanitizedCells.join(';')
       if (line.length > 2) lineArray.push(line)