@opengis/fastify-table 1.1.28 → 1.1.29

package/Changelog.md

@@ -1,6 +1,6 @@
 # fastify-table
 
-## 1.1.28 - 09.10.2024
+## 1.1.29 - 09.10.2024
 
 - add after crud hook
 

package/package.json

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

package/server/migrations/properties.sql

@@ -1,4 +1,5 @@
 create schema if not exists admin;
+create schema if not exists setting;
 
 -- DROP TABLE admin.properties;
 CREATE TABLE IF NOT EXISTS admin.properties();

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

@@ -19,7 +19,7 @@ function formatDateISOString(date) {
 }
 
 function formatValue({
-  clsList, filterType, filter, name, value, operator = '=', fieldType = 'text', uid = 1, optimize,
+  filterType, filter, name, value, operator = '=', fieldType = 'text', uid = 1, optimize,
 }) {
   if (!name || !value) return {};
 
@@ -105,7 +105,7 @@ function formatValue({
     return { op: operator, query };
   }
 
-  if (operator === '=' && filterType !== 'text') {
+  if (operator === '=' && filterType !== 'text' && !filter?.data) {
     const query = {
       null: `${name} is null`,
       notnull: `${name} is not null`,
@@ -114,9 +114,12 @@ function formatValue({
   }
 
   if (['~', '='].includes(operator)) {
-    const query = clsList[filter?.data]
-      ? `${filter?.name} in ( ( with q(id,name)  as  (${clsList?.[filter?.data]}) select id from q where name ilike '%${value}%') )` // filter with cls
-      : `${name}::text ilike '%${value}%'`; // simple filter
+    const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
+    const match = operator1 === '=' ? `='${value}'` : `ilike '%${value}%'`;
+    const query = filter?.data && filter?.sql
+      ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where name::text ${match}) )` // filter with cls
+      : `${name}::text ${match}`; // simple filter
+    // console.log(query);
     return { op: 'ilike', query };
   }
 

package/widget/controllers/utils/obj2db.js

@@ -5,8 +5,8 @@ export default function obj2db(data, nonexistCol) {
         || !Object.keys(data || {}).length
   ) return { error: 'invalid data type' };
 
-  const existColumns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
-  const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
+  const columns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
+  // const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
   const args = columns?.map((col) => data[col]);
 
   return { columns, args, error: !columns?.length ? 'nothing to process' : undefined };