@opengis/fastify-table 1.4.26 → 1.4.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.26",
+  "version": "1.4.27",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -51,8 +51,8 @@
     "uglify-js": "3.19.3"
   },
   "devDependencies": {
-    "eslint": "8.49.0",
-    "eslint-config-airbnb": "19.0.4"
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4"
   },
   "author": "Softpro",
   "license": "ISC"

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

@@ -17,6 +17,14 @@ const checkInline = {};
 const maxLimit = 100;
 const defaultLimit = 20;
 
+function getOrder(query, columnList, orderColumn, loadTable, orderDir, called) {
+  if (query?.order && called) { return `order by ${query.order}`; }
+  if (typeof orderColumn === 'string' && Array.isArray(columnList) && columnList.includes(orderColumn)) {
+    return `order by ${orderColumn} ${query?.desc || orderDir === 'desc' ? 'desc' : ''} nulls last`;
+  }
+  return `order by ${(loadTable?.order || 'true::boolean')} nulls last`;
+}
+
 export default async function dataAPI(req, reply, called) {
   const {
     pg = pgClients.client, params, headers = {}, query = {}, user = {}, contextQuery, sufix = true,
@@ -166,9 +174,8 @@ export default async function dataAPI(req, reply, called) {
   // id, query, filter
   const [orderColumn, orderDir] = (query.order || loadTable?.order || '').split(/[- ]/);
 
-  const order = query.order && columnList.includes(orderColumn) && orderColumn?.length
-    ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''} nulls last`
-    : `order by ${(loadTable?.order || 'true::boolean')} nulls last`;
+  const order = getOrder(query, columnList, orderColumn, loadTable, orderDir, called);
+
   const search = loadTable?.meta?.search && query.search
     ? `(${loadTable?.meta?.search?.split(',')?.map(el => `${el} ilike '%${query.search.replace(/%/g, '\\%').replace(/'/g, "''")}%'`).join(' or ')})`
     : null;