@opengis/bi 1.0.13 → 1.0.15

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;
-        }
-
-        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.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 };
-            }
-        }
-    });
-
-    // 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);
-    }
-
-    fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
-}
-
-export default fp(plugin);
+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;
+    }
+
+    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.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 };
+      }
+    }
+  });
+
+  // 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);
+  }
+
+  fastify.addContentTypeParser(
+    'application/x-www-form-urlencoded',
+    { parseAs: 'buffer' },
+    contentParser
+  );
+}
+
+export default fp(plugin);

package/server/plugins/vite.js

@@ -1,55 +1,69 @@
-import fs from 'fs';
-import path from 'path';
-import config from '../../config.js';
-const { disableAuth } = config;
-const isProduction = process.env.NODE_ENV === 'production';
-
-async function plugin(fastify) {
-  // vite server
-  if (!isProduction) {
-    const vite = await import('vite');
-
-    const viteServer = await vite.createServer({
-      server: {
-        middlewareMode: true,
-      },
-    });
-    // hot reload
-    viteServer.watcher.on('all', function (d, t) {
-      if (!t.includes('module') && !t.includes('templates')) return;
-      console.log(d, t);
-      viteServer.ws.send({ type: 'full-reload' });
-    });
-
-    // this is middleware for vite's dev servert
-    fastify.addHook('onRequest', async (req, reply) => {
-      // const { user } = req.session?.passport || {};
-      const next = () => new Promise((resolve) => {
-        viteServer.middlewares(req.raw, reply.raw, () => resolve());
-      });
-      await next();
-    });
-    fastify.get('*', async () => { });
-    return;
-  }
-
-  // From Build
-  fastify.get('*', async (req, reply) => {
-    // 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);
-  });
-  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',
-    }[ext];
-    //reply.cacheControl('max-age', '1d');
-    return mime ? reply.headers({ 'Cache-Control': 'public, max-age=3600' }).type(mime).send(stream) : stream;
-
-  });
-}
-
-export default plugin;
+import fs from 'fs';
+import path from 'path';
+import config from '../../config.js';
+
+const { disableAuth } = config;
+const isProduction = process.env.NODE_ENV === 'production';
+
+async function plugin(fastify) {
+  // vite server
+  if (!isProduction) {
+    const vite = await import('vite');
+
+    const viteServer = await vite.createServer({
+      server: {
+        middlewareMode: true,
+      },
+    });
+    // hot reload
+    viteServer.watcher.on('all', (d, t) => {
+      if (!t.includes('module') && !t.includes('templates')) return;
+      // console.log(d, t);
+      viteServer.ws.send({ type: 'full-reload' });
+    });
+
+    // this is middleware for vite's dev servert
+    fastify.addHook('onRequest', async (req, reply) => {
+      // const { user } = req.session?.passport || {};
+      const next = () => new Promise((resolve) => {
+        viteServer.middlewares(req.raw, reply.raw, () => resolve());
+      });
+      await next();
+    });
+    fastify.get('*', async () => {});
+    return;
+  }
+
+  // From Build
+  fastify.get('*', async (req, reply) => {
+    // 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);
+  });
+  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',
+    }[ext];
+    // reply.cacheControl('max-age', '1d');
+    return mime
+      ? reply
+        .headers({
+          'Cache-Control': 'public, max-age=3600',
+          'Content-Encoding': 'identity',
+        })
+        .type(mime)
+        .send(stream)
+      : stream;
+  });
+}
+
+export default plugin;

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

@@ -1,35 +1,38 @@
-import { existsSync, readdirSync } from 'fs';
-import path from 'path';
-import pgClients from '@opengis/fastify-table/pg/pgClients.js';
-
-const cwd = process.cwd();
-const dashboardDir = path.join(cwd, 'server/templates/dashboard');
-
-export default async function data({ pg = pgClients.client, params = {} }) {
-  const { id } = params;
-
-  if (!id) {
-    return { message: 'not enough params: id', status: 400 };
-  }
-
-  const dirContent = existsSync(dashboardDir) ? readdirSync(dashboardDir) : [];
-
-  if (dirContent.includes(id)) {
-    return { message: 'access restricted: ' + id, status: 403 };
-  }
-  try {
-    const { rowCount } = await pg.query(
-      `select * from bi.dashboard where $1 in (dashboard_id,name)`,
-      [id]
-    );
-
-    if (rowCount === 0) {
-      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]);
-    return { message: 'successfully deleted', status: 200 };
-  } catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { existsSync, readdirSync } from 'fs';
+import path from 'path';
+
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+const cwd = process.cwd();
+const dashboardDir = path.join(cwd, 'server/templates/dashboard');
+
+export default async function data({ pg = pgClients.client, params = {} }) {
+  const { id } = params;
+
+  if (!id) {
+    return { message: 'not enough params: id', status: 400 };
+  }
+
+  const dirContent = existsSync(dashboardDir) ? readdirSync(dashboardDir) : [];
+
+  if (dirContent.includes(id)) {
+    return { message: `access restricted: ${id}`, status: 403 };
+  }
+  try {
+    const { rowCount } = await pg.query(
+      `select * from bi.dashboard where $1 in (dashboard_id,name)`,
+      [id]
+    );
+
+    if (rowCount === 0) {
+      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,
+    ]);
+    return { message: 'successfully deleted', status: 200 };
+  } catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

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

