@opengis/fastify-table 1.4.59 → 1.4.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.59",
+  "version": "1.4.61",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -59,4 +59,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

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

@@ -38,9 +38,10 @@ function formatDateISOString(date) {
 
 function getRangeValues(value = '', filterType = 'range') {
     if (['range'].includes(filterType)) {
-        return value?.indexOf('_') !== -1
-            ? value.split('_')
-            : value.split('-');
+        if (value?.includes(',')) return value.split(',').map((el) => el || 'min');
+        if (value?.includes('_')) return value.split('_');
+
+        return value.split('-');
     }
 
     // date range, specific options: current day, week, month, year etc.
@@ -61,14 +62,14 @@ function getRangeValues(value = '', filterType = 'range') {
     }
 
     // date range, example: 01.01.2024-31.12.2024
-    const [startDate, endDate] = value.split('-');
+    const [startDate, endDate = 'max'] = value?.includes(',') ? value.split(',').map((el) => el || 'min') : value.split('-');
     const min = startDate === 'min' ? startDate : formatDateISOString(startDate);
     const max = endDate === 'max' ? endDate : formatDateISOString(endDate);
     return [min, max];
 }
 
 function checkValid(value, fieldType, filterType, sql, extra) {
-    const [min, max] = getRangeValues(value, filterType);
+    const [min, max = 'max'] = getRangeValues(value, filterType);
 
     if (['date', 'datepicker'].includes(filterType)) {
         const isvalid = (dateTypeList.includes(fieldType) || sql || extra) && (isValidDate(min) && (isValidDate(max) || value === 'cd'));

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

@@ -54,10 +54,10 @@ export default async function filterAPI(req, reply, iscalled) {
 
   filters?.forEach?.(el => Object.assign(el, { id: el.id || el.name, title: el.title || el.ua, extra: extraColumns.includes(el.id || el.name) }));
 
-  await Promise.all(filters.filter((el) => el.data && el.id && el.type !== 'Autocomplete' && !el.sql).map(async (el) => {
-    const cls = await getSelect(el.data, pg);
+  await Promise.all(filters.filter((el) => el.id && el.type !== 'Autocomplete' && !el.sql).map(async (el) => {
+    const cls = el.data ? await getSelect(el.data, pg) : null;
 
-    if (!cls) return;
+    if (!cls && !el.type?.includes?.('Check')) return;
     const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
 
     if (el.extra && Array.isArray(cls?.arr || cls)) {
@@ -87,7 +87,7 @@ export default async function filterAPI(req, reply, iscalled) {
     const clsData = await getSelectVal({ pg, values: ids, name: el.data });
 
     const options = countArr.rows.map(cel => {
-      const data = cls?.arr?.find(c => c.id?.toString?.() === cel.id?.toString?.()) || { text: clsData[cel.id]?.text || clsData[cel.id] };
+      const data = cls?.arr?.find?.(c => c.id?.toString?.() === cel.id?.toString?.()) || { text: clsData?.[cel.id]?.text || clsData?.[cel.id] || cel.id };
       return { ...cel, ...data };
     });
     Object.assign(el, { options });