@opengis/admin 0.2.129 → 0.2.130

package/server/routes/user/controllers/user.cls.js

@@ -1,71 +1,71 @@
-import { readFile } from 'fs/promises';
-import { getTemplatePath } from '@opengis/fastify-table/utils.js';
-
-export default async function userCls(req) {
-  const {
-    pg, params = {}, query = {}, session = {},
-  } = req;
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (query.type && !['json', 'sql'].includes(query.type)) {
-    return { message: 'param type is invalid', status: 400 };
-  }
-
-  const q = `select user_clsid as id, name, type, 
-  case when type='json' then (
-      ${params?.id
-    ? `(with recursive rows as (
-        select user_clsid, code as id, name as text, icon, color, parent
-        from admin.user_cls a
-        where name=u.name
-        union all
-        select a.user_clsid, a.code, a.name, a.icon, a.color, a.parent
-        from admin.user_cls a
-        join rows b on a.parent=b.text
-      ) select json_agg(row_to_json(q)) from rows q where text<>u.name
-     )`
-    : 'select count(*)::int from admin.user_cls where parent=u.name'} ) else null end as children, 
-      case when type='sql' then data else null end as sql from admin.user_cls u
-    where (case when type='json' then parent is null else true end)
-    and uid=(select uid from admin.users where $1 in (login,uid) limit 1)
-    and parent is null and ${query.type ? `type='${query.type}'` : '1=1'} and ${params?.id ? 'u.name=$2' : '1=1'}`;
-
-  if (query?.sql) return q;
-
-
-    const { rows = [] } = await pg.query(q, [uid, params.id].filter((el) => el));
-
-    rows.forEach((row) => {
-      if (row.type === 'sql') delete row.children;
-      if (row.type === 'json') { delete row.sql; Object.assign(row, { children: row.children || (params?.id ? [] : 0) }); }
-    });
-
-    const clsList = query.type === 'sql' ? [] : getTemplatePath('cls'); // skip cls if type sql
-    const selectList = query.type === 'json' ? [] : getTemplatePath('select'); // skip sql if type json
-
-    const userClsNames = rows.map((el) => el.name);
-    const selectNames = selectList.map((el) => el[0]);
-
-    const arr = (clsList || []).concat(selectList || []).map((el) => ({ name: el[0], path: el[1], type: el[2] }))
-      ?.filter((el) => (params?.id ? el.name === params?.id : true))
-      ?.filter((el) => ['sql', 'json'].includes(el?.type) && !userClsNames.includes(el.name))
-      ?.filter((el) => (el?.type === 'json' ? !selectNames?.includes(el?.name) : true));
-
-    const res = await Promise.all(arr?.map(async (el) => {
-      const type = { json: 'cls', sql: 'select' }[el.type] || el.type;
-      // const clsData = await getSelect(type, el.name);
-      const str = await readFile(el.path, 'utf-8');
-      const clsData = type === 'cls' ? JSON.parse(str) : str;
-      if (type === 'cls') {
-        const children = params?.id ? clsData : clsData?.length || 0;
-        return { name: el.name, type: el.type, children };
-      }
-      return { name: el.name, type: el.type, sql: clsData?.sql || clsData };
-    }));
-
-    return { message: { rows: rows.concat(res) }, status: 200 };
-}
+import { readFile } from 'fs/promises';
+import { getTemplatePath } from '@opengis/fastify-table/utils.js';
+
+export default async function userCls(req) {
+  const {
+    pg, params = {}, query = {}, session = {},
+  } = req;
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (query.type && !['json', 'sql'].includes(query.type)) {
+    return { message: 'param type is invalid', status: 400 };
+  }
+
+  const q = `select user_clsid as id, name, type, 
+  case when type='json' then (
+      ${params?.id
+    ? `(with recursive rows as (
+        select user_clsid, code as id, name as text, icon, color, parent
+        from admin.user_cls a
+        where name=u.name
+        union all
+        select a.user_clsid, a.code, a.name, a.icon, a.color, a.parent
+        from admin.user_cls a
+        join rows b on a.parent=b.text
+      ) select json_agg(row_to_json(q)) from rows q where text<>u.name
+     )`
+    : 'select count(*)::int from admin.user_cls where parent=u.name'} ) else null end as children, 
+      case when type='sql' then data else null end as sql from admin.user_cls u
+    where (case when type='json' then parent is null else true end)
+    and uid=(select uid from admin.users where $1 in (login,uid) limit 1)
+    and parent is null and ${query.type ? `type='${query.type}'` : '1=1'} and ${params?.id ? 'u.name=$2' : '1=1'}`;
+
+  if (query?.sql) return q;
+
+
+    const { rows = [] } = await pg.query(q, [uid, params.id].filter((el) => el));
+
+    rows.forEach((row) => {
+      if (row.type === 'sql') delete row.children;
+      if (row.type === 'json') { delete row.sql; Object.assign(row, { children: row.children || (params?.id ? [] : 0) }); }
+    });
+
+    const clsList = query.type === 'sql' ? [] : getTemplatePath('cls'); // skip cls if type sql
+    const selectList = query.type === 'json' ? [] : getTemplatePath('select'); // skip sql if type json
+
+    const userClsNames = rows.map((el) => el.name);
+    const selectNames = selectList.map((el) => el[0]);
+
+    const arr = (clsList || []).concat(selectList || []).map((el) => ({ name: el[0], path: el[1], type: el[2] }))
+      ?.filter((el) => (params?.id ? el.name === params?.id : true))
+      ?.filter((el) => ['sql', 'json'].includes(el?.type) && !userClsNames.includes(el.name))
+      ?.filter((el) => (el?.type === 'json' ? !selectNames?.includes(el?.name) : true));
+
+    const res = await Promise.all(arr?.map(async (el) => {
+      const type = { json: 'cls', sql: 'select' }[el.type] || el.type;
+      // const clsData = await getSelect(type, el.name);
+      const str = await readFile(el.path, 'utf-8');
+      const clsData = type === 'cls' ? JSON.parse(str) : str;
+      if (type === 'cls') {
+        const children = params?.id ? clsData : clsData?.length || 0;
+        return { name: el.name, type: el.type, children };
+      }
+      return { name: el.name, type: el.type, sql: clsData?.sql || clsData };
+    }));
+
+    return { message: { rows: rows.concat(res) }, status: 200 };
+}

