zet-lib 3.3.6 → 4.0.0

package/lib/connection.js

@@ -414,15 +414,12 @@ connection.delete = async (obj) => {
 }
 
 connection.insertData = async(tableName, data) => {
-  let pgPool;
   try {
     // Validasi input
     if (!data || typeof data !== 'object') {
       throw new Error('Invalid data provided for insert');
     }
 
-    pgPool = new Pool(configPG);
-
     const columns = Object.keys(data);
     if (columns.length === 0) {
       throw new Error('No columns found in the data object');
@@ -435,29 +432,23 @@ connection.insertData = async(tableName, data) => {
             RETURNING *
         `;
     const values = columns.map(col => data[col]);
-    const result = await pgPool.query(insertQuery, values);
+    const result = await pool.query(insertQuery, values);
     console.log(`Successfully inserted 1 record into ${tableName}`);
     return result.rows[0];
   } catch (error) {
     console.error(`Error inserting record into ${tableName}:`, error);
     throw error;
   } finally {
-    if (pgPool) {
-      await pgPool.end();
-    }
   }
 }
 
 connection.deleteData = async(tableName, where) => {
-  let pgPool;
   try {
     // Validasi input
     if (!where || typeof where !== 'object') {
       throw new Error('Invalid where clause provided for delete');
     }
 
-    pgPool = new Pool(configPG);
-
     const whereColumns = Object.keys(where);
     if (whereColumns.length === 0) {
       throw new Error('No where conditions provided for delete');
@@ -470,21 +461,17 @@ connection.deleteData = async(tableName, where) => {
             RETURNING *
         `;
     const values = whereColumns.map(col => where[col]);
-    const result = await pgPool.query(deleteQuery, values);
+    const result = await pool.query(deleteQuery, values);
     console.log(`Successfully deleted ${result.rowCount} records from ${tableName}`);
     return result.rowCount;
   } catch (error) {
     console.error(`Error deleting records from ${tableName}:`, error);
     throw error;
   } finally {
-    if (pgPool) {
-      await pgPool.end();
-    }
   }
 }
 
 connection.insertMultipleRecords = async(tableName,records) => {
-  let pgPool;
   try {
     // Validasi input
     if (!records || !Array.isArray(records) || records.length === 0) {
@@ -492,8 +479,6 @@ connection.insertMultipleRecords = async(tableName,records) => {
       return [];
     }
 
-    pgPool = new Pool(configPG);
-
     // Validasi bahwa semua records memiliki struktur yang sama
     const firstRecord = records[0];
     if (!firstRecord || typeof firstRecord !== 'object') {
@@ -528,16 +513,13 @@ connection.insertMultipleRecords = async(tableName,records) => {
             RETURNING *
         `;
     const values = records.flatMap(record => columns.map(col => record[col]));
-    const result = await pgPool.query(insertQuery, values);
+    const result = await pool.query(insertQuery, values);
     console.log(`Successfully inserted ${records.length} records into ${tableName}`);
     return result.rows;
   } catch (error) {
     console.error(`Error inserting multiple records into ${tableName}:`, error);
     throw error;
   } finally {
-    if (pgPool) {
-      await pgPool.end();
-    }
   }
 }
 

package/lib/index.js

@@ -50,7 +50,11 @@ const lazyModules = {
     return require("exceljs");
   },
   get pm2() {
-    return require("pm2");
+    try {
+      return require("pm2");
+    } catch (e) {
+      return null;
+    }
   },
   get nodemailer() {
     return require("nodemailer");

package/lib/optionalPm2.js

@@ -0,0 +1,14 @@
+let pm2Module
+let attempted = false
+
+module.exports = function getPm2 () {
+  if (attempted) return pm2Module
+  attempted = true
+  try {
+    pm2Module = require('pm2')
+  } catch (e) {
+    pm2Module = null
+  }
+  return pm2Module
+}
+

package/lib/views/zgenerator/routerApp.ejs

@@ -1,359 +1,359 @@
-const router = require('express').Router();
-const {csrf} = require('zet-lib');
-const csrfProtection = csrf({cookie: true});
-const {Util, access, connection, moduleLib, zDebug, zRoute, zRole, zDataTable, zForm} = require('zet-lib');
-const MYMODEL = require('./../models/[[[TABLE_NAME]]]');
-
-router.get('/', async (req, res) => {
-    await zRoute.attributeData(res, MYMODEL);
-    let dataTable = new zDataTable(res.locals);
-    dataTable.filterMODEL = await zRoute.dataTableFilterSync(req,res, MYMODEL, res.locals.gridFilter);
-    const levels = zRole.myLevel(req, res, MYMODEL.table);
-    dataTable.levels = levels;
-    res.render(`layouts/${layout}`, {
-        dataTable: dataTable,
-        levels : levels,
-        titleHeader: `<strong class="text text-info">${MYMODEL.title}</strong>`,
-        breadcrumb : zForm.breadcrumbIndex(),
-        myModal : zForm.modal({
-        attributeData: res.locals.attributeData,
-        visibles: res.locals.visibles,
-        invisibles: res.locals.invisibles,
-        routeName: MYMODEL.table,
-        }, LANGUAGE),
-        renderHead: `${MYMODEL.routeName}/indexcss.ejs`,
-        renderBody: `${MYMODEL.routeName}/index.ejs`,
-        renderEnd: `${MYMODEL.routeName}/indexjs.ejs`
-    });
-});
-
-router.post('/list', async (req, res) => {
-    const data = await zRoute.listData(req, res, MYMODEL, zRole);
-    res.json(data);
-});
-
-router.get('/create', csrfProtection, async(req, res) => {
-    let data = MYMODEL.datas;
-    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
-    res.render(`layouts/${layout}`, {
-        data: data,
-        zForms: zForms,
-        titleHeader: `${LANGUAGE['form_create']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        csrfToken: req.csrfToken(),
-        breadcrumb : zForm.breadcrumbCreate(MYMODEL.routeName),
-        renderBody: `${MYMODEL.routeName}/create.ejs`,
-        renderEnd: `${MYMODEL.routeName}/createjs.ejs`
-    });
-});
-
-router.post('/create', csrfProtection, async (req, res) => {
-    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
-    try {
-        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
-        const validator = zRoute.validator(data, MYMODEL);
-        if(validator.status == 0) return res.json(validator.message);
-        const result = await zRoute.insertSQL(req, res, MYMODEL.table, data);
-        json.data=result;
-    } catch (err) {
-        if(Object.hasOwn(err,"sqlMessage")){
-            json = Util.flashError(err.sqlMessage);
-        } else {
-            json = Util.flashError(err.toString());
-        }
-        zDebug(req, res, err);
-    }
-    res.json(json);
-});
-
-router.get('/update/:id', csrfProtection, async (req, res) => {
-    const id = parseInt(req.params.id);
-    const results = await connection.results({
-        select:zRoute.selectData(MYMODEL),
-        table: MYMODEL.table,
-        where: {
-            id: id,
-            company_id: res.locals.companyId
-        }
-    });
-    if (results.length == 0) {
-        req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-        return res.redirect('/' + MYMODEL.routeName);
-    }
-    let data = results[0];
-    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
-    res.render(`layouts/${layout}`, {
-        data: data,
-        zForms: zForms,
-        titleHeader: `${LANGUAGE['form_update']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        csrfToken: req.csrfToken(),
-        breadcrumb : zForm.breadcrumbUpdate(MYMODEL.routeName, id),
-        renderBody: `${MYMODEL.routeName}/update.ejs`,
-        renderEnd: `${MYMODEL.routeName}/updatejs.ejs`,
-    });
-});
-
-router.post('/update/:id', csrfProtection, async (req, res) => {
-    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
-    try {
-        const id = parseInt(req.params.id);
-        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
-        const validator = zRoute.validator(data, MYMODEL);
-        if(validator.status == 0) return res.json(validator.message);
-        const result = await zRoute.updateSQL(req, res,MYMODEL.table, data, {id:id});
-        json.data=result;
-    } catch (err) {
-        console.log(err)
-        if(Object.hasOwn(err,"sqlMessage")){
-            json = Util.flashError(err.sqlMessage);
-        } else {
-            json = Util.flashError(err.toString());
-        }
-        zDebug(req, res, err)
-    }
-    res.json(json);
-});
-
-router.delete('/delete', async (req, res) => {
-    const id = req.body.id;
-    let json = Util.jsonSuccess(LANGUAGE['data_delete']);
-    try {
-        await zRoute.deleteSQL(MYMODEL.table, id, res.locals.companyId);
-    } catch (err) {
-        json = Util.flashError(err.toString());
-        zDebug(req, res, err)
-    }
-    res.json(json);
-});
-
-router.get('/view/:id', async (req, res) => {
-    await zRoute.attributeData(res, MYMODEL);
-    const id = req.params.id;
-    let data = {};
-    let zForms = {};
-    try {
-        const results = await connection.results({select:zRoute.selectData(MYMODEL),table:MYMODEL.table,where:{id:id}});
-        if (results.length == 0) {
-            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-            return res.redirect('/' + MYMODEL.routeName);
-        }
-        data = results[0];
-        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, data);
-    } catch (err){
-        zDebug(req, res, err);
-        res.send("Err");
-    }
-    res.render(`layouts/${layout}`, {
-        data: data,
-        Util:Util,
-        zForms:zForms,
-        titleHeader: `View : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        breadcrumb : zForm.breadcrumbView(MYMODEL.routeName),
-        levels: zRole.myLevel(req, res, MYMODEL.table),
-        renderBody: `${MYMODEL.routeName}/view.ejs`
-    });
-});
-
-router.get('/excel-query', async (req,res) => {
-    await zRoute.excelQuery(req, res, MYMODEL);
-});
-
-router.get('/excel', async (req, res) => {
-    const fields = MYMODEL.keysExcel;
-    const results = await connection.results({
-        table: MYMODEL.table,
-        where: {company_id: res.locals.companyId},
-        orderBy: ['id', 'DESC']
-    });
-    await zRoute.excel(req, res, MYMODEL, fields, results);
-});
-
-router.get('/sample', async (req, res) => {
-    let fields = [];
-    for (let i = 0; i < MYMODEL.keysExcel.length; i++) {
-        if (!Util.in_array(MYMODEL.keysExcel[i], Util.nots)) {
-            fields.push(MYMODEL.keysExcel[i]);
-        }
-    }
-    const results = await connection.results({
-        table:MYMODEL.table,
-        where:{
-            company_id:res.locals.companyId
-        },
-        orderBy:["id","desc"], limit:10
-    });
-    let callback=(result,field)=> {
-        return MYMODEL.widgets[field] && MYMODEL.widgets[field].name == 'datepicker' ? Util.dateSql(result[field]) : result[field];
-    };
-    await zRoute.excel(req, res, MYMODEL, fields, results, callback);
-});
-
-router.get('/import',csrfProtection, async (req, res) => {
-    const room = res.locals.token;
-    res.render(`layouts/${layout}`, {
-        room: room,
-        titleHeader: `Import / Upload data : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        csrfToken: req.csrfToken(),
-        breadcrumb : zForm.breadcrumbImport(MYMODEL.routeName),
-        renderBody: `${MYMODEL.routeName}/import.ejs`,
-        renderEnd: `${MYMODEL.routeName}/importjs.ejs`
-    });
-});
-
-
-router.post('/import', async(req, res) => {
-    res.json(await zRoute.import(req,res,MYMODEL));
-});
-
-router.get('/approval/:id', async (req, res) => {
-    await zRoute.attributeData(res, MYMODEL);
-    const id = req.params.id;
-    let data = {};
-    let data2 = {};
-    let zForms = {};
-    let zForms2 = {};
-    let result = {};
-    try {
-        result = await connection.result({table: MYMODEL.table, where: {id: id}});
-        if (!result.id) {
-            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-            return res.redirect('/' + MYMODEL.routeName);
-        }
-        data=result;
-        moduleLib.editor(req, res);
-        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, result);
-        const contentScript = `$("#submit_draft").on("click", function () {$("#status").val(1);ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
-            if (data.status == 0) {
-                toastr.error(data.message, data.title);
-            } else {
-                toastr.success(data.title, data.message);
-            }
-        });});
-        $("#submit").on("click", function () {
-            $('[name="zapprovals[status]"]').val(2);
-            ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
-                if (data.status == 0) {
-                    toastr.error(data.message, data.title);
-                } else {
-                    toastr.success(data.title, data.message);
-                    location.href = "";
-                }
-            });
-        });
-    `;
-        await moduleLib.addScript(req, res, contentScript);
-        const MODEL_APROVALS = require("./../models/zapprovals");
-        const rows = await connection.results({
-            table: "zapprovals",
-            where: {table: MYMODEL.table, company_id: res.locals.companyId, id_data: id}
-        });
-        if (rows.length) {
-            data2 = rows[0];
-        } else {
-            let obj = {};
-            obj.token = Util.uuid();
-            obj.status = 1;
-            obj.table = MYMODEL.table;
-            obj.company_id = res.locals.companyId;
-            obj.id_data = id;
-            obj.created_by = res.locals.userId;
-            obj.updated_by = res.locals.userId;
-            obj.created_at = Util.now();
-            let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
-            let jsonApproval = zfields.approval_json || {}
-            obj.template = jsonApproval.content || {}
-            let title = jsonApproval.title;
-            if (title) {
-                let titleData = title;
-                for (var key in data) {
-                    titleData = Util.replaceAll(titleData, "{{" + key + "}}", data[key])
-                }
-                obj.title = titleData
-            }
-            if (jsonApproval.hasOwnProperty("approvers")) {
-                obj.approvers = JSON.stringify(jsonApproval.approvers);
-                obj.knowings = JSON.stringify(jsonApproval.knowings);
-                obj.type = 1;
-            }
-            //insert default data
-            await connection.insert({table: "zapprovals", data: obj});
-            data2 = obj;
-        }
-        zForms2 = await zRoute.formsFieldSync(req, res, MODEL_APROVALS, data2);
-    } catch (err) {
-        zDebug(req, res, err);
-        res.send("Err");
-    }
-    res.render(`layouts/${layout}`, {
-        zForms: zForms,
-        zForms2: zForms2,
-        data: result,
-        result:result,
-        data2: data2,
-        Util: Util,
-        levels: zRole.myLevel(req, res, MYMODEL.table),
-        breadcrumb : zForm.breadcrumbApproval(MYMODEL.routeName, id),
-        renderBody: `${MYMODEL.routeName}/approval.ejs`
-    });
-});
-
-router.get('/preview/:token', async (req, res) => {
-    let token = req.params.token;
-    let data = {}, data2 = {};
-    let template = "";
-    let footers = "";
-    try {
-        let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
-        let jsonApproval = zfields.approval_json || {}
-        let mytemplate = jsonApproval.content || {}
-        let results = await connection.results({table: "zapprovals", where: {token: token}});
-        if (results.length == 0) {
-            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-            return res.redirect('/' + MYMODEL.routeName);
-        }
-        if(results[0].status == 1){
-            await connection.update({
-                table : "zapprovals",
-                data: {
-                    template : mytemplate
-                },
-                where : {
-                    token:token
-                }
-            })
-            results = await connection.results({table: "zapprovals", where: {token: token}});
-        }
-        let MYMODEL2 = require("./../models/zapprovals")
-        data = await zRoute.viewTable(req, res, MYMODEL2, results[0], true);
-        let row = await connection.result({table: results[0].table, where: {id: results[0].id_data}});
-        data2 = await zRoute.viewTable(req, res, MYMODEL, row, true);
-        template = data.template;
-        let title = data.title || ""
-        for (var key in data2) {
-            template = Util.replaceAll(template, "{{" + key + "}}", data2[key])
-            title = Util.replaceAll(title, "{{" + key + "}}", data2[key])
-        }
-        data.title = title;
-        var details = await connection.results({table: "zapprovals_details", where: {title_id: results[0].id}});
-        if (details.length) {
-            footers = await zRoute.approversFooter(details);
-        }
-    } catch (err) {
-        zDebug(req, res, err);
-        res.send("Err");
-    }
-    res.render(`layouts/blank`, {
-        template: template,
-        data: data,
-        footers: footers,
-        Util: Util,
-        details: details,
-        renderBody: 'index/zapprovals_preview.ejs'
-    });
-});
-
-router.post('/grid', access, zRoute.postGrid);
-router.post('/reload', access, zRoute.postGridReload);
-router.post('/chains', access, zRoute.chains);
-router.post('/get_attributes',access, zRoute.getAttributes);
-
-module.exports = router;
+const router = require('express').Router();
+const {csrf} = require('zet-lib');
+const csrfProtection = csrf({cookie: true});
+const {Util, access, connection, moduleLib, zDebug, zRoute, zRole, zDataTable, zForm} = require('zet-lib');
+const MYMODEL = require('./../models/[[[TABLE_NAME]]]');
+
+router.get('/', async (req, res) => {
+    await zRoute.attributeData(res, MYMODEL);
+    let dataTable = new zDataTable(res.locals);
+    dataTable.filterMODEL = await zRoute.dataTableFilterSync(req,res, MYMODEL, res.locals.gridFilter);
+    const levels = zRole.myLevel(req, res, MYMODEL.table);
+    dataTable.levels = levels;
+    res.render(`layouts/${layout}`, {
+        dataTable: dataTable,
+        levels : levels,
+        titleHeader: `<strong class="text text-info">${MYMODEL.title}</strong>`,
+        breadcrumb : zForm.breadcrumbIndex(),
+        myModal : zForm.modal({
+        attributeData: res.locals.attributeData,
+        visibles: res.locals.visibles,
+        invisibles: res.locals.invisibles,
+        routeName: MYMODEL.table,
+        }, LANGUAGE),
+        renderHead: `${MYMODEL.routeName}/indexcss.ejs`,
+        renderBody: `${MYMODEL.routeName}/index.ejs`,
+        renderEnd: `${MYMODEL.routeName}/indexjs.ejs`
+    });
+});
+
+router.post('/list', async (req, res) => {
+    const data = await zRoute.listData(req, res, MYMODEL, zRole);
+    res.json(data);
+});
+
+router.get('/create', csrfProtection, async(req, res) => {
+    let data = MYMODEL.datas;
+    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
+    res.render(`layouts/${layout}`, {
+        data: data,
+        zForms: zForms,
+        titleHeader: `${LANGUAGE['form_create']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        csrfToken: req.csrfToken(),
+        breadcrumb : zForm.breadcrumbCreate(MYMODEL.routeName),
+        renderBody: `${MYMODEL.routeName}/create.ejs`,
+        renderEnd: `${MYMODEL.routeName}/createjs.ejs`
+    });
+});
+
+router.post('/create', csrfProtection, async (req, res) => {
+    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
+    try {
+        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
+        const validator = zRoute.validator(data, MYMODEL);
+        if(validator.status == 0) return res.json(validator.message);
+        const result = await zRoute.insertSQL(req, res, MYMODEL.table, data);
+        json.data=result;
+    } catch (err) {
+        if(Object.hasOwn(err,"sqlMessage")){
+            json = Util.flashError(err.sqlMessage);
+        } else {
+            json = Util.flashError(err.toString());
+        }
+        zDebug(req, res, err);
+    }
+    res.json(json);
+});
+
+router.get('/update/:id', csrfProtection, async (req, res) => {
+    const id = parseInt(req.params.id);
+    const results = await connection.results({
+        select:zRoute.selectData(MYMODEL),
+        table: MYMODEL.table,
+        where: {
+            id: id,
+            company_id: res.locals.companyId
+        }
+    });
+    if (results.length == 0) {
+        req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+        return res.redirect('/' + MYMODEL.routeName);
+    }
+    let data = results[0];
+    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
+    res.render(`layouts/${layout}`, {
+        data: data,
+        zForms: zForms,
+        titleHeader: `${LANGUAGE['form_update']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        csrfToken: req.csrfToken(),
+        breadcrumb : zForm.breadcrumbUpdate(MYMODEL.routeName, id),
+        renderBody: `${MYMODEL.routeName}/update.ejs`,
+        renderEnd: `${MYMODEL.routeName}/updatejs.ejs`,
+    });
+});
+
+router.post('/update/:id', csrfProtection, async (req, res) => {
+    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
+    try {
+        const id = parseInt(req.params.id);
+        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
+        const validator = zRoute.validator(data, MYMODEL);
+        if(validator.status == 0) return res.json(validator.message);
+        const result = await zRoute.updateSQL(req, res,MYMODEL.table, data, {id:id});
+        json.data=result;
+    } catch (err) {
+        console.log(err)
+        if(Object.hasOwn(err,"sqlMessage")){
+            json = Util.flashError(err.sqlMessage);
+        } else {
+            json = Util.flashError(err.toString());
+        }
+        zDebug(req, res, err)
+    }
+    res.json(json);
+});
+
+router.delete('/delete', async (req, res) => {
+    const id = req.body.id;
+    let json = Util.jsonSuccess(LANGUAGE['data_delete']);
+    try {
+        await zRoute.deleteSQL(MYMODEL.table, id, res.locals.companyId);
+    } catch (err) {
+        json = Util.flashError(err.toString());
+        zDebug(req, res, err)
+    }
+    res.json(json);
+});
+
+router.get('/view/:id', async (req, res) => {
+    await zRoute.attributeData(res, MYMODEL);
+    const id = req.params.id;
+    let data = {};
+    let zForms = {};
+    try {
+        const results = await connection.results({select:zRoute.selectData(MYMODEL),table:MYMODEL.table,where:{id:id}});
+        if (results.length == 0) {
+            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+            return res.redirect('/' + MYMODEL.routeName);
+        }
+        data = results[0];
+        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, data);
+    } catch (err){
+        zDebug(req, res, err);
+        res.send("Err");
+    }
+    res.render(`layouts/${layout}`, {
+        data: data,
+        Util:Util,
+        zForms:zForms,
+        titleHeader: `View : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        breadcrumb : zForm.breadcrumbView(MYMODEL.routeName),
+        levels: zRole.myLevel(req, res, MYMODEL.table),
+        renderBody: `${MYMODEL.routeName}/view.ejs`
+    });
+});
+
+router.get('/excel-query', async (req,res) => {
+    await zRoute.excelQuery(req, res, MYMODEL);
+});
+
+router.get('/excel', async (req, res) => {
+    const fields = MYMODEL.keysExcel;
+    const results = await connection.results({
+        table: MYMODEL.table,
+        where: {company_id: res.locals.companyId},
+        orderBy: ['id', 'DESC']
+    });
+    await zRoute.excel(req, res, MYMODEL, fields, results);
+});
+
+router.get('/sample', async (req, res) => {
+    let fields = [];
+    for (let i = 0; i < MYMODEL.keysExcel.length; i++) {
+        if (!Util.in_array(MYMODEL.keysExcel[i], Util.nots)) {
+            fields.push(MYMODEL.keysExcel[i]);
+        }
+    }
+    const results = await connection.results({
+        table:MYMODEL.table,
+        where:{
+            company_id:res.locals.companyId
+        },
+        orderBy:["id","desc"], limit:10
+    });
+    let callback=(result,field)=> {
+        return MYMODEL.widgets[field] && MYMODEL.widgets[field].name == 'datepicker' ? Util.dateSql(result[field]) : result[field];
+    };
+    await zRoute.excel(req, res, MYMODEL, fields, results, callback);
+});
+
+router.get('/import',csrfProtection, async (req, res) => {
+    const room = res.locals.token;
+    res.render(`layouts/${layout}`, {
+        room: room,
+        titleHeader: `Import / Upload data : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        csrfToken: req.csrfToken(),
+        breadcrumb : zForm.breadcrumbImport(MYMODEL.routeName),
+        renderBody: `${MYMODEL.routeName}/import.ejs`,
+        renderEnd: `${MYMODEL.routeName}/importjs.ejs`
+    });
+});
+
+
+router.post('/import', async(req, res) => {
+    res.json(await zRoute.import(req,res,MYMODEL));
+});
+
+router.get('/approval/:id', async (req, res) => {
+    await zRoute.attributeData(res, MYMODEL);
+    const id = req.params.id;
+    let data = {};
+    let data2 = {};
+    let zForms = {};
+    let zForms2 = {};
+    let result = {};
+    try {
+        result = await connection.result({table: MYMODEL.table, where: {id: id}});
+        if (!result.id) {
+            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+            return res.redirect('/' + MYMODEL.routeName);
+        }
+        data=result;
+        moduleLib.editor(req, res);
+        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, result);
+        const contentScript = `$("#submit_draft").on("click", function () {$("#status").val(1);ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
+            if (data.status == 0) {
+                toastr.error(data.message, data.title);
+            } else {
+                toastr.success(data.title, data.message);
+            }
+        });});
+        $("#submit").on("click", function () {
+            $('[name="zapprovals[status]"]').val(2);
+            ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
+                if (data.status == 0) {
+                    toastr.error(data.message, data.title);
+                } else {
+                    toastr.success(data.title, data.message);
+                    location.href = "";
+                }
+            });
+        });
+    `;
+        await moduleLib.addScript(req, res, contentScript);
+        const MODEL_APROVALS = require("./../models/zapprovals");
+        const rows = await connection.results({
+            table: "zapprovals",
+            where: {table: MYMODEL.table, company_id: res.locals.companyId, id_data: id}
+        });
+        if (rows.length) {
+            data2 = rows[0];
+        } else {
+            let obj = {};
+            obj.token = Util.uuid();
+            obj.status = 1;
+            obj.table = MYMODEL.table;
+            obj.company_id = res.locals.companyId;
+            obj.id_data = id;
+            obj.created_by = res.locals.userId;
+            obj.updated_by = res.locals.userId;
+            obj.created_at = Util.now();
+            let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
+            let jsonApproval = zfields.approval_json || {}
+            obj.template = jsonApproval.content || {}
+            let title = jsonApproval.title;
+            if (title) {
+                let titleData = title;
+                for (var key in data) {
+                    titleData = Util.replaceAll(titleData, "{{" + key + "}}", data[key])
+                }
+                obj.title = titleData
+            }
+            if (jsonApproval.hasOwnProperty("approvers")) {
+                obj.approvers = JSON.stringify(jsonApproval.approvers);
+                obj.knowings = JSON.stringify(jsonApproval.knowings);
+                obj.type = 1;
+            }
+            //insert default data
+            await connection.insert({table: "zapprovals", data: obj});
+            data2 = obj;
+        }
+        zForms2 = await zRoute.formsFieldSync(req, res, MODEL_APROVALS, data2);
+    } catch (err) {
+        zDebug(req, res, err);
+        res.send("Err");
+    }
+    res.render(`layouts/${layout}`, {
+        zForms: zForms,
+        zForms2: zForms2,
+        data: result,
+        result:result,
+        data2: data2,
+        Util: Util,
+        levels: zRole.myLevel(req, res, MYMODEL.table),
+        breadcrumb : zForm.breadcrumbApproval(MYMODEL.routeName, id),
+        renderBody: `${MYMODEL.routeName}/approval.ejs`
+    });
+});
+
+router.get('/preview/:token', async (req, res) => {
+    let token = req.params.token;
+    let data = {}, data2 = {};
+    let template = "";
+    let footers = "";
+    try {
+        let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
+        let jsonApproval = zfields.approval_json || {}
+        let mytemplate = jsonApproval.content || {}
+        let results = await connection.results({table: "zapprovals", where: {token: token}});
+        if (results.length == 0) {
+            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+            return res.redirect('/' + MYMODEL.routeName);
+        }
+        if(results[0].status == 1){
+            await connection.update({
+                table : "zapprovals",
+                data: {
+                    template : mytemplate
+                },
+                where : {
+                    token:token
+                }
+            })
+            results = await connection.results({table: "zapprovals", where: {token: token}});
+        }
+        let MYMODEL2 = require("./../models/zapprovals")
+        data = await zRoute.viewTable(req, res, MYMODEL2, results[0], true);
+        let row = await connection.result({table: results[0].table, where: {id: results[0].id_data}});
+        data2 = await zRoute.viewTable(req, res, MYMODEL, row, true);
+        template = data.template;
+        let title = data.title || ""
+        for (var key in data2) {
+            template = Util.replaceAll(template, "{{" + key + "}}", data2[key])
+            title = Util.replaceAll(title, "{{" + key + "}}", data2[key])
+        }
+        data.title = title;
+        var details = await connection.results({table: "zapprovals_details", where: {title_id: results[0].id}});
+        if (details.length) {
+            footers = await zRoute.approversFooter(details);
+        }
+    } catch (err) {
+        zDebug(req, res, err);
+        res.send("Err");
+    }
+    res.render(`layouts/blank`, {
+        template: template,
+        data: data,
+        footers: footers,
+        Util: Util,
+        details: details,
+        renderBody: 'index/zapprovals_preview.ejs'
+    });
+});
+
+router.post('/grid', access, zRoute.postGrid);
+router.post('/reload', access, zRoute.postGridReload);
+router.post('/chains', access, zRoute.chains);
+router.post('/get_attributes',access, zRoute.getAttributes);
+
+module.exports = router;

package/lib/zAppRouter.js

@@ -18,7 +18,7 @@ const debug = require("./debug");
 const io = require("./io");
 const Mail = require("./Mail");
 const zCache = require("./zCache");
-const pm2 = require("pm2");
+const getPm2 = require("./optionalPm2");
 const zFunction = require("./zFunction");
 const qs = require("qs");
 const zip = require("express-zip");
@@ -663,6 +663,11 @@ router.get("/layout_changes/:layout", access, async (req, res) => {
 router.get("/restart", access, async (req, res) => {
   var room = res.locals.user.token;
   if (env == "production") {
+    const pm2 = getPm2();
+    if (!pm2) {
+      io.to(room).emit("error", "pm2 module is not installed");
+      return res.json("ok");
+    }
     pm2.connect(function (err) {
       if (err) {
         io.to(room).emit("error", err.toString());

package/lib/zGeneratorRouter.js

@@ -4,7 +4,7 @@ const csrf = require("./csrf");
 const csrfProtection = csrf({ cookie: true });
 const fs = require("fs-extra");
 const axios = require("axios");
-const pm2 = require("pm2");
+const getPm2 = require("./optionalPm2");
 const uglifyJS = require("uglify-js");
 const { minify } = require("html-minifier-terser");
 const zRoute = require("./zRoute");
@@ -674,6 +674,8 @@ const generate = async (req, res) => {
 
   //restart pm2 module in production
   if (process.env.NODE_ENV == "production") {
+    const pm2 = getPm2();
+    if (!pm2) return Util.jsonSuccess("Success");
     pm2.connect(function (err) {
       if (err) {
         console.log(err.toString());

package/lib/zPage.js

@@ -7,7 +7,7 @@ const fs = require('fs-extra');
 const nodemailer = require('nodemailer');
 const qs = require('qs');
 const moment = require('moment');
-const pm2 = require('pm2');
+const getPm2 = require('./optionalPm2');
 const { minify } = require('html-minifier-terser');
 const connection = require('./connection');
 const Util = require('./Util');
@@ -39,6 +39,8 @@ zpage.build = async (req, res) => {
     fs.writeFileSync(path.join(dirRoot, "routes", "zindex.js"), server_code, 'utf-8');
     if (process.env.NODE_ENV === "production") {
         setTimeout(function () {
+            const pm2 = getPm2()
+            if (!pm2) return
             pm2.connect(function (err) {
                 if (err) {
                     console.log(err.toString());
@@ -167,6 +169,8 @@ zpage.buildLayout = async (obj) => {
         fs.writeFileSync(path.join(dirRoot, "views", "layouts", name + ".ejs"), html, 'utf-8');
         if (process.env.NODE_ENV  === "production") {
             setTimeout(function () {
+                const pm2 = getPm2()
+                if (!pm2) return
                 pm2.connect(function (err) {
                     if (err) {
                         console.log(err.toString());

package/lib/zRoleRouter.js

@@ -6,7 +6,7 @@ const bodyParser = require('body-parser')
 const path = require('path')
 const parseForm = bodyParser.urlencoded({ extended: true })
 const csrfProtection = csrf({ cookie: true })
-const pm2 = require('pm2')
+const getPm2 = require('./optionalPm2')
 const env = process.env.NODE_ENV || 'development'
 const ejs = require('ejs')
 const Util = require('./Util')
@@ -99,6 +99,11 @@ router.post('/update/:id', async function (req, res, next) {
     await zCache.ROLES()
 
     if (env == 'production') {
+      const pm2 = getPm2()
+      if (!pm2) {
+        res.json(data)
+        return
+      }
       pm2.connect(function (err) {
         if (err) {
           //console.log(err.toString());

package/lib/zRoute.js

@@ -24,6 +24,7 @@ const cForm = require("./Form");
 const readXlsxFile = require("read-excel-file/node");
 //const { Dropbox } = require("dropbox");
 const zDropbox = require("./zDropbox");
+const getPm2 = require("./optionalPm2");
 
 if (typeof global.dirRoot === 'undefined') {
   global.dirRoot = Util.dirRoot;
@@ -6241,6 +6242,8 @@ module.exports = (req, res, next) => {`;
     Util.writeFile(fileSystem, templateSystem);
     if (process.env.NODE_ENV === "production") {
       setTimeout(function () {
+        const pm2 = getPm2()
+        if (!pm2) return
         pm2.connect(function (err) {
           if (err) {
             console.log(err + "");

package/lib/zViewGenerator.js

@@ -10,7 +10,7 @@ const myCache = require("./cache");
 const moduleLib = require("./moduleLib");
 const Model = require('./Model')
 const ejs = require('ejs')
-const pm2 = require("pm2");
+const getPm2 = require("./optionalPm2");
 
 if (typeof global.dirRoot === 'undefined') {
     global.dirRoot = Util.dirRoot;
@@ -515,6 +515,8 @@ const generate = async (req, res) => {
     await createAllFiles(table)
     //restart pm2 module in production
     if (process.env.NODE_ENV == 'production') {
+        const pm2 = getPm2()
+        if (!pm2) return Util.jsonSuccess('Success')
         pm2.connect(function (err) {
             if (err) {
                 console.log(err.toString())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "3.3.6",
+  "version": "4.0.0",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -28,24 +28,23 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "axios": "^1.7.9",
+    "axios": "^1.15.0",
     "convert-excel-to-json": "^1.7.0",
     "dotenv": "^16.5.0",
     "dropbox": "^10.34.0",
     "ejs": "^3.1.10",
     "exceljs": "^4.4.0",
     "express-zip": "^3.0.0",
-    "fs-extra": "^11.3.2",
+    "fs-extra": "^11.3.4",
     "html-minifier-terser": "^7.2.0",
     "isomorphic-fetch": "^3.0.0",
     "js-sha256": "^0.11.1",
     "jszip": "^3.10.1",
     "moment": "^2.30.1",
     "node-cache": "^5.1.2",
-    "nodemailer": "^6.9.4",
+    "nodemailer": "^8.0.5",
     "pg": "^8.16.3",
-    "pm2": "^5.3.1",
-    "puppeteer": "^24.33.0",
+    "puppeteer": "^24.40.0",
     "qs": "^6.14.0",
     "randomstring": "^1.3.1",
     "read-excel-file": "^5.8.0",
@@ -55,6 +54,7 @@
     "xlsx": "^0.18.5"
   },
   "optionalDependencies": {
+    "pm2": "^6.0.0",
     "sharp": "^0.34.1"
   },
   "overrides": {