@opengis/admin 0.4.35 → 0.4.37

package/package.json

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

package/server/helpers/list/descriptionList.js

@@ -17,8 +17,11 @@ export default async function descriptionList(data, opt) {
 
     // no data
     if (hash.nodata && !data) {
-        const noDataText = typeof hash.nodata == 'string' ? hash.nodata : '<div class="bg-gray-200 text-center p-6 rounded-xl"><h3 class="text-lg font-semibold">Інформація відсутня</h3></div>';
-        return noDataText
+        const noDataText =
+            typeof hash.nodata == 'string'
+                ? hash.nodata
+                : '<div class="bg-gray-200 dark:bg-transparent dark:text-white text-center p-6 rounded-xl"><h3 class="text-lg font-semibold">Інформація відсутня</h3></div>';
+        return noDataText;
     }
     if (!hash.columns) return 'columns empty'
     const keys = hash.columns.split(hash.divider || ',').map(el => hash.comma ? el.trim().replace(new RegExp(hash.comma || '#', 'g'), ',') : el.trim());
@@ -35,12 +38,22 @@ export default async function descriptionList(data, opt) {
 
         const d1 = await format(data[key], key, data) || '-';
 
-        result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
-            <dt class="text-gray-900">${nameHBS || name}</dt>
-            <dd class="text-gray-700 sm:col-span-2">${d1}</dd>
+        result.push(`
+            <div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 
+                        even:bg-gray-50 dark:bg-transparent bg-white
+                        text-[12px] text-gray-700 dark:text-white">
+                <dt class="text-gray-900 dark:text-white">${nameHBS || name}</dt>
+                <dd class="text-gray-700 dark:text-white sm:col-span-2">${d1}</dd>
             </div>
         `);
 
     }
-    return '<dl class=" divide-y divide-gray-100 py-[5px] w-full">' + result.join('') + '</dl>';
+    return `
+        <div class="min-w-full relative overflow-auto 
+            divide-y divide-gray-200 dark:divide-gray-700
+            bg-white dark:bg-transparent 
+            text-[12px] text-gray-600 dark:text-white">
+            ${result.join('')}
+        </div>
+    `;
 }

package/server/helpers/list/tableList.js

@@ -31,7 +31,7 @@ export default async function tableList(data, opt) {
     const keys = hash.columns.split(hash.divider || ',').map(el => hash.comma ? el.trim().replace(new RegExp(hash.comma, 'g'), ',') : el.trim()).concat(hash.uid && hash.table && hash.id && !hash.noactions ? ['Дії', 'actions'] : []);
 
     const result = [];
-    result.push('<thead class="text-left font-medium text-gray-700"> <tr>');
+    result.push('<thead class="text-left font-medium text-gray-700 dark:text-white dark:bg-transparent"> <tr>');
 
     // thead 
     const skip = {}
@@ -48,16 +48,19 @@ export default async function tableList(data, opt) {
         if (skip[name]) continue;
 
         const isActionsColumn = hash.noactions && i === keys.length - 2;
-        result.push(`<th class="py-2 min-w-[200px] ${isActionsColumn ? 'last:min-w-[60px] last:max-w-[60px] last:bg-white last:sticky last:right-0' : ''}">
-                    ${nameHBS || name}
-        </th>`)
+        result.push(`
+            <th class="py-2 min-w-[200px] ${isActionsColumn
+                ? 'last:min-w-[60px] last:max-w-[60px] last:bg-white last:sticky last:right-0'
+                : ''}">
+                ${nameHBS || name}
+            </th>`);
     }
-    result.push('</tr></thead><tbody class="divide-y divide-gray-200">');
+     result.push('</tr></thead><tbody class="divide-y divide-gray-200 dark:divide-gray-700">');
 
     // body 
     for (let k = 0; k < data.length; k += 1) {
         const row = data[k];
-        result.push('<tr class="bg-white odd:bg-gray-50 ">');
+         result.push('<tr class="bg-white odd:bg-gray-50 dark:bg-transparent dark:odd:bg-transparent">');
         const obj = { form: hash.form, table: hash.table, id: row[hash.id] }
         const token = hash.table ? setToken({ ids: [JSON.stringify(obj)], uid: hash.uid, array: 1 })[0] : null;
         for (let i = 0; i < keys.length; i += 2) {
@@ -70,9 +73,10 @@ export default async function tableList(data, opt) {
             const tokenData = key == 'actions' ? token : null;
             const d1 = key.includes('{{') ? await handlebars.compile(key)({ ...row, token, hash }) || '-' : null
             const isActionsColumn = hash.noactions && i === keys.length - 2;
-            result.push(`<td class="py-2 pr-5 ${isActionsColumn ? 'last:sticky last:right-0' : ''}">
-                               ${d1 || format(tokenData || row[key], key, row, hash)}
-                            </td>`);
+            result.push(`
+                <td class="py-2 pr-5 ${isActionsColumn ? 'last:sticky last:right-0' : ''} dark:text-white">
+                    ${d1 || format(tokenData || row[key], key, row, hash)}
+                </td>`);
 
         }
         // action token 
@@ -82,5 +86,10 @@ export default async function tableList(data, opt) {
     result.push('</tbody>');
 
     //    console.log(Date.now() - time)
-    return '<table class="min-w-full relative divide-y-2 divide-gray-200 bg-white min-w-full overflow-auto divide-y-2 divide-gray-200 bg-white text-[12px] text-gray-600">' + result.join('') + '</table>';
+    return `<table class="min-w-full relative overflow-auto 
+        divide-y-2 divide-gray-200 dark:divide-gray-700
+        bg-white dark:bg-transparent 
+        text-[12px] text-gray-600 dark:text-white">
+        ${result.join('')}
+    </table>`;
 }

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 }