@opengis/admin 0.3.103 → 0.3.105

package/package.json

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

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

@@ -1,112 +1,107 @@
-import path from 'node:path';
-
-import { handlebars, pgClients, getTemplate, metaFormat } from '@opengis/fastify-table/utils.js';
-
-import getFilterQuery from '../utils/getFilterQuery.js';
-
-const maxLimit = 100;
-
-export default async function tableData({
-    pg = pgClients.client, params = {}, query = {}, user = {},
-}, reply) {
-    if (!params?.name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-
-    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 { uid } = user;
-
-    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;
-    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?.filter?.(el => el.agg)?.map?.(el => `${el.agg || 'count(*)'} as value`)?.join?.(',') : '';
-    const columnsList = metaColumns;
-
-    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] || {}).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, 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) => {
-            const { rows = [], fields = [] } = await pg.query(el.sql).catch(err => {
-                Object.assign(el, { error: err.toString() });
-            }) || {};
-            Object.assign(el, { count: rows?.[0]?.[fields[0].name] || 0, sql: user?.user_type === 'admin' ? el.sql : 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,
-        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],
-        data: meta?.cls?.[el.name],
-    }));
-
-    return {
-        q: user?.user_type?.includes('admin') ? q : undefined,
-        kpi,
-        data: rows,
-        title,
-        subtitle,
-        widgets,
-        columns,
-    };
-}
+import path from 'node:path';
+
+import { pgClients, getTemplate, metaFormat, handlebarsSync } from '@opengis/fastify-table/utils.js';
+
+import getFilterQuery from '../utils/getFilterQuery.js';
+
+const maxLimit = 100;
+
+export default async function tableData({
+    pg = pgClients.client, params = {}, query = {}, user = {},
+}, reply) {
+    if (!params?.name) {
+        return { message: 'not enough params: name', status: 400 };
+    }
+
+    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 { 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;
+    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 { 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 q = `select ${metaColumns || '*'} from (${sql.replace(/{{uid}}/g, user?.uid)})q where ${where || '1=1'} ${groupby ? `group by ${groupby}` : ''} limit ${limit} offset ${offset}`;
+
+    if (query.sql && user?.user_type?.includes('admin')) {
+        return q;
+    }
+
+    if (kpi?.length) {
+        await Promise.all(kpi.map(async (el) => {
+            if (!el.sql && !el.table) {
+                Object.assign(el, { error: 'empty sql / table' });
+                return;
+            }
+
+            const sqlq = el.sql || `select ${el.agg || 'count(*)'} as value from ${el.table} where ${el.query || 'true'}`;
+            const { rows = [], fields = [] } = await pg.query(sqlq.replace(/{{uid}}/g, user?.uid)).catch(err => {
+                Object.assign(el, { error: err.toString() });
+            }) || {};
+            Object.assign(el, { count: rows?.[0]?.[fields[0].name] || 0, sql: user?.user_type === 'admin' ? sqlq.replace(/{{uid}}/g, user?.uid) : 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(q).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,
+        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],
+        data: meta?.cls?.[el.name],
+    }));
+
+    return {
+        q: user?.user_type?.includes('admin') ? q : undefined,
+        kpi,
+        data: rows,
+        title,
+        subtitle,
+        widgets,
+        columns,
+    };
+}

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

@@ -1,90 +1,105 @@
-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;
-}
+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) {
+        return reply.status(404).send(`report not found: ${params.name}`);
+    }
+
+    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}`);
+    }
+
+    if (!widget.table || !pg.pk?.[widget.table]) {
+        return reply.status(404).send(`widget table not found: ${widget.table}`);
+    }
+
+    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 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 => {
+        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;
+}