@opengis/admin 0.2.104 → 0.2.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.2.104",
+  "version": "0.2.105",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

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

@@ -1,20 +1,22 @@
 import getData from '@opengis/fastify-table/server/routes/table/controllers/data.js';
-import { getOpt } from '@opengis/fastify-table/utils.js';
+import { getOpt, getMeta } 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 }
+        const { rows = [], fields = [] } = await req.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 };
     }
 
     // Це можна 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] || {}) : {};
+            .then(el => el.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]) : {};