@opengis/bi 1.0.37 → 1.0.38

package/server/plugins/vite.js

@@ -1,69 +1,69 @@
-import fs from 'fs';
-import path from 'path';
-import config from '../../config.js';
-
-const { disableAuth } = config;
-const isProduction = process.env.NODE_ENV === 'production';
-
-async function plugin(fastify) {
-  // vite server
-  if (!isProduction) {
-    const vite = await import('vite');
-
-    const viteServer = await vite.createServer({
-      server: {
-        middlewareMode: true,
-      },
-    });
-    // hot reload
-    viteServer.watcher.on('all', (d, t) => {
-      if (!t.includes('module') && !t.includes('templates')) return;
-      // console.log(d, t);
-      viteServer.ws.send({ type: 'full-reload' });
-    });
-
-    // this is middleware for vite's dev servert
-    fastify.addHook('onRequest', async (req, reply) => {
-      // const { user } = req.session?.passport || {};
-      const next = () => new Promise((resolve) => {
-        viteServer.middlewares(req.raw, reply.raw, () => resolve());
-      });
-      await next();
-    });
-    fastify.get('*', async () => {});
-    return;
-  }
-
-  // From Build
-  fastify.get('*', async (req, reply) => {
-    // console.log(disableAuth)
-    if (!req.user && !disableAuth) return reply.redirect('/login');
-    const stream = fs.createReadStream('dist/index.html');
-    return reply
-      .headers({ 'Cache-Control': 'public, no-cache' })
-      .type('text/html')
-      .send(stream);
-  });
-  fastify.get('/assets/:file', async (req, reply) => {
-    const stream = fs.createReadStream(`dist/assets/${req.params.file}`);
-    const ext = path.extname(req.params.file);
-    const mime = {
-      '.js': 'text/javascript',
-      '.css': 'text/css',
-      '.woff2': 'application/font-woff',
-      '.png': 'image/png',
-    }[ext];
-    // reply.cacheControl('max-age', '1d');
-    return mime
-      ? reply
-        .headers({
-          'Cache-Control': 'public, max-age=3600',
-          'Content-Encoding': 'identity',
-        })
-        .type(mime)
-        .send(stream)
-      : stream;
-  });
-}
-
-export default plugin;
+import fs from 'fs';
+import path from 'path';
+import config from '../../config.js';
+
+const { disableAuth } = config;
+const isProduction = process.env.NODE_ENV === 'production';
+
+async function plugin(fastify) {
+  // vite server
+  if (!isProduction) {
+    const vite = await import('vite');
+
+    const viteServer = await vite.createServer({
+      server: {
+        middlewareMode: true,
+      },
+    });
+    // hot reload
+    viteServer.watcher.on('all', (d, t) => {
+      if (!t.includes('module') && !t.includes('templates')) return;
+      // console.log(d, t);
+      viteServer.ws.send({ type: 'full-reload' });
+    });
+
+    // this is middleware for vite's dev servert
+    fastify.addHook('onRequest', async (req, reply) => {
+      // const { user } = req.session?.passport || {};
+      const next = () => new Promise((resolve) => {
+        viteServer.middlewares(req.raw, reply.raw, () => resolve());
+      });
+      await next();
+    });
+    fastify.get('*', async () => {});
+    return;
+  }
+
+  // From Build
+  fastify.get('*', async (req, reply) => {
+    // console.log(disableAuth)
+    if (!req.user && !disableAuth) return reply.redirect('/login');
+    const stream = fs.createReadStream('dist/index.html');
+    return reply
+      .headers({ 'Cache-Control': 'public, no-cache' })
+      .type('text/html')
+      .send(stream);
+  });
+  fastify.get('/assets/:file', async (req, reply) => {
+    const stream = fs.createReadStream(`dist/assets/${req.params.file}`);
+    const ext = path.extname(req.params.file);
+    const mime = {
+      '.js': 'text/javascript',
+      '.css': 'text/css',
+      '.woff2': 'application/font-woff',
+      '.png': 'image/png',
+    }[ext];
+    // reply.cacheControl('max-age', '1d');
+    return mime
+      ? reply
+        .headers({
+          'Cache-Control': 'public, max-age=3600',
+          'Content-Encoding': 'identity',
+        })
+        .type(mime)
+        .send(stream)
+      : stream;
+  });
+}
+
+export default plugin;

