@opengis/fastify-table 1.1.18 → 1.1.20

package/Changelog.md

@@ -1,6 +1,10 @@
 # fastify-table
 
-## 1.1.18 - 01.10.2024
+## 1.1.20 - 02.10.2024
+
+- code optimization
+
+## 1.1.19 - 01.10.2024
 
 - custom hook support - addHook, applyHook
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/table/funcs/getFilterSQL/index.js

@@ -20,7 +20,10 @@ async function getFilterSQL({
 
   const sqlList = body?.sql?.length
     ? body?.sql?.filter((el) => !el.disabled && el?.sql?.replace)
-      .map((el) => ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `).join(' ')
+      .map((el, i) => {
+        Object.assign(el, { name: el.name || `t${i + 1}` });
+        return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
+      }).join(' ')
     : '';
   const fieldQuery = config.allTemplates?.table?.[table] ? `${config.allTemplates?.table?.[table]} limit 0`
     : `select * from ${body?.table || table} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 limit 0`;

package/widget/controllers/widget.get.js

@@ -33,7 +33,11 @@ export default async function widgetGet({
     left join lateral(
       select change_data_id, entity_key, value_new, value_old from log.table_changes_data where change_id=a.change_id
     )b on 1=1
-    where entity_id=$1 and b.change_data_id is not null order by cdate desc limit 100`,
+    where (entity_id=$1 or entity_id in (
+      select communication_id as comments from crm.communications where entity_id=$1
+      union all select file_id from crm.files where entity_id=$1
+      union all select checklist_id from crm.checklists where entity_id=$1)
+    ) and b.change_data_id is not null order by cdate desc limit 100`,
 
     checklist: pg.pk['admin.users']
       ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username,