@opengis/bi 1.2.32 → 1.2.34

package/server/routes/edit/controllers/widget.add.js

@@ -1,78 +1,78 @@
-import { createHash } from 'node:crypto';
-import { dataInsert, dataUpdate, getPGAsync, pgClients } from "@opengis/fastify-table/utils.js";
-
-/* eslint-disable import/extensions */
-import { yamlSafe } from '../../../../utils.js';
-
-function generateUniqueName(prefix = 'bar') {
-  const randomPart = Math.floor(Math.random() * 10000);
-  const timestamp = Date.now();
-  return `${prefix}_${randomPart}_${timestamp}`;
-}
-
-export default async function widgetAdd({ pg = pgClients.client, params = {}, body = {} }) {
-  const { name: dashboardName } = params;
-  if (!dashboardName) {
-    return { message: 'not enough params: id', status: 400 };
-  }
-  const data = body.yml ? yamlSafe.load(body.yml) : body;
-
-  const row = await pg.query(`select dashboard_id, widgets, panels, table_name, db from bi.dashboard 
-  where $1 in (dashboard_id,name)`, [dashboardName]).then(el => el.rows?.[0] || {});
-
-  const pg1 = row?.db ? await getPGAsync(row.db) : pg;
-
-  const tableName = data.data?.table
-    || data?.table
-    || data.table_name
-    || row.table_name;
-
-  const loadTemplate = pg1.pk?.['admin.doc_template'] ? await pg1.query(
-    'select body from admin.doc_template where doc_type=5 and title=$1',
-    [tableName]
-  ).then(el => el.rows?.[0]?.body) : null;
-
-  if (!tableName || !(pg.pk?.[loadTemplate?.table || tableName] || pgClients[data.db || row.db || 'client']?.pk?.[loadTemplate?.table || tableName])) {
-    return { message: 'bad params: table', status: 400 };
-  }
-
-  const { dashboard_id: dashboardId } = row;
-
-  const metric = data.data?.metrics || data.data?.metric || data?.metrics || data?.metric;
-  Object.assign(data, {
-    name: generateUniqueName(data.type),
-    table_name: tableName,
-    metrics: Array.isArray(metric) ? metric[0] : metric,
-  });
-
-  data.widget_id = createHash('md5').update([data?.name, dashboardId].join()).digest('hex').substr(0, 10);
-
-  const res = await dataUpdate({
-    pg,
-    table: 'bi.dashboard',
-    id: dashboardId,
-    data: {
-      widgets: [data].concat(row.widgets || []),
-      panels: [{ widget: data.name, col: data.col || 3, height: data.data?.height }].concat(
-        row.panels || []
-      ),
-    },
-  });
-
-  const widgetData = { ...data, data, dashboard_id: dashboardId };
-  if (body?.yml) Object.assign(widgetData, { yml: body.yml });
-
-  await dataInsert({
-    pg,
-    table: 'bi.widget',
-    data: widgetData,
-  });
-
-  return {
-    dashboard: dashboardName,
-    widgetId: data.widget_id,
-    widgetName: data.name,
-    status: 200,
-    rows: res,
-  };
-}
+import { createHash } from 'node:crypto';
+import { dataInsert, dataUpdate, getPGAsync, pgClients } from "@opengis/fastify-table/utils.js";
+
+/* eslint-disable import/extensions */
+import { yamlSafe } from '../../../../utils.js';
+
+function generateUniqueName(prefix = 'bar') {
+  const randomPart = Math.floor(Math.random() * 10000);
+  const timestamp = Date.now();
+  return `${prefix}_${randomPart}_${timestamp}`;
+}
+
+export default async function widgetAdd({ pg = pgClients.client, params = {}, body = {} }) {
+  const { name: dashboardName } = params;
+  if (!dashboardName) {
+    return { message: 'not enough params: id', status: 400 };
+  }
+  const data = body.yml ? yamlSafe.load(body.yml) : body;
+
+  const row = await pg.query(`select dashboard_id, widgets, panels, table_name, db from bi.dashboard 
+  where $1 in (dashboard_id,name)`, [dashboardName]).then(el => el.rows?.[0] || {});
+
+  const pg1 = row?.db ? await getPGAsync(row.db) : pg;
+
+  const tableName = data.data?.table
+    || data?.table
+    || data.table_name
+    || row.table_name;
+
+  const loadTemplate = pg1.pk?.['admin.doc_template'] ? await pg1.query(
+    'select body from admin.doc_template where doc_type=5 and title=$1',
+    [tableName]
+  ).then(el => el.rows?.[0]?.body) : null;
+
+  if (!tableName || !(pg.pk?.[loadTemplate?.table || tableName] || pgClients[data.db || row.db || 'client']?.pk?.[loadTemplate?.table || tableName])) {
+    return { message: 'bad params: table', status: 400 };
+  }
+
+  const { dashboard_id: dashboardId } = row;
+
+  const metric = data.data?.metrics || data.data?.metric || data?.metrics || data?.metric;
+  Object.assign(data, {
+    name: generateUniqueName(data.type),
+    table_name: tableName,
+    metrics: Array.isArray(metric) ? metric[0] : metric,
+  });
+
+  data.widget_id = createHash('md5').update([data?.name, dashboardId].join()).digest('hex').substr(0, 10);
+
+  const res = await dataUpdate({
+    pg,
+    table: 'bi.dashboard',
+    id: dashboardId,
+    data: {
+      widgets: [data].concat(row.widgets || []),
+      panels: [{ widget: data.name, col: data.col || 3, height: data.data?.height }].concat(
+        row.panels || []
+      ),
+    },
+  });
+
+  const widgetData = { ...data, data, dashboard_id: dashboardId };
+  if (body?.yml) Object.assign(widgetData, { yml: body.yml });
+
+  await dataInsert({
+    pg,
+    table: 'bi.widget',
+    data: widgetData,
+  });
+
+  return {
+    dashboard: dashboardName,
+    widgetId: data.widget_id,
+    widgetName: data.name,
+    status: 200,
+    rows: res,
+  };
+}

