@opengis/fastify-table 2.0.24 → 2.0.26

package/dist/server/plugins/table/funcs/getFilterSQL/index.js

@@ -38,7 +38,7 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
     const { fields: fieldsModel = [] } = body?.table && pg.pk?.[body.table]
         ? await pg.query(`select * from ${body.table} limit 0`)
         : {};
-    const { q: extraSqlColumns, extraColumns = [] } = pg.pk?.[extraDataTable] && pg.pk?.[body.table || table]
+    const { q: extraSqlColumns, extraColumns = [] } = extraDataTable && pg.pk?.[extraDataTable] && pg.pk?.[body.table || table]
         ? getExtraQuery(fieldsModel, loadTemplate?.schema, extraDataTable, pg.pk[body.table || table])
         : {};
     // console.log('extra getFilterSQL', extraDataTable, pg.pk?.[extraDataTable]);

package/dist/server/plugins/table/funcs/metaFormat/getSelectVal.js

@@ -26,7 +26,7 @@ export default async function getSelectVal({ pg = pgClients.client, name, values
     // select id column name
     if (!selectIds[name]) {
         selectIds[name] = await pg
-            .queryCache(`select * from (${cls.sql})q limit 0`)
+            .query(`select * from (${cls.sql})q limit 0`)
             .then((el) => el.fields?.[0]?.name)
             .catch((err) => console.error("getSelectVal error: 1", name, cls.sql, err.toString()));
     }

package/dist/server/routes/crud/controllers/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAe5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBA6MZ"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAe5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBAuNZ"}

package/dist/server/routes/crud/controllers/table.js

@@ -20,7 +20,9 @@ export default async function tableAPI(req, reply, called) {
         !(pg.pk?.[templateName] && called)) {
         return reply.status(404).send("not found");
     }
-    const { table = params.table, /* columns, */ form } = hookData || loadTable || tokenData;
+    const { table: table1 = params.table, form: form1, obj, } = hookData || loadTable || tokenData;
+    const table = loadTable?.table || table1;
+    const form = loadTable?.form || form1;
     const id = hookData?.id || tokenData.id || params.id;
     if (tokenData && !id)
         return { message: {} };
@@ -42,7 +44,10 @@ export default async function tableAPI(req, reply, called) {
     if (!actions.includes("edit") && !config?.local && !tokenData && !called) {
         return reply.status(403).send("access restricted: actions");
     }
-    const { pk, columns: dbColumns = [] } = await getMeta({ pg, table });
+    const { pk, columns: dbColumns = [] } = await getMeta({
+        pg,
+        table,
+    });
     if (!pk) {
         return reply.status(404).send(`table not found: ${table}`);
     }
@@ -128,7 +133,7 @@ export default async function tableAPI(req, reply, called) {
         data.token = tokenData?.table
             ? params.table
             : setToken({
-                ids: [JSON.stringify({ id, table, form })],
+                ids: [JSON.stringify({ id, table, form, obj })],
                 uid: user.uid,
                 array: 1,
             })?.[0];

package/dist/server/routes/table/controllers/cardTabData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cardTabData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/cardTabData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAW5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,KAAU,EACV,MAAW,EACX,IAAS,GACV,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,EACD,KAAK,EAAE,YAAY;;;;;;;;;;GA8DpB"}
+{"version":3,"file":"cardTabData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/cardTabData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAW5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,KAAU,EACV,MAAW,EACX,IAAS,GACV,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,EACD,KAAK,EAAE,YAAY;;;;;;;;;;GAiEpB"}

package/dist/server/routes/table/controllers/cardTabData.js

@@ -27,7 +27,7 @@ export default async function cardTabData({ pg = pgClients.client, query = {}, p
         params: { table: props.table },
         user,
         query: { filter, sql },
-    });
+    }, reply);
     if (message)
         return { message };
     if (props.columns?.length && rows?.length) {

package/dist/server/routes/table/controllers/suggest.js

@@ -39,7 +39,7 @@ export default async function suggest(req) {
     const [table, column] = params.data?.includes(":")
         ? params.data.split(":")
         : [query.token, query.column];
-    const selectName = query.sel || query.name || params.data;
+    const selectName = query.sel || params.data;
     if (!selectName)
         return { status: 400, message: "name is required" };
     const { body: hookBody } = table || query.token

package/dist/server/routes/table/controllers/tableData.d.ts

@@ -1,2 +1,3 @@
-export default function getTableData(req: any, reply?: any, called?: any): Promise<any>;
+import { FastifyReply } from "fastify";
+export default function getTableData(req: any, reply: FastifyReply, called?: any): Promise<any>;
 //# sourceMappingURL=tableData.d.ts.map

package/dist/server/routes/table/controllers/tableData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tableData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/tableData.ts"],"names":[],"mappings":"AAQA,wBAA8B,YAAY,CACxC,GAAG,EAAE,GAAG,EACR,KAAK,CAAC,EAAE,GAAG,EACX,MAAM,CAAC,EAAE,GAAG,gBAsHb"}
+{"version":3,"file":"tableData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/tableData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,wBAA8B,YAAY,CACxC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBA8Bb"}

package/dist/server/routes/table/controllers/tableData.js

@@ -1,58 +1,7 @@
-import getToken from "../../../plugins/crud/funcs/getToken.js";
-import getOpt from "../../../plugins/crud/funcs/getOpt.js";
-import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
-import getMeta from "../../../plugins/pg/funcs/getMeta.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
 import getData from "../functions/getData.js";
 export default async function getTableData(req, reply, called) {
-    const { user = {}, params = {}, headers = {}, query = {}, pg = pgClients.client, contextQuery: contextQuery1, sufix = true, filterList, } = req;
-    const { id } = params || {};
-    const tokenData1 = await getOpt(params.table, user?.uid);
-    const tokenData2 = await getToken({
-        uid: user?.uid,
-        token: params.table,
-        json: true,
-    });
-    const tokenData = tokenData1 || tokenData2;
-    if (tokenData?.table) {
-        const loadTable = await getTemplate("table", tokenData.table);
-        if (!loadTable) {
-            const { rows = [], fields = [] } = await pg.query(`select ${tokenData.columns || "*"} from ${tokenData.table} where ${tokenData.query || "true"} limit 10`);
-            const meta = await getMeta({ pg, table: tokenData.table });
-            const columns = (meta?.columns || fields).map((el) => ({
-                name: el.name,
-                type: pg.pgType?.[el.dataTypeID],
-                title: el.title,
-            }));
-            return { rows, columns };
-        }
-        const resp = await getData({
-            pg,
-            params: { id, table: tokenData.table },
-            headers,
-            query,
-            user,
-            contextQuery: [contextQuery1, tokenData.query]
-                .filter(Boolean)
-                .join(" and "),
-            sufix,
-            filterList,
-            actions: tokenData1?.actions,
-        }, reply, called);
-        if (resp?.addToken && tokenData.obj) {
-            Object.assign(resp, { addToken: params.table });
-        }
-        return resp;
-    }
-    // Це можна 1 раз на старті
-    const interfaceName = req.headers?.referer?.match(/.*\/([^?]+)/)?.[1];
-    const { query: interfaceQuery } = interfaceName && pg?.pk
-        ? await pg
-            .query("select query from admin.routes where route_id=$1", [
-            interfaceName,
-        ])
-            .then((el) => el.rows?.[0] || {})
-        : {};
+    const { user, params, headers, query, pg = pgClients.client } = req;
     // це можна від користувача
     const q = `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) 
@@ -60,12 +9,10 @@ export default async function getTableData(req, reply, called) {
     const { rows = [] } = pg?.pk?.["admin.rules"]
         ? await pg.query(q, [params.table, user.uid])
         : {};
-    const context = rows
+    const contextQuery = rows
         .filter((el) => el.rule_values)
         .map((el) => `${el.attr} = any ('{${el.rule_values}}')`)
         .join(" and ");
-    const contextQuery = [contextQuery1, interfaceQuery, context].filter(Boolean).join(" and ") ||
-        " 2=2 ";
     const res = await getData({
         pg,
         params,
@@ -73,16 +20,6 @@ export default async function getTableData(req, reply, called) {
         headers,
         user,
         contextQuery,
-        sufix,
-        filterList,
-        actions: tokenData1?.actions,
     }, reply, called);
-    const route = pg.tlist?.includes("admin.routes")
-        ? await pg
-            .query("select route_id as path, title from admin.routes where enabled and alias=$1 limit 1", [params.table])
-            .then((el) => el.rows?.[0] || {})
-        : {};
-    if (typeof res === "string")
-        return res;
-    return { route, ...res };
+    return res;
 }

package/dist/server/routes/table/functions/getData.d.ts

@@ -12,7 +12,7 @@ export default function dataAPI({ pg, params, headers, query, user, contextQuery
     user: Record<string, any>;
     contextQuery: any;
     sufix?: boolean;
-    filterList: any[];
-    actions: string[];
+    filterList?: any[];
+    actions?: string[];
 }, reply: FastifyReply, called: any): Promise<any>;
 //# sourceMappingURL=getData.d.ts.map

package/dist/server/routes/table/functions/getData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA2DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,EAAE,GAAG,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBAoxBZ"}
+{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,EAAE,GAAG,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBAmzBZ"}

package/dist/server/routes/table/functions/getData.js

@@ -3,6 +3,7 @@ import { handlebars, handlebarsSync } from "../../../helpers/index.js";
 import getFilterSQL from "../../../plugins/table/funcs/getFilterSQL/index.js";
 import getAccess from "../../../plugins/crud/funcs/getAccess.js";
 import setToken from "../../../plugins/crud/funcs/setToken.js";
+import getToken from "../../../plugins/crud/funcs/getToken.js";
 import gisIRColumn from "../../../plugins/table/funcs/gisIRColumn.js";
 import { applyHook } from "../../../../utils.js";
 import getSelect from "../../../plugins/table/funcs/getSelect.js";
@@ -52,9 +53,27 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
     if (hookData?.message && hookData?.status) {
         return { message: hookData?.message, status: hookData?.status };
     }
-    const tokenData = await getOpt(params.table, user?.uid);
+    /* from tableData START */
+    const tokenData1 = await getOpt(params.table, user?.uid);
+    const tokenData2 = await getToken({
+        uid: user?.uid,
+        token: params.table,
+        json: true,
+    });
+    const tokenData = tokenData1 || tokenData2;
     const templateName = tokenData?.table || hookData?.table || params.table;
     const loadTable = await getTemplate("table", templateName);
+    if (tokenData?.table && !loadTable) {
+        const { rows = [], fields = [] } = await pg.query(`select ${tokenData.columns || "*"} from ${tokenData.table} where ${tokenData.query || "true"} limit 10`);
+        const meta = await getMeta({ pg, table: tokenData.table });
+        const columns = (meta?.columns || fields).map((el) => ({
+            name: el.name,
+            type: pg.pgType?.[el.dataTypeID],
+            title: el.title,
+        }));
+        return { rows, columns };
+    }
+    /* from tableData END */
     // check sql inline fields count
     if (!checkInline[params?.table] &&
         loadTable?.sql?.length &&
@@ -88,7 +107,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
     }
     const id = tokenData?.id || hookData?.id || params?.id;
     const { actions = [], query: accessQuery } = (await getAccess({
-        table: tokenData?.table || hookData?.table || params.table,
+        table: templateName,
         id,
         user,
     }, pg));
@@ -106,14 +125,14 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
     ).filter(el => el.id || el.name); */
     if (body?.filter_list || body?.filterList) {
         // console.warn('invalid filters in template: filter_list / filterList');
-        // logger.file('crud/warning', { msg: 'invalid filters', template: tokenData?.table || hookData?.table || params.table });
+        // logger.file('crud/warning', { msg: 'invalid filters', template: templateName });
     }
     const objectId = tokenData?.id || hookData?.id || params.id;
     const { list: filters = [] } = objectId
         ? {}
         : (await getFilter({
             pg,
-            table: tokenData?.table || hookData?.table || params.table,
+            table: templateName,
             user,
         }, null)) || {};
     const tableMeta = await getMeta({ pg, table });
@@ -188,7 +207,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         query.state,
         query.custom,
         isdefault,
-    ].filter((el) => el).length;
+    ].filter(Boolean).length;
     const fData = checkFilter
         ? await getFilterSQL({
             pg,
@@ -235,6 +254,14 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
     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 interfaceName = headers?.referer?.match?.(/.*\/([^?]+)/)?.[1];
+    const interfaceQuery1 = interfaceName && pg?.pk
+        ? await pg
+            .query("select query from admin.routes where route_id=$1", [
+            interfaceName,
+        ])
+            .then((el) => el.rows?.[0]?.query)
+        : null;
     const interfaceQuery = params?.query
         ? await handlebars.compile(params?.query)({ user, uid })
         : undefined;
@@ -243,17 +270,17 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         keyQuery,
         loadTable?.query,
         tokenData?.query,
-        fData.q,
+        fData?.q,
         search,
         accessQuery || "1=1",
         contextQuery,
         bbox,
         queryPolyline,
         interfaceQuery,
+        interfaceQuery1,
     ]
-        .filter((el) => el)
+        .filter(Boolean)
         .filter((el) => checkQuery(el));
-    // const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
     const q = `select  ${pk ? `"${pk}" as id,` : ""} 
                      ${params.id || query.key ? "*" : sqlColumns || cols || "*"} 
                      ${metaCols} 
@@ -272,7 +299,6 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
                      ${params.id ? cardSqlTable : ""} 
                      where ${where.join(" and ") || "true"} 
                      ${order} ${offset} limit ${limit}`.replace(/{{uid}}/g, uid);
-    // if (user?.user_type === 'superadmin') console.log(q);
     if (config.trace)
         console.log(q);
     if (query.sql === "1") {
@@ -284,11 +310,11 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         : null) || (query.key && loadTable.key ? [query.key] : []))
         .catch((err) => {
         console.error(err.toString());
-        throw new Error(err.toString());
+        throw err;
     });
     if (!rows.length &&
         headers?.referer?.includes?.("/card/") &&
-        headers?.referer?.includes?.(tokenData?.table || hookData?.table || params.table)) {
+        headers?.referer?.includes?.(templateName)) {
         return reply.status(403).send("access restricted: empty rows");
     }
     timeArr.push(Date.now());
@@ -296,7 +322,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         rows.length &&
         !config.security?.disableToken &&
         (editable ||
-            actionsParam?.includes("edit") ||
+            (tokenData?.actions || actionsParam)?.includes("edit") ||
             actions.includes("edit") ||
             actions.includes("del"))) {
         rows.forEach((row) => {
@@ -305,8 +331,9 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
                     ids: [
                         JSON.stringify({
                             id: row.id,
-                            table: tokenData?.table || hookData?.table || params.table,
+                            table: templateName,
                             form: loadTable?.form,
+                            obj: tokenData?.obj || hookData?.obj,
                         }),
                     ],
                     uid,
@@ -324,7 +351,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         loadTable?.query,
         tokenData?.query,
     ]
-        .filter((el) => el)
+        .filter(Boolean)
         .filter((el) => checkQuery(el));
     const aggColumns = columns
         .filter((el) => el.agg)
@@ -348,7 +375,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         .map((el) => `,(${el.sql})`)
         .join("") || ""} from ${table} t ${sqlTable})q 
             where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery]
-        .filter((el) => el)
+        .filter(Boolean)
         .filter((el) => checkQuery(el))
         .join(" and ") || "true"} `.replace(/{{uid}}/g, uid);
     if (query.sql === "2") {
@@ -368,7 +395,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         .filter((el) => !["total", "filtered"].includes(el))
         .reduce((acc, el) => ({ ...acc, [el]: counts[el] }), {});
     await extraDataGet({ rows, table: loadTable?.table, form }, pg);
-    await metaFormat({ rows, table: tokenData?.table || hookData?.table || params.table, sufix }, pg);
+    await metaFormat({ rows, table: templateName, sufix }, pg);
     timeArr.push(Date.now());
     const status = [];
     if (loadTable?.meta?.status) {
@@ -382,11 +409,10 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         const statusClsData = statusCls ? await getSelect(statusCls, pg) : {};
         statusClsData?.arr?.forEach((el) => status.push({
             ...el,
-            count: rows.filter((row) => el.id === row[statusColumn.name])
-                .length,
+            count: rows.filter((row) => el.id === row[statusColumn.name]).length,
         }));
     }
-    const template = await getTemplate("card", tokenData?.table || hookData?.table || params.table);
+    const template = await getTemplate("card", templateName);
     const index = template?.find((el) => el[0] === "index.yml")?.[1] || {};
     const html = {};
     const { panels = [] } = index;
@@ -463,12 +489,6 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         }));
         // data result
         const data = {};
-        const route = pg.pk?.["admin.routes"]
-            ? await pg
-                .query("select route_id as path, title from admin.routes where enabled and alias=$1 limit 1", [table])
-                .then((el) => el.rows?.[0] || {})
-            : {};
-        Object.assign(route, { tableTitle: loadTable?.title });
         if (index?.data && index?.data?.[0]?.name) {
             await Promise.all(index.data
                 .filter((el) => el?.name && el?.sql)
@@ -515,6 +535,11 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
             }
         }));
     }
