zet-lib 3.3.2 → 3.3.3

package/lib/zAppRouter.js

@@ -93,6 +93,7 @@ router.get("/profile", csrfProtection, access, async (req, res) => {
   let verify_signed = result.verify_signed
       ? "/uploads/zuser/" + result.verify_signed
       : "/img/user.png";
+  const layout = res.locals.layout || "finsrecipe";
   res.render("layouts/" + layout, {
     menu: { menu: "profile" },
     data: result,
@@ -574,8 +575,9 @@ router.get(
 
 router.get("/no-access", async (req, res) => {
   let myview = "fronts";
-  if (req.session.user) {
-    myview = "main";
+  if (req.session && req.session.user) {
+    // backend layout mengikuti preferensi user (res.locals.layout)
+    myview = res.locals.layout || "main";
   }
   res.render("layouts/" + myview, {
     data: { table: "error" },
@@ -623,27 +625,24 @@ router.get("/session/:id", access, async (req, res) => {
   res.redirect(backURL);
 });
 
-// change backend layout preference
+// Ubah layout backend (per user / personalized: tiap user punya preferensi sendiri)
 router.get("/layout_changes/:layout", access, async (req, res) => {
-  const selectedLayout = req.params.layout;
+  const selectedLayout = String(req.params.layout || "").replace(/\.ejs$/i, "");
   const backURL = req.header("Referer") || "/";
   try {
-    // persist user preference
-    await connection.update({
-      table: "zuser",
-      data: { layout: selectedLayout },
-      where: { id: res.locals.userId },
-    });
-    // update session + locals for next requests
     if (req.session && req.session.user) {
       req.session.user.layout = selectedLayout;
     }
     res.locals.layout = selectedLayout;
-    global.layout = selectedLayout;
   } catch (err) {
     debug(req, res, err);
   }
-  res.redirect(backURL);
+
+  // pastikan perubahan session tersimpan sebelum redirect (tergantung session store)
+  if (req.session && typeof req.session.save === "function") {
+    return req.session.save(() => res.redirect(backURL));
+  }
+  return res.redirect(backURL);
 });
 
 //RESTART
@@ -671,6 +670,7 @@ router.get("/error", async (err, req, res, next) => {
   // render the error page
   res.status(err.status || 500);
   debug(req, res, err);
+  const layout = res.locals.layout || "finsrecipe";
   res.render("layouts/" + layout, {
     renderBody: "index/error.ejs",
   });

package/lib/zRoleRouter.js

@@ -65,6 +65,7 @@ router.get('/', csrfProtection, async function (req, res, next) {
   const endBody = ejs.render(js, datas)
   datas.bodyHTML = bodyHTML
   moduleLib.addModule(req, res, endBody)
+  const layout = res.locals.layout || 'finsrecipe'
   res.render('layouts/' + layout, datas)
 })
 

package/lib/zapp.js

@@ -1,93 +1,121 @@
 const myCache = require("./cache");
-module.exports = (req,res,next) => {
-  res.locals.BACKEND_LAYOUTS = myCache.get("BACKEND_LAYOUTS");
-  res.locals.renderHead = "";
-  res.locals.renderBody = "";
-  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 = "";
-  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'
-  };
-  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.backend_layouts = [];
-  res.locals.isLogin = false;
-  res.locals.objectStores = {};
-  if (req.session) {
-    let reqSession = req.session;
-    if (reqSession.hasOwnProperty('user')) {
-      const tUser = req.session.user;
-      if (tUser && Object.prototype.hasOwnProperty.call(tUser, "id")) {
-        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;
-        res.locals.zcompany = tUser.company;
-        if(tUser.language){
-          let objLanguage = {
-            1 : "lang_en",
-            2 : "lang_id",
-            3 : "lang_jp",
-            4 : "lang_fr"
-          };
-          global.LANGUAGE = require(`./languages/${objLanguage[tUser.language]}`);
+const Util = require('./Util')
+const zRole = require('./zRole')
+module.exports = (req, res, next) => {
+    res.locals.BACKEND_LAYOUTS = myCache.get("BACKEND_LAYOUTS");
+    res.locals.renderHead = "";
+    res.locals.renderBody = "";
+    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 = "";
+    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'
+    };
+    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.backend_layouts = [];
+    res.locals.isLogin = false;
+    res.locals.objectStores = {};
+    if (req.session) {
+        let reqSession = req.session;
+        if (reqSession.hasOwnProperty('user')) {
+            const tUser = req.session.user;
+            if (tUser && Object.prototype.hasOwnProperty.call(tUser, "id")) {
+                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;
+                res.locals.zcompany = tUser.company;
+                if (tUser.language) {
+                    let objLanguage = {
+                        1: "lang_en",
+                        2: "lang_id",
+                        3: "lang_jp",
+                        4: "lang_fr"
+                    };
+                    global.LANGUAGE = require(`./languages/${objLanguage[tUser.language]}`);
+                }
+                // Layout per user (personalized): dari preferensi user di session
+                if (tUser.layout) {
+                    res.locals.layout = String(tUser.layout).replace(/\.ejs$/i, "");
+                }
+            }
         }
-        if(tUser.layout){
-          res.locals.layout = tUser.layout;
-          //global.layout = tUser.layout;
-        }
-        console.log(global.layout)
-      }
     }
-  }
-  global.COMPANY_ID = res.locals.companyId;
-  global.USER_ID = res.locals.userId;
-  res.locals.LANGUAGE = global.LANGUAGE;
+    // Default layout jika user belum pilih; tiap user bisa punya layout berbeda
+    res.locals.layout = res.locals.layout || "admin";
+    global.COMPANY_ID = res.locals.companyId;
+    global.USER_ID = res.locals.userId;
+    res.locals.LANGUAGE = global.LANGUAGE;
 
-  const path = req.route && req.route.path ? req.route.path : req.path;
+    const path = req.route && req.route.path ? req.route.path : req.path;
+    const MYMODELS = myCache.get("MYMODELS");
+    // Mapping manual per route
+    let map = {
+        '/dashboard': {title: 'Dashboard', subtitle: 'Systems'},
+        '/users': {title: 'Users', subtitle: 'List'},
+        '/users/new': {title: 'Users', subtitle: 'Create'},
+    };
+    for (let key in MYMODELS) {
+        map[`/${key}`] = {title: MYMODELS[key].name, subtitle: 'List'}
+        map[`/${key}/create`] = {title: MYMODELS[key].name, subtitle: 'Create'}
+        map[`/${key}/update`] = {title: MYMODELS[key].name, subtitle: 'Update'}
+        map[`/${key}/view`] = {title: MYMODELS[key].name, subtitle: 'View'}
+    }
 
-  const MYMODELS = myCache.get("MYMODELS");
-  // Mapping manual per route
-  let map = {
-    '/dashboard': { title: 'Dashboard', subtitle: 'Systems' },
-    '/users':     { title: 'Users',     subtitle: 'List' },
-    '/users/new': { title: 'Users',     subtitle: 'Create' },
-  };
-  for(let key in MYMODELS) {
-    map[`/${key}`] = {title : MYMODELS[key].name, subtitle:'List'}
-    map[`/${key}/create`] = {title : MYMODELS[key].name, subtitle:'Create'}
-    map[`/${key}/update`] = {title : MYMODELS[key].name, subtitle:'Update'}
-    map[`/${key}/view`] = {title : MYMODELS[key].name, subtitle:'View'}
-  }
+    const info = map[path] || {};
+    res.locals.pagetitle = info.title || 'Dashboard';
+    res.locals.pagesubtitle = info.subtitle || '';
 
-  const info = map[path] || {};
-  res.locals.pagetitle = info.title || 'Dashboard';
-  res.locals.pagesubtitle = info.subtitle || '';
+    const explode = req.path.split("/");
+    const route = explode[1];
+    let action = "index";
+    res.locals.menuApp = Util.capitalizeAfterSpace(route);
+    res.locals.routeName = route;
+    if (explode.length > 2) {
+        action = explode[2] || "index";
+    }
+    res.locals.titleApp = `${process.env.APP_TITLE} - ${route} ${action}`;
+    if (global.hasCacheLogo == 0) {
+        try {
+            global.hasCacheLogo = 1;
+        } catch (e) {
+            console.log(e);
+        }
+    }
+    // define role for route base on session or not
+    //define routes at zRole
+    if (zRole.routes.indexOf(route) > -1) {
+        req.route = route;
+        req.action = action;
+        zRole.access(req, res, next);
+    } else {
+        next();
+    }
 
-  next();
+    //next();
 }

package/package.json

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