@opengis/fastify-table 1.4.27 → 1.4.28

package/package.json

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

package/server/routes/table/controllers/cardData.js

@@ -50,31 +50,7 @@ export default async function getCardData(req, reply) {
         return reply.status(403).send('access restricted: empty rows');
     }
 
-    const { rows = [] } = result;
-
-    // conditions
-    index.panels?.filter(el => el.items).forEach(el1 => {
-        el1.items = el1.items?.filter(item => conditions(item.conditions, rows[0]));
-    });
-
-    // title, count
-    index.panels?.filter(el => el.items).forEach(async el => {
-        const filtered = el.items.filter(item => item.count?.toLowerCase?.().includes('select'));
-
-        const data = await Promise.all(filtered.map(el1 => pg.query(el1.count).then(item => item.rows?.[0] || {})));
-
-        filtered.forEach((item1, i) => {
-            Object.assign(item1, data[i] || {}, data[i].count ? {} : { count: undefined });
-        });
-
-        const q = el.items.map((item2) => (item2.component ? components[item2.component] : null)).filter(item2 => item2).join(' union all ');
-
-        const counts = q && id
-            ? await pg.query(q, [id])
-                .then(e => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
-            : {};
-        el.items?.filter?.(item => item.component)?.forEach(item => Object.assign(item, { count: counts?.[item.component] }));
-    });
+    const { rows = [], panels } = result;
 
     // tokens result
     const tokens = {};
@@ -137,6 +113,7 @@ export default async function getCardData(req, reply) {
     return {
         time: Date.now() - time,
         ...index,
+        panels,
         tokens,
         vue,
         data,

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

@@ -17,14 +17,6 @@ const checkInline = {};
 const maxLimit = 100;
 const defaultLimit = 20;
 
-function getOrder(query, columnList, orderColumn, loadTable, orderDir, called) {
-  if (query?.order && called) { return `order by ${query.order}`; }
-  if (typeof orderColumn === 'string' && Array.isArray(columnList) && columnList.includes(orderColumn)) {
-    return `order by ${orderColumn} ${query?.desc || orderDir === 'desc' ? 'desc' : ''} nulls last`;
-  }
-  return `order by ${(loadTable?.order || 'true::boolean')} nulls last`;
-}
-
 export default async function dataAPI(req, reply, called) {
   const {
     pg = pgClients.client, params, headers = {}, query = {}, user = {}, contextQuery, sufix = true,
@@ -174,8 +166,9 @@ export default async function dataAPI(req, reply, called) {
   // id, query, filter
   const [orderColumn, orderDir] = (query.order || loadTable?.order || '').split(/[- ]/);
 
-  const order = getOrder(query, columnList, orderColumn, loadTable, orderDir, called);
-
+  const order = query.order && columnList.includes(orderColumn) && orderColumn?.length
+    ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''} nulls last`
+    : `order by ${(loadTable?.order || 'true::boolean')} nulls last`;
   const search = loadTable?.meta?.search && query.search
     ? `(${loadTable?.meta?.search?.split(',')?.map(el => `${el} ilike '%${query.search.replace(/%/g, '\\%').replace(/'/g, "''")}%'`).join(' or ')})`
     : null;
@@ -269,6 +262,7 @@ export default async function dataAPI(req, reply, called) {
   const { panels = [] } = index;
 
   const tokens = {};
+
   if (template && objectId) {
     // tokens result
     if (!config.security?.disableToken && index?.tokens && typeof index?.tokens === 'object' && !Array.isArray(index?.tokens)) {
@@ -300,19 +294,20 @@ export default async function dataAPI(req, reply, called) {
     });
 
     // title, count
-    panels?.filter(el => el.items).forEach(async el => {
+    await Promise.all(panels.filter(el => el.items).map(async el => {
       const filtered1 = el.items.filter(item => item.count?.toLowerCase?.().includes('select'));
-      const data = await Promise.all(filtered1.map(item => pg.query(item.count.replace(/{{id}}/g, params.id)).then(item1 => item1.rows[0] || {})));
+      const data = await Promise.all(filtered1.map(async item => pg.query(item.count.replace(/{{id}}/g, params.id)).then(item1 => item1.rows[0] || {})));
       filtered1.forEach((el1, i) => {
+        // el1.title = data[i].title;
         Object.assign(el1, data[i] || {}, data[i].count ? {} : { count: undefined });
       });
       const q1 = el.items.map((item) => (item.component ? components[item.component] : null)).filter(item => item).join(' union all ');
       const counts1 = q1 && id
-        ? await pg.query(q, [id])
+        ? await pg.query(q1, [id])
           .then(e => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
         : {};
       el.items?.filter?.(item => item.component)?.forEach(item => Object.assign(item, { count: counts1?.[item.component] }));
-    });
+    }));
 
     // data result
     const data = {};