@opengis/admin 0.2.113 → 0.2.114

package/server/helpers/temp/ifCond.js

@@ -1,101 +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);
-  }
-}
+/**
+ * Перетинає два масиви
+ *
+ * @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

@@ -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/plugins/access/index.mjs

@@ -1,6 +1,6 @@
-import getAdminAccess from './funcs/getAdminAccess.js';
-
-async function plugin(fastify) {
-//   fastify.decorate('getAdminAccess', getAdminAccess);
-}
-export default plugin;
+import getAdminAccess from './funcs/getAdminAccess.js';
+
+async function plugin(fastify) {
+//   fastify.decorate('getAdminAccess', getAdminAccess);
+}
+export default plugin;

package/server/plugins/adminHook.js

@@ -1,81 +1,81 @@
-import fp from 'fastify-plugin';
-import fs from 'node:fs';
-
-import config from '../../config.js';
-
-// to export the decorators to the outer scope
-
-async function plugin(fastify) {
-  fastify.decorate('config', config);
-
-  // preSerialization
-  fastify.addHook('preSerialization', async (req, reply, payload) => {
-    if (req.url.includes('/suggest/') && !req.query.json) {
-      return payload?.data;
-    }
-    if (payload?.redirect) {
-      return reply.redirect(payload.redirect);
-    }
-    if (reply.sent) {
-      return null;
-    }
-
-    if ([200, 400, 403, 409, 404, 500].includes(payload.status)) {
-      reply.status(payload.status);
-    }
-    /* if (payload.headers) {
-      reply.headers(payload.headers);
-    } */
-    if (payload?.buffer) {
-      return payload.buffer;
-    }
-    if (payload?.file) {
-      // const buffer = await readFile(payload.file);
-      // return reply.send(buffer);
-      const stream = fs.createReadStream(payload.file);
-      return stream;
-      // return reply.send(stream);
-    }
-
-    if (payload?.message) {
-      return payload.message;
-    }
-    return payload;
-  });
-
-  //  preValidation
-  fastify.addHook('preValidation', async (req) => {
-    const parseRawBody = ['POST', 'PUT'].includes(req.method) && req.body && typeof req.body === 'string'
-      && req.body.trim(/\r\n/g).startsWith('{')
-      && req.body.trim(/\r\n/g).endsWith('}');
-    if (parseRawBody) {
-      try {
-        req.body = JSON.parse(req.body || '{}');
-      }
-      catch (err) {
-        // throw new Error('invalid body');
-        // return { error: 'invalid body', status: 400 };
-      }
-    }
-  });
-
-  // allow upload file
-  const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
-  fastify.addContentTypeParser('multipart', (request, _, done) => {
-    request[kIsMultipart] = true;
-    done(null);
-  });
-
-  // parse Body
-  function contentParser(req, body, done) {
-    const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
-      const [key, val] = el.split('=');
-      return { ...acc, [key]: val };
-    }, {});
-    done(null, parseBody);
-  }
-
-  fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
-}
-
-export default fp(plugin);
+import fp from 'fastify-plugin';
+import fs from 'node:fs';
+
+import config from '../../config.js';
+
+// to export the decorators to the outer scope
+
+async function plugin(fastify) {
+  fastify.decorate('config', config);
+
+  // preSerialization
+  fastify.addHook('preSerialization', async (req, reply, payload) => {
+    if (req.url.includes('/suggest/') && !req.query.json) {
+      return payload?.data;
+    }
+    if (payload?.redirect) {
+      return reply.redirect(payload.redirect);
+    }
+    if (reply.sent) {
+      return null;
+    }
+
+    if ([200, 400, 403, 409, 404, 500].includes(payload.status)) {
+      reply.status(payload.status);
+    }
+    /* if (payload.headers) {
+      reply.headers(payload.headers);
+    } */
+    if (payload?.buffer) {
+      return payload.buffer;
+    }
+    if (payload?.file) {
+      // const buffer = await readFile(payload.file);
+      // return reply.send(buffer);
+      const stream = fs.createReadStream(payload.file);
+      return stream;
+      // return reply.send(stream);
+    }
+
+    if (payload?.message) {
+      return payload.message;
+    }
+    return payload;
+  });
+
+  //  preValidation
+  fastify.addHook('preValidation', async (req) => {
+    const parseRawBody = ['POST', 'PUT'].includes(req.method) && req.body && typeof req.body === 'string'
+      && req.body.trim(/\r\n/g).startsWith('{')
+      && req.body.trim(/\r\n/g).endsWith('}');
+    if (parseRawBody) {
+      try {
+        req.body = JSON.parse(req.body || '{}');
+      }
+      catch (err) {
+        // throw new Error('invalid body');
+        // return { error: 'invalid body', status: 400 };
+      }
+    }
+  });
+
+  // allow upload file
+  const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
+  fastify.addContentTypeParser('multipart', (request, _, done) => {
+    request[kIsMultipart] = true;
+    done(null);
+  });
+
+  // parse Body
+  function contentParser(req, body, done) {
+    const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
+      const [key, val] = el.split('=');
+      return { ...acc, [key]: val };
+    }, {});
+    done(null, parseBody);
+  }
+
+  fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
+}
+
+export default fp(plugin);

