@opengis/admin 0.1.94 → 0.1.96

package/server/helpers/temp/ifCond.js

@@ -0,0 +1,101 @@
+/**
+ * Перетинає два масиви
+ *
+ * @example
+ * // returns [1, 4, 5, 6]
+ * intersect([1,2,3,4,5,6],[1,4,5,6,7,8,9,11])
+ * @param {Array} a
+ * @param {Array} b
+ * @returns {Array} Returns new intersect array
+ */
+function intersect(a, b) {
+  let aN = a; let bN = b;
+  if (b.length > a.length) {
+    [aN, bN] = [bN, aN];
+  }
+  return aN.filter((e) => bN.includes(e));
+}
+
+/**
+ * Створення шаблона або його частини внаслідок перевірки значення із веб-запиту та заздалегідь прописаного значення.
+ * Дозволяє змінювати наповнення сторінки через ряд перевірок. Є можливість внесення додаткової умови - що робити, коли умова не виконується.
+ *
+ * @summary Перевірка двох значень та виконання коду при виконанні умови, а також у всіх інших випадках.
+ * @priority 5
+ * @alias ifCond
+ * @type helper
+ * @tag condition
+ * @example
+ * {{#ifCond @root.req.domain 'in' 'help.softpro.ua,123'}} {{select user.uid data="get_full_uid"}} {{^}} Умова не виконана {{/ifCond}}
+ * @example
+ * {{#ifCond "1234567890" 'in' @root.user.group_list}} 1=1 {{^}} uid='{{uid}}' {{/ifCond}}
+ * @example
+ * {{#ifCond 'debug' 'in' @root.setting.core.setting}}Умова виконана{{^}}Не виконана умова{{/ifCond}}
+ * @param {Array} args Параметри для значень і умов
+ * @param {Array} args[0]] Перше значення
+ * @param {Array} args[1]] Оператор
+ * @param {Array} args[2]] Друге значення
+ * @returns {String} Returns HTML
+ */
+export default function ifCond(v1, operator, v2, options) {
+  const __obj = this;
+
+  switch (operator) {
+    case '==':
+      return (v1 == v2) ? options.fn(__obj) : options.inverse(__obj);
+    case '!=':
+      return (v1 != v2) ? options.fn(__obj) : options.inverse(__obj);
+    case '===':
+      return (v1 === v2) ? options.fn(__obj) : options.inverse(__obj);
+    case '!==':
+      return (v1 !== v2) ? options.fn(__obj) : options.inverse(__obj);
+    case '&&':
+      return (v1 && v2) ? options.fn(__obj) : options.inverse(__obj);
+    case '||':
+      return (v1 || v2) ? options.fn(__obj) : options.inverse(__obj);
+    case '<':
+      return (v1 < v2) ? options.fn(__obj) : options.inverse(__obj);
+    case '<=':
+      return (v1 <= v2) ? options.fn(__obj) : options.inverse(__obj);
+    case '>':
+      return (v1 > v2) ? options.fn(__obj) : options.inverse(__obj);
+    case '>=':
+      return (v1 >= v2) ? options.fn(__obj) : options.inverse(__obj);
+    case '&':
+      return intersect(v1, v2).length !== 0
+        ? options.fn(__obj)
+        : options.inverse(__obj);
+    case '!~':
+      return (v1 || '').indexOf(v2) === -1
+        ? options.fn(__obj)
+        : options.inverse(__obj);
+    case '~':
+      return (v1 || '').indexOf(v2) !== -1
+        ? options.fn(__obj)
+        : options.inverse(__obj);
+    case 'period':
+      return (new Date(v1) < new Date() && new Date(v2) > new Date())
+        ? options.fn(__obj)
+        : options.inverse(__obj);
+    case 'in': {
+      if (typeof v2 === 'string') v2 = v2.split(',').map(item => item.trim());
+
+      if (Array.isArray(v1)) {
+        return v1.some((value) => v2.includes(value.toString()))
+          ? options.fn(__obj)
+          : options.inverse(__obj);
+      }
+      return v2.includes(v1?.toString())
+        ? options.fn(__obj)
+        : options.inverse(__obj);
+    }
+    case 'not in': {
+      if (typeof v2 === 'string') v2 = v2.split(',').map(item => item.trim());
+      return !v2.includes(v1?.toString())
+        ? options.fn(__obj)
+        : options.inverse(__obj);
+    }
+    default:
+      return options.inverse(__obj);
+  }
+}

package/server/helpers/utils/button.js

@@ -0,0 +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>`;
+}

package/server/helpers/utils/buttonDel.js

@@ -0,0 +1,6 @@
+
+
+export default function button(token, title) {
+    return `<button onclick="window.v3plugin.$api({ api: '/api/table/${token}', method:'delete',confirm: { title:'Підтвердити операцію',  text: 'Ви впевнені що хочете вилучити запис?', cancel: 'Скасувати', confirm : 'Виконати'} })"
+    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-red-600 border border-transparent rounded-lg gap-x-2 hover:bg-red-700 hover:text-white">${title || 'Вилучити'}</button>`;
+}

