@opengis/admin 0.3.99 → 0.3.101

package/dist/{card-view-BWLrtFEA.js → card-view-BPUveYDd.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as e, openBlock as r, createBlock as t } from "vue";
-import { _ as c } from "./import-file-5z6J6maH.js";
+import { _ as c } from "./import-file-Bs86FUW3.js";
 const n = {};
 function s(_, p, a, i, f, m) {
   const o = e("router-view");

package/dist/{edit-page-DeVqk6QY.js → edit-page-DVyHgdP0.js}

@@ -1,4 +1,4 @@
-import { _ as $, s as k, u as V, g as d } from "./import-file-5z6J6maH.js";
+import { _ as $, s as k, u as V, g as d } from "./import-file-Bs86FUW3.js";
 import { resolveComponent as j, openBlock as p, createElementBlock as g, createElementVNode as m, normalizeClass as b, createCommentVNode as x, normalizeStyle as y, createBlock as E } from "vue";
 const O = {
   data() {

package/dist/{import-file-5z6J6maH.js → import-file-Bs86FUW3.js}

@@ -3705,27 +3705,27 @@ const Z4 = [
   {
     name: "edit",
     path: "/edit",
-    component: () => import("./edit-page-DeVqk6QY.js")
+    component: () => import("./edit-page-DVyHgdP0.js")
   },
   {
     name: "add",
     path: "/add",
-    component: () => import("./add-page-Dqhn198n.js")
+    component: () => import("./add-page-BtME1JJf.js")
   },
   {
     path: "/profile",
     name: "profile",
-    component: () => import("./profile-page-BICBVBpI.js")
+    component: () => import("./profile-page-DHRxyJA_.js")
   },
   {
     name: "card-view",
     path: "/card",
-    component: () => import("./card-view-BWLrtFEA.js"),
+    component: () => import("./card-view-BPUveYDd.js"),
     children: [
       {
         name: "table",
         path: ":table",
-        component: () => import("./card-view-BWLrtFEA.js"),
+        component: () => import("./card-view-BPUveYDd.js"),
         children: [
           {
             name: "card",
@@ -3786,14 +3786,14 @@ const eB = /* @__PURE__ */ ft(X4, [["render", Q4]]), tB = (t) => {
         {
           path: "/",
           name: "home",
-          component: () => import("./admin-view-Bde8C2zb.js"),
+          component: () => import("./admin-view-URsx4MBX.js"),
           children: [
             ...t,
             ...e,
             // { path: '/', redirect: '/home' },
             {
               path: "/:catchAll(.*)",
-              component: () => import("./admin-interface-d347ItOq.js")
+              component: () => import("./admin-interface-mIo1_gE2.js")
             }
           ]
         }

package/dist/{profile-page-BICBVBpI.js → profile-page-DHRxyJA_.js}

@@ -1,4 +1,4 @@
-import { _ as n, g as m } from "./import-file-5z6J6maH.js";
+import { _ as n, g as m } from "./import-file-Bs86FUW3.js";
 import { u as p } from "./user-B_2kh6ic.js";
 import { resolveComponent as d, openBlock as u, createElementBlock as f, createElementVNode as o, createBlock as h, createCommentVNode as b } from "vue";
 const x = {

package/package.json

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

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

@@ -1,4 +1,6 @@
-import { handlebars, pgClients, getTemplate, metaFormat, handlebarsSync } from '@opengis/fastify-table/utils.js';
+import path from 'node:path';
+
+import { handlebars, pgClients, getTemplate, metaFormat } from '@opengis/fastify-table/utils.js';
 
 import getFilterQuery from '../utils/getFilterQuery.js';
 
@@ -6,20 +8,32 @@ const maxLimit = 100;
 
 export default async function reportData({
     pg = pgClients.client, params = {}, query = {}, user = {},
-}) {
+}, reply) {
     if (!params?.name) {
         return { message: 'not enough params: name', status: 400 };
     }
 
-    const loadTemplate = await getTemplate('report', params.name);
+    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 (!loadTemplate?.sql) {
-        return { message: `report not found: ${params.name}`, status: 404 };
+    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 { kpi, sql, meta, filters } = loadTemplate;
+    const { 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;
@@ -31,8 +45,8 @@ 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?.map(el => `${el.sql || 'count(*)'} as "${el.name}"`)?.join(',') : '';
-    const columnsList = metaColumns || loadTemplate.columns?.map(el => el.name)?.join(',');
+    const kpiColumns = kpi ? kpi?.filter?.(el => el.agg)?.map?.(el => `${el.agg || 'count(*)'} as "${el.name}"`)?.join?.(',') : '';
+    const columnsList = metaColumns;
 
     const qMeta = await handlebars.compile(sql)({ user, uid });
     const { fields = [] } = await pg.query(`select * from (${qMeta})q limit 0`);
@@ -42,35 +56,96 @@ export default async function reportData({
     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 });
+    if (query.sql && user?.user_type?.includes('admin')) {
+        return `${qAgg};${q}`;
+    }
 
-    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],
+    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 }));
+
+    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 });
         }));
+    }
+    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 });
+            }
+        }));
+    }
+
+    const types = fields.reduce((acc, curr) => ({ ...acc, [curr.name]: pg.pgType?.[curr.dataTypeID] }), {});
+
+    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,
-        rows,
+        widgets,
         columns,
     };
 }

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

@@ -1,17 +1,20 @@
+import path from 'node:path';
+
 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 arr = getTemplatePath('report');
 
     const rows = await Promise.all(arr.map(async (el) => {
-        const loadTemplate = await getTemplate('report', 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,
-            filters: loadTemplate?.filters || [],
-            title: loadTemplate?.title || el,
-            sql: user.user_type?.includes('admin') ? loadTemplate?.sql : undefined,
+            name: el[0],
+            filters: item?.filters || [],
+            title: item?.title || el[0],
+            sql: user.user_type?.includes('admin') ? item?.sql : undefined,
         };
     }));
     return { rows };