@opengis/admin 0.3.24 → 0.3.26

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

@@ -1,13 +1,13 @@
-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;
+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 +1,64 @@
-/* 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;
+/* 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 +1,12 @@
-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;
+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 +1,34 @@
-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;
+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/tableData.js

@@ -1,32 +1,32 @@
-import getData from '@opengis/fastify-table/server/routes/table/controllers/data.js';
-import { getOpt, getMeta } from '@opengis/fastify-table/utils.js';
-// import getData from '../../../../../../npm/fastify-table/server/routes/table/controllers/data.js';
-
-export default async function getTableData(req) {
-    const { user = {}, pg } = req
-    const tokenData = await getOpt(req.params.table, req.user?.uid);
-    if (tokenData) {
-        const { rows = [], fields = [] } = await req.pg.query(`select ${tokenData.columns || '*'} from ${tokenData.table} where ${tokenData.query || 'true'} limit 10`);
-        const meta = await getMeta({ pg, table: tokenData.table });
-        const columns = (meta?.columns || fields).map(el => ({ name: el.name, type: pg.pgType?.[el.dataTypeID], title: el.title }));
-        return { rows, columns };
-    }
-
-    // Це можна 1 раз на старті 
-    const interfaceName = req.headers?.referer?.match(/.*\/([^?]+)/)?.[1];
-    const { query } = interfaceName ?
-        await req.pg.query(`select query from admin.routes where route_id=$1`, [interfaceName])
-            .then(el => el.rows?.[0] || {}) : {};
-
-    // це можна від користувача
-    const { rows = [] } = pg.pk?.['admin.rules'] ? await req.pg.query(`select attr,(select rule_values from admin.account_grants where account_id in (select account_id from admin.account_users where user_uid=$2) and rule_id=r.rule_id limit 1) from admin.rules r where (select route_id from admin.routes where $1 in (alias,table_name)) = any(routes)`, [req.params.table, user.uid]) : {};
-
-
-    const context = rows.filter(el => el.rule_values).map(el => `${el.attr} = any ('{${el.rule_values}}')`).join(' and ')
-    req.params.query = [query, context].filter(el => el).join(' and ') || ' true ';
-
-    const res = await getData(req);
-
-    return res;
-
+import getData from '@opengis/fastify-table/server/routes/table/controllers/data.js';
+import { getOpt, getMeta } from '@opengis/fastify-table/utils.js';
+// import getData from '../../../../../../npm/fastify-table/server/routes/table/controllers/data.js';
+
+export default async function getTableData(req) {
+    const { user = {}, pg } = req
+    const tokenData = await getOpt(req.params.table, req.user?.uid);
+    if (tokenData) {
+        const { rows = [], fields = [] } = await req.pg.query(`select ${tokenData.columns || '*'} from ${tokenData.table} where ${tokenData.query || 'true'} limit 10`);
+        const meta = await getMeta({ pg, table: tokenData.table });
+        const columns = (meta?.columns || fields).map(el => ({ name: el.name, type: pg.pgType?.[el.dataTypeID], title: el.title }));
+        return { rows, columns };
+    }
+
+    // Це можна 1 раз на старті 
+    const interfaceName = req.headers?.referer?.match(/.*\/([^?]+)/)?.[1];
+    const { query } = interfaceName ?
+        await req.pg.query(`select query from admin.routes where route_id=$1`, [interfaceName])
+            .then(el => el.rows?.[0] || {}) : {};
+
+    // це можна від користувача
+    const { rows = [] } = pg.pk?.['admin.rules'] ? await req.pg.query(`select attr,(select rule_values from admin.account_grants where account_id in (select account_id from admin.account_users where user_uid=$2) and rule_id=r.rule_id limit 1) from admin.rules r where (select route_id from admin.routes where $1 in (alias,table_name)) = any(routes)`, [req.params.table, user.uid]) : {};
+
+
+    const context = rows.filter(el => el.rule_values).map(el => `${el.attr} = any ('{${el.rule_values}}')`).join(' and ')
+    req.params.query = [query, context].filter(el => el).join(' and ') || ' true ';
+
+    const res = await getData(req);
+
+    return res;
+
 }

package/server/routes/data/controllers/tableDataId.js

@@ -1,28 +1,28 @@
-import { handlebars } from "@opengis/fastify-table/utils.js";
-
-import getTemplate from "../../templates/funcs/getTemplate.js";
-import getTableData from "./tableData.js";
-
-export default async function tableDataId({ pg, params = {}, session = {}, user }, reply) {
-    const { name, id } = params;
-
-    const data = await getTemplate('pt', `${name}.pt`);
-
-
-    if (!data) {
-        return { message: `invalid template: ${name}.pt`, status: 400 };
-    }
-    debugger;
-    const { message, status = 500, rows = [] } = await getTableData({ pg, params: { name, id }, session, user });
-    if (message) {
-        return { message, status };
-    }
-
-    if (!rows.length) {
-        return { message: `data not found: ${name}/${id}`, status: 404 };
-    }
-
-    const htmlContent = await handlebars.compile(data)(rows[0]);
-
-    return reply.headers({ 'Content-Type': 'text/html; charset=utf-8' }).send(htmlContent);
+import { handlebars } from "@opengis/fastify-table/utils.js";
+
+import getTemplate from "../../templates/funcs/getTemplate.js";
+import getTableData from "./tableData.js";
+
+export default async function tableDataId({ pg, params = {}, session = {}, user }, reply) {
+    const { name, id } = params;
+
+    const data = await getTemplate('pt', `${name}.pt`);
+
+
+    if (!data) {
+        return { message: `invalid template: ${name}.pt`, status: 400 };
+    }
+    debugger;
+    const { message, status = 500, rows = [] } = await getTableData({ pg, params: { name, id }, session, user });
+    if (message) {
+        return { message, status };
+    }
+
+    if (!rows.length) {
+        return { message: `data not found: ${name}/${id}`, status: 404 };
+    }
+
+    const htmlContent = await handlebars.compile(data)(rows[0]);
+
+    return reply.headers({ 'Content-Type': 'text/html; charset=utf-8' }).send(htmlContent);
 }

package/server/routes/data/controllers/tableFilter.js

@@ -1,10 +1,10 @@
-import { getFilter } from "@opengis/fastify-table/utils.js";
-
-export default async function tableFilter(req) {
-    const { pg, params = {}, query = {}, user = {} } = req;
-
-    const { table } = params;
-    const { filter, custom, state, search } = query;
-    const result = await getFilter({ table, pg, filter, custom, state, search, user });
-    return result;
+import { getFilter } from "@opengis/fastify-table/utils.js";
+
+export default async function tableFilter(req) {
+    const { pg, params = {}, query = {}, user = {} } = req;
+
+    const { table } = params;
+    const { filter, custom, state, search } = query;
+    const result = await getFilter({ table, pg, filter, custom, state, search, user });
+    return result;
 }

package/server/routes/data/controllers/tableInfo.js

@@ -1,112 +1,112 @@
-import {
-  getTemplate, getMeta, metaFormat, applyHook, handlebars, pgClients,
-} from '@opengis/fastify-table/utils.js';
-
-export default async function tableInfo(req) {
-    const {
-        pg = pgClients.client, params = {}, query = {}, user = {},
-    } = req;
-
-    const time = Date.now();
-
-    const { uid } = user;
-
-    if (!uid) {
-        return { message: 'access restricted: uid', status: 403 };
-    }
-
-    if (!params?.id || !params?.table) {
-        return { message: 'not enougn params', status: 400 };
-    }
-
-    const loadTable = await getTemplate('table', params.table);
-
-    if (!loadTable) {
-        return { message: 'template not found', status: 404 };
-    }
-
-    const {
-        table, columns = [], sql, cardSql, filters, form, meta, public: ispublic,
-    } = loadTable;
-
-    if (!meta?.info) {
-        return { message: 'empty meta info', status: 400 };
-    }
-
-    const tableMeta = await getMeta(table);
-
-    if (tableMeta?.view) {
-        if (!loadTable?.key) {
-            return { message: `key not found: ${table}`, status: 404 };
-        }
-        Object.assign(tableMeta, { pk: loadTable?.key });
-    }
-
-    const { pk } = tableMeta || {};
-
-    if (!pk) {
-        return { message: `table not found: ${table}`, status: 404 };
-    }
-
-    const sqlTable = sql
-        ?.filter?.((el) => !el?.disabled && el?.sql?.replace)
-        ?.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)
-        ?.join('') || '';
-
-    const cardSqlFiltered = params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
-    const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ct${i}  on 1=1 `).join('\n') || '' : '';
-
-    const interfaceQuery = params?.query ? await handlebars.compile(params?.query)({ user, uid }) : undefined;
-    const where = [params.id ? `"${pk}" = $1` : null, loadTable.query, interfaceQuery].filter((el) => el).filter((el) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
-
-    const { fields = [] } = await pg.query(`select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')} limit 0`, ([sqlTable ? null : params.id].filter(el => el)) );
-    const columnList = fields.map(el => el.name);
-
-    const metaInfoCols = meta.info.split(',').filter(el => columnList.includes(el)).map((el) => `"${el}"`);
-
-    if (!metaInfoCols.length) {
-        return { message: 'invalid meta info: columns not found', status: 400 };
-    }
-
-    const q = `select  ${pk ? `"${pk}" as id,` : ''} 
-                        ${metaInfoCols.join(',')} 
-                        from (select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')}) t 
-                        ${sqlTable} 
-                        ${cardSqlTable} 
-                        where ${where.join(' and ') || 'true'} 
-                        limit 1`
-        .replace(/{{uid}}/g, uid);
-    
-    // if (user?.user_type === 'superadmin') console.log(q);
-
-    if (query.sql === '1') { return q; }
-
-    const { rows } = await pg.query(q, [params.id]);
-
-    const qCount = `select 
-                count(*)::int as total,  
-                count(*) FILTER(WHERE ${[interfaceQuery].filter(el => el).join(' and ') || 'true'})::int as filtered 
-                from ${table} t ${sqlTable} 
-                where ${[loadTable.query].filter(el => el).join(' and ') || 'true'} `
-        .replace(/{{uid}}/g, uid);
-
-    const { total, filtered } = params.id ? rows.length
-        : await pg.queryCache(qCount, { table: loadTable.table, time: 5 }).then((el) => el?.rows[0]);
-
-    const cls = meta.info.split(',').filter(el => columnList.includes(el))
-        .map(el => ({ name: el, data: columns.find(col => col.name === el)?.data }))
-        .filter(el => el.data)
-        .reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.data }), {});
-
-    await metaFormat({ rows, cls /* , sufix: false */ });
-
-    const res = {
-        time: Date.now() - time, public: ispublic, card: loadTable.card, total, filtered, count: rows.length, pk, form, rows, meta, columns, filters,
-    };
-
-    const result = await applyHook('afterData', {
-        table: loadTable.table, payload: res, user,
-    });
-
-    return result || res;
-}
+import {
+  getTemplate, getMeta, metaFormat, applyHook, handlebars, pgClients,
+} from '@opengis/fastify-table/utils.js';
+
+export default async function tableInfo(req) {
+    const {
+        pg = pgClients.client, params = {}, query = {}, user = {},
+    } = req;
+
+    const time = Date.now();
+
+    const { uid } = user;
+
+    if (!uid) {
+        return { message: 'access restricted: uid', status: 403 };
+    }
+
+    if (!params?.id || !params?.table) {
+        return { message: 'not enougn params', status: 400 };
+    }
+
+    const loadTable = await getTemplate('table', params.table);
+
+    if (!loadTable) {
+        return { message: 'template not found', status: 404 };
+    }
+
+    const {
+        table, columns = [], sql, cardSql, filters, form, meta, public: ispublic,
+    } = loadTable;
+
+    if (!meta?.info) {
+        return { message: 'empty meta info', status: 400 };
+    }
+
+    const tableMeta = await getMeta(table);
+
+    if (tableMeta?.view) {
+        if (!loadTable?.key) {
+            return { message: `key not found: ${table}`, status: 404 };
+        }
+        Object.assign(tableMeta, { pk: loadTable?.key });
+    }
+
+    const { pk } = tableMeta || {};
+
+    if (!pk) {
+        return { message: `table not found: ${table}`, status: 404 };
+    }
+
+    const sqlTable = sql
+        ?.filter?.((el) => !el?.disabled && el?.sql?.replace)
+        ?.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)
+        ?.join('') || '';
+
+    const cardSqlFiltered = params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
+    const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ct${i}  on 1=1 `).join('\n') || '' : '';
+
+    const interfaceQuery = params?.query ? await handlebars.compile(params?.query)({ user, uid }) : undefined;
+    const where = [params.id ? `"${pk}" = $1` : null, loadTable.query, interfaceQuery].filter((el) => el).filter((el) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
+
+    const { fields = [] } = await pg.query(`select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')} limit 0`, ([sqlTable ? null : params.id].filter(el => el)) );
+    const columnList = fields.map(el => el.name);
+
+    const metaInfoCols = meta.info.split(',').filter(el => columnList.includes(el)).map((el) => `"${el}"`);
+
+    if (!metaInfoCols.length) {
+        return { message: 'invalid meta info: columns not found', status: 400 };
+    }
+
+    const q = `select  ${pk ? `"${pk}" as id,` : ''} 
+                        ${metaInfoCols.join(',')} 
+                        from (select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')}) t 
+                        ${sqlTable} 
+                        ${cardSqlTable} 
+                        where ${where.join(' and ') || 'true'} 
+                        limit 1`
+        .replace(/{{uid}}/g, uid);
+    
+    // if (user?.user_type === 'superadmin') console.log(q);
+
+    if (query.sql === '1') { return q; }
+
+    const { rows } = await pg.query(q, [params.id]);
+
+    const qCount = `select 
+                count(*)::int as total,  
+                count(*) FILTER(WHERE ${[interfaceQuery].filter(el => el).join(' and ') || 'true'})::int as filtered 
+                from ${table} t ${sqlTable} 
+                where ${[loadTable.query].filter(el => el).join(' and ') || 'true'} `
+        .replace(/{{uid}}/g, uid);
+
+    const { total, filtered } = params.id ? rows.length
+        : await pg.queryCache(qCount, { table: loadTable.table, time: 5 }).then((el) => el?.rows[0]);
+
+    const cls = meta.info.split(',').filter(el => columnList.includes(el))
+        .map(el => ({ name: el, data: columns.find(col => col.name === el)?.data }))
+        .filter(el => el.data)
+        .reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.data }), {});
+
+    await metaFormat({ rows, cls /* , sufix: false */ });
+
+    const res = {
+        time: Date.now() - time, public: ispublic, card: loadTable.card, total, filtered, count: rows.length, pk, form, rows, meta, columns, filters,
+    };
+
+    const result = await applyHook('afterData', {
+        table: loadTable.table, payload: res, user,
+    });
+
+    return result || res;
+}

package/server/routes/data/controllers/tokenInfo.js

@@ -1,10 +1,10 @@
-import { getOpt, getToken } from "@opengis/fastify-table/utils.js";
-
-export default async function tokenInfo(req) {
-
-    const { params = {}, user } = req;
-    if (user.user_type !== 'admin') return { status: 403, message: 'access restricted' }
-    const tokenData = await getToken({ uid: user.uid, token: params.token, }) || await getOpt(params.token, user.uid)
-    return tokenData;
-
+import { getOpt, getToken } from "@opengis/fastify-table/utils.js";
+
+export default async function tokenInfo(req) {
+
+    const { params = {}, user } = req;
+    if (user.user_type !== 'admin') return { status: 403, message: 'access restricted' }
+    const tokenData = await getToken({ uid: user.uid, token: params.token, }) || await getOpt(params.token, user.uid)
+    return tokenData;
+
 }