+    const route = pg.tlist?.includes?.("admin.routes")
+        ? await pg
+            .query("select route_id as path, title from admin.routes where enabled and alias=$1 limit 1", [params.table])
+            .then((el) => el.rows?.[0] || {})
+        : {};
     const res = {
         time: {
             total: Date.now() - time,
@@ -524,10 +549,11 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
             count: timeArr[4] - timeArr[3],
             format: timeArr[5] - timeArr[4],
         },
+        route,
         public: ispublic,
         tokens,
         card: !!(loadTable?.card ?? (await getTemplate("card", templateName))),
-        actions: actionsParam || actions || ["view"],
+        actions: tokenData?.actions || actionsParam || actions || ["view"],
         total,
         filtered,
         count: rows.length,
@@ -555,7 +581,6 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
             })),
         });
     }
-    // console.log({ add: loadTable.table, form: loadTable.form });
     if (uid &&
         !config.security?.disableToken &&
         actions.includes("add") &&
@@ -563,8 +588,9 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         const addTokens = setToken({
             ids: [
                 JSON.stringify({
-                    table: tokenData?.table || hookData?.table || params.table,
+                    table: templateName,
                     form: loadTable?.form,
+                    obj: tokenData?.obj || hookData?.obj,
                 }),
             ],
             uid,
@@ -576,7 +602,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
         pg,
         table: loadTable?.table || tokenData?.table,
         id: tokenData?.id || hookData?.id || params.id,
-        template: tokenData?.table || hookData?.table || params.table,
+        template: templateName,
         payload: res,
         user,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.24",
+  "version": "2.0.26",
   "type": "module",
   "description": "core-plugins",
   "keywords": [