@opengis/fastify-table 1.3.35 → 1.3.37

package/package.json

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

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

@@ -4,7 +4,7 @@ import getRangeQuery from "./getRangeQuery.js";
 export default function formatValue({
   pg, table, filter = {}, name, value, dataTypeID, uid = 1, optimize,
 }) {
-  const { extra, sql, select, strict, options } = filter;
+  const { extra, sql, select, strict, options, default: defaultValue } = filter;
   const pk = pg?.pk && table ? pg.pk[table] : undefined;
 
   const filterType = filter.type?.toLowerCase() || 'text';

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

@@ -11,16 +11,21 @@ import formatValue from './formatValue.js';
 function getQuery({
   pg, filter: filterStr, table, tableSQL, fields, filterList, uid,
 }) {
-  if (!filterStr) return null; // filter list API
+  // if (!filterStr) return null; // filter list API
 
   const mainOperators = ['=', '~', '>', '<'];
 
   const filterQueryArray = decodeURIComponent(filterStr?.replace?.(/%/g, '%25')?.replace?.(/%/g, '\\%')?.replace?.(/(^,)|(,$)/g, ''))?.replace?.(/'/g, "''")?.split?.(/[;|]/) || [];
+  // default filter value form checkboxes, autocomplete or sql-defined only
+  const filterDefaultQueryArray = filterList?.filter?.(el => el.name && !filterStr?.includes?.(`${el.name}=`) && el.default && (el.options || el.sql))?.map?.((el) => `${el.name}=${el.default}`) || [];
+
+  // concat default + request filters
+  const arr = filterQueryArray.concat(filterDefaultQueryArray).filter(el => el);
 
   const resultList = [];
 
-  for (let i = 0; i < filterQueryArray.length; i += 1) {
-    const item = filterQueryArray[i];
+  for (let i = 0; i < arr.length; i += 1) {
+    const item = arr[i];
     const splitby = mainOperators?.find((el) => item.indexOf(el) !== -1) || '=';
     const [name] = item.split(splitby);
 
@@ -34,7 +39,7 @@ function getQuery({
     const { strict, extra } = filter;
 
     // find all value
-    const value = filterQueryArray.filter((el) => el.split(splitby)?.[0] === name).map((el) => el.substring(name.length + 1)).join(',');
+    const value = arr.filter((el) => el.split(splitby)?.[0] === name).map((el) => el.substring(name.length + 1)).join(',');
 
     const optimize = fields?.find((el) => el.name === name) ? null : tableSQL.find((el) => el.name === name);
 

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

@@ -104,7 +104,15 @@ export default async function dataAPI(req, reply, called) {
     });
   }
 
-  const checkFilter = [query.filter, query.search, query.state, query.custom].filter((el) => el).length;
+  const isdefault = (loadTable?.filter_list || [])
+    .concat(loadTable?.filterInline || [])
+    .concat(loadTable?.filterCustom || [])
+    .concat(loadTable?.filterState || [])
+    .concat(loadTable?.filterList || [])
+    .concat(loadTable?.filters || [])
+    .find(el => el.default);
+
+  const checkFilter = [query.filter, query.search, query.state, query.custom, isdefault].filter((el) => el).length;
 
   const fData = checkFilter ? await getFilterSQL({
     pg,