@opengis/fastify-table 1.0.7 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/table/controllers/data.js

@@ -36,10 +36,14 @@ export default async function data(req) {
   const orderColumn = query.order || loadTable.order;
 
   const order = cols.includes(orderColumn) ? `order by ${orderColumn} ${query.desc ? 'desc' : ''}` : '';
-  const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q].filter((el) => el);
+  const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
+  const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
+  const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
+
+  const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
   const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${offset} ${order} limit ${limit}`;
 
-  if (query.sql) { return q; }
+  if (query.sql === '1') { return q; }
 
   const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
 

package/test/templates/table/green_space.table.json

@@ -282,17 +282,17 @@
   "filterCustom": [
     {
       "label": "Поточний рік",
-      "sql": "date_trunc('year',cdate) = date_trunc('year',now())"
+      "sql": "cdate > '2014-01-01'"
     }
   ],
   "filterState": [
     {
       "label": "Не верифіковано",
-      "sql": "yes_no=false"
+      "sql": "verif=false"
     },
     {
       "label": "Верифіковано",
-      "sql": "yes_no=true"
+      "sql": "verif=true"
     }
   ],
   "filterList": [
@@ -374,7 +374,7 @@
   ],
   "meta": {
     "title": "invent_number",
-    "search": "invent_number"
+    "search": "invent_number,type_tree"
   },
   "actions": [
     "edit",