@opengis/admin 0.3.63 → 0.3.65

package/server/routes/notifications/index.mjs

@@ -1,26 +1,26 @@
-import { addHook } from '@opengis/fastify-table/utils.js';
-
-// api
-import testEmail from './controllers/testEmail.js';
-import readNotifications from './controllers/readNotifications.js'; // mark as read
-import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
-
-// hook
-import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
-
-// funcs
-// import addNotification from '../notifications/funcs/addNotification.js'; // add to db
-// import notification from '../notifications/funcs/sendNotification.js'; // send notification
-
-import { notificationSchema, emailSchema } from './schema.js';
-
-export default async function route(fastify) {
-
-  // fastify.decorate('addNotification', addNotification);
-  // fastify.decorate('notification', notification);
-
-  fastify.get('/test-email', { config: { policy: ['user'] }, schema: emailSchema }, testEmail);
-  fastify.get('/notification', { config: { policy: ['user'] }, schema: notificationSchema }, userNotifications);
-  fastify.get('/notification-read/:id?', { config: { policy: ['user'] }, schema: notificationSchema }, readNotifications);
-  addHook('onWidgetSet', onWidgetSet);
-}
+import { addHook } from '@opengis/fastify-table/utils.js';
+
+// api
+import testEmail from './controllers/testEmail.js';
+import readNotifications from './controllers/readNotifications.js'; // mark as read
+import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
+
+// hook
+import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
+
+// funcs
+// import addNotification from '../notifications/funcs/addNotification.js'; // add to db
+// import notification from '../notifications/funcs/sendNotification.js'; // send notification
+
+import { notificationSchema, emailSchema } from './schema.js';
+
+export default async function route(fastify) {
+
+  // fastify.decorate('addNotification', addNotification);
+  // fastify.decorate('notification', notification);
+
+  fastify.get('/test-email', { config: { policy: ['user'] }, schema: emailSchema }, testEmail);
+  fastify.get('/notification', { config: { policy: ['user'] }, schema: notificationSchema }, userNotifications);
+  fastify.get('/notification-read/:id?', { config: { policy: ['user'] }, schema: notificationSchema }, readNotifications);
+  addHook('onWidgetSet', onWidgetSet);
+}

package/server/routes/notifications/schema.js

