@opengis/fastify-table 1.1.140 → 1.1.142

package/package.json

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

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

@@ -7,7 +7,7 @@ import logChanges from './utils/logChanges.js';
 const rclient = getRedis();
 
 export default async function dataDelete({
-  table, template, id, pg: pg1, uid,
+  table, tokenData, referer, id, pg: pg1, uid,
 }) {
   const pg = pg1 || getPG({ name: 'client' });
   const { pk } = await getMeta({ pg, table });
@@ -16,7 +16,7 @@ export default async function dataDelete({
   //  console.log(updateDataset);
   const res = await pg.query(delQuery, [id]).then(el => el.rows?.[0] || {});
   await logChanges({
-    pg, table, template, id, uid, type: 'DELETE',
+    pg, table, tokenData, referer, id, uid, type: 'DELETE',
   });
   rclient.incr(`pg:${table}:crud`);
   return res;

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

@@ -7,7 +7,7 @@ import logChanges from './utils/logChanges.js';
 const rclient = getRedis();
 
 export default async function dataInsert({
-  id, table, template, data, pg: pg1, uid,
+  id, table, tokenData, referer, data, pg: pg1, uid,
 }) {
   const pg = pg1 || getPG({ name: 'client' });
   if (!data) return null;
@@ -37,7 +37,7 @@ export default async function dataInsert({
   const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
 
   await logChanges({
-    pg, table, template, data, id: res.rows?.[0]?.[pg.pk[table]], uid, type: 'INSERT',
+    pg, table, tokenData, referer, data, id: res.rows?.[0]?.[pg.pk[table]], uid, type: 'INSERT',
   });
 
   rclient.incr(`pg:${table}:crud`);

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

@@ -18,7 +18,7 @@ function assignValue(key, i, srid = 4326, columnType = 'text') {
 }
 
 export default async function dataUpdate({
-  table, template, id, data, pg: pg1, uid,
+  table, tokenData, referer, id, data, pg: pg1, uid,
 }) {
   if (!data || !table || !id) return null;
 
@@ -57,7 +57,7 @@ export default async function dataUpdate({
   const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
 
   await logChanges({
-    pg, table, template, data, id, uid, type: 'UPDATE',
+    pg, table, tokenData, referer, data, id, uid, type: 'UPDATE',
   });
 
   rclient.incr(`pg:${table}:crud`);

package/server/plugins/crud/funcs/utils/logChanges.js

@@ -1,16 +1,17 @@
-import getMeta from '../../../pg/funcs/getMeta.js';
 import getTemplate from '../../..//table/funcs/getTemplate.js';
 import { metaFormat } from '@opengis/fastify-table/utils.js';
 
-const getValue = function (val) {
+function getValue(val) {
   if (!val) return null;
   return typeof val === 'object'
     ? JSON.stringify(val)?.substring?.(0, 30)
     : val?.toString?.()?.substring?.(0, 30);
 }
 
+// extract titles and cls from form schema
+// alt: extract table template from referer -> form
 export default async function logChanges({
-  pg, table, template, id, data, uid = 1, type,
+  pg, table, tokenData, referer, id, data, uid = 1, type,
 }) {
   if (!id) {
     console.error('param id is required');
@@ -53,13 +54,13 @@ export default async function logChanges({
 
     const old = type !== 'INSERT' ? await pg.query(q, [id, table]).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
 
-    const { columns = [] } = await getMeta({ table: 'log.table_changes_data' });
-    // const names = columns.map((el) => el.name);
-
-    const body = template ? await getTemplate('table', template) : null;
-    const cls = body?.columns?.filter(el => el.data)?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.data }), {}) || {};
-    Object.keys(data || {}).filter(key => typeof data[key] === 'boolean').forEach(key => Object.assign(cls, { [key]: 'yes_no' }));
-    const titles = (body?.columns || columns)?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua }), {});
+    const body = await getTemplate('form', tokenData?.form);
+    const schema = body?.schema || body || {};
+    const titles = Object.keys(schema)
+      .reduce((acc, curr) => Object.assign(acc, { [curr]: schema[curr].title || schema[curr].ua }), {});
+    const cls = Object.keys(schema)
+      .filter(el => schema[el]?.data)
+      .reduce((acc, curr) => Object.assign(acc, { [curr]: schema[curr].data }), {});
 
     if (data) {
       await metaFormat({ rows: [data], cls, sufix: false });
@@ -68,7 +69,7 @@ export default async function logChanges({
     const newObj = Object.fromEntries(Object.entries(data || {}).map(el => ([[titles[el[0]] || el[0]], el[1]])));
     const changesData = Object.keys(newObj || {}).map(el => ({
       change_id: changeId,
-      entity_key: titles[el] || el,
+      entity_key: titles[el[0]] || el,
       value_old: getValue(old?.[el]),
       value_new: type === 'DELETE' ? null : getValue(newObj?.[el]),
       uid,

package/server/plugins/pg/funcs/getMeta.js

@@ -7,7 +7,7 @@ export default async function getMeta(opt) {
   const pg = opt?.pg || getPG({ name: 'client' });
   const table = opt?.table || opt;
 
-  if (data[table]) return data[table];
+  if (data[pg.options.database]?.[table]) return data[pg.options.database][table];
 
   if (!pg.tlist?.includes(table?.replace?.(/"/g, ''))) {
     return { error: `${table} - not found`, status: 400 };
@@ -25,9 +25,23 @@ export default async function getMeta(opt) {
 
   const geomAttr = fields.find((el) => pg.pgType?.[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
 
+  const dbColumns = await pg.query(`select json_object_agg(
+    attname, 
+    json_build_object(
+      'title', pg_catalog.col_description(attrelid,attnum)
+      /*,'type', atttypid::regtype */
+    )
+  ) from pg_catalog.pg_attribute a 
+  where attrelid=$1::regclass and attnum>0`, [table]).then(el => el.rows?.[0]?.json_object_agg || {});
+
+  fields.forEach(el => Object.assign(el, { ...dbColumns[el.name] || {} }));
+
   const res = {
     pk, columns: fields, geom: geomAttr, view: pg.relkinds?.[table] === 'v',
   };
-  data[table] = res;
+  if (!data[pg.options.database]) {
+    data[pg.options.database] = {};
+  }
+  data[pg.options.database][table] = res;
   return res;
 }

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

@@ -3,14 +3,17 @@ import {
 } from '../../../../utils.js';
 
 export default async function deleteCrud(req) {
-  const { user, params = {} } = req || {};
+  const { user, params = {}, headers = {} } = req || {};
+
   const hookData = await applyHook('preDelete', {
     table: params?.table, id: params?.id, user,
   });
+
   if (hookData?.message && hookData?.status) {
     return { message: hookData?.message, status: hookData?.status };
   }
 
+  const { referer } = headers;
   const tokenData = await getToken({
     uid: user.uid, token: params.table, json: 1,
   });
@@ -29,7 +32,7 @@ export default async function deleteCrud(req) {
   if (!id) return { status: 404, message: 'id is required' };
 
   const data = await dataDelete({
-    table, id, uid: user?.uid, template: tokenData?.template || tokenData?.table,
+    table, id, uid: user?.uid, tokenData, referer,
   });
 
   return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };

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

@@ -5,13 +5,17 @@ import {
 
 export default async function insert(req) {
   const {
-    user = {}, params = {}, body = {},
+    user = {}, params = {}, body = {}, headers = {},
   } = req || {};
   if (!user) return { message: 'access restricted', status: 403 };
+
   const hookData = await applyHook('preInsert', { table: params?.table, user });
+
   if (hookData?.message && hookData?.status) {
     return { message: hookData?.message, status: hookData?.status };
   }
+
+  const { referer } = headers;
   const tokenData = await getToken({
     uid: user?.uid, token: params.table, mode: 'a', json: 1,
   });
@@ -57,7 +61,8 @@ export default async function insert(req) {
     table: loadTemplate?.table || table,
     data: body,
     uid: user?.uid,
-    template: tokenData?.template || tokenData?.table,
+    tokenData,
+    referer,
   });
   if (!res) return { message: 'nothing added ' };
 
@@ -75,7 +80,7 @@ export default async function insert(req) {
       const objId = body[schema[key].parent_id] || req.body?.id || res?.rows?.[0]?.[schema[key].parent_id] || pkey;
       const extraRows = await Promise.all(body[key].map(async (row) => {
         const extraRes = await dataInsert({
-          table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid: user?.uid, template: tokenData?.template,
+          table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid: user?.uid, tokenData, referer,
         });
         return extraRes?.rows?.[0];
       }));

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

@@ -79,7 +79,7 @@ export default async function tableAPI(req) {
   }
   if (user?.uid && actions?.includes?.('edit')) {
     data.token = tokenData?.table ? params.table : setToken({
-      ids: [JSON.stringify({ id, table: tableName, form: loadTable.form, template: params?.table })],
+      ids: [JSON.stringify({ id, table: tableName, form: loadTable.form })],
       uid: user.uid,
       array: 1,
     })[0];

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

@@ -6,8 +6,9 @@ import insert from './insert.js';
 
 export default async function update(req) {
   const {
-    pg = pgClients.client, user, params = {}, body = {}, unittest,
+    pg = pgClients.client, user, params = {}, body = {}, headers = {}, unittest,
   } = req;
+
   if (!user) return { message: 'access restricted', status: 403 };
   const hookData = await applyHook('preUpdate', {
     table: params?.table, id: params?.id, user,
@@ -16,6 +17,8 @@ export default async function update(req) {
   if (hookData?.message && hookData?.status) {
     return { message: hookData?.message, status: hookData?.status };
   }
+
+  const { referer } = headers;
   const tokenData = await getToken({
     uid: user.uid, token: body.token || params.table, mode: 'w', json: 1,
   });
@@ -64,7 +67,8 @@ export default async function update(req) {
     id,
     data: body,
     uid,
-    template: tokenData?.template || tokenData?.table,
+    tokenData,
+    referer,
   });
 
   // admin.custom_column
@@ -83,7 +87,7 @@ export default async function update(req) {
       // insert new extra data
       if (Array.isArray(body[key]) && body[key]?.length) {
         const extraRows = await Promise.all(body[key]?.map?.(async (row) => {
-          const extraRes = await dataInsert({ table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid, template: tokenData?.template || tokenData?.table });
+          const extraRes = await dataInsert({ table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid, tokenData, referer });
           return extraRes?.rows?.[0];
         }));
         Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });