@opengis/bi 1.0.35 → 1.0.36

package/server/plugins/hook.js

@@ -1,89 +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 ([200, 400, 403, 409, 404, 500].includes(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 ([200, 400, 403, 409, 404, 500].includes(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,69 +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', (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;
+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/utils/yaml.js

@@ -1,11 +1,11 @@
-import yaml from 'js-yaml';
-
-yaml.loadSafe = (yml) => {
-  try {
-    return yaml.load(yml);
-  } catch (err) {
-    return { error: err.toString() };
-  }
-};
-
-export default yaml;
+import yaml from 'js-yaml';
+
+yaml.loadSafe = (yml) => {
+  try {
+    return yaml.load(yml);
+  } catch (err) {
+    return { error: err.toString() };
+  }
+};
+
+export default yaml;

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

@@ -14,6 +14,8 @@ import normalizeData from './util/normalizeData.js';
 
 import { getWidget } from '../../../../utils.js';
 
+const maxLimit = 100;
+
 export default async function dataAPI(req, reply) {
   const time = Date.now();
 
@@ -83,7 +85,7 @@ export default async function dataAPI(req, reply) {
 
   const order = data.order || (type === 'listbar' ? 'metric desc' : null);
 
-  const { optimizedSQL = `select * from ${tableSQL || table}` } =
+  const fData =
     filter || search
       ? await getFilterSQL({
         pg,
@@ -94,16 +96,20 @@ export default async function dataAPI(req, reply) {
       })
       : {};
 
+  const optimizedSQL = widgetData?.sql
+    ? `${widgetData.sql} ${fData?.q && false ? fData?.q : ''} limit ${Math.min(query.limit || widgetData.limit || maxLimit, maxLimit)}`
+    : (fData?.optimizedSQL || `select * from ${tableSQL || table}`);
+
   if (type?.includes('bar') && !metric?.length) {
     return { message: 'empty widget params: metrics', status: 400 };
   }
 
-  const sql = (chartSQL[type] || chartSQL.chart)({
+  const sql = widgetData.sql ? optimizedSQL : (chartSQL[type] || chartSQL.chart)({
     where,
     metric,
     yType, // metric type
     columns: widgetData.columns,
-    table: `(${optimizedSQL} ${samples ? 'limit 10' : ''})q`,
+    table: `(${optimizedSQL} limit ${samples ? '10' : Math.min(query.limit || maxLimit, maxLimit)})q`,
     x,
     groupData,
     groupby,

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

@@ -1,61 +1,61 @@
-function normalizeData(data, query = {}, columnTypes = []) {
-  const skip = [];
-  ['x', 'groupby', 'granularity'].forEach((el) => {
-    // console.log(el, query[el], columnTypes.find(col => col.name == query[el]))
-    if (!columnTypes.find((col) => col.name == query[el])) {
-      if (query[el] && query[el] !== 'null') skip.push(`column not found: ${query[el]}`);
-      if (!(el === 'groupby' && query[el] === 'null')) delete query[el];
-    }
-  });
-
-  if (
-    !columnTypes.find(
-      (col) => col.type === 'numeric' && col.name == query.metric
-    )
-  ) {
-    delete query.metric;
-  }
-
-  const xName = query.x || (Array.isArray(data.x) ? data.x[0] : data.x);
-  const xType = columnTypes.find((el) => el.name == xName)?.type;
-
-  const granularity =
-    xType === 'date' || xType?.includes('timestamp')
-      ? query.granularity || data.granularity || 'year'
-      : null;
-
-  const x =
-    (granularity
-      ? `date_trunc('${granularity}',${xName})::date::text`
-      : null) || xName;
-
-  const metrics = Array.isArray(data.metrics || data.metric) ? (data.metrics || data.metric) : [data.metrics || data.metric];
-  const metric =
-    (query.metric ? `sum(${query.metric})` : null) ||
-    (metrics.length
-      ? (metrics
-        ?.filter((el) => el && columnTypes.find((col) => col.name == (el?.name || el)))
-        ?.map((el) => el.fx || `${el.operator || 'sum'}(${el.name || el})`)?.join(',') || 'count(*)')
-      : 'count(*)');
-
-  const yName = metrics?.[0]?.name || metrics?.[0];
-  const yType = columnTypes.find((el) => el.name == yName)?.type;
-
-  const { cls, table, filterCustom } = data;
-  const groupby = (query.groupby || data.groupby) === 'null' ? null : (query.groupby || data.groupby);
-  // const orderby = query.orderby || data.orderby || 'count(*)';
-
-  const custom = query?.filterCustom
-    ?.split(',')
-    ?.map((el) => filterCustom?.find((item) => item?.name === el)?.sql)
-    ?.filter((el) => el)
-    ?.join(' and ');
-  const where = `${data.query || '1=1'} and ${custom || 'true'}`;
-
-  const tableSQL = data.tableSQL?.length
-    ? `(select * from ${data?.table} t ${data.tableSQL.join(' \n ')} where ${where})q`
-    : undefined;
-
-  return { x, cls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };
-}
-export default normalizeData;
+function normalizeData(data, query = {}, columnTypes = []) {
+  const skip = [];
+  ['x', 'groupby', 'granularity'].forEach((el) => {
+    // console.log(el, query[el], columnTypes.find(col => col.name == query[el]))
+    if (!columnTypes.find((col) => col.name == query[el])) {
+      if (query[el] && query[el] !== 'null') skip.push(`column not found: ${query[el]}`);
+      if (!(el === 'groupby' && query[el] === 'null')) delete query[el];
+    }
+  });
+
+  if (
+    !columnTypes.find(
+      (col) => col.type === 'numeric' && col.name == query.metric
+    )
+  ) {
+    delete query.metric;
+  }
+
+  const xName = query.x || (Array.isArray(data.x) ? data.x[0] : data.x);
+  const xType = columnTypes.find((el) => el.name == xName)?.type;
+
+  const granularity =
+    xType === 'date' || xType?.includes('timestamp')
+      ? query.granularity || data.granularity || 'year'
+      : null;
+
+  const x =
+    (granularity
+      ? `date_trunc('${granularity}',${xName})::date::text`
+      : null) || xName;
+
+  const metrics = Array.isArray(data.metrics || data.metric) ? (data.metrics || data.metric) : [data.metrics || data.metric];
+  const metric =
+    (query.metric ? `sum(${query.metric})` : null) ||
+    (metrics.length
+      ? (metrics
+        ?.filter((el) => el && columnTypes.find((col) => col.name == (el?.name || el)))
+        ?.map((el) => el.fx || `${el.operator || 'sum'}(${el.name || el})`)?.join(',') || 'count(*)')
+      : 'count(*)');
+
+  const yName = metrics?.[0]?.name || metrics?.[0];
+  const yType = columnTypes.find((el) => el.name == yName)?.type;
+
+  const { cls, table, filterCustom } = data;
+  const groupby = (query.groupby || data.groupby) === 'null' ? null : (query.groupby || data.groupby);
+  // const orderby = query.orderby || data.orderby || 'count(*)';
+
+  const custom = query?.filterCustom
+    ?.split(',')
+    ?.map((el) => filterCustom?.find((item) => item?.name === el)?.sql)
+    ?.filter((el) => el)
+    ?.join(' and ');
+  const where = `${data.query || '1=1'} and ${custom || 'true'}`;
+
+  const tableSQL = data.tableSQL?.length
+    ? `(select * from ${data?.table} t ${data.tableSQL.join(' \n ')} where ${where})q`
+    : undefined;
+
+  return { x, cls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };
+}
+export default normalizeData;