@opengis/fastify-table 1.2.76 → 1.2.78

package/package.json

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

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

@@ -1,8 +1,8 @@
 import routeData from '../../../routes/table/controllers/data.js';
 
-export default async function getData({ id, table, pg, filter, limit, page, search, user, sql }, reply, called) {
+export default async function getData({ id, table, pg, filter, limit, page, search, user, sql, contextQuery }, reply, called) {
   const params = { table, id };
   const query = { filter, limit, page, search, sql };
-  const result = await routeData({ pg, params, query, user, sql }, reply, called);
+  const result = await routeData({ pg, params, query, user, contextQuery }, reply, called);
   return result;
 }

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

@@ -15,7 +15,7 @@ const checkInline = {};
 const maxLimit = 100;
 export default async function dataAPI(req, reply, called) {
   const {
-    pg = pgClients.client, params, query = {}, user = {},
+    pg = pgClients.client, params, query = {}, user = {}, contextQuery,
   } = req;
 
   const time = Date.now();
@@ -130,7 +130,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', 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) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
 
   // const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
   const q = `select  ${pk ? `"${pk}" as id,` : ''} 
@@ -146,7 +146,7 @@ export default async function dataAPI(req, reply, called) {
     .replace(/{{uid}}/g, uid);
 
   // if (user?.user_type === 'superadmin') console.log(q);
-
+  if (config.trace) console.log(q);
   if (query.sql === '1') { return q; }
 
   const { rows = [] } = await pg.query(q, (tokenData?.id || hookData?.id || params.id ? [tokenData?.id || hookData?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
@@ -172,7 +172,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].filter(el => el).join(' and ') || 'true'} `
+            where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery].filter(el => el).join(' and ') || 'true'} `
     .replace(/{{uid}}/g, uid);
 
   if (query.sql === '2') { return qCount; }

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

@@ -134,9 +134,9 @@ export default async function suggest(req) {
 
   const { columns = [] } = await getMeta({ pg: pg1, table: tableName1 });
 
-  const filterColumn = query.column ? columns.find(el => el.name === query.column)?.name : null;
-  const filter = query.token && pg.pk?.[loadTable?.table || query.token] && filterColumn
-    ? `id in (select ${filterColumn} from ${(loadTable?.table || query.token).replace(/'/g, "''")})`
+  const { name: filterColumn, dataTypeID } = query.column ? (columns.find(el => el.name === query.column) || {}) : {};
+  const filter = query.token && pg.pk?.[loadTable?.table || query.token] && filterColumn && dataTypeID
+    ? `id in (select ${pg.pgType[dataTypeID]?.includes('[]') ? `unnest(${filterColumn})` : filterColumn} from ${(loadTable?.table || query.token).replace(/'/g, "''")})`
     : 'true';
 
   const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} order by 2) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || '0');