@opengis/admin 0.1.27 → 0.1.28

package/server/routes/data/controllers/funcs/getFilterSQL/util/getTableSql.js

@@ -1,34 +1,34 @@
-function getTable(table) {
-  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    ?.map((el) => el.split(/[ )]/)[0]);
-  return result;
-}
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-const tableSql = {};
-async function getTableSql({
-  pg, body, table, fields,
-}) {
-  if (tableSql[table]) return tableSql[table];
-
-  const fieldList = fields.map((el) => el.name);
-
-  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
-
-  if (!tableList) { tableSql[table] = []; return []; }
-
-  const data = await Promise.all(tableList?.map(async (tableEl) => {
-    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
-    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
-  }));
-
-  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
-
-  return tableSql[table];
-}
-
-export default getTableSql;
+function getTable(table) {
+  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+    ?.map((el) => el.split(/[ )]/)[0]);
+  return result;
+}
+
+/**
+* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+* @param {String} opt.query - запит до таблиці
+* @param {String} opt.hash - інформація з хешу по запиту
+*/
+const tableSql = {};
+async function getTableSql({
+  pg, body, table, fields,
+}) {
+  if (tableSql[table]) return tableSql[table];
+
+  const fieldList = fields.map((el) => el.name);
+
+  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
+
+  if (!tableList) { tableSql[table] = []; return []; }
+
+  const data = await Promise.all(tableList?.map(async (tableEl) => {
+    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
+    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
+  }));
+
+  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
+
+  return tableSql[table];
+}
+
+export default getTableSql;

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

