@opengis/admin 0.1.58 → 0.1.60

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

@@ -1,89 +1,89 @@
-import { /* getSelectVal, */ getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function calendarData({
-    pg, funcs, params = {}, query = {}, session = {},
-}) {
-    const { name } = params;
-    const { uid } = session.passport?.user || {};
-    if (!name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-    const { date, sql } = query;
-    
-    try {
-        const body = await getTemplate('calendar', name);
-
-        if (!body) {
-            return { message: `calendar not found: ${name}`, status: 404 };
-        }
-
-        const {
-            title,
-            table,
-            query: query1 = '1=1',
-            meta = {},
-            filter = [],
-        } = body;
-
-        if (!table) {
-            return { message: 'not enough calendar params: table', status: 404 };
-        }
-        if (!pg.pk?.[table]) {
-            return { message: `table pkey not found: ${table}`, status: 404 };
-        }
-
-        const filterWhere = filter?.length && query.filter?.length
-            ? filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true))
-                .map((el) => {
-                    const val = query.filter.split(',').find((e) => e?.split('=')?.shift()?.includes(el.column || el.name))?.split('=')?.pop();
-                    if (val) return el.column && val ? `(${[`${el.column}::text='${val.replace(/'/g,"''")}'::text`, el.query].filter((el) => el).join(' and ')})` : el.query;
-                }).filter((el) => el).join(' and ')
-            : undefined;
-        // console.log(filterWhere);
-
-        const queryWhere = await funcs.handlebars.compile(query1)({ uid });
-        const filterDate = date ? `date_trunc('month', "${meta?.date || meta?.start}"::date)='${date}'::date` : undefined;
-        const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
-
-        const filtersByColumn = filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && el?.column);
-        
-        const filters = [];
-        if (filtersByColumn?.length) {
-            await Promise.all(filtersByColumn.map(async (el) => {
-                const { rows: filterData = [] } = await pg.query(`select "${el.column}" as id, count(*) from ${table} 
-                where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by "${el.column}"`);
-                if (!filterData?.length) return;
-                
-                // const clsData = await getSelectVal({ pg, name: el.cls, values: filterData.map((el) => el.id) });
-                const clsData = el.cls ? await getTemplate(['cls', 'select'], el.cls) : undefined;
-                
-                if (!el.cls) {
-                    filterData.forEach((el1) => filters.push(el1));
-                    return;
-                }
-
-                filterData.forEach((el1) => {
-                    const cls = clsData.find((item) => item.id === el1.id.toString());
-                    Object.assign(el1, { title: cls?.text, color: cls?.color });
-                    filters.push(el1);
-                });
-            }));
-        }
-
-        const tableMeta = await getMeta({ pg, table });
-        const columnList = tableMeta?.columns?.map((el) => el?.name);
-        const columns = Object.keys(meta).filter((el) => ['date', 'start','end','title','status'].includes(el) && columnList.includes(meta[el])).map((el) => `"${meta[el]}" as ${el}`);
-        
-        if (!columns?.length) {
-            return { message: `calendar param meta is invalid: invalid/empty keys`, status: 404 };
-        }
-
-        const q = `select ${columns.join(',')} from ${table} where ${where}`;
-        if (sql) return q;
-
-        const { rows = [] } = await pg.query(q); 
-        return { title, filters, rows };
-    } catch (err) {
-        return { error: err.toString(), status: 500 };
-    }
+import { /* getSelectVal, */ getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function calendarData({
+    pg, funcs, params = {}, query = {}, session = {},
+}) {
+    const { name } = params;
+    const { uid } = session.passport?.user || {};
+    if (!name) {
+        return { message: 'not enough params: name', status: 400 };
+    }
+    const { date, sql } = query;
+    
+    try {
+        const body = await getTemplate('calendar', name);
+
+        if (!body) {
+            return { message: `calendar not found: ${name}`, status: 404 };
+        }
+
+        const {
+            title,
+            table,
+            query: query1 = '1=1',
+            meta = {},
+            filter = [],
+        } = body;
+
+        if (!table) {
+            return { message: 'not enough calendar params: table', status: 404 };
+        }
+        if (!pg.pk?.[table]) {
+            return { message: `table pkey not found: ${table}`, status: 404 };
+        }
+
+        const filterWhere = filter?.length && query.filter?.length
+            ? filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true))
+                .map((el) => {
+                    const val = query.filter.split(',').find((e) => e?.split('=')?.shift()?.includes(el.column || el.name))?.split('=')?.pop();
+                    if (val) return el.column && val ? `(${[`${el.column}::text='${val.replace(/'/g,"''")}'::text`, el.query].filter((el) => el).join(' and ')})` : el.query;
+                }).filter((el) => el).join(' and ')
+            : undefined;
+        // console.log(filterWhere);
+
+        const queryWhere = await funcs.handlebars.compile(query1)({ uid });
+        const filterDate = date ? `date_trunc('month', "${meta?.date || meta?.start}"::date)='${date}'::date` : undefined;
+        const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
+
+        const filtersByColumn = filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && el?.column);
+        
+        const filters = [];
+        if (filtersByColumn?.length) {
+            await Promise.all(filtersByColumn.map(async (el) => {
+                const { rows: filterData = [] } = await pg.query(`select "${el.column}" as id, count(*) from ${table} 
+                where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by "${el.column}"`);
+                if (!filterData?.length) return;
+                
+                // const clsData = await getSelectVal({ pg, name: el.cls, values: filterData.map((el) => el.id) });
+                const clsData = el.cls ? await getTemplate(['cls', 'select'], el.cls) : undefined;
+                
+                if (!el.cls) {
+                    filterData.forEach((el1) => filters.push(el1));
+                    return;
+                }
+
+                filterData.forEach((el1) => {
+                    const cls = clsData.find((item) => item.id === el1.id.toString());
+                    Object.assign(el1, { title: cls?.text, color: cls?.color });
+                    filters.push(el1);
+                });
+            }));
+        }
+
+        const tableMeta = await getMeta({ pg, table });
+        const columnList = tableMeta?.columns?.map((el) => el?.name);
+        const columns = Object.keys(meta).filter((el) => ['date', 'start','end','title','status'].includes(el) && columnList.includes(meta[el])).map((el) => `"${meta[el]}" as ${el}`);
+        
+        if (!columns?.length) {
+            return { message: `calendar param meta is invalid: invalid/empty keys`, status: 404 };
+        }
+
+        const q = `select ${columns.join(',')} from ${table} where ${where}`;
+        if (sql) return q;
+
+        const { rows = [] } = await pg.query(q); 
+        return { title, filters, rows };
+    } catch (err) {
+        return { error: err.toString(), status: 500 };
+    }
 }

