@opengis/fastify-table 1.3.16 → 1.3.18

package/package.json

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

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

@@ -25,6 +25,7 @@ export default async function dataAPI(req, reply, called) {
   const hookData = await applyHook('preData', {
     pg, table: params?.table, id: params?.id, user,
   });
+
   if (hookData?.message && hookData?.status) {
     return { message: hookData?.message, status: hookData?.status };
   }
@@ -49,7 +50,9 @@ export default async function dataAPI(req, reply, called) {
 
   if (query.sql === '0') return loadTable;
 
-  if (!loadTable && !(tokenData?.table && pg.pk?.[tokenData?.table]) && !(called && pg.pk?.[params?.table])) { return { message: 'template not found', status: 404 }; }
+  if (!loadTable && !(tokenData?.table && pg.pk?.[tokenData?.table]) && !(called && pg.pk?.[params?.table])) {
+    return { message: 'template not found', status: 404 };
+  }
 
   const id = tokenData?.id || hookData?.id || params?.id;
   const { actions = [], query: accessQuery } = await getAccess({ table: tokenData?.table || hookData?.table || params.table, id, user }, pg) || {};
@@ -100,6 +103,7 @@ export default async function dataAPI(req, reply, called) {
   }
 
   const checkFilter = [query.filter, query.search, query.state, query.custom].filter((el) => el).length;
+
   const fData = checkFilter ? await getFilterSQL({
     pg,
     table: loadTable ? params.table : table,
@@ -110,18 +114,20 @@ export default async function dataAPI(req, reply, called) {
     uid,
     json: 1,
   }) : {};
-  timeArr.push(Date.now())
-  const keyQuery = query.key && (loadTable?.key || tokenData?.key) && !(hookData?.id || tokenData?.id || params.id) ? `${loadTable?.key || tokenData?.key}=$1` : null;
+
+  timeArr.push(Date.now());
+
+  const keyQuery = query.key && (loadTable?.key || tokenData?.key) && !(tokenData?.id || hookData?.id || params.id) ? `${loadTable?.key || tokenData?.key}=$1` : null;
 
   const limit = called ? (query.limit || 20) : Math.min(maxLimit, +(query.limit || 20));
 
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+  const offset = query.page && query.page > 0 && !(tokenData?.id || hookData?.id || params.id) ? ` offset ${(query.page - 1) * limit}` : '';
   // 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' : ''}`
-    : `order by ${(loadTable?.order || 'true::boolean')}`;
+    ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''} 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;
@@ -142,7 +148,7 @@ export default async function dataAPI(req, reply, called) {
                       
                      ${params.id ? cardSqlTable : ''} 
                      where ${where.join(' and ') || 'true'} 
-                     ${order} ${offset}  limit ${limit}`
+                     ${order} ${offset} limit ${limit}`
     .replace(/{{uid}}/g, uid);
 
   // if (user?.user_type === 'superadmin') console.log(q);