@opengis/fastify-table 1.1.10 → 1.1.12

package/Changelog.md

@@ -1,6 +1,6 @@
 # fastify-table
 
-## 1.1.10 - 24.09.2024
+## 1.1.12 - 24.09.2024
 
 - fix update crud editor id/date + geom
 

package/package.json

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

package/table/controllers/filter.js

@@ -1,6 +1,7 @@
 import getTemplate from './utils/getTemplate.js';
 import getSelect from './utils/getSelect.js';
 import getMeta from '../../pg/funcs/getMeta.js';
+import getFilterSQL from '../funcs/getFilterSQL/index.js';
 
 export default async function filter(req) {
   const time = Date.now();
@@ -12,14 +13,16 @@ export default async function filter(req) {
   if (!loadTable) { return { status: 404, message: 'not found' }; }
   const { columns } = await getMeta({ table: loadTable.table });
 
+  const { optimizedSQL = `select * from ${loadTable.table}` } = loadTable?.sql ? await getFilterSQL({ table: params.table, pg: req.pg }) : {};
+
   const filters = loadTable?.filters || loadTable?.filterList || [];
   await Promise.all(filters.filter((el) => el.data).map(async (el) => {
     const cls = await getSelect(el.data);
     if (!cls?.arr || !loadTable.table) return;
     const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
     const countArr = req.pg.pgType[dataTypeID]?.includes('[]')
-      ? await req.pg.queryCache(`select unnest(${el.id})::text as id,count(*) from ${loadTable.table} group by unnest(${el.id})`)
-      : await req.pg.queryCache(`select ${el.id}::text as id,count(*) from ${loadTable.table} group by ${el.id}`);
+      ? await req.pg.queryCache(`select unnest(${el.id})::text as id,count(*) from (${optimizedSQL})q group by unnest(${el.id})`)
+      : await req.pg.queryCache(`select ${el.id}::text as id,count(*) from (${optimizedSQL})q group by ${el.id}`);
 
     const options = countArr.rows.map(cel => {
       const data = cls?.arr.find(c => c.id === cel.id);

package/utils.js

@@ -23,6 +23,7 @@ import checkXSS from './crud/controllers/utils/checkXSS.js';
 import gisIRColumn from './table/controllers/utils/gisIRColumn.js';
 import getMeta from './pg/funcs/getMeta.js';
 import getAccess from './crud/funcs/getAccess.js';
+import getSelectVal from './table/funcs/metaFormat/getSelectVal.js';
 
 export default null;
 export {
@@ -45,4 +46,5 @@ export {
   gisIRColumn,
   getMeta,
   getAccess,
+  getSelectVal,
 };