package/server/routes/edit/controllers/widget.del.js

@@ -1,58 +1,58 @@
-import { dataDelete, dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function widgetDel({ pg = pgClients.client, params = {} }) {
-  const { widget: widgetName, name: dashboardName } = params;
-
-  if (!widgetName || !dashboardName) {
-    return {
-      message: 'not enough params: dashboard and widget name',
-      status: 400,
-    };
-  }
-
-  const row = await pg.query(`select a.widget_id, b.dashboard_id from bi.widget a, bi.dashboard b
-    where $2 in (a.widget_id, a.name) and $1 in (b.dashboard_id, b.name) order by 1,2`, [dashboardName, widgetName])
-    .then(el => el.rows?.[0] || {});
-
-  const { widget_id: widgetId, dashboard_id: dashboardId } = row || {};
-
-  if (!widgetId) {
-    return { message: `widget not found ${widgetName}`, status: 404 };
-  }
-
-  await dataDelete({
-    pg,
-    table: 'bi.widget',
-    id: widgetId,
-  });
-
-  const currentDashboard = await pg.query('select * from  bi.dashboard where $1 in (dashboard_id, name)', [dashboardName])
-    .then(el => el.rows?.[0] || {});
-
-  const body = currentDashboard;
-
-  if (!currentDashboard) {
-    return { message: `dashboard not found ${dashboardName}`, status: 404 };
-  }
-  body.panels =
-    Array.isArray(body.panels) && body.panels?.length
-      ? body.panels?.filter((panel) => panel.widget !== widgetName)
-      : undefined;
-  body.widgets =
-    Array.isArray(body.widgets) && body?.widgets?.length
-      ? body.widgets?.filter((widget) => widget.name !== widgetName)
-      : undefined;
-
-  const res1 = await dataUpdate({
-    pg,
-    table: 'bi.dashboard',
-    id: dashboardId,
-    data: body,
-  });
-
-  return {
-    message: `Deleted widget ${widgetName}`,
-    status: 200,
-    rows: res1,
-  };
-}
+import { dataDelete, dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function widgetDel({ pg = pgClients.client, params = {} }) {
+  const { widget: widgetName, name: dashboardName } = params;
+
+  if (!widgetName || !dashboardName) {
+    return {
+      message: 'not enough params: dashboard and widget name',
+      status: 400,
+    };
+  }
+
+  const row = await pg.query(`select a.widget_id, b.dashboard_id from bi.widget a, bi.dashboard b
+    where $2 in (a.widget_id, a.name) and $1 in (b.dashboard_id, b.name) order by 1,2`, [dashboardName, widgetName])
+    .then(el => el.rows?.[0] || {});
+
+  const { widget_id: widgetId, dashboard_id: dashboardId } = row || {};
+
+  if (!widgetId) {
+    return { message: `widget not found ${widgetName}`, status: 404 };
+  }
+
+  await dataDelete({
+    pg,
+    table: 'bi.widget',
+    id: widgetId,
+  });
+
+  const currentDashboard = await pg.query('select * from  bi.dashboard where $1 in (dashboard_id, name)', [dashboardName])
+    .then(el => el.rows?.[0] || {});
+
+  const body = currentDashboard;
+
+  if (!currentDashboard) {
+    return { message: `dashboard not found ${dashboardName}`, status: 404 };
+  }
+  body.panels =
+    Array.isArray(body.panels) && body.panels?.length
+      ? body.panels?.filter((panel) => panel.widget !== widgetName)
+      : undefined;
+  body.widgets =
+    Array.isArray(body.widgets) && body?.widgets?.length
+      ? body.widgets?.filter((widget) => widget.name !== widgetName)
+      : undefined;
+
+  const res1 = await dataUpdate({
+    pg,
+    table: 'bi.dashboard',
+    id: dashboardId,
+    data: body,
+  });
+
+  return {
+    message: `Deleted widget ${widgetName}`,
+    status: 200,
+    rows: res1,
+  };
+}

package/server/routes/edit/controllers/widget.edit.js

@@ -1,115 +1,115 @@
-import { dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getWidget, yamlSafe } from '../../../../utils.js';
-
-export default async function widgetEdit({ pg = pgClients.client, body, params }, reply) {
-  const { widget: widgetName, name: dashboardName } = params;
-  const data = body.yml && !body.style ? yamlSafe.load(body.yml) : body;
-  const yml = body.yml ?? yamlSafe.dump(body.data);
-  // console.log(body.data, data, body.yml, yml);
-
-  if (!widgetName || !dashboardName) {
-    return reply.status(400).send({
-      error: 'not enough params: dashboard and widget name',
-      code: 400,
-    });
-  }
-
-  const { widget_id: widgetId, dashboard_id: dashboardId, widgets } = await pg.query(
-    `select a.widget_id , b.dashboard_id, b.widgets from bi.widget a, bi.dashboard b
-    where $2 in (a.widget_id, a.name) and $1 in (b.dashboard_id, b.name) order by 1,2`,
-    [dashboardName, widgetName]).then(res1 => res1.rows?.[0] || {});
-
-  // get Data
-  const templateData = await getWidget({ pg, dashboard: dashboardName, widget: widgetName });
-  if (!templateData) {
-    return reply.status(404).send({
-      error: `widget not found ${widgetName}`,
-      code: 404,
-    });
-  }
-
-  if (data?.data) {
-    Object.assign(data, {
-      data: Object.keys(data.data || {})
-        ?.reduce?.((acc, curr) => ({ ...acc, [curr]: data.data[curr] === 'null' ? null : data.data[curr] }), {})
-    });
-  }
-  const widgetData = ['style', 'data', 'type', 'title', 'controls', 'query', 'cls', 'x']
-    .filter(el => data[el])
-    .reduce((p, el) => ({ ...p, [el]: data[el] }), {});
-
-  // get table
-  const tableName = body.table
-    || widgetData.data?.table_name
-    || widgetData.data?.table
-    || widgetData?.table_name
-    || templateData.table;
-
-  const loadTemplate = pg?.pk?.['admin.doc_template'] ? await pg.query(
-    'select body from admin.doc_template where doc_type=5 and title=$1',
-    [tableName]
-  ).then(el => el.rows?.[0]?.body) : null;
-
-  if (!pg || !tableName || !(pg.pk?.[loadTemplate?.table || tableName] || pgClients[widgetData?.data?.db || templateData?.db || 'client']?.pk?.[loadTemplate?.table || tableName])) {
-    return reply.status(400).send({
-      error: 'bad params: table ' + tableName,
-      code: 400,
-    });
-  }
-
-  if (yml) {
-    Object.assign(widgetData, { yml })
-  }
-
-  if (widgetData?.data) {
-    Object.assign(widgetData, { data: { ...widgetData?.data || {}, table_name: tableName } });
-  }
-  Object.assign(widgetData, { table_name: tableName });
-  // console.log(widgetData);
-  const row = await dataUpdate({
-    pg,
-    table: 'bi.widget',
-    id: widgetId,
-    data: widgetData,
-  });
-
-  const idx = widgets?.findIndex?.(el => el.name === widgetName)?.toString?.() || -1;
-  if (widgetData.hasOwnProperty('table_name') && idx > -1) {
-    widgets[idx].table_name = tableName;
-    widgets[idx].table = tableName;
-  }
-  if (widgetData.hasOwnProperty('data') && idx > -1) {
-    widgets[idx].data = widgetData.data
-  }
-  if (widgetData.hasOwnProperty('yml') && idx > -1) {
-    widgets[idx].yml = widgetData.yml;
-  }
-  if (widgetData.hasOwnProperty('style') && idx > -1) {
-    widgets[idx].style = widgetData.style;
-  }
-  if (widgetData.hasOwnProperty('type') && idx > -1) {
-    widgets[idx].type = widgetData.type;
-  }
-  if (widgetData.data?.type === 'text' && idx > -1) {
-    widgets[idx].data.text = widgetData.data?.text;
-  }
-  if (typeof widgetData?.query === 'string' && idx > -1) {
-    widgets[idx].data.query = widgetData.query;
-  }
-  if (typeof widgetData?.cls === 'string' && idx > -1) {
-    widgets[idx].data.cls = widgetData.cls;
-  }
-  if (typeof widgetData?.x === 'string' && idx > -1) {
-    widgets[idx].data.x = widgetData.x;
-  }
-
-  await dataUpdate({
-    pg,
-    table: 'bi.dashboard',
-    id: dashboardId,
-    data: { widgets },
-  });
-
-  return row;
-}
+import { dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
+
+import { getWidget, yamlSafe } from '../../../../utils.js';
+
+export default async function widgetEdit({ pg = pgClients.client, body, params }, reply) {
+  const { widget: widgetName, name: dashboardName } = params;
+  const data = body.yml && !body.style ? yamlSafe.load(body.yml) : body;
+  const yml = body.yml ?? yamlSafe.dump(body.data);
+  // console.log(body.data, data, body.yml, yml);
+
+  if (!widgetName || !dashboardName) {
+    return reply.status(400).send({
+      error: 'not enough params: dashboard and widget name',
+      code: 400,
+    });
+  }
+
+  const { widget_id: widgetId, dashboard_id: dashboardId, widgets } = await pg.query(
+    `select a.widget_id , b.dashboard_id, b.widgets from bi.widget a, bi.dashboard b
+    where $2 in (a.widget_id, a.name) and $1 in (b.dashboard_id, b.name) order by 1,2`,
+    [dashboardName, widgetName]).then(res1 => res1.rows?.[0] || {});
+
+  // get Data
+  const templateData = await getWidget({ pg, dashboard: dashboardName, widget: widgetName });
+  if (!templateData) {
+    return reply.status(404).send({
+      error: `widget not found ${widgetName}`,
+      code: 404,
+    });
+  }
+
+  if (data?.data) {
+    Object.assign(data, {
+      data: Object.keys(data.data || {})
+        ?.reduce?.((acc, curr) => ({ ...acc, [curr]: data.data[curr] === 'null' ? null : data.data[curr] }), {})
+    });
+  }
+  const widgetData = ['style', 'data', 'type', 'title', 'controls', 'query', 'cls', 'x']
+    .filter(el => data[el])
+    .reduce((p, el) => ({ ...p, [el]: data[el] }), {});
+
+  // get table
+  const tableName = body.table
+    || widgetData.data?.table_name
+    || widgetData.data?.table
+    || widgetData?.table_name
+    || templateData.table;
+
+  const loadTemplate = pg?.pk?.['admin.doc_template'] ? await pg.query(
+    'select body from admin.doc_template where doc_type=5 and title=$1',
+    [tableName]
+  ).then(el => el.rows?.[0]?.body) : null;
+
+  if (!pg || !tableName || !(pg.pk?.[loadTemplate?.table || tableName] || pgClients[widgetData?.data?.db || templateData?.db || 'client']?.pk?.[loadTemplate?.table || tableName])) {
+    return reply.status(400).send({
+      error: 'bad params: table ' + tableName,
+      code: 400,
+    });
+  }
+
+  if (yml) {
+    Object.assign(widgetData, { yml })
+  }
+
+  if (widgetData?.data) {
+    Object.assign(widgetData, { data: { ...widgetData?.data || {}, table_name: tableName } });
+  }
+  Object.assign(widgetData, { table_name: tableName });
+  // console.log(widgetData);
+  const row = await dataUpdate({
+    pg,
+    table: 'bi.widget',
+    id: widgetId,
+    data: widgetData,
+  });
+
+  const idx = widgets?.findIndex?.(el => el.name === widgetName)?.toString?.() || -1;
+  if (widgetData.hasOwnProperty('table_name') && idx > -1) {
+    widgets[idx].table_name = tableName;
+    widgets[idx].table = tableName;
+  }
+  if (widgetData.hasOwnProperty('data') && idx > -1) {
+    widgets[idx].data = widgetData.data
+  }
+  if (widgetData.hasOwnProperty('yml') && idx > -1) {
+    widgets[idx].yml = widgetData.yml;
+  }
+  if (widgetData.hasOwnProperty('style') && idx > -1) {
+    widgets[idx].style = widgetData.style;
+  }
+  if (widgetData.hasOwnProperty('type') && idx > -1) {
+    widgets[idx].type = widgetData.type;
+  }
+  if (widgetData.data?.type === 'text' && idx > -1) {
+    widgets[idx].data.text = widgetData.data?.text;
+  }
+  if (typeof widgetData?.query === 'string' && idx > -1) {
+    widgets[idx].data.query = widgetData.query;
+  }
+  if (typeof widgetData?.cls === 'string' && idx > -1) {
+    widgets[idx].data.cls = widgetData.cls;
+  }
+  if (typeof widgetData?.x === 'string' && idx > -1) {
+    widgets[idx].data.x = widgetData.x;
+  }
+
+  await dataUpdate({
+    pg,
+    table: 'bi.dashboard',
+    id: dashboardId,
+    data: { widgets },
+  });
+
+  return row;
+}

package/server/routes/edit/index.mjs

@@ -1,33 +1,33 @@
-/* eslint-disable import/extensions */
-import widgetAdd from './controllers/widget.add.js';
-import widgetEdit from './controllers/widget.edit.js';
-import widgetDel from './controllers/widget.del.js';
-import dashboardEdit from './controllers/dashboard.edit.js';
-import dashboardAdd from './controllers/dashboard.add.js';
-import dashboardDelete from './controllers/dashboard.delete.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: {
-      name: { type: 'string', pattern: '^([\\d\\w]+)$' },
-      widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-  },
-};
-
-export default async function route(fastify) {
-  fastify.post(`/bi-dashboard/:name`, { schema: biSchema }, widgetAdd);
-  fastify.put(`/bi-dashboard/:name/:widget`, { schema: biSchema }, widgetEdit);
-  fastify.delete(`/bi-dashboard/:name/:widget`, { schema: biSchema }, widgetDel);
-
-  fastify.post(`/bi-dashboard`, { schema: biSchema }, dashboardAdd);
-  fastify.put(`/bi-dashboard/:name`, { schema: biSchema }, dashboardEdit);
-  fastify.delete(`/bi-dashboard/:id`, {}, dashboardDelete);
-}
+/* eslint-disable import/extensions */
+import widgetAdd from './controllers/widget.add.js';
+import widgetEdit from './controllers/widget.edit.js';
+import widgetDel from './controllers/widget.del.js';
+import dashboardEdit from './controllers/dashboard.edit.js';
+import dashboardAdd from './controllers/dashboard.add.js';
+import dashboardDelete from './controllers/dashboard.delete.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: {
+      name: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+  },
+};
+
+export default async function route(fastify) {
+  fastify.post(`/bi-dashboard/:name`, { schema: biSchema }, widgetAdd);
+  fastify.put(`/bi-dashboard/:name/:widget`, { schema: biSchema }, widgetEdit);
+  fastify.delete(`/bi-dashboard/:name/:widget`, { schema: biSchema }, widgetDel);
+
+  fastify.post(`/bi-dashboard`, { schema: biSchema }, dashboardAdd);
+  fastify.put(`/bi-dashboard/:name`, { schema: biSchema }, dashboardEdit);
+  fastify.delete(`/bi-dashboard/:id`, {}, dashboardDelete);
+}