@things-factory/import-ui-excel 4.3.695 → 4.3.700

package/client/bootstrap.js

@@ -3,6 +3,26 @@ import { store } from '@things-factory/shell'
 import * as XLSX from '!xlsx'
 import Excel from '!exceljs'
 
+/**
+ * Normalize cell value - handles ExcelJS hyperlink objects and other object types
+ * @param {any} cellVal - The cell value from ExcelJS
+ * @return {any} - Normalized value (string for hyperlinks, original value otherwise)
+ */
+function normalizeCellValue(cellVal) {
+  // Handle ExcelJS hyperlink objects (e.g., { text: 'email@example.com', hyperlink: 'mailto:...' })
+  if (cellVal && typeof cellVal === 'object' && !Array.isArray(cellVal)) {
+    if (cellVal.text !== undefined) {
+      return cellVal.text
+    }
+    // For other object types, try to extract a meaningful value
+    if (cellVal.toString && cellVal.toString() !== '[object Object]') {
+      return cellVal.toString()
+    }
+    return ''
+  }
+  return cellVal
+}
+
 /**
  * Convert Excel to Object
  * @param {ArrayBufferTypes} params - Array Buffer of the excel file.
@@ -14,7 +34,8 @@ async function excelToObj(params) {
 
   let ws = workbook.getWorksheet(1)
   ws._rows[0]._cells.map((cell, index) => {
-    ws._columns[index]._key = cell.name || cell.value.toLowerCase()
+    const cellValue = normalizeCellValue(cell.value)
+    ws._columns[index]._key = cell.name || (typeof cellValue === 'string' ? cellValue.toLowerCase() : '')
   })
 
   //Fetch supporting data and place it under 'extraData' object.
@@ -53,7 +74,7 @@ async function excelToObj(params) {
         columnType = ws.dataValidations?.model[currentCell._address]?.type
       }
 
-      let cellVal = currentCell ? currentCell.value : ''
+      let cellVal = currentCell ? normalizeCellValue(currentCell.value) : ''
 
       let arrColumnKeys = ws._columns[columncount].key?.split('.')
       if (arrColumnKeys.length > 1) {
@@ -70,23 +91,24 @@ async function excelToObj(params) {
                 prev[e] = cellVal ? parseFloat(cellVal) : 0
                 break
               default:
-                prev[e] = cellVal ? cellVal.toString() : null
+                prev[e] = cellVal !== null && cellVal !== undefined ? cellVal.toString() : null
                 break
             }
           }
           return prev[e]
         }, objRow)
       } else {
-        if (
-          (ws._rows[0]._cells[columncount].value === 'id' && cellVal !== '') ||
-          ws._rows[0]._cells[columncount].value !== 'id'
-        ) {
+        const headerCellValue = ws._rows[0]._cells[columncount]
+          ? normalizeCellValue(ws._rows[0]._cells[columncount].value)
+          : ''
+        if ((headerCellValue === 'id' && cellVal !== '') || headerCellValue !== 'id') {
           switch (columnType) {
             case 'decimal':
               objRow[ws._columns[columncount].key] = cellVal ? parseFloat(cellVal) : 0
               break
             default:
-              objRow[ws._columns[columncount].key] = cellVal ? cellVal.toString() : null
+              objRow[ws._columns[columncount].key] =
+                cellVal !== null && cellVal !== undefined ? cellVal.toString() : null
               break
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/import-ui-excel",
-  "version": "4.3.695",
+  "version": "4.3.700",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,5 +27,5 @@
     "@things-factory/layout-base": "^4.3.695",
     "xlsx": "^0.16.8"
   },
-  "gitHead": "7155fc08d58a626367b5fb6231b598e02919e98f"
+  "gitHead": "f1b712fc8f3a7b7b5136204e4c4fd6bfad0e766e"
 }