@opengis/admin 0.1.90 → 0.1.92

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

@@ -1,14 +1,14 @@
-import userCls from './user.cls.js';
-
-export default async function userClsId(req) {
-  const { id } = req.params || {};
-  const res = await userCls(req);
-  if (req.query?.sql || res?.error) {
-    return res;
-  }
-  const { rows = [] } = res?.message || {};
-  if (!rows?.length) {
-    return { message: `cls not found: ${id}`, status: 404 };
-  }
-  return { message: rows?.[0], status: 200 };
-}
+import userCls from './user.cls.js';
+
+export default async function userClsId(req) {
+  const { id } = req.params || {};
+  const res = await userCls(req);
+  if (req.query?.sql || res?.error) {
+    return res;
+  }
+  const { rows = [] } = res?.message || {};
+  if (!rows?.length) {
+    return { message: `cls not found: ${id}`, status: 404 };
+  }
+  return { message: rows?.[0], status: 200 };
+}

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.cls.post.js

@@ -1,52 +1,52 @@
-export default async function userClsPost({
-  pg, body = {}, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-  const {
-    name, type = 'json', children = [], sql,
-  } = body;
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (!name) {
-    return { message: 'not enough params: name', status: 400 };
-  }
-
-  if (type === 'json' && (!Array.isArray(children) || !children.length || !children?.[0]?.id)) {
-    return { message: 'invalid params: children (array of objects)', status: 400 };
-  }
-
-  if (type === 'sql' && (!sql || typeof sql !== 'string')) {
-    return { message: 'invalid params: sql (string)', status: 400 };
-  }
-
-
-    const { rowCount = 0 } = await pg.query(`with recursive rows as (
-      select user_clsid, name, code, icon, color, parent
-      from admin.user_cls a
-      where name=$1
-      union all
-      select a.user_clsid, a.name, a.code, a.icon, a.color, a.parent
-      from admin.user_cls a
-      join rows b on a.parent=b.name
-    ) delete from admin.user_cls where user_clsid in (select user_clsid from rows )`, [name]);
-    console.log('delete old user cls', name, rowCount);
-
-    const { id, data } = await pg.query('insert into admin.user_cls(name,type,data,uid) values($1,$2,$3,$4) returning user_clsid as id, data', [name, type, sql, uid])
-      .then((res) => res.rows?.[0] || {});
-    if (type === 'json') {
-      if (!id) { return { error: 'insert user cls error', status: 500 }; }
-      const q1 = `insert into admin.user_cls(code,name,color,icon,parent,uid)
-      
-      select value->>'id',value->>'text',value->>'color',value->>'icon', '${name.replace(/'/g, "''")}', '${uid}'
-      from json_array_elements('${JSON.stringify(children).replace(/'/g, "''")}'::json)
-      
-      returning user_clsid as id, code, name, parent`;
-      const { rows = [] } = await pg.query(q1);
-      return { id, children: rows };
-    }
-    return { id, data };
-
-}
+export default async function userClsPost({
+  pg, body = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+  const {
+    name, type = 'json', children = [], sql,
+  } = body;
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (!name) {
+    return { message: 'not enough params: name', status: 400 };
+  }
+
+  if (type === 'json' && (!Array.isArray(children) || !children.length || !children?.[0]?.id)) {
+    return { message: 'invalid params: children (array of objects)', status: 400 };
+  }
+
+  if (type === 'sql' && (!sql || typeof sql !== 'string')) {
+    return { message: 'invalid params: sql (string)', status: 400 };
+  }
+
+
+    const { rowCount = 0 } = await pg.query(`with recursive rows as (
+      select user_clsid, name, code, icon, color, parent
+      from admin.user_cls a
+      where name=$1
+      union all
+      select a.user_clsid, a.name, a.code, a.icon, a.color, a.parent
+      from admin.user_cls a
+      join rows b on a.parent=b.name
+    ) delete from admin.user_cls where user_clsid in (select user_clsid from rows )`, [name]);
+    console.log('delete old user cls', name, rowCount);
+
+    const { id, data } = await pg.query('insert into admin.user_cls(name,type,data,uid) values($1,$2,$3,$4) returning user_clsid as id, data', [name, type, sql, uid])
+      .then((res) => res.rows?.[0] || {});
+    if (type === 'json') {
+      if (!id) { return { error: 'insert user cls error', status: 500 }; }
+      const q1 = `insert into admin.user_cls(code,name,color,icon,parent,uid)
+      
+      select value->>'id',value->>'text',value->>'color',value->>'icon', '${name.replace(/'/g, "''")}', '${uid}'
+      from json_array_elements('${JSON.stringify(children).replace(/'/g, "''")}'::json)
+      
+      returning user_clsid as id, code, name, parent`;
+      const { rows = [] } = await pg.query(q1);
+      return { id, children: rows };
+    }
+    return { id, data };
+
+}

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/utils/historyFormat.js

@@ -1,75 +1,75 @@
-import { readdir } from 'fs/promises';
-import { existsSync, readFileSync } from 'fs';
-
-import { getSelect } from '@opengis/fastify-table/utils.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 { getSelect } from '@opengis/fastify-table/utils.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/server/routes/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/server/routes/widget/controllers/widget.del.js

@@ -1,41 +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 };
-  
-  await pg.query(sql, [objectid, user.uid, id]);
-  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 Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+
+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 } };
+  
+}