@opengis/fastify-table 1.0.89 → 1.0.90

package/test/api/table.test.js

@@ -1,89 +1,89 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-import pgClients from '../../pg/pgClients.js';
-import init from '../../pg/funcs/init.js';
-
-import build from '../../helper.js';
-import config from '../config.js';
-
-test('api table', async (t) => {
-  const app = await build(t);
-  await init(pgClients.client);
-
-  const bbox = '20.276526313524393 40.6651677831094,35.27752631352439 50.66616778310941';
-  const { count = 0 } = await pgClients.client.query(`select count(*) from gis.dataset 
-  where geom && 'box(${bbox})'::box2d`)
-    .then((res) => res.rows[0] || {});
-
-  await t.test('GET /data (meta bbox / cls)', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${config.prefix || '/api'}/data/test.dataset.table?bbox=${bbox}`,
-    });
-    const json = res.json();
-    assert.ok(json?.rows?.length === +count, 'meta bbox - not ok');
-    assert.ok(json?.rows?.length ? json?.rows?.[0]?.dataset_id_text : true, 'meta cls - not ok');
-  });
-
-  const polyline = 'wfvkH_jsvCoKvj@oKfiB?fw@?nd@?nK?nK~WgEfE?wQfw@gEfE?vQwQvj@wQvcAoKvQoKnKgEnd@_cBgw@wj@fEwj@nKg^vQg^oK?vQgEnKgpAvj@?vcAfEf^fEf^?vj@vQvj@vQgE~Wvj@?~p@gE~iAfEnK?~iA_XnvA?nd@fEf^~p@~bBvQ?nd@wQ?vQfEf^fEnK?vQ?vj@oKfEoKfEvQnd@nKvj@?vQfEvQgEf^gEf^?vQfEvQfEvQfE~W?fE?fE?~W?f^?nd@?nK?nKfEfEg^oKwj@nK_X~W~p@~WvQnKoKn}@wQvj@oK~Wg^vcAgEnK?~Wfw@vgD~p@oKfpAvQnd@nKoKvQoKvQ?fE?fEnKvj@wQvQ?fEod@fw@~Wn}@fEn}@_Xv|A_jA~fEwQwQ_XoKwQoKoKoKoKoKg^gE_XgEoKg^gEgEgE?gEfEgEfEgEf^_XoKwQ?gEgEoK?wQ?gE~WoKoKoKwQfEgEnK_X?gEgE?oKfEoKoKgE_XgEgEwQfEoKod@_Xgw@gEoKgE_Xg^wQoKg^_XnvAgE?gEvQgE?od@fpA?vQ?f^oKvcAwj@oKg^?wQn}@gEf^oK?w|AnKgE??nKwj@gEgEg^oKwQoKoK?gEwQoaD?oKod@oKod@gEod@wQo}@oKfEf^gEfEgpAnd@_XfEgE?wQnKo}@_q@?gEgEwj@?oK?oK?_X?oKfEoK?oKfEoK?oK?oK?gEfEoKwQfEoK?gEwQwj@nKo}@nKwQ~Wod@nKoKfEgw@ovAgEwQgE??oKoKgEoKgEgEwQ?oKfEoKnKwQfEwQoK?g^fE?wQfEg^fEod@gE??fEoKvQ?nKoKnKgEfEgEgE?g^nK_q@nKod@?oKoKoK~Wgw@fEoKnd@fE?_XfEoKfEwQfEoKfEwQfEoKvQ?fEfE?vj@gE~W~WvQvQwj@vQvQf^o}@nKvQ?_XgEg^gEg^nKod@?wQgEgEgE?oK_XgEoK?oKgEoKgE_XoKg^oKg^oKod@?gEfEoKvQgEnK?nKfE?_Xnd@gw@fEwQf^wj@fEwQnd@w|A?gEgEgEgEwQfEoKfEgEnKoKnKwQfEgE?oKfEoKnKgEnKwQ_XwQnKwcAod@wQvQod@~Wgw@nKgw@oKg^f^ovAgEwQ?_X?od@gEwj@gEwQvQg^fEoKnKoKvQnK~WfEnKvQ~Wod@f^wj@~WoKnKg^~W?vQgE~WoKnKoK~WoKfEwQvQwQfEgEnKwQnKwQvQwQnKoKnKgEnKgEnKgEvQnKnK?fE?fE?~WwQnKgEnKgEfE?fE?nK?fE?fE?vQgEfE?nKfEfE?fE?vQ?~W?~WgEfEgEnKgEnKwQfEnKnKfE?wj@?o}@g^o}@_Xod@?gEf^_X?o}@?wQ~W?~WgE~WgEfE?f^gEf^oK~Wg^nKgE?oK~WwQ?od@nK_XfEwQnKoKfEgEfE~W?f^f^fEfEfEnKfEnK?gEf^vQfEnK?~WnKvQnK?vQf^nKfEfEgE~WnKfEnK?fEgEfE?nK?fEfEfEgEnK?nKgEnK?nKfEf^?vQgEvQ?nd@gEnKo}@vQgE~WgEf^gE'; // UA26040270000047749
-
-  const { count1 } = await pgClients.client.query('select count(*) as count1 from gis.dataset where ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline($1)),geom)', [polyline])
-    .then((res) => res.rows[0] || {});
-  await t.test('GET /data (meta polyline)', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${config.prefix || '/api'}/data/test.dataset.table?polyline=${polyline}`,
-    });
-    const json = res.json();
-    assert.ok(json?.rows?.length === +count1, 'meta bbox (polyline) - not ok');
-  });
-
-  /* await t.test('GET /suggest', async () => {
-      const res = await app.inject({
-        method: 'GET',
-        url: '/api/suggest/test.storage.data',
-      });
-      // console.log(res?.body);
-      const rep = JSON.parse(res?.body);
-      // console.log(rep.total);
-      assert.ok(rep.total);
-    }); */
-  /* await t.test('GET /data', async () => {
-      const res = await app.inject({
-        method: 'GET',
-        url: '/api/data/test.dataset.table',
-      });
-      // console.log(res);
-      const rep = JSON.parse(res?.body);
-      // console.log(rep.total);
-      assert.ok(rep.total);
-    }); */
-  /* await t.test('GET /search', async () => {
-      const res = await app.inject({
-        method: 'GET',
-        url: '/api/search?table=test.dataset.table&key=0',
-      });
-      const rep = JSON.parse(res?.body);
-      assert.ok(rep.total);
-    }); */
-  await t.test('GET /form', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: '/api/form/test.dataset.form',
-    });
-      // console.log(res);
-    const rep = JSON.parse(res?.body);
-    // console.log(rep.total);
-    assert.ok(rep);
-  });
-  await t.test('GET /filter', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: '/api/filter/test.dataset.table',
-    });
-      // console.log(res);
-    const rep = JSON.parse(res?.body);
-    // console.log(rep.total);
-    assert.ok(rep);
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+import pgClients from '../../pg/pgClients.js';
+import init from '../../pg/funcs/init.js';
+
+import build from '../../helper.js';
+import config from '../config.js';
+
+test('api table', async (t) => {
+  const app = await build(t);
+  await init(pgClients.client);
+
+  const bbox = '20.276526313524393 40.6651677831094,35.27752631352439 50.66616778310941';
+  const { count = 0 } = await pgClients.client.query(`select count(*) from gis.dataset 
+  where geom && 'box(${bbox})'::box2d`)
+    .then((res) => res.rows[0] || {});
+
+  await t.test('GET /data (meta bbox / cls)', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${config.prefix || '/api'}/data/test.dataset.table?bbox=${bbox}`,
+    });
+    const json = res.json();
+    assert.ok(json?.rows?.length === +count, 'meta bbox - not ok');
+    assert.ok(json?.rows?.length ? json?.rows?.[0]?.dataset_id_text : true, 'meta cls - not ok');
+  });
+
+  const polyline = 'wfvkH_jsvCoKvj@oKfiB?fw@?nd@?nK?nK~WgEfE?wQfw@gEfE?vQwQvj@wQvcAoKvQoKnKgEnd@_cBgw@wj@fEwj@nKg^vQg^oK?vQgEnKgpAvj@?vcAfEf^fEf^?vj@vQvj@vQgE~Wvj@?~p@gE~iAfEnK?~iA_XnvA?nd@fEf^~p@~bBvQ?nd@wQ?vQfEf^fEnK?vQ?vj@oKfEoKfEvQnd@nKvj@?vQfEvQgEf^gEf^?vQfEvQfEvQfE~W?fE?fE?~W?f^?nd@?nK?nKfEfEg^oKwj@nK_X~W~p@~WvQnKoKn}@wQvj@oK~Wg^vcAgEnK?~Wfw@vgD~p@oKfpAvQnd@nKoKvQoKvQ?fE?fEnKvj@wQvQ?fEod@fw@~Wn}@fEn}@_Xv|A_jA~fEwQwQ_XoKwQoKoKoKoKoKg^gE_XgEoKg^gEgEgE?gEfEgEfEgEf^_XoKwQ?gEgEoK?wQ?gE~WoKoKoKwQfEgEnK_X?gEgE?oKfEoKoKgE_XgEgEwQfEoKod@_Xgw@gEoKgE_Xg^wQoKg^_XnvAgE?gEvQgE?od@fpA?vQ?f^oKvcAwj@oKg^?wQn}@gEf^oK?w|AnKgE??nKwj@gEgEg^oKwQoKoK?gEwQoaD?oKod@oKod@gEod@wQo}@oKfEf^gEfEgpAnd@_XfEgE?wQnKo}@_q@?gEgEwj@?oK?oK?_X?oKfEoK?oKfEoK?oK?oK?gEfEoKwQfEoK?gEwQwj@nKo}@nKwQ~Wod@nKoKfEgw@ovAgEwQgE??oKoKgEoKgEgEwQ?oKfEoKnKwQfEwQoK?g^fE?wQfEg^fEod@gE??fEoKvQ?nKoKnKgEfEgEgE?g^nK_q@nKod@?oKoKoK~Wgw@fEoKnd@fE?_XfEoKfEwQfEoKfEwQfEoKvQ?fEfE?vj@gE~W~WvQvQwj@vQvQf^o}@nKvQ?_XgEg^gEg^nKod@?wQgEgEgE?oK_XgEoK?oKgEoKgE_XoKg^oKg^oKod@?gEfEoKvQgEnK?nKfE?_Xnd@gw@fEwQf^wj@fEwQnd@w|A?gEgEgEgEwQfEoKfEgEnKoKnKwQfEgE?oKfEoKnKgEnKwQ_XwQnKwcAod@wQvQod@~Wgw@nKgw@oKg^f^ovAgEwQ?_X?od@gEwj@gEwQvQg^fEoKnKoKvQnK~WfEnKvQ~Wod@f^wj@~WoKnKg^~W?vQgE~WoKnKoK~WoKfEwQvQwQfEgEnKwQnKwQvQwQnKoKnKgEnKgEnKgEvQnKnK?fE?fE?~WwQnKgEnKgEfE?fE?nK?fE?fE?vQgEfE?nKfEfE?fE?vQ?~W?~WgEfEgEnKgEnKwQfEnKnKfE?wj@?o}@g^o}@_Xod@?gEf^_X?o}@?wQ~W?~WgE~WgEfE?f^gEf^oK~Wg^nKgE?oK~WwQ?od@nK_XfEwQnKoKfEgEfE~W?f^f^fEfEfEnKfEnK?gEf^vQfEnK?~WnKvQnK?vQf^nKfEfEgE~WnKfEnK?fEgEfE?nK?fEfEfEgEnK?nKgEnK?nKfEf^?vQgEvQ?nd@gEnKo}@vQgE~WgEf^gE'; // UA26040270000047749
+
+  const { count1 } = await pgClients.client.query('select count(*) as count1 from gis.dataset where ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline($1)),geom)', [polyline])
+    .then((res) => res.rows[0] || {});
+  await t.test('GET /data (meta polyline)', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${config.prefix || '/api'}/data/test.dataset.table?polyline=${polyline}`,
+    });
+    const json = res.json();
+    assert.ok(json?.rows?.length === +count1, 'meta bbox (polyline) - not ok');
+  });
+
+  /* await t.test('GET /suggest', async () => {
+      const res = await app.inject({
+        method: 'GET',
+        url: '/api/suggest/test.storage.data',
+      });
+      // console.log(res?.body);
+      const rep = JSON.parse(res?.body);
+      // console.log(rep.total);
+      assert.ok(rep.total);
+    }); */
+  /* await t.test('GET /data', async () => {
+      const res = await app.inject({
+        method: 'GET',
+        url: '/api/data/test.dataset.table',
+      });
+      // console.log(res);
+      const rep = JSON.parse(res?.body);
+      // console.log(rep.total);
+      assert.ok(rep.total);
+    }); */
+  /* await t.test('GET /search', async () => {
+      const res = await app.inject({
+        method: 'GET',
+        url: '/api/search?table=test.dataset.table&key=0',
+      });
+      const rep = JSON.parse(res?.body);
+      assert.ok(rep.total);
+    }); */
+  await t.test('GET /form', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/form/test.dataset.form',
+    });
+      // console.log(res);
+    const rep = JSON.parse(res?.body);
+    // console.log(rep.total);
+    assert.ok(rep);
+  });
+  await t.test('GET /filter', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/filter/test.dataset.table',
+    });
+      // console.log(res);
+    const rep = JSON.parse(res?.body);
+    // console.log(rep.total);
+    assert.ok(rep);
+  });
+});

