@opengis/fastify-table 1.1.72 → 1.1.74

package/README.md

@@ -1,26 +1,26 @@
-# fastify-table
-
-[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
-
-It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
-
-- pg
-- redis
-- crud
-
-## Install
-
-```bash
-npm i @opengis/fastify-table
-```
-
-## Usage
-
-```js
-fastify.register(import('@opengis/fastify-table'), config);
-```
-
-## Documenation
-
-For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).
+# fastify-table
+
+[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
+
+It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
+
+- pg
+- redis
+- crud
+
+## Install
+
+```bash
+npm i @opengis/fastify-table
+```
+
+## Usage
+
+```js
+fastify.register(import('@opengis/fastify-table'), config);
+```
+
+## Documenation
+
+For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).

package/config.js

@@ -1,10 +1,10 @@
-import fs from 'fs';
-
-const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
-const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
-
-Object.assign(config, {
-  allTemplates: config?.allTemplates || {},
-});
-
-export default config;
+import fs from 'fs';
+
+const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
+const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
+
+Object.assign(config, {
+  allTemplates: config?.allTemplates || {},
+});
+
+export default config;

package/package.json

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

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

@@ -65,15 +65,17 @@ async function runCron({
 
   if (!unique) return;
   const db = pg.options.database;
-  logger.debug(`cron.${name}`, 1, db);
+
   try {
     const data = await func({ pg });
-    logger.debug('cron', { db, name, result: data });
-    logger.info('cron', { db, name, result: data });
+    logger.file('cron', {
+      level: 'INFO', db, name, result: data,
+    });
   }
   catch (err) {
-    logger.debug('cron', { db, name, error: err.toString() });
-    logger.error('cron', { db, name, error: err.toString() });
+    logger.file('cron', {
+      level: 'ERROR', db, name, error: err.toString(),
+    });
   }
 }
 

package/server/plugins/redis/index.js

@@ -1,12 +1,14 @@
-import getRedis from './funcs/getRedis.js';
+// import redis from './client.js';
+import redisClients from './funcs/redisClients.js';
 
 function close(fastify) {
-  fastify.rclient.quit();
+  // redis.quit();
+  Object.keys(redisClients).forEach((key) => redisClients[key].quit());
 }
 
 async function plugin(fastify) {
-  const client = getRedis({ db: 0 });
-  client.getJSON = client.get;
+  // const client = getRedis({ db: 0 });
+  // client.getJSON = client.get;
   // fastify.decorate('rclient', client);
   // fastify.decorate('getRedis', getRedis);
   fastify.addHook('onClose', close);

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

@@ -1,10 +1,10 @@
-import getPG from '../../pg/funcs/getPG.js';
+import pgClients from '../../pg/pgClients.js';
 
 import getSelect from './getSelect.js';
 
 const selectMeta = {};
 
-export default async function getSelectMeta({ name, pg: pg1, nocache }) {
+export default async function getSelectMeta({ name, pg = pgClients.client, nocache }) {
   if (selectMeta[name] && !nocache) return selectMeta[name];
 
   const cls = await getSelect(name);
@@ -13,7 +13,6 @@ export default async function getSelectMeta({ name, pg: pg1, nocache }) {
   if (cls.arr) return cls;
   if (!cls.sql) return null;
 
-  const pg = pg1 || getPG({ db: cls.db || 'client' });
   const { sql: original } = cls;
   if (!original.toLowerCase) { console.log(`sql select null: ${name}`); return null; }
 

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

@@ -4,15 +4,17 @@ import redis from '../../../redis/client.js';
 
 // import { pgClients, getSelect } from '../../../../../utils.js';
 
-export default async function getSelectVal({ pg: pg1, name, values }) {
-  const pg = pg1 || pgClients.client;
+export default async function getSelectVal({ pg = pgClients.client, name, values }) {
   const cls = await getSelect(name);
   if (!cls?.arr && !cls?.sql) return null;
   const key = `select:${name}`;
   const cache = !cls.arr ? (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {}) : {};
 
+  const id = cls?.sql?.toLowerCase()?.split(',')?.shift()?.split(' ')
+    ?.pop();
+  const q = `with c(id,text) as (select * from (${cls.sql})q where ${id} = any('{${values.filter(el => !cache[el])}}')) select * from c`;
   const data = cls.arr || (values.filter(el => !cache[el]).length
-    ? await pg.query(`with c(id,text) as (${cls.sql}) select * from c where id = any('{${values.filter(el => !cache[el])}}')`).then(el => el.rows)
+    ? await pg.query(q).then(el => el.rows)
     : []);
 
   const clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };

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

@@ -98,7 +98,9 @@ export default async function dataAPI(req) {
                      ${query.id || query.key ? '*' : sqlColumns || cols || '*'} 
                      ${metaCols} 
                      ${cardColumns} 
-                     from ${table} t ${sqlTable} ${cardSqlTable} 
+                     from (select * from ${table} where ${where.join(' and ') || 'true'}  ${order}) t 
+                     ${sqlTable} 
+                     ${cardSqlTable} 
                      where ${where.join(' and ') || 'true'} 
                      ${order} ${offset}  limit ${limit}`
     .replace(/{{uid}}/g, uid);