@@ -1,17 +1,17 @@
-const notificationSchema = {
-    params: {
-      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-    querystring: {
-      nocache: { type: 'string', pattern: '^(\\d+)$' },
-    },
-};
-
-const emailSchema = {
-  quertstring: {
-    to: { type: 'string', pattern: '^((?!\\.)[\\w\\-_.]*[^.])(@\\w+)(\\.\\w+(\\.\\w+)?[^.\\W])$' },
-  },
-};
-
-export default null;
+const notificationSchema = {
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+    querystring: {
+      nocache: { type: 'string', pattern: '^(\\d+)$' },
+    },
+};
+
+const emailSchema = {
+  quertstring: {
+    to: { type: 'string', pattern: '^((?!\\.)[\\w\\-_.]*[^.])(@\\w+)(\\.\\w+(\\.\\w+)?[^.\\W])$' },
+  },
+};
+
+export default null;
 export { notificationSchema, emailSchema }

package/server/routes/print/controllers/cardPrint.js

@@ -1,136 +1,136 @@
-import path from 'path';
-import qr from 'qrcode';
-import { readFile } from 'node:fs/promises';
-import { fileURLToPath } from 'url';
-import { createHash } from 'crypto';
-
-import {
-    config, getTemplate, pgClients, handlebars, getFilterSQL, logger, metaFormat, getMeta,
-} from '@opengis/fastify-table/utils.js';
-import { grpc } from '@opengis/fastify-file/utils.js';
-
-const { htmlToPdf } = grpc();
-const filename = fileURLToPath(import.meta.url);
-const dirname = path.dirname(filename);
-
-// printMap
-const host = 'https://data.gki.com.ua';
-const width = 850;
-const height = 400;
-const geomBuffer = 0.001;
-const layers = '';
-const basemap = 'voyager';
-
-export default async function cardPrint(req, reply) {
-    const { pg = pgClients.client, params = {}, query = {}, user = {} } = req;
-    const { table, id } = params;
-
-    const { template = 'card-print.pt', tab } = query;
-    const format = query.format || (config.debug ? 'html' : 'pdf');
-
-    const hash = createHash('md5').update([table, id, template, tab].join()).digest('hex');
-
-    // const rootDir = getFolder(req, 'local');
-    // const filepath = path.join(rootDir, '/files/tmp/print/', `${hash}.pdf`);
-
-    const headers = {
-        'Content-Disposition': `inline; filename=${hash}.pdf`,
-        'Content-Type': 'application/pdf',
-    };
-
-    if (!user?.uid) {
-        return { message: 'access restricted', status: 401 };
-    }
-
-    if (!table || !id) {
-        return { message: 'not enougn params: table, id', status: 400 };
-    }
-
-    const body = await getTemplate('table', table);
-    const { geom } = await getMeta({ pg, table: body?.table });
-
-    if (!body?.table) {
-        return { message: 'table nof found', status: 404 };
-    }
-
-    if (!body.key && !pg.pk?.[body.table]) {
-        return { message: 'pkey not found', status: 404 };
-    }
-
-    const where = `${body.query || '1=1'} and ${body.key || pg.pk?.[body.table]}=$1`;
-
-    const { optimizedSQL = `select * from ${body.table} where ${body.query || '1=1'} and ` } = await getFilterSQL({
-        pg,
-        table,
-        query: where,
-    })
-    const { rows = [] } = await pg.query(`select * ${geom ? `, st_asgeojson(${geom})::json as geom` : ''} from (${optimizedSQL})q where ${where}`, [id]);
-
-    // metaFormat + descriptionList => bugs
-    // const cls = body?.columns?.filter(el => el.data)?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.data }), {});
-    // await metaFormat({ rows, cls, sufix: false });
-
-    const data = rows?.[0];
-    if (!data) {
-        return { message: 'data not found', status: 404 };
-    }
-
-    Object.assign(data, { id: data[body.key || pg.pk?.[body.table]] });
-
-    const mapUrl = `${host}/api-user/print-map?basemap=${basemap}&layers=${layers || ''}&geojson=${JSON.stringify(data['geom'])}&base64=1&height=${height}&width=${width}&buffer=${geomBuffer}&nocache=1`;
-    const resp = data['geom'] ? await fetch(mapUrl) : null;
-    const printMap = data['geom'] ? await resp.text() : '';
-
-    const pt = await getTemplate('pt', template)
-        || await readFile(path.join(dirname, '../../../templates/pt/card-print.pt.hbs'), 'utf8');
-
-    const trimPort = ['80', '443'].find(el => req.hostname.endsWith(el));
-    const url = (req.protocol || 'https') + '://' + req.hostname.replace(trimPort, '') + req.url.replace(req.routeOptions.url.split(':')[0], '/card/');
-    const qrCode = `<img src="${await qr.toDataURL(url, { type: 'png', ec_level: 'M', size: 5, margin: 4 })}" alt="qrcode">`;
-
-    const cardTemplates = await getTemplate('card', table);
-    const index = cardTemplates?.find(el => el[0] === 'index.yml')?.[1];
-    const cardHbsTabs = cardTemplates.filter(el => el[0].endsWith('hbs'));
-
-    const orderedTabs = index?.panels
-        ?.flatMap(panel => panel.items?.map(item => {
-            const body = cardHbsTabs.find(el => el[0] === `${item.name}.hbs`)?.[1];
-            return { ...item, body };
-        }))
-        .filter(el => el.name && el.body)
-        .filter(el => query.tab ? el.name === query.tab.toString() : true);
-
-    const tabData = await Promise.all(orderedTabs.map(async (el) => {
-        const html = await handlebars.compile(el.body.replace(/\{\{\{button[^\}]*\}\}\}/g, ''))(data);
-        return { name: el.name, title: el.title, html };
-    }));
-
-    const title = data?.[body.meta.title || ''];
-
-    const columnTitles = body?.columns?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua }), {});
-    const obj = {
-        title,
-        table_title: body.ua || body.title,
-        printMap,
-        rows: tabData,
-        data: Object.keys(data).filter(el => columnTitles[el]).reduce((acc, curr) => Object.assign(acc, { [columnTitles[curr] || curr]: data[curr] }), {}),
-        rawData: data,
-        url,
-        qr: qrCode,
-    };
-
-    const html = await handlebars.compile(pt || 'template not found')(obj);
-
-    if (format == 'html') {
-        return reply.headers({ 'Content-Type': 'text/html; charset=utf-8' }).send(html);
-    }
-
-    const result = await htmlToPdf({ html });
-    const buffer = Buffer.from(result.result, 'base64');
-
-    // await mkdir(path.dirname(filepath), { recursive: true });
-    // await writeFile(filepath, buffer);
-
-    logger.file('cardPrint', { table, id, format, uid: user?.uid });
-    return reply.headers(headers).send(buffer);
+import path from 'path';
+import qr from 'qrcode';
+import { readFile } from 'node:fs/promises';
+import { fileURLToPath } from 'url';
+import { createHash } from 'crypto';
+
+import {
+    config, getTemplate, pgClients, handlebars, getFilterSQL, logger, metaFormat, getMeta,
+} from '@opengis/fastify-table/utils.js';
+import { grpc } from '@opengis/fastify-file/utils.js';
+
+const { htmlToPdf } = grpc();
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+
+// printMap
+const host = 'https://data.gki.com.ua';
+const width = 850;
+const height = 400;
+const geomBuffer = 0.001;
+const layers = '';
+const basemap = 'voyager';
+
+export default async function cardPrint(req, reply) {
+    const { pg = pgClients.client, params = {}, query = {}, user = {} } = req;
+    const { table, id } = params;
+
+    const { template = 'card-print.pt', tab } = query;
+    const format = query.format || (config.debug ? 'html' : 'pdf');
+
+    const hash = createHash('md5').update([table, id, template, tab].join()).digest('hex');
+
+    // const rootDir = getFolder(req, 'local');
+    // const filepath = path.join(rootDir, '/files/tmp/print/', `${hash}.pdf`);
+
+    const headers = {
+        'Content-Disposition': `inline; filename=${hash}.pdf`,
+        'Content-Type': 'application/pdf',
+    };
+
+    if (!user?.uid) {
+        return { message: 'access restricted', status: 401 };
+    }
+
+    if (!table || !id) {
+        return { message: 'not enougn params: table, id', status: 400 };
+    }
+
+    const body = await getTemplate('table', table);
+    const { geom } = await getMeta({ pg, table: body?.table });
+
+    if (!body?.table) {
+        return { message: 'table nof found', status: 404 };
+    }
+
+    if (!body.key && !pg.pk?.[body.table]) {
+        return { message: 'pkey not found', status: 404 };
+    }
+
+    const where = `${body.query || '1=1'} and ${body.key || pg.pk?.[body.table]}=$1`;
+
+    const { optimizedSQL = `select * from ${body.table} where ${body.query || '1=1'} and ` } = await getFilterSQL({
+        pg,
+        table,
+        query: where,
+    })
+    const { rows = [] } = await pg.query(`select * ${geom ? `, st_asgeojson(${geom})::json as geom` : ''} from (${optimizedSQL})q where ${where}`, [id]);
+
+    // metaFormat + descriptionList => bugs
+    // const cls = body?.columns?.filter(el => el.data)?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.data }), {});
+    // await metaFormat({ rows, cls, sufix: false });
+
+    const data = rows?.[0];
+    if (!data) {
+        return { message: 'data not found', status: 404 };
+    }
+
+    Object.assign(data, { id: data[body.key || pg.pk?.[body.table]] });
+
+    const mapUrl = `${host}/api-user/print-map?basemap=${basemap}&layers=${layers || ''}&geojson=${JSON.stringify(data['geom'])}&base64=1&height=${height}&width=${width}&buffer=${geomBuffer}&nocache=1`;
+    const resp = data['geom'] ? await fetch(mapUrl) : null;
+    const printMap = data['geom'] ? await resp.text() : '';
+
+    const pt = await getTemplate('pt', template)
+        || await readFile(path.join(dirname, '../../../templates/pt/card-print.pt.hbs'), 'utf8');
+
+    const trimPort = ['80', '443'].find(el => req.hostname.endsWith(el));
+    const url = (req.protocol || 'https') + '://' + req.hostname.replace(trimPort, '') + req.url.replace(req.routeOptions.url.split(':')[0], '/card/');
+    const qrCode = `<img src="${await qr.toDataURL(url, { type: 'png', ec_level: 'M', size: 5, margin: 4 })}" alt="qrcode">`;
+
+    const cardTemplates = await getTemplate('card', table);
+    const index = cardTemplates?.find(el => el[0] === 'index.yml')?.[1];
+    const cardHbsTabs = cardTemplates.filter(el => el[0].endsWith('hbs'));
+
+    const orderedTabs = index?.panels
+        ?.flatMap(panel => panel.items?.map(item => {
+            const body = cardHbsTabs.find(el => el[0] === `${item.name}.hbs`)?.[1];
+            return { ...item, body };
+        }))
+        .filter(el => el.name && el.body)
+        .filter(el => query.tab ? el.name === query.tab.toString() : true);
+
+    const tabData = await Promise.all(orderedTabs.map(async (el) => {
+        const html = await handlebars.compile(el.body.replace(/\{\{\{button[^\}]*\}\}\}/g, ''))(data);
+        return { name: el.name, title: el.title, html };
+    }));
+
+    const title = data?.[body.meta.title || ''];
+
+    const columnTitles = body?.columns?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua }), {});
+    const obj = {
+        title,
+        table_title: body.ua || body.title,
+        printMap,
+        rows: tabData,
+        data: Object.keys(data).filter(el => columnTitles[el]).reduce((acc, curr) => Object.assign(acc, { [columnTitles[curr] || curr]: data[curr] }), {}),
+        rawData: data,
+        url,
+        qr: qrCode,
+    };
+
+    const html = await handlebars.compile(pt || 'template not found')(obj);
+
+    if (format == 'html') {
+        return reply.headers({ 'Content-Type': 'text/html; charset=utf-8' }).send(html);
+    }
+
+    const result = await htmlToPdf({ html });
+    const buffer = Buffer.from(result.result, 'base64');
+
+    // await mkdir(path.dirname(filepath), { recursive: true });
+    // await writeFile(filepath, buffer);
+
+    logger.file('cardPrint', { table, id, format, uid: user?.uid });
+    return reply.headers(headers).send(buffer);
 }

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

