@opengis/bi 1.2.2 → 1.2.4

package/dist/{vs-funnel-bar-T330oJNS.js → vs-funnel-bar-BdVcgrYG.js}

@@ -1,4 +1,4 @@
-import { _ as n, c, a as o, b as h, d as l } from "./import-file-D8jh74Dz.js";
+import { _ as n, c, a as o, b as h, d as l } from "./import-file-MEpI7PGd.js";
 import { createElementBlock as d, openBlock as p } from "vue";
 const u = {
   name: "VsFunnelBar",

package/dist/{vs-list-DeHF_Oaf.js → vs-list-_1Ub562I.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as l, openBlock as h, createStaticVNode as V, createElementVNode as a, withDirectives as B, toDisplayString as L, vShow as P, Fragment as z, renderList as S, normalizeClass as G, resolveComponent as j, createVNode as D } from "vue";
-import { _ as p } from "./import-file-D8jh74Dz.js";
+import { _ as p } from "./import-file-MEpI7PGd.js";
 function N(t) {
   return [
     {

package/dist/{vs-map-Skt608pM.js → vs-map-BQwf_Vmm.js}

@@ -1,5 +1,5 @@
-import { c as E, l as L, p as $, V as T, a as B, b as H, d as O, e as F } from "./vs-list-DeHF_Oaf.js";
-import { _ as V, c as N } from "./import-file-D8jh74Dz.js";
+import { c as E, l as L, p as $, V as T, a as B, b as H, d as O, e as F } from "./vs-list-_1Ub562I.js";
+import { _ as V, c as N } from "./import-file-MEpI7PGd.js";
 import { resolveComponent as u, createElementBlock as p, openBlock as i, Fragment as w, createElementVNode as l, createBlock as C, createCommentVNode as m, createVNode as x, Teleport as P, toDisplayString as f, renderList as S, normalizeStyle as k, normalizeClass as I } from "vue";
 const R = {
   components: { legendIcon: L, closeIcon: E },

package/dist/{vs-map-cluster-BRUiY_90.js → vs-map-cluster-Bu0fgucv.js}

@@ -1,5 +1,5 @@
-import { c as F, l as G, p as T, b as A, V as P, a as Z, d as q, e as D } from "./vs-list-DeHF_Oaf.js";
-import { _ as x, V as K, c as W, e as j } from "./import-file-D8jh74Dz.js";
+import { c as F, l as G, p as T, b as A, V as P, a as Z, d as q, e as D } from "./vs-list-_1Ub562I.js";
+import { _ as x, V as K, c as W, e as j } from "./import-file-MEpI7PGd.js";
 import { createElementBlock as p, createCommentVNode as S, openBlock as c, createElementVNode as r, normalizeClass as I, Fragment as N, renderList as R, toDisplayString as O, normalizeStyle as J, createStaticVNode as Q, resolveComponent as g, withDirectives as M, createBlock as k, resolveDynamicComponent as U, createVNode as z, vShow as C } from "vue";
 const X = {
   components: { legendIcon: G, closeIcon: F },

package/dist/{vs-number-Dd_21nn-.js → vs-number-Dke5ThxE.js}

@@ -1,4 +1,4 @@
-import { _ as c, c as o, f as n } from "./import-file-D8jh74Dz.js";
+import { _ as c, c as o, f as n } from "./import-file-MEpI7PGd.js";
 import { createElementBlock as i, openBlock as m, toDisplayString as s } from "vue";
 const u = {
   name: "VsNumber",

package/dist/{vs-table-BwC29Zyc.js → vs-table-C95epuWz.js}

@@ -1,4 +1,4 @@
-import { _ as m, c as f, b as _, d as b } from "./import-file-D8jh74Dz.js";
+import { _ as m, c as f, b as _, d as b } from "./import-file-MEpI7PGd.js";
 import { createElementBlock as a, openBlock as r, createElementVNode as s, Fragment as n, renderList as c, toDisplayString as d } from "vue";
 const x = {
   name: "VsTable",

package/dist/{vs-text-DEJjWxDu.js → vs-text-DAq6rCjJ.js}

@@ -1,7 +1,7 @@
 var ge = Object.defineProperty;
 var ke = (c, e, t) => e in c ? ge(c, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[e] = t;
 var k = (c, e, t) => ke(c, typeof e != "symbol" ? e + "" : e, t);
-import { _ as de, c as xe } from "./import-file-D8jh74Dz.js";
+import { _ as de, c as xe } from "./import-file-MEpI7PGd.js";
 import { createElementBlock as V, openBlock as J, createCommentVNode as be } from "vue";
 function Q() {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "BI data visualization module",
   "main": "dist/bi.js",
   "browser": "dist/bi.umd.cjs",
@@ -12,6 +12,7 @@
     "utils.js"
   ],
   "scripts": {
+    "patch": "npm version patch && git push && npm publish",
     "prepublishOnly": "npm run build",
     "debug": "node --watch-path=server server",
     "dev": "vite",
@@ -75,4 +76,4 @@
     "typescript-eslint": "~8.8.1",
     "vue-tsc": "^2.1.6"
   }
-}
+}

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/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

@@ -23,12 +23,12 @@ export default async function dataAPI(req, reply) {
 
   const { query = {}, user = {}, unittest } = req;
 
-  query.metric = Array.isArray(query.metric) ? query.metric.pop() : query.metric;
-
   const { dashboard, widget, filter, search, samples } = query;
 
   const widgetData = await getWidget({ pg: req.pg, dashboard, widget });
 
+  query.metric = Array.isArray(query.metric) ? query.metric.pop() : query.metric || widgetData?.metric || widgetData?.data?.metrics?.[0]?.fx;
+
   if (widgetData.status) return widgetData;
 
   const { type, text, data = {}, controls, style, options } = widgetData;

package/server/routes/data/index.mjs

@@ -26,7 +26,13 @@ export default async function route(fastify, opts) {
     method: 'GET',
     url: '/bi-data',
     schema: biSchema,
-    config: { policy },
+    config: {
+      policy,
+      rateLimit: {
+        max: 3000,
+        timeWindow: '1 minute',
+      }
+    },
     handler: data,
   });
 }

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

@@ -1,125 +1,125 @@
-import { getFilterSQL, logger, pgClients, getMeta } 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, reply) {
-  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, style, controls } = 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 { columns = [] } = await getMeta({ pg, table });
-    const columnList = columns.map(el => el.name);
-
-    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 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} ${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 ${multipleMetricsOrder || metricFunc} 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, style, controls, metrics, rows, columns: columns.map(({ name, title, dataTypeID }) => ({ name, title, type: pg.pgType[dataTypeID] })), 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, getMeta } 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, reply) {
+  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, style, controls } = 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 { columns = [] } = await getMeta({ pg, table });
+    const columnList = columns.map(el => el.name);
+
+    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 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} ${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 ${multipleMetricsOrder || metricFunc} 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, style, controls, metrics, rows, columns: columns.map(({ name, title, dataTypeID }) => ({ name, title, type: pg.pgType[dataTypeID] })), 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 };
+  }
+}