@@ -1,122 +1,122 @@
-import { getTemplate, metaFormat } from "@opengis/fastify-table/utils.js";
-
-import getMeta from "@opengis/fastify-table/pg/funcs/getMeta.js";
-import getAccess from "@opengis/fastify-table/crud/funcs/getAccess.js";
-
-import gisIRColumn from "@opengis/fastify-table/table/controllers/utils/gisIRColumn.js";
-
-import getFilterSQL from "./funcs/getFilterSQL/index.js";
-
-import assignTokens from './utils/assignTokens.js';
-
-import getColumns from './utils/getColumns.js';
-
-const maxLimit = 100;
-
-export default async function getTableData(req) {
-    const time = Date.now();
-
-    const {
-        pg, params, funcs = {}, query = {}, opt = {}, session = {}, mode = 'table',
-    } = req;
-    const { uid } = session.passport?.user || {};
-
-    try {
-        const loadTable = await getTemplate('table', params.table);
-
-        if (!loadTable) {
-            return { message: 'template not found', status: 404 };
-        }
-
-        const {
-            table, sql, form, meta, sqlColumns, ispublic,
-        } = loadTable;
-        const columns = loadTable.columns || loadTable.colModel;
-
-        const { pk, columns: dbColumns = [] } = await getMeta(table);
-
-        if (!pk) {
-            return { message: `table not found: ${table}`, status: 404 };
-        }
-
-        const { cols, columnList, extraKeys, schema } = await getColumns({
-            columns, params, opt, loadTable, form, table, dbColumns, mode,
-        });
-
-        const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
-            ? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
-            : '';
-
-        const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
-
-        if (params.id && columnList.includes(params.id)) {
-            return gisIRColumn({
-                pg, funcs, layer: params.table, column: params.id, sql: query.sql,
-            });
-        }
-
-        const fData = query.filter || query.search ? await getFilterSQL({
-            funcs,
-            filter: query.filter,
-            search: query.search,
-            table: params.table,
-            json: 1,
-        }) : {};
-
-        const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
-
-        const limit = Math.min(maxLimit, +(query.limit || 20));
-
-        const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-        // id, query, filter
-        const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
-
-        const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-
-        const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
-
-        const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
-
-        const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
-
-        const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
-
-        const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
-
-        const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
-
-        const access = await getAccess(req, params.table);
-
-        const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1', bbox, queryPolyline].filter((el) => el);
-
-        const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${metaCols} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
-
-        if (query.sql === '1') { return { message: q }; }
-
-        const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
-
-        const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => (el?.rows[0]?.count || 0) - 0);
-
-        if (extraKeys?.length && mode === 'card') {
-            await Promise.all(rows?.map(async (row) => {
-                await Promise.all(extraKeys?.map(async (key) => {
-                const { colModel, table: extraTable, parent_id: parentId } = schema[key];
-                const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
-                Object.assign(row, { [key]: extraRows });
-                }));
-            }));
-        }
-
-        await metaFormat({ funcs, rows, table: params.table });
-
-        const res = {
-            time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, meta, columns,
-        };
-        const addToken = assignTokens({ rows, funcs, ispublic, uid: 1, loadTable });
-        Object.assign(res, { rows, addToken });
-
-        return res;
-    } catch (err) {
-        return { message: err.toString(), status: 500 };
-    }
+import { getTemplate, metaFormat } from "@opengis/fastify-table/utils.js";
+
+import getMeta from "@opengis/fastify-table/pg/funcs/getMeta.js";
+import getAccess from "@opengis/fastify-table/crud/funcs/getAccess.js";
+
+import gisIRColumn from "@opengis/fastify-table/table/controllers/utils/gisIRColumn.js";
+
+import getFilterSQL from "./funcs/getFilterSQL/index.js";
+
+import assignTokens from './utils/assignTokens.js';
+
+import getColumns from './utils/getColumns.js';
+
+const maxLimit = 100;
+
+export default async function getTableData(req) {
+    const time = Date.now();
+
+    const {
+        pg, params, funcs = {}, query = {}, opt = {}, session = {}, mode = 'table',
+    } = req;
+    const { uid } = session.passport?.user || {};
+
+    try {
+        const loadTable = await getTemplate('table', params.table);
+
+        if (!loadTable) {
+            return { message: 'template not found', status: 404 };
+        }
+
+        const {
+            table, sql, form, meta, sqlColumns, ispublic,
+        } = loadTable;
+        const columns = loadTable.columns || loadTable.colModel;
+
+        const { pk, columns: dbColumns = [] } = await getMeta(table);
+
+        if (!pk) {
+            return { message: `table not found: ${table}`, status: 404 };
+        }
+
+        const { cols, columnList, extraKeys, schema } = await getColumns({
+            columns, params, opt, loadTable, form, table, dbColumns, mode,
+        });
+
+        const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
+            ? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
+            : '';
+
+        const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
+
+        if (params.id && columnList.includes(params.id)) {
+            return gisIRColumn({
+                pg, funcs, layer: params.table, column: params.id, sql: query.sql,
+            });
+        }
+
+        const fData = query.filter || query.search ? await getFilterSQL({
+            funcs,
+            filter: query.filter,
+            search: query.search,
+            table: params.table,
+            json: 1,
+        }) : {};
+
+        const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
+
+        const limit = Math.min(maxLimit, +(query.limit || 20));
+
+        const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+        // id, query, filter
+        const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
+
+        const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+
+        const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
+
+        const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
+
+        const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
+
+        const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
+
+        const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
+
+        const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
+
+        const access = await getAccess(req, params.table);
+
+        const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1', bbox, queryPolyline].filter((el) => el);
+
+        const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${metaCols} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
+
+        if (query.sql === '1') { return { message: q }; }
+
+        const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
+
+        const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => (el?.rows[0]?.count || 0) - 0);
+
+        if (extraKeys?.length && mode === 'card') {
+            await Promise.all(rows?.map(async (row) => {
+                await Promise.all(extraKeys?.map(async (key) => {
+                const { colModel, table: extraTable, parent_id: parentId } = schema[key];
+                const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
+                Object.assign(row, { [key]: extraRows });
+                }));
+            }));
+        }
+
+        await metaFormat({ funcs, rows, table: params.table });
+
+        const res = {
+            time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, meta, columns,
+        };
+        const addToken = assignTokens({ rows, funcs, ispublic, uid: 1, loadTable });
+        Object.assign(res, { rows, addToken });
+
+        return res;
+    } catch (err) {
+        return { message: err.toString(), status: 500 };
+    }
 }

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

