@opengis/fastify-table 1.0.39 → 1.0.40

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.0.40 - 12.06.2024
+
+- fix widget GET API
+
 ## 1.0.39 - 29.05.2024
 
 - add getFolder func

package/index.js

@@ -27,7 +27,7 @@ async function plugin(fastify, opt) {
   fastify.decorate('getFolder', (req, type = 'server') => {
     if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
     const types = { local: req.root, server: req.mapServerRoot };
-    const filepath = path.posix.join(types[type] || '/data/local', req.folder || '');
+    const filepath = path.posix.join(types[type] || '/data/local', req.folder || config.folder || '');
     return filepath;
   });
 

package/package.json

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

package/widget/controllers/widget.get.js

@@ -23,25 +23,35 @@ export default async function widgetGet({
   if (!objectid) return { error: 'id required', status: 400 };
 
   const sqls = {
-    comment: `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
+    comment: pg.pk['admin.users']
+      ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
     coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, avatar 
-    from crm.communications c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`,
+    from crm.communications c left join admin.users u on u.uid=c.uid 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 table_change_id, entity_id, entity_type, change_key, change_date, json_old, json_new, date_old, 
     date_new, number_old, number_new, bool_old, bool_new, text_old, 
     text_new, uid, cdate FROM log.table_changes where entity_id=$1 order by cdate desc, change_key limit 100`,
 
-    checklist: `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
-    avatar FROM crm.checklists c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`,
+    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, 
+    avatar FROM crm.checklists c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`
+      : 'SELECT checklist_id, entity_id, subject, is_done, done_date, uid, cdate FROM crm.checklists where entity_id=$1 order by cdate desc',
 
-    file: `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
+    file: pg.pk['admin.users']
+      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
     coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
     avatar, c.uid as author, file_status FROM crm.files c left join admin.users u on u.uid=c.uid
-    where entity_id=$1 and file_status<>3 order by cdate desc`,
-    gallery: `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
+    where entity_id=$1 and file_status<>3 order by cdate desc`
+      : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, uid, cdate, file_type, ismain,
+      isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 order by cdate desc`,
+    gallery: pg.pk['admin.users']
+      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
     coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
     avatar, c.uid as author, file_status FROM crm.files c left join admin.users u on u.uid=c.uid
-    where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`,
+    where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`
+      : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
+      isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`,
 
   };
   const sql = sqls[params.type];
@@ -56,12 +66,12 @@ export default async function widgetGet({
     time.push(Date.now());
 
     /* Object info  */
-    const { tableName } = await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]);
+    const { tableName } = pg.pk['log.table_changes'] ? await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]) : {};
     const { pk } = await getMeta({ table: tableName });
 
-    const q = `select coalesce(b.user_name,'')||coalesce(' '||b.sur_name,'') as author, a.cdate, a.editor_date from ${tableName} a 
-    left join admin.users b on a.uid=b.uid where a.${pk}=$1 limit 1`;
-    const data = pk ? await pg.one(q, [objectid]) : {};
+    const q = tableName && pg.pk['admin.users'] ? `select coalesce(b.user_name,'')||coalesce(' '||b.sur_name,'') as author, a.cdate, a.editor_date from ${tableName} a 
+    left join admin.users b on a.uid=b.uid where a.${pk}=$1 limit 1` : undefined;
+    const data = pk && q ? await pg.one(q, [objectid]) : {};
 
     if (query.debug && user?.user_type === 'admin') {
       return {