zet-lib 1.0.9 → 1.0.11

package/lib/index.js

@@ -10,7 +10,6 @@ module.exports = {
     Form: require('./Form'),
     io: require('./io'),
     Mail: require('./Mail'),
-    menuGenerator: require('./menuGenerator'),
     Modal: require('./Modal'),
     moduleLib: require('./moduleLib'),
     tableForm: require('./tableForm'),
@@ -18,7 +17,6 @@ module.exports = {
     zComponent: require('./zComponent'),
     zFn: require('./zFn'),
     zFunction: require('./zFunction'),
-    zMenuCollections: require('./zMenuCollections'),
     zMenuRouter: require('./zMenuRouter'),
     zReport: require('./zReport'),
     zRoute: require('./zRoute'),

package/lib/moduleLib.js

@@ -22,7 +22,7 @@ m.ide = function (req,res,elem) {
     let head = ``;
     let end = ``;
     elem = elem || "#ide_editor";
-        end += `<script>   var editor_${elem} = ace.edit("${elem}");
+    end += `<script>   var editor_${elem} = ace.edit("${elem}");
     editor_${elem}.getSession().setMode("ace/mode/ejs");
      </script> ${Util.newLine}`;
     return {
@@ -50,8 +50,8 @@ m.datepicker = function (req, res, elem) {
     let head = ``;
     let end = ``;
     elem = elem || ".datepicker";
-      /*  head += '<link href="/css/bootstrap-datepicker.css" rel="stylesheet">';
-        end += '<script src="/js/bootstrap-datepicker.min.js"></script>';*/
+    /*  head += '<link href="/css/bootstrap-datepicker.css" rel="stylesheet">';
+      end += '<script src="/js/bootstrap-datepicker.min.js"></script>';*/
     head += '<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css" rel="stylesheet">';
     end += '<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js"></script>';
     script = `$.fn.datepicker.defaults.format = "yyyy-mm-dd";$.fn.datepicker.defaults.todayHighlight = true;$("body").on("click", "${elem}", function(){$(this).datepicker();$(this).datepicker("show");});`;
@@ -69,12 +69,12 @@ m.datetimepicker = function (req, res, elem) {
     let head = ``;
     let end = ``;
     elem = elem || ".datetimepicker";
-        head += '<link href="/css/bootstrap-datetimepicker.min.css" rel="stylesheet" />';
-        end += '<script type="text/javascript" src="/js/moment-with-locales.min.js" ></script>';
-        end += '<script type="text/javascript" src="/js/bootstrap-datetimepicker.min.js" ></script>';
-        script += `$(function () { $("${elem}").datetimepicker({format:'YYYY-MM-DD hh:mm:ss'}); });`;
-        script += `setTimeout(function () { $("body").click();},1000);`;
-        script += `$("body").on("click", function(){$("${elem}").datetimepicker({format:'YYYY-MM-DD hh:mm:ss'});});`;
+    head += '<link href="/css/bootstrap-datetimepicker.min.css" rel="stylesheet" />';
+    end += '<script type="text/javascript" src="/js/moment-with-locales.min.js" ></script>';
+    end += '<script type="text/javascript" src="/js/bootstrap-datetimepicker.min.js" ></script>';
+    script += `$(function () { $("${elem}").datetimepicker({format:'YYYY-MM-DD hh:mm:ss'}); });`;
+    script += `setTimeout(function () { $("body").click();},1000);`;
+    script += `$("body").on("click", function(){$("${elem}").datetimepicker({format:'YYYY-MM-DD hh:mm:ss'});});`;
 
 
     return {
@@ -171,6 +171,7 @@ m.editor = (req, res, elem = "") => {
     let head = ``;
     let end = ``;
 
+    head += '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.4.2/css/all.min.css" integrity="sha512-NicFTMUg/LwBeG8C7VG+gC4YiiRtQACl98QdkmfsLy37RzXdkaUAuPyVMND0olPP4Jn8M/ctesGSB2pgUBDRIw==" crossorigin="anonymous" referrerpolicy="no-referrer" />';
     head += '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />';
     head += '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_style.min.css" rel="stylesheet" type="text/css" />';
     end += '<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/js/froala_editor.pkgd.min.js"></script>';
@@ -273,8 +274,8 @@ m.typeahead = (req, res, elem, data) => {
     let element = elem.replace("Typeahead", "");
 
     script += 'const ' + elemData + 'Data = ' + JSON.stringify(data.filter(function (value, index, arr) {
-            return index > 0;
-        })) + ';' + newLine;
+        return index > 0;
+    })) + ';' + newLine;
     script += `$("body").on("change", "${elem}", function(){
             var current = $("${elem}").typeahead("getActive");
             if(current){

package/lib/zCache.js

@@ -151,7 +151,7 @@ zCache.ZFUNCTIONS = async() => {
         let obj = Util.arrayToObject(results, "title");
         await myCache.set("ZFUNCTIONS", obj);
         //add to version after set
-        zCache.updateVersions("ZFUNCTIONS")
+        zCache.updateVersions("ZFUNCTIONS");
     }
 };
 

package/lib/zRole.js

@@ -95,7 +95,6 @@ a.menuAccess = (res, menu) => {
             return true;
         }
     }
-
     return false;
 };
 
@@ -129,7 +128,7 @@ a.access = (req, res, next) => {
         if (isAccess) {
             next();
         } else {
-            if(a.isAccess(res.locals.roleId,"zrole","index")) {
+            if(a.isAccess(res.locals.roleId,'zrole','index')) {
                 req.session.sessionFlash = Util.flashError(LANGUAGE.no_access);
                 res.redirect(`${process.env.APP_AFTER_LOGIN}?setup=role`)
             } else {
@@ -139,5 +138,108 @@ a.access = (req, res, next) => {
     }
 };
 
+a.menu = (req, res) => {
+    let jsonArray = [];
+    if (!res.locals.isLogin) return jsonArray;
+    let companyId = res.locals.companyId;
+    let userId = res.locals.userId;
+    let jsonMenu = myCache.get("MENU");
+    let arr = [];
+    if (jsonMenu && jsonMenu.hasOwnProperty(companyId)) {
+        arr = jsonMenu[companyId] || [];
+    }
+    arr.map((me) => {
+        if (a.menuAccess(res, me.href)) {
+            let obj = a.addItemMenu(me);
+            if (me.hasOwnProperty("children")) {
+                obj.children = a.childrenMenu(res, me.children);
+                if(obj.children.length) {
+                    jsonArray.push(obj);
+                }
+            } else {
+                jsonArray.push(obj);
+            }
+        }
+    });
+
+    return jsonArray;
+};
+
+a.menuSystems = (req,res) => {
+    let arr = [];
+    let menus = myCache.get("MENU_SYSTEMS");
+    let children = [];
+    menus["users"].forEach(function (item) {
+        if (a.menuAccess(res, item.href)) {
+            children.push(item);
+        }
+    });
+    if(children.length == 0) {
+        delete menus.users;
+    } else {
+        let userManagament = {
+            text: "Users",
+            icon: "tabler-users-plus",
+            children: children
+        };
+        arr.push(userManagament);
+    }
+    children = [];
+    menus["systems"].forEach(function (item) {
+        if (a.menuAccess(res, item.href)) {
+            children.push(item);
+        }
+    });
+    if(children.length == 0) {
+        delete menus.systems;
+    } else {
+        let settings = {
+            text: "Systems",
+            icon: "tabler-settings-check",
+            children: children
+        };
+        arr.push(settings);
+    }
+    return arr;
+};
+
+a.menus = (req, res) => {
+    let arr = a.menu(req, res);
+    return  [...arr, ...a.menuSystems(req, res)];
+};
+
+a.addItemMenu = (obj) => {
+    let newObj = {};
+    for (const key in obj) {
+        if (key != "children") {
+            newObj[key] = obj[key];
+        }
+    }
+    return newObj;
+};
+
+a.childrenMenu = (res, arr) => {
+    let myArr = [];
+    let nArr = arr.reduce((result, item) => [...result, item.href],[]);
+    let isAccess =  a.menuAccess(res, nArr);
+    if (isAccess) {
+        //stupid way
+        arr.map((item) => {
+            let obj = {};
+            if(a.isAccess(res.locals.roleId,item.href,"index")) {
+                obj = a.addItem(item);
+                if (item.hasOwnProperty("children") && item.children.length) {
+                    let child = [];
+                    child.push(a.children(res, item.children));
+                    if (child[0]) {
+                        obj.children = child[0];
+                    }
+                }
+                myArr.push(obj)
+            }
+        });
+    }
+    return myArr;
+};
 
 module.exports = a;

package/lib/zRoute.js

@@ -3225,4 +3225,36 @@ zRoute.modelsCacheRenew =  (table, companyId) => {
     }
 };
 
+zRoute.makeFunctionsSystem = () => {
+    let obj = myCache.get("ZFUNCTIONS");
+    let content = ``;
+    for(let key in obj) {
+        if(obj[key].systems == 1) {
+            content += obj[key].code;
+            content += Util.newLine;
+        }
+    }
+    let templateSystem = `const {zRole, zCache, myCache, Util, io, moment, Mail} = require('zet-lib');
+module.exports = (req, res, next) => {`;
+    let fileSystem = `${dirRoot}/components/zFunctionsSystem.js`;
+    templateSystem += content;
+    templateSystem += `  next();
+};
+`;
+
+    Util.writeFile(fileSystem, templateSystem);
+    if(process.env.NODE_ENV === 'production') {
+        setTimeout(function () {
+            pm2.connect(function (err) {
+                if (err) {
+                    console.log(err.toString());
+                }
+                pm2.restart(process.env.app.pm2, (err, proc) => {
+                    //io.to(room).emit("message","Restart done")
+                });
+            });
+        }, 3000)
+    }
+}
+
 module.exports = zRoute;

package/lib/zapp.js

@@ -1,6 +1,4 @@
 const config = require('dotenv').config();
-const dirRoot = process.env.dirRoot;
-const menuGenerator = require('./menuGenerator');
 module.exports = (req,res,next) => {
   res.locals.renderHead = "";
   res.locals.renderBody = "";
@@ -21,8 +19,7 @@ module.exports = (req,res,next) => {
   res.locals.userId = 0;
   res.locals.userAvatar = "/img/user.png";
   res.locals.zuser = {
-    fullname: 'test',
-    role: {name: "test"}
+    fullname: 'test'
   };
   res.locals.frameworkcss = "bootstrap5";
   res.locals.startup = 0;
@@ -32,17 +29,11 @@ module.exports = (req,res,next) => {
   res.locals.zcompanies = [];
   res.locals.isLogin = false;
   res.locals.objectStores = {};
-  res.locals.MENU = [];
-  res.locals.MENU_SYSTEMS = [];
-  res.locals.MENU_ALL = [];
   if (req.session) {
     let reqSession = req.session;
     if (reqSession.hasOwnProperty('user')) {
       const tUser = req.session.user;
       if (tUser && Object.prototype.hasOwnProperty.call(tUser, "id")) {
-        tUser.role = {
-          name: "Admin"
-        };
         res.locals.isLogin = true;
         res.locals.token = tUser.token;
         res.locals.roleId = tUser.role_id;
@@ -64,17 +55,10 @@ module.exports = (req,res,next) => {
         global.layout = "two";
       }
     }
-    res.locals.MENU = menuGenerator.menu(req, res);
-    res.locals.MENU_SYSTEMS = menuGenerator.systems(req, res);
-    res.locals.MENU_ALL = menuGenerator.menuPlus(req, res);
   }
   global.COMPANY_ID = res.locals.companyId;
   global.USER_ID = res.locals.userId;
   res.locals.LANGUAGE = global.LANGUAGE;
-  res.locals.currency = {};
-  res.locals.settings = {};
-  res.locals.sessionFlash = req.session.sessionFlash;
-  delete req.session.sessionFlash;
-  res.locals.sessionFlashc = req.session.sessionFlashc;
+
   next();
 };

package/package.json

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

package/lib/menuGenerator.js

@@ -1,236 +0,0 @@
-/**
- * Created by ANDHIE on 2/28/2021.
- */
-const myCache = require("./cache");
-const zRole = require("./zRole");
-const connection = require("./connection");
-const fs = require("fs-extra");
-const config = require('dotenv').config();
-const dirRoot = process.env.dirRoot;
-const pm2 = require('pm2');
-const menuGenerator = {};
-
-menuGenerator.addItem = (obj) => {
-    let newObj = {};
-    for (const key in obj) {
-        if (key != "children") {
-            newObj[key] = obj[key];
-        }
-    }
-    return newObj;
-};
-
-menuGenerator.children = (res, arr) => {
-    let myArr = [];
-    let nArr = arr.reduce((result, item) => [...result, item.href],[]);
-    let isAccess =  zRole.menuAccess(res, nArr);
-    if (isAccess) {
-        //stupid way
-        arr.map((item) => {
-            let obj = {};
-            if(zRole.isAccess(res.locals.roleId,item.href,"index")) {
-                obj = menuGenerator.addItem(item);
-                if (item.hasOwnProperty("children") && item.children.length) {
-                    let child = [];
-                    child.push(menuGenerator.children(res, item.children));
-                    if (child[0]) {
-                        obj.children = child[0];
-                    }
-                }
-                myArr.push(obj)
-            }
-        });
-    }
-    return myArr;
-};
-
-menuGenerator.menu = (req, res) => {
-    let jsonArray = [];
-    if (!res.locals.isLogin) return jsonArray;
-    let companyId = res.locals.companyId;
-    let userId = res.locals.userId;
-    let jsonMenu = myCache.get("MENU");
-    let arr = [];
-    if (jsonMenu && jsonMenu.hasOwnProperty(companyId)) {
-        arr = jsonMenu[companyId] || [];
-    } else {
-        arr = menuGenerator.arr; //set to default menu
-    }
-    arr.map((me) => {
-        if (zRole.menuAccess(res, me.href)) {
-            let obj = menuGenerator.addItem(me);
-            if (me.hasOwnProperty("children")) {
-                obj.children = menuGenerator.children(res, me.children);
-                if(obj.children.length) {
-                    jsonArray.push(obj);
-                }
-            } else {
-                jsonArray.push(obj);
-            }
-        }
-    });
-
-    return jsonArray;
-};
-
-menuGenerator.systems = (req,res) => {
-    let arr = [];
-    let menus = myCache.get("MENU_SYSTEMS");
-    let children = [];
-    menus["users"].forEach(function (item) {
-        if (zRole.menuAccess(res, item.href)) {
-            children.push(item);
-        }
-    });
-    if(children.length == 0) {
-        delete menus.users;
-    } else {
-        let userManagament = {
-            text: "Users",
-            icon: "tabler-users-plus",
-            children: children
-        };
-        arr.push(userManagament);
-    }
-    children = [];
-    menus["systems"].forEach(function (item) {
-        if (zRole.menuAccess(res, item.href)) {
-            children.push(item);
-        }
-    });
-    if(children.length == 0) {
-        delete menus.systems;
-    } else {
-        let settings = {
-            text: "Systems",
-            icon: "tabler-settings-check",
-            children: children
-        };
-        arr.push(settings);
-    }
-    return arr;
-};
-
-menuGenerator.menuPlus = (req, res) => {
-    let arr = menuGenerator.menu(req, res);
-    return  [...arr, ...menuGenerator.systems(req, res)];
-};
-
-menuGenerator.html = (req, res) => {
-    let html = "";
-    let arr = menuGenerator.menu(req, res);
-    let span = "";
-    let dropdown = "";
-    let test = "";
-    arr.map((me) => {
-        let href = me.href == "" ? "#" : "/" + me.href;
-        if (me.hasOwnProperty("children") && me.children.length) {
-            dropdown = `class="dropdown"`;
-            span = `<span class="caret"></span>`;
-            test = `class="test"`;
-        } else {
-            dropdown = "", span = "", test = "";
-        }
-        html += `<li ${dropdown}>`;
-        html += `<a href="${href}" title="${me.title}" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="${me.icon} fa-fw"></i> ${me.text}${span}</a>`;
-
-        if (me.hasOwnProperty("children") && me.children.length) {
-            html += `<ul class="dropdown-menu">`;
-            let children = me.children;
-
-            //1 child
-            children.map((item) => {
-                if (item.hasOwnProperty("children")) {
-                    dropdown = `class="dropdown-submenu"`;
-                    span = `<span class="caret"></span>`;
-                    test = `class="test"`;
-                } else {
-                    dropdown = "", span = "", test = "";
-                }
-
-                href = item.href == "" ? "#" : "/" + item.href;
-                html += `<li ${dropdown}><a ${test} title="${item.title}" tabindex="-1" href="${href}"><i class="${item.icon} fa-fw"></i> ${item.text}${span}</a>`;
-
-                //2 child
-                if (item.hasOwnProperty("children") && me.children.length) {
-                    html += `<ul class="dropdown-menu">`;
-                    item.children.map((child) => {
-                        if (child.hasOwnProperty("children")) {
-                            dropdown = `class="dropdown-submenu"`;
-                            span = `<span class="caret"></span>`;
-                            test = `class="test"`;
-                        } else {
-                            dropdown = "", span = "", test = "";
-                        }
-
-                        href = child.href == "" ? "#" : "/" + child.href;
-                        html += `<li ${dropdown}><a title="${child.title}" ${test} tabindex="-1" href="${href}"><i class="${child.icon} fa-fw"></i>  ${child.text}${span}</a>`;
-
-
-                        if (child.hasOwnProperty("children") && me.children.length) {
-                            html += `<ul class="dropdown-menu">`;
-                            child.children.map((child2) => {
-                                href = child2.href == "" ? "#" : "/" + child2.href;
-
-                                html += `<li><a title="${child2.title}" tabindex="-1" href="${href}"><i class="${child2.icon} fa-fw"></i>  ${child2.text}</a>`;
-                            });
-
-                            //end 3 child
-                            html += '</ul>';
-                        }
-                    });
-                    //end 2 child
-                    html += '</ul>';
-                }
-            });
-            //end 1 child
-            html += `</ul>`;
-        }
-        html += `<li>`
-    });
-    return html;
-};
-
-
-/*
-Do not remove for menu
- */
-menuGenerator.generateCollections = async() => {
-    let scripts = `
-module.exports = (req,res,next) => {
-
-`;
-    let results = await connection.results({
-        table : "zmenu_collections",
-        where : {
-            active : 1
-        }
-    });
-    let arrFn = [];
-    if(results.length) {
-        for(let i = 0;i<results.length;i++) {
-            scripts += `function menu${i}() {
-               ${results[i].code}
-            }
-            menu${i}();
-            `;
-        }
-    }
-    scripts += ` next();
-}`;
-    fs.writeFileSync(`${dirRoot}/components/zMenuCollections.js`, scripts, 'utf-8');
-    if (process.env.environment == "production") {
-        setTimeout(function () {
-            pm2.connect(function (err) {
-                if (err) {
-                    console.log(err.toString());
-                }
-                pm2.restart(process.env.app.pm2, (err, proc) => {
-                    //io.to(room).emit("message","Restart done")
-                });
-            });
-        }, 3000)
-    }
-};
-
-module.exports = menuGenerator;

package/lib/zMenuCollections.js

@@ -1,62 +0,0 @@
-module.exports = (req, res, next) => {
-
-    function menu0() {
-        function mainMenu(obj) {
-            let html = "", span = "", dropdown = "", test = "";
-            const parent = (obj, classname = "") => {
-                let href = obj.href ? "/" + obj.href : "#";
-                let hassub = "", sidebarlink = "", aClass = "", span = obj.text;
-                if (obj.hasOwnProperty("children")) {
-                    hassub = "has-sub";
-                    sidebarlink = "sidebar-link";
-                    aClass = `class="${sidebarlink}"`;
-                    span = `<span>${obj.text}</span>`;
-                }
-                let html = '';
-                let icon = obj.icon ? obj.icon.replace('tabler-', '') : '';
-                let aicon = '';
-                if(icon && icon != "empty"){
-                    aicon = icon ? `<img src="/assets/icons/${icon}.svg" class="tabler-icons icons-black-color" >` : `<i class="${obj.icon}"></i>`;
-                }
-                html += `<li class="${classname}">
-                    <a href="${href}" ${aClass} >
-                    ${aicon}
-                    ${span}
-                    </a>`;
-                if (hassub != "") {
-                    html += child(obj.children);
-                }
-                html += `</li>`;
-
-                return html;
-            };
-
-            const child = (arr) => {
-                let html = '<div class="submenu"><ul>';
-                arr.map((item) => {
-                    html += parent(item, "submenu-item");
-                });
-                html += `</ul></div>`;
-                return html;
-            };
-            let arr = obj.items;
-            html += `<ul class="main-menu">`;
-            arr.map((item) => {
-                let classname = "";
-                if (item.hasOwnProperty("children")) {
-                    classname = "has-submenu ";
-                } else {
-                    classname = "";
-                }
-                html += parent(item, classname);
-            });
-            html += `</ul>`;
-            return html;
-        }
-
-        const html = mainMenu({items: res.locals.MENU_ALL, options: {class: "sidebar-nav"}});
-        res.locals.menu_vertical = html;
-    }
-    menu0();
-    next();
-};