@opengis/fastify-table 1.4.30 → 1.4.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.30",
+  "version": "1.4.31",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -27,7 +27,8 @@
     "test:functions": "node --test .\\test\\functions",
     "compress": "node compress.js",
     "dev1": "set NODE_ENV=dev&& node server.js",
-    "dev": "node --env-file=.env.dev --env-file=.env server"
+    "dev": "node --env-file=.env.dev --env-file=.env server",
+    "start": "node --env-file=.env.dev server"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "3.554.0",

package/server/migrations/properties.sql

@@ -1,12 +1,12 @@
 create schema if not exists admin;
 create schema if not exists crm;
-create schema if not exists setting;
 
 CREATE EXTENSION if not exists pg_trgm SCHEMA public VERSION "1.5";
 
 -- drop old
-DROP TABLE IF EXISTS setting.extra_data;
+DROP TABLE IF EXISTS admin.user_properties;
 DROP TABLE IF EXISTS admin.table_properties;
+DROP SCHEMA IF EXISTS setting cascade;
 
 CREATE TABLE IF NOT EXISTS admin.properties();
 ALTER TABLE admin.properties DROP CONSTRAINT IF EXISTS admin_properties_property_id_pkey;
@@ -37,40 +37,6 @@ ALTER TABLE admin.properties ADD CONSTRAINT admin_properties_property_id_pkey PR
 
 COMMENT ON TABLE admin.properties IS 'Налаштування';
 
-CREATE TABLE IF NOT EXISTS admin.user_properties();
-ALTER TABLE admin.user_properties DROP CONSTRAINT IF EXISTS admin_user_properties_property_id_pkey;
-alter table admin.user_properties drop constraint if exists user_properties_key_uid_unique;
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_id text NOT NULL DEFAULT next_id();
-
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_key text;
-COMMENT ON COLUMN admin.user_properties.property_key IS 'Ключ';
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_json json;
-COMMENT ON COLUMN admin.user_properties.property_json IS 'Налаштування json';
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_text text;
-COMMENT ON COLUMN admin.user_properties.property_text IS 'Налаштування text';
-
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_entity text;
-COMMENT ON COLUMN admin.user_properties.property_entity IS 'Сутність';
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_title text;
-COMMENT ON COLUMN admin.user_properties.property_title IS 'Назва';
-
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS private boolean;
-update admin.user_properties set private = true where private is null;
-ALTER TABLE admin.user_properties ALTER COLUMN private SET NOT NULL;
-ALTER TABLE admin.user_properties ALTER COLUMN private SET default true;
-COMMENT ON COLUMN admin.user_properties.private IS 'Доступ лише для користувача, який додав дане налаштування';
-
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT now();
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS files json;
-
-ALTER TABLE admin.user_properties ADD CONSTRAINT admin_user_properties_property_id_pkey PRIMARY KEY(property_id);
-ALTER TABLE admin.user_properties ADD CONSTRAINT user_properties_key_uid_unique UNIQUE (property_key,property_entity,uid);
-
-COMMENT ON TABLE admin.user_properties IS 'Налаштування користувача';
-
 CREATE TABLE IF NOT EXISTS admin.custom_column();
 ALTER TABLE admin.custom_column DROP CONSTRAINT IF EXISTS admin_custom_column_column_id_pkey cascade;
 alter table admin.custom_column drop constraint if exists admin_custom_column_name_entity_uid_unique;
@@ -147,42 +113,3 @@ CREATE INDEX IF NOT EXISTS crm_extra_data_cdate_btree_idx ON crm.extra_data USIN
 CREATE INDEX IF NOT EXISTS crm_extra_data_property_id_btree_idx ON crm.extra_data USING btree (property_id COLLATE pg_catalog."default");
 CREATE INDEX IF NOT EXISTS crm_extra_data_property_entity_btree_idx ON crm.extra_data USING btree (property_entity COLLATE pg_catalog."default");
 CREATE INDEX IF NOT EXISTS crm_extra_data_object_id_btree_idx ON crm.extra_data USING btree (object_id COLLATE pg_catalog."default");
