@opengis/admin 0.2.67 → 0.2.68

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

@@ -1,98 +1,98 @@
-import { getMeta, getToken, pgClients } from '@opengis/fastify-table/utils.js';
-
-const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
-
-/**
- * Дістає CRM для widget
- *
- */
-
-export default async function widgetGet({
-  pg = pgClients.client, user = {}, params = {}, query = {},
-}) {
-  const param = user?.uid ? await getToken({
-    token: params.objectid, mode: 'w', uid: user.uid,
-  }) : null;
-
-  const objectid = param ? JSON.parse(param)?.id : params.objectid;
-
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const sqls = {
-    comment: pg.pk['admin.users']
-      ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
-    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 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,
-    (coalesce(coalesce(u.sur_name,'')||coalesce(' '||u.user_name,'') ||coalesce(' '||u.father_name,''),u.login)) as username
-    FROM log.table_changes a
-    left join admin.users u on a.change_user_id = u.uid
-    left join lateral(
-      select json_agg(row_to_json(q)) from (
-        select change_data_id, entity_key, value_new, value_old from log.table_changes_data
-        where change_id=a.change_id
-      )q
-    )b on 1=1
-    where (entity_id=$1 or entity_id in (
-      select communication_id as comments from crm.communications where entity_id=$1
-      union all select file_id from crm.files where entity_id=$1
-      union all select checklist_id from crm.checklists where entity_id=$1)
-    ) order by cdate desc 
-    limit 100`,
-
-    checklist: pg.pk['admin.users']
-      ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
-    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,
-    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
-    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 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,
-    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
-    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`,
-
-  };
-  const sql = sqls[params.type];
-  if (!sql) {
-    return { error: 'param type not valid', status: 400 };
-  }
-
-
-  /* data */
-  const time = [Date.now()];
-  const { rows } = await pg.query(sql, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
-  time.push(Date.now());
-
-  /* Object info  */
-  const { tableName } = pg.pk['log.table_changes'] ? await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]) : {};
-  const { pk } = await getMeta({ table: tableName });
-
-  const q = tableName && pg.pk['admin.users'] ? `select coalesce(b.user_name,'')||coalesce(' '||b.sur_name,'') as author, a.cdate, a.editor_date from ${tableName} a 
-    left join admin.users b on a.uid=b.uid where a.${pk}=$1 limit 1` : undefined;
-  const data = pk && q ? await pg.one(q, [objectid]) : {};
-
-  if (query.debug && user?.user_type === 'admin') {
-    return {
-      sql, type: params.type, q, id: objectid, data,
-    };
-  }
-
-  return {
-    time: { data: time[1] - time[0] },
-    rows,
-    user: { uid: user?.uid, name: user?.user_name },
-    data: { author: data?.author, cdate: data?.cdate, edate: data?.editor_date },
-    objectid: params.objectid,
-  };
-}
+import { getMeta, getToken, pgClients } from '@opengis/fastify-table/utils.js';
+
+const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+
+/**
+ * Дістає CRM для widget
+ *
+ */
+
+export default async function widgetGet({
+  pg = pgClients.client, user = {}, params = {}, query = {},
+}) {
+  const param = user?.uid ? await getToken({
+    token: params.objectid, mode: 'w', uid: user.uid,
+  }) : null;
+
+  const objectid = param ? JSON.parse(param)?.id : params.objectid;
+
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const sqls = {
+    comment: pg.pk['admin.users']
+      ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
+    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 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,
+    (coalesce(coalesce(u.sur_name,'')||coalesce(' '||u.user_name,'') ||coalesce(' '||u.father_name,''),u.login)) as username
+    FROM log.table_changes a
+    left join admin.users u on a.change_user_id = u.uid
+    left join lateral(
+      select json_agg(row_to_json(q)) from (
+        select change_data_id, entity_key, value_new, value_old from log.table_changes_data
+        where change_id=a.change_id
+      )q
+    )b on 1=1
+    where (entity_id=$1 or entity_id in (
+      select communication_id as comments from crm.communications where entity_id=$1
+      union all select file_id from crm.files where entity_id=$1
+      union all select checklist_id from crm.checklists where entity_id=$1)
+    ) order by cdate desc 
+    limit 100`,
+
+    checklist: pg.pk['admin.users']
+      ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
+    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,
+    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
+    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 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,
+    coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
+    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`,
+
+  };
+  const sql = sqls[params.type];
+  if (!sql) {
+    return { error: 'param type not valid', status: 400 };
+  }
+
+
+  /* data */
+  const time = [Date.now()];
+  const { rows } = await pg.query(sql, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
+  time.push(Date.now());
+
+  /* Object info  */
+  const { tableName } = pg.pk['log.table_changes'] ? await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]) : {};
+  const { pk } = await getMeta({ table: tableName });
+
+  const q = tableName && pg.pk['admin.users'] ? `select coalesce(b.user_name,'')||coalesce(' '||b.sur_name,'') as author, a.cdate, a.editor_date from ${tableName} a 
+    left join admin.users b on a.uid=b.uid where a.${pk}=$1 limit 1` : undefined;
+  const data = pk && q ? await pg.one(q, [objectid]) : {};
+
+  if (query.debug && user?.user_type === 'admin') {
+    return {
+      sql, type: params.type, q, id: objectid, data,
+    };
+  }
+
+  return {
+    time: { data: time[1] - time[0] },
+    rows,
+    user: { uid: user?.uid, name: user?.user_name },
+    data: { author: data?.author, cdate: data?.cdate, edate: data?.editor_date },
+    objectid: params.objectid,
+  };
+}

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

