@opengis/admin 0.2.101 → 0.2.102

package/server/routes/widget/controllers/widget.get.js

@@ -24,12 +24,14 @@ export default async function widgetGet({
   const sqls = {
     comment: pg.pk['admin.users']
       ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
-    ${username}, u.login, avatar 
-    from crm.communications c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`
+    ${username} as username, u.login, u.avatar
+    from crm.communications c
+    left join admin.users u on u.uid=c.uid 
+    where entity_id=$1 order by cdate desc`
       : 'select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 order by cdate desc',
 
     history: `SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
-    ${username}, u.login
+    ${username} as username, u.login, u.avatar
     FROM log.table_changes a
     left join admin.users u on a.change_user_id = u.uid
     left join lateral(
@@ -46,21 +48,25 @@ export default async function widgetGet({
     limit 100`,
 
     checklist: pg.pk['admin.users']
-      ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username}, u.login,
-    avatar FROM crm.checklists c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`
+      ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username} as username, u.login, u.avatar
+      FROM crm.checklists c
+      left join admin.users u on u.uid=c.uid
+      where entity_id=$1 order by cdate desc`
       : 'SELECT checklist_id, entity_id, subject, is_done, done_date, uid, cdate FROM crm.checklists where entity_id=$1 order by cdate desc',
 
     file: pg.pk['admin.users']
-      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
-    ${username}, u.login, isverified,
-    avatar, c.uid as author, file_status FROM crm.files c left join admin.users u on u.uid=c.uid
+      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain, 
+    ${username} as username, u.login, isverified, u.avatar, u.uid as author, file_status 
+    FROM crm.files c 
+    left join admin.users u on u.uid=c.uid
     where entity_id=$1 and file_status<>3 order by cdate desc`
       : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, uid, cdate, file_type, ismain,
       isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 order by cdate desc`,
     gallery: pg.pk['admin.users']
       ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
-    ${username}, u.login, isverified,
-    avatar, c.uid as author, file_status FROM crm.files c left join admin.users u on u.uid=c.uid
+    ${username} as username, u.login, u.avatar, isverified, u.avatar, c.uid as author, file_status 
+    FROM crm.files c 
+    left join admin.users u on u.uid=c.uid
     where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`
       : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
       isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`,

package/server/routes/widget/controllers/widget.set.js

@@ -8,11 +8,13 @@ import { uploadMultiPart } from '@opengis/fastify-file/utils.js';
 
 const tableList = {
   comment: 'crm.communications',
+  gallery: 'crm.files',
   checklist: 'crm.checklists',
 };
 const pkList = {
   comment: 'communication_id',
   checklist: 'checklist_id',
+  gallery: 'file_id',
 };
 
 const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
@@ -28,49 +30,55 @@ export default async function widgetSet(req) {
 
   const table = tableList[type];
 
+  // dsadasdad
+  if (['gallery', 'file'].includes(type) && req.headers['content-type'].split(';').shift() === "multipart/form-data") {
+    const file = await uploadMultiPart(req);
+    const extName = path.extname(file.filepath).slice(1).toLowerCase();
 
-    if (['gallery', 'file'].includes(type)) {
-      const file = await uploadMultiPart(req);
-      const extName = path.extname(file.filepath).slice(1).toLowerCase();
+    const data = {
+      uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
+      file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
+      ext: extName,
+      size: file?.size,
+      file_status: 1,
+      uid: user?.uid || 1,
+      entity_id: objectid,
+    };
 
-      const data = {
-        uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
-        file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
-        ext: extName,
-        size: file?.size,
-        file_status: 1,
-        uid: user?.uid || 1,
-        entity_id: objectid,
-      };
+    if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
+      return { message: 'invalid file extension', status: 400 };
+    }
 
-      if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
-        return { message: 'invalid file extension', status: 400 };
-      }
+    const { rows = [] } = await dataInsert({
+      table: 'crm.files', data, uid: user?.uid,
+    });
+    return {
+      rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
+    };
+  }
+  const { pk } = await getMeta({ pg, table });
+  if (!pk) return { message: 'table not found', status: 404 };
 
-      const { rows = [] } = await dataInsert({
-        table: 'crm.files', data, uid: user?.uid,
-      });
-      return {
-        rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
-      };
-    }
-    const { pk } = await getMeta({ pg, table });
-    if (!pk) return { message: 'table not found', status: 404 };
+  const data = { ...body, uid: user?.uid, entity_id: objectid };
 
-    const data = { ...body, uid: user?.uid, entity_id: objectid };
+  await applyHook('onWidgetSet', {
+    link: req.path,
+    id,
+    objectid,
+    session,
+    type,
+    payload: data,
+  });
 
-    await applyHook('onWidgetSet', {
-      link: req.path, session, type, payload: data,
+  const result = id
+    ? await dataUpdate({
+      table, data, id, uid: user?.uid,
+    })
+    : await dataInsert({
+      table, data, uid: user?.uid,
     });
-    const result = id
-      ? await dataUpdate({
-        table, data, id, uid: user?.uid,
-      })
-      : await dataInsert({
-        table, data, uid: user?.uid,
-      });
 
-    return {
-      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
-    };
+  return {
+    rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
+  };
 }

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

@@ -0,0 +1,12 @@
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function onWidgetSet({
+  pg = pgClients.client, id, objectid, type, payload = {},
+}) {
+  if (!id || !objectid || type !== 'gallery') {
+    return null;
+  }
+  if (payload?.ismain) {
+    await pg.query('update crm.files set ismain=false where entity_id=$1 and file_id<>$2', [objectid, id]);
+  }
+}

package/server/routes/widget/index.mjs

@@ -1,11 +1,16 @@
+import { addHook } from '@opengis/fastify-table/utils.js';
+
 import widgetDel from './controllers/widget.del.js';
 import widgetSet from './controllers/widget.set.js';
 import widgetGet from './controllers/widget.get.js';
 
-import { tableSchema } from './schema.js'
+import onWidgetSet from './hook/onWidgetSet.js';
+
+import { tableSchema } from './schema.js';
 
 export default async function route(fastify) {
   fastify.delete(`/widget/:type/:objectid/:id`, { scheme: tableSchema }, widgetDel);
   fastify.post(`/widget/:type/:objectid/:id?`, { scheme: tableSchema }, widgetSet);
   fastify.get(`/widget/:type/:objectid`, { config: { policy: ['public'] }, scheme: tableSchema }, widgetGet);
+  addHook('onWidgetSet', onWidgetSet);
 }

package/server/routes/widget/controllers/utils/obj2db.js

@@ -1,13 +0,0 @@
-export default function obj2db(data, nonexistCol) {
-  if (
-    typeof data !== 'object'
-        || Array.isArray(data)
-        || !Object.keys(data || {}).length
-  ) return { error: 'invalid data type' };
-
-  const columns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
-  // const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
-  const args = columns?.map((col) => data[col]);
-
-  return { columns, args, error: !columns?.length ? 'nothing to process' : undefined };
-}