zet-lib 1.2.73 → 1.2.75

package/lib/Form.js

@@ -153,7 +153,7 @@ Form.field = (obj) => {
       let stringvalue = value ? value.substring(13) : ''
       let trashicon = stringvalue ? `<img class="tabler-icons icons-filter-danger" src="/assets/icons/trash-filled.svg" onclick="removeimage(this)">` : ''
       displayForm = `${prepend}<input ${tabindex} type="file" accept="image/*" onchange="loadFile(this,'${obj.id}' )" data-width="${obj.width}" class="form-control ${obj.class || ''}" ${id} ${name} ${placeholder}  value="${value}" ${htmlOptions}>
-					<div  id="body${obj.id}" class="isfile"  data-id="${obj.id}" data-table="${obj.routeName}" data-width="${obj.width}"  data-name="${obj.title}" data-filename="${value}" data-required="${obj.required}"> <img class="mb-3" id="file${obj.id}" /><br><a class="text-success" target="_blank" href="/uploads/${
+					<div  id="body${obj.id}" class="isfile"  data-id="${obj.id}" data-table="${obj.routeName}" data-width="${obj.width}"  data-name="${obj.title}" data-filename="${value}" data-required="${obj.required}"> <img class="mb-3" width="${obj.width}" id="file${obj.id}" /><br><a class="text-success" target="_blank" href="/uploads/${
         obj.routeName
       }/${value}"> ${stringvalue}</a>  ${trashicon}</div>${append}`
       break

package/lib/zRoute.js

@@ -1228,11 +1228,11 @@ zRoute.selectAllowedField = (req, res, MYMODEL, arr = []) => {
 }
 
 zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
-  const cacheRole = myCache.get("ROLES")[res.locals.roleId].params;
+  const cacheRole = myCache.get('ROLES')[res.locals.roleId].params
   const levels = cacheRole[MYMODEL.table] || []
-  if(!levels.includes("export")) {
-    res.json("no access")
-    return false;
+  if (!levels.includes('export')) {
+    res.json('no access')
+    return false
   }
 
   let virtuals = []
@@ -1355,11 +1355,11 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
 
 // for excels
 zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
-  const cacheRole = myCache.get("ROLES")[res.locals.roleId].params;
+  const cacheRole = myCache.get('ROLES')[res.locals.roleId].params
   const levels = cacheRole[MYMODEL.table] || []
-  if(!levels.includes("export")) {
-    res.json("no access")
-    return false;
+  if (!levels.includes('export')) {
+    res.json('no access')
+    return false
   }
 
   //if any other custom value then callback needed
@@ -2532,7 +2532,7 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
       let val = obj.value || []
       if (val.length) {
         val.forEach(function (item) {
-          let myforms = zRoute.viewForm(req, res, MODEL, relationsTable, item, MYMODEL)
+          let myforms = zRoute.viewForm(req, res, MODEL, relationsTable, item, MYMODEL, key)
           html += `<tr>`
           for (let k in obj.data) {
             html += `<td>${cForm.field(myforms.obj[k])}</td>`
@@ -2573,7 +2573,7 @@ zRoute.viewFormSync = (req, res, MYMODEL, relations, data = {}) => {
   return forms
 }
 
-zRoute.viewForm = (req, res, MYMODEL, relations, data = {}, MODEL_TABLE = {}) => {
+zRoute.viewForm = (req, res, MYMODEL, relations, data = {}, MODEL_TABLE = {}, keyName = '') => {
   let isTableType = Object.keys(MODEL_TABLE).length > 0 ? true : false
   let forms = zRoute.forms(req, res, MYMODEL, relations, data)
   const widgets = MYMODEL.widgets
@@ -2602,7 +2602,7 @@ zRoute.viewForm = (req, res, MYMODEL, relations, data = {}, MODEL_TABLE = {}) =>
           obj[key].type = 'plaintext'
           let width = widgets[key].width || '300'
           if (isTableType) {
-            obj[key].value = Util.fileView(`/uploads/${MODEL_TABLE.routeName}/${MYMODEL.routeName}/`, data[key], {
+            obj[key].value = Util.fileView(`/uploads/${MODEL_TABLE.routeName}/${keyName}/`, data[key], {
               width: width,
               class: 'boxy',
             })
@@ -2618,7 +2618,7 @@ zRoute.viewForm = (req, res, MYMODEL, relations, data = {}, MODEL_TABLE = {}) =>
         case 'file':
           obj[key].type = 'plaintext'
           if (isTableType) {
-            obj[key].value = Util.fileView(`/uploads/${MODEL_TABLE.routeName}/${MYMODEL.routeName}/`, data[key], { withIcon: true })
+            obj[key].value = Util.fileView(`/uploads/${MODEL_TABLE.routeName}/${keyName}/`, data[key], { withIcon: true })
           } else {
             obj[key].value = '<br><br>' + Util.fileView(`/uploads/${MYMODEL.routeName}/`, data[key], { withIcon: true })
           }
@@ -3560,11 +3560,11 @@ zRoute.deleteSQL = async (table, id, company_id) => {
 
 //for import
 zRoute.import = async (req, res, MYMODEL) => {
-  const cacheRole = myCache.get("ROLES")[res.locals.roleId].params;
+  const cacheRole = myCache.get('ROLES')[res.locals.roleId].params
   const levels = cacheRole[MYMODEL.table] || []
-  if(!levels.includes("export")) {
-    res.json("no access")
-    return false;
+  if (!levels.includes('export')) {
+    res.json('no access')
+    return false
   }
 
   const userId = res.locals.userId
@@ -3757,7 +3757,7 @@ zRoute.buildForm = async (req, res) => {
   let increment = req.body.increment
   let table = req.body.table
   let keys = req.body.keys
-  let relations = JSON.parse(req.body.relations)
+  let relations = JSON.parse(req.body.relations) || {}
   let MYMODEL = MYMODELS[table] || require(`${dirRoot}/models/${table}`)
   let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table] || require(`${dirRoot}/models/${MYMODEL.widgets[keys].table}`)
   let MODEL_TABLE_RELATIONS = await zRoute.relations(req, res, MODEL_TABLE.table)
@@ -4094,7 +4094,7 @@ module.exports = (req, res, next) => {`
       setTimeout(function () {
         pm2.connect(function (err) {
           if (err) {
-            console.log(err.toString())
+            console.log(err + '')
           }
           pm2.restart(process.env.PM2_NAME, (err, proc) => {
             //io.to(room).emit("message","Restart done")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.2.73",
+  "version": "1.2.75",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -41,7 +41,7 @@
     "nodemailer": "^6.9.4",
     "pg": "^8.11.2",
     "pm2": "^5.3.1",
-    "postgres-pool": "^8.1.4",
+    "postgres-pool": "^8.1.6",
     "puppeteer": "^21.0.1",
     "qs": "^6.11.2",
     "randomstring": "^1.3.0",