@opengis/bi 1.0.30 → 1.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "BI data visualization module",
   "main": "dist/bi.js",
   "browser": "dist/bi.umd.cjs",

package/plugin.js

@@ -1,14 +1,22 @@
 import fp from 'fastify-plugin';
-import config from './config.js';
+import path from 'node:path';
+import { fileURLToPath } from 'url';
 
-config.prefix = config.prefix || '/api';
-async function plugin(fastify, opts = config) {
-  // API
+import { config, addTemplateDir, execMigrations } from '@opengis/fastify-table/utils.js';
+
+const fileName = fileURLToPath(import.meta.url);
+const dirName = path.dirname(fileName);
+
+async function plugin(fastify, opt) {
   fastify.register(import('./server/routes/dashboard/index.mjs'), config);
   fastify.register(import('./server/routes/dataset/index.mjs'), config);
 
   fastify.register(import('./server/routes/data/index.mjs'), config);
   fastify.register(import('./server/routes/edit/index.mjs'), config);
-}
+  fastify.register(import('./server/routes/map/index.mjs'), config);
+  config.templates?.forEach(el => addTemplateDir(el));
 
+  const dir = path.join(dirName, 'server/migrations');
+  execMigrations(dir).catch(err => console.log(err));
+}
 export default fp(plugin);

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

@@ -141,7 +141,7 @@ export default async function dataAPI(req, reply) {
     rows
       .filter((row) => row[x])
       .forEach((row) => {
-        Object.assign(row, { [x]: vals?.[row[x]] || row[x] });
+        Object.assign(row, { [x]: vals?.[row[x]]?.text || vals?.[row[x]] || row[x] });
       });
   }
 

package/server/routes/map/controllers/cluster.js

@@ -82,10 +82,10 @@ export default async function cluster(req) {
         ? await getFilterSQL({ pg, table, filter, search })
         : {};
 
-    const q = `select "${cluster}" as name, sum("${metrics[0]}")::float as metric 
+    const q = `select b.*, ${clusterTable?.operator || 'sum'}("${metrics[0]}")::float as metric 
         from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
-        left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id from ${clusterTable?.name} where ${clusterTable?.title}=q."${cluster}" limit 1)b on 1=1
-        where ${where} group by ${cluster}, b.id order by sum("${metrics[0]}")::float desc`;
+        left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id, ${clusterTable?.column || cluster} as name, ${clusterTable?.title} as title from ${clusterTable?.name} where ${clusterTable?.codifierColumn || 'codifier'}=q."${clusterTable?.column || cluster}" limit 1)b on 1=1
+        where ${where} group by b.id, b.name, b.title order by ${clusterTable?.operator || 'sum'}("${metrics[0]}")::float desc`;
 
     if (query.sql === '1') return q;
 

package/server/routes/map/controllers/clusterVtile.js

@@ -4,7 +4,7 @@ import path from 'path';
 import { createHash } from 'crypto';
 import { writeFile, mkdir } from 'fs/promises';
 
-import { getFolder, getFilterSQL, autoIndex, pgClients } from '@opengis/fastify-table/utils.js';
+import { logger, getFolder, getFilterSQL, autoIndex, pgClients } from '@opengis/fastify-table/utils.js';
 
 import { getWidget } from '../../../../utils.js';
 
@@ -105,14 +105,14 @@ export default async function clusterVtile(req, reply) {
         ? await getFilterSQL({ pg, table, filter, search })
         : {};
 
-    const q = `select "${cluster}" as name, sum("${metrics[0]}")::float as metric, b.* 
+    const q = `select ${clusterTable?.column || cluster} as name, ${clusterTable?.operator || 'sum'}("${metrics[0]}")::float as metric, b.* 
         from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
-            left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id,
+            left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id, ${clusterTable?.title} as title,
                 ${clusterTable?.geom || 'geom'} as geom from ${clusterTable?.name} 
-                where ${clusterTable?.query || '1=1'} and ${clusterTable?.title}=q."${cluster}" limit 1
+                where ${clusterTable?.query || '1=1'} and ${clusterTable?.codifierColumn || 'codifier'}=q."${clusterTable?.column || cluster}" limit 1
             )b on 1=1 
         where ${where} group by 
-        ${cluster}, b.id, b.${clusterTable?.geom || 'geom'}`;
+        q."${clusterTable?.column || cluster}", b.id, b.title, b.geom`;
 
     if (query.sql === '1') return q;
 
@@ -129,7 +129,7 @@ export default async function clusterVtile(req, reply) {
                 SELECT  
                 floor(random() * 100000 + 1)::int + row_number() over() as row,
 
-                ${pg.pk?.[clusterTable?.name] ? 'id,' : ''} name, metric,
+                ${pg.pk?.[clusterTable?.name] ? 'id,' : ''} name, metric, title,
 
                 ST_AsMVTGeom(st_transform(${geomCol}, 3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom