@opengis/admin 0.2.130 → 0.2.132

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

@@ -48,13 +48,14 @@ export default async function printTemplate(req, reply) {
     const loadTable = await getTemplate('table', table);
     const { optimizedSQL } = await getFilterSQL({ table, pg });
 
-    const where = `${loadTable?.key || pg.pk?.[loadTable?.table || table]}=$1`;
+    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 obj = await pg.query(q, [params.id]).then(el => el.rows?.[0] || {});
+    const { rows = [] } = await pg.query(q, [params.id.split(',')]);
 
-    const html = await handlebars.compile(body)(obj);
+    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);

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

@@ -1,6 +1,6 @@
 import { createHash } from 'node:crypto';
 
-import { config, getFilterSQL, getTemplate, handlebars, pgClients } from '@opengis/fastify-table/utils.js';
+import { config, getFilterSQL, getTemplate, handlebars, pgClients, getMeta } from '@opengis/fastify-table/utils.js';
 import { grpc } from '@opengis/fastify-file/utils.js';
 
 const { htmlToPdf } = grpc();
@@ -50,17 +50,21 @@ export default async function printTemplate(req, reply) {
         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 table = await pg.query(`select alias from admin.routes where route_id=$1`, [route])
-            .then(el => el.rows?.[0]?.alias);
+        const loadTable = await getTemplate('table', alias);
+        const { optimizedSQL } = await getFilterSQL({ pg, table: alias });
 
-        if (!table) {
-            return reply.status(404).send('route table not found');
+        if (!optimizedSQL) {
+            return reply.status(400).send('empty query');
         }
 
-        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] || {});
@@ -76,6 +80,8 @@ export default async function printTemplate(req, reply) {
         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 };
+    return { name, title, html: body, route, alias, table, columns };
 }

package/server/routes/properties/funcs/getSettings.js

@@ -1,56 +1,56 @@
-import { getMeta } from '@opengis/fastify-table/utils.js';
-
-const match = {
-  property_key: 'key',
-  property_json: 'json',
-  property_int: 'int',
-  property_text: 'text',
-};
-
-function getQuery({
-  table, columns = [], key, uid,
-}) {
-  const columnList = columns?.filter((el) => match[el?.name]).map((el) => el?.name).map((el) => `${el} as ${match[el]}`);
-  const sql = `select ${columnList.join(',')} from ${table} where 1=1`;
-
-  if (table === 'admin.user_properties') {
-    const args = [uid, key].filter((el) => el);
-    const q = sql + (uid ? ' and uid=$1' : '') + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
-    return { q, args };
-  }
-  const args = [key].filter((el) => el);
-  const q = sql + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
-  return { q, args };
-}
-
-export default async function getSettings({
-  pg, redis, json, key, table = 'admin.properties', uid,
-}) {
-  const { columns = [] } = await getMeta({ table });
-
-  const { q, args } = getQuery({
-    table, columns, key, uid,
-  });
-
-  const { rows } = await pg.query(q, args);
-  const data = rows?.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  
-  const jsonData = Object.keys(data || {}).reduce((acc, curr) => {
-    const [ckey, csubkey] = curr.split('.');
-    if (!csubkey) return Object.assign(acc, { [curr]: data[curr] });
-    if (!acc[ckey]) Object.assign(acc, { [ckey]: {} });
-    Object.assign(acc[ckey], { [csubkey]: data[curr] });
-    return acc;
-  }, {});
-
-  // save both
-  if (redis) {
-    const keyCacheJSON = `${pg.options?.database}:settings:${key || 'all'}:json:${table}`;
-    await redis.set(keyCacheJSON, JSON.stringify(jsonData));
-
-    const keyCachePlain = `${pg.options?.database}:settings:${key || 'all'}:plain:${table}`;
-    await redis.set(keyCachePlain, JSON.stringify(data));
-  }
-
-  return json ? jsonData : data;
-}
+import { getMeta } from '@opengis/fastify-table/utils.js';
+
+const match = {
+  property_key: 'key',
+  property_json: 'json',
+  property_int: 'int',
+  property_text: 'text',
+};
+
+function getQuery({
+  table, columns = [], key, uid,
+}) {
+  const columnList = columns?.filter((el) => match[el?.name]).map((el) => el?.name).map((el) => `${el} as ${match[el]}`);
+  const sql = `select ${columnList.join(',')} from ${table} where 1=1`;
+
+  if (table === 'admin.user_properties') {
+    const args = [uid, key].filter((el) => el);
+    const q = sql + (uid ? ' and uid=$1' : '') + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
+    return { q, args };
+  }
+  const args = [key].filter((el) => el);
+  const q = sql + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
+  return { q, args };
+}
+
+export default async function getSettings({
+  pg, redis, json, key, table = 'admin.properties', uid,
+}) {
+  const { columns = [] } = await getMeta({ table });
+
+  const { q, args } = getQuery({
+    table, columns, key, uid,
+  });
+
+  const { rows } = await pg.query(q, args);
+  const data = rows?.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+  
+  const jsonData = Object.keys(data || {}).reduce((acc, curr) => {
+    const [ckey, csubkey] = curr.split('.');
+    if (!csubkey) return Object.assign(acc, { [curr]: data[curr] });
+    if (!acc[ckey]) Object.assign(acc, { [ckey]: {} });
+    Object.assign(acc[ckey], { [csubkey]: data[curr] });
+    return acc;
+  }, {});
+
+  // save both
+  if (redis) {
+    const keyCacheJSON = `${pg.options?.database}:settings:${key || 'all'}:json:${table}`;
+    await redis.set(keyCacheJSON, JSON.stringify(jsonData));
+
+    const keyCachePlain = `${pg.options?.database}:settings:${key || 'all'}:plain:${table}`;
+    await redis.set(keyCachePlain, JSON.stringify(data));
+  }
+
+  return json ? jsonData : data;
+}