-
-
-CREATE TABLE IF NOT EXISTS setting.property ();
-ALTER TABLE setting.property DROP CONSTRAINT IF EXISTS setting_property_pkey;
-
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_id text;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_entity text;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_key text;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_text text;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_json json;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS property_int integer;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS level text;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS object_id text;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS category text;
-
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS cdate timestamp without time zone;
-ALTER TABLE setting.property ALTER COLUMN cdate SET DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE setting.property ADD COLUMN IF NOT EXISTS files json;
-
-ALTER TABLE setting.property ADD CONSTRAINT setting_property_pkey PRIMARY KEY (property_id);
-
-COMMENT ON TABLE setting.property IS 'Налаштування';
-COMMENT ON COLUMN setting.property.property_entity IS 'Сутність';
-COMMENT ON COLUMN setting.property.property_key IS 'Ключ';
-COMMENT ON COLUMN setting.property.property_text IS 'Текстове значення налаштування';
-COMMENT ON COLUMN setting.property.property_json IS 'Значення налаштування';
-COMMENT ON COLUMN setting.property.level IS 'Рівень (user/system)';
-COMMENT ON COLUMN setting.property.object_id IS 'ID Об''єкту';
-COMMENT ON COLUMN setting.property.category IS 'Категорія (filter/menu/...)';
-COMMENT ON COLUMN setting.property.property_int IS 'Цілочислове значения';
-
-CREATE INDEX if not exists setting_property_object_id_gin_idx ON setting.property USING gin (object_id COLLATE pg_catalog."default" gin_trgm_ops);
-CREATE INDEX if not exists setting_property_property_entity_gin_idx ON setting.property USING gin (property_entity COLLATE pg_catalog."default" gin_trgm_ops);
-CREATE INDEX if not exists setting_property_property_int_btree_idx ON setting.property USING btree (property_int);
-CREATE INDEX if not exists setting_property_property_key_gin_idx ON setting.property USING gin (property_key COLLATE pg_catalog."default" gin_trgm_ops);
-CREATE INDEX if not exists setting_property_property_text_gin_idx ON setting.property USING gin (property_text COLLATE pg_catalog."default" gin_trgm_ops);

package/server/routes/properties/controllers/properties.get.js

