From a28fe03264188f732d7c58f5f46bc567da7d6957 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 5 Jan 2022 16:56:30 +0530
Subject: [PATCH] fix: excel currency value import

re #884

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../templateParsers/ExcelTemplateAdapter.js   | 23 +++++++++++++++----
 packages/nocodb/src/lib/sqlUi/MysqlUi.ts      |  2 +-
 packages/nocodb/src/lib/sqlUi/PgUi.ts         |  2 +-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/import/templateParsers/ExcelTemplateAdapter.js b/packages/nc-gui/components/import/templateParsers/ExcelTemplateAdapter.js
index 78ff3fd183..2e7b0d2873 100644
--- a/packages/nc-gui/components/import/templateParsers/ExcelTemplateAdapter.js
+++ b/packages/nc-gui/components/import/templateParsers/ExcelTemplateAdapter.js
@@ -49,11 +49,11 @@ export default class ExcelTemplateAdapter extends TemplateGenerator {
       const rows = XLSX.utils.sheet_to_json(ws, { header: 1, blankrows: false, cellDates: true, defval: null })
 
       // const colLen = Math.max()
-
       for (let col = 0; col < rows[0].length; col++) {
         let cn = ((rows[0] && rows[0][col] && rows[0][col].toString().trim()) ||
           `field${col + 1}`).replace(/\W/g, '_').trim()
 
+        // todo: look for duplicate
         if (cn in columnNamePrefixRef) {
           cn = `${cn}${++columnNamePrefixRef[cn]}`
         } else {
@@ -63,6 +63,8 @@ export default class ExcelTemplateAdapter extends TemplateGenerator {
           cn
         }
 
+        table.columns.push(column)
+
         // const cellId = `${col.toString(26).split('').map(s => (parseInt(s, 26) + 10).toString(36).toUpperCase())}2`;
         const cellId = XLSX.utils.encode_cell({
           c: range.s.c + col,
@@ -86,7 +88,9 @@ export default class ExcelTemplateAdapter extends TemplateGenerator {
             if (checkboxType.length === 1) {
               column.uidt = UITypes.Checkbox
             } else {
+              // todo: optimize
               vals = vals.filter(v => v !== null && v !== undefined).map(v => v.toString().trim())
+                .filter((v, i, arr) => i === arr.findIndex(v1 => v.toLowerCase() === v1.toLowerCase()))
 
               // check column is multi or single select by comparing unique values
               // todo:
@@ -128,31 +132,40 @@ export default class ExcelTemplateAdapter extends TemplateGenerator {
           if (rows.slice(1, this.config.maxRowsToParse).every((v, i) => {
             const cellId = XLSX.utils.encode_cell({
               c: range.s.c + col,
-              r: i + 2
+              r: i + 1
             })
 
             const cellObj = ws[cellId]
-
             return !cellObj || (cellObj.w && cellObj.w.split(' ').length === 1)
           })) {
             column.uidt = UITypes.Date
           }
         }
-
-        table.columns.push(column)
       }
 
+      let rowIndex = 0
       for (const row of rows.slice(1)) {
         const rowData = {}
         for (let i = 0; i < table.columns.length; i++) {
           if (table.columns[i].uidt === UITypes.Checkbox) {
             rowData[table.columns[i].cn] = getCheckboxValue(row[i])
+          } else if (table.columns[i].uidt === UITypes.Currency) {
+            console.log(table.columns[i], table.columns[i].uidt === UITypes.Currency)
+
+            const cellId = XLSX.utils.encode_cell({
+              c: range.s.c + i,
+              r: rowIndex + 1
+            })
+
+            const cellObj = ws[cellId]
+            rowData[table.columns[i].cn] = (cellObj && cellObj.w && cellObj.w.replace(/[^\d.]+/g, '')) || row[i]
           } else {
             // toto: do parsing if necessary based on type
             rowData[table.columns[i].cn] = row[i]
           }
         }
         this.data[sheet].push(rowData)
+        rowIndex++
       }
       this.project.tables.push(table)
     }
diff --git a/packages/nocodb/src/lib/sqlUi/MysqlUi.ts b/packages/nocodb/src/lib/sqlUi/MysqlUi.ts
index 1c164acea3..7ffe23cf3d 100644
--- a/packages/nocodb/src/lib/sqlUi/MysqlUi.ts
+++ b/packages/nocodb/src/lib/sqlUi/MysqlUi.ts
@@ -1006,7 +1006,7 @@ export class MysqlUi {
         };
         break;
       case 'Number':
-        colProp.dt = 'int';
+        colProp.dt = 'bigint';
         break;
       case 'Decimal':
         colProp.dt = 'decimal';
diff --git a/packages/nocodb/src/lib/sqlUi/PgUi.ts b/packages/nocodb/src/lib/sqlUi/PgUi.ts
index 0cc09078e9..68f71620e8 100644
--- a/packages/nocodb/src/lib/sqlUi/PgUi.ts
+++ b/packages/nocodb/src/lib/sqlUi/PgUi.ts
@@ -1630,7 +1630,7 @@ export class PgUi {
         };
         break;
       case 'Number':
-        colProp.dt = 'int8';
+        colProp.dt = 'bigint';
         break;
       case 'Decimal':
         colProp.dt = 'decimal';