@opengis/fastify-table 1.4.62 → 1.4.64

package/package.json

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

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

@@ -54,7 +54,7 @@ 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.id && el.type !== 'Autocomplete' && !el.sql).map(async (el) => {
+  await Promise.all(filters.filter((el) => el.id && el.type !== 'Autocomplete' && !el.sql && !el.options?.find?.(item => item.sql)).map(async (el) => {
     const cls = el.data ? await getSelect(el.data, pg) : null;
 
     if (!cls && !el.type?.includes?.('Check')) return;
@@ -88,7 +88,7 @@ export default async function filterAPI(req, reply, iscalled) {
 
     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] || cel.id };
-      return { ...cel, ...data };
+      return { ...cel, id: cel.id === null ? 'null' : cel.id, ...data };
     });
     Object.assign(el, { options });
   }));

package/server/routes/table/controllers/utils/conditions.js

@@ -1,4 +1,4 @@
-function onCheck(rule, data) {
+function onCheck(rule, data = {}) {
     const val = data[rule[0]];
     // console.log(val, rule[1], rule[2])
     if (rule[1] === '==') return val === rule[2];

package/server/routes/table/functions/getData.js

@@ -182,11 +182,12 @@ export default async function dataAPI(req, reply, called) {
 
   const offset = query.page && query.page > 0 && !objectId ? ` offset ${(query.page - 1) * limit}` : '';
   // id, query, filter
-  const [orderColumn, orderDir] = (query.order || loadTable?.order || '').split(/[- ]/);
+  const [orderColumn, orderDir] = called && query.order ? [query.order] : (query.order || loadTable?.order || '').split(/[- ]/);
 
-  const order = query.order && columnList.includes(orderColumn) && orderColumn?.length
-    ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''} nulls last`
+  const order = query.order && (columnList.includes(orderColumn) && orderColumn?.length || called)
+    ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''} ${!called ? 'nulls last' : ''}`
     : `order by ${(loadTable?.order || 'true::boolean')} nulls last`;
+
   const search = loadTable?.meta?.search && query.search
     ? `(${loadTable?.meta?.search?.split(',')?.map(el => `${el} ilike '%${query.search.replace(/%/g, '\\%').replace(/'/g, "''")}%'`).join(' or ')})`
     : null;

package/server/routes/widget/controllers/widget.set.js

@@ -84,7 +84,7 @@ export default async function widgetSet(req, reply) {
     link: req.path,
     id,
     objectid,
-    session,
+    user,
     type,
     payload: data,
   });