@opengis/admin 0.4.3 → 0.4.4

package/config.js

@@ -1,5 +1,5 @@
-import { readFile } from 'fs/promises';
-import fs from 'fs';
-const config = fs.existsSync('config.json') ? JSON.parse(await readFile('config.json')) : {};
+import { existsSync, readFileSync } from 'node:fs';
+
+const config = existsSync('config.json') ? JSON.parse(readFileSync('config.json')) : {};
 
 export default config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

package/plugin.js

@@ -24,8 +24,8 @@ async function plugin(fastify, opts = config) {
   fastify.register(import('./server/routes/user/index.mjs'), opts);
   fastify.register(import('./server/routes/widget/index.mjs'), opts);
   fastify.register(import('./server/routes/access/index.mjs'), opts);
-  fastify.register(import('./server/routes/report/index.mjs'), opts);
-  fastify.register(import('./server/routes/print/index.mjs'), opts);
+  // fastify.register(import('./server/routes/report/index.mjs'), opts);
+  // fastify.register(import('./server/routes/print/index.mjs'), opts);
   fastify.register(import('./server/routes/util/index.mjs'), opts);
 }
 export default fp(plugin)

package/server/plugins/hook.js

@@ -6,8 +6,6 @@ import {
     getTemplatePath, addHook, getToken, getTemplate, config, pgClients, initPG, getRedis, logger, getMenu,
 } from '@opengis/fastify-table/utils.js';
 
-import printTemplates from '../routes/print/controllers/printTemplates.js';
-
 const { client } = pgClients;
 
 const rclient = getRedis();
@@ -84,31 +82,6 @@ export default async function plugin(fastify) {
         }
     });
 
