@opengis/admin 0.1.80 → 0.1.81

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

@@ -1,88 +1,88 @@
-import { handlebars, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function calendarData({
-    pg, 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;
-    
-
-    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 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 $1 as id, count(*) from $2 
-            where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by $1`, [el.column, table] );
-            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 &1 from $2 where $3`;
-    if (sql) return q;
-
-    const { rows = [] } = await pg.query(q, [columns.join(','), table, where]); 
-    
-    return { title, filters, rows };
-
+import { handlebars, getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function calendarData({
+    pg, 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;
+    
+
+    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 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 $1 as id, count(*) from $2 
+            where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by $1`, [el.column, table] );
+            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 &1 from $2 where $3`;
+    if (sql) return q;
+
+    const { rows = [] } = await pg.query(q, [columns.join(','), table, where]); 
+    
+    return { title, filters, 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\\s\\/,.:-]+)$' },
-    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\\s\\/,.:-]+)$' },
+    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,95 +1,80 @@
-import path from 'node:path';
-
-import { config, handlebars, 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, params = {}, session = {}, user
-    } = req;
-    const { table, id } = params;
-    const uid = config?.auth?.disable ? '1' : session.passport?.user?.uid;
-
-    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?.tokens && typeof index?.tokens === 'object' && !Array.isArray(index?.tokens)) {
-        Object.keys(index?.tokens).map((key) => {
-            const id1 = index.tokens[key]?.edit ? index.tokens[key]?.id : id;
-            const [token] = setToken({
-                ids: [JSON.stringify({ ...index.tokens[key], id: id1 })],
-                mode: index.tokens[key]?.edit ? 'w' : 'a',
-                uid,
-                array: 1,
-            });
-            index.tokens[key] = token;
-        });
-    }
-
-    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() }), {});
-
-    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: 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: config?.auth?.disable ? '1' : uid,
-                        array: 1,
-                    });
-                    Object.assign(item, { token: editTokens[0] });
-                });
-            }
-        });
-    }
-
-    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 = await handlebars.compile(el.sql)({ user, uid: user?.uid, id });
-            const { rows = [] } = await pg.query(q);
-            data[el.name] = rows;
-        }));
-    }
-
-    const { message, rows = [] } = await getTableData({ pg, params: { table, id }, session, user });
-
-    if (message) return { message };
-
-    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 });
-            const name = el[0].substring(0, el[0].lastIndexOf('.'))
-            html[name] = htmlContent;
-        }));
-    }
-
-    return {
-        time: Date.now() - time,
-        ...index,
-        vue,
-        data,
-        html,
-        rows,
-        columns: tableTemplate?.columns || tableTemplate?.colModel,
-    };
-
+import path from 'node:path';
+
+import { config, handlebars, setOpt, setToken, getTemplate, handlebarsSync } from "@opengis/fastify-table/utils.js";
+//import { setOpt, setToken } from "../../../../../fastify-table/utils.js";
+// import yaml from 'js-yaml';
+import getTableData from "./tableData.js";
+
+export default async function getCardData(req) {
+    const {
+        pg, params = {}, session = {}, user
+    } = req;
+    const { table, id } = params;
+    const uid = config?.auth?.disable ? '1' : session.passport?.user?.uid;
+
+    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] || {};
+
+    // tokens result
+    const tokens = {};
+    if (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 });
+            });
+
+            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)({ user, uid: user?.uid, id });
+            const { rows = [] } = await pg.query(q);
+            data[el.name] = rows;
+        }));
+    }
+
+    const { message, rows = [] } = await getTableData({ pg, params: { table, id }, session, user });
+
+    if (message) return { message };
+
+    // 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,
+    };
+
 }

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 };
 }