@opengis/admin 0.3.106 → 0.3.109

package/server/routes/notifications/index.mjs

@@ -1,26 +1,26 @@
-import { addHook } from '@opengis/fastify-table/utils.js';
-
-// api
-import testEmail from './controllers/testEmail.js';
-import readNotifications from './controllers/readNotifications.js'; // mark as read
-import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
-
-// hook
-import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
-
-// funcs
-// import addNotification from '../notifications/funcs/addNotification.js'; // add to db
-// import notification from '../notifications/funcs/sendNotification.js'; // send notification
-
-import { notificationSchema, emailSchema } from './schema.js';
-
-export default async function route(fastify) {
-
-  // fastify.decorate('addNotification', addNotification);
-  // fastify.decorate('notification', notification);
-
-  fastify.get('/test-email', { config: { policy: ['user'] }, schema: emailSchema }, testEmail);
-  fastify.get('/notification', { config: { policy: ['user'] }, schema: notificationSchema }, userNotifications);
-  fastify.get('/notification-read/:id?', { config: { policy: ['user'] }, schema: notificationSchema }, readNotifications);
-  addHook('onWidgetSet', onWidgetSet);
-}
+import { addHook } from '@opengis/fastify-table/utils.js';
+
+// api
+import testEmail from './controllers/testEmail.js';
+import readNotifications from './controllers/readNotifications.js'; // mark as read
+import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
+
+// hook
+import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
+
+// funcs
+// import addNotification from '../notifications/funcs/addNotification.js'; // add to db
+// import notification from '../notifications/funcs/sendNotification.js'; // send notification
+
+import { notificationSchema, emailSchema } from './schema.js';
+
+export default async function route(fastify) {
+
+  // fastify.decorate('addNotification', addNotification);
+  // fastify.decorate('notification', notification);
+
+  fastify.get('/test-email', { config: { policy: ['user'] }, schema: emailSchema }, testEmail);
+  fastify.get('/notification', { config: { policy: ['user'] }, schema: notificationSchema }, userNotifications);
+  fastify.get('/notification-read/:id?', { config: { policy: ['user'] }, schema: notificationSchema }, readNotifications);
+  addHook('onWidgetSet', onWidgetSet);
+}

package/server/routes/notifications/schema.js

@@ -1,17 +1,17 @@
-const notificationSchema = {
-    params: {
-      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-    querystring: {
-      nocache: { type: 'string', pattern: '^(\\d+)$' },
-    },
-};
-
-const emailSchema = {
-  quertstring: {
-    to: { type: 'string', pattern: '^((?!\\.)[\\w\\-_.]*[^.])(@\\w+)(\\.\\w+(\\.\\w+)?[^.\\W])$' },
-  },
-};
-
-export default null;
+const notificationSchema = {
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+    querystring: {
+      nocache: { type: 'string', pattern: '^(\\d+)$' },
+    },
+};
+
+const emailSchema = {
+  quertstring: {
+    to: { type: 'string', pattern: '^((?!\\.)[\\w\\-_.]*[^.])(@\\w+)(\\.\\w+(\\.\\w+)?[^.\\W])$' },
+  },
+};
+
+export default null;
 export { notificationSchema, emailSchema }

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/report/controllers/list.js

@@ -1,21 +1,23 @@
-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],
-            sql: user.user_type?.includes('admin') ? item?.sql : undefined,
-        };
-    }));
-    return { rows };
-}
+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,14 +1,26 @@
 import path from 'node:path';
 
-import { pgClients, getTemplate, metaFormat, handlebarsSync } from '@opengis/fastify-table/utils.js';
+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;
 
-export default async function tableData({
-    pg = pgClients.client, params = {}, query = {}, user = {},
-}, reply) {
+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 };
     }
@@ -31,11 +43,12 @@ export default async function tableData({
         });
     }
 
