@opengis/fastify-table 1.2.75 → 1.2.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.75",
+  "version": "1.2.77",
   "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/plugins/table/funcs/getFilterSQL/index.js

@@ -44,7 +44,7 @@ export default async function getFilterSQL({
   // console.log('extra getFilterSQL', extraDataTable, pg.pk?.[extraDataTable]);
 
   // check sql inline fields count
-  if (!checkInline[body?.table] && body?.sql?.length && body.table) {
+  if (body?.table && !checkInline[body?.table] && body?.sql?.length) {
     const filterSql = body.sql.filter(el => !el?.disabled && (el.inline ?? true));
     const sqlTable = filterSql.map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
     const d = await Promise.all(filterSql.map((el, i) => pg.query(`select  ${el.name || `t${i}`}.* from(select * from ${body.table})t ${sqlTable} limit 0`).then(el => el.fields)))

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();
@@ -78,7 +78,7 @@ export default async function dataAPI(req, reply, called) {
   const cardSqlFiltered = hookData?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
   const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ct${i}  on 1=1 `).join('\n') || '' : '';
 
-  const sqlInline = loadTable.sql?.filter?.(el => el.inline).map(el => `,(${el.sql})`).join('') || '';
+  const sqlInline = loadTable?.sql?.filter?.(el => el.inline)?.map(el => `,(${el.sql})`)?.join('') || '';
   const { fields = [] } = pg.queryCache ? await pg.queryCache(`select * ${sqlInline} from ${table} t ${sqlTable}  ${cardSqlTable} limit 0`) : {};
   const dbColumnsTable = fields.map(el => el.name);
   const cols = columns.filter((el) => el.name !== 'geom' && dbColumnsTable.includes(el.name)).map((el) => el.name || el).join(',');
@@ -102,7 +102,7 @@ export default async function dataAPI(req, reply, called) {
   const checkFilter = [query.filter, query.search, query.state, query.custom].filter((el) => el).length;
   const fData = checkFilter ? await getFilterSQL({
     pg,
-    table: params.table,
+    table: loadTable ? params.table : table,
     filter: query.filter,
     search: query.search,
     state: query.state,
@@ -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; }