package/util/controllers/logger.file.js

@@ -0,0 +1,90 @@
+import path from 'path';
+import { lstat, readdir } from 'fs/promises';
+import { createReadStream, existsSync } from 'fs';
+import readline from 'readline';
+
+import checkUserAccess from './utils/checkUserAccess.js';
+import getRootDir from './utils/getRootDir.js';
+
+/**
+ *
+ * @method GET
+ * @summary API для перегляду логів
+ *
+ */
+
+export default async function loggerFile({
+  pg, params = {}, user = {}, query = {}, originalUrl, funcs = {},
+}, reply) {
+  const limit = 200000;
+  const access = pg ? await checkUserAccess({ user, pg }) : {};
+
+  const { config = {} } = funcs;
+  if (access?.status === 403 && !config?.local) return access;
+
+  // absolute / relative path
+  const rootDir = getRootDir(config);
+  const filepath = path.join(rootDir, params['*'] || '');
+
+  if (!existsSync(filepath)) {
+    return { error: 'file not exists', status: 404 };
+  }
+  const stat = await lstat(filepath);
+  const isFile = stat.isFile();
+
+  if (query.download && isFile) {
+    return reply.download(filepath);
+  }
+
+  if (query.full && isFile) {
+    if (stat.size > 20 * 1000 * 1000) {
+      return { message: 'file size > 20MB' };
+    }
+    const buffer = await readFile(filepath, { buffer: true });
+    return buffer;
+  }
+
+  if (isFile) {
+    const ext = path.extname(filepath);
+
+    const lines = await new Promise((resolve) => {
+      const rl = readline.createInterface({
+        input: createReadStream(filepath, { start: stat.size > limit ? stat.size - limit : 0 }),
+      });
+      const lines1 = [];
+      rl.on('close', () => resolve(lines1));
+      rl.on('line', (line) => lines1.push(line));
+    });
+
+    if (ext === '.html') {
+      const buffer = await readFile(filepath, { buffer: true });
+      reply.headers({ 'Content-type': 'text/html; charset=UTF-8' });
+      return buffer;
+    }
+
+    reply.headers({ 'Content-type': 'text/plain' });
+    return stat.size > limit && lines.length > 1
+      ? lines.reverse().slice(0, -1).join('\n')
+      : lines.reverse().join('\n');
+  }
+
+  // dir
+  const files = await readdir(filepath);
+
+  if (query.dir) {
+    return files.filter((el) => !['backup', 'marker_icon', 'error', 'migration'].includes(el));
+  }
+
+  const lstatsArr = await Promise.all(files.map(async (file) => [file, await lstat(path.join(filepath, file))]));
+  const lstats = Object.fromEntries(lstatsArr);
+
+  const message = (params['*'] ? '<a href="/logger-file/">...</a><br>' : '')
+    + files.map((file) => `<a href="${originalUrl}/${file}">${file}</a> (${lstats[file].size} bytes)`).join('</br>');
+
+  reply.headers({
+    'Content-Type': 'text/html; charset=UTF-8',
+    'Content-Security-Policy': "default-src 'none'",
+    'X-Content-Type-Options': 'nosniff',
+  });
+  return message;
+}

