@opengis/fastify-table 1.3.30 → 1.3.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.30",
+  "version": "1.3.32",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

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

@@ -72,6 +72,11 @@ async function init(client) {
     const { table, args = [], time = 15 } = param;
     const seconds = typeof time !== 'number' || time < 0 ? 0 : time * 60;
 
+    if (seconds === 0 || config.disableCache) {
+      const data = await query(q, args || []);
+      return data;
+    }
+
     // CRUD table state
     const keyCacheTable = `pg:${table}:crud`;
     const crudInc = table ? await rclient.get(keyCacheTable) || 0 : 0;

package/server/plugins/yml/funcs/json2yml.js

@@ -1,5 +1,5 @@
 import { dump } from "js-yaml";
 
-const yml2json = (json) => dump(json || {});
+const json2yml = (json) => dump(json || {});
 
-export default yml2json;
+export default json2yml;

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

@@ -22,6 +22,8 @@ export default async function dataAPI(req, reply, called) {
   const timeArr = [Date.now()];
   const { uid } = user;
 
+  const checkQuery = (item) => (user?.user_type === 'superadmin' ? !item.includes('{{uid}}') : true);
+
   const hookData = await applyHook('preData', {
     pg, table: params?.table, id: params?.id, user,
   });
@@ -136,7 +138,7 @@ export default async function dataAPI(req, reply, called) {
   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 interfaceQuery = params?.query ? await handlebars.compile(params?.query)({ user, uid }) : undefined;
-  const where = [(tokenData?.id || hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable?.query, tokenData?.query, fData.q, search, accessQuery || '1=1', contextQuery, bbox, queryPolyline, interfaceQuery].filter((el) => el).filter((el) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
+  const where = [(tokenData?.id || hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable?.query, tokenData?.query, fData.q, search, accessQuery || '1=1', contextQuery, bbox, queryPolyline, interfaceQuery].filter((el) => el).filter((el) => checkQuery(el));
 
   // const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
   const q = `select  ${pk ? `"${pk}" as id,` : ''} 
@@ -169,7 +171,7 @@ export default async function dataAPI(req, reply, called) {
     });
   }
 
-  const filterWhere = [fData.q, search, bbox, queryPolyline, interfaceQuery, loadTable?.query, tokenData?.query].filter((el) => el);
+  const filterWhere = [fData.q, search, bbox, queryPolyline, interfaceQuery, loadTable?.query, tokenData?.query].filter((el) => el).filter((el) => checkQuery(el));
 
   const aggColumns = columns.filter((el) => el.agg).reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.agg }), {});
   const aggregates = dbColumns.map((el) => ({ name: el.name, type: pg.pgType?.[el.dataTypeID] })).filter((el) => ['numeric', 'double precision'].includes(el.type) && aggColumns[el.name]);
@@ -178,7 +180,7 @@ export default async function dataAPI(req, reply, called) {
             count(*) FILTER(WHERE ${filterWhere.join(' and ') || 'true'})::int as filtered
             ${aggregates.length ? `,${aggregates.map((el) => `${aggColumns[el.name]}(${el.name}) FILTER(WHERE ${filterWhere.join(' and ') || 'true'}) as ${el.name}`).join(',')}` : ''}
             from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t ${sqlTable})q 
-            where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery].filter(el => el).join(' and ') || 'true'} `
+            where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery].filter(el => el).filter((el) => checkQuery(el)).join(' and ') || 'true'} `
     .replace(/{{uid}}/g, uid);
 
   if (query.sql === '2') { return qCount; }

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

@@ -0,0 +1,54 @@
+import { readFileSync } from 'node:fs';
+
+import getMeta from '../../../plugins/pg/funcs/getMeta.js';
+import metaFormat from "../../../plugins/table/funcs/metaFormat/index.js";
+import getTemplatePath from "../../../plugins/table/funcs/getTemplatePath.js";
+import yml2json from "../../../plugins/yml/funcs/yml2json.js";
+
+const infoList = [];
+
+const infoTemplateList = getTemplatePath('info')?.filter?.((el, idx, arr) => arr.findIndex(item => item[1] === el[1]) === idx);
+infoTemplateList?.forEach?.(el => {
+  const info = yml2json(readFileSync(el[1], 'utf-8'));
+  infoList.push(info);
+});
+
+export default async function dataInfo({
+  pg = pgClients.client, params = {}, query = {}, user = {},
+}, reply) {
+  const timeStart = Date.now();
+  const { id } = params;
+  const { table } = query;
+
+  const filteredList = table ? infoList.filter(el => el.table === table) : infoList;
+
+  if (!filteredList?.length) {
+    return reply.status(404).send('empty info templates list');
+  }
+
+  if (!id) {
+    return reply.status(400).send('not enough params: id');
+  }
+
+  const result = await Promise.all(filteredList.filter(el => el.table && pg.pk?.[el.table]).map(async (el) => {
+    const { table, cls } = el;
+    const { rowCount = 0, rows = [] } = await pg.query(`select ${pg.pk?.[el.table]} as id, ${el.columns?.map?.(el => el?.replace?.(/'/g, "''")) || '*'} from ${table} where ${el.query || 'true'} and ${pg.pk?.[table]}=$1`, [id]);
+    if (rowCount > 0) {
+      const meta = await getMeta({ pg, table });
+      const columns = meta?.columns?.filter(item => el.columns?.includes?.(item.name))?.map?.(({ name, title, dataTypeID }) => ({ name, title, type: pg.pgType[dataTypeID] }));
+      return { table, columns, rows, cls, sufix: false };
+    }
+    return null;
+  }));
+
+  if (!result[0]?.table) {
+    return reply.status(404).send('object not found: ' + id);
+  }
+
+  await metaFormat(result[0], pg);
+
+  return {
+    time: Date.now() - timeStart,
+    ...result[0],
+  };
+}

package/server/routes/table/index.js

@@ -1,5 +1,6 @@
 import suggest from './controllers/suggest.js';
 import data from './controllers/data.js';
+import dataInfo from './controllers/dataInfo.js';
 
 import card from './controllers/card.js';
 import search from './controllers/search.js';
@@ -16,7 +17,8 @@ async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
   const policy = ['public'];
   fastify.get(`${prefix}/suggest/:data`, { config: { policy }, schema: suggestSchema }, suggest);
-  fastify.get(`${prefix}/data/:table/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/data/:table/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, data);
+  fastify.get(`${prefix}/data-info/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, dataInfo);
 
   fastify.get(`${prefix}/card/:table/:id`, { config: { policy }, schema: tableSchema }, card);
   fastify.get(`${prefix}/search`, { config: { policy }, schema: searchSchema }, search);