@opengis/fastify-table 1.1.114 → 1.1.116

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.114",
+  "version": "1.1.116",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

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

@@ -1,6 +1,4 @@
-import config from '../../../../config.js';
 import pgClients from '../../pg/pgClients.js';
-
 import getTemplate from '../../table/funcs/getTemplate.js';
 import applyHook from '../../hook/funcs/applyHook.js';
 
@@ -26,33 +24,29 @@ export default async function getAccess({ table, user = {} }) {
   const hookData = await applyHook('getAccess', { table, user });
   if (hookData) return hookData;
 
-  const { uid, user_type: userType } = user;
+  const { uid, user_type: userType = 'regular' } = user;
 
-  if (config.auth?.disable || userType?.includes?.('admin')) {
+  if (userType.includes('admin')) {
     return { actions: ['view', 'edit', 'add', 'del'], query: '1=1' };
   }
 
-  const body = await getTemplate('table', table) || {};
+  const body = await getTemplate('table', table);
+  const tableActions = ['view'].concat(body?.actions || body?.action_default || []);
 
-  if (body.access === 'admin' && !userType?.includes?.('admin')) {
-    const { userActions = [] } = uid ? await pgClients.client.query(q, [table, uid]).then(el => el.rows?.[0] || {}) : {};
-    const customActions = userActions.filter((el => ['view'].concat(body.actions || body.action_default || []).includes(el)));
-    return { actions: customActions, query: '1=1' };
+  if (body?.public || body?.access === 'public') {
+    return { actions: tableActions, query: '1=1' };
   }
 
-  const actions = uid ? ['view'].concat(body.actions || body.action_default || []) : [];
-
-  if (body?.public || body.access === 'public') {
-    return { actions, query: '1=1' };
+  if (body?.access === 'user' && uid) {
+    return { actions: tableActions, query: '1=1' };
   }
 
-  const dbTable = pgClients.client?.pk?.[table] ? table : body?.table;
-  if (!uid || !dbTable) return null;
+  const { userScope, userActions = [] } = uid
+    ? await pgClients.client.query(q, [table, uid]).then(el => el.rows?.[0] || {})
+    : {};
 
-  const { userScope, userActions = [] } = await pgClients.client.query(q, [table, uid]).then(el => el.rows?.[0] || {});
-  const query = body.access === 'user' || userScope === 'my' ? `uid='${uid}'` : null;
-  const customActions = userActions.filter((el => actions.includes(el)));
-  const scope = body.access === 'user' ? 'my' : userScope;
+  const query = uid && userScope === 'my' ? `uid='${uid}'` : '1=1';
+  const actions = userActions.filter((el => tableActions.includes(el)));
 
-  return { scope, actions: customActions, query };
+  return { scope: userScope, actions, query };
 }

package/server/plugins/table/funcs/metaFormat/index.js

@@ -3,16 +3,16 @@ import { handlebars } from '@opengis/fastify-hb/utils.js';
 import getTemplate from '../getTemplate.js';
 import getSelectVal from './getSelectVal.js';
 
-// import { getTemplate, getSelectVal } from '../../../../../utils.js';
-
-export default async function metaFormat({ rows, table }) {
-  const loadTable = await getTemplate('table', table);
-  const selectCols = loadTable?.columns?.filter((e) => e.data);
+export default async function metaFormat({
+  rows, table, cls, sufix = true,
+}) {
+  const loadTable = table ? await getTemplate('table', table) : {};
+  const selectCols = Object.keys(cls || {}).map(key => ({ name: key, data: cls[key] })).concat(loadTable?.columns?.filter((e) => e.data) || []);
   const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
-  const htmlCols = loadTable?.columns?.filter((e) => e.name && e.format === 'html' && e.html);
+  const htmlCols = loadTable?.columns?.filter?.((e) => e.name && e.format === 'html' && e.html) || [];
   if (!selectCols?.length && !metaCls?.length && !htmlCols?.length) return rows;
 
-  await Promise.all(htmlCols?.map(async (attr) => {
+  await Promise.all(htmlCols.map(async (attr) => {
     await Promise.all(rows.filter(row => row?.[attr.name])?.map(async (row) => {
       const html = await handlebars.compile(attr.html)(row);
       Object.assign(row, { [attr.name]: html?.replaceAll(/<[^>]*>/g, '')?.replace(/\n/g, '')?.trim() });
@@ -24,13 +24,18 @@ export default async function metaFormat({ rows, table }) {
     const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => (typeof el === 'boolean' ? true : el));
     if (!values.length) return null;
 
-    const cls = await getSelectVal({ name: attr.data, values });
-    if (!cls) return null;
+    const clsValues = await getSelectVal({ name: attr.data, values });
+    if (!clsValues) return null;
 
     rows.forEach(el => {
-      const val = el[attr.name]?.map?.(c => cls[c.toString()] || cls[c] || c) || cls[el[attr.name]?.toString()] || cls[el[attr.name]] || el[attr.name];
+      const val = el[attr.name]?.map?.(c => clsValues[c.toString()] || clsValues[c] || c) || clsValues[el[attr.name]?.toString()] || clsValues[el[attr.name]] || el[attr.name];
       if (!val) return;
-      Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
+      if (!sufix) {
+        Object.assign(el, { [attr.name]: val.text || val });
+      }
+      else {
+        Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
+      }
     });
 
     return null;

package/server/routes/crud/controllers/update.js

@@ -5,7 +5,9 @@ import config from '../../../../config.js';
 import insert from './insert.js';
 
 export default async function update(req) {
-  const { user, params = {}, body = {} } = req;
+  const {
+    pg = pgClients.client, user, params = {}, body = {},
+  } = req;
   if (!user) return { message: 'access restricted', status: 403 };
   const hookData = await applyHook('preUpdate', {
     table: params?.table, id: params?.id, user,
@@ -69,7 +71,7 @@ export default async function update(req) {
   if (extraKeys?.length) {
     res.extra = {};
     await Promise.all(extraKeys?.map(async (key) => {
-      const objId = body[schema[key].parent_id] || body?.id || res?.[schema[key]?.parent_id];
+      const objId = body[schema[key].parent_id] || body?.id || res?.[schema[key]?.parent_id] || res?.[pg.pk?.[loadTemplate?.table || table] || ''];
       // delete old extra data
       await pgClients.client.query(`delete from ${schema[key].table} where ${schema[key].parent_id}=$1`, [objId]); // rewrite?
       // insert new extra data