@opengis/fastify-table 1.1.138 → 1.1.139

package/package.json

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

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

@@ -57,7 +57,7 @@ export default async function logChanges({
     // 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 }), {});
+    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 }), {});
 
@@ -67,17 +67,15 @@ export default async function logChanges({
       change_id: changeId,
       entity_key: titles[el] || el,
       value_old: getValue(old?.[el]),
-      value_new: getValue(newObj?.[el]),
+      value_new: type === 'DELETE' ? null : getValue(newObj?.[el]),
       uid,
     })).filter(el => el?.value_new !== el?.value_old);
 
     const res = await Promise.all(changesData.map(async (el) => {
-      const filterData = Object.entries(el);
+      const insertQuery = `insert into log.table_changes_data (${Object.entries(el)?.map((key) => `"${key[0]}"`).join(',')}) 
+      values (${Object.entries(el)?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;
 
-      const insertQuery = `insert into log.table_changes_data (${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
-      values (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;
-
-      const { rows = [] } = await pg.query(insertQuery, [...filterData.map((el1) => (el1[1] && typeof el1[1] === 'object' && (!Array.isArray(el1[1]) || typeof el1[1]?.[0] === 'object') ? JSON.stringify(el1[1]) : el1[1]))]) || {};
+      const { rows = [] } = await pg.query(insertQuery, [...Object.entries(el).map((el1) => (el1[1] && typeof el1[1] === 'object' && (!Array.isArray(el1[1]) || typeof el1[1]?.[0] === 'object') ? JSON.stringify(el1[1]) : el1[1]))]) || {};
       return rows[0];
     }));
 

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

@@ -29,7 +29,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,
+    table, id, uid: user?.uid, template: tokenData?.template || tokenData?.table,
   });
 
   return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };

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

@@ -57,7 +57,7 @@ export default async function insert(req) {
     table: loadTemplate?.table || table,
     data: body,
     uid: user?.uid,
-    template: tokenData?.template,
+    template: tokenData?.template || tokenData?.table,
   });
   if (!res) return { message: 'nothing added ' };
 

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

@@ -64,7 +64,7 @@ export default async function update(req) {
     id,
     data: body,
     uid,
-    template: tokenData?.template,
+    template: tokenData?.template || tokenData?.table,
   });
 
   // admin.custom_column
@@ -83,7 +83,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 });
+          const extraRes = await dataInsert({ table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid, template: tokenData?.template || tokenData?.table });
           return extraRes?.rows?.[0];
         }));
         Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });