@opengis/fastify-table 1.2.14 → 1.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.14",
+  "version": "1.2.16",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/crud/funcs/getAccess.js

@@ -13,7 +13,7 @@ import applyHook from '../../hook/funcs/applyHook.js';
  * @returns { scope: String, actions: String[], query: String }
  */
 
-const q = `select a.route_id as id, coalesce(d.actions, b.actions, array['view']) as actions, b.scope, c.role_id
+const q = `select a.route_id as id, d.actions as user_roles, d.actions as role_actions, coalesce(b.actions, array['view']) as interface_actions, b.scope, c.role_id
 from admin.routes a 
 left join admin.role_access b on 
   a.route_id=b.route_id
@@ -73,7 +73,10 @@ export default async function getAccess({ table, user = {} }) {
     : {};
 
   const query = userAccess?.scope === 'my' ? `uid='${uid}'` : '1=1';
-  const actions = userAccess?.actions?.filter?.((el, idx, arr) => arr.indexOf(el) === idx && tableActions.includes(el));
+  const actions = userAccess?.interface_actions
+    ?.filter?.((el, idx, arr) => arr.indexOf(el) === idx)
+    ?.filter(el => userAccess?.role_actions?.length ? userAccess?.role_actions.includes(el) : true)
+    ?.filter(el => tableActions.includes(el));
   return {
     scope: userAccess?.scope,
     roles: userAccess?.roles,

package/server/plugins/table/funcs/getSelectMeta.js

@@ -12,7 +12,7 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
   if (selectMeta[name] && !nocache) return selectMeta[name];
 
   const cls = await getSelect(name, pg);
-  const db = typeof cls.db === 'string' ? { database: cls.db } : cls.db;
+  const db = typeof cls?.db === 'string' ? { database: cls.db } : cls?.db;
   const pg1 = cls?.db ? getPG(db) : pg;
   if (!pg1?.pk) await pg1.init();