@opengis/bi 1.0.13 → 1.0.14

package/plugin.js

@@ -1,13 +1,13 @@
 import fp from 'fastify-plugin';
 import config from './config.js';
-config.prefix = config.prefix || '/api'
-async function plugin(fastify, opts = config) {
 
+config.prefix = config.prefix || '/api';
+async function plugin(fastify, opts = config) {
   // API
   fastify.register(import('./server/routes/dashboard/index.mjs'), config);
+  fastify.register(import('./server/routes/db/index.mjs'), config);
   fastify.register(import('./server/routes/data/index.mjs'), config);
   fastify.register(import('./server/routes/edit/index.mjs'), config);
-
 }
 
-export default fp(plugin)
+export default fp(plugin);

package/server/migrations/bi.sql

@@ -1,3 +1,69 @@
+create schema if not exists bi;
+
+CREATE TABLE if not exists bi.dashboard ();
+alter table bi.dashboard drop constraint if exists dashboard_id_pkey cascade;
+
+alter table bi.dashboard add column if not exists dashboard_id text;
+alter table bi.dashboard alter column dashboard_id set not null;
+alter table bi.dashboard alter column dashboard_id set default next_id();
+
+alter table bi.dashboard add column if not exists title text;
+alter table bi.dashboard add column if not exists description text;
+alter table bi.dashboard add column if not exists widgets json;
+alter table bi.dashboard add column if not exists table_name text;
+alter table bi.dashboard add column if not exists style json;
+alter table bi.dashboard add column if not exists name text;
+alter table bi.dashboard alter column name set not null;
+alter table bi.dashboard add column if not exists panels json;
+alter table bi.dashboard add column if not exists grid json;
+alter table bi.dashboard add column if not exists filters json;
+
+alter table bi.dashboard add CONSTRAINT dashboard_id_pkey PRIMARY KEY (dashboard_id);
+
+COMMENT ON TABLE bi.dashboard IS 'Дашборди';
+COMMENT ON COLUMN bi.dashboard.dashboard_id IS 'PK';
+COMMENT ON COLUMN bi.dashboard.title IS 'Заголовок';
+COMMENT ON COLUMN bi.dashboard.description IS 'Опис';
+COMMENT ON COLUMN bi.dashboard.widgets IS 'Віджети';
+COMMENT ON COLUMN bi.dashboard.table_name IS 'Назва таблиці';
+COMMENT ON COLUMN bi.dashboard.style IS 'Стилі';
+COMMENT ON COLUMN bi.dashboard.name IS 'Назва';
+COMMENT ON COLUMN bi.dashboard.panels IS 'Панелі віджетів';
+COMMENT ON COLUMN bi.dashboard.grid IS 'Сітка';
+COMMENT ON COLUMN bi.dashboard.filters IS 'Фільтри';
+
+CREATE TABLE if not exists bi.widget ();
+alter table bi.widget drop constraint if exists widget_id_pk;
+alter table bi.widget drop constraint if exists widget_id_fkey;
+
+alter table bi.widget add column if not exists widget_id text;
+alter table bi.widget alter column widget_id set not null;
+alter table bi.widget alter column widget_id set default next_id();
+alter table bi.widget add column if not exists type text;
+alter table bi.widget add column if not exists title text;
+alter table bi.widget add column if not exists style json;
+alter table bi.widget add column if not exists data json;
+alter table bi.widget add column if not exists table_name text;
+alter table bi.widget add column if not exists dashboard_id text;
+alter table bi.widget add column if not exists name text;
+alter table bi.widget add column if not exists x text;
+alter table bi.widget add column if not exists col numeric;
+alter table bi.widget add column if not exists metrics text;
+alter table bi.widget add column if not exists yml text;
+
+alter table bi.widget add CONSTRAINT widget_id_pk PRIMARY KEY (widget_id);
+alter table bi.widget add CONSTRAINT widget_id_fkey FOREIGN KEY (dashboard_id) REFERENCES bi.dashboard (dashboard_id);
+
+COMMENT ON TABLE bi.widget IS 'Віджети';
+COMMENT ON COLUMN bi.widget.widget_id IS 'PK';
+COMMENT ON COLUMN bi.widget.type IS 'Тип';
+COMMENT ON COLUMN bi.widget.title IS 'Назва';
+COMMENT ON COLUMN bi.widget.style IS 'Стилі';
+COMMENT ON COLUMN bi.widget.yml IS 'Yml';
+COMMENT ON COLUMN bi.widget.data IS 'Дані';
+COMMENT ON COLUMN bi.widget.table_name IS 'Назва таблиці';
+COMMENT ON COLUMN bi.widget.dashboard_id IS 'Ідентифікатор дашборду';
+
 create table if not exists bi.cluster();
 alter table bi.cluster drop constraint if exists bi_cluster_cluster_id_pkey;
 alter table bi.cluster drop constraint if exists bi_cluster_title_type_unique;

package/server/plugins/docs.js

@@ -1,5 +1,3 @@
-'use strict'
-
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
@@ -8,40 +6,43 @@ 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);
+  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;