@@ -1,17 +1,33 @@
-export default async function getExtraProperties({
-  pg, params = {},
-}) {
-  const { id } = params;
-  if (!id) {
-    return { message: 'not enougn params', status: 400 };
-  }
-
-  const { rows = [] } = pg.pk?.['crm.properties']
-    ? await pg.query(`select property_key, property_type, property_text, property_int,
-            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
-    : {};
-  if (!rows.length) return {};
-
-  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
-  return { message: data, status: 200 };
-}
+/* eslint-disable camelcase */
+import pgClients from '../../../plugins/pg/pgClients.js';
+
+export default async function getAppSettings({
+  pg = pgClients.client, query = {}, params = {}, user = {},
+}, reply) {
+  const t1 = Date.now();
+
+  if (!pg) {
+    return reply.status(500).send('empty pg');
+  }
+
+  if (!pg.pk?.['admin.properties']) {
+    return reply.status(404).send('properties table not found');
+  }
+
+  if (params.entity === 'user' && !user.uid) {
+    return reply.status(401).send('unauthorized');
+  }
+
+  const { uid } = user;
+
+  const args = params.entity === 'user'
+    ? [user.uid]
+    : [params.entity || 'app'];
+
+  const { rows = [] } = await pg.query('select property_key as key, property_text, property_json from admin.properties where property_entity=$1', args);
+
+  const settings = rows.filter(row => (typeof query.keys === 'string' ? query.keys.includes(row.key) : true))
+    .reduce((acc, { key, property_text, property_json }) => ({ ...acc, [key]: property_text || property_json }), {});
+
+  return reply.status(200).send({ time: Date.now() - t1, uid, settings });
+}

package/server/routes/properties/controllers/properties.post.js

@@ -0,0 +1,74 @@
+import { logger, dataInsert, pgClients } from '../../../../utils.js';
+
+function checkValueType(val) {
+  if (val && typeof val === 'object') {
+    return 'property_json';
+  }
+  if (val && typeof val === 'number' && (!/\D/.test(val.toString()) && val.toString().length < 10)) {
+    return 'property_int';
+  }
+  return 'property_text';
+}
+
+export default async function postAppSettings({
+  pg = pgClients.client, body = {}, user = {}, params = {},
+}, reply) {
+  const { uid } = user;
+
+  if ((!params.entity || params.entity === 'app') && !user?.user_type?.includes?.('admin')) {
+    return reply.status(403).send('access restricted');
+  }
+
+  if (!pg) {
+    return reply.status(500).send('empty pg');
+  }
+
+  if (!pg?.pk?.['admin.properties']) {
+    return reply.status(404).send('table not found');
+  }
+
+  const { key, val } = body;
+
+  if ((!key || !val) && !Object.keys(body).length) {
+    return reply.status(400).send('not enough body params');
+  }
+
+  const keys = Object.keys(body);
+  const entity = params.entity === 'user' ? user.uid : (params.entity || 'app');
+
+  const client = await pg.connect();
+
+  try {
+    await client.query('begin;');
+
+    await client.query('delete from admin.properties where property_entity=$1 and property_key=any($2)', [entity, keys]);
+
+    await Promise.all(keys.filter(el => body[el]).map(async (el) => {
+      const columnType = checkValueType(body[el]);
+
+      await dataInsert({
+        pg: client,
+        table: 'admin.properties',
+        data: {
+          property_key: el,
+          [columnType]: body[el],
+          property_entity: entity,
+        },
+        uid,
+      });
+    }));
+
+    await client.query('commit;');
+
+    return reply.status(200).send('ok');
+  }
+  catch (err) {
+    logger.file('properties/error', {
+      error: err.toString(), stack: err.stack, body, user, entity,
+    });
+    return reply.status(500).send(err.toString());
+  }
+  finally {
+    client.release();
+  }
+}

package/server/routes/properties/index.js

@@ -1,11 +1,5 @@
-import getExtraProperties from './controllers/properties.get.js';
-import addExtraProperties from './controllers/properties.add.js';
-
-import getSettingsApp from './controllers/admin.properties.get.js';
-import postSettingsApp from './controllers/admin.properties.post.js';
-
-import getSettingsTable from './controllers/table.properties.get.js';
-import postSettingsTable from './controllers/table.properties.post.js';
+import getAppSettings from './controllers/properties.get.js';
+import postAppSettings from './controllers/properties.post.js';
 
 const propertiesSchema = {
   type: 'object',
@@ -24,14 +18,8 @@ const policy = ['site']; // cms etc.
 
 async function plugin(app, config = {}) {
   const { prefix = '/api' } = config;
-  app.get(`${prefix}/properties/:id`, { config: { policy }, schema: propertiesSchema }, getExtraProperties);
-  app.post(`${prefix}/properties/:id`, { config: { policy }, schema: propertiesSchema }, addExtraProperties);
-
-  app.get(`${prefix}/settings-app/:key?`, { config: { policy }, schema: propertiesSchema }, getSettingsApp);
-  app.post(`${prefix}/settings-app`, { config: { policy: ['admin'] } }, postSettingsApp);
-
-  app.get(`${prefix}/settings-table/:table/:entity?`, { config: { policy } }, getSettingsTable);
-  app.post(`${prefix}/settings-table/:table`, { config: { policy } }, postSettingsTable);
+  app.get(`${prefix}/settings-app/:entity?`, { config: { policy }, schema: propertiesSchema }, getAppSettings);
+  app.post(`${prefix}/settings-app/:entity?`, { config: { policy: ['admin'] } }, postAppSettings);
 }
 
 export default plugin;

package/server/routes/properties/controllers/admin.properties.get.js

@@ -1,27 +0,0 @@
-/* eslint-disable camelcase */
-const table = 'admin.properties';
-
-import { pgClients, getTemplatePath, getTemplate } from '../../../../utils.js';
-
-export default async function getSettingsApp({
-  pg = pgClients.client,
-}, reply) {
-  const time = Date.now();
-
-  if (!pg) {
-    return reply.status(500).send('empty pg');
-  }
-
-  if (!pg?.pk?.[table]) {
-    return reply.status(404).send('table not found');
-  }
-
-  const { rows = [] } = await pg.query('select property_key as key, property_text, property_json from admin.properties');
-
-  const settings = rows.reduce((acc, { key, property_text, property_json }) => ({ ...acc, [key]: property_text || property_json }), {});
-
-  const forms = await Promise.all(getTemplatePath('setting')
-    .map(async (el) => ({ name: el[0], body: await getTemplate('setting', el[0]) })));
-
-  return reply.status(200).send({ time: Date.now() - time, forms, settings });
-}

package/server/routes/properties/controllers/admin.properties.post.js

@@ -1,54 +0,0 @@
-const table = 'admin.properties';
-
-import { dataInsert, pgClients } from '../../../../utils.js';
-
-function checkValueType(val) {
-  if (val) {
-    if (typeof val === 'object') {
-      return 'property_json';
-    }
-    if (typeof val === 'number' && (!/\D/.test(val.toString()) && val.toString().length < 10)) {
-      return 'property_int';
-    }
-  }
-  return 'property_text';
-}
-
-export default async function postSettingsApp({
-  pg = pgClients.client, body = {}, user = {}, uid = user?.uid,
-}, reply) {
-  if (!user?.user_type?.includes?.('admin')) {
-    return reply.status(403).send('access restricted');
-  }
-  const { key, val } = body;
-
-  if ((!key || !val) && !Object.keys(body).length) {
-    return reply.status(400).send('not enough body params');
-  }
-
-  if (!pg) {
-    return reply.status(500).send('empty pg');
-  }
-
-  if (!pg?.pk?.[table]) {
-    return reply.status(404).send('table not found');
-  }
-
-  const keys = Object.keys(body);
-  await pg.query(`delete from ${table} where property_key=any($1)`, [keys]);
-
-  await Promise.all(keys.filter(el => body[el]).map(async (el) => {
-    const columnType = table === 'admin.user_properties'
-      ? 'property_json'
-      : checkValueType(body[el]);
-
-    await dataInsert({
-      pg,
-      table,
-      data: { property_key: el, [columnType]: body[el] },
-      uid,
-    });
-  }));
-
-  return reply.status(200).send('ok');
-}

package/server/routes/properties/controllers/properties.add.js

@@ -1,55 +0,0 @@
-import { dataInsert } from '../../../../utils.js';
-
-const table = 'crm.properties';
-
-function checkKeyType({ body, key }) {
-  if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
-    return { [key]: 'int' };
-  } if (typeof body[key] === 'object') {
-    return { [key]: 'json' };
-  }
-  if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
-    return { [key]: 'date' };
-  }
-  return { [key]: 'text' };
-}
-
-export default async function addExtraProperties({
-  pg, params = {}, body = {}, user = {},
-}) {
-  const { id } = params;
-  const { uid } = user;
-  if (!uid) {
-    return { message: 'access restricted: uid', status: 403 };
-  }
-  if (!id) {
-    return { message: 'not enougn params: 1', status: 400 };
-  }
-  const extraProperties = Object.keys(body);
-  if (!extraProperties.length) {
-    return { message: 'not enougn params: 2', status: 400 };
-  }
-
-  if (!pg.pk?.[table]) {
-    return { message: 'table not found: crm.properties', status: 400 };
-  }
-
-  await pg.query('delete from crm.properties where object_id=$1', [id]); // rewrite?
-  const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
-  const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
-    const propertyType = keyTypeMatch[key];
-    const { rows = [] } = await dataInsert({
-      pg,
-      table,
-      data: {
-        property_type: propertyType,
-        property_key: key,
-        object_id: id,
-        [`property_${propertyType}`]: body[key],
-      },
-      uid,
-    });
-    return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
-  }));
-  return { message: { rows: res }, status: 200 };
-}

package/server/routes/properties/controllers/table.properties.get.js

@@ -1,116 +0,0 @@
-import { pgClients, getMeta, getTemplate } from '../../../../utils.js';
-
-import getColumnMetaData from '../utils/getColumnMetaData.js';
-
-/**
- *
- * @method GET
- * @priority 4
- * @alias getSettingsTable
- * @type api
- * @tag custom
-
- * @returns {String} message and status
- */
-
-export default async function getSettingsTable({
-  pg = pgClients.client, params = {}, user = {}, query = {},
-}, reply) {
-  const { table, entity } = params;
-  const { uid } = user;
-  const time = [];
-
-  if (!uid) {
-    return reply.status(401).send('unauthorized');
-  }
-
-  if (!table) {
-    return reply.status(400).send('not enough params: table');
-  }
-
-  if (!pg) {
-    return reply.status(500).send('empty pg');
-  }
-
-  const loadTable = await getTemplate('table', table);
-
-  const tableName = loadTable?.table || table;
-  const meta = await getMeta({ pg, table: tableName });
-  const { view, pk } = meta || {};
-  time.push(Date.now());
-
-  if (!pk && !view) {
-    return reply.status(400).send(`table primary key not found: ${tableName}`);
-  }
-
-  const { rows: geometry } = meta?.geom
-    ? await pg.queryCache(`select st_geometrytype(${meta?.geom}) as type ,count(*) 
-    from ${tableName} group by st_geometrytype(${meta?.geom})`, { table: tableName }) : [];
-  time.push(Date.now());
-
-  const stat = !view ? await getColumnMetaData({ pg, table: tableName }) : {};
-  time.push(Date.now());
-
-  const { total = 0 } = await pg.queryCache(`select count(*) as total from ${tableName}`, { table: tableName })
-    .then(el => el.rows?.[0] || {});
-  time.push(Date.now());
-
-  const { property_json: customColumns = [] } = await pg.query(`select property_json::json from setting.property 
-  where property_entity='customColumn' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  const { property_json: tableSettingColumns } = await pg.query(`select property_json::json from setting.property 
-  where property_entity='column' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  const columns = (tableSettingColumns || loadTable?.columns || meta?.columns)?.map((el) => ({ ...el, title: el.title || el.name }))
-    ?.filter((value, index, array) => array?.map((el) => el.name).indexOf(value.name) === index); // get unique columns
-
-  const cls = columns?.filter((el) => ['badge', 'select'].includes(el.format) && (el.option || el.data))
-    ?.map((el) => (el.option || el.data))
-    ?.filter((value, index, array) => array.indexOf(value) === index); // get unique cls
-
-  const { property_json: userFilterList } = await pg.query(`select property_json::json from setting.property
-    where property_entity='filter' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  const { property_json: customQuery } = await pg.query(`select json_agg(json_build_object('id',property_id,'name', property_key,
-  'query', property_text, 'disabled', coalesce((property_json::json->>'disabled')::boolean,false) )) as property_json
-  from setting.property where 1=1 and property_entity='customQuery' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  time.push(Date.now());
-
-  const debug = user?.user_type?.includes('admin') && query?.debug
-    ? {
-      view,
-      tableName,
-      metaColumns: meta?.columns,
-      columnProperties: tableSettingColumns,
-    }
-    : undefined;
-
-  const res = {
-    time: {
-      geom: time[1] - time[0],
-      stat: time[2] - time[1],
-      count: time[3] - time[2],
-      total: time[4] - time[0],
-    },
-    debug,
-    model: tableName,
-    total,
-    geometry,
-    stat,
-    cls,
-    columns,
-    filters: userFilterList?.length
-      ? userFilterList
-      : loadTable?.filters?.map((el) => ({ ...el, title: el.title || el.ua })),
-    customQuery: customQuery?.length ? customQuery : [],
-    customColumns,
-    customFilters: userFilterList || [],
-  };
-
-  if (entity) {
-    return reply.status(200).send({ [entity]: res[entity] });
-  }
-
-  return reply.status(200).send(res);
-}

package/server/routes/properties/controllers/table.properties.post.js

@@ -1,125 +0,0 @@
-import { pgClients, getRedis } from '../../../../utils.js';
-
-import refreshData from '../utils/refreshData.js';
-
-const rclient = getRedis();
-
-/**
- *
- * @method POST
- * @priority 4
- * @alias postSettingsTable
- * @type api
- * @tag custom
- * @returns {String} message and status
- */
-
-export default async function postTablpostSettingsTableeProperties({
-  pg = pgClients.client, params = {}, body = {}, user = {},
-}, reply) {
-  const { table } = params;
-  const { uid } = user;
-
-  if (!uid) {
-    return reply.status(401).send('unauthorized');
-  }
-
-  if (!table) {
-    return reply.status(400).send('not enough params: table');
-  }
-
-  if (!pg) {
-    return reply.status(500).send('empty pg');
-  }
-
-  const {
-    deleted = [],
-    columns = [],
-    filters = [],
-    customColumns = [],
-    customQuery = [],
-  } = body;
-
-  const cacheKey = `${pg.options?.database}:filter-list:${table}`;
-
-  if (Array.isArray(deleted) && deleted?.length) {
-    const sqlList = {
-      columns: 'delete from setting.property where property_entity=\'column\' and object_id=$1',
-      filters: 'delete from setting.property where property_entity=\'filter\' and object_id=$1',
-      customColumns: `delete from setting.custom_data where attr in (select cf_id from setting.custom_field where object_id=$1);
-      delete from setting.custom_field where object_id=$1;
-      delete from setting.property where property_entity='customColumn' and object_id=$1;`,
-      customQuery: 'delete from setting.property where property_entity=\'customQuery\' and object_id=$1;',
-    };
-    const q = deleted.map((item) => sqlList[item])?.filter((el) => el)?.join(' ');
-    const { rowCount = 0 } = await pg.query(q, [table]);
-
-    if (['customColumn', 'column'].find((el) => deleted.includes(el))) {
-      // await funcs.applyHook('preTemplate', { pg, name: table, type: 'table' });
-    }
-    if (['customQuery', 'filter'].find((el) => deleted.includes(el))) {
-      await rclient.del(cacheKey);
-    }
-
-    if (rowCount === 0) {
-      return reply.status(200).send('nothing to restore');
-    }
-
-    return reply.status(200).send({
-      command: 'DELETE',
-      deleted,
-      table,
-      result: 'success',
-    });
-  }
-
-  const result = {};
-  // custom filter query (sql)
-  if (customQuery?.length) {
-    const res = await refreshData({
-      pg, entity: 'customQuery', table, uid, data: customQuery,
-    });
-    if (res?.error) return res;
-    Object.assign(result, { customQuery: res });
-  }
-
-  // columns
-  if (columns?.length) {
-    const res = await refreshData({
-      pg, entity: 'column', table, uid, data: columns,
-    });
-    if (res?.error) return res;
-    Object.assign(result, { columns: res });
-  }
-
-  // custom columns
-  if (customColumns?.length) {
-    const colModel = await pg.query(`select property_json::json from setting.property
-    where property_entity='customColumn' and object_id=$1`, [table]).then((el) => el.rows?.[0]?.property_json);
-
-    const res = await refreshData({
-      pg, entity: 'customColumn', table, uid, data: customColumns, colModel,
-    });
-    if (res?.error) return res;
-    Object.assign(result, { customColumns: res });
-  }
-
-  // filters
-  if (filters?.length) {
-    const res = await refreshData({
-      pg, entity: 'filter', table, uid, data: filters,
-    });
-    if (res?.error) return res;
-
-    Object.assign(result, { filters: res });
-  }
-
-  if (columns?.length || customColumns?.length) {
-    // await funcs.applyHook('preTemplate', { pg, type: 'table', name: table });
-  }
-  if (filters?.length || customQuery?.length) {
-    await rclient.del(cacheKey);
-  }
-
-  return reply.status(200).send(result);
-}

package/server/routes/properties/utils/dataInsert.js

@@ -1,26 +0,0 @@
-import { getMeta, getPG } from '../../../../utils.js';
-
-export default async function dataInsert({
-  table, data, pg: pg1,
-}) {
-  const pg = pg1 || getPG({ name: 'client' });
-  if (!data) return null;
-  const { columns } = await getMeta(table);
-  if (!columns) return null;
-
-  const names = columns.map((el) => el.name);
-  const filterData = Object.keys(data)
-    .filter((el) => data[el] && names.includes(el)).map((el) => [el, data[el]]);
-
-  const insertQuery = `insert into ${table}
-
-    ( ${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
-
-    values  (${filterData?.map((key, i) => (key[0] === 'property_json' ? `to_json($${i + 1}::${key[1] && typeof key[1] === 'object' ? 'json' : 'text'})` : `$${i + 1}`)).join(',')}) 
-    
-    returning *`;
-
-  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
-
-  return res;
-}

package/server/routes/properties/utils/getColumnMetaData.js

@@ -1,19 +0,0 @@
-import { pgClients, getMeta } from '../../../../utils.js';
-
-const systemColumns = ['files', 'uid', 'editor_date', 'editor_id', 'cdate', 'created_at', 'updated_at', 'created_by', 'updated_by'];
-
-export default async function getColumnMetaData({
-  pg = pgClients.client, table,
-}) {
-  if (!table) return null;
-
-  const { columns = [] } = await getMeta({ pg, table });
-  const columnList = columns.filter(el => !systemColumns.includes(el.name)).map(el => el.name);
-
-  const sql = `select count(*) as total, ${columnList.map((item) => `(count(*) filter(where ${item} is not null)) as "${item}"`).join(',')} from ${table}`;
-  const res = await pg.queryCache(sql, { table }).then(el => el.rows?.[0] || {});
-
-  return columns
-    .filter(el => !systemColumns.includes(el.name))
-    .map((row) => Object.assign(row, { percent: ((+res[row.name] / +res.total) * 100).toFixed(0) }));
-}

package/server/routes/properties/utils/refreshData.js

@@ -1,129 +0,0 @@
-import { randomUUID, createHash } from 'node:crypto';
-
-import { dataInsert, pgClients } from '../../../../utils.js';
-
-function prepareResult(res) {
-  const arr = (res.rows || (Array.isArray(res) ? res : Object.values(res || {})));
-  return {
-    command: 'INSERT',
-    count: res?.rowCount || arr.filter((el) => el.command === 'INSERT')
-      ?.map((el) => ({ result: 'success', count: el.rowCount }))
-      ?.reduce((acc, curr) => acc + curr.count, 0),
-  };
-}
-
-export default async function refreshData({
-  pg = pgClients.client, entity, table, uid, data,
-}) {
-  if (!['filter', 'column', 'customQuery', 'customColumn'].includes(entity)) {
-    return { message: 'invalid params: entity', status: 400 };
-  }
-
-  const client = await pg.connect();
-
-  /* getMeta support */
-  client.options = pg.options;
-  client.tlist = pg.tlist;
-  client.pgType = pg.pgType;
-  client.pk = pg.pk;
-  client.relkinds = pg.relkinds;
-
-  const result = {};
-
-  try {
-    await client.query('BEGIN');
-
-    if (['filter', 'column'].includes(entity)) {
-      data?.forEach((el) => Object.assign(el, { id: el.id || randomUUID() }));
-      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
-
-      const res = await dataInsert({
-        pg: client,
-        table: 'setting.property',
-        data: {
-          property_entity: entity,
-          object_id: table,
-          property_json: JSON.stringify(data), // ?.replace(/'+/g, "'")?.replace(/'/g, "''")
-        },
-        uid,
-      });
-      Object.assign(result, res);
-    }
-
-    if (['customQuery'].includes(entity)) {
-      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
-
-      const res = await Promise.all(data?.map(async (el) => dataInsert({
-        pg: client,
-        table: 'setting.property',
-        data: {
-          property_entity: entity,
-          object_id: table,
-          property_key: el.name,
-          property_text: el.query,
-          property_json: { disabled: el.disabled },
-        },
-        uid,
-      })));
-      Object.assign(result, res);
-    }
-
-    if (entity === 'customColumn') {
-      const prefix = createHash('md5').update(table).digest('hex').substr(0, 10);
-      const data1 = [];
-
-      await Promise.all(data.map(async (el, index) => {
-        const obj = {
-          cf_id: `col_${prefix}_${index}`,
-          cf_name: el.title || el.ua || el.name,
-          cf_type: el.format || el.type,
-          cf_default: el.default,
-          cf_notnull: el.notnull,
-          object_id: table,
-          tablename: table,
-        };
-
-        data1.push({
-          name: obj.cf_id,
-          title: obj.cf_name,
-          format: obj.cf_type,
-          option: data[index]?.option,
-          hidden: data[index]?.hidden,
-          custom: true,
-        });
-
-        await dataInsert({
-          pg: client,
-          table: 'setting.custom_field',
-          data: obj,
-          uid,
-        });
-      }));
-
-      await client.query('delete from setting.custom_field where $1 in (tablename, object_id)', [table]);
-      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
-
-      const data2 = JSON.stringify(data1?.filter((value, index, array) => array.indexOf(value) === index)); // ?.replace(/'+/g, "'")?.replace(/'/g, "''")
-      const res = await dataInsert({
-        pg: client,
-        table: 'setting.property',
-        data: {
-          property_entity: 'customColumn',
-          object_id: table,
-          property_json: data2,
-        },
-        uid,
-      });
-      Object.assign(result, res);
-    }
-    await client.query('COMMIT');
-    return prepareResult(result);
-  }
-  catch (err) {
-    await client.query('ROLLBACK');
-    return { error: err.toString(), status: 500 };
-  }
-  finally {
-    client.release();
-  }
-}