@opengis/admin 0.2.142 → 0.2.144

package/server/helpers/list/descriptionList.js

@@ -1,18 +1,15 @@
 import { config, handlebarsSync, handlebars } from '@opengis/fastify-table/utils.js'
 
 async function format(d, key, data) {
+
     if (!key?.includes) return '';
     if (d === true) return 'Так';
     if (d === false) return 'Ні';
 
-    if (key.startsWith('{{') && key.match(/\{\{([^\s]+)/)?.[1] in handlebarsSync.helpers) {
-        return handlebarsSync.compile(key)(data);
-    } else if (key.startsWith('{{')) {
-        return handlebars.compile(key)(data);
+    if (key.includes('{{')) {
+        return await handlebars.compile(key)(data);
     }
 
-    // if (config.local && config.debug) console.log('descriptionList:d', d, key, data);
-    if (!d) return null;
     return d;
 }
 export default async function descriptionList(data, opt) {
@@ -38,10 +35,6 @@ export default async function descriptionList(data, opt) {
 
         const d1 = await format(data[key], key, data) || '-';
 
-        if (config.local && config.debug && d1 === '-') {
-            // console.log('descriptionList:for', name, nameHBS, key, data);
-        }
-
         result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4">
             <dt class="text-gray-900">${nameHBS || name}</dt>
             <dd class="text-gray-700 sm:col-span-2">${d1}</dd>

package/server/helpers/list/tableList.js

@@ -10,8 +10,8 @@ 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.startsWith('{{') && key.match(/\{\{([^\s]+)/)?.[1] in handlebarsSync.helpers) {
-        return handlebarsSync.compile(key)(data);
+    if (key.startsWith('{{')) {
+        return handlebars.compile(key)(data);
     } else if (key.startsWith('{{') && key.includes(' ') && !(key.match(/\{\{([^\s]+)/)?.[1] in handlebars.helpers)) {
         return null;
     }
@@ -21,7 +21,7 @@ function format(d, key, data, hash) {
 export default async function tableList(data, opt) {
     const { hash } = opt;
     // no data
-
+    // const time = Date.now();
     if (hash.nodata && !data?.length) {
         const noDataText = typeof hash.nodata == 'string' ? hash.nodata : '<div class="bg-gray-200 text-center p-6 rounded-xl"><h3 class="text-lg font-semibold">Інформація відсутня</h3></div>';
         return noDataText
@@ -66,7 +66,7 @@ export default async function tableList(data, opt) {
             if (skip[name]) continue;
 
             const tokenData = key == 'actions' ? token : null;
-            const d1 = ['{{format', '{{select', '{{badge', '{{#ifCond'].filter(el => key.includes(el)).length ? await handlebars.compile(key)({ ...row, token, hash }) || '-' : null
+            const d1 = key.includes('{{') ? await handlebars.compile(key)({ ...row, token, hash }) || '-' : null
             result.push(`<td class="whitespace-nowrap py-2 text-gray-900">
                                ${d1 || format(tokenData || row[key], key, row, hash)}
                             </td>`);
@@ -78,6 +78,6 @@ export default async function tableList(data, opt) {
     }
     result.push('</tbody>');
 
-
+    //    console.log(Date.now() - time)
     return '<table class="min-w-full divide-y-2 divide-gray-200 bg-white min-w-full divide-y-2 divide-gray-200 bg-white "> ' + result.join('') + '</table>';
 }

package/server/helpers/list/utils/button.js

@@ -1,6 +1,6 @@
-
-
-export default function button(token, title) {
-    return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
-    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white">${title || 'Додати'}</button>`;
+
+
+export default function button(token, title) {
+    return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
+    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white">${title || 'Додати'}</button>`;
 }

package/server/routes/data/controllers/utils/conditions.js

@@ -1,21 +1,21 @@
-function onCheck(rule, data) {
-    const val = data[rule[0]];
-    // console.log(val, rule[1], rule[2])
-    if (rule[1] === '==') return val === rule[2];
-    if (rule[1] === '!=') return val !== rule[2];
-    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
-    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
-
-    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
-    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
-
-    if (rule[1] === '>') return val > rule[2];
-    if (rule[1] === '<') return val < rule[2];
-}
-export default function conditions(rules, data) {
-    if (!rules?.length) return true;
-    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
-    // console.log(rules, result)
-    return result;
-
+function onCheck(rule, data) {
+    const val = data[rule[0]];
+    // console.log(val, rule[1], rule[2])
+    if (rule[1] === '==') return val === rule[2];
+    if (rule[1] === '!=') return val !== rule[2];
+    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
+    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
+
+    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
+    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
+
+    if (rule[1] === '>') return val > rule[2];
+    if (rule[1] === '<') return val < rule[2];
+}
+export default function conditions(rules, data) {
+    if (!rules?.length) return true;
+    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
+    // console.log(rules, result)
+    return result;
+
 }

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

@@ -84,7 +84,8 @@ export default async function cardPrint(req, reply) {
     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.replace(req.routeOptions.url.split(':')[0], '/card/');
+    const trimPort = ['80', '443'].find(el => req.hostname.endsWith(el));
+    const url = (req.protocol || 'https') + '://' + req.hostname.replace(trimPort, '') + req.url.replace(req.routeOptions.url.split(':')[0], '/card/');
     const qrCode = `<img src="${await qr.toDataURL(url, { type: 'png', ec_level: 'M', size: 5, margin: 4 })}" alt="qrcode">`;
 
     const cardTemplates = await getTemplate('card', table);