@opengis/admin 0.2.118 → 0.2.120

package/server/routes/widget/controllers/widget.get.js

@@ -30,22 +30,37 @@ export default async function widgetGet({
     where entity_id=$1 order by cdate desc`
       : 'select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 order by cdate desc',
 
-    history: `SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
-    ${username} as username, u.login, u.avatar
-    FROM log.table_changes a
-    left join admin.users u on a.change_user_id = u.uid
-    left join lateral(
-      select json_agg(row_to_json(q)) from (
-        select change_data_id, entity_key, value_new, value_old from log.table_changes_data
-        where change_id=a.change_id
-      )q
-    )b on 1=1
-    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)
-    ) order by cdate desc 
-    limit 100`,
+    history: `select * from (
+      SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
+      ${username} as username, u.login, u.avatar
+      FROM log.table_changes a
+      left join admin.users u on a.change_user_id = u.uid
+      left join lateral(
+        select json_agg(row_to_json(q)) from (
+          select change_data_id, entity_key, value_new, value_old from log.table_changes_data
+          where change_id=a.change_id
+        )q
+      )b on 1=1
+      where b.json_agg is not null and (entity_id=$1 or entity_id in (
+        select communication_id as comments from crm.communications where entity_id=$1
+        union all select checklist_id from crm.checklists where entity_id=$1)
+      )
+
+    union all
+    select change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
+        ${username} as username, u.login, u.avatar
+        FROM log.table_changes a
+        left join admin.users u on a.change_user_id = u.uid
+            left join lateral(
+          select json_agg(o) from (
+            select json_object_agg(entity_key, coalesce(value_new, value_old)) as o from log.table_changes_data
+            where change_id=a.change_id and entity_key not in ('uid', 'file_status', 'editor_id', 'cdate', 'editor_date', 'entity_id')
+          )q 
+        )b on 1=1
+        where a.change_type in ('INSERT', 'DELETE') and a.entity_id in (select file_id from crm.files where entity_id=$1)
+        limit 100
+
+    )q 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, ${username} as username, u.login, u.avatar