@opengis/admin 0.4.34 → 0.4.35

package/server/plugins/hook.js

@@ -110,11 +110,11 @@ export default async function plugin(fastify) {
                     clsQuery.push(`insert into admin.cls(name,type,data,module,hash) values('${name}','sql','${(loadTemplate?.sql || loadTemplate)?.replace(/'/g, "''")}', '${module?.replace(/'/g, "''")}','${el.hash}')`);
                     if (config.trace) console.log(name, type, 'insert fresh select');
                     return el.hash;
-                } else if (type === 'cls' && loadTemplate?.length && el.update) {
+                } else if (type === 'cls' && loadTemplate?.length && (el.update || Object.hasOwn(loadTemplate?.[0] || {}, 'color'))) {
                     clsQuery.push(`insert into admin.cls(name,type, module,hash) values('${name}','json', '${module?.replace(/'/g, "''")}','${el.hash}'); 
-                insert into admin.cls(code,name,parent,icon,data) 
-                select value->>'id',value->>'text','${name}',value->>'icon',value->>'data' 
-                from json_array_elements('${JSON.stringify(loadTemplate).replace(/'/g, "''")}'::json)`);
+                insert into admin.cls(code,name,parent,icon,color,data) 
+                select value->>'id',value->>'text','${name}',value->>'icon',value->>'color',value->>'data' 
+                from json_array_elements('${JSON.stringify(loadTemplate).replace(/'/g, "''")}'::json) on conflict (code,parent) do update set color=excluded.color;`);
                     if (config.trace) console.log(name, type, 'insert fresh cls');
                     return el.hash;
                 } else if (hashes.includes(el.hash)) {

package/server/routes/calendar/controllers/calendar.data.js

@@ -1,125 +1,125 @@
-import { getMeta, getTemplate, pgClients, handlebarsSync } from '@opengis/fastify-table/utils.js';
-
-const isValidDate = (dateStr) => (new Date(dateStr)).toString() !== 'Invalid Date';
-
-export default async function calendarData({
-    pg = pgClients.client, params = {}, query = {}, user = {},
-}) {
-    const { name } = params;
-    const { granularity = 'month' } = query;
-
-    if (!name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-
-    if (query.granularity && !['day', 'month', 'week', 'year'].includes(granularity)) {
-        return { message: 'invalid query params: granularity', status: 400 };
-    }
-
-    const body = await getTemplate('calendar', name);
-
-    if (!body) {
-        return { message: `calendar not found: ${name}`, status: 404 };
-    }
-
-    const {
-        title,
-        table,
-        meta = {},
-    } = body || {};
-
-    if (!table) {
-        return { message: 'not enough calendar params: table', status: 404 };
-    }
-    if (!pg.pk?.[table]) {
-        return { message: `table pkey not found: ${table}`, status: 404 };
-    }
-
-    const filterList = (body?.filter || [])
-        .concat(body?.filterInline || [])
-        .concat(body?.filterCustom || [])
-        .concat(body?.filterState || [])
-        .concat(body?.filterList || [])
-        .concat(body?.filters || [])
-        .concat(body?.filter_list || []);
-
-    const { columns = [] } = await getMeta({ pg, table });
-    const columnList = columns?.map((el) => el?.name);
-
-    const dateColumn = columns?.find((el) => el?.name === (meta?.date || meta?.start))?.name
-        || columns?.find((el) => el?.name === 'cdate')?.name;
-
-    if (query.date && !dateColumn) {
-        return { message: 'invalid template params: date column not found', status: 400 };
-    }
-
-    if (query.date && !isValidDate(query.date)) {
-        return { message: 'Invalid date: out of range or incorrect format', status: 400 };
-    }
-
-    const filterWhere = filterList?.length && query.filter?.length
-        ? filterList
-            .filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true))
-            .map((el) => {
-                const val = query.filter.split(',').find((e) => e?.split('=')?.shift()?.includes(el.column || el.name))?.split('=')?.pop();
-                if (val) return el.column && val ? `(${[`${el.column}::text='${val.replace(/'/g, "''")}'::text`, el.query].filter((el) => el).join(' and ')})` : el.query;
-            })
-            .filter((el) => el)
-            .join(' and ')
-        : undefined;
-
-    const queryWhere = handlebarsSync.compile(body.query || '1=1')({ user, uid: user?.uid });
-    const filterDate = query.date ? `date_trunc('${granularity}', "${dateColumn}"::date)='${query.date}'::date` : undefined;
-
-    const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
-
-    const filtersByColumn = filterList.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && el?.column);
-
-    const filters = [];
-    if (filtersByColumn?.length) {
-        await Promise.all(filtersByColumn.map(async (el) => {
-            const { rows: filterData = [] } = await pg.query(`select ${el.column.replace(/'/g, "''")} as id, count(*) from ${table} 
-            where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by ${el.column.replace(/'/g, "''")}`);
-            if (!filterData?.length) return;
-
-            const clsData = await getTemplate(['cls', 'select'], el.cls);
-
-            if (!el.cls || !clsData?.length) {
-                filterData.forEach((item) => filters.push(item));
-                return;
-            }
-
-            filterData.forEach((filter) => {
-                const cls = clsData.find((item) => item.id === filter.id.toString());
-                Object.assign(filter, { title: cls?.text, color: cls?.color });
-                filters.push(filter);
-            });
-        }));
-    }
-
-    const filtersByPreparedQuery = filterList.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && !el?.column && el?.query);
-
-    if (filtersByPreparedQuery?.length) {
-        await Promise.all(filtersByPreparedQuery.map(async (el) => {
-            const { rows = [] } = await pg.query(`select ${el.query} as id, count(*) from ${table} 
-            where ${filterWhere || '1=1'} group by ${el.query}`);
-            rows.forEach((item) => filters.push(item));
-        }));
-    }
-
-    const metaColumns = Object.keys(meta)
-        .filter((el) => ['date', 'start', 'end', 'title', 'status'].includes(el) && columnList.includes(meta[el]))
-        .map((el) => `"${meta[el]}" as ${el}`);
-
-    if (!metaColumns?.length) {
-        return { message: `calendar param meta is invalid: invalid/empty keys`, status: 404 };
-    }
-
-    const q = `select ${metaColumns.join(',')} from ${table} where ${where}`;
-    if (query?.sql && user?.user_type?.includes('admin')) return q;
-
-    const { rows = [] } = await pg.query(q);
-
-    return { title, filters, granularity, sql: user?.user_type?.includes('admin') ? q : undefined, rows };
-
+import { getMeta, getTemplate, pgClients, handlebarsSync } from '@opengis/fastify-table/utils.js';
+
+const isValidDate = (dateStr) => (new Date(dateStr)).toString() !== 'Invalid Date';
+
+export default async function calendarData({
+    pg = pgClients.client, params = {}, query = {}, user = {},
+}) {
+    const { name } = params;
+    const { granularity = 'month' } = query;
+
+    if (!name) {
+        return { message: 'not enough params: name', status: 400 };
+    }
+
+    if (query.granularity && !['day', 'month', 'week', 'year'].includes(granularity)) {
+        return { message: 'invalid query params: granularity', status: 400 };
+    }
+
+    const body = await getTemplate('calendar', name);
+
+    if (!body) {
+        return { message: `calendar not found: ${name}`, status: 404 };
+    }
+
+    const {
+        title,
+        table,
+        meta = {},
+    } = body || {};
+
+    if (!table) {
+        return { message: 'not enough calendar params: table', status: 404 };
+    }
+    if (!pg.pk?.[table]) {
+        return { message: `table pkey not found: ${table}`, status: 404 };
+    }
+
+    const filterList = (body?.filter || [])
+        .concat(body?.filterInline || [])
+        .concat(body?.filterCustom || [])
+        .concat(body?.filterState || [])
+        .concat(body?.filterList || [])
+        .concat(body?.filters || [])
+        .concat(body?.filter_list || []);
+
+    const { columns = [] } = await getMeta({ pg, table });
+    const columnList = columns?.map((el) => el?.name);
+
+    const dateColumn = columns?.find((el) => el?.name === (meta?.date || meta?.start))?.name
+        || columns?.find((el) => el?.name === 'cdate')?.name;
+
+    if (query.date && !dateColumn) {
+        return { message: 'invalid template params: date column not found', status: 400 };
+    }
+
+    if (query.date && !isValidDate(query.date)) {
+        return { message: 'Invalid date: out of range or incorrect format', status: 400 };
+    }
+
+    const filterWhere = filterList?.length && query.filter?.length
+        ? filterList
+            .filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true))
+            .map((el) => {
+                const val = query.filter.split(',').find((e) => e?.split('=')?.shift()?.includes(el.column || el.name))?.split('=')?.pop();
+                if (val) return el.column && val ? `(${[`${el.column}::text='${val.replace(/'/g, "''")}'::text`, el.query].filter((el) => el).join(' and ')})` : el.query;
+            })
+            .filter((el) => el)
+            .join(' and ')
+        : undefined;
+
+    const queryWhere = handlebarsSync.compile(body.query || '1=1')({ user, uid: user?.uid });
+    const filterDate = query.date ? `date_trunc('${granularity}', "${dateColumn}"::date)='${query.date}'::date` : undefined;
+
+    const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
+
+    const filtersByColumn = filterList.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && el?.column);
+
+    const filters = [];
+    if (filtersByColumn?.length) {
+        await Promise.all(filtersByColumn.map(async (el) => {
+            const { rows: filterData = [] } = await pg.query(`select ${el.column.replace(/'/g, "''")} as id, count(*) from ${table} 
+            where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by ${el.column.replace(/'/g, "''")}`);
+            if (!filterData?.length) return;
+
+            const clsData = await getTemplate(['cls', 'select'], el.cls);
+
+            if (!el.cls || !clsData?.length) {
+                filterData.forEach((item) => filters.push(item));
+                return;
+            }
+
+            filterData.forEach((filter) => {
+                const cls = clsData.find((item) => item.id === filter.id.toString());
+                Object.assign(filter, { title: cls?.text, color: cls?.color });
+                filters.push(filter);
+            });
+        }));
+    }
+
+    const filtersByPreparedQuery = filterList.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && !el?.column && el?.query);
+
+    if (filtersByPreparedQuery?.length) {
+        await Promise.all(filtersByPreparedQuery.map(async (el) => {
+            const { rows = [] } = await pg.query(`select ${el.query} as id, count(*) from ${table} 
+            where ${filterWhere || '1=1'} group by ${el.query}`);
+            rows.forEach((item) => filters.push(item));
+        }));
+    }
+
+    const metaColumns = Object.keys(meta)
+        .filter((el) => ['date', 'start', 'end', 'title', 'status'].includes(el) && columnList.includes(meta[el]))
+        .map((el) => `"${meta[el]}" as ${el}`);
+
+    if (!metaColumns?.length) {
+        return { message: `calendar param meta is invalid: invalid/empty keys`, status: 404 };
+    }
+
+    const q = `select ${metaColumns.join(',')} from ${table} where ${where}`;
+    if (query?.sql && user?.user_type?.includes('admin')) return q;
+
+    const { rows = [] } = await pg.query(q);
+
+    return { title, filters, granularity, sql: user?.user_type?.includes('admin') ? q : undefined, rows };
+
 }

