@opengis/admin 0.1.79 → 0.1.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.1.79",
+  "version": "0.1.80",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

package/server/plugins/hook.js

@@ -32,7 +32,7 @@ export default async function plugin(fastify) {
 
             const menus = rows.reduce((acc, curr) => Object.assign(acc, { [curr.menu_id]: menuList.find((item) => (item?.ua || item?.en || item?.name) === curr.name) }), {});
             const values = Object.entries(menus).reduce((acc, curr) => {
-                if (curr[1].table) { acc.push({ ...curr[1], menuId: curr[0] }); }
+                if (curr[1]?.table) { acc.push({ ...curr[1], menuId: curr[0] }); }
                 curr[1]?.menu?.forEach((el) => acc.push({ ...el, menuId: curr[0] }));
                 return acc; 
             }, []);

package/server/routes/notifications/controllers/userNotifications.js

@@ -31,14 +31,12 @@ export default async function userNotifications({
   const limit = Math.min(maxLimit, +(query.limit || 5));
   const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
 
-
-
-    const q = `select notification_id as id, subject, body, cdate,
-    author_id, read, link, entity_id, (select avatar from admin.users where uid=a.author_id limit 1) as avatar from crm.notifications a where addressee_id=$1 order by cdate desc limit $2 offset $3`;
+  const q = `select notification_id as id, subject, body, cdate,
+  author_id, read, link, entity_id, (select avatar from admin.users where uid=a.author_id limit 1) as avatar from crm.notifications a where addressee_id=$1 order by cdate desc limit $2 offset $3`;
 
   if (query.sql) return q;
 
-    const { rows = [] } = await pg.query(q, [userId, limit, offset]);
+  const { rows = [] } = await pg.query(q, [uid, limit, offset]);
 
   const values = rows.map((el) => el.author_id)
     ?.filter((el, idx, arr) => el && arr.indexOf(el) === idx);