@opengis/bi 1.0.45 → 1.0.47

package/dist/{vs-map-CUF5ZJo4.js → vs-map-CwR6ZYur.js}

@@ -1,8 +1,8 @@
-import { l as L, c as $, p as T, V as B, a as H, b as O, d as F, m as S, e as N } from "./vs-list-D1NHJa-8.js";
-import { _ as C, c as P } from "./import-file-n7AnE4rc.js";
-import { resolveComponent as u, openBlock as i, createElementBlock as p, Fragment as v, createElementVNode as r, createVNode as f, createBlock as E, Teleport as R, toDisplayString as b, createCommentVNode as m, renderList as k, normalizeStyle as I, normalizeClass as V } from "vue";
+import { c as L, l as $, p as T, V as B, a as H, b as O, d as F, m as S, e as N } from "./vs-list-1QDnN3pH.js";
+import { _ as C, c as P } from "./import-file-XFI3CaVb.js";
+import { resolveComponent as u, createElementBlock as p, openBlock as i, Fragment as v, createElementVNode as r, createBlock as E, createCommentVNode as m, createVNode as f, Teleport as R, toDisplayString as b, renderList as k, normalizeStyle as I, normalizeClass as V } from "vue";
 const A = {
-  components: { legendIcon: L, closeIcon: $ },
+  components: { legendIcon: $, closeIcon: L },
   props: {
     mapId: { type: String },
     colors: { type: Array },
@@ -132,11 +132,11 @@ function ee(e, t, s, o, l, a) {
 }
 const te = /* @__PURE__ */ C(A, [["render", ee]]), se = {
   components: {
-    VsMapSetting: B,
-    VsMapSlotLayers: H,
+    VsMapSetting: F,
+    VsMapSlotLayers: O,
     VsMapLegend: te,
-    VsMapGoHome: O,
-    VsList: F
+    VsMapGoHome: H,
+    VsList: B
   },
   data() {
     return {

package/dist/{vs-map-cluster-ZPcu4qhm.js → vs-map-cluster-YdXTBIVf.js}

@@ -1,8 +1,8 @@
-import { l as G, c as A, p as R, e as P, V as Z, b as q, d as D, a as K, m as H } from "./vs-list-D1NHJa-8.js";
-import { _ as V, c as W, V as J, I as Q, e as U, g as X } from "./import-file-n7AnE4rc.js";
-import { openBlock as p, createElementBlock as m, createElementVNode as l, normalizeClass as I, Fragment as N, renderList as O, toDisplayString as F, normalizeStyle as Y, createCommentVNode as S, resolveComponent as g, createBlock as z, resolveDynamicComponent as j, withDirectives as M, createVNode as w, vShow as C } from "vue";
+import { c as G, l as A, p as R, b as P, V as Z, a as q, d as D, e as K, m as H } from "./vs-list-1QDnN3pH.js";
+import { _ as V, V as W, c as J, e as Q, I as U, g as X } from "./import-file-XFI3CaVb.js";
+import { createElementBlock as m, createCommentVNode as S, openBlock as p, createElementVNode as l, normalizeClass as I, Fragment as N, renderList as O, toDisplayString as F, normalizeStyle as Y, resolveComponent as g, withDirectives as z, createBlock as M, resolveDynamicComponent as j, createVNode as w, vShow as C } from "vue";
 const $ = {
-  components: { legendIcon: G, closeIcon: A },
+  components: { legendIcon: A, closeIcon: G },
   props: {
     mapId: { type: String },
     colors: { type: Array },
@@ -100,15 +100,15 @@ function ie(t, s) {
   ]));
 }
 const pe = /* @__PURE__ */ V(ne, [["render", ie]]), ce = {
-  mixins: [W, P],
+  mixins: [J, K],
   components: {
-    VsMapSetting: Z,
+    VsMapSetting: D,
     VsClusterLegend: ae,
     VsMapGoHome: q,
-    VsList: D,
-    VsMapSlotLayers: K,
+    VsList: Z,
+    VsMapSlotLayers: P,
     // VsListbar,
-    VsBar: J
+    VsBar: W
   },
   data() {
     return {
@@ -116,8 +116,8 @@ const pe = /* @__PURE__ */ V(ne, [["render", ie]]), ce = {
       kattotg: "",
       options: [
         { id: "map", text: "Карта", component: pe },
-        { id: "table", text: "Таблиця", component: Q },
-        { id: "chart", text: "Віджет", component: U }
+        { id: "table", text: "Таблиця", component: U },
+        { id: "chart", text: "Віджет", component: X }
       ],
       activeTab: "map",
       mapId: `map-${Math.floor(Math.random() * 1e3)}`,
@@ -142,7 +142,7 @@ const pe = /* @__PURE__ */ V(ne, [["render", ie]]), ce = {
   },
   methods: {
     async getMapData() {
-      const t = await X.get(
+      const t = await Q.get(
         `/bi-cluster?widget=${this.widget}&dashboard=${this.dashboard}`
       );
       this.data = t.data, this.$emit("update:widgetData", this.data), setTimeout(() => {
@@ -248,14 +248,14 @@ function xe(t, s, n, a, e, o) {
           class: I(["p-1 text-gray-700 border rounded", [e.activeTab === (r == null ? void 0 : r.id) ? "ring-2 ring-blue-500" : ""]]),
           onClick: (_e) => e.activeTab = r == null ? void 0 : r.id
         }, [
-          (p(), z(j(r == null ? void 0 : r.component), {
+          (p(), M(j(r == null ? void 0 : r.component), {
             height: "16",
             width: "16"
           }))
         ], 10, ge))), 256))
       ])
     ]),
-    M(l("div", {
+    z(l("div", {
       class: "relative w-full h-[calc(100%-40px)]",
       id: `wrapper-${e.mapId}`
     }, [
@@ -263,7 +263,7 @@ function xe(t, s, n, a, e, o) {
         id: e.mapId,
         class: "h-[calc(100%-40px)] w-full flex items-end min-h-[250px]"
       }, null, 8, fe),
-      e.showSetting ? (p(), z(d, {
+      e.showSetting ? (p(), M(d, {
         key: 0,
         map: e.map,
         coordinates: e.coordinatesByMouse
@@ -286,7 +286,7 @@ function xe(t, s, n, a, e, o) {
     ], 8, ye), [
       [C, e.activeTab == "map"]
     ]),
-    M(w(u, {
+    z(w(u, {
       mapId: e.mapId,
       source: (v = e.data) == null ? void 0 : v.rows,
       total: ((x = e.data) == null ? void 0 : x.total) || 0,
@@ -295,8 +295,8 @@ function xe(t, s, n, a, e, o) {
     }, null, 8, ["mapId", "source", "total", "count"]), [
       [C, e.activeTab == "table"]
     ]),
-    M(l("div", ve, [
-      (E = (L = e.data) == null ? void 0 : L.rows) != null && E.length ? (p(), z(_, {
+    z(l("div", ve, [
+      (E = (L = e.data) == null ? void 0 : L.rows) != null && E.length ? (p(), M(_, {
         key: 0,
         source: (T = (B = e.data) == null ? void 0 : B.rows) == null ? void 0 : T.map((r) => ({
           title: r == null ? void 0 : r.title,

package/dist/{vs-number-Z4ee8Kwo.js → vs-number-CRUhHKym.js}

@@ -1,5 +1,5 @@
-import { _ as c, c as o, f as n } from "./import-file-n7AnE4rc.js";
-import { openBlock as i, createElementBlock as m, toDisplayString as s } from "vue";
+import { _ as c, c as o, f as n } from "./import-file-XFI3CaVb.js";
+import { createElementBlock as i, openBlock as m, toDisplayString as s } from "vue";
 const u = {
   name: "VsNumber",
   mixins: [o],
@@ -47,7 +47,7 @@ const u = {
   }
 }, h = { class: "text-lg lg:text-xl xl:text-2xl text-gray-800 h-[32px] flex items-center" };
 function x(e, t, r, f, l, a) {
-  return i(), m("div", h, s(a.prefix) + s(a.formattedNumber), 1);
+  return m(), i("div", h, s(a.prefix) + s(a.formattedNumber), 1);
 }
 const b = /* @__PURE__ */ c(u, [["render", x]]);
 export {

package/dist/{vs-table-BrnSztWP.js → vs-table-OddIdr1s.js}

@@ -1,5 +1,5 @@
-import { _ as m, c as f, d as _, a as b } from "./import-file-n7AnE4rc.js";
-import { openBlock as a, createElementBlock as r, createElementVNode as s, Fragment as n, renderList as c, toDisplayString as d } from "vue";
+import { _ as m, c as f, d as _, a as b } from "./import-file-XFI3CaVb.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",
   mixins: [f],
@@ -39,20 +39,20 @@ const x = {
   class: "xl:min-w-[120px] min-w-48"
 }, F = { class: "flex items-center px-1 py-3 font-medium text-gray-800 text-start gap-x-1" }, T = { class: "divide-y divide-gray-200" }, B = { class: "text-gray-600" };
 function E(t, e, o, l, N, S) {
-  return a(), r("div", y, [
+  return r(), a("div", y, [
     s("div", g, [
       s("div", w, [
         s("table", k, [
           s("thead", v, [
             s("tr", D, [
-              (a(!0), r(n, null, c(t.dimensions, (i) => (a(), r("th", $, [
+              (r(!0), a(n, null, c(t.dimensions, (i) => (r(), a("th", $, [
                 s("div", F, d(i), 1)
               ]))), 256))
             ])
           ]),
           s("tbody", T, [
-            (a(!0), r(n, null, c(t.sourceData, (i, p) => (a(), r("tr", { key: p }, [
-              (a(!0), r(n, null, c(t.dimensions, (u, h) => (a(), r("td", {
+            (r(!0), a(n, null, c(t.sourceData, (i, p) => (r(), a("tr", { key: p }, [
+              (r(!0), a(n, null, c(t.dimensions, (u, h) => (r(), a("td", {
                 key: h,
                 class: "py-3 whitespace-nowrap"
               }, [

package/dist/{vs-text-Bj9iBISe.js → vs-text-CQ9vn0qO.js}

@@ -1,5 +1,5 @@
-import { _ as o, c as s, m as i } from "./import-file-n7AnE4rc.js";
-import { openBlock as r, createElementBlock as n, createCommentVNode as a } from "vue";
+import { _ as o, c as s, m as i } from "./import-file-XFI3CaVb.js";
+import { createElementBlock as r, openBlock as n, createCommentVNode as a } from "vue";
 const c = {
   name: "VsText",
   mixins: [s],
@@ -24,11 +24,11 @@ const c = {
   }
 }, u = ["id"], d = ["innerHTML"];
 function l(t, m, x, h, e, _) {
-  return r(), n("div", {
+  return n(), r("div", {
     id: e.uniqueID,
     class: "relative select-auto h-full rounded-xl text-[12px] box-border bg-white custom-scrollbar text-widget"
   }, [
-    e.markedText ? (r(), n("div", {
+    e.markedText ? (n(), r("div", {
       key: 0,
       innerHTML: e.markedText
     }, null, 8, d)) : a("", !0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "description": "BI data visualization module",
   "main": "dist/bi.js",
   "browser": "dist/bi.umd.cjs",
@@ -24,14 +24,9 @@
     "test21": "node --test ./test/plugins/*",
     "start": "node server.js",
     "prod": "cross-env NODE_ENV=production npm run start",
-    "docs:local": "cross-env docs=local vitepress build docs",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs",
-    "docs-dev:local": "cross-env docs=local vitepress build docs-dev",
-    "docs-dev:dev": "vitepress dev docs-dev",
-    "docs-dev:build": "vitepress build docs-dev",
-    "docs-dev:preview": "vitepress preview docs-dev",
     "adduser": "node script/adduser.js"
   },
   "keywords": [

package/server/plugins/docs.js

@@ -6,8 +6,8 @@ const dir = dirname(fileURLToPath(import.meta.url));
 const root = `${dir}/../../`;
 
 async function plugin(fastify, opts) {
-  fastify.get('/docs-dev*', async (req, reply) => {
-    if (!fs.existsSync(path.join(root, 'docs-dev/.vitepress/dist/'))) {
+  fastify.get('/docs*', async (req, reply) => {
+    if (!fs.existsSync(path.join(root, 'docs/.vitepress/dist/'))) {
       return reply.status(404).send('docs not exists');
     }
 
@@ -16,8 +16,8 @@ async function plugin(fastify, opts) {
 
     const filePath =
       url && url[url.length - 1] !== '/'
-        ? path.join(root, 'docs-dev/.vitepress/dist/', url)
-        : path.join(root, 'docs-dev/.vitepress/dist/', url, 'index.html');
+        ? path.join(root, 'docs/.vitepress/dist/', url)
+        : path.join(root, 'docs/.vitepress/dist/', url, 'index.html');
 
     if (!fs.existsSync(filePath)) {
       return reply.status(404).send('File not found');

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.list.js

@@ -19,7 +19,15 @@ export default async function data({
     })
   ) : [];
 
-  const { rows = [] } = type === 'db' ? await pg.query(q) : {};
+  const { rows = [] } = ['db', 'viewer'].includes(type) ? await pg.query(q) : {};
+
+  if (type === 'viewer') {
+    return {
+      time: Date.now() - time,
+      db: pg.options?.database,
+      rows: rows.filter(el => el.table_name && !el.table_name.startsWith('demo.')),
+    };
+  }
 
   const list = dir.concat(rows);
 

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

@@ -7,6 +7,7 @@ import {
   getSelectVal,
   getFilterSQL,
   getMeta,
+  logger,
 } from '@opengis/fastify-table/utils.js';
 
 import chartSQL from './util/chartSQL.js';
@@ -141,7 +142,10 @@ export default async function dataAPI(req, reply) {
 
   if (config.trace) console.log(sql, user?.uid);
 
-  const { rows, fields } = await pg.query(sql.replace('{{uid}}', user?.uid)); // test with limit
+  const { rows = [], fields = [], errorSql } = await pg.query(sql.replace('{{uid}}', user?.uid)).catch(err => {
+    logger.file('bi/data', { error: err.toString(), sql });
+    return { errorSql: err.toString() };
+  }); // test with limit
 
   if (cls) {
     const values = rows
@@ -167,7 +171,7 @@ export default async function dataAPI(req, reply) {
 
   const res = {
     time: Date.now() - time,
-    error,
+    error: errorSql || (!widgetData.sql ? widgetData.error : undefined),
     dimensions,
     filter: xName,
     dimensionsType: [xType, yType].filter((el) => el)?.length