-    fastify.addHook('onListen', async () => {
-        return; // temporary moved to product/rent
-        // insert document templates to db (print API)
-        const printTemplateList = getTemplatePath('print');
-        printTemplateList.filter(el => el[2] === 'json').map((el) => {
-            const settings = JSON.parse(readFileSync(el[1]) || '{}');
-            const htmlPath = printTemplateList.find(item => item[0] === el[0] && ['hbs', 'html'].includes(item[2]))?.[1];
-            const html = htmlPath ? readFileSync(htmlPath, 'utf-8') : null;
-            Object.assign(settings, { html });
-            printTemplates[el[0]] = settings;
-        });
-        if (client?.pk?.['admin.templates']) {
-            const arr = Object.keys(printTemplates || {}).map(el => ({ name: el, ...printTemplates?.[el] || {} })).filter(el => el.name && el.route && el.html);
-
-            const { rowsCount = 0 } = await pgClients.client.query(`delete from admin.templates where not (name=any($1::text[])) and type = 'demo'`, [arr.map(el => el.name)]);
-            console.log('delete deprecated templates', 'ok', rowsCount);
-            const { rowsCount: empty = 0 } = await pgClients.client.query('delete from admin.templates where body is null');
-            console.log('delete empty templates', 'ok', empty);
-
-            const q = arr.map(el => `insert into admin.templates(name, route_id, title, type, body) values ('${el.name.replace(/'/g, "''")}', '${el.route.replace(/'/g, "''")}', '${(el.title || el.name).replace(/'/g, "''")}', 'demo', '${(el.html || '').replace(/'/g, "''")}') on conflict(name, type) do update set route_id=excluded.route_id, title=excluded.title`).join(';');
-            const res = await pgClients.client.query(q);
-            console.log('insert print templates', 'ok', (Array.isArray(res) ? res : [res]).length);
-        }
-    });
-
     fastify.addHook('onListen', async () => {
         const clsQuery = [];
         if (!client?.pk?.['admin.cls']) return;

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

@@ -1,136 +0,0 @@
-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/print/controllers/printTemplate.add.js

@@ -1,37 +0,0 @@
-import { pgClients, dataInsert } from '@opengis/fastify-table/utils.js';
-
-export default async function printTemplateAdd({
-    pg = pgClients.client, body = {}, user = {},
-}) {
-    if (!user?.uid) {
-        return { message: 'access restricted', status: 403 };
-    }
-
-    const { name, title, route, html } = body;
-
-    if (!name) {
-        return { message: 'not enough body params: name', status: 400 };
-    }
-
-    if (!html) {
-        return { message: 'not enough body params: html', status: 400 };
-    }
-
-    const id = await pg.query(`select template_id as id from admin.templates where $1 in (template_id, name)`, [name])
-        .then(el => el.rows?.[0]?.id);
-
-    if (id) {
-        return { message: 'access restricted: template exists', status: 403 };
-    }
-
-    const res = await dataInsert({
-        pg,
-        table: 'admin.templates',
-        data: { name, title, route_id: route, body: html, type: 'user' },
-        uid: user?.uid,
-    })
-
-    const data = res.rows?.[0];
-
-    return { id: data?.template_id, data };
-}

package/server/routes/print/controllers/printTemplate.delete.js

@@ -1,29 +0,0 @@
-import { pgClients, dataDelete } from '@opengis/fastify-table/utils.js';
-
-export default async function printTemplateDelete({
-    pg = pgClients.client, params = {}, user = {},
-}) {
-    if (!user?.uid) {
-        return { message: 'access restricted', status: 403 };
-    }
-
-    const { id, type } = await pg.query(`select template_id as id, type from admin.templates where enabled and $1 in (template_id, name)`, [params.id])
-        .then(el => el.rows?.[0] || {});
-
-    if (!id) {
-        return { message: 'template not found', status: 404 };
-    }
-
-    if (type === 'demo') {
-        return { message: 'access restricted: demo', status: 403 };
-    }
-
-    const res = await dataDelete({
-        pg,
-        table: 'admin.templates',
-        id,
-        uid: user?.uid,
-    });
-
-    return { id: res?.template_id, data: res };
-}

package/server/routes/print/controllers/printTemplate.edit.js

@@ -1,42 +0,0 @@
-import { pgClients, dataInsert } from '@opengis/fastify-table/utils.js';
-
-export default async function printTemplateEdit({
-    pg = pgClients.client, params = {}, body = {}, user = {},
-}) {
-    if (!user?.uid) {
-        return { message: 'access restricted', status: 403 };
-    }
-
-    if (!params?.id) {
-        return { message: 'not enough params: id', status: 400 };
-    }
-
-    const { html, route, title } = body;
-
-    if (!html) {
-        return { message: 'not enough body params: html', status: 400 };
-    }
-
-    const { id, name } = await pg.query(`select template_id as id, name from admin.templates where $1 in (template_id, name)`, [params.id])
-        .then(el => el.rows?.[0] || {});
-
-    if (!id) {
-        return { message: 'template not found', status: 404 };
-    }
-
-    await pg.query(`delete from admin.templates where $1 in (template_id, name)`, [id]);
-
-    const data = { name, body: html, type: 'user' };
-    if (title) Object.assign(data, { title });
-    if (route) Object.assign(data, { route_id: route });
-
-    const res = await dataInsert({
-        pg,
-        table: 'admin.templates',
-        id,
-        data,
-        uid: user?.uid,
-    });
-
-    return { id: res.rows?.[0]?.template_id, data: res.rows?.[0] };
-}

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

@@ -1,67 +0,0 @@
-import { createHash } from 'node:crypto';
-
-import { config, getFilterSQL, getTemplate, handlebars, pgClients } from '@opengis/fastify-table/utils.js';
-import { grpc } from '@opengis/fastify-file/utils.js';
-
-const { htmlToPdf } = grpc();
-
-export default async function printTemplate(req, reply) {
-    const {
-        pg = pgClients.client,
-        params = {},
-        query = {},
-    } = req;
-
-    if (!params?.name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-
-    if (!params?.id) {
-        return { message: 'not enough params: id', status: 400 };
-    }
-
-    const { id, route, body = '' } = await pg.query(`select template_id as id, body, route_id as route from admin.templates where $1 in (template_id,name)`, [params.name])
-        .then(el => el.rows?.[0] || {});
-
-    if (!id) {
-        return reply.status(404).send('template not found');
-    }
-
-    /* -- params.name === document template -- */
-    const format = query.format || (config.debug ? 'html' : 'pdf');
-
-    const hash = createHash('md5')
-        .update([params?.name, params?.id].join())
-        .digest('hex');
-
-    const headers = format === 'pdf'
-        ? { 'Content-Disposition': `inline; filename=${hash}.pdf`, 'Content-Type': 'application/pdf' }
-        : { 'Content-Type': 'text/html; charset=utf-8' };
-
-    const table = await pg.query(`select alias from admin.routes where route_id=$1`, [route])
-        .then(el => el.rows?.[0]?.alias);
-
-    if (!table) {
-        return { message: 'route table not found', status: 404 };
-    }
-
-    const loadTable = await getTemplate('table', table);
-    const { optimizedSQL } = await getFilterSQL({ table, pg });
-
-    const where = `${loadTable?.key || pg.pk?.[loadTable?.table || table]}=any($1::text[])`;
-
-    const q = `select * from (${optimizedSQL})q where ${loadTable?.query || '1=1'} and ${where}`;
-
-    const { rows = [] } = await pg.query(q, [params.id.split(',')]);
-
-    const htmls = await Promise.all(rows.map(async (row) => handlebars.compile(body)(row)));
-    const html = htmls.join('<p style="page-break-after: always;">&nbsp;</p>');
-
-    if (format == 'html') {
-        return reply.headers(headers).send(html);
-    }
-
-    const result = await htmlToPdf({ html });
-    const buffer = Buffer.from(result.result, 'base64');
-    return reply.headers(headers).send(buffer);
-}

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

@@ -1,20 +0,0 @@
-import { pgClients } from "@opengis/fastify-table/utils.js";
-
-const maxLimit = 100;
-
-export default async function printTemplateList({
-    pg = pgClients.client, query = {},
-}) {
-    const { page = 1 } = query;
-
-    const limit = Math.min(maxLimit, +(query.limit || 20));
-
-    const offset = page && page > 0 ? (page - 1) * limit : '0';
-
-    const q = `select template_id as id, name, title, route_id as route, type from admin.templates
-    where enabled limit ${limit} offset ${offset}`;
-
-    const { rows = [] } = pg.pk?.['admin.templates'] ? await pg.query(q) : {};
-
-    return { page, limit, rows };
-}

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

@@ -1,87 +0,0 @@
-import { createHash } from 'node:crypto';
-
-import { config, getFilterSQL, getTemplate, handlebars, pgClients, getMeta } from '@opengis/fastify-table/utils.js';
-import { grpc } from '@opengis/fastify-file/utils.js';
-
-const { htmlToPdf } = grpc();
-
-export default async function printTemplate(req, reply) {
-    const {
-        pg = pgClients.client,
-        params = {},
-        query = {},
-    } = req;
-
-    if (!params?.name) {
-        return reply.status(404).send('not enough params: name');
-    }
-
-    const { id, name, title, body = '', route } = await pg.query(`select template_id as id, name, title, body, route_id as route from admin.templates where $1 in (template_id,name)`, [params.name])
-        .then(el => el.rows?.[0] || {});
-
-    if (!id) {
-        return reply.status(404).send('template not found');
-    }
-
-    /* -- params.name === document template -- */
-    const format = query.format || (config.debug ? 'html' : 'pdf');
-
-    const hash = createHash('md5')
-        .update([query?.preview, query?.demo, params?.name].join())
-        .digest('hex');
-
-    const headers = format === 'pdf'
-        ? { 'Content-Disposition': `inline; filename=${hash}.pdf`, 'Content-Type': 'application/pdf' }
-        : { 'Content-Type': 'text/html; charset=utf-8' };
-
-    if (query?.preview) {
-        const matches = body?.match?.(/{{(?!\!)([^}]*)}}/g) || [];
-        const preview = `<style> #toggle { background: yellow; } </style>`
-            + matches.reduce((acc, curr) => acc.replace(curr, curr.replace(/{{(?!\!)([^}]*)}}/g, `<div id="toggle">${curr.replace(/{/g, '%7B').replace(/}/g, '%7D')}</div>`)), body);
-
-        const html = await handlebars.compile(preview)({});
-
-        if (format == 'html') {
-            return reply.headers(headers).send(html.replace(/%7B/g, '{').replace(/%7D/g, '}'));
-        }
-
-        const result = await htmlToPdf({ html: html.replace(/%7B/g, '{').replace(/%7D/g, '}') });
-        const buffer = Buffer.from(result.result, 'base64');
-        return reply.headers(headers).send(buffer);
-    }
-
-    const { alias, table } = await pg.query(`select alias, table_name as table from admin.routes where route_id=$1`, [route])
-        .then(el => el.rows?.[0] || {});
-
-    if (!alias || !table) {
-        return reply.status(404).send('route table not found');
-    }
-
-    if (query?.demo) {
-        const loadTable = await getTemplate('table', alias);
-        const { optimizedSQL } = await getFilterSQL({ pg, table: alias });
-
-        if (!optimizedSQL) {
-            return reply.status(400).send('empty query');
-        }
-
-        const q = `select * from (${optimizedSQL})q where ${loadTable?.query || '1=1'} limit 1`;
-
-        const obj = await pg.query(q).then(el => el.rows?.[0] || {});
-
-        const html = await handlebars.compile(body)(obj);
-
-        if (format == 'html') {
-            return reply.headers(headers).send(html);
-        }
-
-        const result = await htmlToPdf({ html });
-        const buffer = Buffer.from(result.result, 'base64');
-        return reply.headers(headers).send(buffer);
-    }
-
-    const meta = await getMeta({ pg, table });
-    const columns = meta.columns?.map(el => ({ name: el.name, title: el.title, type: pg.pgType[el.dataTypeID] || 'text' }));
-    // for body edit
-    return { name, title, html: body, route, alias, table, columns };
-}

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

@@ -1 +0,0 @@
-export default {}

package/server/routes/print/index.mjs

@@ -1,20 +0,0 @@
-import cardPrint from './controllers/cardPrint.js';
-import printTemplateAdd from './controllers/printTemplate.add.js';
-import printTemplateEdit from './controllers/printTemplate.edit.js';
-import printTemplateDelete from './controllers/printTemplate.delete.js';
-import printTemplate from './controllers/printTemplate.js';
-import printTemplatePreview from './controllers/printTemplatePreview.js';
-import printTemplateList from './controllers/printTemplateList.js';
-
-const policy = ['user'];
-
-// temporary moved to product/rent
-export default async function route(app) {
-  // app.get(`/card-print/:table/:id`, { config: { policy } }, cardPrint);
-  // app.get('/print-template/:name/:id', { config: { policy } }, printTemplate);
-  // app.get('/print-template/:name', { config: { policy } }, printTemplatePreview);
-  // app.get('/print-template', { config: { policy } }, printTemplateList);
-  // app.post('/print-template', { config: { policy } }, printTemplateAdd);
-  // app.put('/print-template/:id', { config: { policy } }, printTemplateEdit);
-  // app.delete('/print-template/:id', { config: { policy } }, printTemplateDelete);
-}

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

@@ -1,23 +0,0 @@
-import path from 'node:path';
-
-import { getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function reportList({
-    user = {},
-}) {
-    const arr = getTemplatePath('report');
-
-    const rows = await Promise.all(arr.map(async (el) => {
-        const loadTemplate = await getTemplate('report', el[0]);
-        const item = Array.isArray(loadTemplate) ? loadTemplate?.find?.(el => el[0].replace(path.extname(el[0]), '') === 'index')[1] : loadTemplate;
-        return {
-            name: el[0],
-            filters: item?.filters || [],
-            title: item?.title || el[0],
-            subtitle: item?.subtitle,
-            category: item?.category,
-            sql: user.user_type?.includes('admin') ? item?.sql : undefined,
-        };
-    }));
-    return { rows };
-}

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

@@ -1,142 +0,0 @@
-import path from 'node:path';
-
-import { pgClients, getTemplate, metaFormat } from '@opengis/fastify-table/utils.js';
-
-import getFilterQuery from '../utils/getFilterQuery.js';
-import { downloadFile, getExport, getMimeType } from '@opengis/fastify-file/utils.js';
-
-const maxLimit = 100;
-
-const matches = {
-    16: 'yes/no', // boolean
-    701: 'number', // double precision
-    1082: 'date', // date
-    1184: 'date', // timestamp w/ time zone
-    1114: 'date', // timestamp w/o time zone
-    1700: 'number', // numeric
-};
-
-export default async function tableData(req, reply) {
-    const {
-        pg = pgClients.client, params = {}, query = {}, user = {}, host, unittest,
-    } = req;
-
-    if (!params?.name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-
-    const body = await getTemplate('report', params.name);
-    const loadTemplate = Array.isArray(body) ? body?.find?.(el => el[0].replace(path.extname(el[0]), '') === 'index')?.[1] : body;
-
-    if (!loadTemplate?.sql && !loadTemplate?.table) {
-        return reply.status(404).send(`report not found: ${params.name}`);
-    }
-
-    if (loadTemplate?.table && !pg.pk?.[loadTemplate.table]) {
-        return reply.status(404).send(`table not found: ${loadTemplate.table}`);
-    }
-
-    if (Array.isArray(body)) {
-        loadTemplate.widgets = [];
-        body.filter(el => el[0].replace(path.extname(el[0]), '') !== 'index').forEach((el) => {
-            loadTemplate.widgets.push(el[1]);
-        });
-    }
-
-    const { title, subtitle, category, widgets = [], kpi, sql = `select * from ${loadTemplate.table} where ${loadTemplate.query || 'true'}`, 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 [orderby, ord] = (query.order || loadTemplate.orderby || '').replace(/ /, '-').split('-');
-
-    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 { fields = [] } = await pg.query(`select * from (${sql.replace(/{{uid}}/g, user?.uid)})q limit 0`);
-
-    const where = getFilterQuery({ pg, filter, fields, filterList: filters, searchColumns: meta.search, search: query.search });
-
-    const orderbyColumnExists = fields?.find?.(el => el.name === orderby);
-    const q = `select ${metaColumns || '*'} from (${sql.replace(/{{uid}}/g, user?.uid)})q where ${where || '1=1'} ${groupby ? `group by ${groupby}` : ''} ${orderby && orderbyColumnExists ? `order by ${orderby} ${['asc', 'desc'].includes(ord) ? ord : 'desc'} nulls last` : ''} limit ${limit} offset ${offset}`;
-
-    if (query.sql && user?.user_type?.includes('admin')) {
-        return q;
-    }
-
-    if (query.export) {
-        const resp = await getExport({
-            pg,
-            host,
-            unittest,
-            nocache: query.nocache,
-            tableSql: `select ${metaColumns || '*'} from (${sql.replace(/{{uid}}/g, user?.uid)})q where ${where || '1=1'}`,
-            sourceName: title || 'report',
-            columns: fields.map(({ name }) => ({ name, title: meta?.titles?.[name] || name })),
-            cls: meta?.cls,
-            format: ['xlsx', 'csv'].find(el => (req.query.format || 'xlsx') === el) || 'xlsx',
-            formatAnswer: 'filepath',
-        }, reply);
-        if (resp?.filePath) {
-            const buffer = await downloadFile(resp.filePath, { buffer: true });
-            const headers = {};
-            headers['Content-Type'] = `attachment; filename=${getMimeType(resp.filePath)}`;
-            headers['Content-Disposition'] = `attachment; filename=${path.basename(resp.filePath)}`;
-            return reply.status(200).headers(headers).send(buffer);
-        }
-        return resp;
-    }
-
-    const { total = 0, filtered = 0 } = await pg.queryCache(`select count(*), count(*) filter(where ${where || '1=1'}) as filtered from (${sql.replace(/{{uid}}/g, user?.uid)})q`, { table: loadTemplate.table })
-        .then(el => ({ total: el.rows?.[0]?.count, filtered: el.rows?.[0]?.filtered }));
-
-    if (kpi?.length) {
-        await Promise.all(kpi.map(async (el) => {
-            if (!el.sql && !el.table) {
-                Object.assign(el, { error: 'empty sql / table' });
-                return;
-            }
-
-            const sqlq = el.sql || `select ${el.agg || 'count(*)'} as value from ${el.table} where ${el.query || 'true'}`;
-            const { rows = [], fields = [] } = await pg.query(sqlq.replace(/{{uid}}/g, user?.uid)).catch(err => {
-                Object.assign(el, { error: err.toString() });
-            }) || {};
-            Object.assign(el, { count: rows?.[0]?.[fields[0].name] || 0, sql: user?.user_type === 'admin' ? sqlq.replace(/{{uid}}/g, user?.uid) : undefined });
-        }));
-    }
-
-    widgets?.forEach?.((el) => Object.assign(el, {
-        agg: user?.user_type === 'admin' ? el.agg : undefined,
-        sql: user?.user_type === 'admin' ? el.sql : undefined
-    }));
-
-    const { rows = [] } = await pg.query(q).catch(err => {
-        return reply.status(500).send('query error: ' + err.toString());
-    });
-
-    await metaFormat({ rows, cls: meta?.cls, sufix: false }, pg);
-
-    const columns = fields.map(el => ({
-        name: el.name,
-        title: meta?.titles?.[el.name] || el.name,
-        format: meta?.cls?.[el.name] ? 'select' : (matches[el.dataTypeID] || 'text'),
-        data: meta?.cls?.[el.name],
-    }));
-
-    return {
-        q: user?.user_type?.includes('admin') ? q : undefined,
-        total,
-        filtered,
-        kpi,
-        data: rows,
-        title,
-        subtitle,
-        category,
-        widgets,
-        columns,
-        filters,
-    };
-}

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

@@ -1,108 +0,0 @@
-import path from 'node:path';
-
-import { pgClients, getTemplate, metaFormat } from '@opengis/fastify-table/utils.js';
-
-const maxLimit = 100;
-
-const matches = {
-    16: 'yes/no', // boolean
-    701: 'number', // double precision
-    1082: 'date', // date
-    1184: 'date', // timestamp w/ time zone
-    1114: 'date', // timestamp w/o time zone
-    1700: 'number', // numeric
-};
-
-function normalizeData(widget, limit = maxLimit, offset = 0) {
-    const groupby = typeof widget.groupby === 'string'
-        ? { name: widget.groupby }
-        : (widget.groupby?.[0] || widget.groupby);
-
-    const agg = groupby.name
-        ? `${widget.granularity ? `date_trunc('${widget.granularity}', ${groupby.name})` : `${groupby.name}`}`
-        : 'count(*)';
-
-    const xCol = widget.granularity
-        ? `date_trunc('${widget.granularity}', ${groupby.name})`
-        : groupby.name;
-
-    const sql = `select * from ${widget.table} where ${widget.query || 'true'} limit ${limit} offset ${offset}`;
-
-    const q = `select ${agg} as ${groupby.name}, ${widget.agg} as metric from (${sql}) t 
-        ${groupby.name ? `group by ${xCol}` : ''}
-        ${widget.orderby || xCol ? `order by ${widget.orderby || xCol}` : ''}`;
-
-    return { groupby, agg, xCol, q };
-}
-
-export default async function widgetData({
-    pg = pgClients.client, params = {}, query = {}, user = {},
-}, reply) {
-    if (!params?.name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-
-    if (!params?.widget) {
-        return reply.status(400).send('not enough params: widget');
-    }
-
-    const body = await getTemplate('report', params.name);
-    const loadTemplate = Array.isArray(body) ? body?.find?.(el => el[0].replace(path.extname(el[0]), '') === 'index')?.[1] : body;
-
-    if (!loadTemplate) {
-        return reply.status(404).send(`report not found: ${params.name}`);
-    }
-
-    if (Array.isArray(body)) {
-        loadTemplate.widgets = [];
-        body.filter(el => el[0].replace(path.extname(el[0]), '') !== 'index').forEach((el) => {
-            loadTemplate.widgets.push(el[1]);
-        });
-    }
-
-    const { widgets = [] } = loadTemplate;
-
-    const widget = widgets.find(el => el.name === params.widget);
-
-    if (!widget) {
-        return reply.status(404).send(`widget not found: ${params.widget}`);
-    }
-
-    if (!widget.table || !pg.pk?.[widget.table]) {
-        return reply.status(404).send(`widget table not found: ${widget.table}`);
-    }
-
-    const { cls = {}, titles = {} } = widget.meta || {};
-
-    const limit = Math.min(query.limit || maxLimit, maxLimit);
-    const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-    const { groupby, q } = normalizeData(widget, limit, offset);
-
-    if (groupby.cls) {
-        Object.assign(cls, { [groupby.name]: groupby.cls });
-    }
-
-    if (query.sql) return q;
-
-    const { rows = [], fields = [] } = await pg.query(q).catch(err => {
-        Object.assign(widget, { error: err.toString() });
-    }) || {};
-    await metaFormat({ rows, cls, sufix: false }, pg);
-
-    const columns = fields.map(el => ({
-        name: el.name,
-        title: titles?.[el.name] || el.name,
-        format: cls?.[el.name] ? 'select' : (matches[el.dataTypeID] || 'text'),
-        data: cls?.[el.name],
-    }));
-
-    Object.assign(widget, {
-        source: rows,
-        columns,
-        agg: user?.user_type === 'admin' ? widget.agg : undefined,
-        sql: user?.user_type === 'admin' ? q : undefined,
-    });
-
-    return widget;
-}

package/server/routes/report/index.mjs

@@ -1,9 +0,0 @@
-import tableData from './controllers/tableData.js';
-import widgetData from './controllers/widgetData.js';
-import reportList from './controllers/list.js';
-
-export default async function route(app) {
-  app.get('/reports', {}, reportList);
-  app.get('/reports/:name', {}, tableData);
-  app.get('/reports/:name/:widget', {}, widgetData);
-}

package/server/routes/report/utils/formatValue.js

@@ -1,179 +0,0 @@
-const dateTypeList = ['date', 'timestamp', 'timestamp without time zone', 'timestamp with time zone'];
-const numberTypeList = ['float8', 'int4', 'int8', 'numeric', 'double precision', 'integer'];
-const isValidDate = (dateStr) => {
-  const [dd, mm, yyyy] = dateStr.split('.');
-  return new Date(mm + '/' + dd + '/' + yyyy).toString() !== 'Invalid Date';
-};
-
-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, filter = {}, name, value, operator = '=', dataTypeID, uid = 1, optimize,
-}) {
-  const { data, sql, extra } = filter;
-  const pk = false;
-
-  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);
-
-    if (!isValidDate(startDate) || !isValidDate(endDate)) {
-      return { op: 'between', query: 'false', extra };
-    }
-    const query = extra && pk
-      ? `${pk} in (select object_id from crm.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 matchNull = { null: 'is null', notnull: 'is not null' }[value];
-    const match = matchNull || ((operator1 === '=' || filterType === 'autocomplete') ? `='${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 ${filterType === 'autocomplete' ? 'id' : '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 ${filterType === 'autocomplete' ? 'id' : '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/report/utils/getFilterQuery.js

@@ -1,68 +0,0 @@
-/* eslint-disable no-continue */
-
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-import formatValue from './formatValue.js';
-
-export default function getFilterQuery({ pg = pgClients.client, filter: filterStr, fields, filterList, searchColumns, search }) {
-    if (!filterStr && !search) return null;
-
-    const mainOperators = ['=', '~', '>', '<'];
-
-    const filterQueryArray = decodeURIComponent(filterStr?.replace(/%/g, '%25').replace(/%/g, '\\%')?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/);
-
-    const resultList = [];
-    const searchwith = searchColumns || fields?.filter?.((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map?.((el) => el.name)?.join?.(',');
-
-    const sval = `ilike '%${decodeURIComponent(search?.replace(/%/g, '%25')).replace(/'/g, "''").replace(/%/g, '\\%')}%'`;
-    const searchQuery = search && searchwith ? ` (${searchwith.split(',')?.map((name) => `${name} ${sval}`).join(' or ')} )` : '';
-
-    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(',');
-
-        if (filter?.query) {
-            resultList.push({
-                name, value, query: filter?.query, operator: '=', filterType: filter.type, type: 'text',
-            });
-            continue;
-        }
-
-        // find field and skip not exists
-        const { dataTypeID } = fields?.find((el) => el.name === name) || {};
-
-        // format query
-        const {
-            op, query, filterType, fieldType,
-        } = formatValue({
-            pg,
-            filter,
-            name,
-            value,
-            operator,
-            dataTypeID,
-        }) || {};
-        if (!query) continue;
-
-        resultList.push({
-            name, value, query, operator: op, filterType, type: fieldType,
-        });
-    }
-
-    const where = [searchQuery].concat(resultList?.map?.(el => el.query) || []).filter(el => el).join(' and ');
-
-    return where;
-}
-