@opengis/bi 1.0.18 → 1.0.19

package/server/routes/db/controllers/dbTablePreview.js

@@ -1,63 +1,63 @@
-const q = `select nspname||'.'||relname as table, json_agg(json_build_object('name',attname, 'type', a.atttypid::regtype, 'description', coalesce(col_description(attrelid, attnum),attname))) as columns
-from pg_attribute a
-left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
-JOIN pg_class AS i
-  ON i.oid = a.attrelid 
-JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
-where a.attnum > 0 and nspname||'.'||relname = $1
-and not a.attisdropped
-group by nspname||'.'||relname limit 1`;
-
-export default async function dbTablePreview({ pg, params = {}, query = {} }) {
-  if (!params?.name) {
-    return { message: 'not enough params: name', status: 400 };
-  }
-
-  if (query.sql) return q;
-  try {
-    const { table, columns } = await pg
-      .query(q, [params.name])
-      .then((res) => res.rows?.[0] || {});
-    if (!table) {
-      return { message: 'table not found', status: 404 };
-    }
-
-    const { count = 0 } = await pg
-      .query(
-        `select reltuples as count from pg_class where oid  = to_regclass($1)`,
-        [params.name]
-      )
-      .then((res) => res.rows?.[0] || {});
-    const geom = columns.find((el) => el.type === 'geometry')?.name;
-    const { bounds, extentStr } = geom
-      ? 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 ${params.name}`
-          )
-          .then((res) => res.rows?.[0] || {})
-      : {};
-    const extent = extentStr ? extentStr.split(',') : undefined;
-
-    const systemColumns = [
-      'uid',
-      'files',
-      'editor_date',
-      'cdate',
-      'editor_id',
-      geom,
-    ];
-    const columnList = columns
-      .map((el) => el?.name)
-      .filter((el) => !systemColumns.includes(el));
-    const { rows = [] } = await pg.query(
-      `select ${columnList.join(',')} ${geom ? `, st_asgeojson(geom)::json as geom` : ''} from ${table} limit 10`
-    );
-
-    return { count, geom: !!geom, bounds, extent, columns, rows };
-  } catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+const q = `select nspname||'.'||relname as table, json_agg(json_build_object('name',attname, 'type', a.atttypid::regtype, 'description', coalesce(col_description(attrelid, attnum),attname))) as columns
+from pg_attribute a
+left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
+JOIN pg_class AS i
+  ON i.oid = a.attrelid 
+JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
+where a.attnum > 0 and nspname||'.'||relname = $1
+and not a.attisdropped
+group by nspname||'.'||relname limit 1`;
+
+export default async function dbTablePreview({ pg, params = {}, query = {} }) {
+  if (!params?.name) {
+    return { message: 'not enough params: name', status: 400 };
+  }
+
+  if (query.sql) return q;
+  try {
+    const { table, columns } = await pg
+      .query(q, [params.name])
+      .then((res) => res.rows?.[0] || {});
+    if (!table) {
+      return { message: 'table not found', status: 404 };
+    }
+
+    const { count = 0 } = await pg
+      .query(
+        `select reltuples as count from pg_class where oid  = to_regclass($1)`,
+        [params.name]
+      )
+      .then((res) => res.rows?.[0] || {});
+    const geom = columns.find((el) => el.type === 'geometry')?.name;
+    const { bounds, extentStr } = geom
+      ? 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 ${params.name}`
+          )
+          .then((res) => res.rows?.[0] || {})
+      : {};
+    const extent = extentStr ? extentStr.split(',') : undefined;
+
+    const systemColumns = [
+      'uid',
+      'files',
+      'editor_date',
+      'cdate',
+      'editor_id',
+      geom,
+    ];
+    const columnList = columns
+      .map((el) => el?.name)
+      .filter((el) => !systemColumns.includes(el));
+    const { rows = [] } = await pg.query(
+      `select ${columnList.join(',')} ${geom ? `, st_asgeojson(geom)::json as geom` : ''} from ${table} limit 10`
+    );
+
+    return { count, geom: !!geom, bounds, extent, columns, rows };
+  } catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/server/routes/db/controllers/dbTables.js

