@opengis/fastify-table 1.1.27 → 1.1.29

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.1.29 - 09.10.2024
+
+- add after crud hook
+
 ## 1.1.27 - 08.10.2024
 
 - add migrations

package/crud/controllers/insert.js

@@ -1,8 +1,6 @@
-import dataInsert from '../funcs/dataInsert.js';
-import getToken from '../funcs/getToken.js';
-import checkXSS from './utils/checkXSS.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-import getAccess from '../funcs/getAccess.js';
+import {
+  applyHook, getAccess, getTemplate, checkXSS, getToken, dataInsert,
+} from '../../utils.js';
 
 export default async function insert(req) {
   const { actions = [] } = await getAccess(req, req.params.table) || {};
@@ -42,6 +40,9 @@ export default async function insert(req) {
     table: add || table, data: req.body, uid,
   });
 
+  // table_properties
+  await applyHook('afterInsert', { req, res });
+  // form DataTable
   const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && req.body[key].length);
   if (extraKeys?.length) {
     res.extra = {};

package/crud/controllers/update.js

@@ -1,10 +1,6 @@
-import dataUpdate from '../funcs/dataUpdate.js';
-import dataInsert from '../funcs/dataInsert.js';
-import pgClients from '../../pg/pgClients.js';
-import getToken from '../funcs/getToken.js';
-import checkXSS from './utils/checkXSS.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-import getAccess from '../funcs/getAccess.js';
+import {
+  pgClients, applyHook, getAccess, getTemplate, checkXSS, getToken, dataInsert, dataUpdate,
+} from '../../utils.js';
 
 export default async function update(req) {
   const { actions = [], scope, my } = await getAccess(req, req.params.table, req.params.id) || {};
@@ -42,6 +38,10 @@ export default async function update(req) {
     table: tokenData?.table || table, id: tokenData?.id || id, data: req.body, uid,
   });
 
+  // table_properties
+  await applyHook('afterUpdate', { req, res });
+
+  // form DataTable
   const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && req.body[key].length);
   if (extraKeys?.length) {
     res.extra = {};

package/package.json

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

package/server/migrations/properties.sql

@@ -1,4 +1,5 @@
 create schema if not exists admin;
+create schema if not exists setting;
 
 -- DROP TABLE admin.properties;
 CREATE TABLE IF NOT EXISTS admin.properties();
@@ -99,7 +100,8 @@ ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS property_id text;
 ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS property_key text;
 ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS property_entity text;
 ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS object_id text;
-ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS value_json json;
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS value_text text;
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS value_date timestamp without time zone;
 ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS uid text;
 ALTER TABLE setting.extra_data ALTER COLUMN uid SET DEFAULT '1'::text;
 ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS cdate timestamp without time zone;
@@ -116,7 +118,8 @@ COMMENT ON COLUMN setting.extra_data.property_id IS 'ID поля користу
 COMMENT ON COLUMN setting.extra_data.property_key IS 'Назва колонки';
 COMMENT ON COLUMN setting.extra_data.property_entity IS 'Таблиця';
 COMMENT ON COLUMN setting.extra_data.object_id IS 'Ідентифікатор об''єкту';
-COMMENT ON COLUMN setting.extra_data.value_json IS 'Значення';
+COMMENT ON COLUMN setting.extra_data.value_text IS 'Значення';
+COMMENT ON COLUMN setting.extra_data.value_date IS 'Дата';
 COMMENT ON COLUMN setting.extra_data.uid IS 'ID користувача';
 
 CREATE INDEX IF NOT EXISTS setting_extra_data_cdate_btree_idx ON setting.extra_data USING btree (cdate);

package/server/migrations/users.sql

@@ -18,6 +18,7 @@ ALTER TABLE admin.users add column if not exists enabled boolean;
 ALTER TABLE admin.users add column if not exists user_personal_code text;
 ALTER TABLE admin.users add column if not exists last_activity_date timestamp without time zone;
 ALTER TABLE admin.users add column if not exists user_type text DEFAULT 'regular'::text;
+ALTER TABLE admin.users add column if not exists user_rnokpp text;
 ALTER TABLE admin.users add column if not exists salt text;
 ALTER TABLE admin.users add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
 ALTER TABLE admin.users add column if not exists editor_id text;

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

@@ -19,7 +19,7 @@ function formatDateISOString(date) {
 }
 
 function formatValue({
-  clsList, filterType, filter, name, value, operator = '=', fieldType = 'text', uid = 1, optimize,
+  filterType, filter, name, value, operator = '=', fieldType = 'text', uid = 1, optimize,
 }) {
   if (!name || !value) return {};
 
@@ -105,7 +105,7 @@ function formatValue({
     return { op: operator, query };
   }
 
-  if (operator === '=' && filterType !== 'text') {
+  if (operator === '=' && filterType !== 'text' && !filter?.data) {
     const query = {
       null: `${name} is null`,
       notnull: `${name} is not null`,
@@ -114,9 +114,12 @@ function formatValue({
   }
 
   if (['~', '='].includes(operator)) {
-    const query = clsList[filter?.data]
-      ? `${filter?.name} in ( ( with q(id,name)  as  (${clsList?.[filter?.data]}) select id from q where name ilike '%${value}%') )` // filter with cls
-      : `${name}::text ilike '%${value}%'`; // simple filter
+    const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
+    const match = operator1 === '=' ? `='${value}'` : `ilike '%${value}%'`;
+    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
+      : `${name}::text ${match}`; // simple filter
+    // console.log(query);
     return { op: 'ilike', query };
   }
 

package/widget/controllers/utils/obj2db.js

@@ -5,8 +5,8 @@ export default function obj2db(data, nonexistCol) {
         || !Object.keys(data || {}).length
   ) return { error: 'invalid data type' };
 
-  const existColumns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
-  const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
+  const columns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
+  // const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
   const args = columns?.map((col) => data[col]);
 
   return { columns, args, error: !columns?.length ? 'nothing to process' : undefined };