@opengis/admin 0.4.36 → 0.4.38

package/dist/{profile-page-Quk3Xc6g.js → profile-page-BEjpnhpW.js}

@@ -1,4 +1,4 @@
-import { _ as u, f as a } from "./import-file-CGrExq_X.js";
+import { _ as u, f as a } from "./import-file-DxhzJKP_.js";
 import "./user-DCzCj0wb.js";
 import { resolveComponent as m, createElementBlock as p, openBlock as c, createElementVNode as r, createTextVNode as d, toDisplayString as b, createBlock as h, createCommentVNode as f } from "vue";
 const g = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.4.36",
+  "version": "0.4.38",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

package/server/routes/notifications/index.mjs

@@ -2,8 +2,8 @@ import { addHook } from '@opengis/fastify-table/utils.js';
 
 // api
 import testEmail from './controllers/testEmail.js';
-import readNotifications from './controllers/readNotifications.js'; // mark as read
-import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
+// 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
@@ -12,7 +12,14 @@ import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
 // import addNotification from '../notifications/funcs/addNotification.js'; // add to db
 // import notification from '../notifications/funcs/sendNotification.js'; // send notification
 
-import { notificationSchema, emailSchema } from './schema.js';
+const emailSchema = {
+  type: 'object',
+  properties: {
+    quertstring: {
+      to: { type: 'string', pattern: '^((?!\\.)[\\w\\-_.]*[^.])(@\\w+)(\\.\\w+(\\.\\w+)?[^.\\W])$' },
+    },
+  },
+};
 
 export default async function route(fastify) {
 
@@ -20,7 +27,7 @@ export default async function route(fastify) {
   // fastify.decorate('notification', notification);
 
   fastify.get('/test-email', { config: { policy: ['user'] }, schema: emailSchema }, testEmail);
-  fastify.get('/notification', { config: { policy: ['user'] }, schema: notificationSchema }, userNotifications);
-  fastify.get('/notification-read/:id?', { config: { policy: ['user'] }, schema: notificationSchema }, readNotifications);
+  // fastify.get('/notification', { config: { policy: ['user'] }, schema: notificationSchema }, userNotifications); // moved to fastify-table
+  // fastify.get('/notification-read/:id?', { config: { policy: ['user'] }, schema: notificationSchema }, readNotifications); // moved to fastify-table
   addHook('onWidgetSet', onWidgetSet);
 }

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

@@ -1,18 +0,0 @@
-export default async function readNotifications({
-  pg, params = {}, query = {}, user = {},
-}, reply) {
-  const { uid } = user || {};
-
-  if (!uid) {
-    return reply.status(401).send('access restricted: user ');
-  }
-
-  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, [uid, params?.id].filter((el) => el));
-
-  return reply.status(200).send(`${rowCount} unread notifications marked as read`);
-}

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

@@ -1,53 +0,0 @@
-// 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 = {}, user = {},
-}) {
-  const time = Date.now();
-
-  const { uid } = 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 = [] } = pg.pk?.['crm.notifications'] ? 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/schema.js

@@ -1,23 +0,0 @@
-const notificationSchema = {
-  type: 'object',
-  properties: {
-    params: {
-      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-    querystring: {
-      nocache: { type: 'string', pattern: '^(\\d+)$' },
-    },
-  },
-};
-
-const emailSchema = {
-  type: 'object',
-    properties: {
-    quertstring: {
-      to: { type: 'string', pattern: '^((?!\\.)[\\w\\-_.]*[^.])(@\\w+)(\\.\\w+(\\.\\w+)?[^.\\W])$' },
-    },
-  },
-};
-
-export default null;
-export { notificationSchema, emailSchema }