@opengis/admin 0.3.22 → 0.3.23

package/server/routes/properties/utils/refreshData.js

@@ -1,128 +1,128 @@
-import { randomUUID, createHash } from 'crypto';
-
-import { dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
-
-function prepareResult(res) {
-  const arr = (res.rows || (Array.isArray(res) ? res : Object.values(res || {})));
-  return {
-    command: 'INSERT',
-    count: res?.rowCount || arr.filter((el) => el.command === 'INSERT')
-      ?.map((el) => ({ result: 'success', count: el.rowCount }))
-      ?.reduce((acc, curr) => acc + curr.count, 0),
-  };
-}
-
-export default async function refreshData({
-  pg = pgClients.client, entity, table, uid, data,
-}) {
-  if (!['filter', 'column', 'customQuery', 'customColumn'].includes(entity)) {
-    return { message: 'invalid params: entity', status: 400 };
-  }
-
-  const client = await pg.connect();
-
-  /* getMeta support */
-  client.options = pg.options;
-  client.tlist = pg.tlist;
-  client.pgType = pg.pgType;
-  client.pk = pg.pk;
-  client.relkinds = pg.relkinds;
-
-  const result = {};
-
-  try {
-    await client.query('BEGIN');
-
-    if (['filter', 'column'].includes(entity)) {
-      data?.forEach((el) => Object.assign(el, { id: el.id || randomUUID() }));
-      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
-
-      const res = await dataInsert({
-        pg: client,
-        table: 'setting.property',
-        data: {
-          property_entity: entity,
-          object_id: table,
-          property_json: JSON.stringify(data), // ?.replace(/'+/g, "'")?.replace(/'/g, "''")
-        },
-        uid,
-      });
-      Object.assign(result, res);
-    }
-
-    if (['customQuery'].includes(entity)) {
-      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
-
-      const res = await Promise.all(data?.map(async (el) => dataInsert({
-        pg: client,
-        table: 'setting.property',
-        data: {
-          property_entity: entity,
-          object_id: table,
-          property_key: el.name,
-          property_text: el.query,
-          property_json: { disabled: el.disabled },
-        },
-        uid,
-      })));
-      Object.assign(result, res);
-    }
-
-    if (entity === 'customColumn') {
-      const prefix = createHash('md5').update(table).digest('hex').substr(0, 10);
-      const data1 = [];
-
-      await Promise.all(data.map(async (el, index) => {
-        const obj = {
-          cf_id: `col_${prefix}_${index}`,
-          cf_name: el.title || el.ua || el.name,
-          cf_type: el.format || el.type,
-          cf_default: el.default,
-          cf_notnull: el.notnull,
-          object_id: table,
-          tablename: table,
-        };
-
-        data1.push({
-          name: obj.cf_id,
-          title: obj.cf_name,
-          format: obj.cf_type,
-          option: data[index]?.option,
-          hidden: data[index]?.hidden,
-          custom: true,
-        });
-
-        await dataInsert({
-          pg: client,
-          table: 'setting.custom_field',
-          data: obj,
-          uid,
-        });
-      }));
-
-      await client.query('delete from setting.custom_field where $1 in (tablename, object_id)', [table]);
-      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
-
-      const data2 = JSON.stringify(data1?.filter((value, index, array) => array.indexOf(value) === index)); // ?.replace(/'+/g, "'")?.replace(/'/g, "''")
-      const res = await dataInsert({
-        pg: client,
-        table: 'setting.property',
-        data: {
-          property_entity: 'customColumn',
-          object_id: table,
-          property_json: data2,
-        },
-        uid,
-      });
-      Object.assign(result, res);
-    }
-    await client.query('COMMIT');
-    return prepareResult(result);
-  } catch (err) {
-    await client.query('ROLLBACK');
-    return { error: err.toString(), status: 500 };
-  }
-  finally {
-    client.release();
-  }
-};
+import { randomUUID, createHash } from 'crypto';
+
+import { dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
+
+function prepareResult(res) {
+  const arr = (res.rows || (Array.isArray(res) ? res : Object.values(res || {})));
+  return {
+    command: 'INSERT',
+    count: res?.rowCount || arr.filter((el) => el.command === 'INSERT')
+      ?.map((el) => ({ result: 'success', count: el.rowCount }))
+      ?.reduce((acc, curr) => acc + curr.count, 0),
+  };
+}
+
+export default async function refreshData({
+  pg = pgClients.client, entity, table, uid, data,
+}) {
+  if (!['filter', 'column', 'customQuery', 'customColumn'].includes(entity)) {
+    return { message: 'invalid params: entity', status: 400 };
+  }
+
+  const client = await pg.connect();
+
+  /* getMeta support */
+  client.options = pg.options;
+  client.tlist = pg.tlist;
+  client.pgType = pg.pgType;
+  client.pk = pg.pk;
+  client.relkinds = pg.relkinds;
+
+  const result = {};
+
+  try {
+    await client.query('BEGIN');
+
+    if (['filter', 'column'].includes(entity)) {
+      data?.forEach((el) => Object.assign(el, { id: el.id || randomUUID() }));
+      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
+
+      const res = await dataInsert({
+        pg: client,
+        table: 'setting.property',
+        data: {
+          property_entity: entity,
+          object_id: table,
+          property_json: JSON.stringify(data), // ?.replace(/'+/g, "'")?.replace(/'/g, "''")
+        },
+        uid,
+      });
+      Object.assign(result, res);
+    }
+
+    if (['customQuery'].includes(entity)) {
+      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
+
+      const res = await Promise.all(data?.map(async (el) => dataInsert({
+        pg: client,
+        table: 'setting.property',
+        data: {
+          property_entity: entity,
+          object_id: table,
+          property_key: el.name,
+          property_text: el.query,
+          property_json: { disabled: el.disabled },
+        },
+        uid,
+      })));
+      Object.assign(result, res);
+    }
+
+    if (entity === 'customColumn') {
+      const prefix = createHash('md5').update(table).digest('hex').substr(0, 10);
+      const data1 = [];
+
+      await Promise.all(data.map(async (el, index) => {
+        const obj = {
+          cf_id: `col_${prefix}_${index}`,
+          cf_name: el.title || el.ua || el.name,
+          cf_type: el.format || el.type,
+          cf_default: el.default,
+          cf_notnull: el.notnull,
+          object_id: table,
+          tablename: table,
+        };
+
+        data1.push({
+          name: obj.cf_id,
+          title: obj.cf_name,
+          format: obj.cf_type,
+          option: data[index]?.option,
+          hidden: data[index]?.hidden,
+          custom: true,
+        });
+
+        await dataInsert({
+          pg: client,
+          table: 'setting.custom_field',
+          data: obj,
+          uid,
+        });
+      }));
+
+      await client.query('delete from setting.custom_field where $1 in (tablename, object_id)', [table]);
+      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
+
+      const data2 = JSON.stringify(data1?.filter((value, index, array) => array.indexOf(value) === index)); // ?.replace(/'+/g, "'")?.replace(/'/g, "''")
+      const res = await dataInsert({
+        pg: client,
+        table: 'setting.property',
+        data: {
+          property_entity: 'customColumn',
+          object_id: table,
+          property_json: data2,
+        },
+        uid,
+      });
+      Object.assign(result, res);
+    }
+    await client.query('COMMIT');
+    return prepareResult(result);
+  } catch (err) {
+    await client.query('ROLLBACK');
+    return { error: err.toString(), status: 500 };
+  }
+  finally {
+    client.release();
+  }
+};

package/server/routes/report/utils/getFilterQuery.js

@@ -1,67 +1,67 @@
-/* eslint-disable no-continue */
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-
-import formatValue from './formatValue.js';
-
-function getFilterQuery({ pg, filter: filterStr, fields, filterList }) {
-    if (!filterStr) return null; // filter list API
-
-    const mainOperators = ['=', '~', '>', '<'];
-
-    const filterQueryArray = decodeURIComponent(filterStr?.replace(/%/g, '%25').replace(/%/g, '\\%')?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/);
-
-    const resultList = [];
-
-    for (let i = 0; i < filterQueryArray.length; i += 1) {
-        const item = filterQueryArray[i];
-        const operator = mainOperators?.find((el) => item.indexOf(el) !== -1) || '=';
-        const [name] = item.split(operator);
-
-        // skip already added filter
-        if (resultList.find((el) => el.name === name)) {
-            continue;
-        }
-
-        // filter
-        const filter = filterList?.find((el) => [el.id, el.name].includes(name)) || { type: 'text' };
-
-        // find all value
-        const value = filterQueryArray.filter((el) => el.startsWith(name)).map((el) => el.substring(name.length + 1)).join(',');
-
-        if (filter?.query) {
-            resultList.push({
-                name, value, query: filter?.query, operator: '=', filterType: filter.type, type: 'text',
-            });
-            continue;
-        }
-
-        // find field and skip not exists
-        const { dataTypeID } = fields?.find((el) => el.name === name) || {};
-
-        // format query
-        const {
-            op, query, filterType, fieldType,
-        } = formatValue({
-            pg,
-            filter,
-            name,
-            value,
-            operator,
-            dataTypeID,
-        }) || {};
-        if (!query) continue;
-
-        resultList.push({
-            name, value, query, operator: op, filterType, type: fieldType,
-        });
-    }
-
-    return resultList;
-}
-
-export default getFilterQuery;
+/* eslint-disable no-continue */
+
+/**
+* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+* @param {String} opt.query - запит до таблиці
+* @param {String} opt.hash - інформація з хешу по запиту
+*/
+
+import formatValue from './formatValue.js';
+
+function getFilterQuery({ pg, filter: filterStr, fields, filterList }) {
+    if (!filterStr) return null; // filter list API
+
+    const mainOperators = ['=', '~', '>', '<'];
+
+    const filterQueryArray = decodeURIComponent(filterStr?.replace(/%/g, '%25').replace(/%/g, '\\%')?.replace(/(^,)|(,$)/g, '')).replace(/'/g, '').split(/[;|]/);
+
+    const resultList = [];
+
+    for (let i = 0; i < filterQueryArray.length; i += 1) {
+        const item = filterQueryArray[i];
+        const operator = mainOperators?.find((el) => item.indexOf(el) !== -1) || '=';
+        const [name] = item.split(operator);
+
+        // skip already added filter
+        if (resultList.find((el) => el.name === name)) {
+            continue;
+        }
+
+        // filter
+        const filter = filterList?.find((el) => [el.id, el.name].includes(name)) || { type: 'text' };
+
+        // find all value
+        const value = filterQueryArray.filter((el) => el.startsWith(name)).map((el) => el.substring(name.length + 1)).join(',');
+
+        if (filter?.query) {
+            resultList.push({
+                name, value, query: filter?.query, operator: '=', filterType: filter.type, type: 'text',
+            });
+            continue;
+        }
+
+        // find field and skip not exists
+        const { dataTypeID } = fields?.find((el) => el.name === name) || {};
+
+        // format query
+        const {
+            op, query, filterType, fieldType,
+        } = formatValue({
+            pg,
+            filter,
+            name,
+            value,
+            operator,
+            dataTypeID,
+        }) || {};
+        if (!query) continue;
+
+        resultList.push({
+            name, value, query, operator: op, filterType, type: fieldType,
+        });
+    }
+
+    return resultList;
+}
+
+export default getFilterQuery;

package/server/routes/templates/index.mjs

@@ -1,16 +1,16 @@
-import getTemplateApi from './controllers/getTemplate.js';
-
-import getTemplateSchema from './schema.js'
-
-export default async function route(fastify) {
-    //fastify.decorate('addTempateFolder', addTempateFolder); // call from funcs
-    fastify.get(`/template/:type/:name`, { config: { policy: ['public'] }, scheme: getTemplateSchema },  getTemplateApi);
-
-    /*fastify.addHook('onListen', async () => {
-        await addTempateFolder(path.join(process.cwd(), '/module/itree'));
-        await addTempateFolder(path.join(process.cwd(), '/module/test'));        
-      });*/
-
-
-
-}
+import getTemplateApi from './controllers/getTemplate.js';
+
+import getTemplateSchema from './schema.js'
+
+export default async function route(fastify) {
+    //fastify.decorate('addTempateFolder', addTempateFolder); // call from funcs
+    fastify.get(`/template/:type/:name`, { config: { policy: ['public'] }, scheme: getTemplateSchema },  getTemplateApi);
+
+    /*fastify.addHook('onListen', async () => {
+        await addTempateFolder(path.join(process.cwd(), '/module/itree'));
+        await addTempateFolder(path.join(process.cwd(), '/module/test'));        
+      });*/
+
+
+
+}

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

@@ -1,54 +1,54 @@
-import { pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function userClsPost({
-  pg = pgClients.client, body = {}, user = {},
-}) {
-  const { uid } = 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' && (children?.length ? (!Array.isArray(children) || !children.length || !children?.[0]?.id) : false)) {
-    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' && children?.length) {
-    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, name, type, children: rows };
-  }
-  return { id, name, type, data };
-
-}
+import { pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function userClsPost({
+  pg = pgClients.client, body = {}, user = {},
+}) {
+  const { uid } = 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' && (children?.length ? (!Array.isArray(children) || !children.length || !children?.[0]?.id) : false)) {
+    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' && children?.length) {
+    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, name, type, children: rows };
+  }
+  return { id, name, type, data };
+
+}

package/server/routes/util/index.mjs

@@ -1,5 +1,5 @@
-import codeGenerator from "./controllers/code.generator.js";
-
-export default async function plugin(fastify, opts) {
-  fastify.get('/code-gen/:token/:column/:id?', { config: { policy: ['user'] } }, codeGenerator);
-}
+import codeGenerator from "./controllers/code.generator.js";
+
+export default async function plugin(fastify, opts) {
+  fastify.get('/code-gen/:token/:column/:id?', { config: { policy: ['user'] } }, codeGenerator);
+}