@opengis/admin 0.2.106 → 0.2.108

package/package.json

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

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

@@ -7,7 +7,7 @@ export default async function tableFilter(req) {
     const { uid } = user || {};
 
     if (!params.name) {
-        return { message: 'not enouggh params: name', status: 400 };
+        return { message: 'not enough params: name', status: 400 };
     }
 
     const loadTable = await getTemplate('table', params.name);
@@ -65,6 +65,11 @@ export default async function tableFilter(req) {
         Object.assign(el, { options });
     }));
 
+    const sqlList = loadTable?.sql
+        ?.filter((el) => !el.disabled && el?.sql?.replace)
+        ?.map((el, i) => ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name || `t${i + 1}`} on 1=1 `)
+        ?.join(' ') || '';
+
     // percentile_cont - alternative
     await Promise.all(filters.filter((el) => el.name && el.type === 'Range').map(async (el) => {
         const data = await pg.queryCache(`select array[
@@ -73,7 +78,7 @@ export default async function tableFilter(req) {
             percentile_disc(0.5) within group (order by ${el.name}),
             percentile_disc(0.75) within group (order by ${el.name}),
             max(${el.name})
-        ] as range from ${loadTable.table} where ${loadTable.query || '1=1'}`, { table: loadTable.table }).then(el => el.rows?.[0]?.range);
+        ] as range from ${loadTable.table} ${sqlList ? ` t ${sqlList}` : ''} where ${loadTable.query || '1=1'}`, { table: loadTable.table }).then(el => el.rows?.[0]?.range);
         Object.assign(el, { data });
     }));