zet-lib 1.0.55 → 1.0.57

package/lib/zRoleRouter.js

@@ -144,34 +144,101 @@ router.post('/create', async (req, res) => {
 })
 
 router.post('/tab-access', async (req, res) => {
-  console.log(req.body)
   let json = Util.jsonSuccess()
   let html = ''
+  const checkedFn = (obj, name, index) => {
+    return obj.hasOwnProperty(name) && obj[name][index] ? 'checked' : ''
+  }
   try {
     const table = req.body.table
+    const id = req.body.id
+    let tabRole = await connection.result({
+      table: 'zrole',
+      where: {
+        id: id,
+      },
+    })
+    let mytabs = tabRole.tabs || {}
+    let mytabsRole = mytabs[table] || {}
     let result = await connection.result({
       table: 'zfields',
       where: {
         table: table,
       },
     })
-    html = `<table class="table table-hover"><thead><tr><th>Tab</th><th>View</th><th>Create</th><th>Edit</th><th>Delete</th></tr></thead>`
-    result.tabs.map((item) => {
+    html += `<form id="tabform">`
+    html += `<table class="table table-hover"><thead><tr><th>Tab</th><th>View <input type="checkbox" onclick="tabChecks(this,'viewtab')" id="viewtabs" /></th><th>Create <input type="checkbox" id="createtabs" onclick="tabChecks(this,'createtab')" /></th><th>Edit <input type="checkbox" id="edittabs" onclick="tabChecks(this,'edittab')" /></th><th>Delete <input type="checkbox" onclick="tabChecks(this,'deletetab')" id="deletetabs" /></th></tr></thead><tbody></tbody>`
+    result.tabs.map((item, index) => {
       html += `<tr>
                 <td>${item}</td>
-                <td><input type="checkbox" name="${table}___${item}___view" /></td>
-                <td><input type="checkbox" name="${table}___${item}___create" /></td>
-                <td><input type="checkbox" name="${table}___${item}___edit" /></td>
-                <td><input type="checkbox" name="${table}___${item}___delete" /></td>
+                <td><input type="checkbox" class="viewtab" name="view___${index}"  ${checkedFn(mytabsRole, 'view', index)} /></td>
+                <td><input type="checkbox" class="createtab" name="create___${index}" ${checkedFn(mytabsRole, 'create', index)}  /></td>
+                <td><input type="checkbox" class="edittab" name="edit___${index}" ${checkedFn(mytabsRole, 'edit', index)} /></td>
+                <td><input type="checkbox" class="deletetab" name="delete___${index}"  ${checkedFn(mytabsRole, 'delete', index)} /></td>
                 </tr>`
     })
-    html += `</table>`
+    html += `</tbody></table>`
+    html += `</form>`
   } catch (e) {
     json = Util.flashError(e.toString())
   }
   res.send(html)
 })
 
+router.post('/post-access', async (req, res) => {
+  let json = Util.jsonSuccess()
+  let table = req.body.table || ''
+  if (table == '') {
+    res.json(Util.flashError('Table is empty!'))
+    return false
+  }
+  let tabs = req.body.tabs || []
+  let id = req.body.id
+  let obj = tabs.reduce((acc, item) => {
+    acc[item.name] = item.value
+    return acc
+  }, {})
+  let mytabs = {}
+  let l = req.body.l
+  let roles = {}
+  let arr = ['view', 'create', 'edit', 'delete']
+  for (var i = 0; i < l; i++) {
+    arr.map((item) => {
+      if (!roles.hasOwnProperty(item)) {
+        roles[item] = []
+      }
+      if (obj.hasOwnProperty(`${item}___${i}`)) {
+        roles[item].push(true)
+      } else {
+        roles[item].push(false)
+      }
+    })
+  }
+
+  try {
+    let tabRole = await connection.result({
+      table: 'zrole',
+      where: {
+        id: id,
+      },
+    })
+    mytabs = tabRole.tabs || {}
+    mytabs[table] = roles
+    await connection.update({
+      table: 'zrole',
+      data: {
+        tabs: JSON.stringify(mytabs),
+      },
+      where: {
+        id: id,
+      },
+    })
+  } catch (err) {
+    json = Util.jsonError(err + '')
+  }
+  res.json(json)
+})
+
 router.delete('/delete/:id', async (req, res) => {
   let json = Util.jsonSuccess()
   let id = parseInt(req.params.id)
@@ -222,10 +289,7 @@ const body = `<div class="">
                         <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>
+                                    <option value="<%- results[i].id %>" <% if(id == results[i].id){ %> selected="" <% } %> ><%- results[i].name %></option>
                                 <% } %>
                             </select></div>
                     </div>
@@ -248,9 +312,7 @@ const body = `<div class="">
                                     </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">
+                                        <% if(json && json.hasOwnProperty(ename) && json[ename].indexOf(actions[x]) >= 0) { %> <%= 'checked="checked"' %> <% } %> title="Role for <%= routes[i] %> <%= actions[x] %>" type="checkbox">
                                     </td>
                                 <% } %>
                             </tr>
@@ -305,11 +367,10 @@ const body = `<div class="">
         </div>
     </div>
 </div>
-
 <div class="modal fade" id="tabaccess" tabindex="-1" aria-labelledby="tabaccessModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
-            <div class="modal-header"><h5 class="modal-title" id="tabaccesstitle">Tab Access </h5>
+            <div class="modal-header"><h5 class="modal-title" id="tabaccesstitle">Tab Access <span id="titleaccess"></span></h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body body-access">
@@ -317,7 +378,7 @@ const body = `<div class="">
             </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-access">Save changes</button>
+                <button type="button" class="btn btn-primary btn-save-tab">Save changes</button>
             </div>
         </div>
     </div>
@@ -334,6 +395,13 @@ const js = `<script>
             $("input." + elm).prop("checked", false);
         }
     }
+    function tabChecks(that,elm) {
+        if ($(that).is(":checked")) {
+            $("input." + elm).prop("checked", true);
+        } else {
+            $("input." + elm).prop("checked", false);
+        }
+    }
     $("#roleName").on('change', function () {
         location.href = "/zrole?id=" + $(this).val();
     });
@@ -383,11 +451,24 @@ const js = `<script>
     }
     
     function handleAccess(table) {
-        ajaxPost('/zrole/tab-access',{table:table}, ((data) => {
+        $(".btn-save-tab").attr("data-table", table);
+        ajaxPost('/zrole/tab-access',{table:table, id: "<%- id %>"}, ((data) => {
             $(".body-access").html(data);
         }))
     }
     $(".handle-access").on("click", (e)=> handleAccess(e.target.text));
+    $(".btn-save-tab").on("click",(e) => {
+        let queryform = $("#tabform").serializeArray();
+        ajaxPost('/zrole/post-access', {
+            tabs: queryform,
+            l : $(".viewtab").length,
+            id: "<%- id %>",
+            table : e.target.getAttribute('data-table')
+            },((data) => {
+            toastrForm(data);
+            $(".btn-close").click();
+        }))
+    })
 </script>
 `
 

package/lib/zRoute.js

@@ -2494,6 +2494,7 @@ zRoute.moduleLib = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
 
 /*
 Generate javascript code into runtime folder
+make it static js
  */
 zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
   //add additional script
@@ -2510,6 +2511,8 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
   const MYMODELS = myCache.get('MYMODELS')
   let widgets = MYMODEL.widgets,
     widgetsArray = Object.keys(widgets) || []
+
+  let hasTabs = MYMODEL.hasOwnProperty('hasTabs') ? MYMODEL.hasTabs : false
   let hasDatePicker = false
   let hasNumber = false
   let hasClockPicker = false
@@ -2658,6 +2661,39 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
     }
   }
 
+  //if this module has tabs than call access
+  if (hasTabs) {
+    scriptForm += `$(()=> {
+        ajaxPost('/ztab-access',{table:"${MYMODEL.table}"},(data)=> {
+            let dataTabs = ${MYMODEL.hasOwnProperty('tabs') ? JSON.stringify(MYMODEL.tabs) : []};
+            let viewAccess = data.view || [];
+            let createAccess = data.create || [];
+            let editAccess = data.edit || [];
+            let deleteAccess = data.delete || [];
+            dataTabs.map((_, index)=> {
+                if(!deleteAccess[index]) {
+                  setTimeout(function () {$("#arr"+index).find(".icons-danger").remove();},1000)
+                }
+                if(!editAccess[index]) {
+                    $("#arr"+index).find("input").attr("disabled",true);
+                    $("#arr"+index).find("select").attr("disabled",true);
+                }
+                if(!createAccess[index]) {
+                    $("#arr"+index).find(".btn-plus").remove();
+                    $("#arr"+index).find("input").attr("disabled",true);
+                    $("#arr"+index).find("select").attr("disabled",true);
+                }
+                if(!viewAccess[index]) {
+                    $("#arr"+index).remove();
+                    $(".arr"+index).remove();
+                }
+            })
+        });
+      })
+      
+      `
+  }
+
   defaultScript = `${Util.newLine} $(function () {
         $(".isfile").each(function (index, value) {
             let filename = $(this).attr("data-filename") || "";
@@ -3164,6 +3200,21 @@ zRoute.buildForm = async (req, res) => {
   res.send(tabledata)
 }
 
+/*
+get tab access from table
+ */
+zRoute.tabAccess = async (req, res) => {
+  try {
+    let table = req.body.table
+    let roles = myCache.get('ROLES')
+    let roleId = res.locals.roleId
+    let tabs = roles[roleId].tabs[table] || []
+    res.json(tabs)
+  } catch (e) {
+    console.log(e)
+  }
+}
+
 zRoute.buildFileModel = (json, index = 0) => {
   //let text = `module.exports = { ${Util.newLine}`;
   let text = ''
@@ -3351,7 +3402,7 @@ zRoute.modelsCache = async () => {
     }
   } catch (e) {
     //debug(req,res,e.toString());
-    console.log('modelsCache :', e.toString())
+    console.log('modelsCache :', e + '')
   }
 
   return obj

package/package.json

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