zet-lib 1.2.16 → 1.2.18

package/lib/zRole.js

@@ -138,26 +138,6 @@ a.access = (req, res, next) => {
   }
 }
 
-a.menuValidasi = (res, me, obj) => {
-  let jsonArray = []
-  obj.children = a.childrenMenu(res, me.children)
-  if (obj.children.length) {
-    //console.log('children : ',obj.children);
-    let count = obj.children.length
-    for (let i = 0; i < count; i++) {
-      if (obj.children[i].hasOwnProperty('children')) {
-        if (obj.children[i].hasOwnProperty('children') > 0) {
-        } else {
-          jsonArray.push(obj.children[i])
-        }
-      } else {
-        jsonArray.push(obj.children[i])
-      }
-    }
-  }
-  return jsonArray
-}
-
 a.menu = (req, res) => {
   let jsonArray = []
   if (!res.locals.isLogin) return jsonArray
@@ -170,35 +150,21 @@ a.menu = (req, res) => {
   }
   //console.log(JSON.stringify(arr))
   let count = arr.length
-  for (let i = 0; i < count; i++) {
-    let me = arr[i]
-    let obj = a.addItemMenu(me)
-    if (me.hasOwnProperty('children')) {
-      let menuchild = a.menuValidasi(res, me, obj)
-      if (menuchild.length) {
-        me.children = menuchild
-        jsonArray.push(me)
+  arr.map((me) => {
+    if (a.menuAccess(res, me.href)) {
+      let obj = a.addItemMenu(me)
+      //console.log(obj)
+      if (me.hasOwnProperty('children')) {
+        obj.children = a.childrenMenu(res, me.children)
+        if (obj.children.length) {
+          jsonArray.push(obj)
+        }
+      } else {
+        jsonArray.push(obj)
       }
-    } else {
-      jsonArray.push(obj)
     }
-  }
-  /*  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);
-              }
-          }
-      });*/
-
+  })
   //console.log(JSON.stringify(jsonArray))
-
   return jsonArray
 }
 
@@ -243,7 +209,6 @@ a.menuSystems = (req, res) => {
 a.menus = (req, res) => {
   let arr = a.menu(req, res)
   let menus = [...arr, ...a.menuSystems(req, res)]
-  //console.log(JSON.stringify(menus));
   return menus
 }
 
@@ -270,11 +235,18 @@ a.childrenMenu = (res, arr) => {
         if (item.hasOwnProperty('children') && item.children.length) {
           let child = []
           child.push(a.childrenMenu(res, item.children))
+          //console.log('child',child)
           if (child[0]) {
             obj.children = child[0]
+          } else {
+            delete obj
           }
         }
-        myArr.push(obj)
+        if (obj.hasOwnProperty('children') && obj.children.length == 0) {
+        } else {
+          myArr.push(obj)
+        }
+        //console.log('OBJ ===== ', obj)
       }
     })
   }

package/lib/zRoute.js

@@ -1687,7 +1687,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
   }
   let whereArray = []
   if (objData.hasOwnProperty('whereArray')) {
-    whereArray.push(objData['whereArray'])
+    whereArray = objData['whereArray']
   }
   whereArray.push({
     field: 'company_id',

package/package.json

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