@opengis/admin 0.3.101 → 0.3.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.3.101",
+  "version": "0.3.103",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

package/server/routes/report/controllers/{data.js → tableData.js}

@@ -6,7 +6,7 @@ import getFilterQuery from '../utils/getFilterQuery.js';
 
 const maxLimit = 100;
 
-export default async function reportData({
+export default async function tableData({
     pg = pgClients.client, params = {}, query = {}, user = {},
 }, reply) {
     if (!params?.name) {
@@ -33,7 +33,7 @@ export default async function reportData({
 
     const { uid } = user;
 
-    const { widgets = [], kpi, sql = `select * from ${loadTemplate.table} where ${loadTemplate.query || 'true'}`, meta, filters } = loadTemplate;
+    const { title, subtitle, 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;
@@ -45,7 +45,7 @@ export default async function reportData({
     const limit = Math.min(maxLimit, +(query.limit || 20));
     const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
 
-    const kpiColumns = kpi ? kpi?.filter?.(el => el.agg)?.map?.(el => `${el.agg || 'count(*)'} as "${el.name}"`)?.join?.(',') : '';
+    const kpiColumns = kpi ? kpi?.filter?.(el => el.agg)?.map?.(el => `${el.agg || 'count(*)'} as value`)?.join?.(',') : '';
     const columnsList = metaColumns;
 
     const qMeta = await handlebars.compile(sql)({ user, uid });
@@ -63,7 +63,7 @@ export default async function reportData({
     const kpiData = await pg.query(qAgg).then(el => el.rows?.[0] || {}).catch(err => {
         return reply.status(500).send('kpi error: ' + err.toString());
     });
-    kpi?.filter?.(el => el.agg)?.forEach?.(el => Object.assign(el, { count: kpiData[el.name] || 0 }));
+    kpi?.filter?.(el => el.agg)?.forEach?.(el => Object.assign(el, { count: kpiData[el.name] || 0, agg: user?.user_type === 'admin' ? el.agg : undefined }));
 
     if (kpi?.filter?.(el => el.sql)?.length) {
         await Promise.all(kpi.filter(el => el.sql).map(async (el) => {
@@ -73,61 +73,19 @@ export default async function reportData({
             Object.assign(el, { count: rows?.[0]?.[fields[0].name] || 0, sql: user?.user_type === 'admin' ? el.sql : undefined });
         }));
     }
-    if (widgets?.length) {
-        await Promise.all(widgets.map(async (el) => {
-            if (el.table && !pg.pk?.[el.table]) {
-                return { error: `table not found: ${el.table}` };
-            }
-
-            const { cls = {}, titles = {} } = (el.table ? el.meta : meta) || {};
-            const sql = el.sql || (el.table ? `select * from ${el.table} where ${el.query || 'true'}` : null) || q;
-
-            if (!el.agg) {
-                const { rows = [] } = await pg.query(sql).catch(err => {
-                    Object.assign(el, { error: err.toString() });
-                }) || {};
-                await metaFormat({ rows, cls, sufix: false }, pg);
-                Object.assign(el, { rows, sql: user?.user_type === 'admin' ? sql : undefined });
-            } else {
-                const groupby = typeof el.groupby === 'string'
-                    ? { name: el.groupby }
-                    : (el.groupby?.[0] || el.groupby);
-
-                const q1 = `select ${el.agg} ${groupby.name ? `${el.granularity ? `,date_trunc('${el.granularity}', ${groupby.name})` : `,${groupby.name}`}` : ''} as ${groupby.name} from (${sql}) t ${groupby.name ? `group by ${el.granularity ? `date_trunc('${el.granularity}', ${groupby.name})` : groupby.name}` : ''}`;
-
-                const { rows = [], fields = [] } = await pg.query(q1).catch(err => {
-                    Object.assign(el, { error: err.toString() });
-                }) || {};
-
-                if (groupby.cls) {
-                    Object.assign(cls, { [groupby.name]: groupby.cls });
-                }
-
-                await metaFormat({ rows, cls, sufix: false }, pg);
-
-                const types = el.table ? fields.reduce((acc, curr) => ({ ...acc, [curr.name]: pg.pgType?.[curr.dataTypeID] }), {}) : {};
-
-                const columns = el.table ? 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],
-                    data: cls?.[el.name],
-                })) : undefined;
-
-                Object.assign(el, { rows, columns, sql: user?.user_type === 'admin' ? q1 : undefined });
-            }
-        }));
-    }
+
+    widgets?.forEach?.((el) => Object.assign(el, {
+        agg: user?.user_type === 'admin' ? el.agg : undefined,
+        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(sql).catch(err => {
+        return reply.status(500).send('query error: ' + err.toString());
+    });
+    await metaFormat({ rows, cls: meta?.cls, sufix: false }, pg);
+
     const columns = fields.map(el => ({
         name: el.name,
         title: meta?.titles?.[el.name] || el.name,
@@ -145,6 +103,9 @@ export default async function reportData({
     return {
         q: user?.user_type?.includes('admin') ? q : undefined,
         kpi,
+        data: rows,
+        title,
+        subtitle,
         widgets,
         columns,
     };

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

@@ -0,0 +1,90 @@
+import path from 'node:path';
+
+import { pgClients, getTemplate, metaFormat } from '@opengis/fastify-table/utils.js';
+
+const maxLimit = 100;
+
+export default async function widgetData({
+    pg = pgClients.client, params = {}, query = {}, user = {},
+}, reply) {
+    if (!params?.name) {
+        return { message: 'not enough params: name', status: 400 };
+    }
+
+    if (!params?.widget) {
+        return reply.status(400).send('not enough params: widget');
+    }
+
+    const body = await getTemplate('report', params.name);
+    const loadTemplate = Array.isArray(body) ? body?.find?.(el => el[0].replace(path.extname(el[0]), '') === 'index')?.[1] : body;
+
+    if (!loadTemplate?.sql && !loadTemplate?.table) {
+        return reply.status(404).send(`report not found: ${params.name}`);
+    }
+
+    if (loadTemplate?.table && !pg.pk?.[loadTemplate.table]) {
+        return reply.status(404).send(`table not found: ${loadTemplate.table}`);
+    }
+
+    if (Array.isArray(body)) {
+        loadTemplate.widgets = [];
+        body.filter(el => el[0].replace(path.extname(el[0]), '') !== 'index').forEach((el) => {
+            loadTemplate.widgets.push(el[1]);
+        });
+    }
+
+    const { widgets = [] } = loadTemplate;
+
+    const widget = widgets.find(el => el.name === params.widget);
+
+    if (!widget) {
+        return reply.status(404).send(`widget not found: ${params.widget}`);
+    }
+
+    const { cls = {}, titles = {} } = widget.meta || {};
+
+    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);
+
+    if (groupby.cls) {
+        Object.assign(cls, { [groupby.name]: groupby.cls });
+    }
+
+    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 ${widget.granularity ? `date_trunc('${widget.granularity}', ${groupby.name})` : groupby.name}` : ''}`
+        : sql;
+
+    const { rows = [], fields = [] } = await pg.query(q).catch(err => {
+        Object.assign(widget, { error: err.toString() });
+    }) || {};
+    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],
+        data: cls?.[el.name],
+    }));
+
+    Object.assign(widget, {
+        source: rows,
+        columns,
+        agg: user?.user_type === 'admin' ? widget.agg : undefined,
+        sql: user?.user_type === 'admin' ? q : undefined,
+    });
+
+    return widget;
+}

package/server/routes/report/index.mjs

@@ -1,7 +1,9 @@
-import reportData from './controllers/data.js';
+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', {}, reportData);
+  app.get('/reports/:name', {}, tableData);
+  app.get('/reports/:name/:widget', {}, widgetData);
 }