@opengis/admin 0.2.78 → 0.2.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.2.78",
+  "version": "0.2.79",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

package/server/routes/data/controllers/tableFilter.js

@@ -55,7 +55,7 @@ export default async function tableFilter(req) {
         } */
         if (el.type === 'Autocomplete') return;
         const options = countArr.rows.map(cel => {
-            const data = cls.find(c => c.id === cel.id);
+            const data = cls.find(c => c.id.toString() === cel.id.toString());
             return { ...cel, ...data };
         });
         Object.assign(el, { options });

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

@@ -1,6 +1,7 @@
 import { getMeta, getToken, pgClients } from '@opengis/fastify-table/utils.js';
 
 const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+const username = `coalesce(u.sur_name,'')||coalesce(' '||u.user_name,'') ||coalesce(' '||u.father_name,'') as username`;
 
 /**
  * Дістає CRM для widget
@@ -16,17 +17,19 @@ export default async function widgetGet({
 
   const objectid = param ? JSON.parse(param)?.id : params.objectid;
 
-  if (!objectid) return { error: 'id required', status: 400 };
+  if (!objectid) {
+    return { message: 'id required', status: 400 };
+  }
 
   const sqls = {
     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 
+    ${username}, u.login, avatar 
     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 change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
-    (coalesce(coalesce(u.sur_name,'')||coalesce(' '||u.user_name,'') ||coalesce(' '||u.father_name,''),u.login)) as username
+    ${username}, u.login
     FROM log.table_changes a
     left join admin.users u on a.change_user_id = u.uid
     left join lateral(
@@ -43,20 +46,20 @@ export default async function widgetGet({
     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, 
+      ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username}, u.login,
     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: 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,
+    ${username}, u.login, 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`
       : `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,
+    ${username}, u.login, 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`
       : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
@@ -64,22 +67,24 @@ export default async function widgetGet({
 
   };
   const sql = sqls[params.type];
+
   if (!sql) {
-    return { error: 'param type not valid', status: 400 };
+    return { message: 'param type not valid', status: 400 };
   }
 
 
   /* data */
   const time = [Date.now()];
-  const { rows } = await pg.query(sql, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
+  const { rows = [] } = await pg.query(sql, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
+  rows.forEach(row => Object.assign(row, { username: row.username?.trim?.() || row.login }));
   time.push(Date.now());
 
   /* Object info  */
   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 = 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 q = tableName && pg.pk['admin.users'] ? `select ${username} as author, u.login, a.cdate, a.editor_date from ${tableName} a 
+  left join admin.users u on a.uid=u.uid where a.${pk}=$1 limit 1` : undefined;
   const data = pk && q ? await pg.one(q, [objectid]) : {};
 
   if (query.debug && user?.user_type === 'admin') {