@opengis/bi 1.0.19 → 1.0.21

package/dist/{vs-calendar-D98bcwCO.js → vs-calendar-B9vXdsaG.js}

@@ -1,4 +1,4 @@
-import { _ as l, c, i as h, t as p, h as d } from "./import-file-BJjgK8Hl.js";
+import { _ as l, c, i as h, t as p, h as d } from "./import-file-C8BY90-b.js";
 import { openBlock as u, createElementBlock as m } from "vue";
 const D = {
   name: "VsCalendar",

package/dist/{vs-funnel-bar-Ps4AevXk.js → vs-funnel-bar-Cj0O8tIf.js}

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

package/dist/{vs-heatmap-DQ4l7XOD.js → vs-heatmap-C9oFph_f.js}

@@ -1,4 +1,4 @@
-import { _ as u, c as m, a as d, i as f, t as x, e as y, g as c, d as D } from "./import-file-BJjgK8Hl.js";
+import { _ as u, c as m, a as d, i as f, t as x, e as y, g as c, d as D } from "./import-file-C8BY90-b.js";
 import { openBlock as _, createElementBlock as g } from "vue";
 const w = {
   name: "VsHeatmap",

package/dist/{vs-map-C36n66Hj.js → vs-map-WOn0RAU7.js}

@@ -1,5 +1,5 @@
-import { l as g, m as M } from "./map-component-mixin-BDeshFZi.js";
-import { _ as w, c as y } from "./import-file-BJjgK8Hl.js";
+import { l as g, m as M } from "./map-component-mixin-CFtShPun.js";
+import { _ as w, c as y } from "./import-file-C8BY90-b.js";
 import { resolveComponent as i, openBlock as u, createElementBlock as _, createElementVNode as r, createBlock as V, createCommentVNode as v, createVNode as d } from "vue";
 const x = {
   mixins: [y, g, M],

package/dist/{vs-map-cluster-Bcjcul0f.js → vs-map-cluster-RJa6sNfI.js}

@@ -1,5 +1,5 @@
-import { l as w, m as V, p as _ } from "./map-component-mixin-BDeshFZi.js";
-import { _ as v, c as C } from "./import-file-BJjgK8Hl.js";
+import { l as w, m as V, p as _ } from "./map-component-mixin-CFtShPun.js";
+import { _ as v, c as C } from "./import-file-C8BY90-b.js";
 import { resolveComponent as a, openBlock as h, createElementBlock as $, createVNode as s, createElementVNode as u, createBlock as x, createCommentVNode as L } from "vue";
 const k = {
   mixins: [C, w, V],

package/dist/{vs-number-XzxJiWRu.js → vs-number-BG0szZL-.js}

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

package/dist/{vs-text-DWhTWJlt.js → vs-text-Kwl3-0yy.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-BJjgK8Hl.js";
+import { _ as de, c as xe } from "./import-file-C8BY90-b.js";
 import { openBlock as V, createElementBlock as J, createCommentVNode as be } from "vue";
 function Q() {
   return {
@@ -289,7 +289,7 @@ ${p}` : p;
 `, 1)[0], x = !p.trim(), d = 0;
         if (this.options.pedantic ? (d = 2, a = p.trimStart()) : x ? d = t[1].length + 1 : (d = t[2].search(/[^ ]/), d = d > 4 ? 1 : d, a = p.slice(d), d += t[1].length), x && /^[ \t]*$/.test(g) && (h += g + `
 `, e = e.substring(g.length + 1), o = !0), !o) {
-          const Z = new RegExp(`^ {0,${Math.min(3, d - 1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ 	][^\\n]*)?(?:\\n|$))`), W = new RegExp(`^ {0,${Math.min(3, d - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`), X = new RegExp(`^ {0,${Math.min(3, d - 1)}}(?:\`\`\`|~~~)`), G = new RegExp(`^ {0,${Math.min(3, d - 1)}}#`), fe = new RegExp(`^ {0,${Math.min(3, d - 1)}}<[a-z].*>`, "i");
+          const Z = new RegExp(`^ {0,${Math.min(3, d - 1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ 	][^\\n]*)?(?:\\n|$))`), W = new RegExp(`^ {0,${Math.min(3, d - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`), X = new RegExp(`^ {0,${Math.min(3, d - 1)}}(?:\`\`\`|~~~)`), G = new RegExp(`^ {0,${Math.min(3, d - 1)}}#`), fe = new RegExp(`^ {0,${Math.min(3, d - 1)}}<(?:[a-z].*>|!--)`, "i");
           for (; e; ) {
             const M = e.split(`
 `, 1)[0];
@@ -647,7 +647,7 @@ const Re = /^(?:[ \t]*(?:\n|$))+/, _e = /^((?: {4}| {0,3}\t)[^\n]+(?:\n(?:[ \t]*
   lheading: /^(.+?)\n {0,3}(=+|-+) *(?:\n+|$)/,
   paragraph: f(j).replace("hr", E).replace("heading", ` *#{1,6} *[^
 ]`).replace("lheading", oe).replace("|table", "").replace("blockquote", " {0,3}>").replace("|fences", "").replace("|list", "").replace("|html", "").replace("|tag", "").getRegex()
-}, ce = /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/, Pe = /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/, he = /^( {2,}|\\)\n(?!\s*$)/, Ze = /^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\<!\[`*_]|\b_|$)|[^ ](?= {2,}\n)))/, L = "\\p{P}\\p{S}", Me = f(/^((?![*_])[\spunctuation])/, "u").replace(/punctuation/g, L).getRegex(), De = /\[[^[\]]*?\]\([^\(\)]*?\)|`[^`]*?`|<[^<>]*?>/g, Qe = f(/^(?:\*+(?:((?!\*)[punct])|[^\s*]))|^_+(?:((?!_)[punct])|([^\s_]))/, "u").replace(/punct/g, L).getRegex(), je = f("^[^_*]*?__[^_*]*?\\*[^_*]*?(?=__)|[^*]+(?=[^*])|(?!\\*)[punct](\\*+)(?=[\\s]|$)|[^punct\\s](\\*+)(?!\\*)(?=[punct\\s]|$)|(?!\\*)[punct\\s](\\*+)(?=[^punct\\s])|[\\s](\\*+)(?!\\*)(?=[punct])|(?!\\*)[punct](\\*+)(?!\\*)(?=[punct])|[^punct\\s](\\*+)(?=[^punct\\s])", "gu").replace(/punct/g, L).getRegex(), Oe = f("^[^_*]*?\\*\\*[^_*]*?_[^_*]*?(?=\\*\\*)|[^_]+(?=[^_])|(?!_)[punct](_+)(?=[\\s]|$)|[^punct\\s](_+)(?!_)(?=[punct\\s]|$)|(?!_)[punct\\s](_+)(?=[^punct\\s])|[\\s](_+)(?!_)(?=[punct])|(?!_)[punct](_+)(?!_)(?=[punct])", "gu").replace(/punct/g, L).getRegex(), He = f(/\\([punct])/, "gu").replace(/punct/g, L).getRegex(), Ne = f(/^<(scheme:[^\s\x00-\x1f<>]*|email)>/).replace("scheme", /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/).replace("email", /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/).getRegex(), Ue = f(H).replace("(?:-->|$)", "-->").getRegex(), Fe = f("^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>").replace("comment", Ue).replace("attribute", /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/).getRegex(), B = /(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/, We = f(/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/).replace("label", B).replace("href", /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/).replace("title", /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/).getRegex(), pe = f(/^!?\[(label)\]\[(ref)\]/).replace("label", B).replace("ref", O).getRegex(), ue = f(/^!?\[(ref)\](?:\[\])?/).replace("ref", O).getRegex(), Xe = f("reflink|nolink(?!\\()", "g").replace("reflink", pe).replace("nolink", ue).getRegex(), U = {
+}, ce = /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/, Pe = /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/, he = /^( {2,}|\\)\n(?!\s*$)/, Ze = /^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\<!\[`*_]|\b_|$)|[^ ](?= {2,}\n)))/, L = "\\p{P}\\p{S}", Me = f(/^((?![*_])[\spunctuation])/, "u").replace(/punctuation/g, L).getRegex(), De = /\[[^[\]]*?\]\((?:\\.|[^\\\(\)]|\((?:\\.|[^\\\(\)])*\))*\)|`[^`]*?`|<[^<>]*?>/g, Qe = f(/^(?:\*+(?:((?!\*)[punct])|[^\s*]))|^_+(?:((?!_)[punct])|([^\s_]))/, "u").replace(/punct/g, L).getRegex(), je = f("^[^_*]*?__[^_*]*?\\*[^_*]*?(?=__)|[^*]+(?=[^*])|(?!\\*)[punct](\\*+)(?=[\\s]|$)|[^punct\\s](\\*+)(?!\\*)(?=[punct\\s]|$)|(?!\\*)[punct\\s](\\*+)(?=[^punct\\s])|[\\s](\\*+)(?!\\*)(?=[punct])|(?!\\*)[punct](\\*+)(?!\\*)(?=[punct])|[^punct\\s](\\*+)(?=[^punct\\s])", "gu").replace(/punct/g, L).getRegex(), Oe = f("^[^_*]*?\\*\\*[^_*]*?_[^_*]*?(?=\\*\\*)|[^_]+(?=[^_])|(?!_)[punct](_+)(?=[\\s]|$)|[^punct\\s](_+)(?!_)(?=[punct\\s]|$)|(?!_)[punct\\s](_+)(?=[^punct\\s])|[\\s](_+)(?!_)(?=[punct])|(?!_)[punct](_+)(?!_)(?=[punct])", "gu").replace(/punct/g, L).getRegex(), He = f(/\\([punct])/, "gu").replace(/punct/g, L).getRegex(), Ne = f(/^<(scheme:[^\s\x00-\x1f<>]*|email)>/).replace("scheme", /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/).replace("email", /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/).getRegex(), Ue = f(H).replace("(?:-->|$)", "-->").getRegex(), Fe = f("^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>").replace("comment", Ue).replace("attribute", /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/).getRegex(), B = /(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/, We = f(/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/).replace("label", B).replace("href", /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/).replace("title", /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/).getRegex(), pe = f(/^!?\[(label)\]\[(ref)\]/).replace("label", B).replace("ref", O).getRegex(), ue = f(/^!?\[(ref)\](?:\[\])?/).replace("ref", O).getRegex(), Xe = f("reflink|nolink(?!\\()", "g").replace("reflink", pe).replace("nolink", ue).getRegex(), U = {
   _backpedal: I,
   // only used for GFM url
   anyPunctuation: He,
@@ -677,7 +677,7 @@ const Re = /^(?:[ \t]*(?:\n|$))+/, _e = /^((?: {4}| {0,3}\t)[^\n]+(?:\n(?:[ \t]*
   escape: f(ce).replace("])", "~|])").getRegex(),
   url: f(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/, "i").replace("email", /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/).getRegex(),
   _backpedal: /(?:[^?!.,:;*_'"~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_'"~)]+(?!$))+/,
-  del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
+  del: /^(~~?)(?=[^\s~])((?:\\.|[^\\])*?(?:\\.|[^\s~\\]))\1(?=[^~]|$)/,
   text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/
 }, Ve = {
   ...D,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "BI data visualization module",
   "main": "dist/bi.js",
   "browser": "dist/bi.umd.cjs",
@@ -50,7 +50,7 @@
     "@opengis/fastify-auth": "^1.0.50",
     "@opengis/fastify-file": "^1.0.32",
     "@opengis/fastify-table": "^1.1.93",
-    "@opengis/v3-core": "^0.2.65",
+    "@opengis/v3-core": "^0.3.8",
     "@opengis/v3-filter": "^0.0.39",
     "@turf/turf": "^7.1.0",
     "@vueuse/core": "^11.1.0",
@@ -92,4 +92,4 @@
     "vitepress-sidebar": "^1.22.0",
     "vue-tsc": "^2.1.6"
   }
-}
+}

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

@@ -91,6 +91,17 @@ export default async function dashboard({
       }
     }));
   }
+  const ranges = index?.filters?.filter((el) => el?.id && columns.map((el) => el?.name).includes(el?.id) && el?.type === 'Range');
+  if (ranges?.length) {
+    await Promise.all(ranges.map(async (el) => {
+    const rows = await pg.query(`select array[
+        percentile_cont(0) within group (order by ${el.id}), percentile_cont(0.25) within group (order by ${el.id}), 
+        percentile_cont(0.5) within group (order by ${el.id}), percentile_cont(0.75) within group (order by ${el.id}), 
+        percentile_cont(1.0) within group (order by ${el.id})
+      ] from ${index?.table_name || index?.table}`).then(el => el.rows?.[0]?.array || []);
+      Object.assign(el, { options: rows });
+    }));
+  }
 
   // console.log(fileData)
   const widgets = fileData

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

@@ -7,6 +7,7 @@ import {
   pgClients,
   getSelectVal,
   getFilterSQL,
+  getMeta,
 } from '@opengis/fastify-table/utils.js';
 
 import chartSQL from './util/chartSQL.js';
@@ -53,6 +54,19 @@ export default async function dataAPI({ query = {} }) {
     }).catch((err) => console.log(err));
   }
 
+  const { pk, columns = [], view } = await getMeta({ pg, table: data.table });
+
+  if (!view && !pk) {
+    return { message: `table not found: ${data.table} (${pg.options?.database})`, status: 404 };
+  }
+
+  const columnList = columns.map(col => col.name);
+  const groupbyColumnNotExists = groupby?.split?.(',')?.filter?.(el => !columnList.includes(el.trim()));
+  
+  if (groupby && groupbyColumnNotExists?.length) {
+    return { message: `groupby column not found: ${groupbyColumnNotExists} (${data.table}/${pg.options?.database})`, status: 404 };
+  }
+
   // get group
   const groupData = groupby
     ? await pg

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

@@ -1,13 +1,12 @@
 import { dataUpdate } from '@opengis/fastify-table/utils.js';
 
-import { yamlSafe } from '../../../../utils.js';
+import { getWidget, yamlSafe } from '../../../../utils.js';
 
 export default async function widgetEdit({ pg, body, params, }) {
   const { widget: widgetName, name: dashboardName } = params;
   const data = body.yml && !body.style ? yamlSafe.load(body.yml) : body;
 
-  const tableName =
-    data.data?.table || data?.table || data.table_name || body.table_name;
+
 
   if (!widgetName || !dashboardName) {
     return {
@@ -15,30 +14,33 @@ export default async function widgetEdit({ pg, body, params, }) {
       status: 400,
     };
   }
-  debugger;
 
   const { widget_id: widgetId } = await pg.query(
     `select a.widget_id , b.dashboard_id from bi.widget a, bi.dashboard b
     where $2 in (a.widget_id, a.name) and $1 in (b.dashboard_id, b.name) order by 1,2`,
-    [dashboardName, widgetName]
-  ).then((res1) => res1.rows?.[0] || {});
+    [dashboardName, widgetName]).then(res1 => res1.rows?.[0] || {});
 
-  if (!widgetId) {
+  // get Data
+  const templateData = await getWidget({ dashboard: dashboardName, widget: widgetName });
+  if (!templateData) {
     return { message: `widget not found ${widgetName}`, status: 404 };
   }
 
+  const widgetData = ['style', 'data', 'type', 'title', 'controls'].filter(el => data[el]).reduce((p, el) => ({ ...p, [el]: data[el] }), {});
+
+  //console.log(templateData)
+  // get table
+  const tableName = templateData.table || body.table || widgetData.data?.table;
   if (!tableName || !pg.pk?.[tableName]) {
-    return { message: 'bad params: table', status: 400 };
+    return { message: 'bad params: table ' + tableName, status: 400 };
   }
 
+  if (body.yml) {
+    Object.assign(widgetData, { yml: body.yml })
+  }
 
-
-  // const widgetData = { ...data, data };
-
-  const widgetData = body.yml ? { yml: body.yml } : { style: data.style, data: { x: data.x, metrics: data.metrics }, controls: data.controls, type: data.type, title: data.title, table_name: data.table_name };
-  // console.log(widgetId, widgetData)
-  // if (body?.yml) Object.assign(widgetData, { yml: body.yml });
-  console.log(widgetData)
+  Object.assign(widgetData, { table_name: tableName });
+  console.log(widgetData);
   const rows = await dataUpdate({
     table: 'bi.widget',
     id: widgetId,