@opengis/fastify-table 1.2.52 → 1.2.54

package/package.json

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

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

@@ -0,0 +1,8 @@
+import routeFilter from '../../../routes/table/controllers/filter.js';
+
+export default async function getFilter({ pg, table, filter, custom, state, search, user }) {
+    const params = { table };
+    const query = { filter, custom, state, search };
+    const result = await routeFilter({ pg, params, query, user });
+    return result;
+}

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

@@ -1,4 +1,4 @@
-import { getSelect, getFilterSQL, getTemplate, getSelectVal, pgClients } from '../../../../utils.js';
+import { logger, autoIndex, getSelect, getFilterSQL, getTemplate, getSelectVal, pgClients } from '../../../../utils.js';
 
 export default async function filterAPI(req) {
   const time = Date.now();
@@ -11,13 +11,14 @@ export default async function filterAPI(req) {
   if (!loadTable) { return { status: 404, message: 'not found' }; }
 
   const sqlTable = loadTable.sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', user?.uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
-  const { fields: columns } = await pg.query(`select * from ${loadTable.table} t ${sqlTable} limit 0`);
+  const { fields: columns = [] } = await pg.query(`select * from ${loadTable.table} t ${sqlTable} limit 0`);
+  const { fields = [] } = await pg.query(`select * from ${loadTable.table} t limit 0`);
 
   const {
     filter, custom, state, search,
   } = query;
 
-  const { extra } = loadTable?.form ? await getTemplate('form', loadTable?.form) : {};
+  const { extra } = loadTable?.form ? await getTemplate('form', loadTable?.form) || {} : {};
 
   const { optimizedSQL = `select * from ${loadTable.table}` } = loadTable?.sql || filter || custom || state || search || extra ? await getFilterSQL({
     pg,
@@ -28,7 +29,19 @@ export default async function filterAPI(req) {
     search,
   }) : {};
 
-  const filters = loadTable?.filter_list || loadTable?.filters || loadTable?.filterList || [];
+  const filters = (loadTable?.filter_list || loadTable?.filters || loadTable?.filterList || []).concat(loadTable?.filterSql || []);
+
+  // admin.custom_column - user filter NA-165
+  const { rows: properties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column where entity=$1 and uid=$2 and filter`, [params.name, user?.uid]);
+  properties.forEach((row) => filters.push({ id: row.name, name: row.name, ua: row.title, type: row.format, data: row.data }));
+
+  // KRYVYIRIH-231
+  autoIndex({ table: loadTable.table, columns: filters.filter((el) => columns?.find?.((item) => item?.name === el.name)) })
+    .catch(err => {
+      console.error(err.toString());
+      logger.file('autoindex/error', { name: params?.name, error: err.toString(), stack: err.stack });
+    });
+
   await Promise.all(filters.filter((el) => el.data && (el.id || el.name)).map(async (el) => {
     const name = el.id || el.name;
     const cls = await getSelect(el.data, pg);
@@ -36,6 +49,15 @@ export default async function filterAPI(req) {
     if (!cls || !loadTable.table) return;
     const { dataTypeID } = columns.find((item) => item.name === name) || {};
 
+    if (el.extra && el.type === 'select' && Array.isArray(cls)) {
+      const countArr = await pg.query(`select value_text as id, count(*) from crm.extra_data where property_key=$1 and property_entity=$2 group by value_text`, [name, params.table]);
+      const options = countArr.rows.map(cel => {
+        const data = cls.find(c => c.id === cel.id);
+        return { ...cel, ...data };
+      });
+      Object.assign(el, { options });
+    }
+
     const countArr = pg.pgType[dataTypeID]?.includes('[]')
       ? await pg.queryCache(`select unnest(${name})::text as id,count(*) from (${optimizedSQL})q group by unnest(${name})`, { table: loadTable.table, time: 5 })
       : await pg.queryCache(`select ${name}::text as id,count(*) from (${optimizedSQL})q group by ${name}`, { table: loadTable.table, time: 5 });
@@ -59,12 +81,38 @@ export default async function filterAPI(req) {
     });
   }
 
+  const sqlList = loadTable?.sql
+    ?.filter((el) => !el.disabled && el?.sql?.replace)
+    ?.map((el, i) => ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name || `t${i + 1}`} on 1=1 `)
+    ?.join(' ') || '';
+
+  // percentile_cont - alternative
+  await Promise.all(filters.filter((el) => el.name && el.type === 'Range' && fields?.find?.((item) => item?.name === el.name)).map(async (el) => {
+    const data = await pg.queryCache(`select array[
+        min(${el.name}),
+        percentile_disc(0.25) within group (order by ${el.name}),
+        percentile_disc(0.5) within group (order by ${el.name}),
+        percentile_disc(0.75) within group (order by ${el.name}),
+        max(${el.name})
+    ] as range from ${loadTable.table} ${sqlList && false ? ` t ${sqlList}` : ''} where ${loadTable.query || '1=1'}`, { table: loadTable.table }).then(el => el.rows?.[0]?.range);
+    Object.assign(el, { data });
+  }));
+
+  const sqlFilters = (loadTable?.filterCustom || []).filter((el) => el.name && el.sql);
+  const q1 = sqlFilters.map((el) => `select count(*), '${el.name}' as name from ${loadTable.table} where ${loadTable.query || '1=1'} and ${el.sql}`).join(' union all ');
+  const { rows: sqlRows = [] } = q1 ? await pg.queryCache(q1, { table: loadTable.table }) : {};
+  if (sqlRows?.length) {
+    sqlFilters.forEach((el) => {
+      const { count } = sqlRows.find((row) => row.name === el.name) || {};
+      Object.assign(el, { count, sql: undefined });
+    });
+  }
+
   return {
     time: Date.now() - time,
     list: filters,
     custom: loadTable?.filterCustom,
     inline: loadTable?.filterInline,
     state: loadTable?.filterState,
-    sql: loadTable?.filterSql,
   };
 }

package/utils.js

@@ -33,6 +33,7 @@ import getSelect from './server/plugins/table/funcs/getSelect.js';
 import getSelectMeta from './server/plugins/table/funcs/getSelectMeta.js';
 import gisIRColumn from './server/plugins/table/funcs/gisIRColumn.js';
 import getData from './server/plugins/table/funcs/getData.js';
+import getFilter from './server/plugins/table/funcs/getFilter.js';
 
 // crud
 import dataInsert from './server/plugins/crud/funcs/dataInsert.js';
@@ -62,6 +63,7 @@ import logger from './server/plugins/logger/getLogger.js';
 
 // utils
 import config from './config.js';
+import dblist from './dblist.js';
 import eventStream from './server/plugins/util/funcs/eventStream.js';
 import isFileExists from './server/plugins/crud/funcs/isFileExists.js';
 import getFolder from './server/plugins/crud/funcs/utils/getFolder.js';
@@ -71,6 +73,7 @@ import logChanges from './server/plugins/crud/funcs/utils/logChanges.js';
 export default null;
 export {
   config,
+  dblist,
   getFolder,
   handlebars,
   handlebarsSync,
@@ -116,6 +119,7 @@ export {
   getMeta,
   gisIRColumn,
   getData,
+  getFilter,
 
   // pg
   initPG,