@opengis/admin 0.1.35 → 0.1.37

package/server/routes/data/controllers/funcs/getFilterSQL/util/getCustomQuery.js

@@ -1,13 +1,13 @@
-async function getCustomQuery({
-  pg, table, customFilter,
-}) {
-  if (!customFilter) return null;
-  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
-  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
-  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
-  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
-  const customQuery = data?.map((el) => el.query).join(' and ');
-  return `${customQuery}`;
-}
-
-export default getCustomQuery;
+async function getCustomQuery({
+  pg, table, customFilter,
+}) {
+  if (!customFilter) return null;
+  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
+  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
+  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
+  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
+  const customQuery = data?.map((el) => el.query).join(' and ');
+  return `${customQuery}`;
+}
+
+export default getCustomQuery;

package/server/routes/data/controllers/funcs/getFilterSQL/util/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 getQuery({
-  pg, filter: filterStr, tableSQL, fields, filterList,
-}) {
-  if (!filterStr) return null; // filter list API
-
-  const mainOperators = ['=', '~', '>', '<'];
-
-  const filterQueryArray = decodeURI(filterStr?.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;
-    }
-
-    // find all value
-    const value = filterQueryArray.filter((el) => el.startsWith(name)).map((el) => el.substring(name.length + 1)).join(',');
-
-    const optimize = fields?.find((el) => el.name === name) ? null : tableSQL.find((el) => el.name === name);
-
-    // find field and skip not exists
-    const { dataTypeID } = fields?.find((el) => el.name === name) || fields?.find((el) => el.name === optimize?.pk) || {};
-    if (!dataTypeID) continue;
-
-    const type = pg.pgType?.[dataTypeID];
-
-    // filter
-    const filter = filterList?.find((el) => [el.id, el.name].includes(name)) || { type: 'text' };
-    const filterType = filter.type?.toLowerCase();
-    
-    // format query
-    const { op, query } = formatValue({
-      filter,
-      optimize,
-      filterType,
-      name,
-      value: decodeURIComponent(value),
-      operator,
-      fieldType: type || 'text',
-    }) || {};
-    if (!query) continue;
-
-    resultList.push({
-      name, value, query, operator: op, filterType, type,
-    });
-  }
-
-  return resultList;
-}
-
-export default getQuery;
+/* 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 getQuery({
+  pg, filter: filterStr, tableSQL, fields, filterList,
+}) {
+  if (!filterStr) return null; // filter list API
+
+  const mainOperators = ['=', '~', '>', '<'];
+
+  const filterQueryArray = decodeURI(filterStr?.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;
+    }
+
+    // find all value
+    const value = filterQueryArray.filter((el) => el.startsWith(name)).map((el) => el.substring(name.length + 1)).join(',');
+
+    const optimize = fields?.find((el) => el.name === name) ? null : tableSQL.find((el) => el.name === name);
+
+    // find field and skip not exists
+    const { dataTypeID } = fields?.find((el) => el.name === name) || fields?.find((el) => el.name === optimize?.pk) || {};
+    if (!dataTypeID) continue;
+
+    const type = pg.pgType?.[dataTypeID];
+
+    // filter
+    const filter = filterList?.find((el) => [el.id, el.name].includes(name)) || { type: 'text' };
+    const filterType = filter.type?.toLowerCase();
+    
+    // format query
+    const { op, query } = formatValue({
+      filter,
+      optimize,
+      filterType,
+      name,
+      value: decodeURIComponent(value),
+      operator,
+      fieldType: type || 'text',
+    }) || {};
+    if (!query) continue;
+
+    resultList.push({
+      name, value, query, operator: op, filterType, type,
+    });
+  }
+
+  return resultList;
+}
+
+export default getQuery;

package/server/routes/data/controllers/funcs/getFilterSQL/util/getOptimizedQuery.js

@@ -1,12 +1,12 @@
-function getOptimizedQuery({ body, table, q }, count) {
-  const order = body?.orderby || body?.order ? `order by ${body?.orderby || body?.order}` : '';
-
-  const tableName = body?.table || body?.model || table;
-
-  const sqlList = body?.sql?.filter((el) => !el.disabled && el?.sql?.replace && (count ? el.count !== false : true))
-    .map((el) => ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `).join(' ');
-
-  return `(select * from ${tableName} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 and ${q?.replace('q.', 't.') || '1=1'} ${order})q`;
-}
-
-export default getOptimizedQuery;
+function getOptimizedQuery({ body, table, q }, count) {
+  const order = body?.orderby || body?.order ? `order by ${body?.orderby || body?.order}` : '';
+
+  const tableName = body?.table || body?.model || table;
+
+  const sqlList = body?.sql?.filter((el) => !el.disabled && el?.sql?.replace && (count ? el.count !== false : true))
+    .map((el) => ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `).join(' ');
+
+  return `(select * from ${tableName} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 and ${q?.replace('q.', 't.') || '1=1'} ${order})q`;
+}
+
+export default getOptimizedQuery;

package/server/routes/data/controllers/funcs/getFilterSQL/util/getTableSql.js

@@ -1,34 +1,34 @@
-function getTable(table) {
-  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    ?.map((el) => el.split(/[ )]/)[0]);
-  return result;
-}
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-const tableSql = {};
-async function getTableSql({
-  pg, body, table, fields,
-}) {
-  if (tableSql[table]) return tableSql[table];
-
-  const fieldList = fields.map((el) => el.name);
-
-  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
-
-  if (!tableList) { tableSql[table] = []; return []; }
-
-  const data = await Promise.all(tableList?.map(async (tableEl) => {
-    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
-    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
-  }));
-
-  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
-
-  return tableSql[table];
-}
-
-export default getTableSql;
+function getTable(table) {
+  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+    ?.map((el) => el.split(/[ )]/)[0]);
+  return result;
+}
+
+/**
+* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+* @param {String} opt.query - запит до таблиці
+* @param {String} opt.hash - інформація з хешу по запиту
+*/
+const tableSql = {};
+async function getTableSql({
+  pg, body, table, fields,
+}) {
+  if (tableSql[table]) return tableSql[table];
+
+  const fieldList = fields.map((el) => el.name);
+
+  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
+
+  if (!tableList) { tableSql[table] = []; return []; }
+
+  const data = await Promise.all(tableList?.map(async (tableEl) => {
+    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
+    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
+  }));
+
+  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
+
+  return tableSql[table];
+}
+
+export default getTableSql;

