zet-lib 1.2.80 → 1.2.82

package/lib/Form.js

@@ -466,7 +466,7 @@ Form.field = (obj) => {
           if (extFile.type == 'image') {
             displayForm += `<img src="${filename}" class="boxy zoom mx-2 my-2" width="200px">`
           } else {
-            displayForm += Util.fileView(`/uploads/${obj.table}/${obj.key}/`, filename, { withIcon: true })
+            displayForm += Util.fileView(`/uploads/${obj.table}/${obj.key}/`, item, { withIcon: true })
           }
         })
       }

package/lib/zAppRouter.js

@@ -1370,14 +1370,6 @@ router.post('/zapproval-update/:table', async (req, res) => {
             canUpdate = false
           }
         }
-        /*if (approval_history.length > 0) {
-          let lastStatus = +approval_history[approval_history.length - 1].status
-          canUpdate = lastStatus > +value ? false : true
-          let history = approval_history.filter((item) => item.status == value && item.user_id == res.locals.userId)
-          if (history.length > 0) {
-            canUpdate = false
-          }
-        }*/
         if (canUpdate) {
           approval_history.push({
             status: value,
@@ -1514,22 +1506,26 @@ router.get('/addapproval-models', async (req, res) => {
 
 //post dropzone widget
 router.post('/zdropzone', async (req, res) => {
-  let userId = res.locals.userId
-  console.log(req.body)
-  if (userId) {
-    let dir = `${dirRoot}/public/zdropzone/${userId}`
-    fs.ensureDir(dir, (err) => {
-      //console.log('ensureDir',err); // => null
-    })
-    let filename = req.files.file.name
-    req.files.file.mv(dir + '/' + filename, function (err) {
-      if (err) {
-        //console.log('fileempty move',err); // => null
-        return res.status(500).send(err)
+  try {
+    let userId = res.locals.userId
+    if (userId) {
+      let dir = `${dirRoot}/public/zdropzone/${userId}`
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true })
       }
-    })
+      let filename = req.files.file.name
+      req.files.file.mv(dir + '/' + filename, function (err) {
+        if (err) {
+          return res.status(500).send(err + '')
+        }
+      })
+    }
+    res.json('ok')
+  } catch (e) {
+    console.log(e)
+    res.status(500)
+    res.send(e + '')
   }
-  res.json('ok')
 })
 
 router.post('/zdropzone-remove', async (req, res) => {
@@ -1537,9 +1533,14 @@ router.post('/zdropzone-remove', async (req, res) => {
     let userId = res.locals.userId
     console.log(req.body)
     let filename = `${dirRoot}/public/zdropzone/${userId}/${req.body.file}`
-    await fs.unlink(filename)
-  } catch (e) {}
-  res.json('ok')
+    if (Util.fileExist(filename)) {
+      await fs.unlink(filename)
+    }
+    res.json('ok')
+  } catch (e) {
+    console.log(e)
+    res.status(500).send(e + '')
+  }
 })
 router.post('/zdropzone-attributes', async (req, res) => {
   try {
@@ -1548,19 +1549,24 @@ router.post('/zdropzone-attributes', async (req, res) => {
     let category = body.category
     let name = `dropzone__${userId}__${body.table}__${body.field}__${body.type}`
     let arr = []
-    if (myCache.has(name)) {
-      arr = myCache.get(name)
-    }
     if (category === 'add') {
+      if (myCache.has(name)) {
+        arr = myCache.get(name)
+      }
       arr.push(body.file)
     } else {
-      Util.arrayDelete(arr, body.file)
+      name = `dropzone__${userId}__${body.table}__${body.field}__${body.type}`
+      if (myCache.has(name)) {
+        arr = myCache.get(name)
+      }
+      arr = Util.arrayDelete(arr, body.file)
     }
     myCache.set(name, arr)
+    res.json('ok')
   } catch (e) {
     console.log(e)
+    res.status(500).send(e + '')
   }
-  res.json('ok')
 })
 
 module.exports = router

package/lib/zRoute.js

@@ -2310,6 +2310,18 @@ zRoute.forms = (req, res, MYMODEL, relations, data = {}) => {
           obj.type = 'email'
           break
         case 'dropzone':
+          let dropzone_data_arr = []
+          if (obj.value.length > 0) {
+            obj.value.map((item) => {
+              let filename = `${dirRoot}/public/uploads/${MYMODEL.table}/${key}/${item}`
+              var stats = fs.statSync(filename)
+              var fileSizeInBytes = stats.size
+              dropzone_data_arr.push({ fileName: item, size: fileSizeInBytes })
+            })
+            myCache.set(`dropzone__${res.locals.userId}__${MYMODEL.table}__${key}__${data.id}`, obj.value)
+          }
+          let dropzoneValue = obj.value.length > 0 ? JSON.stringify(dropzone_data_arr) : '[]'
+          script += `let dropzone_${key}_data = ${dropzoneValue};`
           obj.type = 'dropzone'
           obj.class = 'dropzone boxy-tiny d-block'
           break
@@ -3197,13 +3209,27 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
         })
     },
     init: function() {
-        let type = window.location.href.split("/").pop();
-        this.on("addedfile", function(file) {
+        let dz = this;
+        const type = window.location.href.split("/").pop();
+        dz.on("addedfile", function(file) {
             ajaxPost("/zdropzone-attributes",{file:file.name,'category':'add',field:"${item}",table:"${MYMODEL.table}", type:type},() => {})
         });
-        this.on("removedfile", function(file) {
-            ajaxPost("/zdropzone-attributes",{file:file.name,'category':'remove',field:"${item}",table:"${MYMODEL.table}", type:type},() => {})
+        dz.on("removedfile", function(file) {
+            ajaxPost("/zdropzone-attributes",{file:file.name,'category':'remove',field:"${item}",table:"${MYMODEL.table}", type:type},() => {});
+            $("div#${item}").find(".dz-message").remove();
         });
+        if(dropzone_${item}_data.length > 0) {
+          dropzone_${item}_data.map((item) => {
+          const mockFile = {
+                    name: item.fileName,
+                    id: item,
+                    size: item.size,
+                    accepted:true
+                }; 
+            dz.options.addedfile.call(dz, mockFile);
+            dz.options.thumbnail.call(dz, mockFile, "${process.env.APP_URL}/uploads/${MYMODEL.table}/${item}/"+item.fileName);
+          })
+        };
     }
 }); `
     })
@@ -3517,12 +3543,12 @@ zRoute.insertSQL = async (req, res, table, data) => {
   let hasDropzone = false
   for (let key in MYMODEL.widgets) {
     if (MYMODEL.widgets[key].name === 'dropzone') {
-      console.log('has dropzone')
+      //console.log('has dropzone')
       let path_src = dirRoot + '/public/zdropzone/' + userId + '/'
       let path_dest = dirRoot + '/public/uploads/' + MYMODEL.routeName + '/' + key + '/'
-      fs.ensureDir(path_dest, (err) => {
-        //console.log('ensureDir',err); // => null
-      })
+      if (!fs.existsSync(path_dest)) {
+        fs.mkdirSync(path_dest, { recursive: true })
+      }
       let name = `dropzone__${res.locals.userId}__${table}__${key}__create`
       if (myCache.has(name)) {
         let arr = myCache.get(name)
@@ -3549,11 +3575,12 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
   const MYMODELS = myCache.get('MYMODELS')
   let MYMODEL = MYMODELS[table]
   let fields = MYMODEL.keys
+  const userId = res.locals.userId
   if (fields.includes('updated_at')) {
     data.updated_at = Util.now()
   }
   if (fields.includes('updated_by')) {
-    data.updated_by = res.locals.userId
+    data.updated_by = userId
   }
   //check if has table and image/file
   let hasImages = false
@@ -3571,6 +3598,32 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
         }
       }
     }
+    if (MYMODEL.widgets[key].name === 'dropzone') {
+      //console.log('has dropzone')
+      let path_src = dirRoot + '/public/zdropzone/' + userId + '/'
+      let path_dest = dirRoot + '/public/uploads/' + MYMODEL.table + '/' + key + '/'
+      if (!fs.existsSync(path_dest)) {
+        fs.mkdirSync(path_dest, { recursive: true })
+      }
+      let name = `dropzone__${userId}__${MYMODEL.table}__${key}__${whereData.id}`
+      if (myCache.has(name)) {
+        let arr = myCache.get(name)
+        let newArr = []
+        if (arr.length > 0) {
+          let time = new Date().getTime()
+          arr.map((item) => {
+            if (!Util.fileExist(path_dest + item)) {
+              let newItem = time + item
+              newArr.push(newItem)
+              fs.rename(path_src + item, path_dest + newItem)
+            } else {
+              newArr.push(item)
+            }
+          })
+          data[key] = Util.array_to_jsonb(newArr)
+        }
+      }
+    }
   }
   let result = await connection.result({
     table: MYMODEL.table,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.2.80",
+  "version": "1.2.82",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"