@opengis/bi 1.2.28 → 1.2.30

package/dist/{vs-funnel-bar-D0j-vBjL.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-CeeuNrOS.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-BlFV_Syw.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-CeeuNrOS.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-DnGaeJ0j.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-BlFV_Syw.js";
-import { _ as V, c as P } from "./import-file-CeeuNrOS.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-CtwhYhfw.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-BlFV_Syw.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-CeeuNrOS.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-poGPfqSn.js → vs-number-jPqxFQ6d.js}

@@ -1,4 +1,4 @@
-import { _ as c, c as o, f as n } from "./import-file-CeeuNrOS.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-D3hPaMk1.js → vs-table-BDgIvJbY.js}

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

@@ -1,4 +1,4 @@
-import { _ as s, c as a, m as d } from "./import-file-CeeuNrOS.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,75 +1,75 @@
-{
-  "name": "@opengis/bi",
-  "version": "1.2.28",
-  "description": "BI data visualization module",
-  "main": "dist/bi.js",
-  "browser": "dist/bi.umd.cjs",
-  "type": "module",
-  "files": [
-    "dist",
-    "server",
-    "plugin.js",
-    "utils.js"
-  ],
-  "scripts": {
-    "patch": "npm version patch && git push && npm publish",
-    "prepublishOnly": "npm run build:lib",
-    "debug": "node --watch-path=server server",
-    "dev": "vite",
-    "type-check": "vue-tsc --noEmit",
-    "build": "vite build",
-    "build:lib": "cross-env APP=true vite build",
-    "build-app": "vite build",
-    "lint": "eslint .",
-    "format": "prettier --write .",
-    "test": "node --test",
-    "test21": "node --test ./test/plugins/*",
-    "start": "node server.js",
-    "prod": "NODE_ENV=production npm run start",
-    "docs:i": "npm install --prefix ./docs",
-    "docs:dev": "npm run --prefix ./docs docs:dev",
-    "docs:build": "npm run --prefix ./docs docs:build",
-    "docs:preview": "npm run --prefix ./docs docs:preview",
-    "adduser": "node script/adduser.js"
-  },
-  "keywords": [
-    "bi",
-    "data visualization",
-    "chart",
-    "opengis",
-    "vue",
-    "fastify"
-  ],
-  "author": "Softpro",
-  "license": "ISC",
-  "dependencies": {
-    "@mapbox/sphericalmercator": "^1.2.0",
-    "@opengis/table": "^0.0.30",
-    "lucide-vue-next": "^0.577.0"
-  },
-  "devDependencies": {
-    "@opengis/core": "^0.0.33",
-    "@opengis/fastify-table": "^2.0.33",
-    "@opengis/form": "0.0.137",
-    "@turf/turf": "^7.1.0",
-    "@types/node": "^22.7.5",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
-    "@vitejs/plugin-vue": "^5.1.4",
-    "cross-env": "^10.1.0",
-    "eslint": "^8.57.1",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-vue": "^9.29.0",
-    "globals": "^15.10.0",
-    "marked": "^14.1.2",
-    "prettier": "^3.3.3",
-    "rollup-plugin-visualizer": "^7.0.0",
-    "sass-embedded": "1.89.2",
-    "typescript": "^5.4.5",
-    "vite": "^5.1.5",
-    "vue": "^3.4.27",
-    "vue-router": "^4.4.3",
-    "vue-tsc": "^2.1.6"
-  }
-}
+{
+  "name": "@opengis/bi",
+  "version": "1.2.30",
+  "description": "BI data visualization module",
+  "main": "dist/bi.js",
+  "browser": "dist/bi.umd.cjs",
+  "type": "module",
+  "files": [
+    "dist",
+    "server",
+    "plugin.js",
+    "utils.js"
+  ],
+  "scripts": {
+    "patch": "npm version patch && git push && npm publish",
+    "prepublishOnly": "npm run build:lib",
+    "debug": "node --watch-path=server server",
+    "dev": "vite",
+    "type-check": "vue-tsc --noEmit",
+    "build": "vite build",
+    "build:lib": "cross-env APP=true vite build",
+    "build-app": "vite build",
+    "lint": "eslint .",
+    "format": "prettier --write .",
+    "test": "node --test",
+    "test21": "node --test ./test/plugins/*",
+    "start": "node server.js",
+    "prod": "NODE_ENV=production npm run start",
+    "docs:i": "npm install --prefix ./docs",
+    "docs:dev": "npm run --prefix ./docs docs:dev",
+    "docs:build": "npm run --prefix ./docs docs:build",
+    "docs:preview": "npm run --prefix ./docs docs:preview",
+    "adduser": "node script/adduser.js"
+  },
+  "keywords": [
+    "bi",
+    "data visualization",
+    "chart",
+    "opengis",
+    "vue",
+    "fastify"
+  ],
+  "author": "Softpro",
+  "license": "ISC",
+  "dependencies": {
+    "@mapbox/sphericalmercator": "^1.2.0",
+    "@opengis/table": "^0.0.30",
+    "lucide-vue-next": "^0.577.0"
+  },
+  "devDependencies": {
+    "@opengis/core": "^0.0.33",
+    "@opengis/fastify-table": "^2.0.33",
+    "@opengis/form": "0.0.137",
+    "@turf/turf": "^7.1.0",
+    "@types/node": "^22.7.5",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "cross-env": "^10.1.0",
+    "eslint": "^8.57.1",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-vue": "^9.29.0",
+    "globals": "^15.10.0",
+    "marked": "^14.1.2",
+    "prettier": "^3.3.3",
+    "rollup-plugin-visualizer": "^7.0.0",
+    "sass-embedded": "1.89.2",
+    "typescript": "^5.4.5",
+    "vite": "^5.1.5",
+    "vue": "^3.4.27",
+    "vue-router": "^4.4.3",
+    "vue-tsc": "^2.1.6"
+  }
+}

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

@@ -1,39 +1,59 @@
-import { pgClients, getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
+import { pgClients, getTemplatePath, getTemplate, getTemplateSync } from '@opengis/fastify-table/utils.js';
 
-const q = `select dashboard_id as name, 'db' as type, title, description, table_name, words, public from bi.dashboard`;
+const dirContent = getTemplatePath('dashboard').map(([filename, filepath]) => {
+  const obj = getTemplateSync('dashboard', filename);
+  const index = obj?.find?.((el) => el[0] === 'index.yml')?.[1];
+  const { table_name, description, title } = index || {};
 
-export default async function data({
+  return { name: filename, path: filepath, type: 'file', title, description, table_name };
+});
+
+const maxLimit = 100;
+
+export default async function dashboardList({
   pg = pgClients.client, query = {}, user = {}
 }) {
   const time = Date.now();
-  const { type = 'file' } = query;
+  const { type = 'file', page, search, sql } = query;
+
+  const limit = Math.min(maxLimit, +(query.limit || 15));
+  const offset = page && page > 0 ? (page - 1) * limit : 0;
+
+  const dir = type === 'file' ? dirContent : [];
 
-  const data = getTemplatePath('dashboard');
-  const dir = type === 'file' ? await Promise.all(
-    data.map(async ([filename, filepath]) => {
-      const obj = await getTemplate('dashboard', filename);
-      const index = obj?.find?.((el) => el[0] === 'index.yml')?.[1];
-      const { table_name, description, title } = index || {};
+  const where = [search ? `lower(title) ~ $1` : null, type === 'viewer' ? `left(table_name,5)='demo.'` : null].filter(Boolean).join(' and ') || 'true';
+  const q1 = `select count(*)::int as total, count(*) filter(where ${where})::int as filtered from bi.dashboard`;
+
+  const q = `select dashboard_id as name, 'db' as type, title, description, table_name, words, public from bi.dashboard where ${where} limit ${limit} offset ${offset}`;
+
+  if (user?.user_type?.includes('admin') && ['db', 'viewer'].includes(type) && sql) {
+    return `${q1};${q}`;
+  }
 
-      return { name: filename, path: user?.user_type?.includes('admin') ? filepath : undefined, type: 'file', title, description, table_name };
-    })
-  ) : [];
+  const args = [search].filter(Boolean);
+  const { total = 0, filtered = 0 } = ['db', 'viewer'].includes(type) ? await pg.query(q1, args).then(el => el.rows?.[0] || {}) : {};
 
-  const { rows = [] } = ['db', 'viewer'].includes(type) ? await pg.query(q) : {};
+  const rows = ['db', 'viewer'].includes(type) ? await pg.query(q, args).then(el => el.rows || []) : [];
 
   if (type === 'viewer') {
     return {
       time: Date.now() - time,
       db: pg.options?.database,
-      rows: rows.filter(el => el.table_name && !el.table_name.startsWith('demo.')),
+      total,
+      filtered,
+      count: rows.length,
+      rows,
     };
   }
 
-  const list = dir.concat(rows);
+  const list = (user?.user_type?.includes('admin') ? dir : dir.map(el => ({ ...el, path: undefined }))).concat(rows);
 
   const res = {
     time: Date.now() - time,
     db: pg.options?.database,
+    total,
+    filtered,
+    count: rows.length,
     rows: list,
   };
   return res;

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

@@ -2,17 +2,17 @@ import { dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
 
 import { getWidget, yamlSafe } from '../../../../utils.js';
 
-export default async function widgetEdit({ pg = pgClients.client, body, params }) {
+export default async function widgetEdit({ pg = pgClients.client, body, params }, reply) {
   const { widget: widgetName, name: dashboardName } = params;
   const data = body.yml && !body.style ? yamlSafe.load(body.yml) : body;
   const yml = body.yml ?? yamlSafe.dump(body.data);
   // console.log(body.data, data, body.yml, yml);
 
   if (!widgetName || !dashboardName) {
-    return {
-      message: 'not enough params: dashboard and widget name',
-      status: 400,
-    };
+    return reply.status(400).send({
+      error: 'not enough params: dashboard and widget name',
+      code: 400,
+    });
   }
 
   const { widget_id: widgetId, dashboard_id: dashboardId, widgets } = await pg.query(
@@ -23,7 +23,10 @@ export default async function widgetEdit({ pg = pgClients.client, body, params }
   // get Data
   const templateData = await getWidget({ pg, dashboard: dashboardName, widget: widgetName });
   if (!templateData) {
-    return { message: `widget not found ${widgetName}`, status: 404 };
+    return reply.status(404).send({
+      error: `widget not found ${widgetName}`,
+      code: 404,
+    });
   }
 
   if (data?.data) {
@@ -43,22 +46,28 @@ export default async function widgetEdit({ pg = pgClients.client, body, params }
     || widgetData?.table_name
     || templateData.table;
 
-  const loadTemplate = pg.pk?.['admin.doc_template'] ? await pg.query(
+  const loadTemplate = pg?.pk?.['admin.doc_template'] ? await pg.query(
     'select body from admin.doc_template where doc_type=5 and title=$1',
     [tableName]
   ).then(el => el.rows?.[0]?.body) : null;
 
-  if (!tableName || !(pg.pk?.[loadTemplate?.table || tableName] || pgClients[widgetData?.data?.db || templateData?.db || 'client']?.pk?.[loadTemplate?.table || tableName])) {
-    return { message: 'bad params: table ' + tableName, status: 400 };
+  if (!pg || !tableName || !(pg.pk?.[loadTemplate?.table || tableName] || pgClients[widgetData?.data?.db || templateData?.db || 'client']?.pk?.[loadTemplate?.table || tableName])) {
+    return reply.status(400).send({
+      error: 'bad params: table ' + tableName,
+      code: 400,
+    });
   }
 
   if (yml) {
     Object.assign(widgetData, { yml })
   }
 
-  Object.assign(widgetData, { table_name: tableName, data: { ...widgetData?.data || {}, table_name: tableName } });
-  console.log(widgetData);
-  const rows = await dataUpdate({
+  if (widgetData?.data) {
+    Object.assign(widgetData, { data: { ...widgetData?.data || {}, table_name: tableName } });
+  }
+  Object.assign(widgetData, { table_name: tableName });
+  // console.log(widgetData);
+  const row = await dataUpdate({
     pg,
     table: 'bi.widget',
     id: widgetId,
@@ -102,5 +111,5 @@ export default async function widgetEdit({ pg = pgClients.client, body, params }
     data: { widgets },
   });
 
-  return { message: rows, status: 200 };
+  return row;
 }