@opengis/fastify-table 1.3.39 → 1.3.41

package/package.json

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

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

@@ -5,7 +5,6 @@ import pgClients from '../../pg/pgClients.js';
 
 import logChanges from './utils/logChanges.js';
 import extraData from '../../extra/extraData.js';
-import logger from '../../logger/getLogger.js';
 
 const rclient = getRedis();
 
@@ -28,33 +27,29 @@ export default async function dataInsert({
   if (!columns) return null;
 
   const names = columns.map((el) => el.name);
-  const types = columns.reduce((acc, { name, dataTypeID }) => ({ ...acc, [name]: pg.pgType?.[dataTypeID] }), {});
 
   Object.assign(data, {
     ...(id && pg.pk?.[table] ? { [pg.pk?.[table]]: id } : {}),
     ...(table !== 'admin.users' ? { uid } : {}),
+    editor_id: uid, created_by: uid, updated_by: uid,
     // editor_id: uid,
   });
-  const systemColumns = ['cdate', 'editor_date'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
+
+  const systemColumns = ['cdate', 'editor_date', 'created_at', 'updated_at'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
+  const systemColumnNames = systemColumns.map(el => el[0]);
 
   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;
-  }
+    .filter((el) => !systemColumnNames.includes(el) && (typeof data[el] === 'boolean' ? true : data[el]) && names.includes(el)).map((el) => [el, data[el]]);
 
   const insertQuery = `insert into ${table}
 
-    ( ${filterData?.map((key) => `"${key[0]}"`).concat(systemColumns.map((el) => el[0])).join(',')}) 
+    ( ${filterData?.map((key) => `"${key[0]}"`).concat(systemColumnNames).join(',')}) 
 
     values  (${filterData?.map((key, i) => (key[0] === 'geom' ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)` : `$${i + 1}`)).concat(systemColumns.map((el) => el[1])).join(',')}) 
     
     returning *`;
 
-  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && types[el[0]]?.includes?.('json') ? JSON.stringify(el[1]) : el[1]))]).catch(err => {
-    logger.file('crud/insert', { error: err.toString(), stack: err.stack, table, id, referer, uid, data, q: insertQuery });
-    throw new Error(err.toString());
-  }) || {};
+  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]))]) || {};
 
   const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
 

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

@@ -46,7 +46,7 @@ export default async function dataUpdate({
   const filterData = Object.keys(data)
     .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el) && !['editor_date', 'editor_id'].includes(el)));
 
-  const systemColumns = [['editor_date', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`] : []].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
+  const systemColumns = [['editor_date', 'now()', 'updated_at', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`, 'updated_by', `'${uid.replace(/'/g, "''")}'`] : []].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
 
   const filterValue = filterData.map((el) => {
     const { dataTypeID = 25 } = columns.find((col) => col?.name === el) || {};

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

@@ -21,7 +21,7 @@ function getExtraQuery(mainColumns, schema, table, pk) {
 }
 
 export default async function getFilterSQL({
-  table, filter, pg = pgClients.client, search, filterList, query, custom, state, uid,
+  table, filter, pg = pgClients.client, search, filterList, query, custom, state, uid, objectId,
 }) {
   if (!table) return { error: 'param table is required', status: 400 };
 
@@ -119,6 +119,7 @@ export default async function getFilterSQL({
       fields,
       filterList: filterList1,
       uid,
+      objectId,
     });
 
     // filter

package/server/plugins/table/funcs/getFilterSQL/util/getFilterQuery.js

@@ -8,16 +8,16 @@
 
 import formatValue from './formatValue.js';
 
-function getQuery({
-  pg, filter: filterStr, table, tableSQL, fields, filterList, uid,
+function getFilterQuery({
+  pg, filter: filterStr, table, tableSQL, fields, filterList, uid, objectId,
 }) {
   // if (!filterStr) return null; // filter list API
 
   const mainOperators = ['=', '~', '>', '<'];
 
   const filterQueryArray = decodeURIComponent(filterStr?.replace?.(/%/g, '%25')?.replace?.(/%/g, '\\%')?.replace?.(/(^,)|(,$)/g, ''))?.replace?.(/'/g, "''")?.split?.(/[;|]/) || [];
-  // default filter value form checkboxes, autocomplete or sql-defined only
-  const filterDefaultQueryArray = filterList?.filter?.(el => el.name && !filterStr?.includes?.(`${el.name}=`) && el.default && (el.options || el.sql))?.map?.((el) => `${el.name}=${el.default}`) || [];
+  // default filter value form checkboxes, autocomplete or sql-defined only - if not called from card
+  const filterDefaultQueryArray = !objectId ? (filterList?.filter?.(el => el.name && !filterStr?.includes?.(`${el.name}=`) && el.default && (el.options || el.sql))?.map?.((el) => `${el.name}=${el.default}`) || []) : [];
 
   // concat default + request filters
   const arr = filterQueryArray.concat(filterDefaultQueryArray).filter(el => el);
@@ -71,4 +71,4 @@ function getQuery({
   return resultList;
 }
 
-export default getQuery;
+export default getFilterQuery;

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

@@ -104,13 +104,14 @@ export default async function dataAPI(req, reply, called) {
     });
   }
 
-  const isdefault = (loadTable?.filter_list || [])
+  const objectId = tokenData?.id || hookData?.id || params.id;
+  const isdefault = !objectId ? (loadTable?.filter_list || [])
     .concat(loadTable?.filterInline || [])
     .concat(loadTable?.filterCustom || [])
     .concat(loadTable?.filterState || [])
     .concat(loadTable?.filterList || [])
     .concat(loadTable?.filters || [])
-    .find(el => el.default);
+    .find(el => el.default) : null;
 
   const checkFilter = [query.filter, query.search, query.state, query.custom, isdefault].filter((el) => el).length;
 
@@ -123,15 +124,16 @@ export default async function dataAPI(req, reply, called) {
     custom: query.custom,
     uid,
     json: 1,
+    objectId,
   }) : {};
 
   timeArr.push(Date.now());
 
-  const keyQuery = query.key && (loadTable?.key || tokenData?.key) && !(tokenData?.id || hookData?.id || params.id) ? `${loadTable?.key || tokenData?.key}=$1` : null;
+  const keyQuery = query.key && (loadTable?.key || tokenData?.key) && !objectId ? `${loadTable?.key || tokenData?.key}=$1` : null;
 
   const limit = called ? (query.limit || 20) : Math.min(maxLimit, +(query.limit || 20));
 
-  const offset = query.page && query.page > 0 && !(tokenData?.id || hookData?.id || params.id) ? ` offset ${(query.page - 1) * limit}` : '';
+  const offset = query.page && query.page > 0 && !objectId ? ` offset ${(query.page - 1) * limit}` : '';
   // id, query, filter
   const [orderColumn, orderDir] = (query.order || loadTable?.order || '').split(/[- ]/);
 
@@ -224,7 +226,7 @@ export default async function dataAPI(req, reply, called) {
   const { panels = [] } = index;
 
   const tokens = {};
-  if (template && (tokenData?.id || hookData?.id || params.id)) {
+  if (template && objectId) {
 
     // tokens result
     if (index?.tokens && typeof index?.tokens === 'object' && !Array.isArray(index?.tokens)) {