@opengis/bi 1.0.14 → 1.0.15

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

@@ -1,73 +1,75 @@
-/* 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, funcs, 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;
-  try {
-    const row = await pg
-      .query(
-        'select dashboard_id, widgets, panels, table_name from bi.dashboard where $1 in (dashboard_id,name)',
-        [dashboardName]
-      )
-      .then((res) => res.rows?.[0] || {});
-
-    const tableName =
-      data.data?.table || data?.table || data.table_name || row.table_name;
-
-    // const checkTable = await pg.query(
-    //   'select * from bi.widget where $1 in (table_name)',
-    //   [tableName]
-    // );
-    // if (!checkTable.rows.length) {
-    //   return { message: 'bad params', status: 400 };
-    // }
-    if (!tableName || !pg.pk?.[tableName]) {
-      return { message: 'bad params: table', status: 400 };
-    }
-
-    const { dashboard_id: dashboardId } = row;
-
-    Object.assign(data, {
-      name: generateUniqueName(data.type),
-      table_name: tableName,
-      metrics:
-        (data.data?.metrics || data?.metrics)?.[0] ||
-        data.data?.metrics ||
-        data?.metrics,
-    });
-
-    const res = await funcs.dataUpdate({
-      table: 'bi.dashboard',
-      id: dashboardId,
-      data: {
-        widgets: [data].concat(row.widgets || []),
-        panels: [{ widget: data.name, col: data.col || 3 }].concat(
-          row.panels || []
-        ),
-      },
-    });
-    const widgetData = { ...data, data, dashboard_id: dashboardId };
-    if (body?.yml) Object.assign(widgetData, { yml: body.yml });
-    await funcs.dataInsert({
-      table: 'bi.widget',
-      data: widgetData,
-    });
-    return {
-      message: `Added widget to ${dashboardName}`,
-      status: 200,
-      rows: res,
-    };
-  } catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { dataInsert, dataUpdate } 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, funcs, 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;
+  try {
+    const row = await pg
+      .query(
+        'select dashboard_id, widgets, panels, table_name from bi.dashboard where $1 in (dashboard_id,name)',
+        [dashboardName]
+      )
+      .then((res) => res.rows?.[0] || {});
+
+    const tableName =
+      data.data?.table || data?.table || data.table_name || row.table_name;
+
+    // const checkTable = await pg.query(
+    //   'select * from bi.widget where $1 in (table_name)',
+    //   [tableName]
+    // );
+    // if (!checkTable.rows.length) {
+    //   return { message: 'bad params', status: 400 };
+    // }
+    if (!tableName || !pg.pk?.[tableName]) {
+      return { message: 'bad params: table', status: 400 };
+    }
+
+    const { dashboard_id: dashboardId } = row;
+
+    Object.assign(data, {
+      name: generateUniqueName(data.type),
+      table_name: tableName,
+      metrics:
+        (data.data?.metrics || data?.metrics)?.[0] ||
+        data.data?.metrics ||
+        data?.metrics,
+    });
+
+    const res = await dataUpdate({
+      table: 'bi.dashboard',
+      id: dashboardId,
+      data: {
+        widgets: [data].concat(row.widgets || []),
+        panels: [{ widget: data.name, col: data.col || 3 }].concat(
+          row.panels || []
+        ),
+      },
+    });
+    const widgetData = { ...data, data, dashboard_id: dashboardId };
+    if (body?.yml) Object.assign(widgetData, { yml: body.yml });
+    await dataInsert({
+      table: 'bi.widget',
+      data: widgetData,
+    });
+    return {
+      message: `Added widget to ${dashboardName}`,
+      status: 200,
+      rows: res,
+    };
+  } catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

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

@@ -1,70 +1,69 @@
-import dataDelete from '@opengis/fastify-table/crud/funcs/dataDelete.js';
-import dataUpdate from '@opengis/fastify-table/crud/funcs/dataUpdate.js';
-
-export default async function widgetDel({ pg = {}, params = {} }) {
-  const { widget: widgetName, name: dashboardName } = params;
-
-  if (!widgetName || !dashboardName) {
-    return {
-      message: 'not enough params: dashboard and widget name',
-      status: 400,
-    };
-  }
-
-  try {
-    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((res1) => res1.rows?.[0] || {});
-
-    const { widget_id: widgetId, dashboard_id: dashboardId } = row || {};
-
-    if (!widgetId) {
-      return { message: `widget not found ${widgetName}`, status: 404 };
-    }
-
-    const res = await dataDelete({
-      table: 'bi.widget',
-      id: widgetId,
-    });
-
-    const currentDashboard = await pg
-      .query(
-        `select * from  bi.dashboard 
-      where $1 in (dashboard_id, name)`,
-        [dashboardName]
-      )
-      .then((res1) => res1.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({
-      table: 'bi.dashboard',
-      id: dashboardId,
-      data: body,
-    });
-
-    return {
-      message: `Deleted widget ${widgetName}`,
-      status: 200,
-      rows: res1,
-    };
-  } catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { dataDelete, dataUpdate } from '@opengis/fastify-table/utils.js';
+
+export default async function widgetDel({ pg = {}, params = {} }) {
+  const { widget: widgetName, name: dashboardName } = params;
+
+  if (!widgetName || !dashboardName) {
+    return {
+      message: 'not enough params: dashboard and widget name',
+      status: 400,
+    };
+  }
+
+  try {
+    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((res1) => res1.rows?.[0] || {});
+
+    const { widget_id: widgetId, dashboard_id: dashboardId } = row || {};
+
+    if (!widgetId) {
+      return { message: `widget not found ${widgetName}`, status: 404 };
+    }
+
+    const res = await dataDelete({
+      table: 'bi.widget',
+      id: widgetId,
+    });
+
+    const currentDashboard = await pg
+      .query(
+        `select * from  bi.dashboard 
+      where $1 in (dashboard_id, name)`,
+        [dashboardName]
+      )
+      .then((res1) => res1.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({
+      table: 'bi.dashboard',
+      id: dashboardId,
+      data: body,
+    });
+
+    return {
+      message: `Deleted widget ${widgetName}`,
+      status: 200,
+      rows: res1,
+    };
+  } catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

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

@@ -1,103 +1,52 @@
-import { dataUpdate } from '@opengis/fastify-table/utils.js';
-
-import { yamlSafe } from '../../../../utils.js';
-
-export default async function widgetEdit({
-  pg = {},
-  funcs = {},
-  body = {},
-  params = {},
-}) {
-  const { widget: widgetName, name: dashboardName } = params;
-  const data = body.yml ? yamlSafe.load(body.yml) : body;
-  const tableName =
-    data.data?.table || data?.table || data.table_name || body.table_name;
-
-  if (!widgetName || !dashboardName) {
-    return {
-      message: 'not enough params: dashboard and widget name',
-      status: 400,
-    };
-  }
-
-  try {
-    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((res1) => res1.rows?.[0] || {});
-    const { widget_id: widgetId, dashboard_id: dashboardId } = row || {};
-
-    // const checkTable = await pg.query(
-    //   `select * from bi.widget where $1 in (table_name)`,
-    //   [tableName]
-    // );
-    // if (!checkTable.rows.length) {
-    //   return { message: 'bad params', status: 401 };
-    // }
-
-    if (!tableName || !pg.pk?.[tableName]) {
-      return { message: 'bad params: table', status: 400 };
-    }
-
-    if (!widgetId) {
-      return { message: `widget not found ${widgetName}`, status: 404 };
-    }
-
-    const widgetData = { ...data, data };
-    if (body?.yml) Object.assign(widgetData, { yml: body.yml });
-    await funcs.dataUpdate({
-      table: 'bi.widget',
-      id: widgetId,
-      data: widgetData,
-    });
-
-    // \====================
-    const currentDashboard = await pg
-      .query(
-        `select * from  bi.dashboard 
-    where $1 in (dashboard_id, name)`,
-        [dashboardName]
-      )
-      .then((res1) => res1.rows?.[0] || {});
-    const bodyDashboard = currentDashboard;
-
-    if (!currentDashboard) {
-      return { message: `dashboard not found ${dashboardName}`, status: 404 };
-    }
-    bodyDashboard.panels =
-      Array.isArray(bodyDashboard.panels) && bodyDashboard.panels?.length
-        ? bodyDashboard.panels?.map((panel) => {
-            if (panel.widget === widgetName) {
-              panel.col = body.col;
-            }
-            return panel;
-          })
-        : undefined;
-    bodyDashboard.widgets =
-      Array.isArray(bodyDashboard.widgets) && bodyDashboard?.widgets?.length
-        ? bodyDashboard.widgets?.map((widget) => {
-            if (widget.name === widgetName) {
-              return body;
-            }
-            return widget;
-          })
-        : undefined;
-
-    const res1 = await dataUpdate({
-      table: 'bi.dashboard',
-      id: dashboardId,
-      data: bodyDashboard,
-    });
-
-    return {
-      message: `Edited widget ${widgetName}`,
-      status: 200,
-      rows: res1,
-    };
-  } catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { dataUpdate } from '@opengis/fastify-table/utils.js';
+
+import { yamlSafe } from '../../../../utils.js';
+
+export default async function widgetEdit({ pg, body, params, }) {
+  const { widget: widgetName, name: dashboardName } = params;
+  const data = body.yml && !body.style ? yamlSafe.load(body.yml) : body;
+
+  const tableName =
+    data.data?.table || data?.table || data.table_name || body.table_name;
+
+  if (!widgetName || !dashboardName) {
+    return {
+      message: 'not enough params: dashboard and widget name',
+      status: 400,
+    };
+  }
+
+
+  const { widget_id: widgetId } = 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((res1) => res1.rows?.[0] || {});
+
+  if (!widgetId) {
+    return { message: `widget not found ${widgetName}`, status: 404 };
+  }
+
+  if (!tableName || !pg.pk?.[tableName]) {
+    return { message: 'bad params: table', status: 400 };
+  }
+
+
+
+  // const widgetData = { ...data, data };
+  const widgetData = body.yml && !body.style ? data : { style: data.style, data: { x: data.x, metrics: data.metrics }, controls: data.controls, type: data.type, title: data.title, table_name: data.table_name };
+  // console.log(widgetId, widgetData)
+  if (body?.yml) Object.assign(widgetData, { yml: body.yml });
+  const rows = await dataUpdate({
+    table: 'bi.widget',
+    id: widgetId,
+    data: widgetData,
+  });
+
+  return {
+    message: rows,
+    status: 200,
+
+  };
+
+}

package/server/routes/edit/index.mjs

@@ -1,31 +1,31 @@
-/* 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';
-
-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: {
-    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);
-}
+/* 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';
+
+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: {
+    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);
+}