@opengis/admin 0.2.71 → 0.2.72

package/module/settings/form/admin.users.form.json

@@ -54,14 +54,14 @@
         },
         "login": {
             "type": "Text",
-            "hidden": true,
+            "hidden1": true,
             "ua": "Логін",
             "i": "Вноситься довільний логін користувача латинськими літерами, що буде використовуватися для входу в систему",
             "ru": "Логин"
         },
         "password": {
             "type": "Password",
-            "hidden": true,
+            "hidden1": true,
             "validators": [
                 {
                     "type": "regexp",

package/package.json

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

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

@@ -1,15 +1,21 @@
-import { handlebars, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
+import { getMeta, getTemplate, pgClients, handlebarsSync } from '@opengis/fastify-table/utils.js';
+
+const isValidDate = (dateStr) => (new Date(dateStr)).toString() !== 'Invalid Date';
 
 export default async function calendarData({
-    pg, params = {}, query = {}, session = {},
+    pg = pgClients.client, params = {}, query = {}, session = {},
 }) {
     const { name } = params;
-    const { uid } = session.passport?.user || {};
+    const { granularity = 'month' } = query;
+    const { user = {} } = session.passport || {};
+
     if (!name) {
         return { message: 'not enough params: name', status: 400 };
     }
-    const { date, sql } = query;
-    
+
+    if (query.granularity && !['day', 'month', 'week', 'year'].includes(granularity)) {
+        return { message: 'invalid query params: granularity', status: 400 };
+    }
 
     const body = await getTemplate('calendar', name);
 
@@ -20,10 +26,8 @@ export default async function calendarData({
     const {
         title,
         table,
-        query: query1 = '1=1',
         meta = {},
-        filter = [],
-    } = body;
+    } = body || {};
 
     if (!table) {
         return { message: 'not enough calendar params: table', status: 404 };
@@ -32,57 +36,91 @@ export default async function calendarData({
         return { message: `table pkey not found: ${table}`, status: 404 };
     }
 
-    const filterWhere = filter?.length && query.filter?.length
-        ? filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true))
+    const filterList = (body?.filter || [])
+        .concat(body?.filterInline || [])
+        .concat(body?.filterCustom || [])
+        .concat(body?.filterState || [])
+        .concat(body?.filterList || [])
+        .concat(body?.filters || [])
+        .concat(body?.filter_list || []);
+
+    const { columns = [] } = await getMeta({ pg, table });
+    const columnList = columns?.map((el) => el?.name);
+
+    const dateColumn = columns?.find((el) => el?.name === (meta?.date || meta?.start))?.name
+        || columns?.find((el) => el?.name === 'cdate')?.name;
+
+    if (query.date && !dateColumn) {
+        return { message: 'invalid template params: date column not found', status: 400 };
+    }
+
+    if (query.date && !isValidDate(query.date)) {
+        return { message: 'Invalid date: out of range or incorrect format', status: 400 };
+    }
+
+    const filterWhere = filterList?.length && query.filter?.length
+        ? filterList
+            .filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true))
             .map((el) => {
                 const val = query.filter.split(',').find((e) => e?.split('=')?.shift()?.includes(el.column || el.name))?.split('=')?.pop();
-                if (val) return el.column && val ? `(${[`${el.column}::text='${val.replace(/'/g,"''")}'::text`, el.query].filter((el) => el).join(' and ')})` : el.query;
-            }).filter((el) => el).join(' and ')
+                if (val) return el.column && val ? `(${[`${el.column}::text='${val.replace(/'/g, "''")}'::text`, el.query].filter((el) => el).join(' and ')})` : el.query;
+            })
+            .filter((el) => el)
+            .join(' and ')
         : undefined;
-    // console.log(filterWhere);
 
-        const queryWhere = await handlebars.compile(query1)({ uid });
-        const filterDate = date ? `date_trunc('month', "${meta?.date || meta?.start}"::date)='${date}'::date` : undefined;
-        const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
+    const queryWhere = handlebarsSync.compile(body.query || '1=1')({ user, uid: user?.uid });
+    const filterDate = query.date ? `date_trunc('${granularity}', "${dateColumn}"::date)='${query.date}'::date` : undefined;
+
+    const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
+
+    const filtersByColumn = filterList.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && el?.column);
 