@@ -1,36 +1,36 @@
-export default async function dbTables({ pg, query = {} }) {
-  const q = `select 
-  t.table_schema ||'.'|| t.table_name as table, 
-  obj_description(to_regclass(t.table_schema ||'."'|| t.table_name||'"')) as description,
-  t.table_schema as schema,
-  (select reltuples from pg_class where oid  = to_regclass(t.table_schema ||'."'|| t.table_name||'"') ) as total,
-  coalesce(isgeom,false) as isgeom
-  
-  from information_schema.tables t
-  left join lateral(
-    select true as isgeom from information_schema.columns c 
-    where c.table_name = t.table_name 
-    and c.table_schema = t.table_schema and 'geometry'=c.udt_name limit 1
-  )c on 1=1
-  
-  where t.table_type = 'BASE TABLE'
-  and t.table_schema not in ('public','log','admin','feature_ir','gis', 'setting')
-  and t.table_name not like '%.%'
-  and regexp_replace(t.table_name, '^[[:digit:]]', '', 'g') = t.table_name
-  and 1=(SELECT count(*) FROM pg_catalog.pg_constraint con 
-    INNER JOIN pg_catalog.pg_class rel ON rel.oid = con.conrelid
-    INNER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = connamespace 
-    WHERE nsp.nspname = t.table_schema AND rel.relname = t.table_name and contype='p'
-  )
-  and ${query.schema ? `t.table_schema=$1` : '1=1'} order by total desc`;
-  if (query.sql) return q;
-  try {
-    const { rows = [] } = await pg.query(
-      q,
-      [query.schema].filter((el) => el)
-    );
-    return { rows };
-  } catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+export default async function dbTables({ pg, query = {} }) {
+  const q = `select 
+  t.table_schema ||'.'|| t.table_name as table, 
+  obj_description(to_regclass(t.table_schema ||'."'|| t.table_name||'"')) as description,
+  t.table_schema as schema,
+  (select reltuples from pg_class where oid  = to_regclass(t.table_schema ||'."'|| t.table_name||'"') ) as total,
+  coalesce(isgeom,false) as isgeom
+  
+  from information_schema.tables t
+  left join lateral(
+    select true as isgeom from information_schema.columns c 
+    where c.table_name = t.table_name 
+    and c.table_schema = t.table_schema and 'geometry'=c.udt_name limit 1
+  )c on 1=1
+  
+  where t.table_type = 'BASE TABLE'
+  and t.table_schema not in ('public','log','admin','feature_ir','gis', 'setting')
+  and t.table_name not like '%.%'
+  and regexp_replace(t.table_name, '^[[:digit:]]', '', 'g') = t.table_name
+  and 1=(SELECT count(*) FROM pg_catalog.pg_constraint con 
+    INNER JOIN pg_catalog.pg_class rel ON rel.oid = con.conrelid
+    INNER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = connamespace 
+    WHERE nsp.nspname = t.table_schema AND rel.relname = t.table_name and contype='p'
+  )
+  and ${query.schema ? `t.table_schema=$1` : '1=1'} order by total desc`;
+  if (query.sql) return q;
+  try {
+    const { rows = [] } = await pg.query(
+      q,
+      [query.schema].filter((el) => el)
+    );
+    return { rows };
+  } catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/server/routes/db/index.mjs

@@ -1,17 +1,17 @@
-import dbTables from './controllers/dbTables.js';
-import dbTablePreview from './controllers/dbTablePreview.js';
-
-export default async function route(fastify, opts) {
-  fastify.route({
-    method: 'GET',
-    url: '/db-tables',
-    schema: {},
-    handler: dbTables,
-  });
-  fastify.route({
-    method: 'GET',
-    url: '/db-tables/:name',
-    schema: {},
-    handler: dbTablePreview,
-  });
-}
+import dbTables from './controllers/dbTables.js';
+import dbTablePreview from './controllers/dbTablePreview.js';
+
+export default async function route(fastify, opts) {
+  fastify.route({
+    method: 'GET',
+    url: '/db-tables',
+    schema: {},
+    handler: dbTables,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/db-tables/:name',
+    schema: {},
+    handler: dbTablePreview,
+  });
+}

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

@@ -1,26 +1,26 @@
-import { dataInsert } from "@opengis/fastify-table/utils.js";
-
-export default async function widgetAdd({ pg, body }) {
-  try {
-    const time = Date.now();
-    const tableName = body.table_name;
-    const checkTable = await pg.query(
-      `select * from bi.dashboard where $1 in (table_name)`,
-      [tableName]
-    );
-    if (!checkTable.rows.length) return { message: 'bad params', status: 401 };
-    const res = await dataInsert({
-      table: 'bi.dashboard',
-      data: body,
-    });
-
-    return {
-      time: Date.now() - time,
-      message: `Added new dashboard, ID: '${res.rows[0].title}'`,
-      status: 200,
-      rows: res.rows,
-    };
-  } catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { dataInsert } from "@opengis/fastify-table/utils.js";
+
+export default async function widgetAdd({ pg, body }) {
+  try {
+    const time = Date.now();
+    const tableName = body.table_name;
+    const checkTable = await pg.query(
+      `select * from bi.dashboard where $1 in (table_name)`,
+      [tableName]
+    );
+    if (!checkTable.rows.length) return { message: 'bad params', status: 401 };
+    const res = await dataInsert({
+      table: 'bi.dashboard',
+      data: body,
+    });
+
+    return {
+      time: Date.now() - time,
+      message: `Added new dashboard, ID: '${res.rows[0].title}'`,
+      status: 200,
+      rows: res.rows,
+    };
+  } catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

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

@@ -1,46 +1,46 @@
-import { dataUpdate } from "@opengis/fastify-table/utils.js";
-
-export default async function dashboardEdit(
-  { pg, params = {}, body = {} },
-  reply
-) {
-  try {
-    if (!params.name) {
-      return {
-        message: 'not enough params: dashboard name required',
-        status: 400,
-      };
-    }
-    const tableName = body.table_name;
-    const checkTable = await pg.query(
-      `select * from bi.dashboard where $1 in (table_name)`,
-      [tableName]
-    );
-    if (!checkTable.rows.length) return { message: 'bad params', status: 401 };
-    const { name: dashboardName } = params;
-    const row = await pg
-      .query(
-        `select dashboard_id from bi.dashboard where $1 in (dashboard_id, name)`,
-        [dashboardName]
-      )
-      .then((res1) => res1.rows?.[0] || {});
-    const { dashboard_id: dashboardId } = row;
-
-    const res = await dataUpdate({
-      table: 'bi.dashboard',
-      id: dashboardId,
-      data: body,
-    });
-    if (!Object.keys(res)?.length) {
-      return { message: 'not found data', status: 404 };
-    }
-
-    return {
-      message: `updated ${dashboardName}`,
-      status: 200,
-      rows: res,
-    };
-  } catch (err) {
-    return reply.status(500).send(err.toString());
-  }
-}
+import { dataUpdate } from "@opengis/fastify-table/utils.js";
+
+export default async function dashboardEdit(
+  { pg, params = {}, body = {} },
+  reply
+) {
+  try {
+    if (!params.name) {
+      return {
+        message: 'not enough params: dashboard name required',
+        status: 400,
+      };
+    }
+    const tableName = body.table_name;
+    const checkTable = await pg.query(
+      `select * from bi.dashboard where $1 in (table_name)`,
+      [tableName]
+    );
+    if (!checkTable.rows.length) return { message: 'bad params', status: 401 };
+    const { name: dashboardName } = params;
+    const row = await pg
+      .query(
+        `select dashboard_id from bi.dashboard where $1 in (dashboard_id, name)`,
+        [dashboardName]
+      )
+      .then((res1) => res1.rows?.[0] || {});
+    const { dashboard_id: dashboardId } = row;
+
+    const res = await dataUpdate({
+      table: 'bi.dashboard',
+      id: dashboardId,
+      data: body,
+    });
+    if (!Object.keys(res)?.length) {
+      return { message: 'not found data', status: 404 };
+    }
+
+    return {
+      message: `updated ${dashboardName}`,
+      status: 200,
+      rows: res,
+    };
+  } catch (err) {
+    return reply.status(500).send(err.toString());
+  }
+}

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

@@ -1,75 +1,75 @@
-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, 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 };
-  }
-}
+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, 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,69 +1,69 @@
-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 };
-  }
-}
+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 };
+  }
+}