@mixd-id/web-scaffold 0.1.2301231332 → 0.1.2301231334

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.2301231332",
+  "version": "0.1.2301231334",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",
@@ -22,7 +22,6 @@
     "@tailwindcss/line-clamp": "^0.4.0",
     "@vueuse/core": "^9.0.2",
     "adm-zip": "^0.5.10",
-    "axios": "^0.27.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",

package/src/components/ImportModal.vue

@@ -17,15 +17,16 @@
 			</div>
 		</template>
 		<template v-slot:foot>
-			<div class="p-5" v-if="step === 2">
-				<Button type="button" class="w-[120px]" :disabled="!canImport" :state="isLoading ? 2 : 1" @click="proceedImport">Import</Button>
+			<div class="p-5 flex flex-row gap-3" v-if="step === 2">
+				<Button class="w-[120px]" :disabled="!canImport" :state="isLoading ? 2 : 1" @click="proceedImport">Import</Button>
+				<Button variant="secondary" class="w-[80px]" @click="step = 1">Back</Button>
 			</div>
 		</template>
 
 		<div class="flex-1 p-5 flex flex-col items-center justify-center" v-if="step === 1">
 			<button type="button" @click="$refs.uploader.click()" class="rounded-3xl w-[200px] bg-base-300 px-6 aspect-square flex items-center justify-center text-center border-dashed border-[3px] border-text-100">
 				<div class="text-xl" v-if="!isLoading">
-					Klik untuk <br />
+					Click to <br />
 					<span class="text-primary text-lg">Upload</span>
 					file
 				</div>
@@ -40,7 +41,7 @@
 			<br />
 			<div v-if="templateFiles.length > 0" class="flex flex-col gap-2">
 				<a v-for="(file, index) in templateFiles" :href="file" class="text-primary">
-					Download Sampel {{ templateFiles.length > 1 ? index + 1 : '' }}
+					Download Sample {{ templateFiles.length > 1 ? index + 1 : '' }}
 				</a>
 			</div>
 		</div>

package/src/utils/importer.js

@@ -23,9 +23,9 @@ const analyseRequest = async(req) => {
     const res = glob.sync(process.env.ROOT_PATH + '/storage/files/temp/' + folderName + '/**/*(*.xlsx|*.csv)')
 
     if(res.length < 1)
-      throw new ValidationError({ file: [ 'File excel atau csv tidak ditemukan' ]})
+      throw new Error('Invalid file')
     else if(res.length > 1)
-      throw new ValidationError({ file: [ 'File excel atau csv tidak melebihi 1' ]})
+      throw new Error('Invalid file')
     else{
       xlsxFile = res[0]
       xlsxFileType = xlsxFile.split('.').slice(-1).pop()
@@ -38,6 +38,7 @@ const analyseRequest = async(req) => {
     xlsxFile = process.env.ROOT_PATH + '/storage/files/temp/' + folderName + '/' + filename
   }
 
+
   const workbook = new Exceljs.Workbook();
   switch(xlsxFileType){
 
@@ -54,14 +55,17 @@ const analyseRequest = async(req) => {
       break
   }
 
-  const worksheet = workbook.worksheets.length > 0 ? workbook.getWorksheet(1) : undefined
-  if(!worksheet)
-    throw new ValidationError({ worksheet:[ 'File tidak dapat dibaca' ] })
+  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')
+
+  const worksheet = workbook.worksheets[0]
 
   const columns = []
   const header = worksheet.getRow(1)
   if(!header)
-    throw new ValidationError({ worksheet:[ 'File tidak dapat dibaca' ] })
+    throw new Error('Invalid file')
   header.eachCell((cell) => {
     columns.push(cell.value)
   })
@@ -80,7 +84,7 @@ const importRequest = async(req) => {
 
   keys.forEach((key) => {
     if (key.required && !key.value)
-      throw new ValidationError({name: ['Kolom ' + key.text + ' harus diisi']})
+      throw new Error({name: ['Kolom ' + key.text + ' harus diisi']})
   })
 
   const rows = []
@@ -101,7 +105,7 @@ const importRequest = async(req) => {
       break
   }
 
-  const worksheet = workbook.getWorksheet(1)
+  const worksheet = workbook.worksheets[0]
   worksheet.eachRow((row, index) => {
     if(index === 1){
       row.eachCell((cell, index) => {