@opengis/admin 0.2.110 → 0.2.112

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

@@ -1,118 +1,118 @@
-import path from 'node:path';
-
-import { getAccess, handlebars, setOpt, setToken, getTemplate, handlebarsSync, applyHook } from "@opengis/fastify-table/utils.js";
-//import { setOpt, setToken } from "../../../../../fastify-table/utils.js";
-// import yaml from 'js-yaml';
-import getTableData from "./tableData.js";
-import conditions from './utils/conditions.js';
-
-const components = {
-    'vs-widget-file': `select 'vs-widget-file' as component, count(*) from crm.files where entity_id=$1 and file_status<>3`,
-    'vs-widget-comments': `select 'vs-widget-comments' as component, count(*) from crm.communications where entity_id=$1`
-};
-
-export default async function getCardData(req) {
-
-    const {
-        pg, params = {}, session = {}, user
-    } = req;
-    const { table, id } = params;
-    const uid = session.passport?.user?.uid;
-
-    const res = await applyHook('cardData', { table, id, user });
-    if (res) return res;
-
-
-    const time = Date.now();
-
-    const template = await getTemplate('card', table);
-    const access = await getAccess({ table, user });
-
-    const tableTemplate = await getTemplate('table', table);
-
-    const index = template?.find(el => el[0] === 'index.yml')?.[1] || {};
-
-    const { message, rows = [] } = index.table && index.query ? await pg.query(`select * from ${index.table} where ${handlebarsSync.compile(index.query)({ uid, user })}`) :
-        await getTableData({ pg, params: { table, id }, session, user });
-
-    if (message) return { message };
-
-    // conditions 
-    index.panels?.filter(el => el.items).forEach(el => {
-        el.items = el.items?.filter(el => conditions(el.conditions, rows[0]));
-    })
-
-    // title, count
-    index.panels?.filter(el => el.items).forEach(async el => {
-        const filtered = el.items.filter(el => el.count?.toLowerCase?.().includes('select'));
-        const data = await Promise.all(filtered.map(el => pg.query(el.count).then(el => el.rows[0] || {})))
-        filtered.forEach((el, i) => {
-            Object.assign(el, data[i] || {}, data[i].count ? {} : { count: undefined })
-        });
-        const q = el.items.map((el) => el.component ? components[el.component] : null).filter(el => el).join(' union all ');
-        const counts = q && id
-            ? await pg.query(q, [id])
-                .then(e => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
-            : {};
-        el.items?.filter?.(item => item.component)?.forEach(item => Object.assign(item, { count: counts?.[item.component] }));
-    })
-
-
-    // tokens result
-    const tokens = {};
-    if (access.actions?.includes?.('edit') && index?.tokens && typeof index?.tokens === 'object' && !Array.isArray(index?.tokens)) {
-        for (let key in index?.tokens) {
-            const item = index?.tokens[key];
-            Object.keys(item).filter(el => item[el]?.includes?.('{{')).forEach(el => {
-                item[el] = handlebarsSync.compile(item[el])({ user, uid: user?.uid, id, data: rows[0] });
-            });
-
-            const token = item.form && item.table ? setToken({
-                ids: [JSON.stringify(item)],
-                uid,
-                array: 1,
-            })[0] : setOpt(item, user.uid);
-            tokens[key] = token;
-        }
-    }
-
-    // vue result
-    const vue = template?.filter((el) => el[0].endsWith('.vue'))
-        .reduce((acc, curr) => Object.assign(acc, { [path.parse(curr[0]).name]: curr[1].match(/<template[^>]*>([\s\S]*?)<\/template>/)[1].trim() }), {});
-
-    // data result
-    const data = {};
-    if (index?.data && index?.data?.[0]?.name) {
-        await Promise.all(index.data.filter((el) => el?.name && el?.sql).map(async (el) => {
-            const q = handlebarsSync.compile(el.sql)({ data: rows[0], user, uid: user?.uid, id });
-            const { rows: sqlData } = await pg.query(q);
-            data[el.name] = sqlData;
-        }));
-    }
-
-
-
-    // html result
-    const html = {};
-    if (template) {
-        await Promise.all(template.filter(el => el[0].includes('.hbs')).map(async (el) => {
-            const htmlContent = await handlebars.compile(el[1])({ ...rows[0], user, data, tokens });
-            const name = el[0].substring(0, el[0].lastIndexOf('.'))
-            html[name] = htmlContent;
-        }));
-    }
-
-    return {
-        time: Date.now() - time,
-        ...index,
-        tokens,
-        vue,
-        data,
-        html,
-        rows,
-        columns: tableTemplate?.columns || tableTemplate?.colModel,
-        table: undefined,
-        query: undefined,
-    };
-
+import path from 'node:path';
+
+import { getAccess, handlebars, setOpt, setToken, getTemplate, handlebarsSync, applyHook } from "@opengis/fastify-table/utils.js";
+//import { setOpt, setToken } from "../../../../../fastify-table/utils.js";
+// import yaml from 'js-yaml';
+import getTableData from "./tableData.js";
+import conditions from './utils/conditions.js';
+
+const components = {
+    'vs-widget-file': `select 'vs-widget-file' as component, count(*) from crm.files where entity_id=$1 and file_status<>3`,
+    'vs-widget-comments': `select 'vs-widget-comments' as component, count(*) from crm.communications where entity_id=$1`
+};
+
+export default async function getCardData(req) {
+
+    const {
+        pg, params = {}, session = {}, user
+    } = req;
+    const { table, id } = params;
+    const uid = session.passport?.user?.uid;
+
+    const res = await applyHook('cardData', { table, id, user });
+    if (res) return res;
+
+
+    const time = Date.now();
+
+    const template = await getTemplate('card', table);
+    const access = await getAccess({ table, user });
+
+    const tableTemplate = await getTemplate('table', table);
+
+    const index = template?.find(el => el[0] === 'index.yml')?.[1] || {};
+
+    const { message, rows = [] } = index.table && index.query ? await pg.query(`select * from ${index.table} where ${handlebarsSync.compile(index.query)({ uid, user })}`) :
+        await getTableData({ pg, params: { table, id }, session, user });
+
+    if (message) return { message };
+
+    // conditions 
+    index.panels?.filter(el => el.items).forEach(el => {
+        el.items = el.items?.filter(el => conditions(el.conditions, rows[0]));
+    })
+
+    // title, count
+    index.panels?.filter(el => el.items).forEach(async el => {
+        const filtered = el.items.filter(el => el.count?.toLowerCase?.().includes('select'));
+        const data = await Promise.all(filtered.map(el => pg.query(el.count).then(el => el.rows[0] || {})))
+        filtered.forEach((el, i) => {
+            Object.assign(el, data[i] || {}, data[i].count ? {} : { count: undefined })
+        });
+        const q = el.items.map((el) => el.component ? components[el.component] : null).filter(el => el).join(' union all ');
+        const counts = q && id
+            ? await pg.query(q, [id])
+                .then(e => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
+            : {};
+        el.items?.filter?.(item => item.component)?.forEach(item => Object.assign(item, { count: counts?.[item.component] }));
+    })
+
+
+    // tokens result
+    const tokens = {};
+    if (access.actions?.includes?.('edit') && index?.tokens && typeof index?.tokens === 'object' && !Array.isArray(index?.tokens)) {
+        for (let key in index?.tokens) {
+            const item = index?.tokens[key];
+            Object.keys(item).filter(el => item[el]?.includes?.('{{')).forEach(el => {
+                item[el] = handlebarsSync.compile(item[el])({ user, uid: user?.uid, id, data: rows[0] });
+            });
+
+            const token = item.form && item.table ? setToken({
+                ids: [JSON.stringify(item)],
+                uid,
+                array: 1,
+            })[0] : setOpt(item, user.uid);
+            tokens[key] = token;
+        }
+    }
+
+    // vue result
+    const vue = template?.filter((el) => el[0].endsWith('.vue'))
+        .reduce((acc, curr) => Object.assign(acc, { [path.parse(curr[0]).name]: curr[1].match(/<template[^>]*>([\s\S]*?)<\/template>/)[1].trim() }), {});
+
+    // data result
+    const data = {};
+    if (index?.data && index?.data?.[0]?.name) {
+        await Promise.all(index.data.filter((el) => el?.name && el?.sql).map(async (el) => {
+            const q = handlebarsSync.compile(el.sql)({ data: rows[0], user, uid: user?.uid, id });
+            const { rows: sqlData } = await pg.query(q);
+            data[el.name] = sqlData;
+        }));
+    }
+
+
+
+    // html result
+    const html = {};
+    if (template) {
+        await Promise.all(template.filter(el => el[0].includes('.hbs')).map(async (el) => {
+            const htmlContent = await handlebars.compile(el[1])({ ...rows[0], user, data, tokens });
+            const name = el[0].substring(0, el[0].lastIndexOf('.'))
+            html[name] = htmlContent;
+        }));
+    }
+
+    return {
+        time: Date.now() - time,
+        ...index,
+        tokens,
+        vue,
+        data,
+        html,
+        rows,
+        columns: tableTemplate?.columns || tableTemplate?.colModel,
+        table: undefined,
+        query: undefined,
+    };
+
 }

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

@@ -1,50 +1,50 @@
-import { config, handlebars, getToken, getTemplate, getMeta } from "@opengis/fastify-table/utils.js";
-
-import getTableData from "./tableData.js";
-
-export default async function cardTabData({
-    pg, query = {}, params = {}, session = {},
-}) {
-    const { token } = params;
-    const { sql } = query;
-
-    if (!token) {
-        return { message: 'not enough params: token', status: 400 };
-    }
-
-    const time = Date.now();
-    const { uid } = config?.auth?.disable ? { uid: '1' } : (session.passport?.user || {});
-
-    const props = await getToken({
-        token,
-        mode: 'w',
-        uid,
-        json: 1,
-    });
-
-    if (!props || !props?.table || !props) {
-        return { message: { error: 'token is invalid', props }, status: 403 };
-    }
-
-    const tableTemplate = await getTemplate('table', props.table);
-
-    const { columns = [] } = tableTemplate?.columns || tableTemplate?.colModel
-        ? { columns: tableTemplate?.columns || tableTemplate?.colModel }
-        : await getMeta({ table: props.table });
-
-    const filter = await handlebars.compile(props.query.replace(/@id/g, '{{id}}'))(props);
-    const { message, rows = [] } = await getTableData({ pg, params: { table: props.table }, session, query: { filter, sql } });
-    if (message) return { message };
-
-    if (props.columns?.length && rows?.length) {
-        const allowList = ['id', 'token'].concat(props.columns).map((el) => [el, `${el}_text`]).flat();
-        rows.forEach((row) => Object.keys(row).forEach((el) => { if (!allowList.includes(el)) delete row[el]; }));
-        
-        return {
-            time: Date.now() - time,
-            rows,
-            columns: columns.filter((col) => props.columns.includes(col.name)),
-        };
-    }
-    return { time: Date.now() - time, rows, columns };
+import { config, handlebars, getToken, getTemplate, getMeta } from "@opengis/fastify-table/utils.js";
+
+import getTableData from "./tableData.js";
+
+export default async function cardTabData({
+    pg, query = {}, params = {}, session = {},
+}) {
+    const { token } = params;
+    const { sql } = query;
+
+    if (!token) {
+        return { message: 'not enough params: token', status: 400 };
+    }
+
+    const time = Date.now();
+    const { uid } = config?.auth?.disable ? { uid: '1' } : (session.passport?.user || {});
+
+    const props = await getToken({
+        token,
+        mode: 'w',
+        uid,
+        json: 1,
+    });
+
+    if (!props || !props?.table || !props) {
+        return { message: { error: 'token is invalid', props }, status: 403 };
+    }
+
+    const tableTemplate = await getTemplate('table', props.table);
+
+    const { columns = [] } = tableTemplate?.columns || tableTemplate?.colModel
+        ? { columns: tableTemplate?.columns || tableTemplate?.colModel }
+        : await getMeta({ table: props.table });
+
+    const filter = await handlebars.compile(props.query.replace(/@id/g, '{{id}}'))(props);
+    const { message, rows = [] } = await getTableData({ pg, params: { table: props.table }, session, query: { filter, sql } });
+    if (message) return { message };
+
+    if (props.columns?.length && rows?.length) {
+        const allowList = ['id', 'token'].concat(props.columns).map((el) => [el, `${el}_text`]).flat();
+        rows.forEach((row) => Object.keys(row).forEach((el) => { if (!allowList.includes(el)) delete row[el]; }));
+        
+        return {
+            time: Date.now() - time,
+            rows,
+            columns: columns.filter((col) => props.columns.includes(col.name)),
+        };
+    }
+    return { time: Date.now() - time, rows, columns };
 }

package/server/routes/data/controllers/funcs/getFilterSQL/index.js

@@ -1,92 +1,92 @@
-import { getPG, getTemplate } from "@opengis/fastify-table/utils.js";
-// import pgClients from '@opengis/fastify-table/pg/funcs/pgClients.js';
-
-import getTableSql from './util/getTableSql.js';
-import getFilterQuery from './util/getFilterQuery.js';
-import getOptimizedQuery from './util/getOptimizedQuery.js';
-
-async function getFilterSQL({
-  pg: pg1, table, filter, search, filterList, query, uid,
-}) {
-  if (!table) return { error: 'param table is required', status: 400 };
-
-  const pg = pg1 || getPG();
-  const body = await getTemplate('table', table);
-
-  const sqlList = body?.sql?.length
-    ? body?.sql?.filter((el) => !el.disabled && el?.sql?.replace)
-      .map((el, i) => {
-        Object.assign(el, { name: el.name || `t${i + 1}` });
-        return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
-      }).join(' ')
-    : '';
-  const fieldQuery = `select * from ${body?.table || table} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 limit 0`;
-  const { fields = [] } = await pg.query(fieldQuery);
-
-  const { fields: fieldsModel } = pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
-
-  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
-  const searchColumn = body?.search_column || autoSearchColumn;
-  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
-  try {
-    const tableSQL = await getTableSql({
-      pg, body, table, fields,
-    });
-    const sval = `ilike '%${decodeURIComponent(search).replace(/'/g, "''")}%'`;
-    const searchQuery = search && searchColumn
-      ? ` (${searchColumn.split(',')?.map((name) => {
-        const { pk } = tableSQL.find((el) => el.name === name) || {};
-        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
-      }).join(' or ')} )` : '';
-    
-    // table_properties - user filter data
-    const { rows: filterProperties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column where entity=$1 and uid=$2`, [table, uid]);
-    const extraFilters = filterProperties.map((row) => ({ ua: row.title, name: row.name, type: row.format, data: row.data, extra: true }));
-    const customFilters = [];
-    
-    const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || []).concat(body?.filters || [])).concat(extraFilters || []).concat(customFilters || [])
-
-      ?.map(async (el) => {
-        if (!el?.data) return el;
-        const cls = await getTemplate(['cls', 'select'], el.data);
-        if (Array.isArray(cls) && cls?.length) {
-          Object.assign(el, { options: cls });
-        } else if (typeof  (cls?.sql || cls) === 'string') {
-          Object.assign(el, { sql: cls?.sql || cls });
-        }
-        return el;
-      })
-    );
-    const filters = getFilterQuery({
-      pg,
-      filter,
-      table: body?.table || table,
-      tableSQL,
-      fields,
-      filterList: filterList1,
-    });
-
-    // filter
-    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
-    const q = [body?.query, query, searchQuery, filterQuery].filter((el) => el).join(' and ');
-
-    // table
-    const modelQuery = body?.model || body?.table || table;
-    const optimizedSQL = `select * from ${getOptimizedQuery({ body, table, q })} `;
-    const tableCount = getOptimizedQuery({ body, table, q }, true);
-    // console.log(optimizedSQL);
-    return {
-      filterList,
-      q,
-      optimizedSQL,
-      tableCount,
-      table: modelQuery,
-      searchQuery,
-    };
-  }
-  catch (err) {
-    throw new Error(err.toString());
-  }
-}
-
-export default getFilterSQL;
+import { getPG, getTemplate } from "@opengis/fastify-table/utils.js";
+// import pgClients from '@opengis/fastify-table/pg/funcs/pgClients.js';
+
+import getTableSql from './util/getTableSql.js';
+import getFilterQuery from './util/getFilterQuery.js';
+import getOptimizedQuery from './util/getOptimizedQuery.js';
+
+async function getFilterSQL({
+  pg: pg1, table, filter, search, filterList, query, uid,
+}) {
+  if (!table) return { error: 'param table is required', status: 400 };
+
+  const pg = pg1 || getPG();
+  const body = await getTemplate('table', table);
+
+  const sqlList = body?.sql?.length
+    ? body?.sql?.filter((el) => !el.disabled && el?.sql?.replace)
+      .map((el, i) => {
+        Object.assign(el, { name: el.name || `t${i + 1}` });
+        return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
+      }).join(' ')
+    : '';
+  const fieldQuery = `select * from ${body?.table || table} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 limit 0`;
+  const { fields = [] } = await pg.query(fieldQuery);
+
+  const { fields: fieldsModel } = pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
+
+  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
+  const searchColumn = body?.search_column || autoSearchColumn;
+  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
+  try {
+    const tableSQL = await getTableSql({
+      pg, body, table, fields,
+    });
+    const sval = `ilike '%${decodeURIComponent(search).replace(/'/g, "''")}%'`;
+    const searchQuery = search && searchColumn
+      ? ` (${searchColumn.split(',')?.map((name) => {
+        const { pk } = tableSQL.find((el) => el.name === name) || {};
+        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
+      }).join(' or ')} )` : '';
+    
+    // table_properties - user filter data
+    const { rows: filterProperties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column where entity=$1 and uid=$2`, [table, uid]);
+    const extraFilters = filterProperties.map((row) => ({ ua: row.title, name: row.name, type: row.format, data: row.data, extra: true }));
+    const customFilters = [];
+    
+    const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || []).concat(body?.filters || [])).concat(extraFilters || []).concat(customFilters || [])
+
+      ?.map(async (el) => {
+        if (!el?.data) return el;
+        const cls = await getTemplate(['cls', 'select'], el.data);
+        if (Array.isArray(cls) && cls?.length) {
+          Object.assign(el, { options: cls });
+        } else if (typeof  (cls?.sql || cls) === 'string') {
+          Object.assign(el, { sql: cls?.sql || cls });
+        }
+        return el;
+      })
+    );
+    const filters = getFilterQuery({
+      pg,
+      filter,
+      table: body?.table || table,
+      tableSQL,
+      fields,
+      filterList: filterList1,
+    });
+
+    // filter
+    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
+    const q = [body?.query, query, searchQuery, filterQuery].filter((el) => el).join(' and ');
+
+    // table
+    const modelQuery = body?.model || body?.table || table;
+    const optimizedSQL = `select * from ${getOptimizedQuery({ body, table, q })} `;
+    const tableCount = getOptimizedQuery({ body, table, q }, true);
+    // console.log(optimizedSQL);
+    return {
+      filterList,
+      q,
+      optimizedSQL,
+      tableCount,
+      table: modelQuery,
+      searchQuery,
+    };
+  }
+  catch (err) {
+    throw new Error(err.toString());
+  }
+}
+
+export default getFilterSQL;