zet-lib 1.0.15 → 1.0.17

package/lib/zPage.js

@@ -54,8 +54,7 @@ const csrfProtection = csrf({cookie: true});
 const fs = require('fs-extra');
 const qs = require('qs');
 const axios = require('axios');
-const nodemailer = require('nodemailer');
-const {zRoute, zRole, connection, Util, io, zCache, debug, moduleLib, zFunction } = require('zet-lib');
+const {zRoute, zRole, connection, Util, io, zCache, myCache, debug, moduleLib, zFunction, zFn, Mail } = require('zet-lib');
 
 `;
 };
@@ -77,7 +76,7 @@ zpage.createRoute = (obj, token, layoutObj) => {
     let renderDataforGet = "";
     let routerforGet = "";
     if (obj.method == 1) {
-        renderDataforGet = `renderData.csrfToken = req.csrfToken()`;
+        renderDataforGet = `renderData.csrfToken = req.csrfToken();`;
         routerforGet = "csrfProtection, "
     }
     let commonData = {
@@ -130,7 +129,7 @@ zpage.createRoute = (obj, token, layoutObj) => {
     }
     let scripts = `router.${METHOD[obj.method]}('${obj.page}', ${routerforGet} async(req,res) => {
     try {
-    let renderData = {}
+    let renderData = {};
     let commonData = ${JSON.stringify(commonData)};
     commonData.updated_at = Util.now();
     commonData.created_at = Util.now();

package/lib/zRoute.js

@@ -1498,6 +1498,84 @@ zRoute.dataTableSave = async (routeName, userId, body) => {
   return "ok";
 };
 
+/*
+dynamic list Data Table
+ */
+zRoute.listDataTable = async (req, res, objData = {}) => {
+  const body = req.body;
+  const MYMODEL = objData.MYMODEL || {};
+  const fields = Object.prototype.hasOwnProperty.call(objData,'fields') ? objData.fields : req.body.fields;
+  const relations = await zRoute.relations(req, res, MYMODEL.table);
+  const select = Object.prototype.hasOwnProperty.call(objData,'select') ? objData.select : Util.selectMysql(fields, relations);
+  const columns = Object.prototype.hasOwnProperty.call(objData,'columns') ? objData.columns : body.columns;
+  let whereArray = [];
+  if(objData.hasOwnProperty('whereArray')) {
+    if(typeof objData.whereArray === 'object') {
+      whereArray = objData.whereArray
+    } else if (typeof objData.whereArray) {
+      whereArray = objData.whereArray(req,res);
+    }
+  } else {
+    whereArray.push({
+      field: "company_id",
+      option: "=",
+      value: res.locals.companyId,
+      operator: "AND"
+    });
+    columns.forEach(function (item) {
+      if (item.search.value) {
+        whereArray.push({
+          field: fields[item.data],
+          option: MYMODEL.options[fields[item.data]],
+          value: item.search.value,
+          operator: "AND"
+        })
+      }
+    });
+  }
+  const orderColumn = fields[body.order[0].column] == "actionColumn" ? "id" : fields[body.order[0].column] == "no" ? "id" : fields[body.order[0].column] == "actionColum" ? "id" : fields[body.order[0].column];
+  const rows = await connection.results({
+    select: select,
+    table: MYMODEL.table,
+    whereArray: whereArray,
+    limit: body.length,
+    offset: body.start,
+    orderBy: [orderColumn, body.order[0].dir]
+  });
+  const count = await connection.result({
+    select: "count(id) as count",
+    table: MYMODEL.table,
+    whereArray: whereArray
+  });
+  let datas = [];
+  const zRole = objData.zRole || {};
+  const levels = objData.hasOwnProperty('levels') ? objData.levels : zRole.myLevel(req, res, MYMODEL.table);
+  rows.forEach(function (row, index) {
+    let arr = [];
+    fields.forEach(function (item) {
+      if (item == "no") {
+        arr.push((index + 1 + parseInt(body.start)));
+      } else if (item == "actionColumn") {
+        let buttons = objData.hasOwnProperty('actionButtons') ? objData.actionButtons(levels, row, MYMODEL.table) : zRoute.actionButtons(levels, row, MYMODEL.table);
+        arr.push(buttons);
+      } else {
+        arr.push(zRoute.dataTableData(item, row[item], MYMODEL, relations));
+      }
+    });
+    datas.push(arr)
+  });
+  const data = {
+    draw: body.draw,
+    recordsTotal: count.count || 0,
+    recordsFiltered: count.count || 0,
+    data: datas
+  };
+  //save grid filter async
+  zRoute.dataTableSave(MYMODEL.routeName, res.locals.userId, body);
+  res.json(data);
+}
+
+
 zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
   actionButtonsFn = actionButtonsFn || function () {};
   const relations = await zRoute.relations(req, res, MYMODEL.table);
@@ -3251,7 +3329,7 @@ module.exports = (req, res, next) => {`;
         if (err) {
           console.log(err.toString());
         }
-        pm2.restart(process.env.app.pm2, (err, proc) => {
+        pm2.restart(process.env.PM2_NAME, (err, proc) => {
           //io.to(room).emit("message","Restart done")
         });
       });

package/lib/zapp.js

@@ -2,8 +2,10 @@ const config = require('dotenv').config();
 module.exports = (req,res,next) => {
   res.locals.renderHead = "";
   res.locals.renderBody = "";
-  res.locals.bodyHTML = '';
   res.locals.renderEnd = "";
+  res.locals.headHTML = '';
+  res.locals.bodyHTML = '';
+  res.locals.endHTML = '';
   res.locals.titleApp = process.env.APP_TITLE;
   res.locals.descriptionApp = process.env.APP_DESCRIPTION;
   res.locals.moduleHead = "";

package/package.json

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