@opengis/fastify-table 1.3.46 → 1.3.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.46",
+  "version": "1.3.48",
   "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/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

@@ -77,18 +77,18 @@ export default async function suggest(req) {
   if (arr && query.token && query.column) {
     const loadTable = await getTemplate('table', query.token);
 
-    const { columns = [] } = await getMeta({ pg, table: tableName });
+    const { columns = [] } = await getMeta({ pg, table: loadTable?.table || tableName });
 
     const column = columns.find(el => el.name === query.column);
     const args = { table: tableName };
     if (!column) return [];
-    const sqlCls = `select array_agg(distinct value) from (select ${pg.pgType?.[column.dataTypeID]?.includes('[]') ? `unnest(${column.name})` : `${column.name}`} as value from ${(tableName).replace(/'/g, "''")} where ${hookBody?.query || loadTable?.query || '1=1'})q`;
+    const sqlCls = `select array_agg(distinct value)::text[] from (select ${pg.pgType?.[column.dataTypeID]?.includes('[]') ? `unnest(${column.name})` : `${column.name}`} as value from ${(loadTable?.table || tableName).replace(/'/g, "''")} where ${hookBody?.query || loadTable?.query || '1=1'})q`;
 
     if (query.sql && (config.local || user?.user_type?.includes?.('admin'))) {
       return sqlCls;
     }
 
-    if (pg.pk?.[tableName] && column?.name) {
+    if (pg.pk?.[loadTable?.table || tableName] && column?.name) {
       const vals = await pg.queryCache(sqlCls, args).then(el => el.rows?.[0]?.array_agg || []);
       // console.log(vals);
 
@@ -97,7 +97,7 @@ export default async function suggest(req) {
         ? arr?.filter((el) => !lower || (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)?.filter((el) => !query.val || el.id === query.val)
         : arr;
 
-      const data2 = data1.filter((el) => vals.includes(el.id));
+      const data2 = data1.filter((el) => el.id && vals.includes(el.id.toString()));
       const data = data2.slice(0, Math.min(query.limit || limit, limit));
       return {
         time: Date.now() - time,