@opengis/fastify-table 1.4.53 → 1.4.55

package/server/routes/table/controllers/form.js

@@ -1,42 +1,42 @@
-import { applyHook, getTemplate } from '../../../../utils.js';
-
-const sql = `select property_key as key, property_json as json, property_int as int,
-property_text as text from admin.properties where 1=1`;
-
-async function getSettings({ pg }) {
-  const { rows = [] } = await pg.query(sql);
-  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  return data;
-}
-
-export default async function formFunction(req) {
-  const time = Date.now();
-
-  const { pg, params, user } = req;
-  const hookData = await applyHook('preForm', { form: params?.form, user });
-
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-
-  const form = await getTemplate('form', hookData?.form || params?.form);
-  if (!form) { return { status: 404, message: 'not found' }; }
-
-  // replace settings
-  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
-  if (arr?.length) {
-    const string = JSON.stringify(form);
-    const settings = await getSettings({ pg });
-    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
-    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
-    return { time: Date.now() - time, form: JSON.parse(res) };
-  }
-
-  const res = { time: Date.now() - time, form };
-  const res1 = await applyHook('afterForm', {
-    form: hookData?.form || params?.form,
-    payload: res,
-    user,
-  });
-  return res1 || { time: Date.now() - time, form };
-}
+import { applyHook, getTemplate } from '../../../../utils.js';
+
+const sql = `select property_key as key, property_json as json, property_int as int,
+property_text as text from admin.properties where 1=1`;
+
+async function getSettings({ pg }) {
+  const { rows = [] } = await pg.query(sql);
+  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+  return data;
+}
+
+export default async function formFunction(req) {
+  const time = Date.now();
+
+  const { pg, params, user } = req;
+  const hookData = await applyHook('preForm', { form: params?.form, user });
+
+  if (hookData?.message && hookData?.status) {
+    return { message: hookData?.message, status: hookData?.status };
+  }
+
+  const form = await getTemplate('form', hookData?.form || params?.form);
+  if (!form) { return { status: 404, message: 'not found' }; }
+
+  // replace settings
+  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
+  if (arr?.length) {
+    const string = JSON.stringify(form);
+    const settings = await getSettings({ pg });
+    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
+    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
+    return { time: Date.now() - time, form: JSON.parse(res) };
+  }
+
+  const res = { time: Date.now() - time, form };
+  const res1 = await applyHook('afterForm', {
+    form: hookData?.form || params?.form,
+    payload: res,
+    user,
+  });
+  return res1 || { time: Date.now() - time, form };
+}

package/server/routes/table/controllers/search.js

