@opengis/fastify-table 1.3.13 → 1.3.15

package/package.json

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

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

@@ -38,6 +38,9 @@ export default async function dataInsert({
 
   const filterData = Object.keys(data)
     .filter((el) => !['cdate', 'editor_date'].includes(el) && (typeof data[el] === 'boolean' ? true : data[el]) && names.includes(el)).map((el) => [el, data[el]]);
+  if (!filterData?.length) {
+    return null;
+  }
 
   const insertQuery = `insert into ${table}
 

package/server/plugins/extra/extraData.js

@@ -27,43 +27,21 @@ export default async function extraData({
     || defaultTable;
 
   const { pk: mainPK, columns: mainColumns = [] } = await getMeta({ pg, table });
-  const { pk, columns: extraColumns = [] } = await getMeta({ pg, table: extraDataTable });
 
   if (!mainPK) {
     return { error: `table pk not found: ${table}`, status: 404 };
   }
 
-  if (!pk) {
+  if (!pg.pk?.[extraDataTable]) {
     return { error: `extra table pk not found: ${extraDataTable}`, status: 404 };
   }
 
-  const mode = extraColumns.find((col) => col?.name === mainPK)
-    ? 'column'
-    : 'property';
+  Object.assign(data || {}, { object_id: id });
 
-  if (mode === 'property') {
-    Object.assign(data || {}, { object_id: id });
-  }
-
-  const deleteRes = mode === 'property'
-    ? await pg.query(`delete from ${extraDataTable} where object_id=$1 and property_key = any($2::text[]) returning *`, [id, Object.keys(loadTemplate?.schema || {})])
-    : await pg.query(`delete from ${extraDataTable} where ${mainPK}=$1 returning *`, [id]);
+  const deleteRes = await pg.query(`delete from ${extraDataTable} where object_id=$1 and property_key = any($2::text[]) returning *`, [id, Object.keys(loadTemplate?.schema || {})]);
 
   if (!data) {
-    const res1 = mode === 'property'
-      ? deleteRes?.rows?.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text, loadTemplate?.schema) }), {})
-      : deleteRes?.rows?.[0];
-    return res1;
-  }
-
-  if (mode === 'column') {
-    const filteredData = Object.keys(data)
-      .filter(key => Object.keys(loadTemplate?.schema || {}).includes(key))
-      .reduce((acc, curr) => Object.assign(acc, { [curr]: data[curr] }), {});
-    Object.assign(filteredData, { [mainPK]: id });
-    const res = await dataInsert({ pg, table: extraDataTable, data: filteredData, uid }).then(el => el.rows?.[0] || {});
-    Object.assign(res, { id: res?.[pg.pk?.[table || '']] });
-    return res;
+    return deleteRes?.rows?.reduce?.((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text, loadTemplate?.schema) }), {});
   }
 
   const rows = Object.keys(data || {})

package/server/plugins/pg/index.js

@@ -11,7 +11,7 @@ function close() {
 
 async function getHeadersPG(req, config) {
   if (!req.headers?.token) return null;
-  const validToken = (req.ip === '127.0.0.1' || req.ip.startsWith('192.168.') || config.debug) && req.headers?.uid && req.headers?.token && config.auth?.tokens?.includes?.(req.headers.token);
+  const validToken = (req.ip === '193.239.152.181' || req.ip === '127.0.0.1' || req.ip.startsWith('192.168.') || config.debug) && req.headers?.token && config.auth?.tokens?.includes?.(req.headers.token);
 
   if (validToken && req.headers?.db) {
     const pg = pgClients[req.headers.db]

package/server/plugins/policy/funcs/checkPolicy.js

@@ -67,7 +67,6 @@ export default function checkPolicy(req, reply) {
   }
 
   const validToken = (req.ip === '193.239.152.181' || req.ip === '127.0.0.1' || req.ip?.startsWith?.('192.168.') || config.debug)
-    && req.headers?.uid
     && req.headers?.token
     && config.auth?.tokens?.includes?.(headers.token);
 

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

@@ -2,6 +2,8 @@ import {
   config, getAccess, getTemplate, getMeta, setToken, applyHook, getToken, pgClients,
 } from '../../../../utils.js';
 
+import extraDataGet from '../../../plugins/extra/extraDataGet.js';
+
 export default async function tableAPI(req) {
   const {
     pg = pgClients.client, params, user = {}, query = {},
@@ -85,8 +87,12 @@ export default async function tableAPI(req) {
       array: 1,
     })[0];
   }
+
+  await extraDataGet({ rows: [data], table: tableName, form: hookData?.form || tokenData?.form || loadTable.form }, pg);
+
   const res = await applyHook('afterTable', {
     pg, table: tableName, payload: [data], user,
   });
+
   return res || data || {};
 }