@opengis/fastify-table 1.4.83 → 1.4.85

package/index.js

@@ -9,6 +9,7 @@ import proxy from '@fastify/http-proxy';
 import config from './config.js';
 
 const { maxFileSize = 512 } = config;
+const { name: execName } = path.parse(process.argv0);
 
 // helpers
 // import helperPlugin from './server/helpers/index.js';
@@ -117,15 +118,35 @@ async function plugin(fastify, opt) {
   }
 
   config.proxy?.forEach?.(el => {
-    fastify.register(proxy, {
-      upstream: el.target,
-      prefix: el.source,
-      http2: false,
-      preHandler: async (req) => {
-        req.headers.uid = req.session?.passport?.user?.uid;
-        Object.keys(el.headers || {})?.forEach(item => req.headers[item] = el.headers[item]);
-      },
-    });
+    if (execName === 'bun') {
+      fastify.all(`${el.source}/*`, async (req, reply) => {
+        const url = el.target.replace(/\/$/, '') + req.raw.url.replace(new RegExp(`^${el.source}`), '');
+        const res = await fetch(url, {
+          method: req.method,
+          headers: {
+            // ...req.headers,
+            uid: req.user?.uid,
+            ...(el.headers || {}),
+          },
+          body: ['PUT', 'POST'].includes(req.method) ? req.raw : undefined,
+        });
+        const resp = res.headers.get('content-type')?.includes('/json') ? await res.json() : await res.text();
+        reply.headers(Object.fromEntries(res.headers));
+        reply.status(res.status);
+        reply.send(resp);
+      });
+    }
+    else {
+      fastify.register(proxy, {
+        upstream: el.target,
+        prefix: el.source,
+        http2: false,
+        preHandler: async (req) => {
+          req.headers.uid = req.session?.passport?.user?.uid;
+          Object.keys(el.headers || {})?.forEach(item => req.headers[item] = el.headers[item]);
+        },
+      });
+    }
   });
 
   if (config.dblist) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.83",
+  "version": "1.4.85",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -61,4 +61,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/server/helpers/core/token.js

@@ -1,18 +1,18 @@
-import setToken from '../../plugins/crud/funcs/setToken.js';
-
-export default function tokenFunc(params) {
-    const { data, hash } = params;
-
-    if (!data?.root?.user?.uid && !hash.uid) return '-';
-    if (!hash || typeof hash !== 'object') return '-';
-
-    // const id = hash?.edit ? hash?.id : data?.root?.id;
-    // console.log(hash)
-    const [token] = setToken({
-        ids: [JSON.stringify(hash)],
-
-        uid: data?.root?.user?.uid || hash.uid,
-        array: 1,
-    });
-    return token;
-}
+import setToken from '../../plugins/crud/funcs/setToken.js';
+
+export default function tokenFunc(params) {
+    const { data, hash } = params;
+
+    if (!data?.root?.user?.uid && !hash.uid) return '-';
+    if (!hash || typeof hash !== 'object') return '-';
+
+    // const id = hash?.edit ? hash?.id : data?.root?.id;
+    // console.log(hash)
+    const [token] = setToken({
+        ids: [JSON.stringify(hash)],
+
+        uid: data?.root?.user?.uid || hash.uid,
+        array: 1,
+    });
+    return token;
+}

package/server/migrations/crm.sql

@@ -124,7 +124,7 @@ COMMENT ON COLUMN crm.properties.table_name IS 'Таблиця';
 ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS object_id text;
 COMMENT ON COLUMN crm.properties.object_id IS 'ID Об''єкту';
 ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_key text;
-COMMENT ON COLUMN crm.properties.object_id IS 'Назва атрибуту';
+COMMENT ON COLUMN crm.properties.property_key IS 'Назва атрибуту';
 ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_text text;
 COMMENT ON COLUMN crm.properties.property_text IS 'Текст';
 ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_int integer;
@@ -143,3 +143,13 @@ ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS cdate timestamp without time
 ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS files json;
 
 ALTER TABLE crm.properties ADD CONSTRAINT crm_properties_pkey PRIMARY KEY(property_id);
+
+-- drop table if exists crm.reactions;
+CREATE TABLE if not exists crm.reactions (
+    reaction_id text default next_id() PRIMARY KEY,
+    created_by text NOT NULL,
+    entity_id text NOT NULL,
+    reaction_type text NOT NULL check (reaction_type in ('like', 'love', 'hate', 'wow', 'sad', 'angry')),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (user_id) REFERENCES admin.users(uid)
+);