@@ -1,28 +1,28 @@
-import getTemplate from "../../templates/funcs/getTemplate.js";
-import getTableData from "./tableData.js";
-
-export default async function tableDataId({
-    pg, funcs, params = {}, session = {},
-}, reply) {
-    const { name, id } = params;
-
-    const data = await getTemplate('pt', `${name}.pt`);
-
-
-    if (!data) {
-        return { message: `invalid template: ${name}.pt`, status: 400 };
-    }
-
-    const { message, status = 500, rows = [] } = await getTableData({ pg, params: { name, id }, session });
-    if (message) {
-        return { message, status };
-    }
-
-    if (!rows.length) {
-        return { message: `data not found: ${name}/${id}`, status: 404 };
-    }
-
-    const htmlContent = await funcs.handlebars.compile(data)(rows[0]);
-
-    return reply.headers({ 'Content-Type': 'text/html; charset=utf-8' }).send(htmlContent);
+import getTemplate from "../../templates/funcs/getTemplate.js";
+import getTableData from "./tableData.js";
+
+export default async function tableDataId({
+    pg, funcs, params = {}, session = {},
+}, reply) {
+    const { name, id } = params;
+
+    const data = await getTemplate('pt', `${name}.pt`);
+
+
+    if (!data) {
+        return { message: `invalid template: ${name}.pt`, status: 400 };
+    }
+
+    const { message, status = 500, rows = [] } = await getTableData({ pg, params: { name, id }, session });
+    if (message) {
+        return { message, status };
+    }
+
+    if (!rows.length) {
+        return { message: `data not found: ${name}/${id}`, status: 404 };
+    }
+
+    const htmlContent = await funcs.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,55 +1,55 @@
-import { getTemplate } from "@opengis/fastify-table/utils.js";
-
-export default async function tableFilter(req) {
-    const time = Date.now();
-    const { pg, funcs = {}, params = {}, query = {} } = req;
-
-    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 funcs.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 });
-    })
-
-    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 (!dataTypeID) return;
-
-        const countArr = pg.pgType?.[dataTypeID]?.includes('[]')
-            ? await pg.queryCache(`select unnest(${name})::text as id,count(*) from ${loadTable.table} group by unnest(${name})`)
-            : await pg.queryCache(`select ${name}::text as id,count(*) from ${loadTable.table} group by ${name}`);
-
-        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 } from "@opengis/fastify-table/utils.js";
+
+export default async function tableFilter(req) {
+    const time = Date.now();
+    const { pg, funcs = {}, params = {}, query = {} } = req;
+
+    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 funcs.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 });
+    })
+
+    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 (!dataTypeID) return;
+
+        const countArr = pg.pgType?.[dataTypeID]?.includes('[]')
+            ? await pg.queryCache(`select unnest(${name})::text as id,count(*) from ${loadTable.table} group by unnest(${name})`)
+            : await pg.queryCache(`select ${name}::text as id,count(*) from ${loadTable.table} group by ${name}`);
+
+        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/utils/assignTokens.js

@@ -1,31 +1,31 @@
-import setToken from "@opengis/fastify-table/crud/funcs/setToken.js";
-
-export default function assignTokens({
-    rows = [], funcs = {}, ispublic, uid, loadTable = {},
-}) {
-    if (funcs.config?.security?.disableToken) return;
-
-    if (!funcs.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: funcs.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: funcs.config?.auth?.disable || ispublic ? '1' : uid,
-            array: 1,
-        });
-        Object.assign(row, { token: editTokens[0] });
-    });
-    return addTokens[0];
-
+import setToken from "@opengis/fastify-table/crud/funcs/setToken.js";
+
+export default function assignTokens({
+    rows = [], funcs = {}, ispublic, uid, loadTable = {},
+}) {
+    if (funcs.config?.security?.disableToken) return;
+
+    if (!funcs.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: funcs.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: funcs.config?.auth?.disable || ispublic ? '1' : uid,
+            array: 1,
+        });
+        Object.assign(row, { token: editTokens[0] });
+    });
+    return addTokens[0];
+
 }

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

@@ -1,22 +1,22 @@
-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(',');
-    if (mode === 'table') {
-        const cols = columns.filter((el) => el?.name !== 'geom').map((el) => el?.name || el).join(',');
-        return { cols, columnList };
-    }
-    // card / edit form
-    const schema = await getTemplate('form', opt?.form || form) || {};
-    // skip DataTable from another table
-    const extraKeys = Object.keys(schema)?.filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
-    // skip non-existing columns
-    const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || opt?.table || params.table} limit 0`) : {};
-    const cols = loadTable?.table
-        ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',')
-        : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
-    
-    return { cols, columnList, extraKeys, schema };
+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(',');
+    if (mode === 'table') {
+        const cols = columns.filter((el) => el?.name !== 'geom').map((el) => el?.name || el).join(',');
+        return { cols, columnList };
+    }
+    // card / edit form
+    const schema = await getTemplate('form', opt?.form || form) || {};
+    // skip DataTable from another table
+    const extraKeys = Object.keys(schema)?.filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
+    // skip non-existing columns
+    const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || opt?.table || params.table} limit 0`) : {};
+    const cols = loadTable?.table
+        ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',')
+        : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
+    
+    return { cols, columnList, extraKeys, schema };
 }

package/server/routes/data/index.mjs

@@ -1,10 +1,12 @@
-import tableData from "./controllers/tableData.js";
-// import tableDataId from "./controllers/tableDataId.js";
-import cardData from "./controllers/cardData.js";
-import tableFilter from "./controllers/tableFilter.js";
-
-export default async function route(fastify) {
-    fastify.get(`/table-data/:table`, tableData);
-    fastify.get(`/table-data/:table/:id`, cardData);
-    fastify.get(`/table-filter/:name`, tableFilter);
-}
+import tableData from "./controllers/tableData.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";
+
+export default async function route(fastify) {
+    fastify.get(`/table-data/:table`, tableData);
+    fastify.get(`/card-data/:token`, cardTabData);
+    fastify.get(`/table-data/:table/:id`, cardData);
+    fastify.get(`/table-filter/:name`, tableFilter);
+}