package/server/routes/user/controllers/user.info.js

@@ -1,17 +1,17 @@
-export default async function userInfo({
-  pg, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const data = await pg.query(`select user_name, sur_name, father_name, user_rnokpp, user_type, email, login from admin.users 
-  where uid=$1`, [uid]).then((res) => res.rows?.[0] || {});
-
-    const { notifications = 0 } = await pg.query(`select count(*)::int as notifications from crm.notifications 
-    where addressee_id=$1 and read is not true`, [uid]).then((res) => res.rows?.[0] || {});
-    return { uid, ...data, notifications };
-
-}
+export default async function userInfo({
+  pg, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const data = await pg.query(`select user_name, sur_name, father_name, user_rnokpp, user_type, email, login from admin.users 
+  where uid=$1`, [uid]).then((res) => res.rows?.[0] || {});
+
+    const { notifications = 0 } = await pg.query(`select count(*)::int as notifications from crm.notifications 
+    where addressee_id=$1 and read is not true`, [uid]).then((res) => res.rows?.[0] || {});
+    return { uid, ...data, notifications };
+
+}

package/server/routes/user/schema.js

@@ -1,14 +1,14 @@
-const userClsSchema = {
-  quertstring: {
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-};
-
-const userClsIdSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w\\.]+)$' },
-  },
-};
-
-export { userClsSchema, userClsIdSchema };
-export default null;
+const userClsSchema = {
+  quertstring: {
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+};
+
+const userClsIdSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w\\.]+)$' },
+  },
+};
+
+export { userClsSchema, userClsIdSchema };
+export default null;

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

