@opengis/fastify-table 1.0.20 → 1.0.22

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.22 - 03.05.2024
+
+- getFilterSQL funcs
+
+## 1.0.21 - 03.05.2024
+
+- fix widget db structure
+
 ## 1.0.20 - 03.05.2024
 
 - fix filter separator

package/dblist/controllers/deleteItem.js

@@ -0,0 +1,12 @@
+import { existsSync } from 'fs';
+import { readFile, writeFile } from 'fs/promises';
+
+export default async function deleteItem({ params = {} }) {
+  const { id } = params;
+  if (!id) return { error: 'not enough params', status: 400 };
+  if (!existsSync('dblist.json')) return { data: [] };
+  const data = JSON.parse(await readFile('dblist.json') || '[]');
+
+  await writeFile('dblist.json', JSON.stringify(data.filter((el) => el.id !== id)));
+  return { data };
+}

package/dblist/controllers/insertItem.js

@@ -0,0 +1,17 @@
+import { randomUUID } from 'crypto';
+import { existsSync } from 'fs';
+import { readFile, writeFile } from 'fs/promises';
+
+import checkItem from './utils/checkItem.js';
+
+export default async function insertItem({ body = {} }) {
+  const check = checkItem(body.data);
+  if (check?.error) return check;
+
+  Object.assign(body.data, { id: randomUUID() });
+  const data = existsSync('dblist.json') ? JSON.parse(await readFile('dblist.json') || '[]') : [];
+  data.push(body.data);
+
+  await writeFile('dblist.json', JSON.stringify(data));
+  return { data };
+}

package/dblist/controllers/readItems.js

@@ -0,0 +1,7 @@
+import { existsSync } from 'fs';
+import { readFile } from 'fs/promises';
+
+export default async function readItemList() {
+  const data = existsSync('dblist.json') ? JSON.parse(await readFile('dblist.json') || '[]') : [];
+  return { data };
+}

package/dblist/controllers/updateItem.js

@@ -0,0 +1,22 @@
+import { existsSync } from 'fs';
+import { readFile, writeFile } from 'fs/promises';
+
+import checkItem from './utils/checkItem.js';
+
+export default async function updateItem({ body = {}, params = {} }) {
+  const { id } = params;
+  if (!id) return { error: 'not enough params', status: 400 };
+
+  if (!existsSync('dblist.json')) {
+    return { error: 'nothing to update: 1', status: 400 };
+  }
+
+  const check = checkItem(body.data);
+  if (check?.error) return check;
+
+  const data = JSON.parse(await readFile('dblist.json') || '[]');
+  data.filter((el) => el.id === id)?.forEach((el) => Object.assign(el, body.data));
+
+  await writeFile('dblist.json', JSON.stringify(data));
+  return { data };
+}

package/dblist/controllers/utils/checkItem.js

@@ -0,0 +1,9 @@
+export default function validateItem(item) {
+  if (!item || typeof item !== 'object' || Array.isArray(item)) {
+    return { error: 'param data is invalid: 1', status: 400 };
+  }
+  if (!item.options?.database || Object.keys(item).filter((key) => !['key', 'name', 'options'].includes(key) || (typeof item[key] !== 'string' && key !== 'options')).length) {
+    return { error: 'param data is invalid: 2', status: 400 };
+  }
+  return null;
+}

package/dblist/index.js