package/server/plugins/access/funcs/getAdminAccess.js

@@ -7,9 +7,7 @@ export default async function getAdminAccess({
         return { message: 'not enough params: id', status: 400 };
     }
 
-    if (config?.auth?.disable) return;
-
-    if (!config?.local && user?.user_type?.includes('admin')) {
+    if (!config?.local && !['admin'].includes(user.user_type, user.type)) {
         return { message: 'access restricted: admin', status: 403 };
     }
 }

package/server/routes/access/controllers/access.group.post.js

@@ -7,8 +7,8 @@ export default async function accessGroupPost({
     pg = pgClients.client, params = {}, session = {}, body = {},
 }) {
     const { id } = params;
-    const { user = {} } = session?.passport || {};
-    const uid = config?.auth?.disable ? '1' : user?.uid;
+    const { user } = session?.passport || {};
+    if (!user) return { status: 403, message: 'access restricted' }
 
     // restrict access - admin only
     const check = await getAdminAccess({ id, user });
@@ -21,11 +21,16 @@ export default async function accessGroupPost({
     }
 
     if (routes?.length) {
-        const q = `delete from admin.access where role_id='${id.replace(/'/g, "''")}';
-        insert into admin.access(role_id,route_id,actions)
-        values ${routes.filter((el) => el?.path && Object.hasOwn(el, 'actions')).map((el) => `('${id.replace(/'/g, "''")}','${el.path.replace(/'/g, "''")}',${el.actions?.length ? `'{ ${el.actions} }'::text[]` : 'null'})`)}`;
+        // delete from admin.access where role_id=$1;
+        await pg.query(`delete from admin.access where role_id=$1;`, [id]);
 
-        await pg.query(q);
+
+        const q = `insert into admin.access(role_id,route_id,actions)   values ($1,$2,$3)`;
+        await Promise.all(routes.filter(el => el.actions).map(el => pg.query(q, [id, el.path, el.actions])))
+
+        const { rows } = await pg.query(`select a.route_id as path, b.actions as actions from admin.routes a 
+            left join admin.access b on a.route_id=b.route_id
+            where b.role_id=$1`, [id]);
 
         if (!users?.length) {
             return { message: { id, routes: rows }, status: 200 };

package/server/routes/access/index.mjs

@@ -1,61 +1,6 @@
 import accessGroup from "./controllers/access.group.js";
 import accessGroupPost from "./controllers/access.group.post.js";
-
-const accessGroupSchema = {
-    params: {
-        type: 'object',
-        properties: {
-            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-        required: ['id'],
-    },
-};
-
-const accessGroupPostSchema = {
-    params: {
-        type: 'object',
-        properties: {
-            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-        required: ['id'],
-    },
-    body: {
-        type: 'object',
-        properties: {
-            users: {
-                type: 'array',
-                items: {
-                    type: 'object',
-                    properties: {
-                        id: {
-                            type: 'string',
-                            pattern: '^([\\d\\w._-]+)$',
-                        },
-                    },
-                },
-            },
-            routes: {
-                type: 'array',
-                items: {
-                    type: 'object',
-                    properties: {
-                        path: {
-                            type: 'string',
-                            pattern: '^([\\d\\w._-]+)$',
-                        },
-                        actions: {
-                            type: 'array',
-                            items: {
-                                type: 'string',
-                                enum: ['get', 'add', 'edit', 'del'],
-                            },
-                        },
-                    },
-                },
-            },
-        },
-    },
-};
+import { accessGroupPostSchema, accessGroupSchema } from "./schema.mjs";
 
 export default async function route(fastify) {
     fastify.get('/access-group/:id', { schema: accessGroupSchema }, accessGroup);

package/server/routes/access/schema.mjs

@@ -0,0 +1,58 @@
+export default null;
+export { accessGroupSchema, accessGroupPostSchema }
+
+const accessGroupSchema = {
+    params: {
+        type: 'object',
+        properties: {
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+        required: ['id'],
+    },
+};
+
+const accessGroupPostSchema = {
+    params: {
+        type: 'object',
+        properties: {
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+        required: ['id'],
+    },
+    body: {
+        type: 'object',
+        properties: {
+            users: {
+                type: 'array',
+                items: {
+                    type: 'object',
+                    properties: {
+                        id: {
+                            type: 'string',
+                            pattern: '^([\\d\\w._-]+)$',
+                        },
+                    },
+                },
+            },
+            routes: {
+                type: 'array',
+                /*items: {
+                    type: 'object',
+                    properties: {
+                        path: {
+                            type: 'string',
+                            pattern: '^([\\d\\w._-]+)$',
+                        },
+                        actions: {
+                            type: 'array',
+                            items: {
+                                type: 'string',
+                                enum: ['get', 'add', 'edit', 'del'],
+                            },
+                        },
+                    },
+                },*/
+            },
+        },
+    },
+};

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

@@ -27,8 +27,8 @@ export default async function getCardData(req) {
     if (message) return { message };
 
     // conditions 
-    index.panels.forEach(el => {
-        el.items = el.items.filter(el => conditions(el.conditions, rows[0]));
+    index.panels?.filter(el => el.items).forEach(el => {
+        el.items = el.items?.filter(el => conditions(el.conditions, rows[0]));
     })
     // tokens result
     const tokens = {};

package/server/routes/notifications/funcs/sendNotification.js

@@ -45,9 +45,10 @@ export default async function notification({
 
   const keyTo = `${pg.options?.database}:mail:${provider[0]}:${to || ''}${id || ''}${table || ''}${title || ''}`;
   const uniqueTo = await rclient.setnx(keyTo, 1);
-  logger.info('notification/sent', { keyTo, send: uniqueTo, nocache });
+
 
   if (!uniqueTo && !nocache) {
+    logger.file('notification/sent', { keyTo, send: uniqueTo, nocache });
     return `already sent: ${keyTo}`;
   }
   await rclient.expire(keyTo, 1000 * 600);
@@ -60,46 +61,32 @@ export default async function notification({
     return 'notification provider - must be array and not empty';
   }
 
-  try {
-    const html = await generateNotificationContent({
-      pg, table, template, id, message, data,
+  const html = await generateNotificationContent({
+    pg, table, template, id, message, data,
+  });
+
+  if (provider.includes('email')) {
+    const files = Array.isArray(file) ? file : [file];
+    const attachments = files?.length && false ? await Promise.all(files?.filter((el) => el).map(async (el) => {
+      /* const content = await downloadFile(el, { buffer: true }); // ?
+      return {
+        filename: el.split('/').pop(),
+        encoding: 'base64',
+        content,
+      }; */
+    })) : [];
+
+    const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
+
+    const result = await sendEmail({
+      attachments,
+      html,
+      subject: title,
+      from,
+      to: toEmail,
     });
 
-    // return html;
-
-    if (provider.includes('email')) {
-      const files = Array.isArray(file) ? file : [file];
-      const attachments = files?.length && false ? await Promise.all(files?.filter((el) => el).map(async (el) => {
-        /* const content = await downloadFile(el, { buffer: true }); // ?
-        return {
-          filename: el.split('/').pop(),
-          encoding: 'base64',
-          content,
-        }; */
-      })) : [];
-
-      const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
-
-      const result = await sendEmail({
-        attachments,
-        html,
-        subject: title,
-        from,
-        to: toEmail,
-      });
-
-      logger.info('notification', {
-        provider, title, to: toEmail, from, result, len: message?.length, files,
-      });
-
-      return result;
-    }
-    return null;
-  }
-  catch (err) {
-    logger.info('notification/error', {
-      provider, from, to, err: err.toString(),
-    });
-    throw err;
+    return result;
   }
+  return null;
 }

package/server/helpers/controllers/badge.js

@@ -1,12 +0,0 @@
-export default async function badge(data, options = {}) {
-    if (!data) return '-';
-    //const cls = await getSelect(options.data, { val: data, full: 1 });
-
-    return data;
-    /*const html = cls?.map((el) => {
-        const color = bscolor[el.color] || el.color || '#aaa';
-        return `<span class="el-tag el-tag--mini" style="color:${color || '#aaa'};border-color:${color || '#aaa'};background:unset;">
-        ${funcs.locale(el.id, { lang: root.lang, prefix: opt.data, type: 'cls' }) || el.text}</span>`;
-    }).join(', ');
-    return html;*/
-}

package/server/helpers/controllers/hb.js

@@ -1,3 +0,0 @@
-export default async function _hb() {
-    return '';
-}

package/server/helpers/controllers/map.js

@@ -1,3 +0,0 @@
-export default async function map() {
-    return '';
-}

package/server/helpers/controllers/mls.js

@@ -1,3 +0,0 @@
-export default async function _mls(data, options={}) {
-    return data.hash?.ua || options?.hash?.ua || '';
-}

package/server/helpers/controllers/vue.js

@@ -1,3 +0,0 @@
-export default async function _vue() {
-    return '';
-}

package/server/helpers/index.mjs

@@ -1,29 +0,0 @@
-import _hb from "./controllers/hb.js";
-import _vue from "./controllers/vue.js";
-import map from "./controllers/map.js";
-import _mls from "./controllers/mls.js";
-import badge from "./controllers/badge.js";
-import token from "./controllers/token.js";
-
-// list
-
-import descriptionList from "./list/descriptionList.js";
-import tableList from "./list/tableList.js";
-import buttonHelper from "./list/buttonHelper.js";
-
-import { handlebars } from "@opengis/fastify-table/utils.js";
-
-export default async function route(fastify) {
-    handlebars.registerHelper('_hb', _hb);
-    handlebars.registerHelper('_vue', _vue);
-    handlebars.registerHelper('map', map);
-    handlebars.registerHelper('mls', _mls);
-    handlebars.registerHelper('badge', badge);
-    handlebars.registerHelper('token', token);
-
-
-    // list
-    handlebars.registerHelper('descriptionList', descriptionList);
-    handlebars.registerHelper('tableList', tableList);
-    handlebars.registerHelper('button', buttonHelper);
-}