zet-lib 1.0.2 → 1.0.4

package/lib/connection.js

@@ -156,6 +156,7 @@ connection.insert = async(obj) => {
         console.log(sql);
         console.log(arr);
         console.log(e.toString());
+        throw e;
     }
 };
 
@@ -196,21 +197,15 @@ connection.update = async(obj) => {
     const sql = `UPDATE "${table}" SET ${dataArr.join(", ")} ${wheres} RETURNING *`;
     /* console.log(sql);
       console.log(arr);*/
-    const result = await pool.query(sql, arr);
-    //await pool.end()
-    return result.rows[0];
-    /*
-  try {
-      var result = await pool.query(sql, arr);
-      //await pool.end()
-      return result.rows[0]
-  } catch (err) {
-      console.log("Error on Update ");
-      console.log(err)
-      return {}
-  }
-  */
-
+    try {
+        const result = await pool.query(sql, arr);
+        return result.rows[0];
+    } catch (e) {
+        console.log(sql);
+        console.log(arr);
+        console.log(e.toString());
+        throw e;
+    }
 };
 
 connection.delete = async(obj) => {
@@ -228,7 +223,14 @@ connection.delete = async(obj) => {
     const sql = `DELETE FROM "${table}" ${wheres}`
     /*console.log(sql);
     console.log(arr)*/
-    return await pool.query(sql, arr);
+    try {
+        return await pool.query(sql, arr);
+    } catch (e) {
+        console.log(sql);
+        console.log(arr);
+        console.log(e.toString());
+        throw e;
+    }
 }
 
 connection.driver = config.driver;

package/lib/index.js

@@ -22,6 +22,7 @@ module.exports = {
     zReport: require('./zReport'),
     zRoute: require('./zRoute'),
     zRole : require('./zRole'),
+    zRoleRouter : require('./zRoleRouter'),
     zPage: require('./zPage'),
     zTester: require('./zTester'),
     zCache : require('./zCache'),

package/lib/views/zrole/index.ejs

@@ -0,0 +1,121 @@
+<div class="">
+    <div class="page-header"><h1>Roles</h1></div>
+    <div class="card panel panel-info boxy">
+        <div class="panel-heading">
+            <div class="float-end">
+                <div class="summary">
+                    <% if(levels.delete) {%>
+                      <span
+                              class="icon-small icons-danger" title="Delete role" onclick="deleterole()"><img class="icons-bg-white icon-image"
+                                                                                                              src="/assets/icons/trash.svg"></span>
+                    <%}%>
+                        <% if(levels.update) {%>
+                    <span class="icon-small icons-primary" data-bs-toggle="modal"
+                                           data-bs-target="#renameModal" title="rename"><img
+                                class="icons-bg-white icon-image" src="/assets/icons/edit.svg"></span>
+                        <%}%>
+                        <% if(levels.create) {%>
+                        <span
+                            class="icon-small icons-success" title="Add a new role" data-bs-toggle="modal"
+                            data-bs-target="#addModal"><img class="icons-bg-white icon-image"
+                                                            src="/assets/icons/plus.svg"></span>
+                        <%}%>
+
+
+                </div>
+            </div>
+            <h3 class="panel-title"><i class="fa fa-cog"></i> Settings</h3>
+            <div class="clearfix"></div>
+        </div>
+        <div class="kv-panel-before">
+            <div class="row">
+                <form id="role-form" class="form-horizontal kv-form-horizontal" method="post"><input type="hidden"
+                                                                                                     name="_csrf"
+                                                                                                     value="<%- csrfToken %>">
+                    <div class="form-group field-role-role_name"><label class="control-label col-md-2"
+                                                                        for="role-role_name">Role Name</label>
+                        <div class="col-md-10"><select id="roleName" class="form-control form-select mb-3" name="name">
+                                <% for(var i = 0;i < results.length;i++){ %>
+                                    <option value="<%- results[i].id %>"
+                                    <% if(id == results[i].id){ %> selected=""
+                                            <% } %>
+                                    ><%- results[i].name %></option>
+                                <% } %>
+                            </select></div>
+                    </div>
+                    <table class="table table-responsive">
+                        <thead>
+                        <tr>
+                            <th>Name</th>
+                            <% for(var i = 0;i < actions.length;i++) { %>
+                                <th><%= actions[i] %> <input onclick='checkthis("<%= actions[i] %>")' type="checkbox"
+                                                             id="all<%= actions[i] %>"></th>
+                            <% } %>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <% for(var i = 0;i < routes.length;i++) { %>
+                            <tr>
+                                <td>
+                                    <% var ename = routes[i] %>
+                                    <%= ename %></td>
+                                <% for(var x = 0;x < actions.length;x++) { %>
+                                    <td><input name="params[<%= ename %>][<%= actions[x] %>]" class="<%= actions[x] %>"
+                                        <% if(json && json.hasOwnProperty(ename) && json[ename].indexOf(actions[x]) >= 0) { %> <%= 'checked="checked"' %>
+                                                <% } %>
+                                               title="Role for <%= routes[i] %> <%= actions[x] %>" type="checkbox"></td>
+                                <% } %>
+                            </tr>
+                        <% } %>
+                        </tbody>
+                    </table>
+                    <div class="row">
+                        <div class="col-md-10 col-md-offset-1">
+                            <% if(levels.update) {%>
+                            <button type="submit" class="btn btn-primary">Update</button>
+                            <%}%>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div><!-- Modal -->
+<div class="modal fade" id="renameModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header"><h5 class="modal-title" id="exampleModalLabel">Rename title</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body"><input type="text" class="form-control" id="rename" name="rename"
+                                           value="<%- model[0].name %>"></div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary btn-update">Save changes</button>
+            </div>
+        </div>
+    </div>
+</div><!-- Modal -->
+<div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="addModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header"><h5 class="modal-title" id="exampleModalLabel">Add a New Role</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                <div class="form-group mb-3"><label for="ruas_sk">Role Name</label> <input type="text"
+                                                                                           class="form-control"
+                                                                                           id="role_name"
+                                                                                           name="role_name"
+                                                                                           placeholder="Role Name">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary btn-add">Save changes</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+

package/lib/views/zrole/indexjs.ejs

@@ -0,0 +1,57 @@
+<script>
+    function checkthis(elm) {
+        var cElem = $("#all" + elm);
+        if (cElem.is(":checked")) {
+            $("input." + elm).prop("checked", true);
+        } else {
+            $("input." + elm).prop("checked", false);
+        }
+    }
+    $("#roleName").on('change', function () {
+        location.href = "/zrole?id=" + $(this).val();
+    });
+    var form = document.getElementById("role-form");
+    form.onsubmit = function (ev) {
+        ev.preventDefault();
+        var url = '/zrole/update/<%= id%>';
+        ajaxPost(url, $(this).serialize(), function (data) {
+            if (data.status == 1) {
+                toastr.success('Success', 'Updated Role');
+            } else {
+                toastr.error('Error!',data.data);
+            }
+        });
+    }
+    $(".btn-update").on("click", function () {
+        ajaxPost('/zrole/rename/<%= id%>',{
+            rename : $("#rename").val()
+        }, function (data) {
+            toastrForm(data);
+            setTimeout(function () {
+                location.href= '';
+            },2000);
+        })
+    })
+
+    $(".btn-add").on("click", function () {
+        ajaxPost('/zrole/create/',{
+            name : $("#role_name").val()
+        }, function (data) {
+            toastrForm(data);
+            setTimeout(function () {
+                location.href= '';
+            },2000);
+        })
+    })
+    function deleterole() {
+        if(window.confirm('delete role selected ? ')) {
+            let id = "<%= id%>";
+            ajaxDelete('/zrole/delete/<%= id%>',{id:id}, function (data) {
+                toastrForm(data);
+                setTimeout(function () {
+                    location.href= '/zrole';
+                },2000);
+            })
+        }
+    }
+</script>

package/lib/zRole.js

@@ -1,6 +1,7 @@
 const Util = require('./Util');
 const fs = require("fs");
 const myCache = require("./cache");
+const zRoute = require('./zRoute');
 
 const a = {};
 
@@ -8,7 +9,7 @@ const a = {};
  Please add your routes here
  */
 
-const routes = fs.readdirSync("./routes/").reduce((result, item) => [...result, item.replace(".js","")],[]);
+const routes = zRoute.ROUTES();
 const cacheRoutes = myCache.get("ROUTES");
 const cacheRoles = myCache.get("ROLES") || {};
 
@@ -18,7 +19,6 @@ if(cacheRoutes && cacheRoutes.length) {
     a.routes = process.env.NODE_ENV  == "production" ? Util.arrayDeletes(routes,["auth","test"]) : Util.arrayDeletes(routes,["generator","auth","test"]);
 }
 
-
 /*
  Default actions
  you can additional here
@@ -31,10 +31,10 @@ a.actions = ['index', 'create', 'update', 'delete', 'view', 'import', 'export','
 
 a.params =  function (roleId) {
     let cacheRoles = myCache.get("ROLES");
-       if(cacheRoles && cacheRoles.hasOwnProperty(roleId)) {
-            return roleId ? cacheRoles[roleId].params : {};
-       }
-       return {}
+    if(cacheRoles && cacheRoles.hasOwnProperty(roleId)) {
+        return roleId ? cacheRoles[roleId].params : {};
+    }
+    return {}
 };
 
 a.rules = function (roleId) {
@@ -65,10 +65,14 @@ a.levels = (route, params) => {
             obj[a.actions[i]] = true;
         }
     }
-
     return obj;
 };
 
+a.myLevel = (req, res, table) => {
+    const levels = a.levels(table, a.routes.includes(table) ?  a.rules(res.locals.roleId) : {});
+    return levels;
+}
+
 a.menuAccess = (res, menu) => {
     if(Array.isArray(menu)) {
         let isTrue = false;
@@ -129,9 +133,8 @@ a.access = (req, res, next) => {
                 req.session.sessionFlash = Util.flashError(LANGUAGE.no_access);
                 res.redirect(`${process.env.APP_AFTER_LOGIN}?setup=role`)
             } else {
-                res.redirect(`${process.env.app.APP_AFTER_LOGIN}`)
+                res.redirect(`${process.env.APP_AFTER_LOGIN}`)
             }
-
         }
     }
 };

package/lib/zRoleRouter.js

@@ -0,0 +1,161 @@
+const express = require('express');
+const router = express.Router();
+// setup route middlewares
+const csrf = require('csurf');
+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 env = process.env.NODE_ENV || 'development';
+const ejs = require('ejs');
+const Util = require('./Util');
+const access = require('./access');
+const connection = require('./connection');
+const zCache = require('./zCache');
+const zRole = require('./zRole');
+const moduleLib = require('./moduleLib');
+
+router.get('/', csrfProtection, async function (req, res, next) {
+  let dirname = './';
+  let id = req.query.id;
+  if (id == undefined) {
+    id = 1;
+  }
+  const model = await connection.results({
+    table : "zrole",
+    where : {
+      id : id
+    }
+  });
+  const json = model[0].params ;
+  const routes = zRole.routes;
+  const results = await connection.results({table:"zrole"});
+  const myLevel = zRole.myLevel(req, res, 'zrole');
+  //inject to end body
+  let datas = {
+    model: model,
+    table: "zrole",
+    id: id,
+    actions: zRole.actions,
+    routes: routes,
+    levels:myLevel,
+    json: json,
+    results: results,
+    csrfToken: req.csrfToken()
+  }
+
+  const bodyHTML = ejs.render(Util.readFile(path.join(dirname,'views/zrole/index.ejs')),datas);
+  const endBody = ejs.render(Util.readFile(path.join(dirname,'views/zrole/indexjs.ejs')), datas);
+  datas.bodyHTML = bodyHTML;
+  moduleLib.addModule(req,res,endBody)
+
+  //moduleLib.addModule(req, res, Util.readFile(path.join(dirname,'views/zrole/indexjs.ejs')));
+  res.render("layouts/"+layout, datas);
+});
+
+router.post('/update/:id',async function (req, res, next) {
+  const data = {};
+  const name = req.body.name;
+  const params = req.body.params;
+  const newKey = {};
+  Object.keys(params).map( (key) => {
+    const arr = [];
+    for (const k in params[key]) {
+      arr.push(k);
+    }
+    newKey[key] = arr;
+  });
+
+  const json = {};
+  json.params = JSON.stringify(newKey);
+  try {
+    await connection.update({
+      table : "zrole",
+      data : {
+        params : json.params
+      },
+      where : {
+        id : req.params.id
+      }
+    });
+    data.status = 1;
+    data.data = 1;
+    await zCache.ROLES();
+
+    if(env == "production") {
+      pm2.connect(function (err) {
+        if (err) {
+          //console.log(err.toString());
+        }
+        pm2.restart(process.env.PM2_NAME, (err, proc) => {
+          //io.to(room).emit("message","Restart done")
+        });
+      });
+    }
+    res.json(data);
+  } catch (error) {
+    data.status = 0;
+    data.data = error;
+    res.json(data);
+  }
+});
+
+router.post('/rename/:id', async (req,res) => {
+  let json = Util.jsonSuccess();
+  try {
+    const id = req.params.id;
+    const rename = req.body.rename;
+    await connection.update({
+      table : "zrole",
+      where : {
+        id : id
+      },
+      data : {name : rename}
+    })
+  } catch (e) {
+    json = Util.flashError(e.toString())
+  }
+  res.json(json);
+});
+
+router.post('/create', async (req,res) => {
+  let json = Util.jsonSuccess();
+  try {
+    const name = req.body.name;
+    await connection.insert({
+      table : "zrole",
+      data : {
+        name : name
+      }
+    });
+    await zCache.ROLES();
+  } catch (e) {
+    json = Util.flashError(e.toString())
+  }
+  res.json(json);
+});
+
+router.delete('/delete/:id', async (req,res) => {
+  let json = Util.jsonSuccess();
+  let id = parseInt(req.params.id);
+  if(id > 3){
+    try {
+      const name = req.body.name;
+      await connection.delete({
+        table : "zrole",
+        where : {
+          id : id
+        }
+      });
+      await zCache.ROLES();
+    } catch (e) {
+      json = Util.flashError(e.toString())
+    }
+  } else {
+    json = Util.flashError('Delete error, not allowed');
+  }
+  res.json(json);
+});
+
+module.exports = router;

package/lib/zapp.js

@@ -2,78 +2,79 @@ 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 = "";
-        res.locals.renderEnd = "";
-        res.locals.titleApp = process.env.APP_TITLE;
-        res.locals.descriptionApp = process.env.APP_DESCRIPTION;
-        res.locals.moduleHead = "";
-        res.locals.relationsVariable = "";
-        res.locals.moduleEnd = "";
-        res.locals.menuApp = "home";
-        res.locals.routeName = "index";
-        res.locals.userId = -1;
-        res.locals.csrfToken = "";
-        res.locals.roleId = 0;
-        res.locals.token = "guest";
-        res.locals.companyId = 0;
-        res.locals.userId = 0;
-        res.locals.userAvatar = "/img/user.png";
-        res.locals.zuser = {
-            fullname: 'test',
-            role: {name: "test"}
+  res.locals.renderHead = "";
+  res.locals.renderBody = "";
+  res.locals.bodyHTML = '';
+  res.locals.renderEnd = "";
+  res.locals.titleApp = process.env.APP_TITLE;
+  res.locals.descriptionApp = process.env.APP_DESCRIPTION;
+  res.locals.moduleHead = "";
+  res.locals.relationsVariable = "";
+  res.locals.moduleEnd = "";
+  res.locals.menuApp = "home";
+  res.locals.routeName = "index";
+  res.locals.userId = -1;
+  res.locals.csrfToken = "";
+  res.locals.roleId = 0;
+  res.locals.token = "guest";
+  res.locals.companyId = 0;
+  res.locals.userId = 0;
+  res.locals.userAvatar = "/img/user.png";
+  res.locals.zuser = {
+    fullname: 'test',
+    role: {name: "test"}
+  };
+  res.locals.frameworkcss = "bootstrap5";
+  res.locals.startup = 0;
+  global.frameworkcss = "bootstrap5";
+  global.LANGUAGE = require('./languages/lang_en');
+  res.locals.socketUrl = process.env.APP_URL;
+  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.frameworkcss = "bootstrap5";
-        res.locals.startup = 0;
-        global.frameworkcss = "bootstrap5";
-        global.LANGUAGE = require('./languages/lang_en');
-        res.locals.socketUrl = process.env.APP_URL;
-        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;
-                    res.locals.isLogin = true;
-                    res.locals.zuser = tUser;
-                    res.locals.userId = tUser.id;
-                    res.locals.companyId = tUser.company.id;
-                    res.locals.userAvatar = tUser.image ? tUser.image.indexOf("http") > -1 ? tUser.image : "/uploads/zuser/" + tUser.image : "/img/user.png";
-                    res.locals.zcompanies = tUser.companies;
-                    if(tUser.language){
-                        let objLanguage = {
-                            1 : "lang_en",
-                            2 : "lang_id",
-                            3 : "lang_jp",
-                            4 : "lang_fr"
-                        };
-                        global.LANGUAGE = require(`./languages/${objLanguage[tUser.language]}`);
-                    }
-                    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);
+        res.locals.isLogin = true;
+        res.locals.token = tUser.token;
+        res.locals.roleId = tUser.role_id;
+        res.locals.isLogin = true;
+        res.locals.zuser = tUser;
+        res.locals.userId = tUser.id;
+        res.locals.companyId = tUser.company.id;
+        res.locals.userAvatar = tUser.image ? tUser.image.indexOf("http") > -1 ? tUser.image : "/uploads/zuser/" + tUser.image : "/img/user.png";
+        res.locals.zcompanies = tUser.companies;
+        if(tUser.language){
+          let objLanguage = {
+            1 : "lang_en",
+            2 : "lang_id",
+            3 : "lang_jp",
+            4 : "lang_fr"
+          };
+          global.LANGUAGE = require(`./languages/${objLanguage[tUser.language]}`);
         }
-        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();
+        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.2",
+  "version": "1.0.4",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"