@@ -1,76 +1,76 @@
-import path from 'path';
-
-import {
-  getMeta, dataInsert, dataUpdate, applyHook,
-} from '@opengis/fastify-table/utils.js';
-
-import { uploadMultiPart } from '@opengis/fastify-file/utils.js';
-
-const tableList = {
-  comment: 'crm.communications',
-  checklist: 'crm.checklists',
-};
-const pkList = {
-  comment: 'communication_id',
-  checklist: 'checklist_id',
-};
-
-const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
-
-export default async function widgetSet(req) {
-  const {
-    pg, params = {}, session = {}, body = {},
-  } = req;
-  const { user = {} } = session.passport || {};
-  const { type, id, objectid } = params;
-  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) return { message: 'param type not valid', status: 400 };
-  if (!objectid) return { message: 'id required', status: 400 };
-
-  const table = tableList[type];
-
-
-    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,
-      };
-
-      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 data = { ...body, uid: user?.uid, entity_id: objectid };
-
-    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,
-      });
-
-    return {
-      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
-    };
-}
+import path from 'path';
+
+import {
+  getMeta, dataInsert, dataUpdate, applyHook,
+} from '@opengis/fastify-table/utils.js';
+
+import { uploadMultiPart } from '@opengis/fastify-file/utils.js';
+
+const tableList = {
+  comment: 'crm.communications',
+  checklist: 'crm.checklists',
+};
+const pkList = {
+  comment: 'communication_id',
+  checklist: 'checklist_id',
+};
+
+const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+
+export default async function widgetSet(req) {
+  const {
+    pg, params = {}, session = {}, body = {},
+  } = req;
+  const { user = {} } = session.passport || {};
+  const { type, id, objectid } = params;
+  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) return { message: 'param type not valid', status: 400 };
+  if (!objectid) return { message: 'id required', status: 400 };
+
+  const table = tableList[type];
+
+
+    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,
+      };
+
+      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 data = { ...body, uid: user?.uid, entity_id: objectid };
+
+    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,
+      });
+
+    return {
+      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
+    };
+}

package/server/routes/widget/index.mjs

@@ -1,11 +1,11 @@
-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'
-
-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);
-}
+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'
+
+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);
+}

package/server/routes/widget/schema.js

