@opengis/admin 0.2.121 → 0.2.123

package/module/settings/card/admin.users.table/index.yml

@@ -1,5 +1,8 @@
 component: default
 isHeaderEditButton: false
+meta: { 
+  title: full_name 
+}
 
 panels:
   - type: vertical-tabs # tabs

package/module/settings/menu.json

@@ -39,26 +39,34 @@
     "icon": "IconSettingsCog",
     "menu": [
       {
-        "path": "admin.user-cls",
-        "ua": "Довідники ",
-        "component": "user-cls-page"
-      },
-      {
-        "path": "admin.properties",
-        "table": "admin.properties.table",
+        "path": "admin.settings",
+        "component": "admin-properties-page" , 
         "ua": "Налаштування",
         "en": "Settings"
       },
       {
-        "path": "admin.table_settings",
-        "ua": "Налаштування таблиць",
+        "path": "admin.templates",
+        "ua": "Друк ",
+        "component": "template-print-page"
+      },
+     {
+        "path": "admin.interfaces",
+        "ua": "Таблиці",
         "component": "table-settings-page"
       },
       {
-        "path": "admin.admin_properties",
-        "ua": "Налаштування адміна",
-        "component": "admin-properties-page"
-      }
+        "path": "admin.user-cls",
+        "ua": "Довідники ",
+        "component": "user-cls-page"
+      },
+      {
+        "path": "admin.reports",
+        "ua": "Звіти  ",
+        "component": "reports-page"
+      },
+       { "path": "admin.admin_properties",
+        "ua": "Налаштування адміна", 
+         "table": "admin.properties.table"}
     ]
   }
 ]

package/{server/templates → module/settings}/setting/test.json

@@ -1,6 +1,6 @@
-{
-    "admin.title": {
-        "type": "Text",
-        "ua": "Назва"
-    }
+{
+    "admin.title": {
+        "type": "Text",
+        "ua": "Назва"
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.2.121",
+  "version": "0.2.123",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -48,9 +48,9 @@
     "@fullcalendar/vue3": "^6.1.15",
     "@opengis/fastify-auth": "^1.0.70",
     "@opengis/fastify-file": "^1.0.42",
-    "@opengis/fastify-table": "^1.2.8",
+    "@opengis/fastify-table": "^1.2.11",
     "@opengis/v3-core": "^0.3.45",
-    "@opengis/v3-filter": "^0.0.68",
+    "@opengis/v3-filter": "^0.0.71",
     "@tabler/icons-vue": "^3.28.1",
     "@tiptap/core": "^2.8.0",
     "@tiptap/extension-color": "^2.8.0",
@@ -94,6 +94,6 @@
     "vitepress": "^1.1.3",
     "vitepress-plugin-mermaid": "^2.0.16",
     "vitepress-plugin-tabs": "^0.5.0",
-    "vitepress-sidebar": "^1.22.0"
+    "vitepress-sidebar": "1.30.2"
   }
 }

package/server/plugins/hook.js

@@ -83,10 +83,22 @@ export default async function plugin(fastify) {
         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']) {
-            console.log('insert into admin.templates', printTemplateList); // test!
+            const arr = Object.keys(printTemplates || {}).map(el => ({ name: el, ...printTemplates?.[el] || {} }));
+
+            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.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);
         }
     });
 

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