package/util/controllers/status.monitor.js

@@ -1,8 +1,8 @@
-const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`;
-
-export default async function statusMonitor() {
-  const memoryUsage = process.memoryUsage();
-  const message = Object.keys(memoryUsage)
-    .reduce((acc, curr) => Object.assign(acc, { [curr]: formatMemoryUsage(memoryUsage[curr]) }), {});
-  return { message, status: 200 };
-}
+const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`;
+
+export default async function statusMonitor() {
+  const memoryUsage = process.memoryUsage();
+  const message = Object.keys(memoryUsage)
+    .reduce((acc, curr) => Object.assign(acc, { [curr]: formatMemoryUsage(memoryUsage[curr]) }), {});
+  return { message, status: 200 };
+}

package/util/controllers/utils/checkUserAccess.js

@@ -0,0 +1,19 @@
+/**
+ * 
+ * @summary check user access to logger interface - per admin user type or user group
+ * @returns {Object} message, status
+ */
+
+export default async function checkUserAccess({
+  user = {}, pg,
+}) {
+    const { count = '0' } = pg.pk?.['admin.access']
+      ? await pg.query(`select count(*) from admin.access 
+        where user_uid=$1 and route_id='logger'`, [user.uid]).then((res) => res.rows[0] || {})
+      : {};
+
+    if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
+      return { message: 'access restricted', status: 403 };
+    }
+    return { message: 'access granted', status: 200 };
+}

