@opengis/fastify-table 1.4.4 → 1.4.5

package/package.json

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

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

@@ -32,7 +32,7 @@ export default async function getFilterSQL({
   const extraDataTable = extra
     ? config.extraData?.[body.table]
     || config.extraData?.[body.table.split('.').shift()]
-    || config.extraData?.['default']
+    || config.extraData?.default
     || config.extraData
     || defaultTable
     : undefined;
@@ -131,7 +131,10 @@ export default async function getFilterSQL({
 
     // table
 
-    const obj = { body, extraSqlColumns, table, q };
+    const obj = {
+      body, extraSqlColumns, table, q,
+    };
+
     const optimizedSQL = `select * from ${getOptimizedQuery(obj)} `;
     const tableCount = getOptimizedQuery(obj, true);
 

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

@@ -1,18 +1,29 @@
-import applyHookSync from "../../../../hook/funcs/applyHookSync.js";
-import getRangeQuery from "./getRangeQuery.js";
+import applyHookSync from '../../../../hook/funcs/applyHookSync.js';
+import getRangeQuery from './getRangeQuery.js';
 
 export default function formatValue({
   pg, table, filter = {}, name, value, dataTypeID, uid = 1, optimize,
 }) {
-  const { extra, sql, select, strict, options, default: defaultValue } = filter;
+  const {
+    extra, sql, select, strict, options, default: defaultValue,
+  } = filter;
+
   const pk = pg?.pk && table ? pg.pk[table] : undefined;
 
+  if (name === 'search' && value && filter?.id) {
+    const columns = filter.id.split(',');
+    const sval = `ilike '%${decodeURIComponent(value.replace(/%/g, '%25')).replace(/%/g, '\\%')}%'`;
+    const query = `${columns.map(el => `"${el}" ${sval}`).join(' or ')}`;
+    return { op: '~', query };
+  }
+
   const filterType = filter.type?.toLowerCase() || 'text';
   const fieldType = pg?.pgType?.[dataTypeID] || pg?.pgType?.[{ date: 1114 }[filterType] || 25];
 
   const hookData = applyHookSync('onFormatValue', {
     pg, pk, table, name, value, filterType, fieldType, filter, dataTypeID, uid, optimize,
   });
+
   if (hookData) {
     return hookData?.query ? hookData : { op: '=', query: hookData };
   }
@@ -21,7 +32,7 @@ export default function formatValue({
     || !value
     || (!dataTypeID && !extra && !sql && !options)
     || extra?.input?.toLowerCase?.() === 'datatable'
-    || !['check', 'autocomplete', 'tags', 'avatar', 'radio'].includes(filterType) && options?.find?.(el => el?.sql)
+    || (!['check', 'autocomplete', 'tags', 'avatar', 'radio'].includes(filterType) && options?.find?.(el => el?.sql))
   ) {
     return {};
   }

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

@@ -35,7 +35,9 @@ function getFilterQuery({
     }
 
     // filter
-    const filter = filterList?.find?.((el) => el.type && el.name === name) || { type: 'text' };
+    const filter = filterList?.find?.((el) => el.type === 'search' && el.id)
+    || filterList?.find?.((el) => el.type && el.name === name)
+    || { type: 'text' };
     const { strict, extra } = filter;
 
     // find all value