@@ -1,4 +1,4 @@
-import { getTemplate, getMeta, handlebarsSync } from "@opengis/fastify-table/utils.js";
+import { getTemplate, getMeta, handlebarsSync, autoIndex, logger } from "@opengis/fastify-table/utils.js";
 
 export default async function tableFilter(req) {
     const time = Date.now();
@@ -31,6 +31,13 @@ export default async function tableFilter(req) {
     const { rows: properties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column where entity=$1 and uid=$2 and filter`, [params.name, uid]);
     properties.forEach((row) => filters.push({ id: row.name, name: row.name, ua: row.title, type: row.format, data: row.data }));
 
+
+    autoIndex({ table: loadTable.table, columns: filters.filter((el) => columns?.find?.((item) => item?.name === el.name)) })
+        .catch(err => {
+            logger.file('autoindex/error', { name: params?.name, error: err.toString(), stack: err.stack });
+        });
+
+
     await Promise.all(filters.filter((el) => el.data).map(async (el) => {
 
         const cls = await getTemplate(['cls', 'select'], el.data);

package/server/routes/menu/controllers/getMenu.js

@@ -1,6 +1,6 @@
 
 import { join } from 'path';
-import { userTemplateDir, config, getAccess, pgClients } from '@opengis/fastify-table/utils.js';
+import { userTemplateDir, config, pgClients } from '@opengis/fastify-table/utils.js';
 
 import { existsSync, readdirSync, readFileSync } from 'fs';
 const menuCache = [];
@@ -38,8 +38,14 @@ export default async function adminMenu({ user = {}, session, pg = pgClients.cli
 
     if (session && user?.uid && !config.local && !config.admin && !user.user_type?.includes?.('admin') && !user.type?.includes?.('admin') && pg.pk['admin.role_access']) {
         const { type, gl = [], routes = [] } = await pg.query(`select user_type as type, b.gl,routes from admin.users a
-        left join lateral ( select array_agg(role_id) as gl from admin.user_roles where user_uid=a.uid)b on 1=1
-        left join lateral ( select array_agg(route_id) as routes from admin.role_access where role_id=any(b.gl))r on 1=1
+        left join lateral (
+            select array_agg(role_id) as gl from admin.user_roles 
+            where   user_uid=a.uid 
+            and     role_id in ( select role_id from admin.roles where enabled)
+        )b on 1=1
+        left join lateral (
+            select array_agg(route_id) as routes from admin.role_access where role_id=any(b.gl)
+        )r on 1=1
         where uid=$1`, [user.uid]).then(el => el.rows[0] || {});
         /* const { interfaces = [] } = await pg.query(`select array_agg(route_id) as interfaces from admin.role_access
         where user_uid=$1 or role_id=any($2::text[])`, [user.uid, gl]).then((res) => res.rows?.[0] || {}); */

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

@@ -0,0 +1,37 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,42 @@
+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

@@ -3,8 +3,6 @@ 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';
 
-import printTemplates from './printTemplates.js';
-
 const { htmlToPdf } = grpc();
 
 export default async function printTemplate(req, reply) {
@@ -12,110 +10,57 @@ export default async function printTemplate(req, reply) {
         pg = pgClients.client,
         params = {},
         query = {},
-        user = {},
     } = req;
 
     if (!params?.name) {
         return { message: 'not enough params: name', status: 400 };
     }
 
-    const printBody = await getTemplate('print', params.name);
-
-    /* -- params.name === interface -- */
-    if (!printBody?.route) {
-        const where = user?.user_type?.includes('admin')
-            ? '1=1'
-            : `coalesce(b.user_uid, d.user_uid)='${user?.uid?.replace(/'/g, "''")}'::text`;
-
-        const { route_id: routeId, alias } = await pg.query(`select a.route_id, alias
-        from admin.routes a 
-        left join admin.role_access b on 
-            a.route_id=b.route_id
-        left join admin.roles c on 
-            b.role_id=c.role_id 
-            and c.enabled
-        left join admin.user_roles d on 
-            c.role_id=d.role_id 
-            and ( case when 
-                    d.expiration is not null 
-                    then d.expiration > CURRENT_DATE 
-                    else 1=1 
-                end )
-        where $1 in (a.route_id, a.alias, a.table_name) and ${where}`, [params.name])
-            .then(el => el.rows?.[0] || {});
-
-        if (!routeId || !alias) {
-            return { message: `access restricted: route (${params.name}/${routeId})`, status: 403 };
-        }
-
-        const rows = Object.keys(printTemplates)
-            .filter(key => printTemplates[key]?.route === routeId)
-            .map(key => ({ key, title: printTemplates[key]?.title }));
-
-        return { rows };
+    if (!params?.id) {
+        return { message: 'not enough params: id', status: 400 };
     }
 
-    if (!query.preview && !query?.demo && !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([query?.preview, query?.demo, params?.name, params?.id].join())
+        .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 pt = printBody?.hbs || printBody?.html;
-
-    if (query?.preview) {
-        const matches = pt.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>`)), pt);
-
-        const html = await handlebars.compile(preview)({});
+    const table = await pg.query(`select alias from admin.routes where route_id=$1`, [route])
+        .then(el => el.rows?.[0]?.alias);
 
-        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);
+    if (!table) {
+        return { message: 'route table not found', status: 404 };
     }
 
-    if (query?.demo || params?.id) {
-        const table = await pg.query(`select alias from admin.routes where route_id=$1`, [printBody.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 loadTable = await getTemplate('table', table);
+    const { optimizedSQL } = await getFilterSQL({ table, pg });
 
-        const where = query.demo
-            ? ' 1=1 limit 1'
-            : `${loadTable?.key || pg.pk?.[loadTable?.table || table]}=$1`;
+    const where = `${loadTable?.key || pg.pk?.[loadTable?.table || table]}=$1`;
 
-        const q = `select * from (${optimizedSQL})q where ${loadTable?.query || '1=1'} and ${where}`;
+    const q = `select * from (${optimizedSQL})q where ${loadTable?.query || '1=1'} and ${where}`;
 
-        const obj = await pg.query(q, [params.id].filter(el => el && !query.demo))
-            .then(el => el.rows?.[0] || {});
+    const obj = await pg.query(q, [params.id]).then(el => el.rows?.[0] || {});
 
-        const html = await handlebars.compile(pt)(obj);
+    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);
+    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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,81 @@
+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 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);
+    }
+
+    if (query?.demo) {
+        const table = await pg.query(`select alias from admin.routes where route_id=$1`, [route])
+            .then(el => el.rows?.[0]?.alias);
+
+        if (!table) {
+            return reply.status(404).send('route table not found');
+        }
+
+        const loadTable = await getTemplate('table', table);
+        const { optimizedSQL } = await getFilterSQL({ table, pg });
+
+        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);
+    }
+
+    // for body edit
+    return { name, title, html: body, route };
+}

package/server/routes/print/index.mjs

@@ -1,7 +1,19 @@
 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'];
 
 export default async function route(app) {
-  app.get(`/card-print/:table/:id`, cardPrint);
-  app.get('/print-template/:name/:id?', printTemplate);
+  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/properties/controllers/admin.properties.get.js

@@ -9,16 +9,17 @@ const redis = getRedis();
 export default async function getSettingsApp({
   pg = pgClients.client, params = {}, query = {},
 }) {
+  const time = Date.now();
   if (!pg.pk?.[table]) {
     return { message: 'table not found', status: 404 };
   }
 
-  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:${table}`;
+  /*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 settings = await getSettings({
     pg, key: params.key, json: query.json, redis, table,
@@ -28,5 +29,5 @@ export default async function getSettingsApp({
     .map(async (el) => ({ name: el[0], body: await getTemplate('setting', el[0]) }))
   );
 
-  return { message: { forms, settings }, status: 200 };
+  return { message: { time: Date.now() - time, forms, settings }, status: 200 };
 }

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

@@ -3,9 +3,9 @@ const table = 'admin.properties';
 import { setSettings } from '../../../../utils.js';
 
 export default async function postSettingsApp({
-  pg, session = {}, body = {},
+  pg, user = {}, body = {},
 }) {
-  if (session.passport?.user?.user_type !== 'superadmin') {
+  if (!user?.user_type?.includes?.('admin')) {
     return { message: 'access restricted', status: 403 };
   }
   const { key, val } = body;

package/server/routes/properties/index.mjs

@@ -11,7 +11,7 @@ import { propertiesSchema } from './schema.js';
 
 export default async function route(fastify) {
   fastify.get('/settings-app/:key?', { scheme: propertiesSchema }, getSettingsApp);
-  fastify.post('/settings-app', { config: { policy: ['superadmin'] } }, postSettingsApp);
+  fastify.post('/settings-app', { config: { policy: ['admin'] } }, postSettingsApp);
 
   fastify.get('/settings-user/:key?', { scheme: propertiesSchema }, getSettingsUser);
   fastify.post('/settings-user', {}, postSettingsUser);