@@ -1,13 +1,13 @@
-const tableSchema = {
-    params: {
-      // type: { type: 'string', pattern: '^([\\d\\w]+)$' },
-      objectid: { type: 'string', pattern: '^([\\d\\w]+)$' },
-      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-    querystring: {
-      debug: { type: 'string', pattern: '^(\\d+)$' },
-    },
-  };
-
-export default null;
+const tableSchema = {
+    params: {
+      // type: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      objectid: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+    querystring: {
+      debug: { type: 'string', pattern: '^(\\d+)$' },
+    },
+  };
+
+export default null;
 export { tableSchema }

package/server/templates/cls/itree.recrzone_category.json

@@ -1,74 +1,74 @@
-[
-    {
-        "id": "12",
-        "text": "Розділювальна смуга",
-        "color": "#85754e",
-        "en": "Dividing line"
-    },
-    {
-        "id": "6",
-        "text": "Бульвар",
-        "color": "#00703c",
-        "en": "Boulevard"
-    },
-    {
-        "id": "1",
-        "text": "Вуличні насадження",
-        "color": "#8fbc8f",
-        "en": "Street plantings"
-    },
-    {
-        "id": "2",
-        "text": "Парк",
-        "color": "#a2cd5a",
-        "en": "Park"
-    },
-    {
-        "id": "3",
-        "text": "Сад",
-        "color": "#5e8c31",
-        "en": "Garden"
-    },
-    {
-        "id": "4",
-        "text": "Сквер",
-        "color": "#00ced1",
-        "en": "Square"
-    },
-    {
-        "id": "9",
-        "text": "Рекреаційна зона",
-        "color": "#e1a95f",
-        "en": "Recreational zone"
-    },
-    {
-        "id": "10",
-        "text": "Санітарно-захисна зона",
-        "color": "#6e7b8b",
-        "en": "Sanitary protection zone"
-    },
-    {
-        "id": "11",
-        "text": "Зелені насадження прибудинкової території",
-        "color": "#ace1af",
-        "en": "Green plantations in local areas"
-    },
-    {
-        "id": "5",
-        "text": "Прибережні зелені насадження",
-        "color": "#698b69",
-        "en": "Coastal green plantations"
-    },
-    {
-        "id": "7",
-        "text": "Лісопарк",
-        "color": "#6e8b3d",
-        "en": "Forest park"
-    },
-    {
-        "id": "8",
-        "text": "Міський ліс",
-        "color": "#4a5d23",
-        "en": "Urban forest"
-    }
+[
+    {
+        "id": "12",
+        "text": "Розділювальна смуга",
+        "color": "#85754e",
+        "en": "Dividing line"
+    },
+    {
+        "id": "6",
+        "text": "Бульвар",
+        "color": "#00703c",
+        "en": "Boulevard"
+    },
+    {
+        "id": "1",
+        "text": "Вуличні насадження",
+        "color": "#8fbc8f",
+        "en": "Street plantings"
+    },
+    {
+        "id": "2",
+        "text": "Парк",
+        "color": "#a2cd5a",
+        "en": "Park"
+    },
+    {
+        "id": "3",
+        "text": "Сад",
+        "color": "#5e8c31",
+        "en": "Garden"
+    },
+    {
+        "id": "4",
+        "text": "Сквер",
+        "color": "#00ced1",
+        "en": "Square"
+    },
+    {
+        "id": "9",
+        "text": "Рекреаційна зона",
+        "color": "#e1a95f",
+        "en": "Recreational zone"
+    },
+    {
+        "id": "10",
+        "text": "Санітарно-захисна зона",
+        "color": "#6e7b8b",
+        "en": "Sanitary protection zone"
+    },
+    {
+        "id": "11",
+        "text": "Зелені насадження прибудинкової території",
+        "color": "#ace1af",
+        "en": "Green plantations in local areas"
+    },
+    {
+        "id": "5",
+        "text": "Прибережні зелені насадження",
+        "color": "#698b69",
+        "en": "Coastal green plantations"
+    },
+    {
+        "id": "7",
+        "text": "Лісопарк",
+        "color": "#6e8b3d",
+        "en": "Forest park"
+    },
+    {
+        "id": "8",
+        "text": "Міський ліс",
+        "color": "#4a5d23",
+        "en": "Urban forest"
+    }
 ]

package/server/templates/cls/test.json

@@ -1,10 +1,10 @@
-[
-    {
-        "id": 1,
-        "text": "test"
-    },
-    {
-        "id": 2,
-        "text": "test2"
-    }
+[
+    {
+        "id": 1,
+        "text": "test"
+    },
+    {
+        "id": 2,
+        "text": "test2"
+    }
 ]