@@ -1,74 +1,74 @@
-import {
-  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
-} from '../../../../utils.js';
-
-function sequence(tables, data, fn) {
-  return tables.reduce((promise, table) => promise.then(() => fn({
-    ...data, tableName: table.replace('.json', ''),
-  })), Promise.resolve());
-}
-
-async function getData({
-  pg, tableName, query = {}, maxLimit, res,
-}) {
-  const loadTable = await getTemplate('table', tableName);
-
-  if (!loadTable) { return { message: 'not found', status: 404 }; }
-
-  const {
-    table, columns, meta,
-  } = loadTable;
-
-  const { pk } = await getMeta(table);
-
-  const cols = columns.map((el) => el.name || el).join(',');
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
-  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-
-  const limit = Math.max(maxLimit - res.rows.length, 0);
-  // Math.max(query.offset - res.rows.length,0)
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-
-  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
-
-  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
-  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
-  if (query.sql) {
-    res.sql.push(q);
-    return null;
-  }
-
-  const { rows } = await pg.query(q);
-
-  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
-
-  await metaFormat({ rows, table: tableName });
-  res.total += +total;
-  rows.forEach((row) => {
-    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
-    res.rows.push({
-      ...row, register: tableName, register_title: loadTable.ua, href,
-    });
-  });
-  return null;
-}
-
-export default async function search({
-  pg, funcs, query = {},
-}) {
-  const time = Date.now();
-
-  const tables = query.table ? [query.table] : await getTemplates('table');
-  const res = { rows: [], sql: [], total: 0 };
-
-  const maxLimit = Math.min(100, query.limit || '16');
-  await sequence(tables, {
-    pg, funcs, query, maxLimit, res,
-  }, getData);
-
-  if (query.sql) return res.sql.join(';\n');
-
-  return {
-    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
-  };
-}
+import {
+  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
+} from '../../../../utils.js';
+
+function sequence(tables, data, fn) {
+  return tables.reduce((promise, table) => promise.then(() => fn({
+    ...data, tableName: table.replace('.json', ''),
+  })), Promise.resolve());
+}
+
+async function getData({
+  pg, tableName, query = {}, maxLimit, res,
+}) {
+  const loadTable = await getTemplate('table', tableName);
+
+  if (!loadTable) { return { message: 'not found', status: 404 }; }
+
+  const {
+    table, columns, meta,
+  } = loadTable;
+
+  const { pk } = await getMeta(table);
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
+  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+
+  const limit = Math.max(maxLimit - res.rows.length, 0);
+  // Math.max(query.offset - res.rows.length,0)
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+
+  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
+
+  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
+  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
+  if (query.sql) {
+    res.sql.push(q);
+    return null;
+  }
+
+  const { rows } = await pg.query(q);
+
+  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
+
+  await metaFormat({ rows, table: tableName });
+  res.total += +total;
+  rows.forEach((row) => {
+    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
+    res.rows.push({
+      ...row, register: tableName, register_title: loadTable.ua, href,
+    });
+  });
+  return null;
+}
+
+export default async function search({
+  pg, funcs, query = {},
+}) {
+  const time = Date.now();
+
+  const tables = query.table ? [query.table] : await getTemplates('table');
+  const res = { rows: [], sql: [], total: 0 };
+
+  const maxLimit = Math.min(100, query.limit || '16');
+  await sequence(tables, {
+    pg, funcs, query, maxLimit, res,
+  }, getData);
+
+  if (query.sql) return res.sql.join(';\n');
+
+  return {
+    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
+  };
+}

package/server/routes/table/controllers/utils/locales.js

@@ -1 +1 @@
-export default {};
+export default {};

package/server/routes/util/controllers/status.monitor.js

@@ -1,8 +1,8 @@
-const formatMemoryUsage = (data) => `${Math.round((data / 1024 / 1024) * 100) / 100} MB`;
-
-export default async function statusMonitor() {
-  const memoryUsage = process.memoryUsage();
-  const message = Object.keys(memoryUsage)
-    .reduce((acc, curr) => Object.assign(acc, { [curr]: formatMemoryUsage(memoryUsage[curr]) }), {});
-  return { message, status: 200 };
-}
+const formatMemoryUsage = (data) => `${Math.round((data / 1024 / 1024) * 100) / 100} MB`;
+
+export default async function statusMonitor() {
+  const memoryUsage = process.memoryUsage();
+  const message = Object.keys(memoryUsage)
+    .reduce((acc, curr) => Object.assign(acc, { [curr]: formatMemoryUsage(memoryUsage[curr]) }), {});
+  return { message, status: 200 };
+}

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

