@opengis/bi 1.0.18 → 1.0.19

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

@@ -1,38 +1,38 @@
-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 };
-  }
-}
+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,118 +1,118 @@
-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,
-  };
-}
+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,30 +1,30 @@
-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;
-}
+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;
+}

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,25 +1,25 @@
-import config from '../../../config.js';
-
-import dashboard from './controllers/dashboard.js';
-import dashboardList from './controllers/dashboard.list.js';
-import dashboardDelete from './controllers/dashboard.delete.js';
-const biSchema = {
-  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]+)$' },
-  },
-};
-
-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' };
-  });
-}
+import config from '../../../config.js';
+
+import dashboard from './controllers/dashboard.js';
+import dashboardList from './controllers/dashboard.list.js';
+import dashboardDelete from './controllers/dashboard.delete.js';
+const biSchema = {
+  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]+)$' },
+  },
+};
+
+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' };
+  });
+}