@opengis/fastify-table 1.1.105 → 1.1.107

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.105",
+  "version": "1.1.107",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",
@@ -25,8 +25,8 @@
     "fastify-plugin": "^4.0.0",
     "ioredis": "^5.3.2",
     "js-yaml": "^4.1.0",
-    "nodemailer": "^6.5.0",
     "pg": "^8.11.3",
+    "pino": "^9.5.0",
     "pino-abstract-transport": "^2.0.0"
   },
   "devDependencies": {

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -34,7 +34,7 @@ async function getFilterSQL({
     const tableSQL = await getTableSql({
       pg, body, table, fields,
     });
-    const sval = `ilike '%${decodeURIComponent(search).replace(/'/g, "''")}%'`;
+    const sval = `ilike '%${decodeURIComponent(search?.replace(/%/g, '%25')).replace(/'/g, "''").replace(/%/g, '\\%')}%'`;
     const searchQuery = search && searchColumn
       ? ` (${searchColumn.split(',')?.map((name) => {
         const { pk } = tableSQL.find((el) => el.name === name) || {};

package/server/plugins/table/funcs/getFilterSQL/util/getFilterQuery.js

@@ -15,7 +15,7 @@ function getQuery({
 
   const mainOperators = ['=', '~', '>', '<'];
 
-  const filterQueryArray = decodeURI(filterStr?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/);
+  const filterQueryArray = decodeURIComponent(filterStr?.replace(/%/g, '%25').replace(/%/g, '\\%')?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/);
 
   const resultList = [];
 
@@ -49,7 +49,7 @@ function getQuery({
       filter,
       optimize,
       name,
-      value: decodeURIComponent(value),
+      value,
       operator,
       dataTypeID,
     }) || {};

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

@@ -59,18 +59,18 @@ export default async function dataAPI(req) {
       column: params.id,
       sql: query.sql,
       filter: query.filter,
-      state: query.state,
       search: query.search,
+      state: query.state,
       custom: query.custom,
     });
   }
 
-  const checkFilter = [query.filter, query.state, query.search, query.custom].filter((el) => el).length;
+  const checkFilter = [query.filter, query.search, query.state, query.custom].filter((el) => el).length;
   const fData = checkFilter ? await getFilterSQL({
     table: params.table,
     filter: query.filter,
-    state: query.state,
     search: query.search,
+    state: query.state,
     custom: query.custom,
     json: 1,
   }) : {};
@@ -84,13 +84,15 @@ export default async function dataAPI(req) {
   const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
 
   const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-  const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
+  const search = loadTable.meta?.search && query.search
+    ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search.replace(/%/g, '\\%')}%'`).join(' or ')})`
+    : null;
   const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
   const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
   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 = [(hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, search, accessQuery || '1=1', bbox, queryPolyline, interfaceQuery].filter((el) => el);
+  const where = [(hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, search, accessQuery || '1=1', 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,` : ''} 
@@ -104,6 +106,8 @@ export default async function dataAPI(req) {
                      where ${where.join(' and ') || 'true'} 
                      ${order} ${offset}  limit ${limit}`
     .replace(/{{uid}}/g, uid);
+  
+  // if (user?.user_type === 'superadmin') console.log(q);
 
   if (query.sql === '1') { return q; }