@opengis/admin 0.2.81 → 0.2.83

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/data/controllers/utils/getColumns.js

@@ -1,9 +1,9 @@
-import { getTemplate } from "@opengis/fastify-table/utils.js";
-
-export default async function getColumns({
-    columns = [], params = {}, opt = {}, loadTable = {}, form, table, dbColumns = [], mode = 'table',
-}) {
-    const columnList = dbColumns.map((el) => el.name || el).join(',');
-    const cols = columns.filter((el) => columnList.includes(el?.name) && el?.name !== 'geom').map((el) => el?.name || el).join(',');
-    return { cols, columnList };
+import { getTemplate } from "@opengis/fastify-table/utils.js";
+
+export default async function getColumns({
+    columns = [], params = {}, opt = {}, loadTable = {}, form, table, dbColumns = [], mode = 'table',
+}) {
+    const columnList = dbColumns.map((el) => el.name || el).join(',');
+    const cols = columns.filter((el) => columnList.includes(el?.name) && el?.name !== 'geom').map((el) => el?.name || el).join(',');
+    return { cols, columnList };
 }

package/server/routes/data/index.mjs

@@ -1,20 +1,20 @@
-
-import tableData from "./controllers/tableData.js";
-import tokenInfo from "./controllers/tokenInfo.js";
-// import tableDataId from "./controllers/tableDataId.js";
-import cardData from "./controllers/cardData.js";
-import cardTabData from './controllers/cardTabData.js';
-import tableFilter from "./controllers/tableFilter.js";
-
-import { tableDataSchema, tableDataIdSchema, tableFilterSchema, cardTabDataSchema } from './schema.js';
-import tableInfo from "./controllers/tableInfo.js";
-
-export default async function route(fastify) {
-    const policy = ['public'];
-    fastify.get(`/token-info/:token`, { config: { policy: ['admin'] } }, tokenInfo);
-    fastify.get(`/table-data/:table`, { config: { policy }, schema: tableDataSchema }, tableData);
-    fastify.get(`/card-data/:token`, { config: { policy }, scheme: cardTabDataSchema }, cardTabData);
-    fastify.get(`/table-data/:table/:id`, { config: { policy }, schema: tableDataIdSchema }, cardData);
-    fastify.get(`/table-filter/:name`, { config: { policy }, schema: tableFilterSchema }, tableFilter);
-    fastify.get(`/table-info/:table/:id?`, { config: { policy }, schema: tableDataSchema }, tableInfo);
-}
+
+import tableData from "./controllers/tableData.js";
+import tokenInfo from "./controllers/tokenInfo.js";
+// import tableDataId from "./controllers/tableDataId.js";
+import cardData from "./controllers/cardData.js";
+import cardTabData from './controllers/cardTabData.js';
+import tableFilter from "./controllers/tableFilter.js";
+
+import { tableDataSchema, tableDataIdSchema, tableFilterSchema, cardTabDataSchema } from './schema.js';
+import tableInfo from "./controllers/tableInfo.js";
+
+export default async function route(fastify) {
+    const policy = ['public'];
+    fastify.get(`/token-info/:token`, { config: { policy: ['admin'] } }, tokenInfo);
+    fastify.get(`/table-data/:table`, { config: { policy }, schema: tableDataSchema }, tableData);
+    fastify.get(`/card-data/:token`, { config: { policy }, scheme: cardTabDataSchema }, cardTabData);
+    fastify.get(`/table-data/:table/:id`, { config: { policy }, schema: tableDataIdSchema }, cardData);
+    fastify.get(`/table-filter/:name`, { config: { policy }, schema: tableFilterSchema }, tableFilter);
+    fastify.get(`/table-info/:table/:id?`, { config: { policy }, schema: tableDataSchema }, tableInfo);
+}

package/server/routes/data/schema.js

@@ -1,54 +1,54 @@
-const tableDataSchema = {
-    querystring: {
-        limit: { type: 'string', pattern: '^(\\d+)$' },
-        page: { type: 'string', pattern: '^(\\d+)$' },
-        // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-        // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-        order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        desc: { type: 'string', pattern: '^(\\d+)$' },
-        state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
-        polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
-        // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-        sql: { type: 'string', pattern: '^(\\d)$' },
-    },
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    }
-};
-
-const tableDataIdSchema = {
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
-};
-
-const tableFilterSchema = {
-    params: {
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
-};
-
-const cardDataSchema = {
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        table: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
-};
-
-const cardTabDataSchema = {
-    querystring: {
-        sql: { type: 'string', pattern: '^(\\d)$' }
-    },
-    params: {
-        token: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    }
-};
-export { 
-    tableDataSchema, tableDataIdSchema, tableFilterSchema,
-    cardDataSchema, cardTabDataSchema
- }
-export default null;
+const tableDataSchema = {
+    querystring: {
+        limit: { type: 'string', pattern: '^(\\d+)$' },
+        page: { type: 'string', pattern: '^(\\d+)$' },
+        // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+        // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+        order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        desc: { type: 'string', pattern: '^(\\d+)$' },
+        state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
+        polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
+        // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+        sql: { type: 'string', pattern: '^(\\d)$' },
+    },
+    params: {
+        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    }
+};
+
+const tableDataIdSchema = {
+    params: {
+        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    }
+};
+
+const tableFilterSchema = {
+    params: {
+        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    }
+};
+
+const cardDataSchema = {
+    params: {
+        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        table: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    }
+};
+
+const cardTabDataSchema = {
+    querystring: {
+        sql: { type: 'string', pattern: '^(\\d)$' }
+    },
+    params: {
+        token: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    }
+};
+export { 
+    tableDataSchema, tableDataIdSchema, tableFilterSchema,
+    cardDataSchema, cardTabDataSchema
+ }
+export default null;

package/server/routes/menu/controllers/getMenu.js

@@ -36,7 +36,7 @@ export default async function adminMenu({ user = {}, session, pg = pgClients.cli
 
     // update user access
 
-    if (session && user?.uid && !config.local && ![user.user_type, user.type].includes('admin') && pg.pk['admin.role_access']) {
+    if (session && user?.uid && !config.local && !config.admin && ![user.user_type, user.type].includes('admin') && pg.pk['admin.role_access']) {
         const { type, gl = [], routes = [] } = await pg.query(`select user_type as type, b.gl,routes from admin.users a
         left join lateral ( select array_agg(role_id) as gl from admin.user_roles where user_uid=a.uid)b on 1=1
         left join lateral ( select array_agg(route_id) as routes from admin.role_access where role_id=any(b.gl))r on 1=1

package/server/routes/menu/index.mjs

@@ -1,5 +1,5 @@
-import getMenu from './controllers/getMenu.js';
-
-export default async function (fastify, opts) {
-  fastify.get(`/user-menu`, getMenu);
-}
+import getMenu from './controllers/getMenu.js';
+
+export default async function (fastify, opts) {
+  fastify.get(`/user-menu`, getMenu);
+}

package/server/routes/notifications/controllers/readNotifications.js

@@ -1,27 +1,27 @@
-export default async function readNotifications({
-  pg, params = {}, query = {}, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-
-    const { userId } = await pg.query('select uid as "userId" from admin.users where $1 in (uid,login) limit 1', [uid])
-      .then((res) => res.rows?.[0] || {});
-
-    if (!userId) {
-      return { message: 'access restricted: 2', status: 403 };
-    }
-
-    const q = `update crm.notifications set read=true where read is not true 
-    and ${params?.id ? 'notification_id=$2' : '1=1'} and addressee_id=$1`;
-
-    if (query.sql) return q;
-
-    const { rowCount = 0 } = await pg.query(q, [userId, params?.id].filter((el) => el));
-
-    return { message: `${rowCount} unread notifications marked as read`, status: 200 };
-
-}
+export default async function readNotifications({
+  pg, params = {}, query = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+
+    const { userId } = await pg.query('select uid as "userId" from admin.users where $1 in (uid,login) limit 1', [uid])
+      .then((res) => res.rows?.[0] || {});
+
+    if (!userId) {
+      return { message: 'access restricted: 2', status: 403 };
+    }
+
+    const q = `update crm.notifications set read=true where read is not true 
+    and ${params?.id ? 'notification_id=$2' : '1=1'} and addressee_id=$1`;
+
+    if (query.sql) return q;
+
+    const { rowCount = 0 } = await pg.query(q, [userId, params?.id].filter((el) => el));
+
+    return { message: `${rowCount} unread notifications marked as read`, status: 200 };
+
+}

package/server/routes/notifications/controllers/testEmail.js

@@ -1,35 +1,35 @@
-import config from '../../../../config.js';
-
-import sendNotification from '../funcs/sendNotification.js';
-
-export default async function testNotification({
-  pg, query = {}, session = {},
-}) {
-  const { local } = config || {};
-
-  if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
-    return { message: 'Forbidden', status: 403 };
-  }
-
-  const date = new Date().toISOString().split('T')[0];
-  if (!query.to) {
-    return { message: 'param to is required', status: 400 };
-  }
-
-  const {
-    to, template, table, id, nocache,
-  } = query;
-
-  const data = await sendNotification({
-    pg,
-    to,
-    template,
-    title: `Test Softpro ${date}`,
-    table,
-    nocache,
-    id,
-    message: `Test mail Softpro ${date} Lorem Ipsum Lorem Ipsum`,
-  });
-
-  return { message: data || 'ok' };
-}
+import config from '../../../../config.js';
+
+import sendNotification from '../funcs/sendNotification.js';
+
+export default async function testNotification({
+  pg, query = {}, session = {},
+}) {
+  const { local } = config || {};
+
+  if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
+    return { message: 'Forbidden', status: 403 };
+  }
+
+  const date = new Date().toISOString().split('T')[0];
+  if (!query.to) {
+    return { message: 'param to is required', status: 400 };
+  }
+
+  const {
+    to, template, table, id, nocache,
+  } = query;
+
+  const data = await sendNotification({
+    pg,
+    to,
+    template,
+    title: `Test Softpro ${date}`,
+    table,
+    nocache,
+    id,
+    message: `Test mail Softpro ${date} Lorem Ipsum Lorem Ipsum`,
+  });
+
+  return { message: data || 'ok' };
+}

package/server/routes/notifications/controllers/userNotifications.js

@@ -1,53 +1,53 @@
-// for example only
-/*
-    const res = await dataInsert({
-      pg,
-      table: 'crm.notifications',
-      data: {
-        subject: 'notif title',
-        body: 'notif body',
-        link: 'http://localhost:3000/api/notification',
-        addressee_id: userId,
-        author_id: userId,
-      },
-    });
-*/
-
-import { getSelectVal } from '@opengis/fastify-table/utils.js';
-
-const maxLimit = 100;
-
-export default async function userNotifications({
-  pg, query = {}, session = {},
-}) {
-  const time = Date.now();
-
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const limit = Math.min(maxLimit, +(query.limit || 5));
-  const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-  const q = `select notification_id as id, subject, body, cdate,
-  author_id, read, link, entity_id, (select avatar from admin.users where uid=a.author_id limit 1) as avatar from crm.notifications a where addressee_id=$1 order by cdate desc limit $2 offset $3`;
-
-  if (query.sql) return q;
-
-  const { rows = [] } = await pg.query(q, [uid, limit, offset]);
-
-  const values = rows.map((el) => el.author_id)
-    ?.filter((el, idx, arr) => el && arr.indexOf(el) === idx);
-
-  if (values?.length) {
-    const vals = await getSelectVal({ name: 'core.user_mentioned', values });
-    rows.forEach((row) => {
-      Object.assign(row, { author: vals?.[row.author_id] });
-    });
-  }
-
-  return { time: Date.now() - time, total: rows?.length, rows };
-
-}
+// for example only
+/*
+    const res = await dataInsert({
+      pg,
+      table: 'crm.notifications',
+      data: {
+        subject: 'notif title',
+        body: 'notif body',
+        link: 'http://localhost:3000/api/notification',
+        addressee_id: userId,
+        author_id: userId,
+      },
+    });
+*/
+
+import { getSelectVal } from '@opengis/fastify-table/utils.js';
+
+const maxLimit = 100;
+
+export default async function userNotifications({
+  pg, query = {}, session = {},
+}) {
+  const time = Date.now();
+
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const limit = Math.min(maxLimit, +(query.limit || 5));
+  const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
+
+  const q = `select notification_id as id, subject, body, cdate,
+  author_id, read, link, entity_id, (select avatar from admin.users where uid=a.author_id limit 1) as avatar from crm.notifications a where addressee_id=$1 order by cdate desc limit $2 offset $3`;
+
+  if (query.sql) return q;
+
+  const { rows = [] } = await pg.query(q, [uid, limit, offset]);
+
+  const values = rows.map((el) => el.author_id)
+    ?.filter((el, idx, arr) => el && arr.indexOf(el) === idx);
+
+  if (values?.length) {
+    const vals = await getSelectVal({ name: 'core.user_mentioned', values });
+    rows.forEach((row) => {
+      Object.assign(row, { author: vals?.[row.author_id] });
+    });
+  }
+
+  return { time: Date.now() - time, total: rows?.length, rows };
+
+}

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

@@ -1,21 +1,21 @@
-import { dataInsert } from '@opengis/fastify-table/utils.js';
-
-export default async function addNotification({
-  pg, session = {}, subject, body, link, uid, entity,
-}) {
-  const { uid: author } = session.passport?.user || {};
-  const res = await dataInsert({
-    pg,
-    table: 'crm.notifications',
-    data: {
-      subject,
-      body,
-      link,
-      addressee_id: uid,
-      author_id: author,
-      entity_id: entity,
-      uid: author,
-    },
-  });
-  return res?.rows?.[0] || {};
-}
+import { dataInsert } from '@opengis/fastify-table/utils.js';
+
+export default async function addNotification({
+  pg, session = {}, subject, body, link, uid, entity,
+}) {
+  const { uid: author } = session.passport?.user || {};
+  const res = await dataInsert({
+    pg,
+    table: 'crm.notifications',
+    data: {
+      subject,
+      body,
+      link,
+      addressee_id: uid,
+      author_id: author,
+      entity_id: entity,
+      uid: author,
+    },
+  });
+  return res?.rows?.[0] || {};
+}