@opengis/admin 0.2.81 → 0.2.83

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

@@ -1,126 +1,126 @@
-import { getMeta, getTemplate, pgClients, handlebarsSync } from '@opengis/fastify-table/utils.js';
-
-const isValidDate = (dateStr) => (new Date(dateStr)).toString() !== 'Invalid Date';
-
-export default async function calendarData({
-    pg = pgClients.client, params = {}, query = {}, session = {},
-}) {
-    const { name } = params;
-    const { granularity = 'month' } = query;
-    const { user = {} } = session.passport || {};
-
-    if (!name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-
-    if (query.granularity && !['day', 'month', 'week', 'year'].includes(granularity)) {
-        return { message: 'invalid query params: granularity', status: 400 };
-    }
-
-    const body = await getTemplate('calendar', name);
-
-    if (!body) {
-        return { message: `calendar not found: ${name}`, status: 404 };
-    }
-
-    const {
-        title,
-        table,
-        meta = {},
-    } = 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 filterList = (body?.filter || [])
-        .concat(body?.filterInline || [])
-        .concat(body?.filterCustom || [])
-        .concat(body?.filterState || [])
-        .concat(body?.filterList || [])
-        .concat(body?.filters || [])
-        .concat(body?.filter_list || []);
-
-    const { columns = [] } = await getMeta({ pg, table });
-    const columnList = columns?.map((el) => el?.name);
-
-    const dateColumn = columns?.find((el) => el?.name === (meta?.date || meta?.start))?.name
-        || columns?.find((el) => el?.name === 'cdate')?.name;
-
-    if (query.date && !dateColumn) {
-        return { message: 'invalid template params: date column not found', status: 400 };
-    }
-
-    if (query.date && !isValidDate(query.date)) {
-        return { message: 'Invalid date: out of range or incorrect format', status: 400 };
-    }
-
-    const filterWhere = filterList?.length && query.filter?.length
-        ? filterList
-            .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;
-
-    const queryWhere = handlebarsSync.compile(body.query || '1=1')({ user, uid: user?.uid });
-    const filterDate = query.date ? `date_trunc('${granularity}', "${dateColumn}"::date)='${query.date}'::date` : undefined;
-
-    const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
-
-    const filtersByColumn = filterList.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.replace(/'/g, "''")} as id, count(*) from ${table} 
-            where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by ${el.column.replace(/'/g, "''")}`);
-            if (!filterData?.length) return;
-
-            const clsData = await getTemplate(['cls', 'select'], el.cls);
-
-            if (!el.cls || !clsData?.length) {
-                filterData.forEach((item) => filters.push(item));
-                return;
-            }
-
-            filterData.forEach((filter) => {
-                const cls = clsData.find((item) => item.id === filter.id.toString());
-                Object.assign(filter, { title: cls?.text, color: cls?.color });
-                filters.push(filter);
-            });
-        }));
-    }
-
-    const filtersByPreparedQuery = filterList.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && !el?.column && el?.query);
-
-    if (filtersByPreparedQuery?.length) {
-        await Promise.all(filtersByPreparedQuery.map(async (el) => {
-            const { rows = [] } = await pg.query(`select ${el.query} as id, count(*) from ${table} 
-            where ${filterWhere || '1=1'} group by ${el.query}`);
-            rows.forEach((item) => filters.push(item));
-        }));
-    }
-
-    const metaColumns = Object.keys(meta)
-        .filter((el) => ['date', 'start', 'end', 'title', 'status'].includes(el) && columnList.includes(meta[el]))
-        .map((el) => `"${meta[el]}" as ${el}`);
-
-    if (!metaColumns?.length) {
-        return { message: `calendar param meta is invalid: invalid/empty keys`, status: 404 };
-    }
-
-    const q = `select ${metaColumns.join(',')} from ${table} where ${where}`;
-    if (query?.sql && user?.user_type?.includes('admin')) return q;
-
-    const { rows = [] } = await pg.query(q);
-
-    return { title, filters, granularity, sql: user?.user_type?.includes('admin') ? q : undefined, rows };
-
+import { getMeta, getTemplate, pgClients, handlebarsSync } from '@opengis/fastify-table/utils.js';
+
+const isValidDate = (dateStr) => (new Date(dateStr)).toString() !== 'Invalid Date';
+
+export default async function calendarData({
+    pg = pgClients.client, params = {}, query = {}, session = {},
+}) {
+    const { name } = params;
+    const { granularity = 'month' } = query;
+    const { user = {} } = session.passport || {};
+
+    if (!name) {
+        return { message: 'not enough params: name', status: 400 };
+    }
+
+    if (query.granularity && !['day', 'month', 'week', 'year'].includes(granularity)) {
+        return { message: 'invalid query params: granularity', status: 400 };
+    }
+
+    const body = await getTemplate('calendar', name);
+
+    if (!body) {
+        return { message: `calendar not found: ${name}`, status: 404 };
+    }
+
+    const {
+        title,
+        table,
+        meta = {},
+    } = 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 filterList = (body?.filter || [])
+        .concat(body?.filterInline || [])
+        .concat(body?.filterCustom || [])
+        .concat(body?.filterState || [])
+        .concat(body?.filterList || [])
+        .concat(body?.filters || [])
+        .concat(body?.filter_list || []);
+
+    const { columns = [] } = await getMeta({ pg, table });
+    const columnList = columns?.map((el) => el?.name);
+
+    const dateColumn = columns?.find((el) => el?.name === (meta?.date || meta?.start))?.name
+        || columns?.find((el) => el?.name === 'cdate')?.name;
+
+    if (query.date && !dateColumn) {
+        return { message: 'invalid template params: date column not found', status: 400 };
+    }
+
+    if (query.date && !isValidDate(query.date)) {
+        return { message: 'Invalid date: out of range or incorrect format', status: 400 };
+    }
+
+    const filterWhere = filterList?.length && query.filter?.length
+        ? filterList
+            .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;
+
+    const queryWhere = handlebarsSync.compile(body.query || '1=1')({ user, uid: user?.uid });
+    const filterDate = query.date ? `date_trunc('${granularity}', "${dateColumn}"::date)='${query.date}'::date` : undefined;
+
+    const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
+
+    const filtersByColumn = filterList.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.replace(/'/g, "''")} as id, count(*) from ${table} 
+            where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by ${el.column.replace(/'/g, "''")}`);
+            if (!filterData?.length) return;
+
+            const clsData = await getTemplate(['cls', 'select'], el.cls);
+
+            if (!el.cls || !clsData?.length) {
+                filterData.forEach((item) => filters.push(item));
+                return;
+            }
+
+            filterData.forEach((filter) => {
+                const cls = clsData.find((item) => item.id === filter.id.toString());
+                Object.assign(filter, { title: cls?.text, color: cls?.color });
+                filters.push(filter);
+            });
+        }));
+    }
+
+    const filtersByPreparedQuery = filterList.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && !el?.column && el?.query);
+
+    if (filtersByPreparedQuery?.length) {
+        await Promise.all(filtersByPreparedQuery.map(async (el) => {
+            const { rows = [] } = await pg.query(`select ${el.query} as id, count(*) from ${table} 
+            where ${filterWhere || '1=1'} group by ${el.query}`);
+            rows.forEach((item) => filters.push(item));
+        }));
+    }
+
+    const metaColumns = Object.keys(meta)
+        .filter((el) => ['date', 'start', 'end', 'title', 'status'].includes(el) && columnList.includes(meta[el]))
+        .map((el) => `"${meta[el]}" as ${el}`);
+
+    if (!metaColumns?.length) {
+        return { message: `calendar param meta is invalid: invalid/empty keys`, status: 404 };
+    }
+
+    const q = `select ${metaColumns.join(',')} from ${table} where ${where}`;
+    if (query?.sql && user?.user_type?.includes('admin')) return q;
+
+    const { rows = [] } = await pg.query(q);
+
+    return { title, filters, granularity, sql: user?.user_type?.includes('admin') ? q : undefined, rows };
+
 }

