@opengis/bi 1.2.32 → 1.2.34

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/dashboard/index.mjs

@@ -1,26 +1,26 @@
-import dashboard from './controllers/dashboard.js';
-import dashboardList from './controllers/dashboard.list.js';
-import dashboardImport from './controllers/dashboard.import.js';
-
-const biSchema = {
-  type: 'object',
-  properties: {
-    querystring: {
-      widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
-      dashboard: { type: 'string', pattern: '^([\\d\\w]+)$' },
-      list: { type: 'string', pattern: '^([\\d])$' },
-      sql: { type: 'string', pattern: '^([\\d])$' },
-    },
-    params: {
-      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-  },
-};
-
-const policy = ['public'];
-
-export default async function route(fastify) {
-  fastify.get(`/bi-dashboard/:id`, { config: { policy }, schema: biSchema }, dashboard);
-  fastify.get(`/bi-dashboard`, { config: { policy } }, dashboardList);
-  fastify.get(`/bi-dashboard-import`, { config: { policy } }, dashboardImport);
-}
+import dashboard from './controllers/dashboard.js';
+import dashboardList from './controllers/dashboard.list.js';
+import dashboardImport from './controllers/dashboard.import.js';
+
+const biSchema = {
+  type: 'object',
+  properties: {
+    querystring: {
+      widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      dashboard: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      list: { type: 'string', pattern: '^([\\d])$' },
+      sql: { type: 'string', pattern: '^([\\d])$' },
+    },
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+  },
+};
+
+const policy = ['public'];
+
+export default async function route(fastify) {
+  fastify.get(`/bi-dashboard/:id`, { config: { policy }, schema: biSchema }, dashboard);
+  fastify.get(`/bi-dashboard`, { config: { policy } }, dashboardList);
+  fastify.get(`/bi-dashboard-import`, { config: { policy } }, dashboardImport);
+}

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

@@ -1,231 +1,231 @@
-import yaml from 'js-yaml';
-
-import {
-  config,
-  autoIndex,
-  pgClients,
-  getSelect,
-  getSelectVal,
-  getFilterSQL,
-  getMeta,
-  logger,
-} from '@opengis/fastify-table/utils.js';
-
-import chartSQL from './util/chartSQL.js';
-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();
-
-  const { query = {}, user = {}, unittest } = req;
-
-  const { dashboard, widget, filter, search, samples } = query;
-
-  const widgetData = await getWidget({ pg: req.pg, dashboard, widget });
-
-  query.metric = Array.isArray(query.metric) ? query.metric.pop() : query.metric || widgetData?.metric || widgetData?.data?.metrics?.[0]?.fx;
-
-  if (widgetData.status) return widgetData;
-
-  const { type, text, data = {}, controls, style, options } = widgetData;
-
-  const pg = widgetData.pg || req.pg || pgClients.client;
-
-  const error1 = {};
-  const { fields: cols = [] } = await pg.query(
-    `select * from ${data.table} t ${widgetData.tableSQL || data.tableSQL || ''} limit 0`
-  ).catch(err => Object.assign(error1, { error: err.toString() })) || {};
-  const columnTypes = cols?.map?.((el) => ({
-    name: el.name,
-    type: pg.pgType?.[el.dataTypeID],
-  }));
-
-  // data param
-  const { x, cls, groupbyCls, metric, table, where, tableSQL, groupby, xName, yName, xType, yType, error = error1 } =
-    normalizeData(widgetData, query, columnTypes);
-
-  const limit = Math.min(query.limit || widgetData.limit || maxLimit, maxLimit);
-  // if (error) { return reply.status(400).send(error); }
-
-  // auto Index
-  if (pg.pk?.[data.table]) {
-    autoIndex({
-      table: data.table,
-      pg,
-      columns: [data?.time]
-        .concat([xName])
-        .concat([groupby])
-        .filter((el) => el),
-    }).catch((err) => console.log(err));
-  }
-
-  const { pk, columns = [], view } = await getMeta({ pg, table: data.table });
-
-  if (!view && !pk) {
-    return { message: `table not found: ${data.table} (${pg.options?.database})`, status: 404 };
-  }
-
-  // const columnList = columns.map(col => col.name);
-  const groupbyColumnNotExists = groupby?.split?.(',')?.filter?.(el => !columnTypes.map(el => el.name).includes(el.trim()));
-
-  if (groupby && groupbyColumnNotExists?.length) {
-    return { message: `groupby column not found: ${groupbyColumnNotExists} (${data.table}/${pg.options?.database})`, status: 404 };
-  }
-
-  // get group
-  const groupData = groupby
-    ? await pg
-      .query(
-        `select ${groupby} as name ,count(*) from ${tableSQL || table} group by ${groupby} order by count(*) desc limit ${limit}`
-      )
-      .then((el) => el.rows)
-    : null;
-
-  if (query.sql === '2') return { x, metric, table, tableSQL, data, groupData };
-
-  const order = data.order || (type === 'listbar' && cols.find(el => el.name === 'metric') ? 'metric desc' : null);
-
-  const fData =
-    filter || search
-      ? await getFilterSQL({
-        pg,
-        table,
-        filter,
-        search,
-        filterList: widgetData.filters,
-      })
-      : {};
-
-  const optimizedSQL = widgetData?.sql
-    ? `${widgetData.sql} ${fData?.q && false ? fData?.q : ''} limit ${limit}`
-    : (fData?.optimizedSQL || `select * from ${tableSQL || table}`);
-
-  if (type?.includes('bar') && !metric?.length) {
-    return { message: 'empty widget params: metrics', status: 400 };
-  }
-
-  const sql = widgetData.sql ? optimizedSQL : (chartSQL[type] || chartSQL.chart)({
-    where: config.local && user?.user_type === 'superadmin' ? 'true' : where, // test
-    metric,
-    yType, // metric type
-    columns: widgetData.columns,
-    table: `(${optimizedSQL})q`,
-    x,
-    groupData,
-    groupby,
-    order,
-    samples,
-    limit,
-    xType,
-    fx: widgetData.fx,
-  });
-
-  if (query.sql) return sql;
-
-  if (!sql || sql?.includes('undefined')) {
-    return {
-      message: {
-        error: 'invalid sql',
-        type,
-        sql,
-        where,
-        metric,
-        table: `(${optimizedSQL})q`,
-        x,
-        groupData,
-        groupby,
-      },
-      status: 500,
-    };
-  }
-
-  if (config.trace) console.log(sql, user?.uid);
-
-  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 (groupbyCls) {
-    const { arr = [] } = await getSelect(groupbyCls, pg) || {};
-    if (arr.length) {
-      const ids = arr.map(el => el.id);
-      const text = arr.reduce((acc, curr) => ({ ...acc, [curr.id]: curr.text }), {});
-      rows.forEach(row => {
-        ids.reduce((acc, curr) => {
-          Object.assign(row, { [text[curr]]: row[curr] });
-          delete row[curr];
-          return acc;
-        }, {});
-      });
-    }
-  }
-
-  if (cls) {
-    const values = rows
-      .map((row) => row[x])
-      ?.filter((el, idx, arr) => el && arr.indexOf(el) === idx);
-    const vals = await getSelectVal({ pg, name: cls, values });
-    rows
-      .filter((row) => row[x])
-      .forEach((row) => {
-        Object.assign(row, { [x]: vals?.[row[x]]?.text || vals?.[row[x]] || row[x] });
-      });
-  }
-
-  const metaTitles = columns.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua }), {});
-  const titles = Array.isArray(widgetData?.columns)
-    ? widgetData.columns.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua }), {})
-    : Object.keys(widgetData?.columns || {}).reduce((acc, curr) => Object.assign(acc, { [curr]: widgetData?.columns?.[curr] }), {});
-
-  const rows1 = type === 'table' ? rows.map(row => Object.keys(row || {}).reduce((acc, curr) => Object.assign(acc, { [titles?.[curr] || metaTitles?.[curr] || curr]: row?.[curr] }), {})) : rows;
-
-  const yml = widgetData.yml || yaml.dump(extractYml(widgetData));
-  const dimensions = fields.map((el) => el.name);
-
-  const res = {
-    time: Date.now() - time,
-    last_update: widgetData?.last_update,
-    error: error || errorSql || (!widgetData.sql ? widgetData.error : undefined),
-    dimensions,
-    filter: xName,
-    dimensionsType: [xType, yType].filter((el) => el)?.length
-      ? [xType, yType].filter((el) => el)
-      : fields.map((el) => pg.pgType?.[el.dataTypeID]),
-    type,
-
-    text: text || widgetData?.title || data.text,
-    // data: query.format === 'data' ? dimensions.map(el => rows.map(r => r[el])) : undefined,
-    source:
-      query.format === 'array'
-        ? dimensions.map((el) => rows1.map((r) => r[el]))
-        : rows1,
-    style,
-    options,
-    controls,
-    yml,
-    data: widgetData.data,
-    id: query.widget,
-    columns: columnTypes.map(el => Object.assign(el, { title: titles[el.name] || metaTitles?.[el.name] || el.name })),
-    params: config?.local || unittest ? {
-      x,
-      cls,
-      metric,
-      table,
-      tableSQL,
-      where,
-      groupby,
-      sql,
-    } : undefined,
-  };
-  return res;
-}
-
-function extractYml(sourceData) {
-  const { title, description, type, data, style, controls } = sourceData;
-  return { title, description, type, data, style, controls };
+import yaml from 'js-yaml';
+
+import {
+  config,
+  autoIndex,
+  pgClients,
+  getSelect,
+  getSelectVal,
+  getFilterSQL,
+  getMeta,
+  logger,
+} from '@opengis/fastify-table/utils.js';
+
+import chartSQL from './util/chartSQL.js';
+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();
+
+  const { query = {}, user = {}, unittest } = req;
+
+  const { dashboard, widget, filter, search, samples } = query;
+
+  const widgetData = await getWidget({ pg: req.pg, dashboard, widget });
+
+  query.metric = Array.isArray(query.metric) ? query.metric.pop() : query.metric || widgetData?.metric || widgetData?.data?.metrics?.[0]?.fx;
+
+  if (widgetData.status) return widgetData;
+
+  const { type, text, data = {}, controls, style, options } = widgetData;
+
+  const pg = widgetData.pg || req.pg || pgClients.client;
+
+  const error1 = {};
+  const { fields: cols = [] } = await pg.query(
+    `select * from ${data.table} t ${widgetData.tableSQL || data.tableSQL || ''} limit 0`
+  ).catch(err => Object.assign(error1, { error: err.toString() })) || {};
+  const columnTypes = cols?.map?.((el) => ({
+    name: el.name,
+    type: pg.pgType?.[el.dataTypeID],
+  }));
+
+  // data param
+  const { x, cls, groupbyCls, metric, table, where, tableSQL, groupby, xName, yName, xType, yType, error = error1 } =
+    normalizeData(widgetData, query, columnTypes);
+
+  const limit = Math.min(query.limit || widgetData.limit || maxLimit, maxLimit);
+  // if (error) { return reply.status(400).send(error); }
+
+  // auto Index
+  if (pg.pk?.[data.table]) {
+    autoIndex({
+      table: data.table,
+      pg,
+      columns: [data?.time]
+        .concat([xName])
+        .concat([groupby])
+        .filter((el) => el),
+    }).catch((err) => console.log(err));
+  }
+
+  const { pk, columns = [], view } = await getMeta({ pg, table: data.table });
+
+  if (!view && !pk) {
+    return { message: `table not found: ${data.table} (${pg.options?.database})`, status: 404 };
+  }
+
+  // const columnList = columns.map(col => col.name);
+  const groupbyColumnNotExists = groupby?.split?.(',')?.filter?.(el => !columnTypes.map(el => el.name).includes(el.trim()));
+
+  if (groupby && groupbyColumnNotExists?.length) {
+    return { message: `groupby column not found: ${groupbyColumnNotExists} (${data.table}/${pg.options?.database})`, status: 404 };
+  }
+
+  // get group
+  const groupData = groupby
+    ? await pg
+      .query(
+        `select ${groupby} as name ,count(*) from ${tableSQL || table} group by ${groupby} order by count(*) desc limit ${limit}`
+      )
+      .then((el) => el.rows)
+    : null;
+
+  if (query.sql === '2') return { x, metric, table, tableSQL, data, groupData };
+
+  const order = data.order || (type === 'listbar' && cols.find(el => el.name === 'metric') ? 'metric desc' : null);
+
+  const fData =
+    filter || search
+      ? await getFilterSQL({
+        pg,
+        table,
+        filter,
+        search,
+        filterList: widgetData.filters,
+      })
+      : {};
+
+  const optimizedSQL = widgetData?.sql
+    ? `${widgetData.sql} ${fData?.q && false ? fData?.q : ''} limit ${limit}`
+    : (fData?.optimizedSQL || `select * from ${tableSQL || table}`);
+
+  if (type?.includes('bar') && !metric?.length) {
+    return { message: 'empty widget params: metrics', status: 400 };
+  }
+
+  const sql = widgetData.sql ? optimizedSQL : (chartSQL[type] || chartSQL.chart)({
+    where: config.local && user?.user_type === 'superadmin' ? 'true' : where, // test
+    metric,
+    yType, // metric type
+    columns: widgetData.columns,
+    table: `(${optimizedSQL})q`,
+    x,
+    groupData,
+    groupby,
+    order,
+    samples,
+    limit,
+    xType,
+    fx: widgetData.fx,
+  });
+
+  if (query.sql) return sql;
+
+  if (!sql || sql?.includes('undefined')) {
+    return {
+      message: {
+        error: 'invalid sql',
+        type,
+        sql,
+        where,
+        metric,
+        table: `(${optimizedSQL})q`,
+        x,
+        groupData,
+        groupby,
+      },
+      status: 500,
+    };
+  }
+
+  if (config.trace) console.log(sql, user?.uid);
+
+  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 (groupbyCls) {
+    const { arr = [] } = await getSelect(groupbyCls, pg) || {};
+    if (arr.length) {
+      const ids = arr.map(el => el.id);
+      const text = arr.reduce((acc, curr) => ({ ...acc, [curr.id]: curr.text }), {});
+      rows.forEach(row => {
+        ids.reduce((acc, curr) => {
+          Object.assign(row, { [text[curr]]: row[curr] });
+          delete row[curr];
+          return acc;
+        }, {});
+      });
+    }
+  }
+
+  if (cls) {
+    const values = rows
+      .map((row) => row[x])
+      ?.filter((el, idx, arr) => el && arr.indexOf(el) === idx);
+    const vals = await getSelectVal({ pg, name: cls, values });
+    rows
+      .filter((row) => row[x])
+      .forEach((row) => {
+        Object.assign(row, { [x]: vals?.[row[x]]?.text || vals?.[row[x]] || row[x] });
+      });
+  }
+
+  const metaTitles = columns.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua }), {});
+  const titles = Array.isArray(widgetData?.columns)
+    ? widgetData.columns.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua }), {})
+    : Object.keys(widgetData?.columns || {}).reduce((acc, curr) => Object.assign(acc, { [curr]: widgetData?.columns?.[curr] }), {});
+
+  const rows1 = type === 'table' ? rows.map(row => Object.keys(row || {}).reduce((acc, curr) => Object.assign(acc, { [titles?.[curr] || metaTitles?.[curr] || curr]: row?.[curr] }), {})) : rows;
+
+  const yml = widgetData.yml || yaml.dump(extractYml(widgetData));
+  const dimensions = fields.map((el) => el.name);
+
+  const res = {
+    time: Date.now() - time,
+    last_update: widgetData?.last_update,
+    error: error || errorSql || (!widgetData.sql ? widgetData.error : undefined),
+    dimensions,
+    filter: xName,
+    dimensionsType: [xType, yType].filter((el) => el)?.length
+      ? [xType, yType].filter((el) => el)
+      : fields.map((el) => pg.pgType?.[el.dataTypeID]),
+    type,
+
+    text: text || widgetData?.title || data.text,
+    // data: query.format === 'data' ? dimensions.map(el => rows.map(r => r[el])) : undefined,
+    source:
+      query.format === 'array'
+        ? dimensions.map((el) => rows1.map((r) => r[el]))
+        : rows1,
+    style,
+    options,
+    controls,
+    yml,
+    data: widgetData.data,
+    id: query.widget,
+    columns: columnTypes.map(el => Object.assign(el, { title: titles[el.name] || metaTitles?.[el.name] || el.name })),
+    params: config?.local || unittest ? {
+      x,
+      cls,
+      metric,
+      table,
+      tableSQL,
+      where,
+      groupby,
+      sql,
+    } : undefined,
+  };
+  return res;
+}
+
+function extractYml(sourceData) {
+  const { title, description, type, data, style, controls } = sourceData;
+  return { title, description, type, data, style, controls };
 }

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

@@ -1,49 +1,49 @@
-function number({ metric, where, table, samples, fx }) {
-  const sql = `select ${fx || metric} from ${table} where ${where} ${samples ? 'limit 10' : ''}`;
-  return sql;
-}
-function table({ columns = [], table, where, samples }) {
-  const cols = Array.isArray(columns)
-    ? columns.map((el) => `"${(el.name || el).replace(/'/g, "''")}"`).join(',')
-    : Object.keys(columns).map(key => `"${key.replace(/'/g, "''")}"`).join(',');
-  return `select ${cols || '*'} from ${table} where ${where} ${samples ? 'limit 10' : 'limit 20'} `;
-}
-
-function chart({
-  metric,
-  yType, // metric type
-  where,
-  table,
-  x,
-  groupby,
-  groupData,
-  order,
-  samples,
-  limit = 100,
-  xType,
-  fx, // agg function
-}) {
-  const xCol = x && xType?.includes('[]') ? `unnest(${x})` : x;
-
-  const metricData =
-    groupData
-      ?.filter(el => el.name)
-      ?.map(
-        (el) =>
-          `${metric} filter (where '${el.name.toString().replace(/'/g, "''")}'=${yType?.includes('[]') ? `any(${groupby.replace(/'/g, "''")}::text[])` : groupby.replace(/'/g, "''")}) as "${el.name.toString().replace(/'/g, "''")}"`
-      )
-      .join(',') || `${fx || metric} as metric`;
-  const sql = `select ${xCol} ${x && xType?.includes('[]') ? `as ${x}` : ''}, ${metricData} 
-    from ${table}
-    where ${where} 
-    ${xCol ? `group by ${xCol}` : ''}
-    ${order || xCol ? `order by ${order || xCol}` : ''}
-    ${samples ? 'limit 10' : `limit ${limit}`}`;
-  return sql;
-}
-
-function text() {
-  return undefined;
-}
-
-export default { number, chart, table };
+function number({ metric, where, table, samples, fx }) {
+  const sql = `select ${fx || metric} from ${table} where ${where} ${samples ? 'limit 10' : ''}`;
+  return sql;
+}
+function table({ columns = [], table, where, samples }) {
+  const cols = Array.isArray(columns)
+    ? columns.map((el) => `"${(el.name || el).replace(/'/g, "''")}"`).join(',')
+    : Object.keys(columns).map(key => `"${key.replace(/'/g, "''")}"`).join(',');
+  return `select ${cols || '*'} from ${table} where ${where} ${samples ? 'limit 10' : 'limit 20'} `;
+}
+
+function chart({
+  metric,
+  yType, // metric type
+  where,
+  table,
+  x,
+  groupby,
+  groupData,
+  order,
+  samples,
+  limit = 100,
+  xType,
+  fx, // agg function
+}) {
+  const xCol = x && xType?.includes('[]') ? `unnest(${x})` : x;
+
+  const metricData =
+    groupData
+      ?.filter(el => el.name)
+      ?.map(
+        (el) =>
+          `${metric} filter (where '${el.name.toString().replace(/'/g, "''")}'=${yType?.includes('[]') ? `any(${groupby.replace(/'/g, "''")}::text[])` : groupby.replace(/'/g, "''")}) as "${el.name.toString().replace(/'/g, "''")}"`
+      )
+      .join(',') || `${fx || metric} as metric`;
+  const sql = `select ${xCol} ${x && xType?.includes('[]') ? `as ${x}` : ''}, ${metricData} 
+    from ${table}
+    where ${where} 
+    ${xCol ? `group by ${xCol}` : ''}
+    ${order || xCol ? `order by ${order || xCol}` : ''}
+    ${samples ? 'limit 10' : `limit ${limit}`}`;
+  return sql;
+}
+
+function text() {
+  return undefined;
+}
+
+export default { number, chart, table };