package/server/plugins/hook.js

@@ -1,86 +1,89 @@
 import fp from 'fastify-plugin';
 import fs from 'fs';
 
-
 // the use of fastify-plugin is required to be able
 // to export the decorators to the outer scope
 
 async function plugin(fastify) {
+  // preSerialization
+  fastify.addHook('preSerialization', async (req, reply, payload) => {
+    if (!req.session?.passport?.user?.uid) {
+      // return reply.redirect('/login');
+    }
+    if (req.url.includes('/suggest/') && !req.query.json) {
+      return payload?.data;
+    }
+    if (payload.redirect) {
+      return reply.redirect(payload.redirect);
+    }
+    if (reply.sent) {
+      return null;
+    }
 
-
-
-
-    // preSerialization
-    fastify.addHook('preSerialization', async (req, reply, payload) => {
-        if (!req.session?.passport?.user?.uid) {
-            // return reply.redirect('/login');
-        }
-        if (req.url.includes('/suggest/') && !req.query.json) {
-            return payload?.data;
-        }
-        if (payload.redirect) {
-            return reply.redirect(payload.redirect);
-        }
-        if (reply.sent) {
-            return null;
-        }
-
-        if (payload.status) {
-            reply.status(payload.status);
-        }
-        /*if (payload.headers) {
+    if (payload.status) {
+      reply.status(payload.status);
+    }
+    /* if (payload.headers) {
           reply.headers(payload.headers);
-        }*/
-        if (payload.buffer) {
-            return payload.buffer;
-        }
-        if (payload.file) {
-            // const buffer = await readFile(payload.file);
-            // return reply.send(buffer);
-            const stream = fs.createReadStream(payload.file);
-            return stream;
-            // return reply.send(stream);
-        }
+        } */
+    if (payload.buffer) {
+      return payload.buffer;
+    }
+    if (payload.file) {
+      // const buffer = await readFile(payload.file);
+      // return reply.send(buffer);
+      const stream = fs.createReadStream(payload.file);
+      return stream;
+      // return reply.send(stream);
+    }
 
-        if (payload.message) {
-            return payload.message;
-        }
-        return payload;
-    });
+    if (payload.message) {
+      return payload.message;
+    }
+    return payload;
+  });
 
-    //  preValidation
-    fastify.addHook('preValidation', async (req) => {
-        const parseRawBody = ['POST', 'PUT'].includes(req.method) && req.body && typeof req.body === 'string'
-            && req.body.trim(/\r\n/g).startsWith('{')
-            && req.body.trim(/\r\n/g).endsWith('}');
-        if (parseRawBody) {
-            try {
-                req.body = JSON.parse(req.body || '{}');
-            }
-            catch (err) {
-                // throw new Error('invalid body');
-                // return { error: 'invalid body', status: 400 };
-            }
-        }
-    });
+  //  preValidation
+  fastify.addHook('preValidation', async (req) => {
+    const parseRawBody =
+      ['POST', 'PUT'].includes(req.method) &&
+      req.body &&
+      typeof req.body === 'string' &&
+      req.body.trim(/\r\n/g).startsWith('{') &&
+      req.body.trim(/\r\n/g).endsWith('}');
+    if (parseRawBody) {
+      try {
+        req.body = JSON.parse(req.body || '{}');
+      } catch (err) {
+        // throw new Error('invalid body');
+        // return { error: 'invalid body', status: 400 };
+      }
+    }
+  });
 
-    // allow upload file
-    const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
-    fastify.addContentTypeParser('multipart', (request, _, done) => {
-        request[kIsMultipart] = true;
-        done(null);
-    });
+  // allow upload file
+  const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
+  fastify.addContentTypeParser('multipart', (request, _, done) => {
+    request[kIsMultipart] = true;
+    done(null);
+  });
 
-    // parse Body
-    function contentParser(req, body, done) {
-        const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
-            const [key, val] = el.split('=');
-            return { ...acc, [key]: val };
-        }, {});
-        done(null, parseBody);
-    }
+  // parse Body
+  function contentParser(req, body, done) {
+    const parseBody = decodeURIComponent(body.toString())
+      .split('&')
+      .reduce((acc, el) => {
+        const [key, val] = el.split('=');
+        return { ...acc, [key]: val };
+      }, {});
+    done(null, parseBody);
+  }
 
-    fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
+  fastify.addContentTypeParser(
+    'application/x-www-form-urlencoded',
+    { parseAs: 'buffer' },
+    contentParser
+  );
 }
 
 export default fp(plugin);

