@opengis/bi 1.0.54 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.0.54",
+  "version": "1.1.0",
   "description": "BI data visualization module",
   "main": "dist/bi.js",
   "browser": "dist/bi.umd.cjs",
@@ -43,17 +43,17 @@
     "@highlightjs/vue-plugin": "github:highlightjs/vue-plugin",
     "@jspreadsheet-ce/vue": "^5.0.0",
     "@mapbox/sphericalmercator": "^1.2.0",
-    "@opengis/fastify-auth": "^1.0.76",
-    "@opengis/fastify-file": "^1.0.46",
-    "@opengis/fastify-table": "^1.2.84",
+    "@opengis/fastify-auth": "1.1.0",
+    "@opengis/fastify-file": "1.1.1",
+    "@opengis/fastify-table": "1.4.1",
     "@opengis/v3-core": "^0.3.93",
     "@opengis/v3-filter": "^0.0.71",
     "@turf/turf": "^7.1.0",
     "axios": "^1.3.1",
     "cross-env": "^7.0.3",
     "echarts": "^5.5.1",
-    "fastify": "^4.26.1",
-    "fastify-plugin": "^4.0.0",
+    "fastify": "5.3.3",
+    "fastify-plugin": "5.0.1",
     "highlight.js": "^11.10.0",
     "js-yaml": "^4.1.0",
     "maplibre-gl": "^4.7.1",

package/server/routes/dashboard/index.mjs

@@ -3,14 +3,17 @@ import dashboardList from './controllers/dashboard.list.js';
 import dashboardImport from './controllers/dashboard.import.js';
 
 const biSchema = {
-  querystring: {
-    widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    dashboard: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    list: { type: 'string', pattern: '^([\\d])$' },
-    sql: { type: 'string', pattern: '^([\\d])$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  type: 'object',
+  properties: {
+    querystring: {
+      widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      dashboard: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      list: { type: 'string', pattern: '^([\\d])$' },
+      sql: { type: 'string', pattern: '^([\\d])$' },
+    },
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
   },
 };
 

package/server/routes/data/index.mjs

@@ -1,20 +1,21 @@
-import config from '../../../config.js';
-
 import data from './controllers/data.js';
 
 const biSchema = {
-  querystring: {
-    widget: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-    dashboard: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-    sql: { type: 'string', pattern: '^([\\d])$' },
-    // metric: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-    x: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-    granularity: { type: 'string', pattern: '^(week|month|quarter|year)$' },
-    groupby: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-    filterCustom: { type: 'string', pattern: '^([\\d\\w_,]+)$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  type: 'object',
+  properties: {
+    querystring: {
+      widget: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+      dashboard: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+      sql: { type: 'string', pattern: '^([\\d])$' },
+      // metric: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+      x: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+      granularity: { type: 'string', pattern: '^(week|month|quarter|year)$' },
+      groupby: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+      filterCustom: { type: 'string', pattern: '^([\\d\\w_,]+)$' },
+    },
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
   },
 };
 

package/server/routes/edit/index.mjs

@@ -7,15 +7,18 @@ import dashboardAdd from './controllers/dashboard.add.js';
 import dashboardDelete from './controllers/dashboard.delete.js';
 
 const biSchema = {
-  querystring: {
-    widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    dashboard: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    list: { type: 'string', pattern: '^([\\d])$' },
-    sql: { type: 'string', pattern: '^([\\d])$' },
-  },
-  params: {
-    name: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  type: 'object',
+  properties: {
+    querystring: {
+      widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      dashboard: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      list: { type: 'string', pattern: '^([\\d])$' },
+      sql: { type: 'string', pattern: '^([\\d])$' },
+    },
+    params: {
+      name: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
   },
 };
 

package/server/routes/map/index.mjs

@@ -7,13 +7,16 @@ import clusterVtile from './controllers/clusterVtile.js';
 import heatmap from './controllers/heatmap.js';
 
 const biSchema = {
-  querystring: {
-    widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    dashboard: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    sql: { type: 'string', pattern: '^([\\d])$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  type: 'object',
+  properties: {
+    querystring: {
+      widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      dashboard: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      sql: { type: 'string', pattern: '^([\\d])$' },
+    },
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
   },
 };
 

package/server/utils/getWidget.js

@@ -37,8 +37,8 @@ async function getWidget({ pg: pg1 = pgClients.client, dashboard, widget }) {
     || dashboardWidgets?.find(el => el.name === widget)
     : await getTemplate('widget', widget);
 
-  if (typeof widgetData === 'string' || (widgetData?.type === 'text' && typeof widgetData?.data?.text === 'string')) {
-    const html = mdToHTML(widgetData?.data?.text || widgetData);
+  if (typeof widgetData === 'string' || typeof widgetData?.html === 'string' || (widgetData?.type === 'text' && typeof widgetData?.data?.text === 'string')) {
+    const html = widgetData?.html || mdToHTML(widgetData?.data?.text || widgetData);
     return { source: html, status: 200 };
   }
 

package/dist/bi.js

@@ -1,4 +0,0 @@
-import { l as f } from "./import-file-C1w6i79j.js";
-export {
-  f as default
-};