-    const filtersByColumn = filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && el?.column);
-    
     const filters = [];
     if (filtersByColumn?.length) {
         await Promise.all(filtersByColumn.map(async (el) => {
-            const { rows: filterData = [] } = await pg.query(`select $1 as id, count(*) from $2 
-            where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by $1`, [el.column, table] );
+            const { rows: filterData = [] } = await pg.query(`select ${el.column.replace(/'/g, "''")} as id, count(*) from ${table} 
+            where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by ${el.column.replace(/'/g, "''")}`);
             if (!filterData?.length) return;
-            
-            // const clsData = await getSelectVal({ pg, name: el.cls, values: filterData.map((el) => el.id) });
-            const clsData = el.cls ? await getTemplate(['cls', 'select'], el.cls) : undefined;
-            
-            if (!el.cls) {
-                filterData.forEach((el1) => filters.push(el1));
+
+            const clsData = await getTemplate(['cls', 'select'], el.cls);
+
+            if (!el.cls || !clsData?.length) {
+                filterData.forEach((item) => filters.push(item));
                 return;
             }
 
-            filterData.forEach((el1) => {
-                const cls = clsData.find((item) => item.id === el1.id.toString());
-                Object.assign(el1, { title: cls?.text, color: cls?.color });
-                filters.push(el1);
+            filterData.forEach((filter) => {
+                const cls = clsData.find((item) => item.id === filter.id.toString());
+                Object.assign(filter, { title: cls?.text, color: cls?.color });
+                filters.push(filter);
             });
         }));
     }
 
-    const tableMeta = await getMeta({ pg, table });
-    const columnList = tableMeta?.columns?.map((el) => el?.name);
-    const columns = Object.keys(meta).filter((el) => ['date', 'start','end','title','status'].includes(el) && columnList.includes(meta[el])).map((el) => `"${meta[el]}" as ${el}`);
-    
-    if (!columns?.length) {
+    const filtersByPreparedQuery = filterList.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && !el?.column && el?.query);
+
+    if (filtersByPreparedQuery?.length) {
+        await Promise.all(filtersByPreparedQuery.map(async (el) => {
+            const { rows = [] } = await pg.query(`select ${el.query} as id, count(*) from ${table} 
+            where ${filterWhere || '1=1'} group by ${el.query}`);
+            rows.forEach((item) => filters.push(item));
+        }));
+    }
+
+    const metaColumns = Object.keys(meta)
+        .filter((el) => ['date', 'start', 'end', 'title', 'status'].includes(el) && columnList.includes(meta[el]))
+        .map((el) => `"${meta[el]}" as ${el}`);
+
+    if (!metaColumns?.length) {
         return { message: `calendar param meta is invalid: invalid/empty keys`, status: 404 };
     }
 
-    const q = `select &1 from $2 where $3`;
-    if (sql) return q;
+    const q = `select ${metaColumns.join(',')} from ${table} where ${where}`;
+    if (query?.sql && user?.user_type?.includes('admin')) return q;
+
+    const { rows = [] } = await pg.query(q);
 
-    const { rows = [] } = await pg.query(q, [columns.join(','), table, where]); 
-    
-    return { title, filters, rows };
+    return { title, filters, granularity, sql: user?.user_type?.includes('admin') ? q : undefined, rows };
 
 }

package/server/routes/calendar/schema.js

@@ -3,7 +3,7 @@ const calendarDataSchema = {
     name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
   },
   querystring: {
-    date: { type: 'string', pattern: '^([\\d\\s\\/,.:-]+)$' },
+    date: { type: 'string', pattern: '^\\d{4}-\\d{2}-\\d{2}$' },
     sql: { type: 'string', pattern: '^(\\d)$' },
   },
 

package/server/routes/print/controllers/cardPrint.js

@@ -1,5 +1,7 @@
 import path from 'path';
 import qr from 'qrcode';
+import { readFile } from 'node:fs/promises';
+import { fileURLToPath } from 'url';
 import { createHash } from 'crypto';
 
 import {
@@ -9,6 +11,8 @@ import {
 import { grpc } from '@opengis/fastify-file/utils.js';
 
 const { htmlToPdf } = grpc();
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
 
 export default async function cardPrint(req, reply) {
     const { pg = pgClients.client, params = {}, query = {}, user = {} } = req;
@@ -62,7 +66,8 @@ export default async function cardPrint(req, reply) {
         return { message: 'data not found', status: 404 };
     }
 
-    const pt = await getTemplate('pt', template);
+    const pt = await getTemplate('pt', template)
+        || await readFile(path.join(dirname, '../../../templates/pt/card-print.pt.hbs'), 'utf8');
 
     const url = (req.protocol || 'https') + '://' + req.hostname + req.url;
     const qrCode = `<img src="${await qr.toDataURL(url, { type: 'png', ec_level: 'M', size: 5, margin: 4 })}" alt="qrcode">`;

package/server/routes/print/index.mjs

@@ -1,5 +1,5 @@
-import cardPrint from './controllers/cardPrint.js';
-
-export default async function route(app) {
-  app.get(`/card-print/:table/:id`, cardPrint);
-}
+import cardPrint from './controllers/cardPrint.js';
+
+export default async function route(app) {
+  app.get(`/card-print/:table/:id`, cardPrint);
+}