@opengis/fastify-table 1.4.3 → 1.4.5

package/index.js

@@ -37,7 +37,6 @@ import pgClients from './server/plugins/pg/pgClients.js';
 
 import dblistRoutes from './server/routes/dblist/index.mjs';
 
-import dataRoutes from './server/routes/data/index.mjs';
 import menuRoutes from './server/routes/menu/index.mjs';
 import templatesRoutes from './server/routes/templates/index.mjs';
 
@@ -110,7 +109,6 @@ async function plugin(fastify, opt) {
   tableRoutes(fastify, opt);
   utilRoutes(fastify, opt);
 
-  dataRoutes(fastify, opt);
   menuRoutes(fastify, opt);
   templatesRoutes(fastify, opt);
 

package/package.json

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

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

@@ -1,4 +1,4 @@
-import routeData from '../../../routes/table/controllers/data.js';
+import routeData from '../../../routes/table/controllers/tableData.js';
 
 export default async function getData({ id, table, pg, filter, state, limit, page, search, user, order, sql, contextQuery, sufix }, reply, called) {
   const params = { table, id };

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

@@ -32,7 +32,7 @@ export default async function getFilterSQL({
   const extraDataTable = extra
     ? config.extraData?.[body.table]
     || config.extraData?.[body.table.split('.').shift()]
-    || config.extraData?.['default']
+    || config.extraData?.default
     || config.extraData
     || defaultTable
     : undefined;
@@ -131,7 +131,10 @@ export default async function getFilterSQL({
 
     // table
 
-    const obj = { body, extraSqlColumns, table, q };
+    const obj = {
+      body, extraSqlColumns, table, q,
+    };
+
     const optimizedSQL = `select * from ${getOptimizedQuery(obj)} `;
     const tableCount = getOptimizedQuery(obj, true);
 

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

@@ -1,18 +1,29 @@
-import applyHookSync from "../../../../hook/funcs/applyHookSync.js";
-import getRangeQuery from "./getRangeQuery.js";
+import applyHookSync from '../../../../hook/funcs/applyHookSync.js';
+import getRangeQuery from './getRangeQuery.js';
 
 export default function formatValue({
   pg, table, filter = {}, name, value, dataTypeID, uid = 1, optimize,
 }) {
-  const { extra, sql, select, strict, options, default: defaultValue } = filter;
+  const {
+    extra, sql, select, strict, options, default: defaultValue,
+  } = filter;
+
   const pk = pg?.pk && table ? pg.pk[table] : undefined;
 
+  if (name === 'search' && value && filter?.id) {
+    const columns = filter.id.split(',');
+    const sval = `ilike '%${decodeURIComponent(value.replace(/%/g, '%25')).replace(/%/g, '\\%')}%'`;
+    const query = `${columns.map(el => `"${el}" ${sval}`).join(' or ')}`;
+    return { op: '~', query };
+  }
+
   const filterType = filter.type?.toLowerCase() || 'text';
   const fieldType = pg?.pgType?.[dataTypeID] || pg?.pgType?.[{ date: 1114 }[filterType] || 25];
 
   const hookData = applyHookSync('onFormatValue', {
     pg, pk, table, name, value, filterType, fieldType, filter, dataTypeID, uid, optimize,
   });
+
   if (hookData) {
     return hookData?.query ? hookData : { op: '=', query: hookData };
   }
@@ -21,7 +32,7 @@ export default function formatValue({
     || !value
     || (!dataTypeID && !extra && !sql && !options)
     || extra?.input?.toLowerCase?.() === 'datatable'
-    || !['check', 'autocomplete', 'tags', 'avatar', 'radio'].includes(filterType) && options?.find?.(el => el?.sql)
+    || (!['check', 'autocomplete', 'tags', 'avatar', 'radio'].includes(filterType) && options?.find?.(el => el?.sql))
   ) {
     return {};
   }

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

@@ -35,7 +35,9 @@ function getFilterQuery({
     }
 
     // filter
-    const filter = filterList?.find?.((el) => el.type && el.name === name) || { type: 'text' };
+    const filter = filterList?.find?.((el) => el.type === 'search' && el.id)
+    || filterList?.find?.((el) => el.type && el.name === name)
+    || { type: 'text' };
     const { strict, extra } = filter;
 
     // find all value

package/server/routes/{data → table}/controllers/cardTabData.js

@@ -1,7 +1,6 @@
 /* eslint-disable no-param-reassign */
 import {
- config, handlebars, getToken, getTemplate, getMeta,
- pgClients,
+ config, handlebars, getToken, getTemplate, getMeta, pgClients,
 } from '../../../../utils.js';
 
 import getTableData from './tableData.js';

package/server/routes/{data → table}/controllers/tableData.js

@@ -1,15 +1,13 @@
 import {
-    getOpt, getMeta, getTemplate, getData, pgClients, getToken,
+    getOpt, getMeta, getTemplate, pgClients, getToken,
 } from '../../../../utils.js';
 
-export default async function getTableData(req, reply) {
-    const {
-        user = {}, params = {}, query = {}, pg = pgClients.client,
-    } = req;
+import getData from '../functions/getData.js';
 
+export default async function getTableData(req, reply, called) {
     const {
-        filter, limit, page, search, sql, state, order,
-    } = query || {};
+        user = {}, params = {}, query = {}, pg = pgClients.client, contextQuery: contextQuery1, sufix = true,
+    } = req;
 
     const { id } = params || {};
 
@@ -30,8 +28,8 @@ export default async function getTableData(req, reply) {
         }
 
         const resp = await getData({
-            id, table: tokenData.table, pg, filter, state, limit, page, search, order, user, sql, contextQuery: tokenData.query,
-        }, reply);
+            pg, params: { id, table: tokenData.table }, query, user, contextQuery: [contextQuery1, tokenData.query].filter(Boolean).join(' and '), sufix,
+        }, reply, called);
         if (resp?.addToken && tokenData.obj) { Object.assign(resp, { addToken: params.table }); }
         return resp;
     }
@@ -49,11 +47,11 @@ export default async function getTableData(req, reply) {
     const { rows = [] } = pg.pk?.['admin.rules'] ? await pg.query(q, [params.table, user.uid]) : {};
 
     const context = rows.filter(el => el.rule_values).map(el => `${el.attr} = any ('{${el.rule_values}}')`).join(' and ');
-    const contextQuery = [interfaceQuery, context].filter(el => el).join(' and ') || ' 2=2 ';
+    const contextQuery = [contextQuery1, interfaceQuery, context].filter(Boolean).join(' and ') || ' 2=2 ';
 
     const res = await getData({
-        id, table: params.table, pg, filter, state, limit, page, search, order, user, sql, contextQuery,
-    }, reply);
+        pg, params, query, user, contextQuery, sufix,
+    }, reply, called);
 
     return res;
 }

package/server/routes/table/{controllers/data.js → functions/getData.js}

@@ -4,9 +4,9 @@ import {
 
 import extraDataGet from '../../../plugins/extra/extraDataGet.js';
 
-import locales from './utils/locales.js';
+import locales from '../controllers/utils/locales.js';
 
-import conditions from './utils/conditions.js';
+import conditions from '../controllers/utils/conditions.js';
 
 const components = {
   'vs-widget-file': 'select \'vs-widget-file\' as component, count(*) from crm.files where entity_id=$1 and file_status<>3',

package/server/routes/table/index.js

@@ -1,6 +1,11 @@
 import suggest from './controllers/suggest.js';
-import data from './controllers/data.js';
+import data from './controllers/tableData.js';
+import cardTabData from './controllers/cardTabData.js';
+import cardData from './controllers/cardData.js';
 import dataInfo from './controllers/dataInfo.js';
+import tableInfo from './controllers/tableInfo.js';
+import tokenInfo from './controllers/tokenInfo.js';
+import tableFilter from './controllers/tableFilter.js';
 
 import card from './controllers/card.js';
 import search from './controllers/search.js';
@@ -10,14 +15,24 @@ import form from './controllers/form.js';
 import loadTemplatePath from '../../plugins/table/funcs/loadTemplatePath.js';
 
 import {
-  tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
+  tableDataSchema, tableSchema, searchSchema, suggestSchema, formSchema, filterSchema, cardTabDataSchema, tableDataIdSchema, tableFilterSchema,
 } from './schema.js';
 
+const policy = ['public'];
+
 async function plugin(app, config = {}) {
   const { prefix = '/api' } = config;
-  const policy = ['public'];
+
+  app.get(`${prefix}/token-info/:token`, { config: { policy: ['admin'] } }, tokenInfo);
+
+  app.get(`${prefix}/table-filter/:table`, { config: { policy }, schema: tableFilterSchema }, tableFilter);
+
+  app.get(`${prefix}/table-info/:table/:id?`, { config: { policy }, schema: tableDataSchema }, tableInfo);
   app.get(`${prefix}/suggest/:data`, { config: { policy }, schema: suggestSchema }, suggest);
   app.get(`${prefix}/data/:table/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, data);
+  app.get(`${prefix}/table-data/:table`, { config: { policy: ['user', 'no-sql'] }, schema: tableDataSchema }, data);
+  app.get(`${prefix}/table-data/:table/:id`, { config: { policy }, schema: tableDataIdSchema }, cardData);
+  app.get(`${prefix}/card-data/:token`, { config: { policy }, scheme: cardTabDataSchema }, cardTabData);
   app.get(`${prefix}/data-info/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, dataInfo);
 
   app.get(`${prefix}/card/:table/:id`, { config: { policy }, schema: tableSchema }, card);

package/server/routes/table/schema.js

@@ -1,3 +1,36 @@
+const tableDataSchema = {
+  type: 'object',
+  properties: {
+      querystring: {
+          limit: { type: 'string', pattern: '^(\\d+)$' },
+          page: { type: 'string', pattern: '^(\\d+)$' },
+          // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+          // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+          order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+          desc: { type: 'string', pattern: '^(\\d+)$' },
+          state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+          custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+          bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
+          polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
+          // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+          sql: { type: 'string', pattern: '^(\\d)$' },
+      },
+      params: {
+          id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+          table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      },
+  },
+};
+
+const tableFilterSchema = {
+  type: 'object',
+  properties: {
+      params: {
+          name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+      },
+  },
+};
+
 const tableSchema = {
   type: 'object',
   properties: {
@@ -75,6 +108,28 @@ const filterSchema = {
   },
 };
 
+const cardTabDataSchema = {
+  type: 'object',
+  properties: {
+      querystring: {
+          sql: { type: 'string', pattern: '^(\\d)$' }
+      },
+      params: {
+          token: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      },
+  },
+};
+
+const tableDataIdSchema = {
+  type: 'object',
+  properties: {
+      params: {
+          id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+          name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+      },
+  },
+};
+
 export {
-  tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
+  tableDataSchema, tableDataIdSchema, tableSchema, searchSchema, suggestSchema, formSchema, filterSchema, cardTabDataSchema, tableFilterSchema,
 };

package/server/routes/data/controllers/funcs/getFilterSQL/index.js

@@ -1,92 +0,0 @@
-import { getPG, getTemplate } from "@opengis/fastify-table/utils.js";
-// import pgClients from '@opengis/fastify-table/pg/funcs/pgClients.js';
-
-import getTableSql from './util/getTableSql.js';
-import getFilterQuery from './util/getFilterQuery.js';
-import getOptimizedQuery from './util/getOptimizedQuery.js';
-
-async function getFilterSQL({
-  pg: pg1, table, filter, search, filterList, query, uid,
-}) {
-  if (!table) return { error: 'param table is required', status: 400 };
-
-  const pg = pg1 || getPG();
-  const body = await getTemplate('table', table);
-
-  const sqlList = body?.sql?.length
-    ? body?.sql?.filter((el) => !el.disabled && el?.sql?.replace)
-      .map((el, i) => {
-        Object.assign(el, { name: el.name || `t${i + 1}` });
-        return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
-      }).join(' ')
-    : '';
-  const fieldQuery = `select * from ${body?.table || table} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 limit 0`;
-  const { fields = [] } = await pg.query(fieldQuery);
-
-  const { fields: fieldsModel } = pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
-
-  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
-  const searchColumn = body?.search_column || autoSearchColumn;
-  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
-  try {
-    const tableSQL = await getTableSql({
-      pg, body, table, fields,
-    });
-    const sval = `ilike '%${decodeURIComponent(search).replace(/'/g, "''")}%'`;
-    const searchQuery = search && searchColumn
-      ? ` (${searchColumn.split(',')?.map((name) => {
-        const { pk } = tableSQL.find((el) => el.name === name) || {};
-        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
-      }).join(' or ')} )` : '';
-    
-    // table_properties - user filter data
-    const { rows: filterProperties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column where entity=$1 and uid=$2`, [table, uid]);
-    const extraFilters = filterProperties.map((row) => ({ ua: row.title, name: row.name, type: row.format, data: row.data, extra: true }));
-    const customFilters = [];
-    
-    const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || []).concat(body?.filters || [])).concat(extraFilters || []).concat(customFilters || [])
-
-      ?.map(async (el) => {
-        if (!el?.data) return el;
-        const cls = await getTemplate(['cls', 'select'], el.data);
-        if (Array.isArray(cls) && cls?.length) {
-          Object.assign(el, { options: cls });
-        } else if (typeof  (cls?.sql || cls) === 'string') {
-          Object.assign(el, { sql: cls?.sql || cls });
-        }
-        return el;
-      })
-    );
-    const filters = getFilterQuery({
-      pg,
-      filter,
-      table: body?.table || table,
-      tableSQL,
-      fields,
-      filterList: filterList1,
-    });
-
-    // filter
-    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
-    const q = [body?.query, query, searchQuery, filterQuery].filter((el) => el).join(' and ');
-
-    // table
-    const modelQuery = body?.model || body?.table || table;
-    const optimizedSQL = `select * from ${getOptimizedQuery({ body, table, q })} `;
-    const tableCount = getOptimizedQuery({ body, table, q }, true);
-    // console.log(optimizedSQL);
-    return {
-      filterList,
-      q,
-      optimizedSQL,
-      tableCount,
-      table: modelQuery,
-      searchQuery,
-    };
-  }
-  catch (err) {
-    throw new Error(err.toString());
-  }
-}
-
-export default getFilterSQL;

package/server/routes/data/controllers/funcs/getFilterSQL/util/formatValue.js

@@ -1,170 +0,0 @@
-const dateTypeList = ['date', 'timestamp', 'timestamp without time zone'];
-const numberTypeList = ['float8', 'int4', 'int8', 'numeric', 'double precision', 'integer'];
-
-function dt(y, m, d) {
-  return new Date(Date.UTC(y, m, d)).toISOString().slice(0, 10);
-}
-const dp = {
-  d: new Date().getDate(),
-  w: new Date().getDate() - (new Date().getDay() || 7) + 1,
-  m: new Date().getMonth(),
-  q: (new Date().getMonth() / 4).toFixed() * 3,
-  y: new Date().getFullYear(),
-};
-
-function formatDateISOString(date) {
-  if (!date?.includes('.')) return date;
-  const [day, month, year] = date.split('.');
-  return `${year}-${month}-${day}`;
-}
-
-function formatValue({
-  pg, table, filter = {}, name, value, operator = '=', dataTypeID, uid = 1, optimize,
-}) {
-  const { data, sql, extra } = filter;
-  const pk = pg?.pk && table ? pg.pk[table] : undefined;
-
-  if (!dataTypeID && !extra) return {};
-  const fieldType = extra ? pg.pgType?.[{ 'Date': 1114 }[filter?.type] || 25] : pg.pgType?.[dataTypeID];
-  if (!name || !value || !fieldType) return {};
-  const filterType = filter.type?.toLowerCase();
-
-  // current day, week, month, year etc.
-  if (dateTypeList.includes(fieldType) && !value?.includes('_') && ['cd', 'cw', 'cm', 'cq', 'cy'].includes(value)) {
-    const query = {
-      cd: `${name}::date = '${dt(dp.y, dp.m, dp.d)}'::date`,
-      cw: `${name}::date >= '${dt(dp.y, dp.m, dp.w)}'::date and ${name} <= '${dt(dp.y, dp.m, dp.w + 6)}'::date`,
-      cm: `${name}::date >= '${dt(dp.y, dp.m, 1)}'::date and ${name} <= '${dt(dp.y, dp.m + 1, 0)}'::date`,
-      cq: `${name}::date >= '${dt(dp.y, dp.q, 1)}'::date and ${name} <= '${dt(dp.y, dp.q + 3, 0)}'::date`,
-      cy: `${name}::date >= '${dt(dp.y, 0, 1)}'::date and ${name}::date <= '${dt(dp.y, 11, 31)}'::date`,
-    }[value];
-    return { op: '=', query, extra };
-  }
-
-  // date range
-  if (dateTypeList.includes(fieldType) && value?.includes('_')) {
-    const [min, max] = value.split('_');
-    const query = `${name} >= '${min}'::date and ${name} <= '${max}'::date`;
-    return { op: 'between', query, extra };
-  }
-
-  // v3 filter date range, example - "01.01.2024-31.12.2024"
-  if (dateTypeList.includes(fieldType) && value?.includes('.') && value?.indexOf('-') === 10 && value?.length === 21) {
-    const [startDate, endDate] = value.split('-');
-    const min = formatDateISOString(startDate);
-    const max = formatDateISOString(endDate);
-    const query = extra && pk
-      ? `${pk} in (select object_id from crn.extra_data where property_key='${name}' and value_date::date >= '${min}'::date and value_date::date <= '${max}'::date)`
-      : `${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date`;
-    return { op: 'between', query, extra };
-  }
-
-  // my rows
-  if (value === 'me' && uid && fieldType === 'text') {
-    return { op: '=', query: extra ? `uid = '${uid}'` : `${name}::text = '${uid}'`, extra };
-  }
-
-  const formatType = {
-    float8: 'numeric',
-    int4: 'numeric',
-    int8: 'numeric',
-    varchar: 'text',
-    bool: 'boolean',
-    geometry: 'geom',
-  }[fieldType] || 'text';
-
-  if (optimize && optimize.name !== optimize.pk) {
-    const val = filterType === 'text' ? `ilike '%${value}%'` : `= any('{${value}}')`;
-    return {
-      op: '~',
-      query: fieldType?.includes('[]')
-        ? `${optimize.pk} && (select array_agg(${optimize.pk}) from ${optimize.table} where ${name} ${val} )`
-        : `${optimize.pk} in (select ${optimize.pk} from ${optimize.table} where ${name} ${val} )`,
-      extra,
-    };
-  }
-
-  if (fieldType?.includes('[]')) {
-    return { op: 'in', query: `'{${value}}'::text[] && ${name}::text[]`, extra };
-  }
-
-  // multiple items of 1 param
-  if (value?.indexOf(',') !== -1) {
-    const values = value.split(',').filter((el) => el !== 'null');
-    if (extra && pk) {
-      const query = value?.indexOf('null') !== -1
-        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and ( value_text is null or value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) ) )`
-        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) )`;
-      return { op: 'in', query, extra };
-    }
-    const query = value?.indexOf('null') !== -1
-      ? `( ${name} is null or ${name}::text in (${values?.map((el) => `'${el}'`).join(',')}) )`
-      : `${name}::text in (${value.split(',')?.map((el) => `'${el}'`).join(',')})`;
-    return { op: 'in', query, extra };
-  }
-
-  // v3 filter number range, example - "100_500"
-  if (numberTypeList.includes(fieldType) && value?.indexOf('_') !== -1) {
-    const [min, max] = value.split('_');
-    const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} < ${max}` : null) || `${name} between ${min} and ${max}`;
-    return { op: 'between', query, extra };
-  }
-
-  // number range
-  if (numberTypeList.includes(fieldType) && value?.indexOf('-') !== -1) {
-    const [min, max] = value.split('-');
-    if (min === 'min' && max === 'max') return {};
-    const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} < ${max}` : null) || `${name} between ${min} and ${max}`;
-    return { op: 'between', query, extra };
-  }
-
-  if (['<', '>'].includes(operator)) {
-    const query = `${name} ${operator} '${value}'::${formatType}`;
-    return { op: operator, query, extra };
-  }
-
-  if (operator === '=' && filterType !== 'text' && !filter?.data) {
-    const query = {
-      null: `${name} is null`,
-      notnull: `${name} is not null`,
-    }[value] || `${name}::${formatType}='${value}'::${formatType}`;
-    return { op: '=', query, extra };
-  }
-
-  if (['~', '='].includes(operator)) {
-    const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
-    const match = operator1 === '=' ? `='${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 ${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
-      : `${name}::text ${match}`; // simple filter
-    // console.log(query);
-    return { op: 'ilike', query };
-  }
-
-  // json
-  if (name.includes('.')) {
-    const [col, prop] = name.split('.');
-    const query = ` ${col}->>'${prop}' in ('${value.join("','")}')`;
-    return { op: 'in', query, extra };
-  }
-
-  // geometry
-  if (['geometry'].includes(fieldType)) {
-    const bbox = value[0].split('_');
-
-    if (bbox?.length === 4) {
-      const query = ` ${name} && 'box(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d `;
-      return { op: '&&', query, extra };
-    }
-  }
-  return {};
-}
-
-export default formatValue;

package/server/routes/data/controllers/funcs/getFilterSQL/util/getCustomQuery.js

@@ -1,13 +0,0 @@
-async function getCustomQuery({
-  pg, table, customFilter,
-}) {
-  if (!customFilter) return null;
-  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
-  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
-  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
-  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
-  const customQuery = data?.map((el) => el.query).join(' and ');
-  return `${customQuery}`;
-}
-
-export default getCustomQuery;

package/server/routes/data/controllers/funcs/getFilterSQL/util/getFilterQuery.js

@@ -1,64 +0,0 @@
-/* eslint-disable no-continue */
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-
-import formatValue from './formatValue.js';
-
-function getQuery({
-  pg, filter: filterStr, table, tableSQL, fields, filterList,
-}) {
-  if (!filterStr) return null; // filter list API
-
-  const mainOperators = ['=', '~', '>', '<'];
-
-  const filterQueryArray = decodeURI(filterStr?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/);
-
-  const resultList = [];
-
-  for (let i = 0; i < filterQueryArray.length; i += 1) {
-    const item = filterQueryArray[i];
-    const operator = mainOperators?.find((el) => item.indexOf(el) !== -1) || '=';
-    const [name] = item.split(operator);
-
-    // skip already added filter
-    if (resultList.find((el) => el.name === name)) {
-      continue;
-    }
-
-    // filter
-    const filter = filterList?.find((el) => [el.id, el.name].includes(name)) || { type: 'text' };
-
-    // find all value
-    const value = filterQueryArray.filter((el) => el.startsWith(name)).map((el) => el.substring(name.length + 1)).join(',');
-
-    const optimize = fields?.find((el) => el.name === name) ? null : tableSQL.find((el) => el.name === name);
-
-    // find field and skip not exists
-    const { dataTypeID } = fields?.find((el) => el.name === name) || fields?.find((el) => el.name === optimize?.pk) || {};
-
-    // format query
-    const { op, query, filterType, fieldType } = formatValue({
-      pg,
-      table,
-      filter,
-      optimize,
-      name,
-      value: decodeURIComponent(value),
-      operator,
-      dataTypeID,
-    }) || {};
-    if (!query) continue;
-
-    resultList.push({
-      name, value, query, operator: op, filterType, type: fieldType,
-    });
-  }
-
-  return resultList;
-}
-
-export default getQuery;

package/server/routes/data/controllers/funcs/getFilterSQL/util/getOptimizedQuery.js

@@ -1,12 +0,0 @@
-function getOptimizedQuery({ body, table, q }, count) {
-  const order = body?.orderby || body?.order ? `order by ${body?.orderby || body?.order}` : '';
-
-  const tableName = body?.table || body?.model || table;
-
-  const sqlList = body?.sql?.filter((el) => !el.disabled && el?.sql?.replace && (count ? el.count !== false : true))
-    .map((el) => ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `).join(' ');
-
-  return `(select * from ${tableName} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 and ${q?.replace('q.', 't.') || '1=1'} ${order})q`;
-}
-
-export default getOptimizedQuery;

package/server/routes/data/controllers/funcs/getFilterSQL/util/getTableSql.js

@@ -1,34 +0,0 @@
-function getTable(table) {
-  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    ?.map((el) => el.split(/[ )]/)[0]);
-  return result;
-}
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-const tableSql = {};
-async function getTableSql({
-  pg, body, table, fields,
-}) {
-  if (tableSql[table]) return tableSql[table];
-
-  const fieldList = fields.map((el) => el.name);
-
-  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
-
-  if (!tableList) { tableSql[table] = []; return []; }
-
-  const data = await Promise.all(tableList?.map(async (tableEl) => {
-    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
-    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
-  }));
-
-  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
-
-  return tableSql[table];
-}
-
-export default getTableSql;

package/server/routes/data/controllers/utils/assignTokens.js

@@ -1,31 +0,0 @@
-import { config, setToken } from "@opengis/fastify-table/utils.js";
-
-export default function assignTokens({
-    rows = [], ispublic, uid, loadTable = {},
-}) {
-    if (config?.security?.disableToken) return;
-
-    if (!config?.auth?.disable && !ispublic && !uid) throw new Error('empty user');
-    if (!loadTable?.table || !(loadTable?.form || loadTable?.add_form)) return null;
-
-    const form = loadTable?.form || loadTable?.add_form;
-    const addTokens = setToken({
-        ids: [JSON.stringify({ add: loadTable.table, form })],
-        mode: 'a',
-        uid: config?.auth?.disable || ispublic ? '1' : uid,
-        array: 1,
-    });
-    if (!rows.length) return addTokens[0];
-
-    rows.forEach((row) => {
-        const editTokens = setToken({
-            ids: [JSON.stringify({ id: row.id, table: loadTable.table, form })],
-            mode: 'w',
-            uid: config?.auth?.disable || ispublic ? '1' : uid,
-            array: 1,
-        });
-        Object.assign(row, { token: editTokens[0] });
-    });
-    return addTokens[0];
-
-}

package/server/routes/data/controllers/utils/conditions.js

@@ -1,19 +0,0 @@
-function onCheck(rule, data) {
-    const val = data[rule[0]];
-    if (rule[1] === '==') return val === rule[2];
-    if (rule[1] === '!=') return val !== rule[2];
-    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
-    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
-
-    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
-    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
-
-    if (rule[1] === '>') return val > rule[2];
-    if (rule[1] === '<') return val < rule[2];
-    return false;
-}
-export default function conditions(rules, data) {
-    if (!rules?.length) return true;
-    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data);
-    return result;
-}

package/server/routes/data/controllers/utils/getColumns.js

@@ -1,9 +0,0 @@
-import { getTemplate } from "@opengis/fastify-table/utils.js";
-
-export default async function getColumns({
-    columns = [], params = {}, opt = {}, loadTable = {}, form, table, dbColumns = [], mode = 'table',
-}) {
-    const columnList = dbColumns.map((el) => el.name || el).join(',');
-    const cols = columns.filter((el) => columnList.includes(el?.name) && el?.name !== 'geom').map((el) => el?.name || el).join(',');
-    return { cols, columnList };
-}

package/server/routes/data/index.mjs

@@ -1,22 +0,0 @@
-import tableData from './controllers/tableData.js';
-import tokenInfo from './controllers/tokenInfo.js';
-import cardTabData from './controllers/cardTabData.js';
-import cardData from './controllers/cardData.js';
-import tableFilter from './controllers/tableFilter.js';
-import tableInfo from './controllers/tableInfo.js';
-
-import {
- tableDataSchema, tableDataIdSchema, tableFilterSchema, cardTabDataSchema,
-} from './schema.js';
-
-const policy = ['user'];
-
-export default async function route(app, config = {}) {
-    const { prefix = '/api' } = config;
-    app.get(`${prefix}/table-data/:table`, { config: { policy: ['user', 'no-sql'] }, schema: tableDataSchema }, tableData);
-    app.get(`${prefix}/token-info/:token`, { config: { policy: ['admin'] } }, tokenInfo);
-    app.get(`${prefix}/card-data/:token`, { config: { policy }, scheme: cardTabDataSchema }, cardTabData);
-    app.get(`${prefix}/table-data/:table/:id`, { config: { policy }, schema: tableDataIdSchema }, cardData);
-    app.get(`${prefix}/table-filter/:table`, { config: { policy }, schema: tableFilterSchema }, tableFilter);
-    app.get(`${prefix}/table-info/:table/:id?`, { config: { policy }, schema: tableDataSchema }, tableInfo);
-}

package/server/routes/data/schema.js

@@ -1,70 +0,0 @@
-const tableDataSchema = {
-    type: 'object',
-    properties: {
-        querystring: {
-            limit: { type: 'string', pattern: '^(\\d+)$' },
-            page: { type: 'string', pattern: '^(\\d+)$' },
-            // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-            // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-            order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            desc: { type: 'string', pattern: '^(\\d+)$' },
-            state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-            custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-            bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
-            polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
-            // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-            sql: { type: 'string', pattern: '^(\\d)$' },
-        },
-        params: {
-            id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        },
-    },
-};
-
-const tableDataIdSchema = {
-    type: 'object',
-    properties: {
-        params: {
-            id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-    },
-};
-
-const tableFilterSchema = {
-    type: 'object',
-    properties: {
-        params: {
-            name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-    },
-};
-
-const cardDataSchema = {
-    type: 'object',
-    properties: {
-        params: {
-            id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            table: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-    },
-};
-
-const cardTabDataSchema = {
-    type: 'object',
-    properties: {
-        querystring: {
-            sql: { type: 'string', pattern: '^(\\d)$' }
-        },
-        params: {
-            token: { type: 'string', pattern: '^([\\d\\w]+)$' },
-        },
-    },
-};
-export {
-    tableDataSchema, tableDataIdSchema, tableFilterSchema,
-    cardDataSchema, cardTabDataSchema,
-};
-
-export default null;