package/server/routes/calendar/index.mjs

@@ -1,7 +1,7 @@
-import calendarData from "./controllers/calendar.data.js";
-
-import { calendarDataSchema } from './schema.js';
-
-export default async function route(fastify) {
-    fastify.get('/calendar/:name', { schema: calendarDataSchema }, calendarData);
-}
+import calendarData from "./controllers/calendar.data.js";
+
+import { calendarDataSchema } from './schema.js';
+
+export default async function route(fastify) {
+    fastify.get('/calendar/:name', { schema: calendarDataSchema }, calendarData);
+}

package/server/routes/calendar/schema.js

@@ -1,22 +1,22 @@
-const calendarDataSchema = {
-  params: {
-    name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-  },
-  querystring: {
-    date: { type: 'string', pattern: '^\\d{4}-\\d{2}-\\d{2}$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-
-  // query: {
-  //     type: 'object',
-  //     properties: {
-  //         date: {
-  //             type: 'string',
-  //             format: 'date',
-  //         },
-  //     },
-  // },
-};
-
-export { calendarDataSchema }
+const calendarDataSchema = {
+  params: {
+    name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+  },
+  querystring: {
+    date: { type: 'string', pattern: '^\\d{4}-\\d{2}-\\d{2}$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+
+  // query: {
+  //     type: 'object',
+  //     properties: {
+  //         date: {
+  //             type: 'string',
+  //             format: 'date',
+  //         },
+  //     },
+  // },
+};
+
+export { calendarDataSchema }
 export default null;

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

@@ -1,107 +1,107 @@
-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';
-
-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 })
-        })
-    })
-
-
-    // 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';
+
+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 })
+        })
+    })
+
+
+    // 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 };
 }