@opengis/admin 0.2.26 → 0.2.28

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

@@ -1,30 +1,30 @@
-import getData from '@opengis/fastify-table/server/routes/table/controllers/data.js';
-import { getOpt } from '@opengis/fastify-table/utils.js';
-// import getData from '../../../../../../npm/fastify-table/server/routes/table/controllers/data.js';
-
-export default async function getTableData(req) {
-    const { user, pg } = req
-    const tokenData = await getOpt(req.params.table, req.user?.uid);
-    if (tokenData) {
-        const { rows } = await req.pg.query(`select ${tokenData.columns || '*'} from ${tokenData.table} where ${tokenData.query || 'true'} limit 10`)
-        return { rows }
-    }
-
-    // Це можна 1 раз на старті 
-    const interfaceName = req.headers?.referer?.match(/.*\/([^?]+)/)?.[1];
-    const { query } = interfaceName ?
-        await req.pg.query(`select query from admin.routes where route_id=$1`, [interfaceName])
-            .then((res1) => res1.rows?.[0] || {}) : {};
-
-    // це можна від користувача
-    const { rows = [] } = pg.pk?.['admin.rules'] ? await req.pg.query(`select attr,(select rule_values from admin.account_grants where account_id in (select account_id from admin.account_users where user_uid=$2) and rule_id=r.rule_id limit 1) from admin.rules r where (select route_id from admin.routes where $1 in (alias,table_name)) = any(routes)`, [req.params.table, user.uid]) : {};
-
-
-    const context = rows.filter(el => el.rule_values).map(el => `${el.attr} = any ('{${el.rule_values}}')`).join(' and ')
-    req.params.query = [query, context].filter(el => el).join(' and ') || ' true ';
-
-    const res = await getData(req);
-
-    return res;
-
+import getData from '@opengis/fastify-table/server/routes/table/controllers/data.js';
+import { getOpt } from '@opengis/fastify-table/utils.js';
+// import getData from '../../../../../../npm/fastify-table/server/routes/table/controllers/data.js';
+
+export default async function getTableData(req) {
+    const { user, pg } = req
+    const tokenData = await getOpt(req.params.table, req.user?.uid);
+    if (tokenData) {
+        const { rows } = await req.pg.query(`select ${tokenData.columns || '*'} from ${tokenData.table} where ${tokenData.query || 'true'} limit 10`)
+        return { rows }
+    }
+
+    // Це можна 1 раз на старті 
+    const interfaceName = req.headers?.referer?.match(/.*\/([^?]+)/)?.[1];
+    const { query } = interfaceName ?
+        await req.pg.query(`select query from admin.routes where route_id=$1`, [interfaceName])
+            .then((res1) => res1.rows?.[0] || {}) : {};
+
+    // це можна від користувача
+    const { rows = [] } = pg.pk?.['admin.rules'] ? await req.pg.query(`select attr,(select rule_values from admin.account_grants where account_id in (select account_id from admin.account_users where user_uid=$2) and rule_id=r.rule_id limit 1) from admin.rules r where (select route_id from admin.routes where $1 in (alias,table_name)) = any(routes)`, [req.params.table, user.uid]) : {};
+
+
+    const context = rows.filter(el => el.rule_values).map(el => `${el.attr} = any ('{${el.rule_values}}')`).join(' and ')
+    req.params.query = [query, context].filter(el => el).join(' and ') || ' true ';
+
+    const res = await getData(req);
+
+    return res;
+
 }

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

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

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

@@ -1,68 +1,68 @@
-import { getTemplate, getMeta } from "@opengis/fastify-table/utils.js";
-
-export default async function tableFilter(req) {
-    const time = Date.now();
-    const { pg, params = {}, session = {} } = req;
-    const { uid } = session.passport?.user || {};
-
-    if (!params.name) {
-        return { message: 'not enouggh params: name', status: 400 };
-    }
-
-    const loadTable = await getTemplate('table', params.name);
-
-    if (!loadTable) {
-        return { message: 'table not found', status: 404 };
-    }
-
-    const { columns = [] } = await getMeta({ table: loadTable.table });
-
-    const filters = loadTable?.filter_list || loadTable?.filters || loadTable?.filterList || [];
-    filters.forEach(el => {
-        Object.assign(el, { id: el.name || el.id, name: el.name || el.id });
-    });
-
-    // admin.custom_column - user filter
-    const { rows: properties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column where entity=$1 and uid=$2 and filter`, [params.name, uid]);
-    properties.forEach((row) => filters.push({ id: row.name, name: row.name, ua: row.title, type: row.format, data: row.data }));
-
-    await Promise.all(filters.filter((el) => el.data).map(async (el) => {
-
-        const cls = await getTemplate(['cls', 'select'], el.data);
-        const name = el.name || el.id;
-
-        if (!cls?.length || !Array.isArray(cls) || !loadTable.table || !name) return;
-        const { dataTypeID } = columns.find((item) => item?.name === name) || {};
-        if (el.extra && el.type === 'select' && Array.isArray(cls)) {
-            const countArr = await pg.query(`select value_text as id, count(*) from crm.extra_data where property_key=$1 and property_entity=$2 group by value_text`, [name, params.name]);
-            const options = countArr.rows.map(cel => {
-                const data = cls.find(c => c.id === cel.id);
-                return { ...cel, ...data };
-            });
-            Object.assign(el, { options });
-        }
-        if (!dataTypeID) return;
-
-        const countArr = pg.pgType?.[dataTypeID]?.includes('[]')
-            ? await pg.queryCache(`select unnest(${name})::text as id,count(*) from ${loadTable.table} where ${loadTable.query || '1=1'} group by unnest(${name})`)
-            : await pg.queryCache(`select ${name}::text as id,count(*) from ${loadTable.table} where ${loadTable.query || '1=1'} group by ${name}`);
-
-        /* if (!countArr.rows?.length) {
-            Object.assign(el, { options: cls.map((item) => ({ count: 0, ...item })) });
-            return;
-        } */
-        const options = countArr.rows.map(cel => {
-            const data = cls.find(c => c.id === cel.id);
-            return { ...cel, ...data };
-        });
-        Object.assign(el, { options });
-    }));
-
-    return {
-        time: Date.now() - time,
-        list: filters,
-        custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
-        inline: loadTable?.filterInline,
-        state: loadTable?.filterState?.map(el => ({ label: el.label })),
-    };
+import { getTemplate, getMeta } from "@opengis/fastify-table/utils.js";
+
+export default async function tableFilter(req) {
+    const time = Date.now();
+    const { pg, params = {}, session = {} } = req;
+    const { uid } = session.passport?.user || {};
+
+    if (!params.name) {
+        return { message: 'not enouggh params: name', status: 400 };
+    }
+
+    const loadTable = await getTemplate('table', params.name);
+
+    if (!loadTable) {
+        return { message: 'table not found', status: 404 };
+    }
+
+    const { columns = [] } = await getMeta({ table: loadTable.table });
+
+    const filters = loadTable?.filter_list || loadTable?.filters || loadTable?.filterList || [];
+    filters.forEach(el => {
+        Object.assign(el, { id: el.name || el.id, name: el.name || el.id });
+    });
+
+    // admin.custom_column - user filter
+    const { rows: properties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column where entity=$1 and uid=$2 and filter`, [params.name, uid]);
+    properties.forEach((row) => filters.push({ id: row.name, name: row.name, ua: row.title, type: row.format, data: row.data }));
+
+    await Promise.all(filters.filter((el) => el.data).map(async (el) => {
+
+        const cls = await getTemplate(['cls', 'select'], el.data);
+        const name = el.name || el.id;
+
+        if (!cls?.length || !Array.isArray(cls) || !loadTable.table || !name) return;
+        const { dataTypeID } = columns.find((item) => item?.name === name) || {};
+        if (el.extra && el.type === 'select' && Array.isArray(cls)) {
+            const countArr = await pg.query(`select value_text as id, count(*) from crm.extra_data where property_key=$1 and property_entity=$2 group by value_text`, [name, params.name]);
+            const options = countArr.rows.map(cel => {
+                const data = cls.find(c => c.id === cel.id);
+                return { ...cel, ...data };
+            });
+            Object.assign(el, { options });
+        }
+        if (!dataTypeID) return;
+
+        const countArr = pg.pgType?.[dataTypeID]?.includes('[]')
+            ? await pg.queryCache(`select unnest(${name})::text as id,count(*) from ${loadTable.table} where ${loadTable.query || '1=1'} group by unnest(${name})`, { table: loadTable.table, time: 5 })
+            : await pg.queryCache(`select ${name}::text as id,count(*) from ${loadTable.table} where ${loadTable.query || '1=1'} group by ${name}`, { table: loadTable.table, time: 5 });
+
+        /* if (!countArr.rows?.length) {
+            Object.assign(el, { options: cls.map((item) => ({ count: 0, ...item })) });
+            return;
+        } */
+        const options = countArr.rows.map(cel => {
+            const data = cls.find(c => c.id === cel.id);
+            return { ...cel, ...data };
+        });
+        Object.assign(el, { options });
+    }));
+
+    return {
+        time: Date.now() - time,
+        list: filters,
+        custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
+        inline: loadTable?.filterInline,
+        state: loadTable?.filterState?.map(el => ({ label: el.label })),
+    };
 }

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

@@ -1,10 +1,10 @@
-import { getOpt, getToken } from "@opengis/fastify-table/utils.js";
-
-export default async function tokenInfo(req) {
-
-    const { params = {}, user } = req;
-    if (user.user_type !== 'admin') return { status: 403, message: 'access restricted' }
-    const tokenData = await getToken({ uid: user.uid, token: params.token, }) || await getOpt(params.token, user.uid)
-    return tokenData;
-
+import { getOpt, getToken } from "@opengis/fastify-table/utils.js";
+
+export default async function tokenInfo(req) {
+
+    const { params = {}, user } = req;
+    if (user.user_type !== 'admin') return { status: 403, message: 'access restricted' }
+    const tokenData = await getToken({ uid: user.uid, token: params.token, }) || await getOpt(params.token, user.uid)
+    return tokenData;
+
 } 

package/server/routes/data/controllers/utils/assignTokens.js

@@ -1,31 +1,31 @@
-import { config, setToken } from "@opengis/fastify-table/utils.js";
-
-export default function assignTokens({
-    rows = [], ispublic, uid, loadTable = {},
-}) {
-    if (config?.security?.disableToken) return;
-
-    if (!config?.auth?.disable && !ispublic && !uid) throw new Error('empty user');
-    if (!loadTable?.table || !(loadTable?.form || loadTable?.add_form)) return null;
-
-    const form = loadTable?.form || loadTable?.add_form;
-    const addTokens = setToken({
-        ids: [JSON.stringify({ add: loadTable.table, form })],
-        mode: 'a',
-        uid: config?.auth?.disable || ispublic ? '1' : uid,
-        array: 1,
-    });
-    if (!rows.length) return addTokens[0];
-
-    rows.forEach((row) => {
-        const editTokens = setToken({
-            ids: [JSON.stringify({ id: row.id, table: loadTable.table, form })],
-            mode: 'w',
-            uid: config?.auth?.disable || ispublic ? '1' : uid,
-            array: 1,
-        });
-        Object.assign(row, { token: editTokens[0] });
-    });
-    return addTokens[0];
-
+import { config, setToken } from "@opengis/fastify-table/utils.js";
+
+export default function assignTokens({
+    rows = [], ispublic, uid, loadTable = {},
+}) {
+    if (config?.security?.disableToken) return;
+
+    if (!config?.auth?.disable && !ispublic && !uid) throw new Error('empty user');
+    if (!loadTable?.table || !(loadTable?.form || loadTable?.add_form)) return null;
+
+    const form = loadTable?.form || loadTable?.add_form;
+    const addTokens = setToken({
+        ids: [JSON.stringify({ add: loadTable.table, form })],
+        mode: 'a',
+        uid: config?.auth?.disable || ispublic ? '1' : uid,
+        array: 1,
+    });
+    if (!rows.length) return addTokens[0];
+
+    rows.forEach((row) => {
+        const editTokens = setToken({
+            ids: [JSON.stringify({ id: row.id, table: loadTable.table, form })],
+            mode: 'w',
+            uid: config?.auth?.disable || ispublic ? '1' : uid,
+            array: 1,
+        });
+        Object.assign(row, { token: editTokens[0] });
+    });
+    return addTokens[0];
+
 }

package/server/routes/data/controllers/utils/conditions.js

@@ -1,21 +1,21 @@
-function onCheck(rule, data) {
-    const val = data[rule[0]];
-    // console.log(val, rule[1], rule[2])
-    if (rule[1] === '==') return val === rule[2];
-    if (rule[1] === '!=') return val !== rule[2];
-    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
-    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
-
-    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
-    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
-
-    if (rule[1] === '>') return val > rule[2];
-    if (rule[1] === '<') return val < rule[2];
-}
-export default function conditions(rules, data) {
-    if (!rules?.length) return true;
-    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
-    // console.log(rules, result)
-    return result;
-
+function onCheck(rule, data) {
+    const val = data[rule[0]];
+    // console.log(val, rule[1], rule[2])
+    if (rule[1] === '==') return val === rule[2];
+    if (rule[1] === '!=') return val !== rule[2];
+    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
+    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
+
+    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
+    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
+
+    if (rule[1] === '>') return val > rule[2];
+    if (rule[1] === '<') return val < rule[2];
+}
+export default function conditions(rules, data) {
+    if (!rules?.length) return true;
+    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
+    // console.log(rules, result)
+    return result;
+
 }

package/server/routes/data/controllers/utils/getColumns.js

@@ -1,9 +1,9 @@
-import { getTemplate } from "@opengis/fastify-table/utils.js";
-
-export default async function getColumns({
-    columns = [], params = {}, opt = {}, loadTable = {}, form, table, dbColumns = [], mode = 'table',
-}) {
-    const columnList = dbColumns.map((el) => el.name || el).join(',');
-    const cols = columns.filter((el) => columnList.includes(el?.name) && el?.name !== 'geom').map((el) => el?.name || el).join(',');
-    return { cols, columnList };
+import { getTemplate } from "@opengis/fastify-table/utils.js";
+
+export default async function getColumns({
+    columns = [], params = {}, opt = {}, loadTable = {}, form, table, dbColumns = [], mode = 'table',
+}) {
+    const columnList = dbColumns.map((el) => el.name || el).join(',');
+    const cols = columns.filter((el) => columnList.includes(el?.name) && el?.name !== 'geom').map((el) => el?.name || el).join(',');
+    return { cols, columnList };
 }

package/server/routes/data/index.mjs

@@ -1,17 +1,17 @@
-
-import tableData from "./controllers/tableData.js";
-import tokenInfo from "./controllers/tokenInfo.js";
-// import tableDataId from "./controllers/tableDataId.js";
-import cardData from "./controllers/cardData.js";
-import cardTabData from './controllers/cardTabData.js';
-import tableFilter from "./controllers/tableFilter.js";
-
-import { tableDataSchema, tableDataIdSchema, tableFilterSchema, cardTabDataSchema } from './schema.js';
-
-export default async function route(fastify) {
-    fastify.get(`/token-info/:token`, tokenInfo);
-    fastify.get(`/table-data/:table`, { schema: tableDataSchema }, tableData);
-    fastify.get(`/card-data/:token`, { scheme: cardTabDataSchema }, cardTabData);
-    fastify.get(`/table-data/:table/:id`, { schema: tableDataIdSchema }, cardData);
-    fastify.get(`/table-filter/:name`, { schema: tableFilterSchema }, tableFilter);
-}
+
+import tableData from "./controllers/tableData.js";
+import tokenInfo from "./controllers/tokenInfo.js";
+// import tableDataId from "./controllers/tableDataId.js";
+import cardData from "./controllers/cardData.js";
+import cardTabData from './controllers/cardTabData.js';
+import tableFilter from "./controllers/tableFilter.js";
+
+import { tableDataSchema, tableDataIdSchema, tableFilterSchema, cardTabDataSchema } from './schema.js';
+
+export default async function route(fastify) {
+    fastify.get(`/token-info/:token`, tokenInfo);
+    fastify.get(`/table-data/:table`, { schema: tableDataSchema }, tableData);
+    fastify.get(`/card-data/:token`, { scheme: cardTabDataSchema }, cardTabData);
+    fastify.get(`/table-data/:table/:id`, { schema: tableDataIdSchema }, cardData);
+    fastify.get(`/table-filter/:name`, { schema: tableFilterSchema }, tableFilter);
+}

package/server/routes/data/schema.js

@@ -1,54 +1,54 @@
-const tableDataSchema = {
-    querystring: {
-        limit: { type: 'string', pattern: '^(\\d+)$' },
-        page: { type: 'string', pattern: '^(\\d+)$' },
-        // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-        // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-        order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        desc: { type: 'string', pattern: '^(\\d+)$' },
-        state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
-        polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
-        // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-        sql: { type: 'string', pattern: '^(\\d)$' },
-    },
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    }
-};
-
-const tableDataIdSchema = {
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
-};
-
-const tableFilterSchema = {
-    params: {
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
-};
-
-const cardDataSchema = {
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        table: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
-};
-
-const cardTabDataSchema = {
-    querystring: {
-        sql: { type: 'string', pattern: '^(\\d)$' }
-    },
-    params: {
-        token: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    }
-};
-export { 
-    tableDataSchema, tableDataIdSchema, tableFilterSchema,
-    cardDataSchema, cardTabDataSchema
- }
-export default null;
+const tableDataSchema = {
+    querystring: {
+        limit: { type: 'string', pattern: '^(\\d+)$' },
+        page: { type: 'string', pattern: '^(\\d+)$' },
+        // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+        // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+        order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        desc: { type: 'string', pattern: '^(\\d+)$' },
+        state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
+        polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
+        // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+        sql: { type: 'string', pattern: '^(\\d)$' },
+    },
+    params: {
+        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    }
+};
+
+const tableDataIdSchema = {
+    params: {
+        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    }
+};
+
+const tableFilterSchema = {
+    params: {
+        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    }
+};
+
+const cardDataSchema = {
+    params: {
+        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        table: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    }
+};
+
+const cardTabDataSchema = {
+    querystring: {
+        sql: { type: 'string', pattern: '^(\\d)$' }
+    },
+    params: {
+        token: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    }
+};
+export { 
+    tableDataSchema, tableDataIdSchema, tableFilterSchema,
+    cardDataSchema, cardTabDataSchema
+ }
+export default null;