@opengis/fastify-table 1.3.36 → 1.3.38

package/package.json

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

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

@@ -15,15 +15,17 @@ function getQuery({
 
   const mainOperators = ['=', '~', '>', '<'];
 
-  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 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);
 
@@ -37,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/plugins/table/funcs/metaFormat/index.js

@@ -7,12 +7,12 @@ import getSelectVal from './getSelectVal.js';
 import pgClients from '../../../pg/pgClients.js';
 
 export default async function metaFormat({
-  rows: original, table, cls, sufix = true, reassign = true,
+  rows: original, table, cls, htmls, sufix = true, reassign = true,
 }, pg = pgClients.client) {
   const loadTable = table ? await getTemplate('table', table) : {};
   const selectCols = Object.keys(cls || {}).map(key => ({ name: key, data: cls[key] })).concat(loadTable?.columns?.filter((e) => e.data) || []);
   const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
-  const htmlCols = loadTable?.columns?.filter?.((e) => e.name && e.format === 'html' && e.html) || [];
+  const htmlCols = Object.keys(htmls || {}).map(key => ({ name: key, html: htmls[key] })).concat(loadTable?.columns?.filter?.((e) => e.name && e.format === 'html' && e.html) || []);
   if (!original?.length || !selectCols?.length && !metaCls?.length && !htmlCols?.length) return original;
 
   const rows = reassign ? original : JSON.parse(JSON.stringify(original));