@opengis/bi 1.0.47 → 1.0.48

package/package.json

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

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

@@ -4,6 +4,7 @@ import {
   config,
   autoIndex,
   pgClients,
+  getSelect,
   getSelectVal,
   getFilterSQL,
   getMeta,
@@ -43,7 +44,7 @@ export default async function dataAPI(req, reply) {
   }));
 
   // data param
-  const { x, cls, metric, table, where, tableSQL, groupby, xName, yName, xType, yType, error } =
+  const { x, cls, groupbyCls, metric, table, where, tableSQL, groupby, xName, yName, xType, yType, error } =
     normalizeData(widgetData, query, columnTypes);
 
   if (error) { return reply.status(400).send(error); }
@@ -106,7 +107,7 @@ export default async function dataAPI(req, reply) {
   }
 
   const sql = widgetData.sql ? optimizedSQL : (chartSQL[type] || chartSQL.chart)({
-    where,
+    where: config.local && user?.user_type === 'superadmin' ? 'true' : where, // test
     metric,
     yType, // metric type
     columns: widgetData.columns,
@@ -147,6 +148,21 @@ export default async function dataAPI(req, reply) {
     return { errorSql: err.toString() };
   }); // test with limit
 
+  if (groupbyCls) {
+    const { arr = [] } = await getSelect(groupbyCls, pg) || {};
+    if (arr.length) {
+      const ids = arr.map(el => el.id);
+      const text = arr.reduce((acc, curr) => ({ ...acc, [curr.id]: curr.text }), {});
+      rows.forEach(row => {
+        ids.reduce((acc, curr) => {
+          Object.assign(row, { [text[curr]]: row[curr] });
+          delete row[curr];
+          return acc;
+        }, {});
+      });
+    }
+  }
+
   if (cls) {
     const values = rows
       .map((row) => row[x])

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

@@ -45,7 +45,7 @@ function normalizeData(data, query = {}, columnTypes = []) {
   const yName = metrics?.[0]?.name || metrics?.[0];
   const yType = columnTypes.find((el) => el.name == yName)?.type;
 
-  const { cls, table, filterCustom } = data;
+  const { cls, groupbyCls, table, filterCustom } = data;
   const groupby = (query.groupby || data.groupby) === 'null' ? null : (query.groupby || data.groupby);
   // const orderby = query.orderby || data.orderby || 'count(*)';
 
@@ -60,6 +60,6 @@ function normalizeData(data, query = {}, columnTypes = []) {
     ? `(select * from ${data?.table} t ${data.tableSQL || ''} where ${where})q`
     : undefined;
 
-  return { x, cls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };
+  return { x, cls, groupbyCls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };
 }
 export default normalizeData;

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

@@ -85,18 +85,22 @@ export default async function cluster(req, reply) {
     const { columns = [] } = await getMeta({ pg, table });
     const columnList = columns.map(el => el.name);
 
-    if (query.metric && query.metric !== 'count' && !columnList.includes(query.metric)) {
-      return reply.status(404).send(`metric column not found: ${query.metric}`);
+    if (query.metric && typeof query.metric === 'string') {
+      const checkInvalid = query.metric.split(',').find(el => !columnList.includes(el) && el !== 'count');
+      if (checkInvalid) {
+        return reply.status(404).send(`invalid query metric value: ${checkInvalid}`);
+      }
     }
 
-    const metricFunc = (columnList.includes(query.metric) ? `sum(${query.metric.replace(/'/g, "''")})::float` : null)
-      || ({ count: 'count(*)' }[query.metric])
+    const multipleMetrics = query.metric ? query.metric.split(',').map(el => el === 'count' ? 'count(*)' : `sum(${el.replace(/'/g, "''")})::float as ${el}`).join(',') : null;
+    const multipleMetricsOrder = query.metric ? query.metric.split(',').map(el => el === 'count' ? 'count(*)' : `sum(${el.replace(/'/g, "''")})::float`).join(',') : null;
+    const metricFunc = multipleMetrics
       || `${clusterTable?.operator || 'sum'}("${metrics[0]}")::float`;
 
-    const q = `select b.*, ${metricFunc} as metric 
+    const q = `select b.*, ${metricFunc} ${multipleMetrics ? '' : 'as metric'} 
         from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
         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 ${metricFunc} desc`;
+        where ${where} group by b.id, b.name, b.title order by ${multipleMetricsOrder || metricFunc} desc`;
 
     if (query.sql === '1') return q;
 

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

@@ -6,7 +6,7 @@ export default async function map(req) {
   const { query = {} } = req;
   const { dashboard, widget } = query;
 
-  const { pg = req.pg || pgClients.client, data, type, layers } = await getWidget({ pg: req.pg, dashboard, widget });
+  const { pg = req.pg || pgClients.client, data, type, layers, style, controls } = await getWidget({ pg: req.pg, dashboard, widget });
 
   if (!['map'].includes(type)) {
     return { message: 'access restricted: invalid widget type', status: 403 };
@@ -57,6 +57,8 @@ export default async function map(req) {
 
   Object.assign(res, {
     layers,
+    style,
+    controls,
     columns: data.columns,
     bounds, // Map bounds
     extent,