package/server/plugins/vite.js

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import config from '../../config.js';
+
 const { disableAuth } = config;
 const isProduction = process.env.NODE_ENV === 'production';
 
@@ -15,9 +16,9 @@ async function plugin(fastify) {
       },
     });
     // hot reload
-    viteServer.watcher.on('all', function (d, t) {
+    viteServer.watcher.on('all', (d, t) => {
       if (!t.includes('module') && !t.includes('templates')) return;
-      console.log(d, t);
+      // console.log(d, t);
       viteServer.ws.send({ type: 'full-reload' });
     });
 
@@ -29,7 +30,7 @@ async function plugin(fastify) {
       });
       await next();
     });
-    fastify.get('*', async () => { });
+    fastify.get('*', async () => {});
     return;
   }
 
@@ -38,17 +39,30 @@ async function plugin(fastify) {
     // 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);
+    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',
+      '.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' }).type(mime).send(stream) : stream;
-
+    // reply.cacheControl('max-age', '1d');
+    return mime
+      ? reply
+        .headers({
+          'Cache-Control': 'public, max-age=3600',
+          'Content-Encoding': 'identity',
+        })
+        .type(mime)
+        .send(stream)
+      : stream;
   });
 }
 

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

@@ -15,7 +15,7 @@ export default async function data({ pg = pgClients.client, params = {} }) {
   const dirContent = existsSync(dashboardDir) ? readdirSync(dashboardDir) : [];
 
   if (dirContent.includes(id)) {
-    return { message: 'access restricted: ' + id, status: 403 };
+    return { message: `access restricted: ${id}`, status: 403 };
   }
   try {
     const { rowCount } = await pg.query(
@@ -24,10 +24,12 @@ export default async function data({ pg = pgClients.client, params = {} }) {
     );
 
     if (rowCount === 0) {
-      return { message: 'not found ' + id, status: 404 };
+      return { message: `not found ${id}`, status: 404 };
     }
     await pg.query(`delete from bi.widget where $1 in (dashboard_id)`, [id]);
-    await pg.query(`delete from bi.dashboard where $1 in (dashboard_id,name)`, [id]);
+    await pg.query(`delete from bi.dashboard where $1 in (dashboard_id,name)`, [
+      id,
+    ]);
     return { message: 'successfully deleted', status: 200 };
   } catch (err) {
     return { error: err.toString(), status: 500 };

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

@@ -1,13 +1,14 @@
-import path from 'path';
-import { existsSync, readFileSync, readdirSync } from 'fs';
-
-import pgClients from '@opengis/fastify-table/pg/pgClients.js';
-import getTemplatePath from '@opengis/fastify-table/table/controllers/utils/getTemplatePath.js';
-import { getTemplate } from '@opengis/fastify-table/utils.js';
-import { getPGAsync } from '@opengis/fastify-table/utils.js';
-
-export default async function data({
-  pg = pgClients.client, params = {},
+import yaml from 'js-yaml';
+import {
+  pgClients,
+  getTemplatePath,
+  getTemplate,
+  getPGAsync,
+} from '@opengis/fastify-table/utils.js';
+
+export default async function dashboard({
+  pg = pgClients.client,
+  params = {},
 }) {
   const time = Date.now();
   const { id } = params;
@@ -17,7 +18,7 @@ export default async function data({
   }
   const dashboards = await getTemplatePath('dashboard');
 
-  const fileDashboard = dashboards.find(el => el[0] === id)
+  const fileDashboard = dashboards.find((el) => el[0] === id);
   if (!fileDashboard) {
     const sql = `select title, description, table_name, panels, grid, widgets, filters, style 
     from bi.dashboard where $1 in (dashboard_id, name)`;
@@ -30,29 +31,50 @@ export default async function data({
       return { message: 'not enough params: table required', status: 400 };
     }
 
-    const { fields = [] } = table && pg.pk?.[table] ? await pg.query(`select * from ${table} limit 1`) : {};
-
-    const columns = table ? fields.map(({ name, dataTypeID }) => ({ name, type: pg.pgType?.[dataTypeID] })) : [];
-    return { ...data, error: table && !pg.pk?.[table] ? `table pkey not found: ${table}` : undefined, table_name: table, time: Date.now() - time, columns };
+    const { fields = [] } =
+      table && pg.pk?.[table]
+        ? await pg.query(`select * from ${table} limit 1`)
+        : {};
+
+    const columns = table
+      ? fields.map(({ name, dataTypeID }) => ({
+        name,
+        type: pg.pgType?.[dataTypeID],
+      }))
+      : [];
+    data.widgets.forEach(el => {
+      const { style, data = {}, type, title, x, metrics } = el;
+      el.yml = yaml.dump({ title, type, data: { x, metrics, ...data }, style, })
+      // el.yml = yaml.dump({ style, data, type, title });
+    })
+    return {
+      ...data,
+      error:
+        table && !pg.pk?.[table] ? `table pkey not found: ${table}` : undefined,
+      table_name: table,
+      time: Date.now() - time,
+      columns,
+    };
   }
 
-
-
   const fileData = await getTemplate('dashboard', id);
-  const index = fileData.find(el => el[0] === 'index.yml')[1]
+  const index = fileData.find((el) => el[0] === 'index.yml')[1];
 
   if (!index) {
-    return { message: 'not found ' + id, status: 404 };
+    return { message: `not found ${id}`, status: 404 };
   }
 
   if (index?.filters?.filter((el) => el?.type === 'Check')?.length) {
-    await Promise.all(index.filters.filter((el) => el?.type === 'Check' && el?.data).map(async (el) => {
-      const options = await getTemplate('cls', el.data);
-      Object.assign(el, { options });
-    }));
+    await Promise.all(
+      index.filters
+        .filter((el) => el?.type === 'Check' && el?.data)
+        .map(async (el) => {
+          const options = await getTemplate('cls', el.data);
+          Object.assign(el, { options });
+        })
+    );
   }
 
-
   const data = index;
   data.type = 'file';
   const { table } = data?.data || { table: data?.table_name };
@@ -66,15 +88,27 @@ export default async function data({
           type: el[1].type,
           title: el[1].title,
           style: el[1].style,
-          data: el[1].data
+          data: el[1].data,
+
         }
         : { name: el[0].split('.')[0], title: el[1] }
     );
-  const pg1 = data.db ? await getPGAsync(data.db) : pg
-
-  const { fields = [] } = table ? await pg1.query(`select * from ${table} limit 1`) : {};
-
-  const columns = fields.map(({ name, dataTypeID }) => ({ name, type: pg.pgType?.[dataTypeID] }));
-
-  return { ...data, table_name: table, time: Date.now() - time, columns, widgets };
+  const pg1 = data.db ? await getPGAsync(data.db) : pg;
+
+  const { fields = [] } = table
+    ? await pg1.query(`select * from ${table} limit 1`)
+    : {};
+
+  const columns = fields.map(({ name, dataTypeID }) => ({
+    name,
+    type: pg.pgType?.[dataTypeID],
+  }));
+
+  return {
+    ...data,
+    table_name: table,
+    time: Date.now() - time,
+    columns,
+    widgets,
+  };
 }

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

@@ -5,12 +5,10 @@ import { getTemplate } from '@opengis/fastify-table/utils.js';
 import getTemplatePath from '@opengis/fastify-table/table/controllers/utils/getTemplatePath.js';
 
 import yaml from './utils/yaml.js';
-//import getTemplate from '@opengis/fastify-table/table/controllers/utils/getTemplate.js';
-
+// import getTemplate from '@opengis/fastify-table/table/controllers/utils/getTemplate.js';
 
 const cwd = process.cwd();
 
-
 const q = `select dashboard_id as name, 'db' as type, title, description, table_name from bi.dashboard`;
 
 export default async function data({ pg = pgClients.client }) {
@@ -18,9 +16,8 @@ export default async function data({ pg = pgClients.client }) {
   const data = await getTemplatePath('dashboard');
   const dir = await Promise.all(
     data.map(async ([filename]) => {
-
       const data = await getTemplate('dashboard', filename);
-      const index = data.find(el => el[0] === 'index.yml')[1]
+      const index = data.find((el) => el[0] === 'index.yml')[1];
       const { table_name, description, title } = index || {};
 
       return { name: filename, type: 'file', title, description, table_name };

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

@@ -3,8 +3,7 @@ import yaml from 'js-yaml';
 yaml.loadSafe = (yml) => {
   try {
     return yaml.load(yml);
-  }
-  catch (err) {
+  } catch (err) {
     return { error: err.toString() };
   }
 };

package/server/routes/dashboard/index.mjs

@@ -8,17 +8,18 @@ const biSchema = {
     widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
     dashboard: { type: 'string', pattern: '^([\\d\\w]+)$' },
     list: { type: 'string', pattern: '^([\\d])$' },
-    sql: { type: 'string', pattern: '^([\\d])$' }
+    sql: { type: 'string', pattern: '^([\\d])$' },
   },
   params: {
     id: { type: 'string', pattern: '^([\\d\\w]+)$' },
   },
 };
 
-
 export default async function route(fastify) {
   fastify.get(`/bi-dashboard/:id`, { schema: biSchema }, dashboard);
   fastify.get(`/bi-dashboard`, dashboardList);
   fastify.delete(`/bi-dashboard/:id`, dashboardDelete);
-  fastify.get(`/bi-test`, () => { return { test: '2' }});
-}
+  fastify.get(`/bi-test`, () => {
+    return { test: '2' };
+  });
+}