@opengis/admin 0.3.24 → 0.3.25

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 };
+}

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

@@ -1,120 +1,120 @@
-import { pgClients, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
-
-import getColumnMetaData from '../utils/getColumnMetaData.js';
-
-/**
- *
- * @method GET
- * @priority 4
- * @alias getSettingsTable
- * @type api
- * @tag custom
-
- * @returns {String} message and status
- */
-
-export default async function getSettingsTable({
-  pg = pgClients.client, params = {}, user = {}, query = {},
-}) {
-  const { table, entity } = params;
-  const { uid } = user;
-  const time = [];
-
-  if (!uid) {
-    return { message: 'access restricted', status: 401 };
-  }
-
-  if (!table) {
-    return { message: 'not enough params: table', status: 400 };
-  }
-
-  const loadTable = await getTemplate('table', table);
-
-  const tableName = loadTable?.table || table;
-  const meta = await getMeta({ pg, table: tableName });
-  const { view, pk } = meta || {};
-  time.push(Date.now());
-
-  if (!pk && !view) {
-    return {
-      message: `table primary key not found: ${tableName}`,
-      status: 400,
-    };
-  }
-
-  const { rows: geometry } = meta?.geom
-    ? await pg.queryCache(`select st_geometrytype(${meta?.geom}) as type ,count(*) 
-    from ${tableName} group by st_geometrytype(${meta?.geom})`, { table: tableName }) : [];
-  time.push(Date.now());
-
-  const stat = !view ? await getColumnMetaData({ pg, table: tableName }) : {};
-  time.push(Date.now());
-
-  const { total = 0 } = await pg.queryCache(`select count(*) as total from ${tableName}`, { table: tableName })
-    .then(el => el.rows?.[0] || {});
-  time.push(Date.now());
-
-  const { property_json: customColumns = [] } = await pg.query(`select property_json::json from setting.property 
-  where property_entity='customColumn' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  const { property_json: tableSettingColumns } = await pg.query(`select property_json::json from setting.property 
-  where property_entity='column' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  const columns = (tableSettingColumns || loadTable?.columns || meta?.columns)?.map((el) => ({ ...el, title: el.title || el.name }))
-    ?.filter((value, index, array) => array?.map((el) => el.name).indexOf(value.name) === index); // get unique columns
-
-  const cls = columns?.filter((el) => ['badge', 'select'].includes(el.format) && (el.option || el.data))
-    ?.map((el) => (el.option || el.data))
-    ?.filter((value, index, array) => array.indexOf(value) === index); // get unique cls
-
-  const { property_json: userFilterList } = await pg.query(`select property_json::json from setting.property
-    where property_entity='filter' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  const { property_json: customQuery } = await pg.query(`select json_agg(json_build_object('id',property_id,'name', property_key,
-  'query', property_text, 'disabled', coalesce((property_json::json->>'disabled')::boolean,false) )) as property_json
-  from setting.property where 1=1 and property_entity='customQuery' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
-
-  time.push(Date.now());
-
-  const debug = user?.user_type?.includes('admin') && query?.debug
-    ? {
-      view,
-      tableName,
-      opt,
-      colModel,
-      metaColumns: meta?.columns,
-      columnProperties: tableSettingColumns,
-    }
-    : undefined;
-
-  const res = {
-    message: {
-      time: {
-        geom: time[1] - time[0],
-        stat: time[2] - time[1],
-        count: time[3] - time[2],
-        total: time[4] - time[0],
-      },
-      debug,
-      model: tableName,
-      total,
-      geometry,
-      stat,
-      cls,
-      columns,
-      filters: userFilterList?.length
-        ? userFilterList
-        : loadTable?.filters?.map((el) => ({ ...el, title: el.title || el.ua })),
-      customQuery: customQuery?.length ? customQuery : [],
-      customColumns,
-      customFilters: userFilterList || [],
-    },
-    status: 200,
-  };
-
-  if (entity) {
-    return { [entity]: res.message[entity] };
-  }
-
-  return res;
-};
+import { pgClients, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
+
+import getColumnMetaData from '../utils/getColumnMetaData.js';
+
+/**
+ *
+ * @method GET
+ * @priority 4
+ * @alias getSettingsTable
+ * @type api
+ * @tag custom
+
+ * @returns {String} message and status
+ */
+
+export default async function getSettingsTable({
+  pg = pgClients.client, params = {}, user = {}, query = {},
+}) {
+  const { table, entity } = params;
+  const { uid } = user;
+  const time = [];
+
+  if (!uid) {
+    return { message: 'access restricted', status: 401 };
+  }
+
+  if (!table) {
+    return { message: 'not enough params: table', status: 400 };
+  }
+
+  const loadTable = await getTemplate('table', table);
+
+  const tableName = loadTable?.table || table;
+  const meta = await getMeta({ pg, table: tableName });
+  const { view, pk } = meta || {};
+  time.push(Date.now());
+
+  if (!pk && !view) {
+    return {
+      message: `table primary key not found: ${tableName}`,
+      status: 400,
+    };
+  }
+
+  const { rows: geometry } = meta?.geom
+    ? await pg.queryCache(`select st_geometrytype(${meta?.geom}) as type ,count(*) 
+    from ${tableName} group by st_geometrytype(${meta?.geom})`, { table: tableName }) : [];
+  time.push(Date.now());
+
+  const stat = !view ? await getColumnMetaData({ pg, table: tableName }) : {};
+  time.push(Date.now());
+
+  const { total = 0 } = await pg.queryCache(`select count(*) as total from ${tableName}`, { table: tableName })
+    .then(el => el.rows?.[0] || {});
+  time.push(Date.now());
+
+  const { property_json: customColumns = [] } = await pg.query(`select property_json::json from setting.property 
+  where property_entity='customColumn' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
+
+  const { property_json: tableSettingColumns } = await pg.query(`select property_json::json from setting.property 
+  where property_entity='column' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
+
+  const columns = (tableSettingColumns || loadTable?.columns || meta?.columns)?.map((el) => ({ ...el, title: el.title || el.name }))
+    ?.filter((value, index, array) => array?.map((el) => el.name).indexOf(value.name) === index); // get unique columns
+
+  const cls = columns?.filter((el) => ['badge', 'select'].includes(el.format) && (el.option || el.data))
+    ?.map((el) => (el.option || el.data))
+    ?.filter((value, index, array) => array.indexOf(value) === index); // get unique cls
+
+  const { property_json: userFilterList } = await pg.query(`select property_json::json from setting.property
+    where property_entity='filter' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
+
+  const { property_json: customQuery } = await pg.query(`select json_agg(json_build_object('id',property_id,'name', property_key,
+  'query', property_text, 'disabled', coalesce((property_json::json->>'disabled')::boolean,false) )) as property_json
+  from setting.property where 1=1 and property_entity='customQuery' and object_id=$1`, [table]).then(el => el.rows?.[0] || {});
+
+  time.push(Date.now());
+
+  const debug = user?.user_type?.includes('admin') && query?.debug
+    ? {
+      view,
+      tableName,
+      opt,
+      colModel,
+      metaColumns: meta?.columns,
+      columnProperties: tableSettingColumns,
+    }
+    : undefined;
+
+  const res = {
+    message: {
+      time: {
+        geom: time[1] - time[0],
+        stat: time[2] - time[1],
+        count: time[3] - time[2],
+        total: time[4] - time[0],
+      },
+      debug,
+      model: tableName,
+      total,
+      geometry,
+      stat,
+      cls,
+      columns,
+      filters: userFilterList?.length
+        ? userFilterList
+        : loadTable?.filters?.map((el) => ({ ...el, title: el.title || el.ua })),
+      customQuery: customQuery?.length ? customQuery : [],
+      customColumns,
+      customFilters: userFilterList || [],
+    },
+    status: 200,
+  };
+
+  if (entity) {
+    return { [entity]: res.message[entity] };
+  }
+
+  return res;
+};