@@ -0,0 +1,40 @@
+import createItem from './controllers/insertItem.js';
+import readItemList from './controllers/readItems.js';
+import updateItem from './controllers/updateItem.js';
+import deleteItem from './controllers/deleteItem.js';
+
+export default async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.route({
+    method: 'POST',
+    url: `${prefix}/list`,
+    config: {
+      policy: [],
+    },
+    handler: createItem,
+  });
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/list`,
+    config: {
+      policy: [],
+    },
+    handler: readItemList,
+  });
+  fastify.route({
+    method: 'PUT',
+    url: `${prefix}/list/:id`,
+    config: {
+      policy: [],
+    },
+    handler: updateItem,
+  });
+  fastify.route({
+    method: 'DELETE',
+    url: `${prefix}/list/:id`,
+    config: {
+      policy: [],
+    },
+    handler: deleteItem,
+  });
+}

package/index.js

@@ -10,6 +10,7 @@ import notificationPlugin from './notification/index.js';
 import widgetPlugin from './widget/index.js';
 import crudPlugin from './crud/index.js';
 import policyPlugin from './policy/index.js';
+import dbListPlugin from './dblist/index.js';
 
 async function plugin(fastify, opt) {
   // console.log(opt);
@@ -31,6 +32,7 @@ async function plugin(fastify, opt) {
   crudPlugin(fastify, opt);
   notificationPlugin(fastify, opt);
   widgetPlugin(fastify, opt);
+  dbListPlugin(fastify, opt);
 }
 export default fp(plugin);
 // export { rclient };

package/package.json

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

package/server/migrations/crm.sql

@@ -24,10 +24,12 @@ ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS file_id text NOT NULL DEFAULT admi
 ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS upload_name text;
 ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS object_id text;
 ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS file_type text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS file_status numeric;
 ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS doc_type text;
 ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS title text;
 ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS size numeric;
 ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS ext text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS tags text[];
 ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS file_path text;
 ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS ismain boolean default false;
 ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS isverified boolean default false;

package/server/migrations/log.sql

@@ -3,6 +3,8 @@ ALTER TABLE log.table_change DROP CONSTRAINT IF EXISTS log_table_change_pkey;
 ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS table_change_id text NOT NULL DEFAULT admin.next_id();
 
 ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS table_name text;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS object_id text;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS change_type text;
 ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS change_key text;
 ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS change_date date;
 ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS json_old json;

package/table/controllers/search.js

@@ -1,41 +1,41 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-
-const maxLimit = 100;
-
-export default async function data({
-  pg, query = {},
-}) {
-  const time = Date.now();
-
-  const loadTable = await getTemplate('table', query.table);
-
-    if (!loadTable) { return { message: 'not found', status: 404 }; }
-
-  const { table, columns, meta } = loadTable;
-  const { pk } = await getMeta(table);
-
-  const cols = columns.map((el) => el.name || el).join(',');
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
-  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-
-  const limit = Math.min(maxLimit, +(query.limit || 10));
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-
-  const search = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : null;
-
-  const where = [loadTable.query, search].filter((el) => el);
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} * from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
-
-  if (query.sql === '1') return q;
-
-  const { rows } = await pg.query(q);
-
-  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
-
-  await metaFormat({ rows, table: query.table });
-  return {
-    time: Date.now() - time, total, count: rows.length, rows,
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+
+const maxLimit = 100;
+
+export default async function data({
+  pg, query = {},
+}) {
+  const time = Date.now();
+
+  const loadTable = await getTemplate('table', query.table);
+
+    if (!loadTable) { return { message: 'not found', status: 404 }; }
+
+  const { table, columns, meta } = loadTable;
+  const { pk } = await getMeta(table);
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
+  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+
+  const limit = Math.min(maxLimit, +(query.limit || 10));
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+
+  const search = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : null;
+
+  const where = [loadTable.query, search].filter((el) => el);
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} * from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
+
+  if (query.sql === '1') return q;
+
+  const { rows } = await pg.query(q);
+
+  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
+
+  await metaFormat({ rows, table: query.table });
+  return {
+    time: Date.now() - time, total, count: rows.length, rows,
+  };
+}

package/table/funcs/getFilterSQL/index.js

@@ -42,7 +42,7 @@ async function getFilterSQL({
       filter,
       tableSQL,
       fields,
-      filterList: filterList || (body?.filter_list || []).concat(body.filterInline || []).concat(body.filterCustom || []).concat(body.filterState || []).concat(body.filterList || []),
+      filterList: filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || []),
       pg,
       config,
     });

package/table/index.js

@@ -4,6 +4,7 @@ import search from './controllers/search.js';
 import filter from './controllers/filter.js';
 import form from './controllers/form.js';
 import metaFormat from './funcs/metaFormat/index.js';
+import getFilterSQL from './funcs/getFilterSQL/index.js';
 
 const tableSchema = {
   querystring: {
@@ -27,6 +28,7 @@ const searchTableSchema = {
 async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
   fastify.decorate('metaFormat', metaFormat);
+  fastify.decorate('getFilterSQL', getFilterSQL);
 
   fastify.get(`${prefix}/suggest/:data`, {}, suggest);
   fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node

package/test/api/dblist.test.js

@@ -0,0 +1,47 @@
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+import config from '../config.js';
+
+const prefix = config.prefix || '/api';
+
+test('api dblist', async (t) => {
+  const app = await build(t);
+  await t.test('GET /list', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/list`,
+    });
+    const rep = JSON.parse(res?.body);
+    assert.ok(rep.data);
+  });
+  let id;
+  await t.test('POST /list', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/list`,
+      body: { data: { key: 'testDB', name: 'testTitle', options: { database: 'mbk_kr_prod' } } },
+    });
+    const rep = JSON.parse(res?.body);
+    id = rep.data?.find((el) => el.key === 'testDB')?.id;
+    assert.ok(id);
+  });
+  await t.test('PUT /list/:id', async () => {
+    const res = await app.inject({
+      method: 'PUT',
+      url: `${prefix}/list/${id}`,
+      body: { data: { key: 'testDB1', name: 'testTitle1', options: { host: '192.168.3.160', database: 'mbk_kr_prod', port: 5434 } } },
+    });
+    const rep = JSON.parse(res?.body);
+    assert.ok(rep.data);
+  });
+  await t.test('DELETE /list/:id', async () => {
+    const res = await app.inject({
+      method: 'DELETE',
+      url: `${prefix}/list/${id}`,
+    });
+    const rep = JSON.parse(res?.body);
+    assert.ok(rep.data);
+  });
+});

package/test/widget.test.js

@@ -1,16 +1,16 @@
 import { test } from 'node:test';
 import assert from 'node:assert';
 
-import build from '../../helper.js';
+import build from '../helper.js';
 import config from '../config.js';
 
 const session = { passport: { user: { uid: config.testUser?.uid || '1' } } };
 
-import widgetGet from '../../widget/controllers/widget.get.js';
-import widgetSet from '../../widget/controllers/widget.set.js';
-import widgetDel from '../../widget/controllers/widget.del.js';
+import widgetGet from '../widget/controllers/widget.get.js';
+import widgetSet from '../widget/controllers/widget.set.js';
+import widgetDel from '../widget/controllers/widget.del.js';
 
-import pgClients from '../../pg/pgClients.js';
+import pgClients from '../pg/pgClients.js';
 
 test('api && funcs notification', async (t) => {
   const app = await build(t);

package/widget/controllers/utils/historyFormat.js

@@ -0,0 +1,76 @@
+import { readdir } from 'fs/promises';
+import { existsSync, readFileSync } from 'fs';
+
+// import getTemplate from '../../../table/controllers/utils/getTemplate.js';
+import getSelect from '../../../table/controllers/utils/getSelect.js';
+
+const dbData = {};
+
+// from config??
+const allTemplates = { table: {} };
+
+const historyQ = `select nspname||'.'||relname as table_name, json_agg(json_build_object('name',attname, 'title',coalesce(col_description(attrelid, attnum),attname))) as columns
+from pg_attribute a
+left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
+JOIN pg_class AS i
+  ON i.oid = a.attrelid 
+JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
+where a.attnum > 0 
+and not a.attisdropped
+group by nspname||'.'||relname`;
+
+export default async function historyFormat(rows, table, pg) {
+  if (!rows?.[0]?.changes) return rows; // old structure
+  // on startup
+  if (!allTemplates.table.length) {
+    const templateDir = './server/templates/table';
+    const templates = existsSync(templateDir) ? await readdir(templateDir) : [];
+    templates.forEach((template) => {
+      const body = JSON.parse(readFileSync(`${templateDir}/${template}`) || '{}');
+      Object.assign(allTemplates.table, { [template]: body });
+    });
+  }
+
+  const progrid = Object.keys(allTemplates.table).find((key) => key.replace('.json', '') === table);
+  if (!progrid) return rows;
+  // const body = await getTemplate('table', progrid);
+  const body = allTemplates.table[progrid];
+  const tableName = body?.table || table;
+  if (!tableName) return rows;
+
+  // get DB column description
+  if (!dbData?.[body.table]?.length) {
+    const { rows: rows1 } = await pg.query(historyQ);
+    rows1.forEach((row) => {
+      dbData[row.table_name] = row.columns;
+    });
+  }
+
+  // rewrite!!!
+  await Promise.all(rows?.map(async (op) => {
+    op.changes?.map(async (el) => {
+      const col = body.colModel.filter((col1) => col1.name === el.attr)[0] || dbData[body?.table]?.find((col1) => col1.name === el.attr);
+      if (el.attr === 'geom') {
+        el.title = 'Геометрія';
+      }
+      el.title = col?.ua || col?.title || el.attr;
+      if (!col) return;
+      el.type = col.type;
+      el.format = col.format;
+      const select = col.data || col.option || col.select;
+
+      // getSelect not equals to node
+      if (select && false) {
+        el.select = select;
+        const cls = await getSelect(select, {
+          val: [el.old, el.new],
+        });
+
+        el.oldf = cls[0] || el.old;
+        el.newf = cls[1] || el.new;
+      }
+    });
+  }));
+
+  return rows;
+}

package/widget/controllers/widget.del.js

@@ -29,8 +29,6 @@ export default async function widgetDel({
   const sql = {
     comment: 'delete from crm.comment where object_id=$1 and uid=$2 and comment_id=$3',
     checklist: 'delete from crm.checklist where object_id=$1 and uid=$2 and checklist_id=$3 ',
-    link: 'delete from crm.link where object_id=$1 and uid=$2 and link_id=$3 ',
-    time: 'delete from crm.elapsed_time where object_id=$1 and uid=$2 and elapsed_time_id=$3 ',
   };
   try {
     const { rows, rowCount } = await pg.query(sql[type], [objectid, user.uid, id]);

package/widget/controllers/widget.get.js

@@ -1,61 +1,6 @@
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-import getSelect from '../../table/controllers/utils/getSelect.js';
 import getToken from '../../crud/funcs/getToken.js';
 import getMeta from '../../pg/funcs/getMeta.js';
-// import setToken from '../../crud/funcs/setToken.js';
-
-const historyQ = `select nspname||'.'||relname as table_name, json_agg(json_build_object('name',attname, 'title',coalesce(col_description(attrelid, attnum),attname))) as columns
-from pg_attribute a
-left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
-JOIN pg_class AS i
-  ON i.oid = a.attrelid 
-JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
-where a.attnum > 0 
-and not a.attisdropped
-group by nspname||'.'||relname`;
-
-const dbData = {};
-
-async function historyFormat(rows, progrid, pg) {
-  if (!progrid) return rows;
-  const body = await getTemplate('table', progrid);
-  const tableName = body?.model || body?.table || progrid;
-
-  // get DB column description
-  if (!dbData?.[tableName]?.length) {
-    const { rows: rows1 } = await pg.query(historyQ);
-    rows1.forEach((row) => {
-      dbData[row.table_name] = row.columns;
-    });
-  }
-
-  await Promise.all(rows?.map(async (op) => {
-    op.changes?.map(async (el) => {
-      const col = body.colModel.filter((col1) => col1.name === el.attr)[0] || dbData[tableName]?.find((col1) => col1.name === el.attr);
-      if (el.attr === 'geom') {
-        el.title = 'Геометрія';
-      }
-      el.title = col?.ua || col?.title || el.attr;
-      if (!col) return;
-      el.type = col.type;
-      el.format = col.format;
-      const select = col.data || col.option || col.select;
-
-      // getSelect not equals to node
-      if (select && false) {
-        el.select = select;
-        const cls = await getSelect(select, {
-          val: [el.old, el.new],
-        });
-
-        el.oldf = cls[0] || el.old;
-        el.newf = cls[1] || el.new;
-      }
-    });
-  }));
-
-  return rows;
-}
+import historyFormat from './utils/historyFormat.js';
 
 /**
  * Дістає CRM для widget
@@ -73,36 +18,24 @@ export default async function widgetGet({
 
   const objectid = param ? JSON.parse(param)?.id : params.objectid;
 
-  if (!['comment', 'history', 'file', 'checklist', 'link', 'time'].includes(params.type)) return { error: 'param type not valid', status: 400 };
+  if (!['comment', 'history', 'file', 'checklist'].includes(params.type)) return { error: 'param type not valid', status: 400 };
   if (!objectid) return { error: 'id required', status: 400 };
 
   const sql = {
     comment: `select body,c.cdate, comment_id,object_id,c.uid, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username,avatar 
-    from crm.comment c left join admin.users u on u.uid=c.uid   where object_id=$1 order by cdate desc`,
+    from crm.comment c left join admin.users u on u.uid=c.uid where object_id=$1 order by cdate desc`,
 
-    history1: `select _column attr, c.cdate,_old "old",_new "new", c.uid, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
-     avatar,pk_id from log.table_row_log c left join admin.users u on u.uid=c.uid  where pk_id=$1 and _type='UPDATE' order by cdate desc limit 100`,
-
-    history: `SELECT  operation_id, _type, c.uid, c.cdate, json_agg(json_build_object('attr',_column,'old', _old,'new', _new)) as changes, pk_id,
-    (select coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username from  admin.users u where u.uid=c.uid) username from log.table_row_log c 
-      
-      where pk_id=$1 and _type='UPDATE' 
-      group by operation_id,_type,c.uid,c.cdate,c.pk_id
-      order by cdate desc limit 100`,
+    history: `SELECT object_id, table_name, 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_change where object_id=$1 order by cdate desc, change_key limit 100`,
 
     checklist: `SELECT checklist_id, title, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
-     avatar  FROM crm.checklist c left join admin.users u on u.uid=c.uid where object_id=$1 order by cdate desc`,
-
-    link: `SELECT link_id, link, title, meta FROM crm.link 
-     where object_id=$1 order by cdate desc`,
+    avatar  FROM crm.checklist c left join admin.users u on u.uid=c.uid where object_id=$1 order by cdate desc`,
 
-    time: `SELECT elapsed_time_id, time, description from crm.elapsed_time 
-     where object_id=$1 order by cdate desc `,
-
-    file: `SELECT file_id, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.main,
-    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, verif,
-     avatar, c.author,publicate,doc_date,describe, cls_type
-     FROM admin.doc_file c left join admin.users u on u.uid=c.uid  where object_id=$1 and file_status<>3 order by cdate desc`,
+    file: `SELECT file_id, 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.file c left join admin.users u on u.uid=c.uid
+    where object_id=$1 and file_status<>3 order by cdate desc`,
 
   };
   try {
@@ -112,26 +45,22 @@ export default async function widgetGet({
     time.push(Date.now());
 
     /* Object info  */
-    const { tableName } = await pg.one(`select _table as "tableName",pk_id from log.table_row_log c 
-    where pk_id = $1 /*and _type ='INSERT'*/ limit 1`, [objectid]);
+    const { tableName } = await pg.one('select table_name as "tableName" from log.table_change where object_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 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]) : {};
+
     if (query.debug && user?.user_type === 'admin') {
       return {
         sql, type: params.type, q, id: objectid, data,
       };
     }
 
-    const progrid = null; /* tableName ? table || Object.keys(db.progrid)
-      .filter((el) => db.progrid[el]?.model === tableName || db.progrid[el]?.includes?.(`"${tableName}"`))[0] : null; */
-
     time.push(Date.now());
     return {
-      progrid,
       time: { data: time[1] - time[0], format: time[2] - time[1] },
-      rows: params.type === 'history' ? await historyFormat(rows, progrid, pg) : rows,
+      rows: params.type === 'history' ? await historyFormat(rows, tableName, pg) : rows,
       user: { uid: user?.uid, name: user?.user_name },
       data: { author: data?.author, cdate: data?.cdate, edate: data?.editor_date },
       objectid: params.objectid,

package/widget/controllers/widget.set.js

@@ -3,14 +3,10 @@ import getMeta from '../../pg/funcs/getMeta.js';
 
 const tableList = {
   comment: 'crm.comment',
-  link: 'crm.link',
-  time: 'crm.elapsed_time',
   checklist: 'crm.checklist',
 };
 const pkList = {
   comment: 'comment_id',
-  link: 'link_id',
-  time: 'elapsed_time_id',
   checklist: 'checklist_id',
 };
 
@@ -19,7 +15,7 @@ export default async function widgetSet({
 }) {
   const { user = {} } = session.passport || {};
   const { type, id, objectid } = params;
-  if (!['comment', 'checklist', 'link', 'time'].includes(type)) return { error: 'param type not valid', status: 400 };
+  if (!['comment', 'checklist'].includes(type)) return { error: 'param type not valid', status: 400 };
   if (!objectid) return { error: 'id required', status: 400 };
 
   const table = tableList[type];