@opengis/fastify-table 1.3.34 → 1.3.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.34",
+  "version": "1.3.36",
   "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,11 +11,14 @@ 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?.(/[;|]/) || [];
+  const filterQueryArray = filterStr
+    ? decodeURIComponent(filterStr?.replace?.(/%/g, '%25')?.replace?.(/%/g, '\\%')?.replace?.(/(^,)|(,$)/g, ''))?.replace?.(/'/g, "''")?.split?.(/[;|]/)
+    : filterList?.filter?.(el => el.default && (el.options || el.sql))?.map?.((el) => `${el.name}=${el.default}`) // default filter value form checkboxes, autocomplete or sql-defined only
+    || [];
 
   const resultList = [];
 

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

@@ -64,7 +64,7 @@ export default async function tableAPI(req) {
 
   if (query?.sql === '1') return q;
 
-  const data = await pg.query(q, [id]).then(el => el.rows[0]);
+  const data = await pg.query(q.replace(/{{uid}}/, user?.uid), [id]).then(el => el.rows[0]);
   if (!data) return { message: 'not found', status: 404 };
 
   Object.keys(schema).filter(key => schema[key]?.type === 'DataTable').forEach(key => {

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,