@mixd-id/web-scaffold 0.1.240411086 → 0.1.240411088

package/package.json

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

package/src/components/ImportModal.vue

@@ -179,6 +179,8 @@ export default{
 				data
 			})
 				.then(({ data:res }) => {
+          if(!res?.keys)
+            return this.alert('File gagal di analisa, pastikan file sesuai dengan format yang ditentukan.')
 
 					this.step = 2
 					this.importData = res
@@ -195,7 +197,7 @@ export default{
 					})
 				})
 				.catch((e) => {
-					this.alert(e.response.data)
+					this.alert(e)
 				})
 				.finally(() => {
 					this.isLoading = false

package/src/utils/importer.js

@@ -59,7 +59,6 @@ const analyseRequest = async(req) => {
     xlsxFile = process.env.ROOT_PATH + '/storage/files/temp/' + folderName + '/' + filename
   }
 
-
   const workbook = new Exceljs.Workbook();
   switch(xlsxFileType){
 
@@ -76,30 +75,40 @@ const analyseRequest = async(req) => {
       break
   }
 
-  if(workbook.worksheets.length > 1)
-    throw new Error('Number of sheet allowed within file is 1')
-  else if(workbook.worksheets.length < 1)
-    throw new Error('Unable to read worksheet')
+  if(workbook.worksheets.length < 1)
+    throw new Error('Unable to read worksheet, please check your file and try again')
 
-  const worksheet = workbook.worksheets[0]
+  const docs = []
+  let index = 0
+  for(const worksheet of workbook.worksheets){
 
-  const columns = []
-  const header = worksheet.getRow(1)
+    const columns = []
+    const header = worksheet.getRow(1)
 
-  if(!header)
-    throw new Error('Invalid file')
-  header.eachCell((cell) => {
-    if(cell.isMerged){
-      const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
-      columns.push(cell.value + '>' + sub)
-    }
-    else{
-      columns.push(cell.value)
-    }
-  })
+    header.eachCell((cell) => {
+      if(cell.isMerged){
+        const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
+        columns.push(cell.value + '>' + sub)
+      }
+      else{
+        columns.push(cell.value)
+      }
+    })
+
+    docs.push({
+      name: `${worksheet.name ?? ''}`.trim(),
+      columns,
+      index
+    })
+
+    index++
+  }
+
+  const columns = docs[0].columns
 
   return {
     columns,
+    docs,
     folderName,
     xlsxFileType,
     xlsxFile
@@ -108,14 +117,13 @@ const analyseRequest = async(req) => {
 
 const importRequest = async(req) => {
 
-  const { columns, folderName, xlsxFileType, xlsxFile, keys } = req.body
+  const { columns, docs, folderName, xlsxFileType, xlsxFile } = req.body
 
-  keys.forEach((key) => {
+  req.body.keys.forEach((key) => {
     if (key.required && !key.value)
       throw new Error({name: ['Kolom ' + key.text + ' harus diisi']})
   })
 
-  let rows = []
   const workbook = new Exceljs.Workbook();
   switch(xlsxFileType){
 
@@ -132,63 +140,85 @@ const importRequest = async(req) => {
       break
   }
 
-  const worksheet = workbook.worksheets[0]
+  for(const worksheet of workbook.worksheets){
+    const doc = docs.find(_ => _.name === worksheet.name)
 
-  const row = worksheet.getRow(2)
-  let isInfoRow = false
-  row.eachCell(cell => {
-    if((cell.value ?? '').toString().trim().startsWith('***')){
-      isInfoRow = true
+    let rows = []
+    const row = worksheet.getRow(2)
+    let isInfoRow = false
+    row.eachCell(cell => {
+      if((cell.value ?? '').toString().trim().startsWith('***')){
+        isInfoRow = true
+      }
+    })
+
+    let rowStart = isInfoRow ? 3 : 2
+    const header = worksheet.getRow(1)
+    const columnAddress = {}
+    header.eachCell((cell, index) => {
+      if(cell.isMerged){
+        const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
+        columnAddress[cell.value + '>' + sub] = index
+        rowStart = 3
+      }
+      else{
+        columnAddress[cell.value] = index
+      }
+    })
+
+    let keys = doc.index === 0 ? req.body.keys : null
+    if(!keys){
+      keys = Object.keys(columnAddress).map(key => ({
+        key: key,
+        value: key
+      }))
     }
-  })
 
-  let rowStart = isInfoRow ? 3 : 2
-  const header = worksheet.getRow(1)
-  const columnAddress = {}
-  header.eachCell((cell, index) => {
-    if(cell.isMerged){
-      const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
-      columnAddress[cell.value + '>' + sub] = index
-      rowStart = 3
-    }
-    else{
-      columnAddress[cell.value] = index
-    }
-  })
+    worksheet.eachRow((row, index) => {
+      if(index >= rowStart){
+        const obj = {}
+
+        // Check if cells in row 2 and 3 is notes in italic
+        if(index <= 3){
+          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])
+              if(cell.font && cell.font.italic){
+                isItalic = true
+                break
+              }
+            }
+          }
+
+          if(isItalic)
+            return
+        }
 
-  worksheet.eachRow((row, index) => {
-    if(index >= rowStart){
-      const obj = {}
-
-      // Check if cells in row 2 and 3 is notes in italic
-      if(index <= 3){
-        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])
-            if(cell.font && cell.font.italic){
-              isItalic = true
-              break
+        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)
             }
           }
         }
+        else{
+          //Object.assign(obj, row)
+        }
 
-        if(isItalic)
-          return
+        rows.push(unflatten(obj))
       }
+    })
 
-      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)
-        }
-      }
+    Object.assign(doc, {
+      rows
+    })
+  }
 
-      rows.push(unflatten(obj))
-    }
-  })
+  const rows = docs[0].rows
 
   const images = glob.sync(process.env.ROOT_PATH + '/storage/files/temp/' + folderName +
       '/**/*(*.jpg|*.jpeg|*.png|*.webp)')
@@ -196,9 +226,10 @@ const importRequest = async(req) => {
   return {
     ...req.body,
     rows,
+    docs,
     images,
     columns,
-    keys
+    keys: req.body.keys
   }
 }