@@ -1,89 +1,89 @@
-import config from '../../../../config.js';
-import isFileExists from '../../../plugins/file/isFileExists.js';
-import logChanges from '../../../plugins/crud/funcs/utils/logChanges.js';
-import pgClients from '../../../plugins/pg/pgClients.js';
-
-const isAdmin = (req) => process.env.NODE_ENV === 'admin'
-  || config.admin
-  || req?.hostname?.split?.(':')?.shift?.() === config.adminDomain
-  || req?.hostname?.startsWith?.('admin');
-
-async function checkAccess(pg, objectid, id) {
-  const { uid, filepath } = await pg.query('select uid, file_path as filepath from crm.files where entity_id=$1 and file_id=$2', [objectid, id])
-    .then(el => el.rows?.[0] || {});
-  return { uid, exists: filepath ? await isFileExists(filepath) : null };
-}
-
-/**
- * Дістає 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 Повідомлення про успішне виконання або об'єкт з параметрами
- */
-
-export default async function widgetDel(req, reply) {
-  const {
-    pg = pgClients.client, params = {}, user = {},
-  } = req;
-
-  if (!user?.uid) {
-    return reply.status(401).send('access restricted: user not authorized');
-  }
-
-  const { type, objectid, id } = params;
-
-  if (!objectid) {
-    return reply.status(400).send('not enough params: id');
-  }
-
-  // force delete db entry if file not exists
-  const { exists, uid } = ['file', 'gallery'].includes(type) ? await checkAccess(pg, objectid, id) : {};
-
-  if (exists && !isAdmin(req) && uid && user?.uid !== uid) {
-    return reply.status(403).send('access restricted: file exists, not an author');
-  }
-
-  const sqls = {
-    comment: `delete from crm.communications where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and communication_id=$3`,
-    checklist: `delete from crm.checklists where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and checklist_id=$3`,
-    file: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
-    gallery: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
-  };
-
-  const sql = sqls[type];
-  const table = {
-    comment: 'crm.communications',
-    checklist: 'crm.checklists',
-    file: 'crm.files',
-    gallery: 'crm.files',
-  }[type];
-
-  if (!sql) {
-    return reply.status(400).send('invalid widget type');
-  }
-
-  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
-
-  await logChanges({
-    pg,
-    table,
-    id,
-    data: rows[0],
-    uid: user?.uid,
-    type: 'DELETE',
-  });
-
-  return reply.status(200).send({ data: { id }, user: { uid: user.uid, name: user.user_name } });
-}
+import config from '../../../../config.js';
+import isFileExists from '../../../plugins/file/isFileExists.js';
+import logChanges from '../../../plugins/crud/funcs/utils/logChanges.js';
+import pgClients from '../../../plugins/pg/pgClients.js';
+
+const isAdmin = (req) => process.env.NODE_ENV === 'admin'
+  || config.admin
+  || req?.hostname?.split?.(':')?.shift?.() === config.adminDomain
+  || req?.hostname?.startsWith?.('admin');
+
+async function checkAccess(pg, objectid, id) {
+  const { uid, filepath } = await pg.query('select uid, file_path as filepath from crm.files where entity_id=$1 and file_id=$2', [objectid, id])
+    .then(el => el.rows?.[0] || {});
+  return { uid, exists: filepath ? await isFileExists(filepath) : null };
+}
+
+/**
+ * Дістає 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 Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+
+export default async function widgetDel(req, reply) {
+  const {
+    pg = pgClients.client, params = {}, user = {},
+  } = req;
+
+  if (!user?.uid) {
+    return reply.status(401).send('access restricted: user not authorized');
+  }
+
+  const { type, objectid, id } = params;
+
+  if (!objectid) {
+    return reply.status(400).send('not enough params: id');
+  }
+
+  // force delete db entry if file not exists
+  const { exists, uid } = ['file', 'gallery'].includes(type) ? await checkAccess(pg, objectid, id) : {};
+
+  if (exists && !isAdmin(req) && uid && user?.uid !== uid) {
+    return reply.status(403).send('access restricted: file exists, not an author');
+  }
+
+  const sqls = {
+    comment: `delete from crm.communications where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and communication_id=$3`,
+    checklist: `delete from crm.checklists where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and checklist_id=$3`,
+    file: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
+    gallery: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
+  };
+
+  const sql = sqls[type];
+  const table = {
+    comment: 'crm.communications',
+    checklist: 'crm.checklists',
+    file: 'crm.files',
+    gallery: 'crm.files',
+  }[type];
+
+  if (!sql) {
+    return reply.status(400).send('invalid widget type');
+  }
+
+  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
+
+  await logChanges({
+    pg,
+    table,
+    id,
+    data: rows[0],
+    uid: user?.uid,
+    type: 'DELETE',
+  });
+
+  return reply.status(200).send({ data: { id }, user: { uid: user.uid, name: user.user_name } });
+}

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

@@ -1,106 +1,106 @@
-import path from 'node:path';
-
-import getMeta from '../../../plugins/pg/funcs/getMeta.js';
-import dataInsert from '../../../plugins/crud/funcs/dataInsert.js';
-import dataUpdate from '../../../plugins/crud/funcs/dataUpdate.js';
-import applyHook from '../../../plugins/hook/funcs/applyHook.js';
-import uploadMultiPart from '../../../plugins/file/uploadMultiPart.js';
-
-const tableList = {
-  comment: 'crm.communications',
-  gallery: 'crm.files',
-  file: 'crm.files',
-  checklist: 'crm.checklists',
-};
-const pkList = {
-  comment: 'communication_id',
-  checklist: 'checklist_id',
-  file: 'file_id',
-  gallery: 'file_id',
-};
-
-const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
-
-export default async function widgetSet(req, reply) {
-  const {
-    pg, params = {}, session = {}, headers = {}, body = {}, user = {},
-  } = req;
-  const { type, id, objectid } = params;
-
-  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) {
-    return reply.status(400).send('param type not valid');
-  }
-
-  if (!objectid) {
-    return reply.status(400).send('not enough params: id');
-  }
-
-  const table = tableList[type];
-
-  // dsadasdad
-  if (['gallery', 'file'].includes(type) && 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 reply.status(400).send('invalid file extension');
-    }
-
-    const { rows = [] } = await dataInsert({
-      pg, table: 'crm.files', data, uid: user?.uid,
-    });
-
-    if (type === 'gallery') {
-      await pg.query(`update crm.files set ismain=true 
-      where entity_id=$1 
-      and file_id=$2 
-      and (select count(*) = 0 from crm.files where entity_id=$1 and ismain)`, [objectid, rows[0]?.file_id]);
-    }
-
-    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 reply.status(404).send('table not found');
-  }
-
-  const data = { ...body, uid: user?.uid, entity_id: objectid };
-
-  await applyHook('onWidgetSet', {
-    pg,
-    link: req.path,
-    id,
-    objectid,
-    session,
-    type,
-    payload: data,
-  });
-
-  const result = id
-    ? await dataUpdate({
-      pg, table, data, id, uid: user?.uid,
-    })
-    : await dataInsert({
-      pg, table, data, uid: user?.uid,
-    });
-
-  return reply.status(200).send({
-    rowCount: result.rowCount,
-    data: 'ok',
-    command: result.command,
-    id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
-  });
-}
+import path from 'node:path';
+
+import getMeta from '../../../plugins/pg/funcs/getMeta.js';
+import dataInsert from '../../../plugins/crud/funcs/dataInsert.js';
+import dataUpdate from '../../../plugins/crud/funcs/dataUpdate.js';
+import applyHook from '../../../plugins/hook/funcs/applyHook.js';
+import uploadMultiPart from '../../../plugins/file/uploadMultiPart.js';
+
+const tableList = {
+  comment: 'crm.communications',
+  gallery: 'crm.files',
+  file: 'crm.files',
+  checklist: 'crm.checklists',
+};
+const pkList = {
+  comment: 'communication_id',
+  checklist: 'checklist_id',
+  file: 'file_id',
+  gallery: 'file_id',
+};
+
+const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+
+export default async function widgetSet(req, reply) {
+  const {
+    pg, params = {}, session = {}, headers = {}, body = {}, user = {},
+  } = req;
+  const { type, id, objectid } = params;
+
+  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) {
+    return reply.status(400).send('param type not valid');
+  }
+
+  if (!objectid) {
+    return reply.status(400).send('not enough params: id');
+  }
+
+  const table = tableList[type];
+
+  // dsadasdad
+  if (['gallery', 'file'].includes(type) && 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 reply.status(400).send('invalid file extension');
+    }
+
+    const { rows = [] } = await dataInsert({
+      pg, table: 'crm.files', data, uid: user?.uid,
+    });
+
+    if (type === 'gallery') {
+      await pg.query(`update crm.files set ismain=true 
+      where entity_id=$1 
+      and file_id=$2 
+      and (select count(*) = 0 from crm.files where entity_id=$1 and ismain)`, [objectid, rows[0]?.file_id]);
+    }
+
+    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 reply.status(404).send('table not found');
+  }
+
+  const data = { ...body, uid: user?.uid, entity_id: objectid };
+
+  await applyHook('onWidgetSet', {
+    pg,
+    link: req.path,
+    id,
+    objectid,
+    session,
+    type,
+    payload: data,
+  });
+
+  const result = id
+    ? await dataUpdate({
+      pg, table, data, id, uid: user?.uid,
+    })
+    : await dataInsert({
+      pg, table, data, uid: user?.uid,
+    });
+
+  return reply.status(200).send({
+    rowCount: result.rowCount,
+    data: 'ok',
+    command: result.command,
+    id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
+  });
+}