@opengis/bi 1.2.29 → 1.2.30

package/dist/{vs-funnel-bar-BuV_pQBq.js → vs-funnel-bar-BOWwPnjW.js}

@@ -1,4 +1,4 @@
-import { _ as l, c as h, a as c, b as d, d as p } from "./import-file-C1s2X9Kt.js";
+import { _ as l, c as h, a as c, b as d, d as p } from "./import-file-B4o9p2_2.js";
 import { createElementBlock as u, openBlock as m } from "vue";
 const o = typeof window < "u" ? window.echarts : null, f = {
   name: "VsFunnelBar",

package/dist/{vs-list-uhEudqNr.js → vs-list-D8jGusRT.js}

@@ -1,5 +1,5 @@
 import { createBlock as b, openBlock as l, unref as L, mergeProps as v, createElementBlock as d, createElementVNode as c, withDirectives as F, toDisplayString as S, vShow as R, Fragment as P, renderList as V, normalizeClass as D, resolveComponent as A, createVNode as H } from "vue";
-import { e as x, X as J, _ as w } from "./import-file-C1s2X9Kt.js";
+import { e as x, X as J, _ as w } from "./import-file-B4o9p2_2.js";
 /**
  * @license lucide-vue-next v0.577.0 - ISC
  *

package/dist/{vs-map-qs7P1yfP.js → vs-map-BGplOwpB.js}

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

package/dist/{vs-map-cluster-CeJxLtZx.js → vs-map-cluster-CHQJV2As.js}

@@ -1,5 +1,5 @@
-import { _ as A, a as F, p as T, c as G, V as P, b as Z, d as q, e as D, l as K } from "./vs-list-uhEudqNr.js";
-import { e as W, _ as H, V as J, c as Q, g as U, h as X, i as Y } from "./import-file-C1s2X9Kt.js";
+import { _ as A, a as F, p as T, c as G, V as P, b as Z, d as q, e as D, l as K } from "./vs-list-D8jGusRT.js";
+import { e as W, _ as H, V as J, c as Q, g as U, h as X, i as Y } from "./import-file-B4o9p2_2.js";
 import { createElementBlock as g, createCommentVNode as S, openBlock as p, createElementVNode as l, normalizeClass as V, Fragment as R, renderList as N, toDisplayString as O, normalizeStyle as j, createBlock as z, unref as $, mergeProps as ee, resolveComponent as m, withDirectives as M, resolveDynamicComponent as te, createVNode as w, vShow as C } from "vue";
 /**
  * @license lucide-vue-next v0.577.0 - ISC

package/dist/{vs-number-BNnFUzs3.js → vs-number-jPqxFQ6d.js}

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

package/dist/{vs-table-BEvWIkoj.js → vs-table-BDgIvJbY.js}

@@ -1,4 +1,4 @@
-import { _ as m, c as f, b as _, d as b } from "./import-file-C1s2X9Kt.js";
+import { _ as m, c as f, b as _, d as b } from "./import-file-B4o9p2_2.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-CPMz7TWB.js → vs-text-DcHOffy9.js}

@@ -1,4 +1,4 @@
-import { _ as s, c as a, m as d } from "./import-file-C1s2X9Kt.js";
+import { _ as s, c as a, m as d } from "./import-file-B4o9p2_2.js";
 import { createElementBlock as n, openBlock as o, createCommentVNode as c } from "vue";
 const u = {
   name: "VsText",

package/package.json

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

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/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 };
+  }
+}