@opengis/fastify-table 1.1.51 → 1.1.52

package/utils.js

@@ -1,104 +1,106 @@
-// This file contains code that we reuse
-// between our tests.
-
-import { handlebars } from '@opengis/fastify-hb/utils.js';
-import getTemplate from './table/controllers/utils/getTemplate.js';
-import getTemplatePath from './table/controllers/utils/getTemplatePath.js';
-import addTemplateDir from './table/controllers/utils/addTemplateDir.js';
-import userTemplateDir from './table/controllers/utils/userTemplateDir.js';
-import metaFormat from './table/funcs/metaFormat/index.js';
-import autoIndex from './pg/funcs/autoIndex.js';
-
-import getPG from './pg/funcs/getPG.js';
-import getPGAsync from './pg/funcs/getPGAsync.js';
-import initPG from './pg/funcs/init.js';
-import pgClients from './pg/pgClients.js';
-import getRedis from './redis/funcs/getRedis.js';
-
-import dataInsert from './crud/funcs/dataInsert.js';
-import dataUpdate from './crud/funcs/dataUpdate.js';
-import dataDelete from './crud/funcs/dataDelete.js';
-
-import getToken from './crud/funcs/getToken.js';
-import setToken from './crud/funcs/setToken.js';
-import checkXSS from './crud/controllers/utils/checkXSS.js';
-import getTableColumn from './table/controllers/utils/gisIRColumn.js';
-import getMeta from './pg/funcs/getMeta.js';
-import getAccess from './crud/funcs/getAccess.js';
-import getSelectVal from './table/funcs/metaFormat/getSelectVal.js';
-import getSelect from './table/controllers/utils/getSelect.js';
-import getSelectMeta from './table/controllers/utils/getSelectMeta.js';
-import applyHook from './hook/funcs/applyHook.js';
-import addHook from './hook/funcs/addHook.js';
-import execMigrations from './migration/exec.migrations.js';
-import addNotification from './notification/funcs/addNotification.js';
-import sendNotification from './notification/funcs/sendNotification.js';
-import getFilterSQL from './table/funcs/getFilterSQL/index.js';
-
-import addCron from './cron/funcs/addCron.js';
-import config from './config.js';
-import getOpt from './crud/funcs/getOpt.js';
-import setOpt from './crud/funcs/setOpt.js';
-
-import isFileExists from './crud/funcs/isFileExists.js';
-import getFolder from './crud/funcs/utils/getFolder.js';
-
-import logger from './logger/getLogger.js';
-
-export default null;
-export {
-  config,
-  getFolder,
-  handlebars,
-  getFilterSQL,
-  addCron,
-  execMigrations,
-  getRedis,
-  logger,
-  isFileExists,
-
-  // hook
-  addHook,
-  applyHook,
-
-  // template
-  getTemplate,
-  getTemplatePath,
-  addTemplateDir,
-  userTemplateDir,
-
-  // notification
-  addNotification,
-  sendNotification,
-
-  // security
-  checkXSS,
-  getAccess,
-  getToken,
-  getOpt,
-  setOpt,
-  setToken,
-
-  // crud
-  dataInsert,
-  dataUpdate,
-  dataDelete,
-
-  // table
-  autoIndex,
-  metaFormat,
-  getMeta,
-  getTableColumn,
-
-  // pg
-  initPG,
-  getPG,
-  getPGAsync,
-  pgClients,
-
-  // select
-  getSelectVal,
-  getSelectMeta,
-  getSelect,
-
-};
+// This file contains code that we reuse
+// between our tests.
+
+import { handlebars } from '@opengis/fastify-hb/utils.js';
+import getTemplate from './table/controllers/utils/getTemplate.js';
+import getTemplatePath from './table/controllers/utils/getTemplatePath.js';
+import addTemplateDir from './table/controllers/utils/addTemplateDir.js';
+import userTemplateDir from './table/controllers/utils/userTemplateDir.js';
+import metaFormat from './table/funcs/metaFormat/index.js';
+import autoIndex from './pg/funcs/autoIndex.js';
+
+import getPG from './pg/funcs/getPG.js';
+import getPGAsync from './pg/funcs/getPGAsync.js';
+import initPG from './pg/funcs/init.js';
+import pgClients from './pg/pgClients.js';
+import getRedis from './redis/funcs/getRedis.js';
+import redisClients from './redis/funcs/redisClients.js';
+
+import dataInsert from './crud/funcs/dataInsert.js';
+import dataUpdate from './crud/funcs/dataUpdate.js';
+import dataDelete from './crud/funcs/dataDelete.js';
+
+import getToken from './crud/funcs/getToken.js';
+import setToken from './crud/funcs/setToken.js';
+import checkXSS from './crud/controllers/utils/checkXSS.js';
+import getTableColumn from './table/controllers/utils/gisIRColumn.js';
+import getMeta from './pg/funcs/getMeta.js';
+import getAccess from './crud/funcs/getAccess.js';
+import getSelectVal from './table/funcs/metaFormat/getSelectVal.js';
+import getSelect from './table/controllers/utils/getSelect.js';
+import getSelectMeta from './table/controllers/utils/getSelectMeta.js';
+import applyHook from './hook/funcs/applyHook.js';
+import addHook from './hook/funcs/addHook.js';
+import execMigrations from './migration/exec.migrations.js';
+import addNotification from './notification/funcs/addNotification.js';
+import sendNotification from './notification/funcs/sendNotification.js';
+import getFilterSQL from './table/funcs/getFilterSQL/index.js';
+
+import addCron from './cron/funcs/addCron.js';
+import config from './config.js';
+import getOpt from './crud/funcs/getOpt.js';
+import setOpt from './crud/funcs/setOpt.js';
+
+import isFileExists from './crud/funcs/isFileExists.js';
+import getFolder from './crud/funcs/utils/getFolder.js';
+
+import logger from './logger/getLogger.js';
+
+export default null;
+export {
+  config,
+  getFolder,
+  handlebars,
+  getFilterSQL,
+  addCron,
+  execMigrations,
+  getRedis,
+  redisClients,
+  logger,
+  isFileExists,
+
+  // hook
+  addHook,
+  applyHook,
+
+  // template
+  getTemplate,
+  getTemplatePath,
+  addTemplateDir,
+  userTemplateDir,
+
+  // notification
+  addNotification,
+  sendNotification,
+
+  // security
+  checkXSS,
+  getAccess,
+  getToken,
+  getOpt,
+  setOpt,
+  setToken,
+
+  // crud
+  dataInsert,
+  dataUpdate,
+  dataDelete,
+
+  // table
+  autoIndex,
+  metaFormat,
+  getMeta,
+  getTableColumn,
+
+  // pg
+  initPG,
+  getPG,
+  getPGAsync,
+  pgClients,
+
+  // select
+  getSelectVal,
+  getSelectMeta,
+  getSelect,
+
+};

