@opengis/fastify-table 1.2.90 → 1.2.92

package/package.json

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

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

@@ -3,7 +3,7 @@ import getRangeQuery from "./getRangeQuery.js";
 export default function formatValue({
   pg, table, filter = {}, name, value, dataTypeID, uid = 1, optimize,
 }) {
-  const { extra, sql, select, strict } = filter;
+  const { extra, sql, select, strict, options } = filter;
   const pk = pg?.pk && table ? pg.pk[table] : undefined;
 
   const filterType = filter.type?.toLowerCase() || 'text';
@@ -11,7 +11,8 @@ export default function formatValue({
 
   if (!name
     || !value
-    || !dataTypeID && !extra && !sql || extra?.input?.toLowerCase?.() === 'datatable') {
+    || (!dataTypeID && !extra && !sql && !options)
+    || extra?.input?.toLowerCase?.() === 'datatable') {
     return {};
   }
 
@@ -87,6 +88,12 @@ export default function formatValue({
 
   /* select query - from admin.cls / filter options */
   if (['check', 'autocomplete', 'text', 'tags', 'avatar', 'radio'].includes(filterType)) {
+    // multiple checks with predefined query
+    if (filterType === 'check' && options?.length) {
+      const query = options.filter(el => value.split(',').includes(el.id)).map(el => el.sql).join(' and ') || 'false';
+      return { op: '=', query };
+    }
+
     // with sql subquery
     if (sql) {
       return { op: '=', query: querysql };
@@ -103,17 +110,5 @@ export default function formatValue({
     return { op: '=', query };
   }
 
-  // sql column
-  if (optimize && optimize.name !== optimize.pk && false) {
-    const val = filterType === 'text' ? `ilike '%${value}%'` : `= any('{${value}}')`;
-    return {
-      op: '~',
-      query: fieldType?.includes('[]')
-        ? `${optimize.pk} && (select array_agg(${optimize.pk}) from ${optimize.table} where ${name} ${val} )`
-        : `${optimize.pk} in (select ${optimize.pk} from ${optimize.table} where ${name} ${val} )`,
-      extra,
-    };
-  }
-
   return {};
 }