@opengis/fastify-table 1.3.31 → 1.3.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.31",
+  "version": "1.3.33",
   "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/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,14 +180,14 @@ 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; }
 
   const counts = keyQuery || tokenData?.id || hookData?.id || params.id
     ? { total: rows.length, filtered: rows.length }
-    : await pg.queryCache?.(qCount, { table: loadTable?.table || tokenData?.table, time: 5 * 60 }).then(el => el?.rows[0] || {});
+    : await pg.queryCache?.(qCount, { table: loadTable?.table || tokenData?.table, time: 5 }).then(el => el?.rows[0] || {});
 
   timeArr.push(Date.now())
   const { total, filtered } = counts || {};