@opengis/fastify-table 1.4.52 → 1.4.53

package/index.js

@@ -105,12 +105,14 @@ async function plugin(fastify, opt) {
   cronPlugin(fastify, opt);
   loggerPlugin(fastify, opt);
 
-  await fastify.register(import('@fastify/rate-limit'), {
-    max: 100,
-    timeWindow: '1 minute',
-    global: true,
-    keyGenerator: (req) => `${req.ip}-${req.raw.url.split('?')[0]}`,
-  });
+  if (config.rateLimit !== false) {
+    await fastify.register(import('@fastify/rate-limit'), {
+      max: config.rateLimit?.max || 100,
+      timeWindow: config.rateLimit?.timeWindow || '1 minute',
+      global: true,
+      keyGenerator: (req) => `${req.ip}-${req.raw.url.split('?')[0]}`,
+    });
+  }
 
   if (config.dblist) {
     dblistRoutes(fastify, opt);

package/package.json

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

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -22,7 +22,7 @@ function getExtraQuery(mainColumns, schema, table, pk) {
 }
 
 export default async function getFilterSQL({
-  table, filter, pg = pgClients.client, search, filterList, query, custom, state, uid, objectId,
+  table, filter, pg = pgClients.client, search, filterList, query, custom, state, uid, objectId, order,
 }) {
   if (!table) return { error: 'param table is required', status: 400 };
 
@@ -141,7 +141,7 @@ export default async function getFilterSQL({
       body, extraSqlColumns, table, q,
     };
 
-    const optimizedSQL = `select * from ${getOptimizedQuery(obj)} `;
+    const optimizedSQL = `select * from ${getOptimizedQuery(obj)} ${order ? `order by ${order}` : ''}`;
     const tableCount = getOptimizedQuery(obj, true);
 
     return {

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

@@ -15,7 +15,7 @@ export default function formatValue({
   if (filterType === 'text' && value && filter?.columns) {
     const columns = filter.columns.split(',');
     const sval = `ilike '%${decodeURIComponent(value.replace(/%/g, '%25')).replace(/%/g, '\\%')}%'`;
-    const query = `${columns.map(el => `"${el}" ${sval}`).join(' or ')}`;
+    const query = `(${columns.map(el => `"${el}" ${sval}`).join(' or ')})`;
     return { op: '~', query };
   }
 

package/server/routes/table/index.js

@@ -30,10 +30,10 @@ async function plugin(app, config = {}) {
   app.get(`${prefix}/suggest/:data`, {
     config: {
       policy,
-      rateLimit: {
-        max: 10000,
-        timeWindow: '1 minute',
-      },
+      rateLimit: config.rateLimit ? {
+        max: config.rateLimit?.suggest?.max || 10000,
+        timeWindow: config.rateLimit?.suggest?.timeWindow || '1 minute',
+      } : undefined,
     },
     schema: suggestSchema,
   }, suggest);