@opengis/fastify-table 1.1.82 → 1.1.84

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.82",
+  "version": "1.1.84",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server/migrations/roles.sql

@@ -62,9 +62,15 @@ alter table admin.routes DROP CONSTRAINT if exists admin_route_id_pkey cascade;
 alter table admin.routes DROP constraint if exists admin_route_menu_id_fkey cascade;
 alter table admin.routes DROP constraint if exists admin_route_alias_query_unique cascade;
 
-alter table admin.routes add column if not exists route_id text NOT NULL default next_id();
-alter table admin.routes add column if not exists alias text NOT NULL;
-alter table admin.routes add column if not exists table_name text NOT NULL;
+alter table admin.routes add column if not exists route_id text;
+alter table admin.routes alter column route_id set not null;
+alter table admin.routes alter column route_id set default next_id();
+alter table admin.routes add column if not exists alias text;
+alter table admin.routes alter column alias drop not null;
+-- alter table admin.routes alter column alias set not null;
+alter table admin.routes add column if not exists table_name text;
+alter table admin.routes alter column table_name drop not null;
+-- alter table admin.routes alter column table_name set not null;
 alter table admin.routes add column if not exists query text;
 alter table admin.routes add column if not exists actions text[];
 alter table admin.routes add column if not exists access text;
@@ -75,7 +81,10 @@ alter table admin.routes add column if not exists uid text;
 alter table admin.routes add column if not exists editor_id text;
 alter table admin.routes add column if not exists editor_date timestamp without time zone;
 alter table admin.routes add column if not exists cdate timestamp without time zone DEFAULT now();
-alter table admin.routes add column if not exists enabled boolean NOT NULL DEFAULT true;
+alter table admin.routes alter column cdate set DEFAULT now();
+alter table admin.routes add column if not exists enabled boolean;
+alter table admin.routes alter column enabled set NOT NULL;
+alter table admin.routes alter column enabled set DEFAULT true;
 
 alter table admin.routes add CONSTRAINT admin_route_id_pkey PRIMARY KEY (route_id);
 alter table admin.routes add constraint admin_route_menu_id_fkey FOREIGN KEY (menu_id) REFERENCES admin.menu(menu_id);

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 };