@opengis/bi 1.0.13 → 1.0.15

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

@@ -1,63 +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,82 +1,52 @@
-import dataUpdate from '@opengis/fastify-table/crud/funcs/dataUpdate.js';
-export default async function widgetEdit({ pg = {}, funcs = {}, body = {}, params = {} }) {
-  const { widget: widgetName, name: dashboardName } = params;
-  const tableName = 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 checkTable = await pg.query(`select * from bi.widget where $1 in (table_name)`, [
-      tableName
-    ]);
-    const { widget_id: widgetId, dashboard_id: dashboardId } = row || {};
-    if (!checkTable.rows.length) return { message: 'bad params', status: 401 };
-
-    if (!widgetId) {
-      return { message: `widget not found ${widgetName}`, status: 404 };
-    }
-
-    const res = await funcs.dataUpdate({
-      table: 'bi.widget',
-      id: widgetId,
-      data: body
-    });
-
-    //\====================
-    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,27 +1,31 @@
-import widgetAdd from '../edit/controllers/widget.add.js';
-import widgetEdit from '../edit/controllers/widget.edit.js';
-import widgetDel from '../edit/controllers/widget.del.js';
-import dashboardEdit from '../edit/controllers/dashboard.edit.js';
-import dashboardAdd from '../edit/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);
+}

package/server/routes/map/controllers/cluster.js

@@ -1,75 +1,109 @@
-
-import { getWidget } from '../../../../utils.js';
-
-export default async function cluster({
-    pg, funcs, query = {}, log,
-}) {
-    const {
-        widget, filter, dashboard, search,
-    } = query;
-
-    if (!widget) {
-        return { message: 'not enough params: widget', status: 400 };
-    }
-
-    const { data } = await getWidget({ dashboard, widget })
-
-    try {
-
-        const pkey = pg.pk?.[data?.table];
-
-        if (!pkey) {
-            return { message: `invalid ${widget ? 'widget' : 'dashboard'}: table pk not found (${data?.table})`, status: 400 };
-        }
-
-        // data param 
-        const { table, query: where = '1=1', metrics = [], cluster, clusterTable = {} } = data;
-
-        if (!cluster) {
-            return { message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`, status: 400 };
-        }
-
-        if (!metrics.length) {
-            return { message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`, status: 400 };
-        }
-
-        if (!clusterTable?.name) {
-            return { message: 'not enough widget params: clusterTable name', status: 400 };
-        }
-
-        if (clusterTable?.name && !pg.pk?.[clusterTable?.name]) {
-            return { message: 'invalid widget params: clusterTable pkey not found', status: 404 };
-        }
-
-        const { total = 0 } = pg.pk?.[table]
-            ? await pg.queryCache(`select oid::regclass as table, reltuples AS total from pg_class`)
-                .then((res) => res.rows?.find((row) => row.table === table))
-            : {};
-
-        const { bbox } = await pg.query(`select st_asgeojson(box2d(geom))::json as bbox from ${table} where ${where || '1=1'}`).then((res1) => res1.rows?.[0] || {});
-
-        // get sql
-        const { optimizedSQL } = filter || search
-            ? await funcs.getFilterSQL({ pg, table, filter, search })
-            : {};
-
-        const q = `select "${cluster}" as name, sum("${metrics[0]}")::float as metric 
-        from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
-        left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id from ${clusterTable?.name} where ${clusterTable?.title}=q."${cluster}" limit 1)b on 1=1
-        where ${where} group by ${cluster}, b.id`;
-
-        if (query.sql === '1') return q;
-
-        // auto Index
-        //  funcs.autoIndex({ table, columns: (metrics || []).concat([cluster]) });
-
-        const { rows = [] } = await pg.query(q);
-        const vals = rows.map(el => el.metric - 0).sort((a, b) => a - b);
-        const len = vals.length;
-        const sizes = [vals[0], vals[Math.floor(len / 4)], vals[Math.floor(len / 2)], vals[Math.floor(len * 0.75)], vals[len - 1]]
-        return { sizes, rows, bbox, count: rows.length, total };
-    } catch (err) {
-        log.error('bi/cluster', { error: err.toString(), query });
-        return { error: err.toString(), status: 500 };
-    }
-}
+import { getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+import { getWidget } from '../../../../utils.js';
+
+import downloadClusterData from './utils/downloadClusterData.js';
+
+const clusterExists = {};
+
+export default async function cluster({ pg, query = {}, log }) {
+  const { widget, filter, dashboard, search } = query;
+
+  if (!widget) {
+    return { message: 'not enough params: widget', status: 400 };
+  }
+
+  const { data } = await getWidget({ dashboard, widget });
+
+  try {
+    const pkey = pg.pk?.[data?.table];
+
+    if (!pkey) {
+      return {
+        message: `invalid ${widget ? 'widget' : 'dashboard'}: table pk not found (${data?.table})`,
+        status: 400,
+      };
+    }
+
+    // data param
+    const {
+      table,
+      query: where = '1=1',
+      metrics = [],
+      cluster,
+      clusterTable = {},
+    } = data;
+
+    if (!cluster) {
+      return {
+        message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
+        status: 400,
+      };
+    }
+
+    if (!metrics.length) {
+      return {
+        message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
+        status: 400,
+      };
+    }
+
+    if (!clusterTable?.name) {
+      Object.assign(clusterTable, {
+        name: 'bi.cluster',
+        title: 'title',
+        query: `type='${cluster}'`,
+      });
+    }
+
+    if (cluster && !clusterExists[cluster]) {
+      const res = await downloadClusterData({ pg, log, cluster });
+      if (res) return res;
+      clusterExists[cluster] = 1;
+    }
+
+    if (clusterTable?.name && !pg.pk?.[clusterTable?.name]) {
+      return {
+        message: 'invalid widget params: clusterTable pkey not found',
+        status: 404,
+      };
+    }
+
+    const { bounds, extentStr } = await pg.query(`select count(*),
+      st_asgeojson(st_extent(geom))::json as bounds,
+      replace(regexp_replace(st_extent(geom)::box2d::text,'BOX\\(|\\)','','g'),' ',',') as "extentStr"
+    from ${table} where ${where || '1=1'}`).then((res) => res.rows?.[0] || {});
+    const extent = extentStr ? extentStr.split(',') : undefined;
+
+    // get sql
+    const { optimizedSQL } =
+      filter || search
+        ? await getFilterSQL({ pg, table, filter, search })
+        : {};
+
+    const q = `select "${cluster}" as name, sum("${metrics[0]}")::float as metric 
+        from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
+        left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id from ${clusterTable?.name} where ${clusterTable?.title}=q."${cluster}" limit 1)b on 1=1
+        where ${where} group by ${cluster}, b.id order by sum("${metrics[0]}")::float desc`;
+
+    if (query.sql === '1') return q;
+
+    // auto Index
+    //  autoIndex({ table, columns: (metrics || []).concat([cluster]) });
+
+    const { rows = [] } = await pg.query(q);
+    const vals = rows.map((el) => el.metric - 0).sort((a, b) => a - b);
+    const len = vals.length;
+    const sizes = [
+      vals[0],
+      vals[Math.floor(len / 4)],
+      vals[Math.floor(len / 2)],
+      vals[Math.floor(len * 0.75)],
+      vals[len - 1],
+    ];
+    return { sizes, rows, bounds, extent, count: rows.length, total: rows?.reduce((acc, curr) => (curr.metric || 0) + acc, 0) };
+  } catch (err) {
+    log.error('bi/cluster', { error: err.toString(), query });
+    return { error: err.toString(), status: 500 };
+  }
+}