@opengis/fastify-table 1.3.57 → 1.3.59

package/package.json

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

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

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

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

@@ -50,7 +50,7 @@ export default async function tableAPI(req) {
   const formData = await getTemplate('form', formName) || {};
   const schema = formData?.schema || formData || {};
   // skip DataTable from another table
-  const extraKeys = Object.keys(schema).filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
+  const extraKeys = Object.keys(schema).filter((key) => schema[key]?.table && schema[key]?.parent_id && Object.hasOwn(schema[key], 'colModel'));
   // skip non-existing columns
   const columnList = dbColumns.map((el) => el.name || el).join(',');
 
@@ -62,7 +62,14 @@ export default async function tableAPI(req) {
   const geom = dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : '';
   const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${tableName} t where ${where.join(' and ') || 'true'} limit 1`;
 
-  if (query?.sql === '1') return q;
+  if (query?.sql === '1') {
+    const extraQ = extraKeys?.map((key) => {
+      const { colModel, table: extraTable, parent_id: parentId } = schema[key];
+      const colModel1 = Array.isArray(colModel) ? colModel : Object.values(colModel || {});
+      return colModel1.length ? `/*${key}*/ select ${parentId} as parent, ${colModel1.map((col) => col.name || col.key).join(',')} from ${extraTable} a where ${parentId}::text=$1` : null;
+    }).filter(el => el).join(';');
+    return `${q};${extraQ || ''}`.replace(/\$1/g, `'${id}'`);
+  }
 
   const data = await pg.query(q.replace(/{{uid}}/, user?.uid), [id]).then(el => el.rows[0]);
   if (!data) return { message: 'not found', status: 404 };
@@ -74,9 +81,10 @@ export default async function tableAPI(req) {
   if (extraKeys?.length) {
     await Promise.all(extraKeys?.map(async (key) => {
       const { colModel, table: extraTable, parent_id: parentId } = schema[key];
-      const q1 = `select ${parentId} as parent, ${colModel.map((col) => col.name || col.key).join(',')} from ${extraTable} a where ${parentId}=$1`;
+      const colModel1 = Array.isArray(colModel) ? colModel : Object.values(colModel || {});
+      const q1 = `select ${parentId} as parent, ${colModel1.map((col) => col.name || col.key).join(',')} from ${extraTable} a where ${parentId}=$1`;
       // console.log(tableName, formName, q1);
-      const { rows: extraRows } = await pg.query(q1, [hookData?.id || tokenData?.id || params?.id]);
+      const { rows: extraRows } = await pg.query(q1, [id]);
       Object.assign(data, { [key]: extraRows });
     }));
   }