@opengis/admin 0.3.23 → 0.3.25

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/controllers/data.js

@@ -1,76 +1,76 @@
-import { handlebars, pgClients, getTemplate, metaFormat, handlebarsSync } from '@opengis/fastify-table/utils.js';
-
-import getFilterQuery from '../utils/getFilterQuery.js';
-
-const maxLimit = 100;
-
-export default async function reportData({
-    pg = pgClients.client, params = {}, query = {}, user = {},
-}) {
-    if (!params?.name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-
-    const loadTemplate = await getTemplate('report', params.name);
-
-    if (!loadTemplate?.sql) {
-        return { message: `report not found: ${params.name}`, status: 404 };
-    }
-
-    const { uid } = user;
-
-    const { kpi, sql, meta, filters } = loadTemplate;
-    const { date, columns: metaColumns } = meta || {};
-
-    const granularity = query.granularity && date && false ? `date_trunc('${query.granularity}',${date})::date::text` : null;
-    const groupby = [meta?.groupby, granularity].filter(el => el).join(',');
-
-    const period = query.period && date ? `${date}=${query.period}` : null;
-    const filter = [query.filter, period].filter(el => el).join(';');
-
-    const limit = Math.min(maxLimit, +(query.limit || 20));
-    const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-    const kpiColumns = kpi ? kpi?.map(el => `${el.sql || 'count(*)'} as "${el.name}"`)?.join(',') : '';
-    const columnsList = metaColumns || loadTemplate.columns?.map(el => el.name)?.join(',');
-
-    const qMeta = await handlebars.compile(sql)({ user, uid });
-    const { fields = [] } = await pg.query(`select * from (${qMeta})q limit 0`);
-
-    const where = filter ? getFilterQuery({ pg, filter, fields, filterList: filters })?.map?.(el => el.query)?.join(' and ') : null;
-
-    const qAgg = `select ${kpiColumns || ''} from (${qMeta})q where ${where || '1=1'}`;
-    const q = `select ${columnsList || '*'} from (${qMeta})q where ${where || '1=1'} ${groupby ? `group by ${groupby}` : ''} limit ${limit} offset ${offset}`;
-
-    if (query.sql && user?.user_type?.includes('admin')) return `${qAgg};${q}`;
-
-    const kpiData = await pg.query(qAgg).then(el => el.rows?.[0] || {});
-    kpi?.forEach(el => Object.assign(el, { count: kpiData[el.name] || '0' }));
-
-    const { rows = [] } = await pg.query(q);
-
-    const cls = meta?.cls || loadTemplate.columns
-        ?.filter(el => (el.option || el.data))
-        ?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: (curr.option || curr.data) }), {});
-
-    const titles = meta?.titles
-        || loadTemplate.columns?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title }), {});
-
-    await metaFormat({ rows, cls, sufix: true });
-
-    const columns = loadTemplate.columns
-        || fields.map(el => ({
-            name: el.name,
-            title: titles?.[el.name] || el.name,
-            type: cls?.[el.name] ? 'Autocomplete' : 'Text',
-            format: pg.pgType?.[el.dataTypeID],
-            data: cls?.[el.name],
-        }));
-
-    return {
-        q: user?.user_type?.includes('admin') ? q : undefined,
-        kpi,
-        rows,
-        columns,
-    };
-}
+import { handlebars, pgClients, getTemplate, metaFormat, handlebarsSync } from '@opengis/fastify-table/utils.js';
+
+import getFilterQuery from '../utils/getFilterQuery.js';
+
+const maxLimit = 100;
+
+export default async function reportData({
+    pg = pgClients.client, params = {}, query = {}, user = {},
+}) {
+    if (!params?.name) {
+        return { message: 'not enough params: name', status: 400 };
+    }
+
+    const loadTemplate = await getTemplate('report', params.name);
+
+    if (!loadTemplate?.sql) {
+        return { message: `report not found: ${params.name}`, status: 404 };
+    }
+
+    const { uid } = user;
+
+    const { kpi, sql, meta, filters } = loadTemplate;
+    const { date, columns: metaColumns } = meta || {};
+
+    const granularity = query.granularity && date && false ? `date_trunc('${query.granularity}',${date})::date::text` : null;
+    const groupby = [meta?.groupby, granularity].filter(el => el).join(',');
+
+    const period = query.period && date ? `${date}=${query.period}` : null;
+    const filter = [query.filter, period].filter(el => el).join(';');
+
+    const limit = Math.min(maxLimit, +(query.limit || 20));
+    const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
+
+    const kpiColumns = kpi ? kpi?.map(el => `${el.sql || 'count(*)'} as "${el.name}"`)?.join(',') : '';
+    const columnsList = metaColumns || loadTemplate.columns?.map(el => el.name)?.join(',');
+
+    const qMeta = await handlebars.compile(sql)({ user, uid });
+    const { fields = [] } = await pg.query(`select * from (${qMeta})q limit 0`);
+
+    const where = filter ? getFilterQuery({ pg, filter, fields, filterList: filters })?.map?.(el => el.query)?.join(' and ') : null;
+
+    const qAgg = `select ${kpiColumns || ''} from (${qMeta})q where ${where || '1=1'}`;
+    const q = `select ${columnsList || '*'} from (${qMeta})q where ${where || '1=1'} ${groupby ? `group by ${groupby}` : ''} limit ${limit} offset ${offset}`;
+
+    if (query.sql && user?.user_type?.includes('admin')) return `${qAgg};${q}`;
+
+    const kpiData = await pg.query(qAgg).then(el => el.rows?.[0] || {});
+    kpi?.forEach(el => Object.assign(el, { count: kpiData[el.name] || '0' }));
+
+    const { rows = [] } = await pg.query(q);
+
+    const cls = meta?.cls || loadTemplate.columns
+        ?.filter(el => (el.option || el.data))
+        ?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: (curr.option || curr.data) }), {});
+
+    const titles = meta?.titles
+        || loadTemplate.columns?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title }), {});
+
+    await metaFormat({ rows, cls, sufix: true });
+
+    const columns = loadTemplate.columns
+        || fields.map(el => ({
+            name: el.name,
+            title: titles?.[el.name] || el.name,
+            type: cls?.[el.name] ? 'Autocomplete' : 'Text',
+            format: pg.pgType?.[el.dataTypeID],
+            data: cls?.[el.name],
+        }));
+
+    return {
+        q: user?.user_type?.includes('admin') ? q : undefined,
+        kpi,
+        rows,
+        columns,
+    };
+}