package/widget/controllers/utils/historyFormat.js

@@ -1,76 +1,76 @@
-import { readdir } from 'fs/promises';
-import { existsSync, readFileSync } from 'fs';
-
-// import getTemplate from '../../../table/controllers/utils/getTemplate.js';
-import getSelect from '../../../table/controllers/utils/getSelect.js';
-
-const dbData = {};
-
-// from config??
-const allTemplates = { table: {} };
-
-const historyQ = `select nspname||'.'||relname as table_name, json_agg(json_build_object('name',attname, 'title',coalesce(col_description(attrelid, attnum),attname))) as columns
-from pg_attribute a
-left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
-JOIN pg_class AS i
-  ON i.oid = a.attrelid 
-JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
-where a.attnum > 0 
-and not a.attisdropped
-group by nspname||'.'||relname`;
-
-export default async function historyFormat(rows, table, pg) {
-  if (!rows?.[0]?.changes) return rows; // old structure
-  // on startup
-  if (!allTemplates.table.length) {
-    const templateDir = './server/templates/table';
-    const templates = existsSync(templateDir) ? await readdir(templateDir) : [];
-    templates.forEach((template) => {
-      const body = JSON.parse(readFileSync(`${templateDir}/${template}`) || '{}');
-      Object.assign(allTemplates.table, { [template]: body });
-    });
-  }
-
-  const progrid = Object.keys(allTemplates.table).find((key) => key.replace('.json', '') === table);
-  if (!progrid) return rows;
-  // const body = await getTemplate('table', progrid);
-  const body = allTemplates.table[progrid];
-  const tableName = body?.table || table;
-  if (!tableName) return rows;
-
-  // get DB column description
-  if (!dbData?.[body.table]?.length) {
-    const { rows: rows1 } = await pg.query(historyQ);
-    rows1.forEach((row) => {
-      dbData[row.table_name] = row.columns;
-    });
-  }
-
-  // rewrite!!!
-  await Promise.all(rows?.map(async (op) => {
-    op.changes?.map(async (el) => {
-      const col = body.colModel.filter((col1) => col1.name === el.attr)[0] || dbData[body?.table]?.find((col1) => col1.name === el.attr);
-      if (el.attr === 'geom') {
-        el.title = 'Геометрія';
-      }
-      el.title = col?.ua || col?.title || el.attr;
-      if (!col) return;
-      el.type = col.type;
-      el.format = col.format;
-      const select = col.data || col.option || col.select;
-
-      // getSelect not equals to node
-      if (select && false) {
-        el.select = select;
-        const cls = await getSelect(select, {
-          val: [el.old, el.new],
-        });
-
-        el.oldf = cls[0] || el.old;
-        el.newf = cls[1] || el.new;
-      }
-    });
-  }));
-
-  return rows;
-}
+import { readdir } from 'fs/promises';
+import { existsSync, readFileSync } from 'fs';
+
+// import getTemplate from '../../../table/controllers/utils/getTemplate.js';
+import getSelect from '../../../table/controllers/utils/getSelect.js';
+
+const dbData = {};
+
+// from config??
+const allTemplates = { table: {} };
+
+const historyQ = `select nspname||'.'||relname as table_name, json_agg(json_build_object('name',attname, 'title',coalesce(col_description(attrelid, attnum),attname))) as columns
+from pg_attribute a
+left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
+JOIN pg_class AS i
+  ON i.oid = a.attrelid 
+JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
+where a.attnum > 0 
+and not a.attisdropped
+group by nspname||'.'||relname`;
+
+export default async function historyFormat(rows, table, pg) {
+  if (!rows?.[0]?.changes) return rows; // old structure
+  // on startup
+  if (!allTemplates.table.length) {
+    const templateDir = './server/templates/table';
+    const templates = existsSync(templateDir) ? await readdir(templateDir) : [];
+    templates.forEach((template) => {
+      const body = JSON.parse(readFileSync(`${templateDir}/${template}`) || '{}');
+      Object.assign(allTemplates.table, { [template]: body });
+    });
+  }
+
+  const progrid = Object.keys(allTemplates.table).find((key) => key.replace('.json', '') === table);
+  if (!progrid) return rows;
+  // const body = await getTemplate('table', progrid);
+  const body = allTemplates.table[progrid];
+  const tableName = body?.table || table;
+  if (!tableName) return rows;
+
+  // get DB column description
+  if (!dbData?.[body.table]?.length) {
+    const { rows: rows1 } = await pg.query(historyQ);
+    rows1.forEach((row) => {
+      dbData[row.table_name] = row.columns;
+    });
+  }
+
+  // rewrite!!!
+  await Promise.all(rows?.map(async (op) => {
+    op.changes?.map(async (el) => {
+      const col = body.colModel.filter((col1) => col1.name === el.attr)[0] || dbData[body?.table]?.find((col1) => col1.name === el.attr);
+      if (el.attr === 'geom') {
+        el.title = 'Геометрія';
+      }
+      el.title = col?.ua || col?.title || el.attr;
+      if (!col) return;
+      el.type = col.type;
+      el.format = col.format;
+      const select = col.data || col.option || col.select;
+
+      // getSelect not equals to node
+      if (select && false) {
+        el.select = select;
+        const cls = await getSelect(select, {
+          val: [el.old, el.new],
+        });
+
+        el.oldf = cls[0] || el.old;
+        el.newf = cls[1] || el.new;
+      }
+    });
+  }));
+
+  return rows;
+}

package/widget/controllers/utils/obj2db.js

@@ -1,13 +1,13 @@
-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 };
-}
+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 };
+}

package/widget/controllers/widget.del.js

@@ -1,44 +1,41 @@
-/**
- * Дістає 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({
-  pg, 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',
-    gallery: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3',
-  };
-  const sql = sqls[type];
-  if (!sql) return { error: 'type not valid', status: 401 };
-  try {
-    await pg.query(sql, [objectid, user.uid, id]);
-    return { data: { id }, user: { uid: user.uid, name: user.user_name } };
-  }
-  catch (err) {
-    return { message: err.toString(), status: 500 };
-  }
-}
+/**
+ * Дістає 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({
+  pg, 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',
+    gallery: 'update crm.files set file_status=3 where entity_id=$1 and uid=$2 and file_id=$3',
+  };
+  const sql = sqls[type];
+  if (!sql) return { error: 'type not valid', status: 401 };
+  
+  await pg.query(sql, [objectid, user.uid, id]);
+  return { data: { id }, user: { uid: user.uid, name: user.user_name } };
+  
+}