@opengis/bi 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "BI data visualization module",
   "main": "dist/bi.js",
   "browser": "dist/bi.umd.cjs",

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

@@ -50,7 +50,7 @@ export default async function data({
   data.type = 'file';
   const { table } = data?.data || { table: data?.table_name };
   // console.log(fileData)
-  const widgets = fileData.filter(el => el[0] !== 'index.yml').map(el => el[1]).map(el => el.data ? ({ name: el.name, type: el.type, text: el.text, style: el.style, data: el.data }) : { text: el });
+  const widgets = fileData.filter(el => el[0] !== 'index.yml').map(el => el[1].data ? ({ name: el[0].split('.')[0], type: el[1].type, text: el[1].text, style: el[1].style, data: el[1].data }) : { name: el[0].split('.')[0], text: el[1] });
 
   const { fields = [] } = table ? await pg.query(`select * from ${table} limit 1`) : {};
 

package/server/routes/dashboard/index.mjs

@@ -17,7 +17,7 @@ const biSchema = {
 
 
 export default async function route(fastify) {
-  fastify.get(`/api/bi-dashboard/:id`, { schema: biSchema }, dashboard);
-  fastify.get(`/api/bi-dashboard`, dashboardList);
-  fastify.delete(`/api/bi-dashboard/:id`, dashboardDelete);
+  fastify.get(`/bi-dashboard/:id`, { schema: biSchema }, dashboard);
+  fastify.get(`/bi-dashboard`, dashboardList);
+  fastify.delete(`/bi-dashboard/:id`, dashboardDelete);
 }

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

@@ -1,17 +1,12 @@
-import path from 'path';
+
 // import getTemplate from '@opengis/fastify-table/table/controllers/utils/getTemplate.js';
 import autoIndex from '@opengis/fastify-table/pg/funcs/autoIndex.js';
 import pgClients from '@opengis/fastify-table/pg/pgClients.js';
 import chartSQL from './util/chartSQL.js';
 import normalizeData from './util/normalizeData.js';
 
-const cwd = process.cwd();
-const dashboardDir = path.join(cwd, 'server/templates/dashboard');
-const widgetDir = path.join(cwd, 'server/templates/widget');
-
-import { existsSync, readdirSync, readFileSync } from 'fs';
 
-import yaml from '../../dashboard/controllers/utils/yaml.js';
+import { getTemplate } from '@opengis/fastify-table/utils.js';
 
 export default async function data({
   pg = pgClients.client, funcs = {}, query = {},
@@ -23,29 +18,32 @@ export default async function data({
   if (!widget && !dashboard) {
     return { message: 'not enough params: widget or dashboard required', status: 400 };
   }
+  const dashboardData = dashboard ? await getTemplate('dashboard', dashboard) : null;
 
-  const fileList = dashboard && existsSync(path.join(dashboardDir, dashboard)) ? readdirSync(path.join(dashboardDir, dashboard)) : []
-  const filePath = dashboard ? fileList.filter(el => el.includes(widget)).map(el => path.join(dashboardDir, dashboard, el))[0] : path.join(widgetDir, widget + '.yml')
+  const { id, tableName } = !dashboardData && pg.pk['bi.dashboard'] && dashboard ?
+    await pg.query(`select dashboard_id as id, table_name as "tableName" from bi.dashboard where $1 in (dashboard_id, name)`, [dashboard]).then((res1) => res1.rows?.[0] || {}) : {};
 
-  const { id, tableName } = !existsSync(filePath) ? await pg.query(`select dashboard_id as id, table_name as "tableName" from bi.dashboard where $1 in (dashboard_id, name)`, [dashboard]).then((res1) => res1.rows?.[0] || {}) : {};
 
-  if (!id && !existsSync(filePath)) {
-    return { message: { root: config?.local ? dashboardDir : undefined, error: `not found`, widget, dashboard }, status: 404 };
-  }
+  if (!dashboardData && dashboard && !id) return 'dashboard not found';
 
-  const fileData = existsSync(filePath) ? readFileSync(filePath, 'utf-8') : '';
+  // return { t: 111, data: dashboardData, dashboard }
 
-  const jsonData = filePath?.includes('.yml') ? yaml.loadSafe(fileData) : {};
+  const widgetData = dashboard ? dashboardData?.find(el => el[0]?.includes(widget))?.[1] : await getTemplate('widget', widget);
 
-  const q = `select *, coalesce(data::jsonb, '{}'::jsonb) || jsonb_build_object('table', table_name) as data from bi.widget where dashboard_id=$1 and name=$2`;
-  const { type, text, data, options, controls, style } = existsSync(filePath)
-    ? jsonData
-    : await pg.query(q, [id || dashboard, widget])
-      .then((res1) => res1.rows?.[0] || {});
 
-  if (type === 'text' || filePath?.includes('.md')) {
+  if (dashboardData && !widgetData) {
+    return widgetData
+  }
+
+  if (!id && !dashboardData && !widgetData) {
+    return { message: { root: config?.local ? dashboardDir : undefined, error: `not found`, widget, dashboard }, status: 404 };
+  }
+
+  const q = `select *, coalesce(data::jsonb, '{}'::jsonb) || jsonb_build_object('table', table_name) as data from bi.widget where dashboard_id=$1 and name=$2`;
+  const { type, text, data, controls, style, options } = widgetData || await pg.query(q, [id || dashboard, widget]).then((res1) => res1.rows?.[0] || {});
 
-    return fileData;
+  if (typeof widgetData === 'string') {
+    return widgetData;
   }
 
   if (!data?.table && tableName) {
@@ -60,7 +58,9 @@ export default async function data({
   const { x, metric, table, where, groupby, xName } = normalizeData(data, query);
 
   // auto Index
-  autoIndex({ table: data.table, columns: [data?.time].concat([xName]).concat([groupby]).filter(el => el) })
+  if (pg.pk[data.table]) {
+    autoIndex({ table: data.table, columns: [data?.time].concat([xName]).concat([groupby]).filter(el => el) }).catch(err => console.log(err))
+  }
 
   // get group 
   const groupData = groupby ? await pg.query(`select ${groupby} as name ,count(*) from ${table} group by ${groupby} order by count(*) desc limit 20`).then(el => el.rows) : null;

package/server/routes/data/index.mjs

@@ -19,7 +19,7 @@ export default async function route(fastify, opts) {
   const prefix = opts?.prefix || config.prefix || '/api';
   fastify.route({
     method: 'GET',
-    url: '/api/bi-data',
+    url: '/bi-data',
     schema: biSchema,
     handler: data,
   });

package/server/routes/edit/index.mjs

@@ -19,9 +19,9 @@ const biSchema = {
 
 
 export default async function route(fastify) {
-  fastify.post(`/api/bi-dashboard/:name`, {schema: biSchema}, widgetAdd);
-  fastify.put(`/api/bi-dashboard/:name/:widget`, {schema: biSchema}, widgetEdit); 
-  fastify.delete(`/api/bi-dashboard/:name/:widget`, {schema: biSchema}, widgetDel);
-  fastify.post(`/api/bi-dashboard`, {schema: biSchema}, dashboardAdd); 
-  fastify.put(`/api/bi-dashboard/:name`, {schema: biSchema}, dashboardEdit);
+  fastify.post(`/bi-dashboard/:name`, { schema: biSchema }, widgetAdd);
+  fastify.put(`/bi-dashboard/:name/:widget`, { schema: biSchema }, widgetEdit);
+  fastify.delete(`/bi-dashboard/:name/:widget`, { schema: biSchema }, widgetDel);
+  fastify.post(`/bi-dashboard`, { schema: biSchema }, dashboardAdd);
+  fastify.put(`/bi-dashboard/:name`, { schema: biSchema }, dashboardEdit);
 }

package/server/templates/widget/product_line.yml

@@ -10,11 +10,11 @@ data:
       operator: sum
       title: sales
   x: product_line
-  groupby: product_line
+  groupby1: product_line
   orderby: sales
 
 controls:
 style:
   donut: true
-  innerRadius: 30 
-  outerRadius: 70	
+  innerRadius: 30
+  outerRadius: 70