package/server/routes/data/controllers/tableData.js

@@ -1,122 +1,122 @@
-import { getTemplate, metaFormat } from "@opengis/fastify-table/utils.js";
-
-import getMeta from "@opengis/fastify-table/pg/funcs/getMeta.js";
-import getAccess from "@opengis/fastify-table/crud/funcs/getAccess.js";
-
-import gisIRColumn from "@opengis/fastify-table/table/controllers/utils/gisIRColumn.js";
-
-import getFilterSQL from "./funcs/getFilterSQL/index.js";
-
-import assignTokens from './utils/assignTokens.js';
-
-import getColumns from './utils/getColumns.js';
-
-const maxLimit = 100;
-
-export default async function getTableData(req) {
-    const time = Date.now();
-
-    const {
-        pg, params, funcs = {}, query = {}, opt = {}, session = {}, mode = 'table',
-    } = req;
-    const { uid } = session.passport?.user || {};
-
-    try {
-        const loadTable = await getTemplate('table', params.table);
-
-        if (!loadTable) {
-            return { message: 'template not found', status: 404 };
-        }
-
-        const {
-            table, sql, form, meta, sqlColumns, ispublic,
-        } = loadTable;
-        const columns = loadTable.columns || loadTable.colModel;
-
-        const { pk, columns: dbColumns = [] } = await getMeta(table);
-
-        if (!pk) {
-            return { message: `table not found: ${table}`, status: 404 };
-        }
-
-        const { cols, columnList, extraKeys, schema } = await getColumns({
-            columns, params, opt, loadTable, form, table, dbColumns, mode,
-        });
-
-        const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
-            ? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
-            : '';
-
-        const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
-
-        if (params.id && columnList.includes(params.id)) {
-            return gisIRColumn({
-                pg, funcs, layer: params.table, column: params.id, sql: query.sql,
-            });
-        }
-
-        const fData = query.filter || query.search ? await getFilterSQL({
-            funcs,
-            filter: query.filter,
-            search: query.search,
-            table: params.table,
-            json: 1,
-        }) : {};
-
-        const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
-
-        const limit = Math.min(maxLimit, +(query.limit || 20));
-
-        const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-        // id, query, filter
-        const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
-
-        const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-
-        const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
-
-        const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
-
-        const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
-
-        const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
-
-        const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
-
-        const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
-
-        const access = await getAccess(req, params.table);
-
-        const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1', bbox, queryPolyline].filter((el) => el);
-
-        const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${metaCols} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
-
-        if (query.sql === '1') { return { message: q }; }
-
-        const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
-
-        const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => (el?.rows[0]?.count || 0) - 0);
-
-        if (extraKeys?.length && mode === 'card') {
-            await Promise.all(rows?.map(async (row) => {
-                await Promise.all(extraKeys?.map(async (key) => {
-                const { colModel, table: extraTable, parent_id: parentId } = schema[key];
-                const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
-                Object.assign(row, { [key]: extraRows });
-                }));
-            }));
-        }
-
-        await metaFormat({ funcs, rows, table: params.table });
-
-        const res = {
-            time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, meta, columns,
-        };
-        const addToken = assignTokens({ rows, funcs, ispublic, uid: 1, loadTable });
-        Object.assign(res, { rows, addToken });
-
-        return res;
-    } catch (err) {
-        return { message: err.toString(), status: 500 };
-    }
+import { getTemplate, metaFormat } from "@opengis/fastify-table/utils.js";
+
+import getMeta from "@opengis/fastify-table/pg/funcs/getMeta.js";
+import getAccess from "@opengis/fastify-table/crud/funcs/getAccess.js";
+
+import gisIRColumn from "@opengis/fastify-table/table/controllers/utils/gisIRColumn.js";
+
+import getFilterSQL from "./funcs/getFilterSQL/index.js";
+
+import assignTokens from './utils/assignTokens.js';
+
+import getColumns from './utils/getColumns.js';
+
+const maxLimit = 100;
+
+export default async function getTableData(req) {
+    const time = Date.now();
+
+    const {
+        pg, params, funcs = {}, query = {}, opt = {}, session = {}, mode = 'table',
+    } = req;
+    const { uid } = session.passport?.user || {};
+
+    try {
+        const loadTable = await getTemplate('table', params.table);
+
+        if (!loadTable) {
+            return { message: 'template not found', status: 404 };
+        }
+
+        const {
+            table, sql, form, meta, sqlColumns, ispublic,
+        } = loadTable;
+        const columns = loadTable.columns || loadTable.colModel;
+
+        const { pk, columns: dbColumns = [] } = await getMeta(table);
+
+        if (!pk) {
+            return { message: `table not found: ${table}`, status: 404 };
+        }
+
+        const { cols, columnList, extraKeys, schema } = await getColumns({
+            columns, params, opt, loadTable, form, table, dbColumns, mode,
+        });
+
+        const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
+            ? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
+            : '';
+
+        const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
+
+        if (params.id && columnList.includes(params.id)) {
+            return gisIRColumn({
+                pg, funcs, layer: params.table, column: params.id, sql: query.sql,
+            });
+        }
+
+        const fData = query.filter || query.search ? await getFilterSQL({
+            funcs,
+            filter: query.filter,
+            search: query.search,
+            table: params.table,
+            json: 1,
+        }) : {};
+
+        const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
+
+        const limit = Math.min(maxLimit, +(query.limit || 20));
+
+        const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+        // id, query, filter
+        const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
+
+        const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+
+        const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
+
+        const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
+
+        const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
+
+        const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
+
+        const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
+
+        const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
+
+        const access = await getAccess(req, params.table);
+
+        const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1', bbox, queryPolyline].filter((el) => el);
+
+        const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${metaCols} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
+
+        if (query.sql === '1') { return { message: q }; }
+
+        const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
+
+        const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => (el?.rows[0]?.count || 0) - 0);
+
+        if (extraKeys?.length && mode === 'card') {
+            await Promise.all(rows?.map(async (row) => {
+                await Promise.all(extraKeys?.map(async (key) => {
+                const { colModel, table: extraTable, parent_id: parentId } = schema[key];
+                const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
+                Object.assign(row, { [key]: extraRows });
+                }));
+            }));
+        }
+
+        await metaFormat({ funcs, rows, table: params.table });
+
+        const res = {
+            time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, meta, columns,
+        };
+        const addToken = assignTokens({ rows, funcs, ispublic, uid: 1, loadTable });
+        Object.assign(res, { rows, addToken });
+
+        return res;
+    } catch (err) {
+        return { message: err.toString(), status: 500 };
+    }
 }

