@opengis/fastify-table 1.1.58 → 1.1.60

package/index.js

@@ -1,11 +1,8 @@
 import path from 'node:path';
-// import { existsSync, readdirSync, readFileSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
-
 import fp from 'fastify-plugin';
+import { fileURLToPath } from 'node:url';
 
 import config from './config.js';
-// import rclient from './redis/client.js';
 
 // plugins
 import cronPlugin from './server/plugins/cron/index.js';
@@ -25,12 +22,9 @@ import propertiesRoutes from './server/routes/properties/index.js';
 import tableRoutes from './server/routes/table/index.js';
 import utilRoutes from './server/routes/util/index.js';
 
-// import pgClients from './pg/pgClients.js';
-
 import { addTemplateDir, execMigrations } from './utils.js';
 
 async function plugin(fastify, opt) {
-  // console.log(opt);
   config.pg = opt.pg;
   config.redis = opt.redis;
   config.root = opt.root;
@@ -66,24 +60,16 @@ async function plugin(fastify, opt) {
       request.log.fatal(request, { status: 501, error: error.toString() });
       return reply.status(500).send('ServerError');
     }
-    // console.log(error);
 
     request.log.error(error, request);
     return reply.status(error.statusCode || 500).send(config.local ? error.toString() : 'ServerError');
   });
 
   execMigrations().catch(err => console.log(err));
-  // core migrations
-  /* try {
-
-  }
-  catch (err) {
-    logger.error(err);
-  } */
 
   if (!fastify.funcs) {
     fastify.addHook('onRequest', async (req) => {
-      req.funcs = fastify;
+      // req.funcs = fastify;
       if (!req.user && req.session?.passport?.user) {
         const { user } = req.session?.passport || {};
         req.user = user;
@@ -115,4 +101,3 @@ async function plugin(fastify, opt) {
   addTemplateDir(path.join(cwd, 'module/core'));
 }
 export default fp(plugin);
-// export { rclient };

package/package.json

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

package/server/migrations/roles.sql

@@ -33,10 +33,12 @@ COMMENT ON COLUMN admin.roles.editor_date IS 'Дата останнього ре
 CREATE TABLE if not exists admin.routes();
 alter table admin.routes DROP CONSTRAINT if exists admin_route_id_pkey cascade;
 alter table admin.routes DROP constraint if exists admin_route_menu_id_fkey cascade;
+alter table admin.routes DROP constraint if exists admin_route_alias_query_unique cascade;
 
 alter table admin.routes add column if not exists route_id text NOT NULL default next_id();
 alter table admin.routes add column if not exists alias text NOT NULL;
 alter table admin.routes add column if not exists table_name text NOT NULL;
+alter table admin.routes add column if not exists query text;
 alter table admin.routes add column if not exists actions text[];
 alter table admin.routes add column if not exists access text;
 alter table admin.routes add column if not exists title text;
@@ -48,15 +50,16 @@ alter table admin.routes add column if not exists editor_date timestamp without
 alter table admin.routes add column if not exists cdate timestamp without time zone DEFAULT now();
 alter table admin.routes add column if not exists enabled boolean NOT NULL DEFAULT true;
 alter table admin.routes add CONSTRAINT admin_route_id_pkey PRIMARY KEY (route_id);
+-- alter table admin.routes add CONSTRAINT admin_route_alias_query_unique UNIQUE (alias, query);
 
 COMMENT ON TABLE admin.routes IS 'Список інтерфейсів';
 COMMENT ON COLUMN admin.routes.route_id IS 'Ідентифікатор інтерфейса';
 COMMENT ON COLUMN admin.routes.alias IS 'Назва файлу інтерфейса';
 
-COMMENT ON COLUMN admin.routes.access IS 'Рівень доступу';
-COMMENT ON COLUMN admin.routes.actions IS 'Дії';
-
 COMMENT ON COLUMN admin.routes.table_name IS 'Таблиця в БД';
+comment on column admin.routes.query is 'Запит до таблиці';
+COMMENT ON COLUMN admin.routes.actions IS 'Дії';
+COMMENT ON COLUMN admin.routes.access IS 'Рівень доступу';
 COMMENT ON COLUMN admin.routes.title IS 'Назва інтерфейсу українською';
 COMMENT ON COLUMN admin.routes.public IS 'Ознака чи для всіх показується';
 COMMENT ON COLUMN admin.routes.enabled IS 'On / Off';

package/server/plugins/pg/funcs/autoIndex.js

@@ -1,4 +1,3 @@
-// const rclient = require('../../redis/client')
 import pgClient from '../pgClients.js';
 
 // subfunc

package/server/plugins/pg/funcs/getMeta.js

@@ -1,4 +1,3 @@
-// import pgClient from '../pgClients.js';
 import getPG from './getPG.js';
 
 const data = {};

package/server/plugins/pg/index.js

@@ -1,8 +1,6 @@
-import pgClients from './funcs/pgClients.js';
+import pgClients from './pgClients.js';
 import init from './funcs/init.js';
 import getPG from './funcs/getPG.js';
-import autoIndex from './funcs/autoIndex.js';
-import getMeta from './funcs/getMeta.js';
 
 function close() {
   Object.keys(pgClients).forEach((el) => {

package/server/plugins/redis/index.js

@@ -5,7 +5,7 @@ function close(fastify) {
 }
 
 async function plugin(fastify) {
-  const client = getRedis({ db: 0, funcs: fastify });
+  const client = getRedis({ db: 0 });
   client.getJSON = client.get;
   // fastify.decorate('rclient', client);
   // fastify.decorate('getRedis', getRedis);

package/server/plugins/table/funcs/metaFormat/getSelectVal.js

@@ -1,5 +1,5 @@
 import getSelect from '../getSelect.js';
-import pgClients from '../../../pg/funcs/pgClients.js';
+import pgClients from '../../../pg/pgClients.js';
 import redis from '../../../redis/client.js';
 
 // import { pgClients, getSelect } from '../../../../../utils.js';

package/server/routes/logger/index.js

@@ -1,4 +1,5 @@
 import loggerFile from './controllers/logger.file.js';
+// import loggerTest from './controllers/logger.test.api.js';
 
 const loggerSchema = {
   querystring: {
@@ -10,6 +11,7 @@ const loggerSchema = {
 
 async function plugin(fastify) {
   fastify.get('/logger-file/*', { schema: loggerSchema }, loggerFile);
+  // fastify.get('/logger-test', {}, loggerTest);
 }
 
 export default plugin;

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

@@ -1,5 +1,6 @@
 import {
   config, getTemplate, getFilterSQL, getMeta, metaFormat, getAccess, setToken, gisIRColumn, applyHook,
+  handlebars,
 } from '../../../../utils.js';
 
 const maxLimit = 100;
@@ -88,7 +89,8 @@ export default async function dataAPI(req) {
   const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
   const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
 
-  const where = [(hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, search, accessQuery || '1=1', bbox, queryPolyline].filter((el) => el);
+  const interfaceQuery = params?.query ? await handlebars.compile(params?.query)({ user, uid }) : undefined;
+  const where = [(hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, search, accessQuery || '1=1', bbox, queryPolyline, interfaceQuery].filter((el) => el);
 
   const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
   const q = `select  ${pk ? `"${pk}" as id,` : ''} 

package/server/plugins/pg/funcs/pgClients.js

@@ -1,2 +0,0 @@
-const pgClients = {};
-export default pgClients;