-    const { title, subtitle, widgets = [], kpi, sql = `select * from ${loadTemplate.table} where ${loadTemplate.query || 'true'}`, meta, filters } = loadTemplate;
+    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(';');
@@ -45,14 +58,38 @@ export default async function tableData({
 
     const { fields = [] } = await pg.query(`select * from (${sql.replace(/{{uid}}/g, user?.uid)})q limit 0`);
 
-    const where = filter ? getFilterQuery({ pg, filter, fields, filterList: filters })?.map?.(el => el.query)?.join(' and ') : null;
+    const where = getFilterQuery({ pg, filter, fields, filterList: filters, searchColumns: meta.search, search: query.search });
 
-    const q = `select ${metaColumns || '*'} from (${sql.replace(/{{uid}}/g, user?.uid)})q where ${where || '1=1'} ${groupby ? `group by ${groupby}` : ''} limit ${limit} offset ${offset}`;
+    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;
+    }
+
     if (kpi?.length) {
         await Promise.all(kpi.map(async (el) => {
             if (!el.sql && !el.table) {
@@ -73,8 +110,6 @@ export default async function tableData({
         sql: user?.user_type === 'admin' ? el.sql : undefined
     }));
 
-    const types = fields.reduce((acc, curr) => ({ ...acc, [curr.name]: pg.pgType?.[curr.dataTypeID] }), {});
-
     const { rows = [] } = await pg.query(q).catch(err => {
         return reply.status(500).send('query error: ' + err.toString());
     });
@@ -84,14 +119,7 @@ export default async function tableData({
     const columns = fields.map(el => ({
         name: el.name,
         title: meta?.titles?.[el.name] || el.name,
-        type: meta?.cls?.[el.name]
-            ? 'Autocomplete'
-            : (
-                ['date', 'timestamp with time zone', 'timestamp without time zone'].includes(types[el.name])
-                    ? 'Date'
-                    : null
-            ) || 'Text',
-        format: pg.pgType?.[el.dataTypeID],
+        format: meta?.cls?.[el.name] ? 'select' : (matches[el.dataTypeID] || 'text'),
         data: meta?.cls?.[el.name],
     }));
 
@@ -101,6 +129,7 @@ export default async function tableData({
         data: rows,
         title,
         subtitle,
+        category,
         widgets,
         columns,
     };

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

@@ -4,6 +4,37 @@ import { pgClients, getTemplate, metaFormat } from '@opengis/fastify-table/utils
 
 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) {
@@ -43,34 +74,15 @@ export default async function widgetData({
 
     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 sql = widget.sql || `select * from ${widget.table} where ${widget.query || 'true'} limit ${maxLimit} offset ${offset}`;
 
-    const groupby = typeof widget.groupby === 'string'
-        ? { name: widget.groupby }
-        : (widget.groupby?.[0] || widget.groupby);
+    const { groupby, q } = normalizeData(widget, limit, offset);
 
     if (groupby.cls) {
         Object.assign(cls, { [groupby.name]: groupby.cls });
     }
 
-    const xCol = widget.granularity
-        ? `date_trunc('${widget.granularity}', ${groupby.name})`
-        : groupby.name;
-
-    const q = widget.agg
-        ? `select ${widget.agg} as metric ${groupby.name
-            ? `${widget.granularity
-                ? `,date_trunc('${widget.granularity}', ${groupby.name})`
-                : `,${groupby.name}`}`
-            : ''
-        } as ${groupby.name} from (${sql}) t ${groupby.name
-            ? `group by ${xCol}`
-            : ''
-        }
-        ${widget.orderby || xCol ? `order by ${widget.orderby || xCol}` : ''}`
-        : sql;
-
     if (query.sql) return q;
 
     const { rows = [], fields = [] } = await pg.query(q).catch(err => {
@@ -78,19 +90,10 @@ export default async function widgetData({
     }) || {};
     await metaFormat({ rows, cls, sufix: false }, pg);
 
-    const types = fields.reduce((acc, curr) => ({ ...acc, [curr.name]: pg.pgType?.[curr.dataTypeID] }), {});
-
     const columns = fields.map(el => ({
         name: el.name,
         title: titles?.[el.name] || el.name,
-        type: cls?.[el.name]
-            ? 'Autocomplete'
-            : (
-                ['date', 'timestamp with time zone', 'timestamp without time zone'].includes(types[el.name])
-                    ? 'Date'
-                    : null
-            ) || 'Text',
-        format: pg.pgType?.[el.dataTypeID],
+        format: cls?.[el.name] ? 'select' : (matches[el.dataTypeID] || 'text'),
         data: cls?.[el.name],
     }));
 

package/server/routes/report/index.mjs

@@ -1,9 +1,9 @@
-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);
-}
+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);
+}