@@ -1,47 +1,47 @@
-/**
- * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
- *
- * @method DELETE
- * @summary CRM дані для обраного віджета.
- * @priority 2
- * @tag table
- * @type api
- * @requires setTokenById
- * @requires getSelect
- * @param {String} id Ідентифікатор для хешування
- * @param {Any} sql Використовується для повернення sql запиту
- * @param {String} type Тип для хешування даних
- * @errors 400, 500
- * @returns {Number} status Номер помилки
- * @returns {String|Object} error Опис помилки
- * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
- */
-
-import { pgClients, logChanges } from "@opengis/fastify-table/utils.js";
-
-export default async function widgetDel({
-  pg = pgClients.client, params = {}, session = {},
-}) {
-  const { user = {} } = session.passport || {};
-  if (!user.uid) return { error: 'access restricted', status: 403 };
-  const { type, objectid, id } = params;
-
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const sqls = {
-    comment: 'delete from crm.communications where entity_id=$1 and uid=$2 and communication_id=$3',
-    checklist: 'delete from crm.checklists where entity_id=$1 and uid=$2 and checklist_id=$3',
-    file: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3 returning uploaded_name',
-    gallery: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3 returning uploaded_name',
-  };
-  const sql = sqls[type];
-  if (!sql) return { error: 'type not valid', status: 401 };
-
-  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
-  const table = { comment: 'crm.communications', checklist: 'crm.checklists', file: 'crm.files', gallery: 'crm.files' }[type];
-  await logChanges({
-    pg, table, id, data: rows[0], uid: user?.uid, type: 'DELETE',
-  });
-  return { data: { id }, user: { uid: user.uid, name: user.user_name } };
-
-}
+/**
+ * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
+ *
+ * @method DELETE
+ * @summary CRM дані для обраного віджета.
+ * @priority 2
+ * @tag table
+ * @type api
+ * @requires setTokenById
+ * @requires getSelect
+ * @param {String} id Ідентифікатор для хешування
+ * @param {Any} sql Використовується для повернення sql запиту
+ * @param {String} type Тип для хешування даних
+ * @errors 400, 500
+ * @returns {Number} status Номер помилки
+ * @returns {String|Object} error Опис помилки
+ * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+
+import { pgClients, logChanges } from "@opengis/fastify-table/utils.js";
+
+export default async function widgetDel({
+  pg = pgClients.client, params = {}, session = {},
+}) {
+  const { user = {} } = session.passport || {};
+  if (!user.uid) return { error: 'access restricted', status: 403 };
+  const { type, objectid, id } = params;
+
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const sqls = {
+    comment: 'delete from crm.communications where entity_id=$1 and uid=$2 and communication_id=$3',
+    checklist: 'delete from crm.checklists where entity_id=$1 and uid=$2 and checklist_id=$3',
+    file: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3 returning uploaded_name',
+    gallery: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3 returning uploaded_name',
+  };
+  const sql = sqls[type];
+  if (!sql) return { error: 'type not valid', status: 401 };
+
+  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
+  const table = { comment: 'crm.communications', checklist: 'crm.checklists', file: 'crm.files', gallery: 'crm.files' }[type];
+  await logChanges({
+    pg, table, id, data: rows[0], uid: user?.uid, type: 'DELETE',
+  });
+  return { data: { id }, user: { uid: user.uid, name: user.user_name } };
+
+}

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

@@ -1,84 +1,84 @@
-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',
-  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'];
-
-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];
-
-  // 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();
-
-    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,
-    id,
-    objectid,
-    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',
+  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'];
+
+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];
+
+  // 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();
+
+    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,
+    id,
+    objectid,
+    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/hook/onWidgetSet.js

@@ -1,12 +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]);
-  }
-}
+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,16 +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 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);
-}
+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 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/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 }