@opengis/admin 0.2.103 → 0.2.104

package/package.json

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

package/server/helpers/list/tableList.js

@@ -10,8 +10,10 @@ function format(d, key, data, hash) {
     if (key === 'actions') {
         return `<div class="flex items-center gap-2">${(hash.form ? buttonEdit(d, 'Редагувати') : '') + buttonDel(d)}</div>`
     }
-    if (key.includes('{{')) {
+    if (key.startsWith('{{') && key.match(/\{\{([^\s]+)/)?.[1] in handlebarsSync.helpers) {
         return handlebarsSync.compile(key)(data);
+    } else if (key.startsWith('{{') && key.includes(' ') && !(key.match(/\{\{([^\s]+)/)?.[1] in handlebars.helpers)) {
+        return null;
     }
     if (!d) return '-';
     return d;

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

@@ -6,6 +6,11 @@ import { getAccess, handlebars, setOpt, setToken, getTemplate, handlebarsSync, a
 import getTableData from "./tableData.js";
 import conditions from './utils/conditions.js';
 
+const components = {
+    'vs-widget-file': `select 'vs-widget-file' as component, count(*) from crm.files where entity_id=$1 and file_status<>3`,
+    'vs-widget-comments': `select 'vs-widget-comments' as component, count(*) from crm.communications where entity_id=$1`
+};
+
 export default async function getCardData(req) {
 
     const {
@@ -43,7 +48,13 @@ export default async function getCardData(req) {
         const data = await Promise.all(filtered.map(el => pg.query(el.count).then(el => el.rows[0] || {})))
         filtered.forEach((el, i) => {
             Object.assign(el, data[i] || {}, data[i].count ? {} : { count: undefined })
-        })
+        });
+        const q = el.items.map((el) => el.component ? components[el.component] : null).filter(el => el).join(' union all ');
+        const counts = q && id
+            ? await pg.query(q, [id])
+                .then(e => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
+            : {};
+        el.items?.filter?.(item => item.component)?.forEach(item => Object.assign(item, { count: counts?.[item.component] }));
     })