@opengis/admin 0.3.105 → 0.3.107

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

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

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

@@ -1,4 +1,4 @@
-import { _ as $, s as k, u as V, g as d } from "./import-file-Bs86FUW3.js";
+import { _ as $, s as k, u as V, g as d } from "./import-file-DIAYCDNH.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-Bs86FUW3.js → import-file-DIAYCDNH.js}

@@ -3705,27 +3705,27 @@ const Z4 = [
   {
     name: "edit",
     path: "/edit",
-    component: () => import("./edit-page-DVyHgdP0.js")
+    component: () => import("./edit-page-DGjs4jeh.js")
   },
   {
     name: "add",
     path: "/add",
-    component: () => import("./add-page-BtME1JJf.js")
+    component: () => import("./add-page-DELwNBs9.js")
   },
   {
     path: "/profile",
     name: "profile",
-    component: () => import("./profile-page-DHRxyJA_.js")
+    component: () => import("./profile-page-CaQqFoqe.js")
   },
   {
     name: "card-view",
     path: "/card",
-    component: () => import("./card-view-BPUveYDd.js"),
+    component: () => import("./card-view-Cb3j5eXY.js"),
     children: [
       {
         name: "table",
         path: ":table",
-        component: () => import("./card-view-BPUveYDd.js"),
+        component: () => import("./card-view-Cb3j5eXY.js"),
         children: [
           {
             name: "card",
@@ -3786,14 +3786,14 @@ const eB = /* @__PURE__ */ ft(X4, [["render", Q4]]), tB = (t) => {
         {
           path: "/",
           name: "home",
-          component: () => import("./admin-view-URsx4MBX.js"),
+          component: () => import("./admin-view-DnD5gBsl.js"),
           children: [
             ...t,
             ...e,
             // { path: '/', redirect: '/home' },
             {
               path: "/:catchAll(.*)",
-              component: () => import("./admin-interface-mIo1_gE2.js")
+              component: () => import("./admin-interface-ChLQ5JCd.js")
             }
           ]
         }
@@ -61180,7 +61180,8 @@ const Jce = /* @__PURE__ */ ft(Zce, [["render", Kce]]), Qce = async (t, e, n, i
   __name: "admin-info-popover",
   props: {
     table: { type: String, default: () => "" },
-    id: { type: String, default: () => "" }
+    id: { type: String, default: () => "" },
+    api: { type: String, default: () => "" }
   },
   setup(t) {
     var _, k;
@@ -61193,7 +61194,7 @@ const Jce = /* @__PURE__ */ ft(Zce, [["render", Kce]]), Qce = async (t, e, n, i
     const f = async () => {
       try {
         const { data: C } = await lt.get(
-          `/api/table-data/${n.table}/${n.id}`
+          `${n.api}/${n.table}/${n.id}`
         );
         i.value = C;
       } catch {

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

@@ -1,4 +1,4 @@
-import { _ as n, g as m } from "./import-file-Bs86FUW3.js";
+import { _ as n, g as m } from "./import-file-DIAYCDNH.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.105",
+  "version": "0.3.107",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -47,7 +47,7 @@
     "@fullcalendar/timegrid": "^6.1.15",
     "@fullcalendar/vue3": "^6.1.15",
     "@opengis/fastify-auth": "1.0.86",
-    "@opengis/fastify-file": "1.0.82",
+    "@opengis/fastify-file": "1.0.83",
     "@opengis/fastify-table": "^1.3.52",
     "@opengis/v3-core": "^0.3.161",
     "@opengis/v3-filter": "^0.1.3",

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

@@ -14,6 +14,8 @@ export default async function reportList({
             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,
         };
     }));

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/utils/getFilterQuery.js

@@ -1,21 +1,21 @@
 /* eslint-disable no-continue */
 
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
+import { pgClients } from '@opengis/fastify-table/utils.js';
 
 import formatValue from './formatValue.js';
 
-function getFilterQuery({ pg, filter: filterStr, fields, filterList }) {
-    if (!filterStr) return null; // filter list API
+export default function getFilterQuery({ pg = pgClients.client, filter: filterStr, fields, filterList, searchColumns, search }) {
+    if (!filterStr && !search) return null;
 
     const mainOperators = ['=', '~', '>', '<'];
 
     const filterQueryArray = decodeURIComponent(filterStr?.replace(/%/g, '%25').replace(/%/g, '\\%')?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/);
 
     const resultList = [];
+    const searchwith = searchColumns || fields?.filter?.((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map?.((el) => el.name)?.join?.(',');
+
+    const sval = `ilike '%${decodeURIComponent(search?.replace(/%/g, '%25')).replace(/'/g, "''").replace(/%/g, '\\%')}%'`;
+    const searchQuery = search && searchwith ? ` (${searchwith.split(',')?.map((name) => `${name} ${sval}`).join(' or ')} )` : '';
 
     for (let i = 0; i < filterQueryArray.length; i += 1) {
         const item = filterQueryArray[i];
@@ -61,7 +61,8 @@ function getFilterQuery({ pg, filter: filterStr, fields, filterList }) {
         });
     }
 
-    return resultList;
+    const where = [searchQuery].concat(resultList?.map?.(el => el.query) || []).filter(el => el).join(' and ');
+
+    return where;
 }
 
-export default getFilterQuery;