@@ -6,26 +6,20 @@ import { pgClients, getTemplatePath, getTemplate } from '@opengis/fastify-table/
 
 export default async function getSettingsApp({
   pg = pgClients.client,
-}) {
+}, reply) {
   const time = Date.now();
+
   if (!pg.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
+    return reply.status(404).send('table not found');
   }
 
-  /*const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:${table}`;
-  const cache = await redis.get(keyCache);
-
-  if (cache && !config?.local) {
-    return JSON.parse(cache);
-  }*/
+  const { rows = [] } = await pg.query('select property_key as key, property_text, property_json from admin.properties');
 
-  const { rows } = await pgClients.client.query("select property_key as key,property_text as val from admin.properties /*where property_key~'^(site|map)'*/");
-  const settings = rows.reduce((p, { key, val }) => { const [k1, k2] = key.split('.'); p[k1] = p[k1] || {}; p[k1][k2] = val; return p }, {});
-  const settings1 = rows.reduce((p, { key, val }) => ({ ...p, [key]: val }), {});
+  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 { message: { time: Date.now() - time, forms, settings: settings1 }, status: 200 };
+  return reply.status(200).send({ time: Date.now() - time, forms, settings });
 }

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

@@ -1,6 +1,6 @@
 const table = 'admin.properties';
 