package/util/controllers/utils/getRootDir.js

@@ -0,0 +1,21 @@
+import path from 'path';
+import { existsSync } from 'fs';
+
+export default function getRootDir(config) {
+  // absolute / relative path
+  if (config.log?.dir) {
+    return config.log.dir.startsWith('/') || config.log.dir.includes(':')
+      ? config.log.dir
+      : path.join(process.cwd(), config.log.dir);
+  }
+
+  // windows debug support
+  const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
+  // docker default path
+  if (existsSync(customLogDir)) {
+    return path.join(customLogDir, config.folder || '', 'log');
+  }
+
+  // non-docker default path
+  return path.join(config.root || '/data/local', config.folder || '', 'log');
+}

package/util/index.js

@@ -1,21 +1,23 @@
-import getExtraProperties from './controllers/properties.get.js';
-import addExtraProperties from './controllers/properties.add.js';
-import nextId from './controllers/next.id.js';
-import statusMonitor from './controllers/status.monitor.js';
-
-const propertiesSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-
-  fastify.get(`${prefix}/next-id`, {}, nextId);
-  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
-  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
-  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
-}
-
-export default plugin;
+import getExtraProperties from './controllers/properties.get.js';
+import addExtraProperties from './controllers/properties.add.js';
+import nextId from './controllers/next.id.js';
+import statusMonitor from './controllers/status.monitor.js';
+import loggerFile from './controllers/logger.file.js';
+
+const propertiesSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+
+  fastify.get(`${prefix}/next-id`, {}, nextId);
+  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
+  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
+  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
+  fastify.get('/logger-file/*', { config: { policy: ['log'] } }, loggerFile);
+}
+
+export default plugin;