package/server/plugins/cron/funcs/addCron.js

@@ -1,52 +1,52 @@
-import config from '../../../../config.js';
-
-import logger from '../../logger/getLogger.js';
-import pgClients from '../../pg/pgClients.js';
-
-import cronList from '../cronList.js';
-import runCron from './runCron.js';
-import interval2ms from './interval2ms.js';
-
-/**
- * interval:
- * -   02:54 - every day
- * -    2:03 - every day
- * -   *1:43 - 2 times a day
- * -  *12:03 - 2 times a day
- * -   **:54 - every hour
- * -   **:*3 - every 10 minutes
- * -      60 - every minute
- * - 10 * 60 - every 10 minutes
- */
-
-export default async function addCron(func, interval, pg = pgClients.client) {
-  const { time = {}, disabled = [] } = config.cron || {};
-
-  const name = func.name || func.toString().split('/').at(-1).split('\'')[0];
-
-  // if (!config.isServer) return;
-
-  if (disabled.includes(name)) {
-    logger.file('cron', { name, message: 'cron disabled' });
-    return;
-  }
-
-  cronList[name] = func;
-
-  const userInterval = time[name] || interval;
-  const [waitMs, intervalMs] = interval2ms[typeof interval](userInterval);
-
-  if (intervalMs < 1000) {
-    logger.file('cron', { name, error: `interval ${interval} too small` });
-    return;
-  }
-
-  // setTimeout to w8 for the time to start
-  setTimeout(() => {
-    runCron({ pg, func, name });
-    // interval
-    setInterval(() => {
-      runCron({ pg, func, name });
-    }, intervalMs);
-  }, waitMs);
-}
+import config from '../../../../config.js';
+
+import logger from '../../logger/getLogger.js';
+import pgClients from '../../pg/pgClients.js';
+
+import cronList from '../cronList.js';
+import runCron from './runCron.js';
+import interval2ms from './interval2ms.js';
+
+/**
+ * interval:
+ * -   02:54 - every day
+ * -    2:03 - every day
+ * -   *1:43 - 2 times a day
+ * -  *12:03 - 2 times a day
+ * -   **:54 - every hour
+ * -   **:*3 - every 10 minutes
+ * -      60 - every minute
+ * - 10 * 60 - every 10 minutes
+ */
+
+export default async function addCron(func, interval, pg = pgClients.client) {
+  const { time = {}, disabled = [] } = config.cron || {};
+
+  const name = func.name || func.toString().split('/').at(-1).split('\'')[0];
+
+  // if (!config.isServer) return;
+
+  if (disabled.includes(name)) {
+    logger.file('cron', { name, message: 'cron disabled' });
+    return;
+  }
+
+  cronList[name] = func;
+
+  const userInterval = time[name] || interval;
+  const [waitMs, intervalMs] = interval2ms[typeof interval](userInterval);
+
+  if (intervalMs < 1000) {
+    logger.file('cron', { name, error: `interval ${interval} too small` });
+    return;
+  }
+
+  // setTimeout to w8 for the time to start
+  setTimeout(() => {
+    runCron({ pg, func, name });
+    // interval
+    setInterval(() => {
+      runCron({ pg, func, name });
+    }, intervalMs);
+  }, waitMs);
+}

package/server/plugins/crud/funcs/getOpt.js

@@ -1,14 +1,14 @@
-import config from '../../../../config.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-const rclient = getRedis({ db: 0 });
-
-export default async function getOpt(token, uid = 0) {
-  if (!config.redis) return null;
-
-  const key = `opt:${uid}:${token}`;
-  // console.log(key);
-  const data = await rclient.get(key);
-  if (!data) return null;
-  return JSON.parse(data);
-}
+import config from '../../../../config.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+const rclient = getRedis({ db: 0 });
+
+export default async function getOpt(token, uid = 0) {
+  if (!config.redis) return null;
+
+  const key = `opt:${uid}:${token}`;
+  // console.log(key);
+  const data = await rclient.get(key);
+  if (!data) return null;
+  return JSON.parse(data);
+}

package/server/plugins/crud/funcs/utils/getFolder.js

