@opengis/fastify-table 1.1.81 → 1.1.83

package/README.md

@@ -1,26 +1,26 @@
-# fastify-table
-
-[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
-
-It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
-
-- pg
-- redis
-- crud
-
-## Install
-
-```bash
-npm i @opengis/fastify-table
-```
-
-## Usage
-
-```js
-fastify.register(import('@opengis/fastify-table'), config);
-```
-
-## Documenation
-
-For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).
+# fastify-table
+
+[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
+
+It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
+
+- pg
+- redis
+- crud
+
+## Install
+
+```bash
+npm i @opengis/fastify-table
+```
+
+## Usage
+
+```js
+fastify.register(import('@opengis/fastify-table'), config);
+```
+
+## Documenation
+
+For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).

package/config.js

@@ -1,10 +1,10 @@
-import fs from 'fs';
-
-const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
-const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
-
-Object.assign(config, {
-  allTemplates: config?.allTemplates || {},
-});
-
-export default config;
+import fs from 'fs';
+
+const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
+const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
+
+Object.assign(config, {
+  allTemplates: config?.allTemplates || {},
+});
+
+export default config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.81",
+  "version": "1.1.83",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

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

@@ -133,16 +133,16 @@ function formatValue({
 
   if (['~', '='].includes(operator)) {
     const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
-    const match = operator1 === '=' ? `='${value}'` : `ilike '%${value}%'`;
+    const match = (operator1 === '=' || filterType === 'autocomplete') ? `='${value}'` : `ilike '%${value}%'`;
     if (extra && pk) {
       const query = data && sql
-        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in ( ( with q(id,name)  as  (${sql}) select id from q where name ${match})))`
+        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in ( ( with q(id,name)  as  (${sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'} ${match})))`
         : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text ${match})`;
       return { op: 'ilike', query, extra };
     }
 
     const query = filter?.data && filter?.sql
-      ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where name::text ${match}) )` // filter with cls
+      ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'}::text ${match}) )` // filter with cls
       : `${name}::text ${match}`; // simple filter
     // console.log(query);
     return { op: 'ilike', query };

package/server/plugins/table/funcs/getSelectMeta.js

@@ -46,7 +46,8 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
   const searchQuery = `(${searchColumn.split(',').map((el) => `lower("${el}") ~ $1 `).join(' or ')})`;
   // console.log(dataOrigin1.fields.map((el) => el.name).join(','));
   const data = {
-
+    minLength: cls.minLength,
+    limit: cls.limit,
     type: type.join(','),
     cols: cols.join(','),
     originalCols: originalCols.join(','),

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

@@ -2,7 +2,7 @@ import {
   config, getPG, getTemplate, getSelectMeta,
 } from '../../../../utils.js';
 
-const limit = 50;
+const limit = 20;
 const headers = {
   'Access-Control-Allow-Origin': '*',
   'Access-Control-Allow-Methods': 'GET',
@@ -37,6 +37,9 @@ export default async function suggest(req) {
       searchQuery: '(lower("text") ~ $1 )',
     }
     : await getSelectMeta({ name: selectName, nocache: query?.nocache });
+  if (meta.minLength && query.key && query.key.length < meta.minLength) {
+    return { message: `min length: ${meta.minLength}` };
+  }
   const pg = meta?.db ? getPG(meta.db) : pg1;
   if (!meta) return { headers, status: 404, message: 'Not found query select ' };
   if (query.meta) return meta;
@@ -62,7 +65,7 @@ export default async function suggest(req) {
 
   const val = query.val ? ` ${meta.pk}=any('{${query.val.replace(/'/g, "''")}}')` : '';
   const where = [search, val, `${meta.pk} is not null`].filter((el) => el).join(' and ') || 'true';
-  const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} order by 2) select * from c `.replace(/{{uid}}/g, user?.uid || '0');
+  const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} order by 2) select * from c limit ${meta.limit || 20}`.replace(/{{uid}}/g, user?.uid || '0');
   if (query.sql && config.local) return sqlSuggest;
 
   // query