@opengis/admin 0.3.22 → 0.3.24

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

@@ -1,29 +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 };
-}
+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 +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] };
-}
+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 +1,67 @@
-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);
-}
+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 +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 };
+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 +1,87 @@
-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 };
-}
+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/index.mjs

@@ -1,19 +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`, { 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);
-}
+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`, { 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

@@ -1,31 +1,31 @@
-const table = 'admin.properties';
-
-import { pgClients, getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
-
-
-
-export default async function getSettingsApp({
-  pg = pgClients.client,
-}) {
-  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 cache = await redis.get(keyCache);
-
-  if (cache && !config?.local) {
-    return JSON.parse(cache);
-  }*/
-
-  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 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 };
-}
+const table = 'admin.properties';
+
+import { pgClients, getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
+
+
+
+export default async function getSettingsApp({
+  pg = pgClients.client,
+}) {
+  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 cache = await redis.get(keyCache);
+
+  if (cache && !config?.local) {
+    return JSON.parse(cache);
+  }*/
+
+  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 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 };
+}