@@ -1,11 +1,11 @@
-import path from 'node:path';
-
-import config from '../../../../../config.js';
-
-export default function getFolder(req, type = 'server') {
-  if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
-  const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
-  const dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params
-  const filepath = path.posix.join(types[type] || `/data/local/${dbname || ''}`, req.folder || config.folder || '');
-  return filepath;
-}
+import path from 'node:path';
+
+import config from '../../../../../config.js';
+
+export default function getFolder(req, type = 'server') {
+  if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
+  const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
+  const dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params
+  const filepath = path.posix.join(types[type] || `/data/local/${dbname || ''}`, req.folder || config.folder || '');
+  return filepath;
+}

package/server/plugins/logger/errorStatus.js

@@ -1,19 +1,19 @@
-import applyHookSync from '../hook/funcs/applyHookSync.js';
-
-function errorStatus(error) {
-  const hook = applyHookSync('errorStatus', error);
-  if (hook) return hook;
-
-  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
-    return 601;
-  }
-  if (error.routine === 'ExecConstraints') {
-    return 602;
-  }
-  if (error.type === 'DatabaseError') {
-    return 600;
-  }
-
-  return 500;
-}
-export default errorStatus;
+import applyHookSync from '../hook/funcs/applyHookSync.js';
+
+function errorStatus(error) {
+  const hook = applyHookSync('errorStatus', error);
+  if (hook) return hook;
+
+  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
+    return 601;
+  }
+  if (error.routine === 'ExecConstraints') {
+    return 602;
+  }
+  if (error.type === 'DatabaseError') {
+    return 600;
+  }
+
+  return 500;
+}
+export default errorStatus;

package/server/plugins/redis/client.js

@@ -1,8 +1,8 @@
-import redisClients from './funcs/redisClients.js';
-import getRedis from './funcs/getRedis.js';
-
-if (!redisClients[0]) {
-  getRedis({ db: 0 });
-}
-
-export default redisClients[0];
+import redisClients from './funcs/redisClients.js';
+import getRedis from './funcs/getRedis.js';
+
+if (!redisClients[0]) {
+  getRedis({ db: 0 });
+}
+
+export default redisClients[0];

package/server/plugins/redis/funcs/redisClients.js

@@ -1,3 +1,3 @@
-const redisClients = {};
-
-export default redisClients;
+const redisClients = {};
+
+export default redisClients;

package/server/plugins/sqlite/funcs/getSqlite.js

@@ -1,6 +1,11 @@
-/* eslint-disable no-console */
+import path from 'node:path';
 
-import Database from 'better-sqlite3';
+const { name: execName } = path.parse(process.argv0);
+
+// import Database from 'better-sqlite3'; // error with bun
+const { default: Database } = execName === 'bun'
+  ? { default: (await import('bun:sqlite')).Database }
+  : await import('better-sqlite3');
 
 import config from '../../../../config.js';
 import sqliteClients from '../sqliteClients.js';
@@ -25,7 +30,7 @@ function getSqliteAsync({
     verbose: config.trace ? console.log : undefined,
   };
 
-  sqliteClients.client = new Database(name || ':memory:', dbConfig);
+  sqliteClients.client = new Database(name || ':memory:', execName === 'bun' ? undefined : dbConfig);
   init(sqliteClients.client);
 
   return sqliteClients.client;

package/server/plugins/sqlite/funcs/init.js

@@ -47,7 +47,7 @@ function init(client) {
     tlist,
   });
 
-  console.log('db connected', client.name || ':memory:');
+  console.log('sqlite db connected', client.name || ':memory:');
 }
 
 export default init;

package/server/plugins/sqlite/sqliteClients.js

@@ -1,6 +1,11 @@
-/* eslint-disable no-console */
+import path from 'node:path';
 
-import Database from 'better-sqlite3';
+const { name: execName } = path.parse(process.argv0);
+
+// import Database from 'better-sqlite3';
+const { default: Database } = execName === 'bun'
+  ? { default: (await import('bun:sqlite')).Database }
+  : await import('better-sqlite3');
 
 import config from '../../../config.js';
 import init from './funcs/init.js';