package/server/routes/data/controllers/tableDataId.js

@@ -1,28 +1,28 @@
-import getTemplate from "../../templates/funcs/getTemplate.js";
-import getTableData from "./tableData.js";
-
-export default async function tableDataId({
-    pg, funcs, params = {}, session = {},
-}, reply) {
-    const { name, id } = params;
-
-    const data = await getTemplate('pt', `${name}.pt`);
-
-
-    if (!data) {
-        return { message: `invalid template: ${name}.pt`, status: 400 };
-    }
-
-    const { message, status = 500, rows = [] } = await getTableData({ pg, params: { name, id }, session });
-    if (message) {
-        return { message, status };
-    }
-
-    if (!rows.length) {
-        return { message: `data not found: ${name}/${id}`, status: 404 };
-    }
-
-    const htmlContent = await funcs.handlebars.compile(data)(rows[0]);
-
-    return reply.headers({ 'Content-Type': 'text/html; charset=utf-8' }).send(htmlContent);
+import getTemplate from "../../templates/funcs/getTemplate.js";
+import getTableData from "./tableData.js";
+
+export default async function tableDataId({
+    pg, funcs, params = {}, session = {},
+}, reply) {
+    const { name, id } = params;
+
+    const data = await getTemplate('pt', `${name}.pt`);
+
+
+    if (!data) {
+        return { message: `invalid template: ${name}.pt`, status: 400 };
+    }
+
+    const { message, status = 500, rows = [] } = await getTableData({ pg, params: { name, id }, session });
+    if (message) {
+        return { message, status };
+    }
+
+    if (!rows.length) {
+        return { message: `data not found: ${name}/${id}`, status: 404 };
+    }
+
+    const htmlContent = await funcs.handlebars.compile(data)(rows[0]);
+
+    return reply.headers({ 'Content-Type': 'text/html; charset=utf-8' }).send(htmlContent);
 }