package/server/plugins/cron.js

@@ -1,11 +1,11 @@
-//import { addCron } from '@opengis/fastify-table/utils.js';
-
-async function deleteOldNotifications({ pg }) {
-    const { rowCount } = pg?.pk?.['crm.notifications'] ? await pg.query('delete from crm.notifications where CURRENT_DATE - \'14 days\'::interval > cdate') : {};
-    return { rowCount };
-}
-
-export default async function cron(fastify) {
-    // addCron(deleteOldNotifications, 60 * 60 * 24, fastify);
-    //  addCron(deleteOldNotifications, 60 * 1, fastify); // debug
+//import { addCron } from '@opengis/fastify-table/utils.js';
+
+async function deleteOldNotifications({ pg }) {
+    const { rowCount } = pg?.pk?.['crm.notifications'] ? await pg.query('delete from crm.notifications where CURRENT_DATE - \'14 days\'::interval > cdate') : {};
+    return { rowCount };
+}
+
+export default async function cron(fastify) {
+    // addCron(deleteOldNotifications, 60 * 60 * 24, fastify);
+    //  addCron(deleteOldNotifications, 60 * 1, fastify); // debug
 }

package/server/plugins/docs.js

@@ -1,28 +1,28 @@
-'use strict'
-
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
-import fs from 'fs';
-
-const dir = dirname(fileURLToPath(import.meta.url));
-const root = `${dir}/../../`;
-
-
-async function plugin(fastify, opts) {
-  fastify.get('/docs*', async (req, reply) => {
-    if (!fs.existsSync(path.join(root, 'docs/.vitepress/dist/'))) {
-      return reply.status(404).send('docs not exists');
-    }
-    const { params } = req;
-    const url = params['*']
-    const filePath = url && url[url.length - 1] !== '/' ? path.join(root, 'docs/.vitepress/dist/', url) : path.join(root, 'docs/.vitepress/dist/', url, 'index.html')
-    const ext = path.extname(filePath);
-    const mime = {
-      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg'
-    }[ext];
-    const stream = fs.createReadStream(filePath);
-    return mime ? reply.type(mime).send(stream) : stream;
-
-  })
-}
-export default plugin;
+'use strict'
+
+import path, { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import fs from 'fs';
+
+const dir = dirname(fileURLToPath(import.meta.url));
+const root = `${dir}/../../`;
+
+
+async function plugin(fastify, opts) {
+  fastify.get('/docs*', async (req, reply) => {
+    if (!fs.existsSync(path.join(root, 'docs/.vitepress/dist/'))) {
+      return reply.status(404).send('docs not exists');
+    }
+    const { params } = req;
+    const url = params['*']
+    const filePath = url && url[url.length - 1] !== '/' ? path.join(root, 'docs/.vitepress/dist/', url) : path.join(root, 'docs/.vitepress/dist/', url, 'index.html')
+    const ext = path.extname(filePath);
+    const mime = {
+      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg'
+    }[ext];
+    const stream = fs.createReadStream(filePath);
+    return mime ? reply.type(mime).send(stream) : stream;
+
+  })
+}
+export default plugin;

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

@@ -1,30 +1,30 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getAdminAccess } from '../../../../utils.js';
-
-export default async function accessGroup({
-    pg = pgClients.client, params = {}, session = {},
-}) {
-    const { user = {} } = session?.passport || {};
-
-    if (!params?.id) {
-        return { message: 'not enough params: id', status: 400 };
-    }
-
-    // restrict access - admin only
-    const check = await getAdminAccess({
-        id: params.id, user,
-    });
-    if (check) return check;
-
-    const { rows: routes = [] } = await pg.query(`select a.route_id as path, b.actions from admin.routes a 
-    left join admin.role_access b on a.route_id=b.route_id
-    where b.role_id=$1`, [params.id]);
-
-    const { rows: users = [] } = await pg.query(`select user_uid as id, user_name as name, access_granted, 
-    b.cdate as user_created, b.last_activity_date as last_activity from admin.user_roles a
-    left join admin.users b on a.user_uid=b.uid
-    where a.role_id=$1`, [params.id]);
-
-    return { routes, users };
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+import { getAdminAccess } from '../../../../utils.js';
+
+export default async function accessGroup({
+    pg = pgClients.client, params = {}, session = {},
+}) {
+    const { user = {} } = session?.passport || {};
+
+    if (!params?.id) {
+        return { message: 'not enough params: id', status: 400 };
+    }
+
+    // restrict access - admin only
+    const check = await getAdminAccess({
+        id: params.id, user,
+    });
+    if (check) return check;
+
+    const { rows: routes = [] } = await pg.query(`select a.route_id as path, b.actions from admin.routes a 
+    left join admin.role_access b on a.route_id=b.route_id
+    where b.role_id=$1`, [params.id]);
+
+    const { rows: users = [] } = await pg.query(`select user_uid as id, user_name as name, access_granted, 
+    b.cdate as user_created, b.last_activity_date as last_activity from admin.user_roles a
+    left join admin.users b on a.user_uid=b.uid
+    where a.role_id=$1`, [params.id]);
+
+    return { routes, users };
 }

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

@@ -1,55 +1,55 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getAdminAccess } from '../../../../utils.js';
-import accessGroup from './access.group.js';
-
-export default async function accessGroupPost({
-    pg = pgClients.client, params = {}, session = {}, body = {},
-}) {
-    const { id } = params;
-    const { user } = session?.passport || {};
-    if (!user) return { status: 403, message: 'access restricted' }
-
-    // restrict access - admin only
-    const check = await getAdminAccess({ id, user });
-    if (check) return check;
-
-    const { users = [], routes = [] } = body;
-
-    if (!routes?.length) {
-        // return { message: 'not enough params: users / routes', status: 400 };
-        await pg.query(`delete from admin.role_access where role_id=$1`, [id]);
-
-        if (!users?.length) {
-            return { message: { id, routes }, status: 200 };
-        }
-    }
-
-    if (routes?.length) {
-        const { routesDB = [] } = await pg.query('select array_agg(route_id) as "routesDB" from admin.routes where enabled')
-            .then((res1) => res1.rows?.[0] || {});
-        await pg.query(`delete from admin.role_access where role_id=$1;`, [id]);
-
-
-        const q = `insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)`;
-        await Promise.all(routes.filter(el => routesDB.includes(el.path) && 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.role_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 };
-        }
-    }
-
-    const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
-    insert into admin.user_roles(role_id,user_uid,access_granted)
-    values ${users.filter((el) => el?.id).map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${uid?.replace(/'/g, "''")}')`)}`;
-
-    await pg.query(q);
-
-    const res = await accessGroup({ pg, params, session });
-
-    return res;
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+import { getAdminAccess } from '../../../../utils.js';
+import accessGroup from './access.group.js';
+
+export default async function accessGroupPost({
+    pg = pgClients.client, params = {}, session = {}, body = {},
+}) {
+    const { id } = params;
+    const { user } = session?.passport || {};
+    if (!user) return { status: 403, message: 'access restricted' }
+
+    // restrict access - admin only
+    const check = await getAdminAccess({ id, user });
+    if (check) return check;
+
+    const { users = [], routes = [] } = body;
+
+    if (!routes?.length) {
+        // return { message: 'not enough params: users / routes', status: 400 };
+        await pg.query(`delete from admin.role_access where role_id=$1`, [id]);
+
+        if (!users?.length) {
+            return { message: { id, routes }, status: 200 };
+        }
+    }
+
+    if (routes?.length) {
+        const { routesDB = [] } = await pg.query('select array_agg(route_id) as "routesDB" from admin.routes where enabled')
+            .then((res1) => res1.rows?.[0] || {});
+        await pg.query(`delete from admin.role_access where role_id=$1;`, [id]);
+
+
+        const q = `insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)`;
+        await Promise.all(routes.filter(el => routesDB.includes(el.path) && 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.role_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 };
+        }
+    }
+
+    const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
+    insert into admin.user_roles(role_id,user_uid,access_granted)
+    values ${users.filter((el) => el?.id).map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${uid?.replace(/'/g, "''")}')`)}`;
+
+    await pg.query(q);
+
+    const res = await accessGroup({ pg, params, session });
+
+    return res;
 }