@@ -1,80 +1,118 @@
-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 = {},
-}) {
-  const time = Date.now();
-  const { id } = params;
-
-  if (!id) {
-    return { message: 'not enough params: dashboard required', status: 400 };
-  }
-  const dashboards = await getTemplatePath('dashboard');
-
-  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)`;
-
-    const data = await pg.query(sql, [id]).then((res) => res.rows?.[0] || {});
-    data.type = 'bd';
-    const { table_name: table } = data;
-
-    if (!table) {
-      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 fileData = await getTemplate('dashboard', id);
-  const index = fileData.find(el => el[0] === 'index.yml')[1]
-
-  if (!index) {
-    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 });
-    }));
-  }
-
-
-  const data = index;
-  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].data
-        ? {
-          name: el[0].split('.')[0],
-          type: el[1].type,
-          title: el[1].title,
-          style: el[1].style,
-          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 };
-}
+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;
+
+  if (!id) {
+    return { message: 'not enough params: dashboard required', status: 400 };
+  }
+  const dashboards = await getTemplatePath('dashboard');
+
+  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)`;
+
+    const data = await pg.query(sql, [id]).then((res) => res.rows?.[0] || {});
+    data.type = 'bd';
+    const { table_name: table } = data;
+
+    if (!table) {
+      return { message: 'not enough params: table required', status: 400 };
+    }
+
+    const { fields = [] } =
+      table && pg.pk?.[table]
+        ? await pg.query(`select * from ${table} limit 0`)
+        : {};
+
+    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];
+
+  if (!index) {
+    return { message: `not found ${id}`, status: 404 };
+  }
+
+  const data = index;
+  data.type = 'file';
+  const { table } = data?.data || { table: data?.table_name };
+
+  const pg1 = data.db ? await getPGAsync(data.db) : pg;
+
+  const { fields = [] } = table
+    ? await pg1.query(`select * from ${table} limit 0`)
+    : {};
+
+  const columns = fields.map(({ name, dataTypeID }) => ({
+    name,
+    type: pg.pgType?.[dataTypeID],
+  }));
+
+  const checks = index?.filters?.filter((el) => el?.id && columns.map((el) => el?.name).includes(el?.id) && el?.type === 'Check');
+  if (checks?.length) {
+    await Promise.all(checks.map(async (el) => {
+      if (el?.data) {
+        const options = await getTemplate('cls', el.data);
+        Object.assign(el, { options });
+      } else if (index?.table_name || index?.table) {
+        const { rows = [] } = await pg.query(`select "${el.id}" as id, count(*) from ${index?.table_name || index?.table} group by "${el.id}"`);
+        Object.assign(el, { options: rows });
+      }
+    }));
+  }
+
+  // console.log(fileData)
+  const widgets = fileData
+    .filter((el) => el[0] !== 'index.yml')
+    .map((el) =>
+      el[1].data
+        ? {
+          name: el[0].split('.')[0],
+          type: el[1].type,
+          title: el[1].title,
+          style: el[1].style,
+          data: el[1].data,
+
+        }
+        : { name: el[0].split('.')[0], title: el[1] }
+    );
+  
+  return {
+    ...data,
+    table_name: table,
+    time: Date.now() - time,
+    columns,
+    widgets,
+  };
+}

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

@@ -1,39 +1,30 @@
-import { readFileSync, readdirSync } from 'fs';
-import path from 'path';
-import pgClients from '@opengis/fastify-table/pg/pgClients.js';
-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';
-
-
-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 }) {
-  const time = Date.now();
-  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 { table_name, description, title } = index || {};
-
-      return { name: filename, type: 'file', title, description, table_name };
-    })
-  );
-
-  const { rows = [] } = await pg.query(q);
-
-  const list = dir.concat(rows);
-
-  const res = {
-    time: Date.now() - time,
-    rows: list,
-  };
-  return res;
-}
+import { pgClients, getTemplate, getTemplatePath } from '@opengis/fastify-table/utils.js';
+
+// import yaml from './utils/yaml.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 }) {
+  const time = Date.now();
+  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 { table_name, description, title } = index || {};
+
+      return { name: filename, type: 'file', title, description, table_name };
+    })
+  );
+
+  const { rows = [] } = await pg.query(q);
+
+  const list = dir.concat(rows);
+
+  const res = {
+    time: Date.now() - time,
+    rows: list,
+  };
+  return res;
+}