package/server/routes/calendar/index.mjs

@@ -1,17 +1,17 @@
-import calendarData from "./controllers/calendar.data.js";
-
-const schema = {
-    query: {
-        type: 'object',
-        properties: {
-            date: {
-                type: 'string',
-                format: 'date',
-            },
-        },
-    },
-};
-
-export default async function route(fastify) {
-    fastify.get('/calendar/:name', { schema }, calendarData);
-}
+import calendarData from "./controllers/calendar.data.js";
+
+const schema = {
+    query: {
+        type: 'object',
+        properties: {
+            date: {
+                type: 'string',
+                format: 'date',
+            },
+        },
+    },
+};
+
+export default async function route(fastify) {
+    fastify.get('/calendar/:name', { schema }, calendarData);
+}

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

@@ -1,57 +1,58 @@
-import { setToken, getTemplate } from "@opengis/fastify-table/utils.js";
-// import yaml from 'js-yaml';
-import getTableData from "./tableData.js";
-
-export default async function getCardData({
-    pg, funcs, params = {}, session = {},
-}) {
-    const { table, id } = params;
-    const { uid } = session.passport?.user || {};
-
-    const time = Date.now();
-
-    const template = await getTemplate('card', table);
-
-    const tableTemplate = await getTemplate('table', table);
-    const index = template?.find(el => el[0] === 'index.yml')?.[1] || {};
-    if (index?.panels?.length) {
-        index?.panels.filter((el) => el.props || el.items?.find((item) => item.props))?.forEach((panel) => {
-            if (panel.props) {
-                const editTokens = setToken({
-                    ids: [JSON.stringify({...panel.props, id })],
-                    mode: 'w',
-                    uid: funcs.config?.auth?.disable ? '1' : uid,
-                    array: 1,
-                });
-                Object.assign(panel, { token: editTokens[0] });
-            }
-            if (panel.items?.length) {
-                panel.items.filter((item)=> item?.props)?.forEach((item) => {
-                    const editTokens = setToken({
-                        ids: [JSON.stringify({...item.props, id })],
-                        mode: 'w',
-                        uid: funcs.config?.auth?.disable ? '1' : uid,
-                        array: 1,
-                    });
-                    Object.assign(item, { token: editTokens[0] });
-                });
-            }
-        });
-    }
-
-    const data = {};
-    const { message, rows = [] } = await getTableData({ pg, funcs, params: { table, id }, session, mode: 'card' });
-
-    if (message) return { message };
-
-    if (template) {
-        await Promise.all(template.filter(el => el[0].includes('.hbs')).map(async (el) => {
-            const htmlContent = await funcs.handlebars.compile(el[1])(rows[0]);
-            const name = el[0].substring(0, el[0].lastIndexOf('.'))
-            data[name] = htmlContent;
-        }));
-    }
-
-    return { time: Date.now() - time, ...index, data, rows, columns: tableTemplate?.columns || tableTemplate?.colModel };
-
+import { setToken, getTemplate } from "@opengis/fastify-table/utils.js";
+// import yaml from 'js-yaml';
+import getTableData from "./tableData.js";
+
+export default async function getCardData(req) {
+    const {
+        pg, funcs, params = {}, session = {},
+    } = req;
+    const { table, id } = params;
+    const { uid } = session.passport?.user || {};
+
+    const time = Date.now();
+
+    const template = await getTemplate('card', table);
+
+    const tableTemplate = await getTemplate('table', table);
+    const index = template?.find(el => el[0] === 'index.yml')?.[1] || {};
+    if (index?.panels?.length) {
+        index?.panels.filter((el) => el.props || el.items?.find((item) => item.props))?.forEach((panel) => {
+            if (panel.props) {
+                const editTokens = setToken({
+                    ids: [JSON.stringify({...panel.props, id })],
+                    mode: 'w',
+                    uid: funcs.config?.auth?.disable ? '1' : uid,
+                    array: 1,
+                });
+                Object.assign(panel, { token: editTokens[0] });
+            }
+            if (panel.items?.length) {
+                panel.items.filter((item)=> item?.props)?.forEach((item) => {
+                    const editTokens = setToken({
+                        ids: [JSON.stringify({...item.props, id })],
+                        mode: 'w',
+                        uid: funcs.config?.auth?.disable ? '1' : uid,
+                        array: 1,
+                    });
+                    Object.assign(item, { token: editTokens[0] });
+                });
+            }
+        });
+    }
+
+    const data = {};
+    const { message, rows = [] } = await getTableData({ pg, funcs, params: { table, id }, session });
+
+    if (message) return { message };
+
+    if (template) {
+        await Promise.all(template.filter(el => el[0].includes('.hbs')).map(async (el) => {
+            const htmlContent = await funcs.handlebars.compile(el[1])(rows[0]);
+            const name = el[0].substring(0, el[0].lastIndexOf('.'))
+            data[name] = htmlContent;
+        }));
+    }
+
+    return { time: Date.now() - time, ...index, data, rows, columns: tableTemplate?.columns || tableTemplate?.colModel };
+
 }

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

@@ -1,50 +1,50 @@
-import { getToken, getTemplate, getMeta } from "@opengis/fastify-table/utils.js";
-
-import getTableData from "./tableData.js";
-
-export default async function cardTabData({
-    pg, funcs, 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 } = funcs.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 funcs.handlebars.compile(props.query.replace(/@id/g, '{{id}}'))(props);
-    const { message, rows = [] } = await getTableData({ pg, funcs, 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 { getToken, getTemplate, getMeta } from "@opengis/fastify-table/utils.js";
+
+import getTableData from "./tableData.js";
+
+export default async function cardTabData({
+    pg, funcs, 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 } = funcs.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 funcs.handlebars.compile(props.query.replace(/@id/g, '{{id}}'))(props);
+    const { message, rows = [] } = await getTableData({ pg, funcs, 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 { 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, funcs, table, filter, search, filterList, query, uid,
-}) {
-  if (!table) return { error: 'param table is required', status: 400 };
-
-  const pg = pg1 || funcs.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 { 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, funcs, table, filter, search, filterList, query, uid,
+}) {
+  if (!table) return { error: 'param table is required', status: 400 };
+
+  const pg = pg1 || funcs.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;