@@ -8,7 +13,7 @@ import init from './funcs/init.js';
 const sqliteClients = {};
 
 if (config.sqlite) {
-  const client = new Database(config.sqlite?.name || ':memory:', {
+  const client = new Database(config.sqlite?.name || ':memory:', execName === 'bun' ? undefined : {
     readonly: config.sqlite?.readonly || false,
     fileMustExist: config.sqlite?.fileMustExist || false,
     timeout: config.sqlite?.statement_timeout || 10000,

package/server/plugins/table/funcs/getFilterSQL/util/getCustomQuery.js

@@ -1,13 +1,13 @@
-async function getCustomQuery({
-  pg, table, customFilter,
-}) {
-  if (!customFilter) return null;
-  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
-  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
-  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
-  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
-  const customQuery = data?.map((el) => el.query).join(' and ');
-  return `${customQuery}`;
-}
-
-export default getCustomQuery;
+async function getCustomQuery({
+  pg, table, customFilter,
+}) {
+  if (!customFilter) return null;
+  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
+  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
+  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
+  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
+  const customQuery = data?.map((el) => el.query).join(' and ');
+  return `${customQuery}`;
+}
+
+export default getCustomQuery;

package/server/plugins/table/funcs/getFilterSQL/util/getTableSql.js

@@ -1,34 +1,34 @@
-function getTable(table) {
-  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    ?.map((el) => el.split(/[ )]/)[0]);
-  return result;
-}
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-const tableSql = {};
-async function getTableSql({
-  pg, body, table, fields,
-}) {
-  if (tableSql[table]) return tableSql[table];
-
-  const fieldList = fields.map((el) => el.name);
-
-  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
-
-  if (!tableList) { tableSql[table] = []; return []; }
-
-  const data = await Promise.all(tableList?.map(async (tableEl) => {
-    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
-    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
-  }));
-
-  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
-
-  return tableSql[table];
-}
-
-export default getTableSql;
+function getTable(table) {
+  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+    ?.map((el) => el.split(/[ )]/)[0]);
+  return result;
+}
+
+/**
+* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+* @param {String} opt.query - запит до таблиці
+* @param {String} opt.hash - інформація з хешу по запиту
+*/
+const tableSql = {};
+async function getTableSql({
+  pg, body, table, fields,
+}) {
+  if (tableSql[table]) return tableSql[table];
+
+  const fieldList = fields.map((el) => el.name);
+
+  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
+
+  if (!tableList) { tableSql[table] = []; return []; }
+
+  const data = await Promise.all(tableList?.map(async (tableEl) => {
+    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
+    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
+  }));
+
+  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
+
+  return tableSql[table];
+}
+
+export default getTableSql;

package/server/plugins/table/funcs/getTemplates.js

@@ -1,19 +1,19 @@
-import fs from 'fs';
-import path from 'path';
-
-import config from '../../../../config.js';
-
-const loadTemplate = {};
-
-export default async function getTemplateDir(type) {
-  if (!type) return null;
-
-  const cwd = process.cwd();
-  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
-
-  if (!loadTemplate[type]) {
-    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
-    loadTemplate[type] = typeList;
-  }
-  return loadTemplate[type];
-}
+import fs from 'fs';
+import path from 'path';
+
+import config from '../../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type) {
+  if (!type) return null;
+
+  const cwd = process.cwd();
+  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
+
+  if (!loadTemplate[type]) {
+    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
+    loadTemplate[type] = typeList;
+  }
+  return loadTemplate[type];
+}

package/server/plugins/table/funcs/gisIRColumn.js

@@ -1,82 +1,82 @@
-import getSelect from './getSelect.js';
-
-import getFilterSQL from './getFilterSQL/index.js';
-import getTemplate from './getTemplate.js';
-import pgClients from '../../pg/pgClients.js';
-import config from '../../../../config.js';
-import getSelectVal from './metaFormat/getSelectVal.js';
-
-export default async function gisIRColumn({
-  pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
-}) {
-  const time = Date.now();
-
-  const sel = await getSelect(query.cls || column, pg);
-
-  const body = await getTemplate('table', layer);
-  const fData = await getFilterSQL({
-    table: layer,
-    filter,
-    state,
-    search,
-    custom,
-  });
-
-  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
-  where relkind in ('r','v','m')`);
-
-  const tableName = body?.table || layer;
-  if (!tlist.includes(tableName)) return { error: `table not found: ${tableName}`, status: 400 };
-
-  // eslint-disable-next-line max-len
-  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
-
-  const col = fields.find((el) => el.name === column);
-
-  if (!col) return { status: 404, message: 'not found' };
-  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
-
-  const q = `select ${colField} as id, count(*)::int from (
-    ${fData?.optimizedSQL || `select * from ${tableName} where ${body?.query || 'true'}`}
-  )t group by ${colField} order by count desc limit 15`;
-
-  if (sql) return q;
-
-  if (!body?.columns?.length) {
-    const { rows } = await pg.query(q);
-    if (sel?.arr?.length) {
-      rows.forEach((el) => {
-        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
-        Object.assign(el, data || {});
-      });
-    }
-    return {
-      count: rows?.reduce((acc, el) => acc + el.count, 0),
-      sql: config.local ? q : undefined,
-      rows,
-    };
-  }
-
-  const { rows } = await pg.query(q);
-  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
-  const select = await getSelectVal({
-    pg, name: cls, values: rows.map((el) => el.id), ar: 1,
-  });
-  rows.forEach((el) => {
-    if (Array.isArray(select)) {
-      Object.assign(el, select.find((item) => item.id?.toString() === el.id?.toString()) || {});
-    }
-    else if (typeof select?.[el.id] === 'string') {
-      Object.assign(el, { text: select?.[el.id] });
-    }
-    else {
-      Object.assign(el, select?.[el.id] || {});
-    }
-  });
-  return {
-    time: Date.now() - time,
-    count: rows.reduce((acc, el) => acc + el.count, 0),
-    sql: config.local ? q : undefined,
-    rows,
-  };
-}
+import getSelect from './getSelect.js';
+
+import getFilterSQL from './getFilterSQL/index.js';
+import getTemplate from './getTemplate.js';
+import pgClients from '../../pg/pgClients.js';
+import config from '../../../../config.js';
+import getSelectVal from './metaFormat/getSelectVal.js';
+
+export default async function gisIRColumn({
+  pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
+}) {
+  const time = Date.now();
+
+  const sel = await getSelect(query.cls || column, pg);
+
+  const body = await getTemplate('table', layer);
+  const fData = await getFilterSQL({
+    table: layer,
+    filter,
+    state,
+    search,
+    custom,
+  });
+
+  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
+  where relkind in ('r','v','m')`);
+
+  const tableName = body?.table || layer;
+  if (!tlist.includes(tableName)) return { error: `table not found: ${tableName}`, status: 400 };
+
+  // eslint-disable-next-line max-len
+  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
+
+  const col = fields.find((el) => el.name === column);
+
+  if (!col) return { status: 404, message: 'not found' };
+  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
+
+  const q = `select ${colField} as id, count(*)::int from (
+    ${fData?.optimizedSQL || `select * from ${tableName} where ${body?.query || 'true'}`}
+  )t group by ${colField} order by count desc limit 15`;
+
+  if (sql) return q;
+
+  if (!body?.columns?.length) {
+    const { rows } = await pg.query(q);
+    if (sel?.arr?.length) {
+      rows.forEach((el) => {
+        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
+        Object.assign(el, data || {});
+      });
+    }
+    return {
+      count: rows?.reduce((acc, el) => acc + el.count, 0),
+      sql: config.local ? q : undefined,
+      rows,
+    };
+  }
+
+  const { rows } = await pg.query(q);
+  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
+  const select = await getSelectVal({
+    pg, name: cls, values: rows.map((el) => el.id), ar: 1,
+  });
+  rows.forEach((el) => {
+    if (Array.isArray(select)) {
+      Object.assign(el, select.find((item) => item.id?.toString() === el.id?.toString()) || {});
+    }
+    else if (typeof select?.[el.id] === 'string') {
+      Object.assign(el, { text: select?.[el.id] });
+    }
+    else {
+      Object.assign(el, select?.[el.id] || {});
+    }
+  });
+  return {
+    time: Date.now() - time,
+    count: rows.reduce((acc, el) => acc + el.count, 0),
+    sql: config.local ? q : undefined,
+    rows,
+  };
+}

package/server/plugins/table/funcs/loadTemplate.js

@@ -1 +1 @@
-export default {};
+export default {};

package/server/plugins/table/funcs/loadTemplatePath.js

@@ -1 +1 @@
-export default {};
+export default {};

package/server/plugins/table/funcs/userTemplateDir.js

@@ -1 +1 @@
-export default [];
+export default [];

package/server/routes/table/controllers/getFormByTable.js

@@ -37,7 +37,7 @@ export default async function getForm({
 
     const form = tokenData?.form
         || hookData?.form
-        || await getTemplate('table', table).then(el => el.form) || {};
+        || await getTemplate('table', table).then(el => el?.form) || {};
 
     if (!form) {
         return reply.status(404).send('form not found');

package/server/routes/table/controllers/search.js

@@ -1,74 +1,74 @@
-import {
-  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
-} from '../../../../utils.js';
-
-function sequence(tables, data, fn) {
-  return tables.reduce((promise, table) => promise.then(() => fn({
-    ...data, tableName: table.replace('.json', ''),
-  })), Promise.resolve());
-}
-
-async function getData({
-  pg, tableName, query = {}, maxLimit, res,
-}) {
-  const loadTable = await getTemplate('table', tableName);
-
-  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.max(maxLimit - res.rows.length, 0);
-  // Math.max(query.offset - res.rows.length,0)
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-
-  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
-
-  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
-  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
-  if (query.sql) {
-    res.sql.push(q);
-    return null;
-  }
-
-  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) || 0;
-
-  await metaFormat({ rows, table: tableName });
-  res.total += +total;
-  rows.forEach((row) => {
-    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
-    res.rows.push({
-      ...row, register: tableName, register_title: loadTable.ua, href,
-    });
-  });
-  return null;
-}
-
-export default async function search({
-  pg, funcs, query = {},
-}) {
-  const time = Date.now();
-
-  const tables = query.table ? [query.table] : await getTemplates('table');
-  const res = { rows: [], sql: [], total: 0 };
-
-  const maxLimit = Math.min(100, query.limit || '16');
-  await sequence(tables, {
-    pg, funcs, query, maxLimit, res,
-  }, getData);
-
-  if (query.sql) return res.sql.join(';\n');
-
-  return {
-    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
-  };
-}
+import {
+  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
+} from '../../../../utils.js';
+
+function sequence(tables, data, fn) {
+  return tables.reduce((promise, table) => promise.then(() => fn({
+    ...data, tableName: table.replace('.json', ''),
+  })), Promise.resolve());
+}
+
+async function getData({
+  pg, tableName, query = {}, maxLimit, res,
+}) {
+  const loadTable = await getTemplate('table', tableName);
+
+  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.max(maxLimit - res.rows.length, 0);
+  // Math.max(query.offset - res.rows.length,0)
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+
+  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
+
+  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
+  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
+  if (query.sql) {
+    res.sql.push(q);
+    return null;
+  }
+
+  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) || 0;
+
+  await metaFormat({ rows, table: tableName });
+  res.total += +total;
+  rows.forEach((row) => {
+    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
+    res.rows.push({
+      ...row, register: tableName, register_title: loadTable.ua, href,
+    });
+  });
+  return null;
+}
+
+export default async function search({
+  pg, funcs, query = {},
+}) {
+  const time = Date.now();
+
+  const tables = query.table ? [query.table] : await getTemplates('table');
+  const res = { rows: [], sql: [], total: 0 };
+
+  const maxLimit = Math.min(100, query.limit || '16');
+  await sequence(tables, {
+    pg, funcs, query, maxLimit, res,
+  }, getData);
+
+  if (query.sql) return res.sql.join(';\n');
+
+  return {
+    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
+  };
+}

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

@@ -1,89 +1,99 @@
-import config from '../../../../config.js';
-import isFileExists from '../../../plugins/file/isFileExists.js';
-import logChanges from '../../../plugins/crud/funcs/utils/logChanges.js';
-import pgClients from '../../../plugins/pg/pgClients.js';
-
-const isAdmin = (req) => process.env.NODE_ENV === 'admin'
-  || config.admin
-  || req?.hostname?.split?.(':')?.shift?.() === config.adminDomain
-  || req?.hostname?.startsWith?.('admin');
-
-async function checkAccess(pg, objectid, id) {
-  const { uid, filepath } = await pg.query('select uid, file_path as filepath from crm.files where entity_id=$1 and file_id=$2', [objectid, id])
-    .then(el => el.rows?.[0] || {});
-  return { uid, exists: filepath ? await isFileExists(filepath) : null };
-}
-
-/**
- * Дістає 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(req, reply) {
-  const {
-    pg = pgClients.client, params = {}, user = {},
-  } = req;
-
-  if (!user?.uid) {
-    return reply.status(401).send('access restricted: user not authorized');
-  }
-
-  const { type, objectid, id } = params;
-
-  if (!objectid) {
-    return reply.status(400).send('not enough params: id');
-  }
-
-  // force delete db entry if file not exists
-  const { exists, uid } = ['file', 'gallery'].includes(type) ? await checkAccess(pg, objectid, id) : {};
-
-  if (exists && !isAdmin(req) && uid && user?.uid !== uid) {
-    return reply.status(403).send('access restricted: file exists, not an author');
-  }
-
-  const sqls = {
-    comment: `delete from crm.communications where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and communication_id=$3`,
-    checklist: `delete from crm.checklists where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and checklist_id=$3`,
-    file: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
-    gallery: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
-  };
-
-  const sql = sqls[type];
-  const table = {
-    comment: 'crm.communications',
-    checklist: 'crm.checklists',
-    file: 'crm.files',
-    gallery: 'crm.files',
-  }[type];
-
-  if (!sql) {
-    return reply.status(400).send('invalid widget type');
-  }
-
-  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
-
-  await logChanges({
-    pg,
-    table,
-    id,
-    data: rows[0],
-    uid: user?.uid,
-    type: 'DELETE',
-  });
-
-  return reply.status(200).send({ data: { id }, user: { uid: user.uid, name: user.user_name } });
-}
+import config from '../../../../config.js';
+import isFileExists from '../../../plugins/file/isFileExists.js';
+import logChanges from '../../../plugins/crud/funcs/utils/logChanges.js';
+import pgClients from '../../../plugins/pg/pgClients.js';
+
+const isAdmin = (req) => process.env.NODE_ENV === 'admin'
+  || config.admin
+  || req?.hostname?.split?.(':')?.shift?.() === config.adminDomain
+  || req?.hostname?.startsWith?.('admin');
+
+async function checkAccess(pg, objectid, id) {
+  const { uid, filepath } = await pg.query('select uid, file_path as filepath from crm.files where entity_id=$1 and file_id=$2', [objectid, id])
+    .then(el => el.rows?.[0] || {});
+  return { uid, exists: filepath ? await isFileExists(filepath) : null };
+}
+
+/**
+ * Дістає 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(req, reply) {
+  const {
+    pg = pgClients.client, params = {}, user = {},
+  } = req;
+
+  if (!user?.uid) {
+    return reply.status(401).send('access restricted: user not authorized');
+  }
+
+  const { type, objectid, id } = params;
+
+  if (!objectid) {
+    return reply.status(400).send('not enough params: object id');
+  }
+
+  if (!id && type !== 'reaction') {
+    return reply.status(400).send('not enough params: id');
+  }
+
+  // force delete db entry if file not exists
+  const { exists, uid } = ['file', 'gallery'].includes(type) ? await checkAccess(pg, objectid, id) : {};
+
+  if (exists && !isAdmin(req) && uid && user?.uid !== uid) {
+    return reply.status(403).send('access restricted: file exists, not an author');
+  }
+
+  const sqls = {
+    comment: `delete from crm.communications where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and communication_id=$3`,
+    checklist: `delete from crm.checklists where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and checklist_id=$3`,
+    file: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
+    gallery: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
+    reaction: `delete from crm.reactions where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'created_by=$2'} and $3=$3 returning reaction_type`,
+  };
+
+  const sql = sqls[type];
+  const table = {
+    comment: 'crm.communications',
+    checklist: 'crm.checklists',
+    file: 'crm.files',
+    gallery: 'crm.files',
+    reaction: 'crm.reactions',
+  }[type];
+
+  if (!sql) {
+    return reply.status(400).send('invalid widget type');
+  }
+
+  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id || '']);
+
+  if (type === 'reaction') {
+    console.log('231131');
+  }
+
+  await logChanges({
+    pg,
+    table,
+    id: type === 'reaction' ? objectid : id,
+    data: rows[0],
+    uid: user?.uid,
+    type: 'DELETE',
+  });
+
+  return reply.status(200).send({ data: { id }, user: { uid: user.uid, name: user.user_name } });
+}

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

@@ -87,7 +87,7 @@ export default async function widgetGet({
     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`,
-
+    reaction: 'SELECT count(*), reaction_type FROM crm.reactions c where entity_id=$1 group by reaction_type',
   };
 
   const q = sqls[params.type];

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

@@ -11,23 +11,25 @@ const tableList = {
   gallery: 'crm.files',
   file: 'crm.files',
   checklist: 'crm.checklists',
+  reaction: 'crm.reactions',
 };
 const pkList = {
   comment: 'communication_id',
   checklist: 'checklist_id',
   file: 'file_id',
   gallery: 'file_id',
+  reaction: 'reaction_id',
 };
 
 const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
 
 export default async function widgetSet(req, reply) {
   const {
-    pg, params = {}, session = {}, headers = {}, body = {}, user = {},
+    pg, params = {}, headers = {}, body = {}, user = {},
   } = req;
   const { type, id, objectid } = params;
 
-  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) {
+  if (!['comment', 'checklist', 'file', 'gallery', 'reaction'].includes(type)) {
     return reply.status(400).send('param type not valid');
   }
 

package/server/routes/widget/hook/onWidgetSet.js

@@ -1,13 +1,13 @@
-import pgClients from '../../../plugins/pg/pgClients.js';
-
-export default async function onWidgetSet({
-  pg = pgClients.client, id, objectid, type, payload = {},
-}) {
-  if (!id || !objectid || type !== 'gallery') {
-    return null;
-  }
-  if (payload?.ismain) {
-    await pg.query('update crm.files set ismain=false where entity_id=$1 and file_id<>$2', [objectid, id]);
-  }
-  return null;
-}
+import pgClients from '../../../plugins/pg/pgClients.js';
+
+export default async function onWidgetSet({
+  pg = pgClients.client, id, objectid, type, payload = {},
+}) {
+  if (!id || !objectid || type !== 'gallery') {
+    return null;
+  }
+  if (payload?.ismain) {
+    await pg.query('update crm.files set ismain=false where entity_id=$1 and file_id<>$2', [objectid, id]);
+  }
+  return null;
+}

package/server/routes/widget/index.mjs

@@ -1,38 +1,38 @@
-import addHook from '../../plugins/hook/funcs/addHook.js';
-
-import widgetDel from './controllers/widget.del.js';
-import widgetSet from './controllers/widget.set.js';
-import widgetGet from './controllers/widget.get.js';
-import fileEdit from './controllers/file.edit.js';
-
-import onWidgetSet from './hook/onWidgetSet.js';
-
-const tableSchema = {
-  params: {
-    type: 'object',
-    properties: {
-      // type: { type: 'string', pattern: '^([\\d\\w]+)$' },
-      objectid: { type: 'string', pattern: '^([\\d\\w]+)$' },
-      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-  },
-  querystring: {
-    type: 'object',
-    properties: {
-      debug: { type: 'string', pattern: '^(\\d+)$' },
-    },
-  },
-};
-
-addHook('onWidgetSet', onWidgetSet);
-
-const policy = ['site'];
-const params = { config: { policy }, schema: tableSchema };
-
-export default async function route(app, config = {}) {
-  const { prefix = '/api' } = config;
-  app.delete(`${prefix}/widget/:type/:objectid/:id`, params, widgetDel);
-  app.post(`${prefix}/widget/:type/:objectid/:id?`, params, widgetSet);
-  app.put(`${prefix}/file-edit/:id`, params, fileEdit);
-  app.get(`${prefix}/widget/:type/:objectid`, { config: { policy: ['public'] }, schema: tableSchema }, widgetGet);
-}
+import addHook from '../../plugins/hook/funcs/addHook.js';
+
+import widgetDel from './controllers/widget.del.js';
+import widgetSet from './controllers/widget.set.js';
+import widgetGet from './controllers/widget.get.js';
+import fileEdit from './controllers/file.edit.js';
+
+import onWidgetSet from './hook/onWidgetSet.js';
+
+const tableSchema = {
+  params: {
+    type: 'object',
+    properties: {
+      type: { type: 'string', enum: ['gallery', 'file', 'checklist', 'history', 'comment', 'reaction'] },
+      objectid: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+  },
+  querystring: {
+    type: 'object',
+    properties: {
+      debug: { type: 'string', pattern: '^(\\d+)$' },
+    },
+  },
+};
+
+addHook('onWidgetSet', onWidgetSet);
+
+const policy = ['site'];
+const params = { config: { policy }, schema: tableSchema };
+
+export default async function route(app, config = {}) {
+  const { prefix = '/api' } = config;
+  app.delete(`${prefix}/widget/:type/:objectid/:id`, params, widgetDel);
+  app.post(`${prefix}/widget/:type/:objectid/:id?`, params, widgetSet);
+  app.put(`${prefix}/file-edit/:id`, params, fileEdit);
+  app.get(`${prefix}/widget/:type/:objectid`, { config: { policy: ['public'] }, schema: tableSchema }, widgetGet);
+}