package/server/routes/properties/schema.js

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

package/server/routes/properties/utils/refreshData.js

@@ -6,7 +6,7 @@ function prepareResult(res) {
   const arr = (res.rows || (Array.isArray(res) ? res : Object.values(res || {})));
   return {
     command: 'INSERT',
-    count: arr.filter((el) => el.command === 'INSERT')
+    count: res?.rowCount || arr.filter((el) => el.command === 'INSERT')
       ?.map((el) => ({ result: 'success', count: el.rowCount }))
       ?.reduce((acc, curr) => acc + curr.count, 0),
   };
@@ -37,13 +37,13 @@ export default async function refreshData({
       data?.forEach((el) => Object.assign(el, { id: el.id || randomUUID() }));
       await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
 
-      const res = dataInsert({
+      const res = await dataInsert({
         pg: client,
         table: 'setting.property',
         data: {
           property_entity: entity,
           object_id: table,
-          property_json: JSON.stringify(data)?.replace(/'/g, "''"),
+          property_json: JSON.stringify(data), // ?.replace(/'+/g, "'")?.replace(/'/g, "''")
         },
         uid,
       });
@@ -103,7 +103,7 @@ export default async function refreshData({
       await client.query('delete from setting.custom_field where $1 in (tablename, object_id)', [table]);
       await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
 
-      const data2 = JSON.stringify(data1?.filter((value, index, array) => array.indexOf(value) === index))?.replace(/'/g, "''");
+      const data2 = JSON.stringify(data1?.filter((value, index, array) => array.indexOf(value) === index)); // ?.replace(/'+/g, "'")?.replace(/'/g, "''")
       const res = await dataInsert({
         pg: client,
         table: 'setting.property',

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

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

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

@@ -1,18 +1,18 @@
-import { getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function reportList({
-    user = {},
-}) {
-    const arr = getTemplatePath('report').filter(el => el[2] === 'json').map(el => el[0]);
-
-    const rows = await Promise.all(arr.map(async (el) => {
-        const loadTemplate = await getTemplate('report', el);
-        return {
-            name: el,
-            filters: loadTemplate?.filters || [],
-            title: loadTemplate?.title || el,
-            sql: user.user_type?.includes('admin') ? loadTemplate?.sql : undefined,
-        };
-    }));
-    return { rows };
-}
+import { getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function reportList({
+    user = {},
+}) {
+    const arr = getTemplatePath('report').filter(el => el[2] === 'json').map(el => el[0]);
+
+    const rows = await Promise.all(arr.map(async (el) => {
+        const loadTemplate = await getTemplate('report', el);
+        return {
+            name: el,
+            filters: loadTemplate?.filters || [],
+            title: loadTemplate?.title || el,
+            sql: user.user_type?.includes('admin') ? loadTemplate?.sql : undefined,
+        };
+    }));
+    return { rows };
+}

package/server/routes/report/index.mjs

@@ -1,7 +1,7 @@
-import reportData from './controllers/data.js';
-import reportList from './controllers/list.js';
-
-export default async function route(app) {
-  app.get('/reports', {}, reportList);
-  app.get('/reports/:name', {}, reportData);
-}
+import reportData from './controllers/data.js';
+import reportList from './controllers/list.js';
+
+export default async function route(app) {
+  app.get('/reports', {}, reportList);
+  app.get('/reports/:name', {}, reportData);
+}