@opengis/bi 1.0.44 → 1.0.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "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

@@ -1,48 +1,48 @@
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
-import fs from 'fs';
-
-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/'))) {
-      return reply.status(404).send('docs not exists');
-    }
-
-    const { params } = req;
-    const url = params['*'];
-
-    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');
-
-    if (!fs.existsSync(filePath)) {
-      return reply.status(404).send('File not found');
-    }
-
-    const ext = path.extname(filePath);
-    const mime = {
-      '.js': 'text/javascript',
-      '.css': 'text/css',
-      '.woff2': 'application/font-woff',
-      '.png': 'image/png',
-      '.svg': 'image/svg+xml',
-      '.jpg': 'image/jpg',
-      '.html': 'text/html',
-      '.json': 'application/json',
-      '.pdf': 'application/pdf',
-    }[ext];
-
-    const stream = fs.createReadStream(filePath);
-    stream.on('error', (err) => {
-      reply.status(500).send('Error reading file');
-    });
-
-    return mime ? reply.type(mime).send(stream) : reply.send(stream);
-  });
-}
-
-export default plugin;
+import path, { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import fs from 'fs';
+
+const dir = dirname(fileURLToPath(import.meta.url));
+const root = `${dir}/../../`;
+
+async function plugin(fastify, opts) {
+  fastify.get('/docs*', async (req, reply) => {
+    if (!fs.existsSync(path.join(root, 'docs/.vitepress/dist/'))) {
+      return reply.status(404).send('docs not exists');
+    }
+
+    const { params } = req;
+    const url = params['*'];
+
+    const filePath =
+      url && url[url.length - 1] !== '/'
+        ? 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');
+    }
+
+    const ext = path.extname(filePath);
+    const mime = {
+      '.js': 'text/javascript',
+      '.css': 'text/css',
+      '.woff2': 'application/font-woff',
+      '.png': 'image/png',
+      '.svg': 'image/svg+xml',
+      '.jpg': 'image/jpg',
+      '.html': 'text/html',
+      '.json': 'application/json',
+      '.pdf': 'application/pdf',
+    }[ext];
+
+    const stream = fs.createReadStream(filePath);
+    stream.on('error', (err) => {
+      reply.status(500).send('Error reading file');
+    });
+
+    return mime ? reply.type(mime).send(stream) : reply.send(stream);
+  });
+}
+
+export default plugin;

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

package/server/routes/map/controllers/cluster.js

@@ -113,7 +113,7 @@ export default async function cluster(req, reply) {
       vals[Math.floor(len * 0.75)],
       vals[len - 1],
     ];
-    return { sizes, style, controls, rows, bounds, extent, count: rows.length, total: rows?.reduce((acc, curr) => (curr.metric || 0) + acc, 0) };
+    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 };