@opengis/fastify-table 1.3.45 → 1.3.47

package/package.json

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

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

@@ -45,7 +45,8 @@ export default async function getAccess({ table, user = {} }, pg = pgClients.cli
   const tableActions = ['view'].concat(body?.actions || body?.action_default || []);
 
   if (userType === 'admin') {
-    return { actions: body?.actions || body?.action_default ? tableActions : ['view', 'edit', 'add', 'del'], query: '1=1' };
+    const adminActions = body?.form ? ['view', 'del', 'edit', 'add'] : ['view', 'del'];
+    return { actions: body?.actions || body?.action_default ? tableActions : adminActions, query: '1=1' };
   }
 
   if (body?.public || body?.access === 'public') {

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

@@ -8,7 +8,7 @@ import getSelect from './getSelect.js';
 const limit = 50;
 const selectMeta = {};
 
-export default async function getSelectMeta({ name, pg = pgClients.client, nocache }) {
+export default async function getSelectMeta({ name, pg = pgClients.client, nocache, parent }) {
   if (selectMeta[name] && !nocache) return selectMeta[name];
 
   const cls = await getSelect(name, pg);
@@ -23,7 +23,7 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
   const { sql: original } = cls;
   if (!original.toLowerCase) { console.log(`sql select null: ${name}`); return null; }
 
-  const sql = `with c(id,text) as (select * from (${original})q limit ${limit}) select * from c`;
+  const sql = `with c(id,text) as (select * from (${original.replace('{{parent}}', parent)})q limit ${limit}) select * from c`;
 
   /*= == meta table === */
 
@@ -32,10 +32,10 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
 
   const dataOrigin = await pg1.query(sql?.replace(`limit ${limit}`, 'limit 0'));
 
-  const dataOrigin1 = await pg1.query(`${original} limit 0`);
+  const dataOrigin1 = await pg1.query(`${original.replace('{{parent}}', parent)} limit 0`);
 
   // const table = getTable(original);
-  const count = cls?.count ?? await pg1.query(`select count(*) from (${original})q`).then((el) => el?.rows?.[0].count);
+  const count = cls?.count ?? await pg1.query(`select count(*) from (${original.replace('{{parent}}', parent)})q`).then((el) => el?.rows?.[0].count);
 
   // column name
   const cols = dataOrigin.fields.map((el) => el.name);

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

@@ -2,7 +2,7 @@ import {
   dataDelete, getTemplate, getAccess, applyHook, getToken, config, pgClients,
 } from '../../../../utils.js';
 
-export default async function deleteCrud(req) {
+export default async function deleteCrud(req, reply) {
   const { pg = pgClients.client, user, params = {}, headers = {} } = req || {};
 
   const hookData = await applyHook('preDelete', {
@@ -10,7 +10,7 @@ export default async function deleteCrud(req) {
   });
 
   if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
+    return reply.status(hookData.status).send(hookData.message);
   }
 
   const { referer } = headers;
@@ -22,18 +22,25 @@ export default async function deleteCrud(req) {
   const { actions = [] } = await getAccess({ table: del, id, user }, pg) || {};
 
   if (!actions.includes('del') && !config?.local && !tokenData) {
-    return { message: 'access restricted', status: 403 };
+    return reply.status(403).send('access restricted');
   }
   const loadTemplate = await getTemplate('table', del);
 
   const { table } = loadTemplate || hookData || tokenData || req.params || {};
 
-  if (!table) return { status: 404, message: 'table is required' };
-  if (!id) return { status: 404, message: 'id is required' };
+  if (!table) reply.status(404).send('table is required');
+  if (!id) reply.status(404).send('id is required');
 
   const data = await dataDelete({
     pg, table, id, uid: user?.uid, tokenData, referer,
+  }).catch(err => {
+    if (err.message?.includes?.('foreign key' || 'unique')) {
+      const constraint = err.message.match(/constraint "([^"]+)"/g);
+      return reply.status(400).send('Видалення заборонено для збереження цілісності БД: ' + constraint);
+    }
+    if (config.trace) console.error(err.toString());
+    return err.toString();
   });
 
-  return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };
+  return reply.status(200).send({ rowCount: data?.rowCount || 0, msg: !data?.rowCount ? data : null });
 }

package/server/routes/table/controllers/suggest.js

@@ -56,7 +56,7 @@ export default async function suggest(req) {
 
   const meta = table && column
     ? getTableColumnMeta(table, column, query?.key || query?.val)
-    : await getSelectMeta({ pg: pg1, name: selectName, nocache: query?.nocache });
+    : await getSelectMeta({ pg: pg1, name: selectName, nocache: query?.nocache, parent });
 
   if (meta?.minLength && query.key && query.key.length < meta?.minLength) {
     return { message: `min length: ${meta.minLength}` };