package/widget/controllers/utils/historyFormat.js

@@ -1,76 +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;
-}
+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/utils/obj2db.js

@@ -1,13 +1,13 @@
-export default function obj2db(data, nonexistCol) {
-  if (
-    typeof data !== 'object'
-        || Array.isArray(data)
-        || !Object.keys(data || {}).length
-  ) return { error: 'invalid data type' };
-
-  const existColumns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
-  const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
-  const args = columns?.map((col) => data[col]);
-
-  return { columns, args, error: !columns?.length ? 'nothing to process' : undefined };
-}
+export default function obj2db(data, nonexistCol) {
+  if (
+    typeof data !== 'object'
+        || Array.isArray(data)
+        || !Object.keys(data || {}).length
+  ) return { error: 'invalid data type' };
+
+  const existColumns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
+  const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
+  const args = columns?.map((col) => data[col]);
+
+  return { columns, args, error: !columns?.length ? 'nothing to process' : undefined };
+}

package/widget/controllers/widget.del.js

@@ -1,44 +1,44 @@
-/**
- * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
- *
- * @method DELETE
- * @summary CRM дані для обраного віджета.
- * @priority 2
- * @tag table
- * @type api
- * @requires setTokenById
- * @requires getSelect
- * @param {String} id Ідентифікатор для хешування
- * @param {Any} sql Використовується для повернення sql запиту
- * @param {String} type Тип для хешування даних
- * @errors 400, 500
- * @returns {Number} status Номер помилки
- * @returns {String|Object} error Опис помилки
- * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
- */
-
-export default async function widgetDel({
-  pg, params = {}, session = {},
-}) {
-  const { user = {} } = session.passport || {};
-  if (!user.uid) return { error: 'access restricted', status: 403 };
-  const { type, objectid, id } = params;
-
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const sqls = {
-    comment: 'delete from crm.communications where entity_id=$1 and uid=$2 and communication_id=$3',
-    checklist: 'delete from crm.checklists where entity_id=$1 and uid=$2 and checklist_id=$3',
-    file: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3',
-    gallery: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3',
-  };
-  const sql = sqls[type];
-  if (!sql) return { error: 'type not valid', status: 401 };
-  try {
-    await pg.query(sql, [objectid, user.uid, id]);
-    return { data: { id }, user: { uid: user.uid, name: user.user_name } };
-  }
-  catch (err) {
-    return { message: err.toString(), status: 500 };
-  }
-}
+/**
+ * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
+ *
+ * @method DELETE
+ * @summary CRM дані для обраного віджета.
+ * @priority 2
+ * @tag table
+ * @type api
+ * @requires setTokenById
+ * @requires getSelect
+ * @param {String} id Ідентифікатор для хешування
+ * @param {Any} sql Використовується для повернення sql запиту
+ * @param {String} type Тип для хешування даних
+ * @errors 400, 500
+ * @returns {Number} status Номер помилки
+ * @returns {String|Object} error Опис помилки
+ * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+
+export default async function widgetDel({
+  pg, params = {}, session = {},
+}) {
+  const { user = {} } = session.passport || {};
+  if (!user.uid) return { error: 'access restricted', status: 403 };
+  const { type, objectid, id } = params;
+
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const sqls = {
+    comment: 'delete from crm.communications where entity_id=$1 and uid=$2 and communication_id=$3',
+    checklist: 'delete from crm.checklists where entity_id=$1 and uid=$2 and checklist_id=$3',
+    file: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3',
+    gallery: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3',
+  };
+  const sql = sqls[type];
+  if (!sql) return { error: 'type not valid', status: 401 };
+  try {
+    await pg.query(sql, [objectid, user.uid, id]);
+    return { data: { id }, user: { uid: user.uid, name: user.user_name } };
+  }
+  catch (err) {
+    return { message: err.toString(), status: 500 };
+  }
+}