@opengis/admin 0.3.28 → 0.3.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.3.28",
+  "version": "0.3.30",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -48,8 +48,8 @@
     "@fullcalendar/vue3": "^6.1.15",
     "@opengis/fastify-auth": "^1.0.73",
     "@opengis/fastify-file": "^1.0.42",
-    "@opengis/fastify-table": "^1.2.63",
-    "@opengis/v3-core": "^0.3.58",
+    "@opengis/fastify-table": "^1.2.77",
+    "@opengis/v3-core": "^0.3.90",
     "@opengis/v3-filter": "^0.0.72",
     "@tabler/icons-vue": "^3.28.1",
     "@tiptap/core": "^2.8.0",

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

@@ -1,32 +1,43 @@
-import getData from '@opengis/fastify-table/server/routes/table/controllers/data.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 = [], 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(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]) : {};
-
-
-    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 { getOpt, getMeta, getTemplate, getData, pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function getTableData(req) {
+    const { user = {}, params = {}, query = {}, pg = pgClients.client } = req;
+    const { filter, limit, page, search, sql } = query || {};
+    const { id } = params || {};
+
+    const tokenData = await getOpt(params.table, user?.uid);
+
+    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({ id, table: tokenData.table, pg, filter, limit, page, search, user, sql });
+        return resp;
+    }
+
+    // Це можна 1 раз на старті 
+    const interfaceName = req.headers?.referer?.match(/.*\/([^?]+)/)?.[1];
+    const { query: interfaceQuery } = interfaceName ?
+        await pg.query(`select query from admin.routes where route_id=$1`, [interfaceName])
+            .then(el => el.rows?.[0] || {}) : {};
+
+    // це можна від користувача
+    const { rows = [] } = pg.pk?.['admin.rules'] ? await 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)`, [params.table, user.uid]) : {};
+
+    const context = rows.filter(el => el.rule_values).map(el => `${el.attr} = any ('{${el.rule_values}}')`).join(' and ');
+    const contextQuery = [interfaceQuery, context].filter(el => el).join(' and ') || ' 2=2 ';
+
+    const res = await getData({
+        id, table: params.table, pg, filter, limit, page, search, user, sql, contextQuery,
+    });
+    // console.log('contextQuery', contextQuery);
+
+    return res;
+
 }