From 1340bd0806a8aaf80ca5fc5a7d6aecc6db914c6b Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 25 Nov 2023 10:03:48 +0000
Subject: [PATCH] fix: use title as field name for import

---
 packages/nc-gui/components/template/Editor.vue          | 9 +++++----
 packages/nc-gui/helpers/parsers/CSVTemplateAdapter.ts   | 3 +++
 packages/nc-gui/helpers/parsers/ExcelTemplateAdapter.ts | 5 +++++
 packages/nc-gui/helpers/parsers/JSONTemplateAdapter.ts  | 2 ++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/template/Editor.vue b/packages/nc-gui/components/template/Editor.vue
index 6dbb1f73b0..b22ec7fa65 100644
--- a/packages/nc-gui/components/template/Editor.vue
+++ b/packages/nc-gui/components/template/Editor.vue
@@ -131,7 +131,7 @@ const validators = computed(() =>
     hasSelectColumn.value[tableIdx] = false
 
     table.columns?.forEach((column, columnIdx) => {
-      acc[`tables.${tableIdx}.columns.${columnIdx}.column_name`] = [
+      acc[`tables.${tableIdx}.columns.${columnIdx}.title`] = [
         fieldRequiredValidator(),
         fieldLengthValidator(),
       ]
@@ -252,6 +252,7 @@ function deleteTableColumn(tableIdx: number, columnKey: number) {
 function addNewColumnRow(tableIdx: number, uidt: string) {
   data.tables[tableIdx].columns.push({
     key: data.tables[tableIdx].columns.length,
+    title: `title${data.tables[tableIdx].columns.length + 1}`,
     column_name: `title${data.tables[tableIdx].columns.length + 1}`,
     uidt,
   })
@@ -275,7 +276,7 @@ function remapColNames(batchData: any[], columns: ColumnType[]) {
       // then only col.column_name exists in data, else col.ref_column_name
       // for csv, col.column_name always exists in data
       // since it streams the data in getData() with the updated col.column_name
-      const key = col.column_name in data ? col.column_name : col.ref_column_name
+      const key = col.title in data ? col.title : col.ref_column_name
       let d = data[key]
       if (col.uidt === UITypes.Date && d) {
         let dateFormat
@@ -295,7 +296,7 @@ function remapColNames(batchData: any[], columns: ColumnType[]) {
       }
       return {
         ...aggObj,
-        [col.column_name]: d,
+        [col.title]: d,
       }
     }, {}),
   )
@@ -901,7 +902,7 @@ watch(modelRef, async () => {
               <template #bodyCell="{ column, record }">
                 <template v-if="column.key === 'column_name'">
                   <a-form-item v-bind="validateInfos[`tables.${tableIdx}.columns.${record.key}.${column.key}`]">
-                    <a-input :ref="(el: HTMLInputElement) => (inputRefs[record.key] = el)" v-model:value="record.column_name" />
+                    <a-input :ref="(el: HTMLInputElement) => (inputRefs[record.key] = el)" v-model:value="record.title" />
                   </a-form-item>
                 </template>
 
diff --git a/packages/nc-gui/helpers/parsers/CSVTemplateAdapter.ts b/packages/nc-gui/helpers/parsers/CSVTemplateAdapter.ts
index 002e8b0e87..6bda581a8e 100644
--- a/packages/nc-gui/helpers/parsers/CSVTemplateAdapter.ts
+++ b/packages/nc-gui/helpers/parsers/CSVTemplateAdapter.ts
@@ -58,6 +58,7 @@ export default class CSVTemplateAdapter {
     this.tables[tableIdx] = []
 
     for (const [columnIdx, columnName] of columnNames.entries()) {
+      let title = ((columnNameRowExist && columnName.toString().trim()) || `Field ${columnIdx + 1}`).trim()
       let cn: string = ((columnNameRowExist && columnName.toString().trim()) || `field_${columnIdx + 1}`)
         .replace(/[` ~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/g, '_')
         .trim()
@@ -70,6 +71,7 @@ export default class CSVTemplateAdapter {
       this.distinctValues[columnIdx] = new Set<string>()
       this.columnValues[columnIdx] = []
       tableObj.columns.push({
+        title,
         column_name: cn,
         ref_column_name: cn,
         meta: {},
@@ -325,6 +327,7 @@ export default class CSVTemplateAdapter {
   }
 
   getTemplate() {
+    console.log(this)
     return this.base
   }
 
diff --git a/packages/nc-gui/helpers/parsers/ExcelTemplateAdapter.ts b/packages/nc-gui/helpers/parsers/ExcelTemplateAdapter.ts
index 80aa8daa58..35d9a29e44 100644
--- a/packages/nc-gui/helpers/parsers/ExcelTemplateAdapter.ts
+++ b/packages/nc-gui/helpers/parsers/ExcelTemplateAdapter.ts
@@ -113,6 +113,10 @@ export default class ExcelTemplateAdapter extends TemplateGenerator {
             )
 
             for (let col = 0; col < rows[0].length; col++) {
+              const title = (
+                (this.config.firstRowAsHeaders && rows[0] && rows[0][col] && rows[0][col].toString().trim()) ||
+                `Field ${col + 1}`
+              ).trim()
               let cn: string = (
                 (this.config.firstRowAsHeaders && rows[0] && rows[0][col] && rows[0][col].toString().trim()) ||
                 `field_${col + 1}`
@@ -126,6 +130,7 @@ export default class ExcelTemplateAdapter extends TemplateGenerator {
               columnNamePrefixRef[cn] = 0
 
               const column: Record<string, any> = {
+                title,
                 column_name: cn,
                 ref_column_name: cn,
                 meta: {},
diff --git a/packages/nc-gui/helpers/parsers/JSONTemplateAdapter.ts b/packages/nc-gui/helpers/parsers/JSONTemplateAdapter.ts
index 726edb9fe4..f78a8a696d 100644
--- a/packages/nc-gui/helpers/parsers/JSONTemplateAdapter.ts
+++ b/packages/nc-gui/helpers/parsers/JSONTemplateAdapter.ts
@@ -90,8 +90,10 @@ export default class JSONTemplateAdapter extends TemplateGenerator {
         columns.push(...normalizedNestedColumns)
       }
     } else {
+      const title = path.join(' ').trim()
       const cn = path.join('_').replace(/\W/g, '_').trim()
       const column: Record<string, any> = {
+        title,
         column_name: cn,
         ref_column_name: cn,
         uidt: UITypes.SingleLineText,