package/server/routes/dashboard/controllers/dashboard.js

@@ -59,8 +59,8 @@ export default async function dashboard({
 
     return {
       ...data || {},
-      widgets: data?.widgets?.filter(el => el?.widget_id) || [],
-      panels: data?.panels?.filter(el => el?.widget) || [],
+      widgets: data?.widgets?.filter?.(el => el?.widget_id) || [],
+      panels: data?.panels?.filter?.(el => el?.widget) || [],
       geom: !meta?.geom,
       error:
         table && !pg.pk?.[table] ? `table pkey not found: ${table}` : undefined,

package/server/routes/dashboard/controllers/dashboard.list.js

@@ -25,6 +25,7 @@ export default async function data({
 
   const res = {
     time: Date.now() - time,
+    db: pg.options?.database,
     rows: list,
   };
   return res;

package/server/routes/dashboard/controllers/utils/yaml.js

@@ -1,11 +1,11 @@
-import yaml from 'js-yaml';
-
-yaml.loadSafe = (yml) => {
-  try {
-    return yaml.load(yml);
-  } catch (err) {
-    return { error: err.toString() };
-  }
-};
-
-export default yaml;
+import yaml from 'js-yaml';
+
+yaml.loadSafe = (yml) => {
+  try {
+    return yaml.load(yml);
+  } catch (err) {
+    return { error: err.toString() };
+  }
+};
+
+export default yaml;

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

@@ -116,6 +116,7 @@ export default async function dataAPI(req, reply) {
     order,
     samples,
     xType,
+    fx: widgetData.fx,
   });
 
   if (query.sql) return sql;

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

@@ -20,6 +20,7 @@ function chart({
   order,
   samples,
   xType,
+  fx, // agg function
 }) {
   const xCol = x && xType?.includes('[]') ? `unnest(${x})` : x;
 
@@ -30,7 +31,7 @@ function chart({
         (el) =>
           `${metric} filter (where '${el.name.toString().replace(/'/g, "''")}'=${yType?.includes('[]') ? `any(${groupby.replace(/'/g, "''")}::text[])` : groupby.replace(/'/g, "''")}) as "${el.name.toString().replace(/'/g, "''")}"`
       )
-      .join(',') || `${metric} as metric`;
+      .join(',') || `${fx || metric} as metric`;
   const sql = `select ${xCol} ${x && xType?.includes('[]') ? `as ${x}` : ''}, ${metricData} 
     from ${table}
     where ${where} 

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

@@ -1,61 +1,61 @@
-function normalizeData(data, query = {}, columnTypes = []) {
-  const skip = [];
-  ['x', 'groupby', 'granularity'].forEach((el) => {
-    // console.log(el, query[el], columnTypes.find(col => col.name == query[el]))
-    if (!columnTypes.find((col) => col.name == query[el])) {
-      if (query[el] && query[el] !== 'null') skip.push(`column not found: ${query[el]}`);
-      if (!(el === 'groupby' && query[el] === 'null')) delete query[el];
-    }
-  });
-
-  if (
-    !columnTypes.find(
-      (col) => col.type === 'numeric' && col.name == query.metric
-    )
-  ) {
-    delete query.metric;
-  }
-
-  const xName = query.x || (Array.isArray(data.x) ? data.x[0] : data.x);
-  const xType = columnTypes.find((el) => el.name == xName)?.type;
-
-  const granularity =
-    xType === 'date' || xType?.includes('timestamp')
-      ? query.granularity || data.granularity || 'year'
-      : null;
-
-  const x =
-    (granularity
-      ? `date_trunc('${granularity}',${xName})::date::text`
-      : null) || xName;
-
-  const metrics = Array.isArray(data.metrics || data.metric) ? (data.metrics || data.metric) : [data.metrics || data.metric];
-  const metric =
-    (query.metric ? `sum(${query.metric})` : null) ||
-    (metrics.length
-      ? (metrics
-        ?.filter((el) => el && columnTypes.find((col) => col.name == (el?.name || el)))
-        ?.map((el) => el.fx || `${el.operator || 'sum'}(${el.name || el})`)?.join(',') || 'count(*)')
-      : 'count(*)');
-
-  const yName = metrics?.[0]?.name || metrics?.[0];
-  const yType = columnTypes.find((el) => el.name == yName)?.type;
-
-  const { cls, table, filterCustom } = data;
-  const groupby = (query.groupby || data.groupby) === 'null' ? null : (query.groupby || data.groupby);
-  // const orderby = query.orderby || data.orderby || 'count(*)';
-
-  const custom = query?.filterCustom
-    ?.split(',')
-    ?.map((el) => filterCustom?.find((item) => item?.name === el)?.sql)
-    ?.filter((el) => el)
-    ?.join(' and ');
-  const where = `${data.query || '1=1'} and ${custom || 'true'}`;
-
-  const tableSQL = data.tableSQL?.length
-    ? `(select * from ${data?.table} t ${data.tableSQL.join(' \n ')} where ${where})q`
-    : undefined;
-
-  return { x, cls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };
-}
-export default normalizeData;
+function normalizeData(data, query = {}, columnTypes = []) {
+  const skip = [];
+  ['x', 'groupby', 'granularity'].forEach((el) => {
+    // console.log(el, query[el], columnTypes.find(col => col.name == query[el]))
+    if (!columnTypes.find((col) => col.name == query[el])) {
+      if (query[el] && query[el] !== 'null') skip.push(`column not found: ${query[el]}`);
+      if (!(el === 'groupby' && query[el] === 'null')) delete query[el];
+    }
+  });
+
+  if (
+    !columnTypes.find(
+      (col) => col.type === 'numeric' && col.name == query.metric
+    )
+  ) {
+    delete query.metric;
+  }
+
+  const xName = query.x || (Array.isArray(data.x) ? data.x[0] : data.x);
+  const xType = columnTypes.find((el) => el.name == xName)?.type;
+
+  const granularity =
+    xType === 'date' || xType?.includes('timestamp')
+      ? query.granularity || data.granularity || 'year'
+      : null;
+
+  const x =
+    (granularity
+      ? `date_trunc('${granularity}',${xName})::date::text`
+      : null) || xName;
+
+  const metrics = Array.isArray(data.metrics || data.metric) ? (data.metrics || data.metric) : [data.metrics || data.metric];
+  const metric =
+    (query.metric ? `sum(${query.metric})` : null) ||
+    (metrics.length
+      ? (metrics
+        ?.filter((el) => el && columnTypes.find((col) => col.name == (el?.name || el)))
+        ?.map((el) => el.fx || `${el.operator || 'sum'}(${el.name || el})`)?.join(',') || 'count(*)')
+      : 'count(*)');
+
+  const yName = metrics?.[0]?.name || metrics?.[0];
+  const yType = columnTypes.find((el) => el.name == yName)?.type;
+
+  const { cls, table, filterCustom } = data;
+  const groupby = (query.groupby || data.groupby) === 'null' ? null : (query.groupby || data.groupby);
+  // const orderby = query.orderby || data.orderby || 'count(*)';
+
+  const custom = query?.filterCustom
+    ?.split(',')
+    ?.map((el) => filterCustom?.find((item) => item?.name === el)?.sql)
+    ?.filter((el) => el)
+    ?.join(' and ');
+  const where = `${data.query || '1=1'} and ${custom || 'true'}`;
+
+  const tableSQL = data.tableSQL?.length
+    ? `(select * from ${data?.table} t ${data.tableSQL.join(' \n ')} where ${where})q`
+    : undefined;
+
+  return { x, cls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };
+}
+export default normalizeData;

package/server/routes/edit/controllers/widget.edit.js

@@ -32,11 +32,10 @@ export default async function widgetEdit({ pg = pgClients.client, body, params }
         ?.reduce?.((acc, curr) => ({ ...acc, [curr]: data.data[curr] === 'null' ? null : data.data[curr] }), {})
     });
   }
-  const widgetData = ['style', 'data', 'type', 'title', 'controls']
+  const widgetData = ['style', 'data', 'type', 'title', 'controls', 'query', 'cls', 'x']
     .filter(el => data[el])
     .reduce((p, el) => ({ ...p, [el]: data[el] }), {});
 
-  //console.log(templateData)
   // get table
   const tableName = body.table || widgetData.data?.table_name || widgetData.data?.table || widgetData?.table_name || templateData.table;
   if (!tableName || !(pg.pk?.[tableName] || pgClients[widgetData?.data?.db || templateData?.db || 'client']?.pk?.[tableName])) {
@@ -76,6 +75,15 @@ export default async function widgetEdit({ pg = pgClients.client, body, params }
   if (widgetData.data?.type === 'text' && idx > -1) {
     widgets[idx].data.text = widgetData.data?.text;
   }
+  if (typeof widgetData?.query === 'string' && idx > -1) {
+    widgets[idx].data.query = widgetData.query;
+  }
+  if (typeof widgetData?.cls === 'string' && idx > -1) {
+    widgets[idx].data.cls = widgetData.cls;
+  }
+  if (typeof widgetData?.x === 'string' && idx > -1) {
+    widgets[idx].data.x = widgetData.x;
+  }
 
   await dataUpdate({
     pg,

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

@@ -1,110 +1,110 @@
-import { getFilterSQL, logger, pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getWidget } from '../../../../utils.js';
-
-import downloadClusterData from './utils/downloadClusterData.js';
-
-const clusterExists = {};
-
-export default async function cluster(req) {
-  const { query = {} } = req;
-  const { widget, filter, dashboard, search } = query;
-
-  if (!widget) {
-    return { message: 'not enough params: widget', status: 400 };
-  }
-
-  const { pg = req.pg || pgClients.client, data } = await getWidget({ pg: req.pg, dashboard, widget });
-
-  const pkey = pg.pk?.[data?.table];
-
-  if (!pkey) {
-    return {
-      message: `invalid ${widget ? 'widget' : 'dashboard'}: table pk not found (${data?.table})`,
-      status: 400,
-    };
-  }
-
-  // data param
-  const {
-    table,
-    query: where = '1=1',
-    metrics = [],
-    cluster,
-    clusterTable = {},
-  } = data;
-
-  if (!cluster) {
-    return {
-      message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
-      status: 400,
-    };
-  }
-
-  if (!metrics.length) {
-    return {
-      message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
-      status: 400,
-    };
-  }
-
-  if (!clusterTable?.name) {
-    Object.assign(clusterTable, {
-      name: 'bi.cluster',
-      title: 'title',
-      query: `type='${cluster}'`,
-    });
-  }
-
-  try {
-    if (cluster && !clusterExists[cluster]) {
-      const res = await downloadClusterData({ pg, cluster });
-      if (res) return res;
-      clusterExists[cluster] = 1;
-    }
-
-    if (clusterTable?.name && !pg.pk?.[clusterTable?.name]) {
-      return {
-        message: 'invalid widget params: clusterTable pkey not found',
-        status: 404,
-      };
-    }
-
-    const { bounds, extentStr } = await pg.query(`select count(*),
-      st_asgeojson(st_extent(geom))::json as bounds,
-      replace(regexp_replace(st_extent(geom)::box2d::text,'BOX\\(|\\)','','g'),' ',',') as "extentStr"
-    from ${table} where ${where || '1=1'}`).then((res) => res.rows?.[0] || {});
-    const extent = extentStr ? extentStr.split(',') : undefined;
-
-    // get sql
-    const { optimizedSQL } =
-      filter || search
-        ? await getFilterSQL({ pg, table, filter, search })
-        : {};
-
-    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, ${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;
-
-    // auto Index
-    //  autoIndex({ table, columns: (metrics || []).concat([cluster]) });
-
-    const { rows = [] } = await pg.query(q);
-    const vals = rows.map((el) => el.metric - 0).sort((a, b) => a - b);
-    const len = vals.length;
-    const sizes = [
-      vals[0],
-      vals[Math.floor(len / 4)],
-      vals[Math.floor(len / 2)],
-      vals[Math.floor(len * 0.75)],
-      vals[len - 1],
-    ];
-    return { sizes, rows, bounds, extent, count: rows.length, total: rows?.reduce((acc, curr) => (curr.metric || 0) + acc, 0) };
-  } catch (err) {
-    logger.file('bi/cluster/error', { error: err.toString(), query });
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { getFilterSQL, logger, pgClients } from '@opengis/fastify-table/utils.js';
+
+import { getWidget } from '../../../../utils.js';
+
+import downloadClusterData from './utils/downloadClusterData.js';
+
+const clusterExists = {};
+
+export default async function cluster(req) {
+  const { query = {} } = req;
+  const { widget, filter, dashboard, search } = query;
+
+  if (!widget) {
+    return { message: 'not enough params: widget', status: 400 };
+  }
+
+  const { pg = req.pg || pgClients.client, data } = await getWidget({ pg: req.pg, dashboard, widget });
+
+  const pkey = pg.pk?.[data?.table];
+
+  if (!pkey) {
+    return {
+      message: `invalid ${widget ? 'widget' : 'dashboard'}: table pk not found (${data?.table})`,
+      status: 400,
+    };
+  }
+
+  // data param
+  const {
+    table,
+    query: where = '1=1',
+    metrics = [],
+    cluster,
+    clusterTable = {},
+  } = data;
+
+  if (!cluster) {
+    return {
+      message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
+      status: 400,
+    };
+  }
+
+  if (!metrics.length) {
+    return {
+      message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
+      status: 400,
+    };
+  }
+
+  if (!clusterTable?.name) {
+    Object.assign(clusterTable, {
+      name: 'bi.cluster',
+      title: 'title',
+      query: `type='${cluster}'`,
+    });
+  }
+
+  try {
+    if (cluster && !clusterExists[cluster]) {
+      const res = await downloadClusterData({ pg, cluster });
+      if (res) return res;
+      clusterExists[cluster] = 1;
+    }
+
+    if (clusterTable?.name && !pg.pk?.[clusterTable?.name]) {
+      return {
+        message: 'invalid widget params: clusterTable pkey not found',
+        status: 404,
+      };
+    }
+
+    const { bounds, extentStr } = await pg.query(`select count(*),
+      st_asgeojson(st_extent(geom))::json as bounds,
+      replace(regexp_replace(st_extent(geom)::box2d::text,'BOX\\(|\\)','','g'),' ',',') as "extentStr"
+    from ${table} where ${where || '1=1'}`).then((res) => res.rows?.[0] || {});
+    const extent = extentStr ? extentStr.split(',') : undefined;
+
+    // get sql
+    const { optimizedSQL } =
+      filter || search
+        ? await getFilterSQL({ pg, table, filter, search })
+        : {};
+
+    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, ${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;
+
+    // auto Index
+    //  autoIndex({ table, columns: (metrics || []).concat([cluster]) });
+
+    const { rows = [] } = await pg.query(q);
+    const vals = rows.map((el) => el.metric - 0).sort((a, b) => a - b);
+    const len = vals.length;
+    const sizes = [
+      vals[0],
+      vals[Math.floor(len / 4)],
+      vals[Math.floor(len / 2)],
+      vals[Math.floor(len * 0.75)],
+      vals[len - 1],
+    ];
+    return { sizes, rows, bounds, extent, count: rows.length, total: rows?.reduce((acc, curr) => (curr.metric || 0) + acc, 0) };
+  } catch (err) {
+    logger.file('bi/cluster/error', { error: err.toString(), query });
+    return { error: err.toString(), status: 500 };
+  }
+}