@opengis/fastify-table 1.2.48 → 1.2.50

package/package.json

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

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

@@ -74,7 +74,7 @@ export default async function getFilterSQL({
       }).join(' or ')} )` : '';
 
     const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || [])
-      .concat(body?.filters || [])) /* .concat(extraFilters || []).concat(customFilters || []) */
+      .concat(body?.filters || [])).concat(body?.filterSql || []) /* .concat(extraFilters || []).concat(customFilters || []) */
 
       ?.map(async (el) => {
         if (el.name && extraKeys?.includes?.(el.name)) {

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

@@ -35,6 +35,40 @@ function formatValue({
   if (!name || !value || !fieldType) return {};
   const filterType = filter.type?.toLowerCase();
 
+  // body.filterSql
+  if (sql && !data) {
+    // date range
+    if (filterType === 'date') {
+      const [startDate, endDate] = value.split('-');
+      const min = formatDateISOString(startDate);
+      const max = formatDateISOString(endDate);
+
+      if (!isValidDate(startDate) || !isValidDate(endDate)) {
+        return { op: 'between', query: 'false', extra, sql: true };
+      }
+
+      const query = sql.replace(/\$1/g, `'${min}'::date`).replace(/\$2/g, `'${max}'::date`);
+      return { op: '=', query, extra, sql: true };
+    }
+
+    // num range
+    if (filterType === 'range') {
+      const [min, max] = value?.indexOf('_') !== -1 ? value.split('_') : value.split('-');
+      const query = sql.replace(/\$1/g, min).replace(/\$2/g, max);
+      return { op: 'between', query, extra, sql: true };
+    }
+
+    // autocomplete, check
+    if (sql?.indexOf('any($1)') !== -1) {
+      const query = sql.replace(/= ?any\(\$1\)/g, `::text=any('{ ${value} }'::text[])`);
+      return { op: '=', query, extra, sql: true };
+    }
+
+    // text
+    const query = sql.replace(/\$1/g, `'${value}'`);
+    return { op: '=', query, extra, sql: true };
+  }
+
   // current day, week, month, year etc.
   if (dateTypeList.includes(fieldType) && !value?.includes('_') && ['cd', 'cw', 'cm', 'cq', 'cy'].includes(value)) {
     const query = {

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

@@ -15,7 +15,7 @@ function getQuery({
 
   const mainOperators = ['=', '~', '>', '<'];
 
-  const filterQueryArray = decodeURIComponent(filterStr?.replace(/%/g, '%25').replace(/%/g, '\\%')?.replace(/(^,)|(,$)/g, '')).replace(/'/g, "''").split(/[;|]/);
+  const filterQueryArray = decodeURIComponent(filterStr?.replace?.(/%/g, '%25')?.replace?.(/%/g, '\\%')?.replace?.(/(^,)|(,$)/g, ''))?.replace?.(/'/g, "''")?.split?.(/[;|]/) || [];
 
   const resultList = [];
 

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

@@ -118,7 +118,7 @@ export default async function dataAPI(req, reply, called) {
                      ${metaCols} 
                      
                      ${dbColumns.find((el) => el.name === 'geom' && pg.pgType?.[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''} 
-                     from (select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')}  ${order}) t 
+                     from (select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')}  ) t 
                      ${sqlTable} 
                      ${params.id ? cardSqlTable : ''} 
                      where ${where.join(' and ') || 'true'} 

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

@@ -65,5 +65,6 @@ export default async function filterAPI(req) {
     custom: loadTable?.filterCustom,
     inline: loadTable?.filterInline,
     state: loadTable?.filterState,
+    sql: loadTable?.filterSql,
   };
 }