-import { dataInsert } from '@opengis/fastify-table/utils.js';
+import { dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
 
 function checkValueType(val) {
   if (val) {
@@ -15,28 +15,34 @@ function checkValueType(val) {
 }
 
 export default async function postSettingsApp({
-  pg, user = {}, body = {}, uid
-}) {
+  pg = pgClients.client, body = {}, user = {}, uid = user?.uid,
+}, reply) {
   if (!user?.user_type?.includes?.('admin')) {
-    return { message: 'access restricted', status: 403 };
+    return reply.status(403).send('access restricted');
   }
   const { key, val } = body;
+
   if ((!key || !val) && !Object.keys(body).length) {
-    return { message: 'not enough params', status: 400 };
+    return reply.status(400).send('not enough body params');
   }
 
   if (!pg?.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
+    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.map(async (el) => {
-    const columnType = table === 'admin.user_properties' ? 'property_json' : checkValueType(body[el]);
-    const data = { property_key: el, [columnType]: body[el], uid };
-    if (!body[el]) return;
+  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, uid,
+      pg,
+      table,
+      data: { property_key: el, [columnType]: body[el] },
+      uid,
     });
 
   }));

package/server/routes/properties/schema.js

@@ -1,11 +1,11 @@
-const propertiesSchema = {
-    params: {
-      key: { type: 'string', pattern: '^([\\d\\w._]+)$' },
-    },
-    querystring: {
-      json: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-};
-
-export default null;
+const propertiesSchema = {
+    params: {
+      key: { type: 'string', pattern: '^([\\d\\w._]+)$' },
+    },
+    querystring: {
+      json: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+};
+
+export default null;
 export { propertiesSchema }

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

@@ -1,76 +1,76 @@
-import { handlebars, pgClients, getTemplate, metaFormat, handlebarsSync } from '@opengis/fastify-table/utils.js';
-
-import getFilterQuery from '../utils/getFilterQuery.js';
-
-const maxLimit = 100;
-
-export default async function reportData({
-    pg = pgClients.client, params = {}, query = {}, user = {},
-}) {
-    if (!params?.name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-
-    const loadTemplate = await getTemplate('report', params.name);
-
-    if (!loadTemplate?.sql) {
-        return { message: `report not found: ${params.name}`, status: 404 };
-    }
-
-    const { uid } = user;
-
-    const { kpi, sql, meta, filters } = loadTemplate;
-    const { date, columns: metaColumns } = meta || {};
-
-    const granularity = query.granularity && date && false ? `date_trunc('${query.granularity}',${date})::date::text` : null;
-    const groupby = [meta?.groupby, granularity].filter(el => el).join(',');
-
-    const period = query.period && date ? `${date}=${query.period}` : null;
-    const filter = [query.filter, period].filter(el => el).join(';');
-
-    const limit = Math.min(maxLimit, +(query.limit || 20));
-    const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-    const kpiColumns = kpi ? kpi?.map(el => `${el.sql || 'count(*)'} as "${el.name}"`)?.join(',') : '';
-    const columnsList = metaColumns || loadTemplate.columns?.map(el => el.name)?.join(',');
-
-    const qMeta = await handlebars.compile(sql)({ user, uid });
-    const { fields = [] } = await pg.query(`select * from (${qMeta})q limit 0`);
-
-    const where = filter ? getFilterQuery({ pg, filter, fields, filterList: filters })?.map?.(el => el.query)?.join(' and ') : null;
-
-    const qAgg = `select ${kpiColumns || ''} from (${qMeta})q where ${where || '1=1'}`;
-    const q = `select ${columnsList || '*'} from (${qMeta})q where ${where || '1=1'} ${groupby ? `group by ${groupby}` : ''} limit ${limit} offset ${offset}`;
-
-    if (query.sql && user?.user_type?.includes('admin')) return `${qAgg};${q}`;
-
-    const kpiData = await pg.query(qAgg).then(el => el.rows?.[0] || {});
-    kpi?.forEach(el => Object.assign(el, { count: kpiData[el.name] || '0' }));
-
-    const { rows = [] } = await pg.query(q);
-
-    const cls = meta?.cls || loadTemplate.columns
-        ?.filter(el => (el.option || el.data))
-        ?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: (curr.option || curr.data) }), {});
-
-    const titles = meta?.titles
-        || loadTemplate.columns?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title }), {});
-
-    await metaFormat({ rows, cls, sufix: true });
-
-    const columns = loadTemplate.columns
-        || fields.map(el => ({
-            name: el.name,
-            title: titles?.[el.name] || el.name,
-            type: cls?.[el.name] ? 'Autocomplete' : 'Text',
-            format: pg.pgType?.[el.dataTypeID],
-            data: cls?.[el.name],
-        }));
-
-    return {
-        q: user?.user_type?.includes('admin') ? q : undefined,
-        kpi,
-        rows,
-        columns,
-    };
-}
+import { handlebars, pgClients, getTemplate, metaFormat, handlebarsSync } from '@opengis/fastify-table/utils.js';
+
+import getFilterQuery from '../utils/getFilterQuery.js';
+
+const maxLimit = 100;
+
+export default async function reportData({
+    pg = pgClients.client, params = {}, query = {}, user = {},
+}) {
+    if (!params?.name) {
+        return { message: 'not enough params: name', status: 400 };
+    }
+
+    const loadTemplate = await getTemplate('report', params.name);
+
+    if (!loadTemplate?.sql) {
+        return { message: `report not found: ${params.name}`, status: 404 };
+    }
+
+    const { uid } = user;
+
+    const { kpi, sql, meta, filters } = loadTemplate;
+    const { date, columns: metaColumns } = meta || {};
+
+    const granularity = query.granularity && date && false ? `date_trunc('${query.granularity}',${date})::date::text` : null;
+    const groupby = [meta?.groupby, granularity].filter(el => el).join(',');
+
+    const period = query.period && date ? `${date}=${query.period}` : null;
+    const filter = [query.filter, period].filter(el => el).join(';');
+
+    const limit = Math.min(maxLimit, +(query.limit || 20));
+    const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
+
+    const kpiColumns = kpi ? kpi?.map(el => `${el.sql || 'count(*)'} as "${el.name}"`)?.join(',') : '';
+    const columnsList = metaColumns || loadTemplate.columns?.map(el => el.name)?.join(',');
+
+    const qMeta = await handlebars.compile(sql)({ user, uid });
+    const { fields = [] } = await pg.query(`select * from (${qMeta})q limit 0`);
+
+    const where = filter ? getFilterQuery({ pg, filter, fields, filterList: filters })?.map?.(el => el.query)?.join(' and ') : null;
+
+    const qAgg = `select ${kpiColumns || ''} from (${qMeta})q where ${where || '1=1'}`;
+    const q = `select ${columnsList || '*'} from (${qMeta})q where ${where || '1=1'} ${groupby ? `group by ${groupby}` : ''} limit ${limit} offset ${offset}`;
+
+    if (query.sql && user?.user_type?.includes('admin')) return `${qAgg};${q}`;
+
+    const kpiData = await pg.query(qAgg).then(el => el.rows?.[0] || {});
+    kpi?.forEach(el => Object.assign(el, { count: kpiData[el.name] || '0' }));
+
+    const { rows = [] } = await pg.query(q);
+
+    const cls = meta?.cls || loadTemplate.columns
+        ?.filter(el => (el.option || el.data))
+        ?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: (curr.option || curr.data) }), {});
+
+    const titles = meta?.titles
+        || loadTemplate.columns?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title }), {});
+
+    await metaFormat({ rows, cls, sufix: true });
+
+    const columns = loadTemplate.columns
+        || fields.map(el => ({
+            name: el.name,
+            title: titles?.[el.name] || el.name,
+            type: cls?.[el.name] ? 'Autocomplete' : 'Text',
+            format: pg.pgType?.[el.dataTypeID],
+            data: cls?.[el.name],
+        }));
+
+    return {
+        q: user?.user_type?.includes('admin') ? q : undefined,
+        kpi,
+        rows,
+        columns,
+    };
+}