@mixd-id/web-scaffold 0.1.240411104 → 0.1.240411105

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.240411104",
+  "version": "0.1.240411105",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/utils/importer.js

@@ -32,6 +32,10 @@ const getCellText = (cell, image) => {
 
 const cellKey = (row, col) => row + ',' + col
 
+// Header labels often carry stray padding in the source file ("TEKS PROGRAM "),
+// normalise them so the column mapping does not depend on it
+const columnName = (value) => `${value ?? ''}`.trim()
+
 // Maps the cell an image is anchored on to its media entry ({ buffer, extension, name }).
 // Only the top left anchor counts, an image spilling over its neighbours stays on one cell.
 const getWorksheetImages = (workbook, worksheet) => {
@@ -118,10 +122,10 @@ const analyseRequest = async(req) => {
     header.eachCell((cell) => {
       if(cell.isMerged){
         const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
-        columns.push(cell.value + '>' + sub)
+        columns.push(columnName(cell.value) + '>' + columnName(sub))
       }
       else{
-        columns.push(cell.value)
+        columns.push(columnName(cell.value))
       }
     })
 
@@ -190,11 +194,11 @@ const importRequest = async(req) => {
     header.eachCell((cell, index) => {
       if(cell.isMerged){
         const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
-        columnAddress[cell.value + '>' + sub] = index
+        columnAddress[columnName(cell.value) + '>' + columnName(sub)] = index
         rowStart = 3
       }
       else{
-        columnAddress[cell.value] = index
+        columnAddress[columnName(cell.value)] = index
       }
     })
 
@@ -227,8 +231,9 @@ const importRequest = async(req) => {
         let isItalic = false
         for(let idx in keys){
           const key = keys[idx]
-          if(key.value && columnAddress[key.value]){
-            const cell = row.getCell(columnAddress[key.value])
+          const address = columnAddress[columnName(key.value)]
+          if(key.value && address){
+            const cell = row.getCell(address)
             if(cell.font && cell.font.italic){
               isItalic = true
               break
@@ -243,9 +248,10 @@ const importRequest = async(req) => {
       if(keys){
         for(let idx in keys){
           const key = keys[idx]
-          if(key.value && columnAddress[key.value]){
-            const cell = row.getCell(columnAddress[key.value])
-            obj[key.key] = getCellText(cell, cellImages.get(cellKey(index, columnAddress[key.value])))
+          const address = columnAddress[columnName(key.value)]
+          if(key.value && address){
+            const cell = row.getCell(address)
+            obj[key.key] = getCellText(cell, cellImages.get(cellKey(index, address)))
           }
         }
       }