@opengis/admin 0.1.54 → 0.1.55

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

@@ -1,35 +1,35 @@
-
-import { join } from 'path';
-import { userTemplateDir } 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() {
-    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
-    return menus;
+
+import { join } from 'path';
+import { userTemplateDir } 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() {
+    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
+    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,30 +1,30 @@
-export default async function readNotifications({
-  pg, params = {}, query = {}, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  try {
-    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 };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+export default async function readNotifications({
+  pg, params = {}, query = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  try {
+    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 };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

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

@@ -1,64 +1,64 @@
-// for example only
-/*
-    const res = await funcs.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;
-
-  try {
-    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 = `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 ${limit} offset ${offset}`;
-
-    if (query.sql) return q;
-
-    const { rows = [] } = await pg.query(q, [userId]);
-
-    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 };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+// for example only
+/*
+    const res = await funcs.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;
+
+  try {
+    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 = `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 ${limit} offset ${offset}`;
+
+    if (query.sql) return q;
+
+    const { rows = [] } = await pg.query(q, [userId]);
+
+    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 };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/server/routes/notifications/hook/onWidgetSet.js

@@ -1,63 +1,63 @@
-/* eslint-disable camelcase */
-import {
-  getSelect, addNotification, sendNotification,
-} from '@opengis/fastify-table/utils.js';
-
-function sequence(arr, data, fn) {
-  return arr.reduce((promise, row) => promise.then(() => fn({
-    ...data, ...row,
-  })), Promise.resolve());
-}
-
-export default async function onWidgetSet({ req, type, data = {} }) {
-  const values = data.body?.match(/\B@[a-zA-z0-9а-яА-яіїІЇєЄ]+ [a-zA-z0-9а-яА-яіїІЇєЄ]+/g)
-    ?.filter((el, idx, arr) => el?.replace && arr.indexOf(el) === idx)
-    ?.map((el) => el.replace(/@/g, ''));
-
-  if (type !== 'comment' || !values?.length) {
-    return null;
-  }
-
-  const {
-    pg, funcs, path: link, session = {}, log,
-  } = req;
-  const { config = {} } = funcs;
-
-  const { sql } = await getSelect('core.user_mentioned');
-
-  const { rows = [] } = await pg.query(`with data (id,name,email) as (${sql})
-  select id, name, email from data where name = any($1)`, [values]);
-
-  if (!rows?.length) {
-    return null;
-  }
-
-  const message = `${data.body?.substring(0, 50)}...`;
-  const subject = 'You were mentioned';
-
-  await sequence(rows, {}, async ({ id, name, email }) => {
-    const res = await addNotification({
-      pg, funcs, session, subject, entity: data.entity_id, body: message, link, uid: id,
-    });
-    try {
-      const res1 = await sendNotification({
-        pg,
-        funcs,
-        log,
-        to: email,
-        // template,
-        message,
-        title: subject,
-        data,
-        nocache: 1,
-      });
-      if (config.local) console.info('comment notification', name, id, email, res1);
-      await pg.query('update crm.notifications set sent=true where notification_id=$1', [res?.notification_id]);
-    }
-    catch (err) {
-      console.error('comment notification send error', err.toString());
-    }
-  });
-  console.log('comment notification add', rows);
-  return null;
-}
+/* eslint-disable camelcase */
+import {
+  getSelect, addNotification, sendNotification,
+} from '@opengis/fastify-table/utils.js';
+
+function sequence(arr, data, fn) {
+  return arr.reduce((promise, row) => promise.then(() => fn({
+    ...data, ...row,
+  })), Promise.resolve());
+}
+
+export default async function onWidgetSet({ req, type, data = {} }) {
+  const values = data.body?.match(/\B@[a-zA-z0-9а-яА-яіїІЇєЄ]+ [a-zA-z0-9а-яА-яіїІЇєЄ]+/g)
+    ?.filter((el, idx, arr) => el?.replace && arr.indexOf(el) === idx)
+    ?.map((el) => el.replace(/@/g, ''));
+
+  if (type !== 'comment' || !values?.length) {
+    return null;
+  }
+
+  const {
+    pg, funcs, path: link, session = {}, log,
+  } = req;
+  const { config = {} } = funcs;
+
+  const { sql } = await getSelect('core.user_mentioned');
+
+  const { rows = [] } = await pg.query(`with data (id,name,email) as (${sql})
+  select id, name, email from data where name = any($1)`, [values]);
+
+  if (!rows?.length) {
+    return null;
+  }
+
+  const message = `${data.body?.substring(0, 50)}...`;
+  const subject = 'You were mentioned';
+
+  await sequence(rows, {}, async ({ id, name, email }) => {
+    const res = await addNotification({
+      pg, funcs, session, subject, entity: data.entity_id, body: message, link, uid: id,
+    });
+    try {
+      const res1 = await sendNotification({
+        pg,
+        funcs,
+        log,
+        to: email,
+        // template,
+        message,
+        title: subject,
+        data,
+        nocache: 1,
+      });
+      if (config.local) console.info('comment notification', name, id, email, res1);
+      await pg.query('update crm.notifications set sent=true where notification_id=$1', [res?.notification_id]);
+    }
+    catch (err) {
+      console.error('comment notification send error', err.toString());
+    }
+  });
+  console.log('comment notification add', rows);
+  return null;
+}

package/server/routes/notifications/index.mjs

@@ -1,40 +1,40 @@
-import { addHook } from '@opengis/fastify-table/utils.js';
-
-// api
-import readNotifications from './controllers/readNotifications.js'; // mark as read
-import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
-// hook
-import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
-
-
-const tableSchema = {
-  params: {
-    id: { type: 'string' },
-  },
-  querystring: {
-    nocache: { type: 'string', pattern: '^(\\d+)$' },
-  },
-};
-
-export default async function plugin(fastify, config = {}) {
-    const prefix = config.prefix || '/api';
-    fastify.route({
-        method: 'GET',
-        url: '/notification',
-        config: {
-            policy: ['user'],
-        },
-        schema: tableSchema,
-        handler: userNotifications,
-    });
-    fastify.route({
-        method: 'GET',
-        url: '/notification-read/:id?',
-        config: {
-            policy: ['user'],
-        },
-        schema: tableSchema,
-        handler: readNotifications,
-    });
-    addHook('onWidgetSet', onWidgetSet);
-}
+import { addHook } from '@opengis/fastify-table/utils.js';
+
+// api
+import readNotifications from './controllers/readNotifications.js'; // mark as read
+import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
+// hook
+import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
+
+
+const tableSchema = {
+  params: {
+    id: { type: 'string' },
+  },
+  querystring: {
+    nocache: { type: 'string', pattern: '^(\\d+)$' },
+  },
+};
+
+export default async function plugin(fastify, config = {}) {
+    const prefix = config.prefix || '/api';
+    fastify.route({
+        method: 'GET',
+        url: '/notification',
+        config: {
+            policy: ['user'],
+        },
+        schema: tableSchema,
+        handler: userNotifications,
+    });
+    fastify.route({
+        method: 'GET',
+        url: '/notification-read/:id?',
+        config: {
+            policy: ['user'],
+        },
+        schema: tableSchema,
+        handler: readNotifications,
+    });
+    addHook('onWidgetSet', onWidgetSet);
+}

package/server/routes/properties/controllers/admin.properties.get.js

@@ -1,29 +1,29 @@
-const table = 'admin.properties';
-
-import { getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
-
-export default async function getSettingsAPI({
-  pg = {}, funcs = {}, params = {}, query = {},
-}) {
-  if (!pg.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const redis = getRedis();
-  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:${table}`;
-
-  const cache = await redis.get(keyCache);
-  if (cache && !funcs.config?.local) return JSON.parse(cache);
-
-  try {
-    const res = await getSettings({
-      pg, key: params.key, json: query.json, redis, table,
-    });
-    return { message: res, status: 200 };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+const table = 'admin.properties';
+
+import { getRedis } from '@opengis/fastify-table/utils.js';
+
+import { getSettings } from '../../../../utils.js';
+
+export default async function getSettingsAPI({
+  pg = {}, funcs = {}, params = {}, query = {},
+}) {
+  if (!pg.pk?.[table]) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const redis = getRedis();
+  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:${table}`;
+
+  const cache = await redis.get(keyCache);
+  if (cache && !funcs.config?.local) return JSON.parse(cache);
+
+  try {
+    const res = await getSettings({
+      pg, key: params.key, json: query.json, redis, table,
+    });
+    return { message: res, status: 200 };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/server/routes/properties/controllers/user.properties.get.js

@@ -1,34 +1,34 @@
-const table = 'admin.user_properties';
-
-import { getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
-
-export default async function getUserProperties({
-  pg = {}, params = {}, query = {}, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-  if (!uid) {
-    return { message: 'access restreicted', status: 403 };
-  }
-
-  if (!pg.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const redis = getRedis();
-  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:user`;
-
-  const cache = await redis.get(keyCache);
-  if (cache) return JSON.parse(cache);
-
-  try {
-    const res = await getSettings({
-      pg, key: params.key, json: query.json, redis, table, uid,
-    });
-    return { message: res, status: 200 };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+const table = 'admin.user_properties';
+
+import { getRedis } from '@opengis/fastify-table/utils.js';
+
+import { getSettings } from '../../../../utils.js';
+
+export default async function getUserProperties({
+  pg = {}, params = {}, query = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+  if (!uid) {
+    return { message: 'access restreicted', status: 403 };
+  }
+
+  if (!pg.pk?.[table]) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const redis = getRedis();
+  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:user`;
+
+  const cache = await redis.get(keyCache);
+  if (cache) return JSON.parse(cache);
+
+  try {
+    const res = await getSettings({
+      pg, key: params.key, json: query.json, redis, table, uid,
+    });
+    return { message: res, status: 200 };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/server/routes/properties/controllers/user.properties.post.js

@@ -1,30 +1,30 @@
-const table = 'admin.user_properties';
-
-import { setSettings } from '../../../../utils.js';
-
-export default async function postUserProperties({
-  pg, session = {}, body = {},
-}) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const { key, val } = body;
-
-  if ((!key || !val) && !Object.keys(body).length) {
-    return { message: 'not enough params', status: 400 };
-  }
-
-  if (!pg?.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const res = await setSettings({
-    pg, key, val, body, table, uid,
-  });
-  if (res?.error) return res;
-
-  return { message: res, status: 200 };
-}
+const table = 'admin.user_properties';
+
+import { setSettings } from '../../../../utils.js';
+
+export default async function postUserProperties({
+  pg, session = {}, body = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const { key, val } = body;
+
+  if ((!key || !val) && !Object.keys(body).length) {
+    return { message: 'not enough params', status: 400 };
+  }
+
+  if (!pg?.pk?.[table]) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const res = await setSettings({
+    pg, key, val, body, table, uid,
+  });
+  if (res?.error) return res;
+
+  return { message: res, status: 200 };
+}