package/server/routes/calendar/index.mjs

@@ -1,7 +1,7 @@
-import calendarData from "./controllers/calendar.data.js";
-
-import { calendarDataSchema } from './schema.js';
-
-export default async function route(fastify) {
-    fastify.get('/calendar/:name', { schema: calendarDataSchema }, calendarData);
-}
+import calendarData from "./controllers/calendar.data.js";
+
+import { calendarDataSchema } from './schema.js';
+
+export default async function route(fastify) {
+    fastify.get('/calendar/:name', { schema: calendarDataSchema }, calendarData);
+}

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

@@ -1,18 +1,18 @@
-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`);
-}
+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/testEmail.js

@@ -1,35 +1,35 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-import { sendNotification } from '../../../../utils.js';
-
-export default async function testNotification({
-  pg, query = {}, user = {},
-}) {
-  const { local } = config || {};
-
-  if (!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 '@opengis/fastify-table/utils.js';
+
+import { sendNotification } from '../../../../utils.js';
+
+export default async function testNotification({
+  pg, query = {}, user = {},
+}) {
+  const { local } = config || {};
+
+  if (!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 = {}, 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 };
-
-}
+// 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/hook/onWidgetSet.js

@@ -1,56 +1,56 @@
-/* eslint-disable camelcase */
-import { config, pgClients, getSelect } from '@opengis/fastify-table/utils.js';
-
-import { addNotification, sendNotification } from '../../../../utils.js';
-
-function sequence(arr, data, fn) {
-  return arr.reduce((promise, row) => promise.then(() => fn({
-    ...data, ...row,
-  })), Promise.resolve());
-}
-
-export default async function onWidgetSet({ pg = pgClients?.client, link, user, type, payload: 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 { 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, user, subject, entity: data.entity_id, body: message, link, uid: id,
-    });
-    try {
-      const res1 = await sendNotification({
-        pg,
-        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 { config, pgClients, getSelect } from '@opengis/fastify-table/utils.js';
+
+import { addNotification, sendNotification } from '../../../../utils.js';
+
+function sequence(arr, data, fn) {
+  return arr.reduce((promise, row) => promise.then(() => fn({
+    ...data, ...row,
+  })), Promise.resolve());
+}
+
+export default async function onWidgetSet({ pg = pgClients?.client, link, user, type, payload: 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 { 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, user, subject, entity: data.entity_id, body: message, link, uid: id,
+    });
+    try {
+      const res1 = await sendNotification({
+        pg,
+        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;
+}