@opengis/admin 0.1.80 → 0.1.82

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

@@ -1,68 +1,68 @@
-
-import { join } from 'path';
-import { userTemplateDir, config, getAccess, pgClients } from '@opengis/fastify-table/utils.js';
-
-import { existsSync, readdirSync, readFileSync } from 'fs';
-const menuCache = [];
-// check module dir
-const moduleDir = join(process.cwd(), 'module');
-const dirs = existsSync(moduleDir) ?
-    readdirSync(moduleDir).map(el => join(moduleDir, el)) : [];
-
-// all menu files module + user 
-
-
-
-const isProduction = process.env.NODE_ENV === 'production';
-// readMenu();
-
-async function readMenu() {
-    const menuList = dirs.concat(userTemplateDir)
-        .map(el => join(el, 'menu.json'))
-        .filter(el => existsSync(el))
-    // const list = menuList.map(el => readFileSync(el, 'utf-8')); // sync 
-    const list = await Promise.all(menuList.map(el => readFileSync(el, 'utf-8'))); // sync 
-    const menus = list.reduce((p, el) => p.concat(JSON.parse(el)), [])
-        .map(el => ({ order: 0, ...el }))
-        .sort((a, b) => (a.order > b.order) ? 1 : ((b.order > a.order) ? -1 : 0))
-
-    if (!menuCache.length) menus.forEach(el => menuCache.push(el))
-    return menus;
-}
-export default async function adminMenu({ user = {}, session, pg = pgClients.client }) {
-    if (!user.uid) return { status: 403, message: 'access restricted' }
-
-    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
-
-    // update user access
-    if (session && user?.uid) {
-        const { type, gl = [] } = await pg.query(`select user_type as type, b.gl 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 where uid=$1`, [user.uid]).then(el => el.rows[0] || {});
-        /* const { interfaces = [] } = await pg.query(`select array_agg(route_id) as interfaces from admin.access
-        where user_uid=$1 or role_id=any($2::text[])`, [user.uid, gl]).then((res) => res.rows?.[0] || {}); */
-        Object.assign(user, { type, group_list: gl });
-        session?.set?.('passport', { user });
-    }
-    return menus;
-
-    if (req) {
-        const user = req?.session?.passport?.user || {};
-        const userMenu = await Promise.all(menus.map(async (menu) => {
-            if (menu?.menu?.length) {
-                const submenu = await Promise.all(menu.menu?.map(async (submenu) => {
-                    const access = await getAccess({ table: submenu?.table, user });
-                    return { ...submenu, access };
-                }));
-                return { ...menu, menu: submenu.filter((e) => e?.access), access: submenu.filter((e) => e?.access?.actions?.includes('get'))?.length };
-            } else if (menu?.table) {
-                const access = await getAccess({ table: menu?.table, user });
-                return { ...menu, access };
-            }
-            return menu;
-        }));
-        return userMenu.filter((e) => e?.access)?.map((e) => ({ ...e, menu: e?.menu ? e?.menu?.filter((el) => el?.access?.actions?.includes('get')) : undefined }));
-    }
-    return menus;
+
+import { join } from 'path';
+import { userTemplateDir, config, getAccess, pgClients } from '@opengis/fastify-table/utils.js';
+
+import { existsSync, readdirSync, readFileSync } from 'fs';
+const menuCache = [];
+// check module dir
+const moduleDir = join(process.cwd(), 'module');
+const dirs = existsSync(moduleDir) ?
+    readdirSync(moduleDir).map(el => join(moduleDir, el)) : [];
+
+// all menu files module + user 
+
+
+
+const isProduction = process.env.NODE_ENV === 'production';
+// readMenu();
+
+async function readMenu() {
+    const menuList = dirs.concat(userTemplateDir)
+        .map(el => join(el, 'menu.json'))
+        .filter(el => existsSync(el))
+    // const list = menuList.map(el => readFileSync(el, 'utf-8')); // sync 
+    const list = await Promise.all(menuList.map(el => readFileSync(el, 'utf-8'))); // sync 
+    const menus = list.reduce((p, el) => p.concat(JSON.parse(el)), [])
+        .map(el => ({ order: 0, ...el }))
+        .sort((a, b) => (a.order > b.order) ? 1 : ((b.order > a.order) ? -1 : 0))
+
+    if (!menuCache.length) menus.forEach(el => menuCache.push(el))
+    return menus;
+}
+export default async function adminMenu({ user = {}, session, pg = pgClients.client }) {
+    if (!user.uid) return { status: 403, message: 'access restricted' }
+
+    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
+
+    // update user access
+    if (session && user?.uid) {
+        const { type, gl = [] } = await pg.query(`select user_type as type, b.gl 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 where uid=$1`, [user.uid]).then(el => el.rows[0] || {});
+        /* const { interfaces = [] } = await pg.query(`select array_agg(route_id) as interfaces from admin.access
+        where user_uid=$1 or role_id=any($2::text[])`, [user.uid, gl]).then((res) => res.rows?.[0] || {}); */
+        Object.assign(user, { type, group_list: gl });
+        session?.set?.('passport', { user });
+    }
+    return menus;
+
+    if (req) {
+        const user = req?.session?.passport?.user || {};
+        const userMenu = await Promise.all(menus.map(async (menu) => {
+            if (menu?.menu?.length) {
+                const submenu = await Promise.all(menu.menu?.map(async (submenu) => {
+                    const access = await getAccess({ table: submenu?.table, user });
+                    return { ...submenu, access };
+                }));
+                return { ...menu, menu: submenu.filter((e) => e?.access), access: submenu.filter((e) => e?.access?.actions?.includes('get'))?.length };
+            } else if (menu?.table) {
+                const access = await getAccess({ table: menu?.table, user });
+                return { ...menu, access };
+            }
+            return menu;
+        }));
+        return userMenu.filter((e) => e?.access)?.map((e) => ({ ...e, menu: e?.menu ? e?.menu?.filter((el) => el?.access?.actions?.includes('get')) : undefined }));
+    }
+    return menus;
 }

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] || {};
+}