package/server/routes/report/controllers/list.js

@@ -1,18 +1,18 @@
-import { getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function reportList({
-    user = {},
-}) {
-    const arr = getTemplatePath('report').filter(el => el[2] === 'json').map(el => el[0]);
-
-    const rows = await Promise.all(arr.map(async (el) => {
-        const loadTemplate = await getTemplate('report', el);
-        return {
-            name: el,
-            filters: loadTemplate?.filters || [],
-            title: loadTemplate?.title || el,
-            sql: user.user_type?.includes('admin') ? loadTemplate?.sql : undefined,
-        };
-    }));
-    return { rows };
-}
+import { getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function reportList({
+    user = {},
+}) {
+    const arr = getTemplatePath('report').filter(el => el[2] === 'json').map(el => el[0]);
+
+    const rows = await Promise.all(arr.map(async (el) => {
+        const loadTemplate = await getTemplate('report', el);
+        return {
+            name: el,
+            filters: loadTemplate?.filters || [],
+            title: loadTemplate?.title || el,
+            sql: user.user_type?.includes('admin') ? loadTemplate?.sql : undefined,
+        };
+    }));
+    return { rows };
+}

package/server/routes/report/index.mjs

@@ -1,7 +1,7 @@
-import reportData from './controllers/data.js';
-import reportList from './controllers/list.js';
-
-export default async function route(app) {
-  app.get('/reports', {}, reportList);
-  app.get('/reports/:name', {}, reportData);
-}
+import reportData from './controllers/data.js';
+import reportList from './controllers/list.js';
+
+export default async function route(app) {
+  app.get('/reports', {}, reportList);
+  app.get('/reports/:name', {}, reportData);
+}