@opengis/bi 1.0.40 → 1.0.42

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

@@ -31,6 +31,7 @@ export default async function dashboard({
     } catch (err) {
       data.error = err.toString();
     }
+
     data.type = 'bd';
     const { table_name: table } = data;
 
@@ -38,7 +39,16 @@ export default async function dashboard({
       return { message: 'not enough params: table required', status: 400 };
     }
 
-    const { fields = [] } = table && pg.pk?.[table] ? await pg.query(`select * from ${table} limit 0`) : {};
+    const loadTemplate = pg.pk?.['admin.doc_template'] ? await pg.query(
+      'select body from admin.doc_template where doc_type=5 and title=$1',
+      [table]
+    ).then(el => el.rows?.[0]?.body) : null;
+
+    const sqlList = loadTemplate?.sql ? loadTemplate?.sql
+      ?.filter?.(el => !el.disabled && el?.sql?.replace)
+      ?.map?.((el, i) => `left join lateral (${el.sql.replace(/limit 1/ig, '')}) t${i} on 1=1`)?.join?.(' ') : '';
+
+    const { fields = [] } = table && pg.pk?.[loadTemplate?.table || table] ? await pg.query(`select * from ${loadTemplate?.table || table} t ${sqlList || ''} limit 0`) : {};
 
     data?.widgets?.forEach?.(el => {
       const { style, data = {}, type, title, x, metrics } = el;
@@ -51,11 +61,10 @@ export default async function dashboard({
       Object.assign(el, { title, type });
     });
 
-    const meta = table ? await getMeta({ pg, table }) : {};
+    const meta = table ? await getMeta({ pg, table: loadTemplate?.table || table }) : {};
+    const columnIndexes = meta?.columns?.reduce((acc, curr, idx) => Object.assign(acc, { [curr.name]: idx }), {}) || [];
 
-    const columns = meta?.columns
-      ?.filter(el => fields.map(field => field.name).includes(el.name))
-      ?.map(el => ({ name: el.name, title: el.title, type: pg.pgType?.[el.dataTypeID] }));
+    const columns = fields?.map(el => ({ name: el.name, title: meta?.columns[columnIndexes[el.name]]?.title || el.name, type: pg.pgType?.[el.dataTypeID] }));
 
     return {
       ...data || {},
@@ -63,8 +72,9 @@ export default async function dashboard({
       panels: data?.panels?.filter?.(el => el?.widget) || [],
       geom: !meta?.geom,
       error:
-        table && !pg.pk?.[table] ? `table pkey not found: ${table}` : undefined,
+        table && !pg.pk?.[loadTemplate?.table || table] ? `table pkey not found: ${loadTemplate?.table || table}` : undefined,
       table_name: table,
+      templateTable: loadTemplate?.table,
       time: Date.now() - time,
       columns,
     };

package/server/routes/data/controllers/data.js

@@ -19,7 +19,7 @@ const maxLimit = 100;
 export default async function dataAPI(req, reply) {
   const time = Date.now();
 
-  const { query = {}, unittest } = req;
+  const { query = {}, user = {}, unittest } = req;
 
   query.metric = Array.isArray(query.metric) ? query.metric.pop() : query.metric;
 
@@ -34,7 +34,7 @@ export default async function dataAPI(req, reply) {
   const pg = widgetData.pg || req.pg || pgClients.client;
 
   const { fields: cols } = await pg.query(
-    `select * from ${data.table} limit 0`
+    `select * from ${data.table} t ${widgetData.tableSQL || data.tableSQL || ''} limit 0`
   );
   const columnTypes = cols.map((el) => ({
     name: el.name,
@@ -65,8 +65,8 @@ export default async function dataAPI(req, reply) {
     return { message: `table not found: ${data.table} (${pg.options?.database})`, status: 404 };
   }
 
-  const columnList = columns.map(col => col.name);
-  const groupbyColumnNotExists = groupby?.split?.(',')?.filter?.(el => !columnList.includes(el.trim()));
+  // const columnList = columns.map(col => col.name);
+  const groupbyColumnNotExists = groupby?.split?.(',')?.filter?.(el => !columnTypes.map(el => el.name).includes(el.trim()));
 
   if (groupby && groupbyColumnNotExists?.length) {
     return { message: `groupby column not found: ${groupbyColumnNotExists} (${data.table}/${pg.options?.database})`, status: 404 };
@@ -83,7 +83,7 @@ export default async function dataAPI(req, reply) {
 
   if (query.sql === '2') return { x, metric, table, tableSQL, data, groupData };
 
-  const order = data.order || (type === 'listbar' ? 'metric desc' : null);
+  const order = data.order || (type === 'listbar' && cols.find(el => el.name === 'metric') ? 'metric desc' : null);
 
   const fData =
     filter || search
@@ -139,8 +139,9 @@ export default async function dataAPI(req, reply) {
     };
   }
 
-  if (config.debug) console.log(sql);
-  const { rows, fields } = await pg.query(sql); // test with limit
+  if (config.trace) console.log(sql, user?.uid);
+
+  const { rows, fields } = await pg.query(sql.replace('{{uid}}', user?.uid)); // test with limit
 
   if (cls) {
     const values = rows

package/server/routes/data/controllers/util/normalizeData.js

@@ -1,61 +1,65 @@
-function normalizeData(data, query = {}, columnTypes = []) {
-  const skip = [];
-  ['x', 'groupby', 'granularity'].forEach((el) => {
-    // console.log(el, query[el], columnTypes.find(col => col.name == query[el]))
-    if (!columnTypes.find((col) => col.name == query[el])) {
-      if (query[el] && query[el] !== 'null') skip.push(`column not found: ${query[el]}`);
-      if (!(el === 'groupby' && query[el] === 'null')) delete query[el];
-    }
-  });
-
-  if (
-    !columnTypes.find(
-      (col) => col.type === 'numeric' && col.name == query.metric
-    )
-  ) {
-    delete query.metric;
-  }
-
-  const xName = query.x || (Array.isArray(data.x) ? data.x[0] : data.x);
-  const xType = columnTypes.find((el) => el.name == xName)?.type;
-
-  const granularity =
-    xType === 'date' || xType?.includes('timestamp')
-      ? query.granularity || data.granularity || 'year'
-      : null;
-
-  const x =
-    (granularity
-      ? `date_trunc('${granularity}',${xName})::date::text`
-      : null) || xName;
-
-  const metrics = Array.isArray(data.metrics || data.metric) ? (data.metrics || data.metric) : [data.metrics || data.metric];
-  const metric =
-    (query.metric ? `sum(${query.metric})` : null) ||
-    (metrics.length
-      ? (metrics
-        ?.filter((el) => el && columnTypes.find((col) => col.name == (el?.name || el)))
-        ?.map((el) => el.fx || `${el.operator || 'sum'}(${el.name || el})`)?.join(',') || 'count(*)')
-      : 'count(*)');
-
-  const yName = metrics?.[0]?.name || metrics?.[0];
-  const yType = columnTypes.find((el) => el.name == yName)?.type;
-
-  const { cls, table, filterCustom } = data;
-  const groupby = (query.groupby || data.groupby) === 'null' ? null : (query.groupby || data.groupby);
-  // const orderby = query.orderby || data.orderby || 'count(*)';
-
-  const custom = query?.filterCustom
-    ?.split(',')
-    ?.map((el) => filterCustom?.find((item) => item?.name === el)?.sql)
-    ?.filter((el) => el)
-    ?.join(' and ');
-  const where = `${data.query || '1=1'} and ${custom || 'true'}`;
-
-  const tableSQL = data.tableSQL?.length
-    ? `(select * from ${data?.table} t ${data.tableSQL.join(' \n ')} where ${where})q`
-    : undefined;
-
-  return { x, cls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };
-}
-export default normalizeData;
+function normalizeData(data, query = {}, columnTypes = []) {
+  const skip = [];
+  ['x', 'groupby', 'granularity'].forEach((el) => {
+    // console.log(el, query[el], columnTypes.find(col => col.name == query[el]))
+    if (!columnTypes.find((col) => col.name == query[el])) {
+      if (query[el] && query[el] !== 'null') {
+        if (el === 'granularity' && !['week', 'month', 'quarter', 'year'].includes(query[el])) {
+          skip.push(`invalid granularity option: ${query[el]}`);
+        } else if (el !== 'granularity') { skip.push(`column not found: ${query[el]}`); }
+      }
+      if (!(el === 'granularity' || (el === 'groupby' && query[el] === 'null'))) delete query[el];
+    }
+  });
+
+  if (
+    !columnTypes.find(
+      (col) => col.type === 'numeric' && col.name == query.metric
+    )
+  ) {
+    delete query.metric;
+  }
+
+  const xName = query.x || (Array.isArray(data.x) ? data.x[0] : data.x);
+  const xType = columnTypes.find((el) => el.name == xName)?.type;
+
+  const granularity =
+    xType === 'date' || xType?.includes('timestamp')
+      ? query.granularity || data.granularity || 'year'
+      : null;
+
+  const x =
+    (granularity
+      ? `date_trunc('${granularity}',${xName})::date::text`
+      : null) || xName;
+
+  const metrics = Array.isArray(data.metrics || data.metric) ? (data.metrics || data.metric) : [data.metrics || data.metric];
+  const metric =
+    (query.metric ? `sum(${query.metric})` : null) ||
+    (metrics.length
+      ? (metrics
+        ?.filter((el) => el && columnTypes.find((col) => col.name == (el?.name || el)))
+        ?.map((el) => el.fx || `${el.operator || 'sum'}(${el.name || el})`)?.join(',') || 'count(*)')
+      : 'count(*)');
+
+  const yName = metrics?.[0]?.name || metrics?.[0];
+  const yType = columnTypes.find((el) => el.name == yName)?.type;
+
+  const { cls, table, filterCustom } = data;
+  const groupby = (query.groupby || data.groupby) === 'null' ? null : (query.groupby || data.groupby);
+  // const orderby = query.orderby || data.orderby || 'count(*)';
+
+  const custom = query?.filterCustom
+    ?.split(',')
+    ?.map((el) => filterCustom?.find((item) => item?.name === el)?.sql)
+    ?.filter((el) => el)
+    ?.join(' and ');
+  const where = `${data.query || '1=1'} and ${custom || 'true'}`;
+
+  const tableSQL = data.tableSQL?.length
+    ? `(select * from ${data?.table} t ${data.tableSQL || ''} where ${where})q`
+    : undefined;
+
+  return { x, cls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };
+}
+export default normalizeData;

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

@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto';
-import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+import { dataInsert, dataUpdate, getPGAsync, pgClients } from "@opengis/fastify-table/utils.js";
 
 /* eslint-disable import/extensions */
 import { yamlSafe } from '../../../../utils.js';
@@ -20,12 +20,19 @@ export default async function widgetAdd({ pg = pgClients.client, params = {}, bo
   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;
 
-  if (!tableName || !(pg.pk?.[tableName] || pgClients[data.db || row.db || 'client']?.pk?.[tableName])) {
+  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 };
   }
 

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

@@ -37,8 +37,18 @@ export default async function widgetEdit({ pg = pgClients.client, body, params }
     .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;
-  if (!tableName || !(pg.pk?.[tableName] || pgClients[widgetData?.data?.db || templateData?.db || 'client']?.pk?.[tableName])) {
+  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 (!tableName || !(pg.pk?.[loadTemplate?.table || tableName] || pgClients[widgetData?.data?.db || templateData?.db || 'client']?.pk?.[loadTemplate?.table || tableName])) {
     return { message: 'bad params: table ' + tableName, status: 400 };
   }
 

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

@@ -31,9 +31,9 @@ export default async function map(req) {
     );
     if (data?.cls) {
       const vals = await getSelectVal({
-        pg, name: data.cls, values: rows.map(el => el.val),
+        pg, name: data.cls, values: rows.map(el => el.val), ar: true,
       });
-      rows.forEach(row => Object.assign(row, { val: vals?.[row.val || ''] || row.val }));
+      rows.forEach(row => Object.assign(row, { ...vals?.find?.(el => el.id === row.val) || { text: row.val } }));
     }
     Object.assign(res, { colors: rows }); // кольори для легенди
   }

package/server/utils/getWidget.js

@@ -85,10 +85,15 @@ async function getWidget({ pg: pg1 = pgClients.client, dashboard, widget }) {
     };
   }
 
-  const { pk, view } = await getMeta({ pg: widgetDb, table: main?.table });
+  const loadTemplate = pg.pk?.['admin.doc_template'] ? await pg.query(
+    'select body from admin.doc_template where doc_type=5 and title=$1',
+    [main.table]
+  ).then(el => el.rows?.[0]?.body) : null;
+
+  const { pk, view, columns = [] } = await getMeta({ pg: widgetDb, table: loadTemplate?.table || main?.table });
   if (!pk && !view) {
     return {
-      message: /* json.error || */ `invalid ${widget ? 'widget' : 'dashboard'}: table not found (${main?.table})`,
+      message: /* json.error || */ `invalid ${widget ? 'widget' : 'dashboard'}: table not found (${loadTemplate?.table || main?.table})`,
       status: 404,
     };
   }
@@ -97,6 +102,16 @@ async function getWidget({ pg: pg1 = pgClients.client, dashboard, widget }) {
     (el, i) => `left join lateral(${el})t${i + 1} on 1=1`
   );
 
-  return { ...main, pg: widgetDb, sql: widgetData?.sql, limit: widgetData?.limit, tableSQL, data, type, text, controls, style, options, yml };
+  const columnList = columns.map(col => col.name);
+
+  const res = { ...main, pg: widgetDb, sql: widgetData?.sql, limit: widgetData?.limit, tableSQL, data, type, text, controls, style, options, yml };
+  if (res.x && !columnList.includes(res.x) && !loadTemplate?.table) {
+    Object.assign(res, { x: null, error: `column does not exists: ${res.x} at table ${res.table}` });
+  }
+  if (loadTemplate?.table) {
+    Object.assign(res.data || {}, { table: loadTemplate?.table });
+    Object.assign(res, { table: loadTemplate?.table, table_name: loadTemplate?.table, tableSQL: loadTemplate.sql?.filter?.(el => !el.disabled && el?.sql?.replace)?.map?.((el, i) => `left join lateral(${el.sql})t${i + 1} on 1=1`)?.join?.(' ') });
+  }
+  return res;
 }
 export default getWidget;

package/dist/vs-map-CNz_KPjD.js

@@ -1,79 +0,0 @@
-import { l as M, m as w } from "./map-component-mixin-C1bMsX3E.js";
-import { _ as b, c as y } from "./import-file-DXZLuS8B.js";
-import { resolveComponent as i, createElementBlock as V, openBlock as u, createElementVNode as d, createBlock as _, createCommentVNode as v, createVNode as c } from "vue";
-const $ = {
-  mixins: [y, M, w],
-  name: "VsMap",
-  async mounted() {
-    await this.getMapData(), await this.createMap();
-  },
-  methods: {
-    async getMapData() {
-      const s = await (await fetch(
-        `/api/bi-map?widget=${this.widget}&dashboard=${this.dashboard}`
-      )).json();
-      this.data = s;
-    },
-    async loadHandler() {
-      const a = ["#69D2E7", "yellow", "#FE4365"], s = this.data.colors ? ["match", ["get", "x"]].concat(
-        this.data.colors.reduce(
-          (o, t, r) => o.concat(t.val, a[r]),
-          []
-        )
-      ).concat(["gray"]) : "blue", p = [5, 7, 9, 11, 13], e = this.data.sizes ? ["case"] : 5;
-      this.data.sizes && (this.data.sizes.reverse().forEach((o, t) => {
-        e.push([">", ["get", "metric"], o]), e.push(p[t]);
-      }), e.push(5));
-      const n = {
-        type: "circle",
-        color: s,
-        width: 2,
-        radius: e,
-        stroke: "#eee"
-      };
-      Object.assign(n, this.data.style || {}), this.addVtileLayer({
-        id: "bi",
-        url: `${window.top.location.origin}/api/bi-vtile/{z}/{x}/{y}.vmt?widget=${this.widget}&dashboard=${this.dashboard}&nocache=1`,
-        style: n
-      });
-    }
-  }
-}, z = ["id"], I = ["id"], k = { ref: "popup" }, x = { class: "absolute flex flex-col right-[10px] top-[105px] gap-1" };
-function E(a, s, p, e, n, o) {
-  var l, m, h;
-  const t = i("VsMapSetting"), r = i("VsMapSlotLayers"), f = i("VsMapLegend"), g = i("VsMapGoHome");
-  return u(), V("div", {
-    class: "relative w-full h-full",
-    id: `wrapper-${a.mapId}`
-  }, [
-    d("div", {
-      id: a.mapId,
-      class: "w-full flex items-end relative h-[250px]"
-    }, [
-      d("div", k, null, 512)
-    ], 8, I),
-    a.showSetting ? (u(), _(t, {
-      key: 0,
-      map: a.map,
-      coordinates: a.coordinatesByMouse
-    }, null, 8, ["map", "coordinates"])) : v("", !0),
-    c(r, { map: a.map }, null, 8, ["map"]),
-    d("div", x, [
-      c(f, {
-        mapId: a.mapId,
-        colors: (l = a.data) == null ? void 0 : l.colors,
-        sizes: (m = a.data) == null ? void 0 : m.sizes,
-        color: a.color,
-        resizeItem: "true"
-      }, null, 8, ["mapId", "colors", "sizes", "color"]),
-      c(g, {
-        map: a.map,
-        bbox: (h = a.data) == null ? void 0 : h.bounds
-      }, null, 8, ["map", "bbox"])
-    ])
-  ], 8, z);
-}
-const C = /* @__PURE__ */ b($, [["render", E]]);
-export {
-  C as default
-};

package/dist/vs-map-cluster-CSDStbmR.js

@@ -1,104 +0,0 @@
-import { l as v, m as k, p as L } from "./map-component-mixin-C1bMsX3E.js";
-import { _ as C, c as I } from "./import-file-DXZLuS8B.js";
-import { resolveComponent as e, createElementBlock as S, openBlock as g, createElementVNode as u, createBlock as _, createCommentVNode as $, createVNode as i } from "vue";
-const z = {
-  mixins: [I, v, k],
-  data() {
-    return {
-      baseColor: "pink",
-      kattotg: ""
-    };
-  },
-  async mounted() {
-    await this.getMapData(), await this.createMap();
-  },
-  watch: {
-    kattotg() {
-      this.loadHandler();
-    }
-  },
-  methods: {
-    async getMapData() {
-      const t = await fetch(
-        `/api/bi-cluster?widget=${this.widget}&dashboard=${this.dashboard}`
-      );
-      this.data = await t.json();
-    },
-    async loadHandler() {
-      var r;
-      this.baseColor = ((r = this.data.style) == null ? void 0 : r.color) || "blue";
-      const t = ["case"];
-      this.data.sizes.reverse().forEach((s, n) => {
-        t.push([">", ["get", "metric"], s]), t.push(L[this.baseColor][n]), n++;
-      }), t.push("gray");
-      const a = {
-        type: "polygon",
-        color: t,
-        opacity: 0.4
-      };
-      Object.assign(a, this.data.style || {}), this.map.getSource("bi") || this.addVtileLayer({
-        id: "bi",
-        url: `${window.location.origin}/api/bi-cluster-vtile/{z}/{x}/{y}.vmt?widget=${this.widget}&dashboard=${this.dashboard}&nocache=1`,
-        style: a
-      }), this.map.getLayer("highlighted") && this.map.removeLayer("highlighted"), this.map.getSource("highlighted") && this.map.removeSource("highlighted");
-      const o = ["case"];
-      this.kattotg && o.push(
-        ["==", ["to-string", ["get", "name"]], String(this.kattotg)],
-        "red"
-      ), o.push("transparent"), this.map.addLayer({
-        id: "highlighted",
-        type: "fill",
-        source: "bi",
-        "source-layer": "bi",
-        paint: {
-          "fill-color": o,
-          "fill-opacity": 0.6
-        }
-      });
-    }
-  }
-}, B = ["id"], H = ["id"], E = { class: "absolute flex flex-col right-[10px] top-[105px] gap-1" };
-function N(t, a, o, r, s, n) {
-  var l, p, d, c, h, m;
-  const y = e("VsMapSetting"), f = e("VsMapSlotLayers"), b = e("VsMapLegend"), w = e("VsMapGoHome"), M = e("VsList");
-  return g(), S("div", {
-    class: "relative w-full h-full",
-    id: `wrapper-${t.mapId}`
-  }, [
-    u("div", {
-      id: t.mapId,
-      class: "h-[96%] w-full flex items-end min-h-[250px]"
-    }, null, 8, H),
-    t.showSetting ? (g(), _(y, {
-      key: 0,
-      map: t.map,
-      coordinates: t.coordinatesByMouse
-    }, null, 8, ["map", "coordinates"])) : $("", !0),
-    i(f, { map: t.map }, null, 8, ["map"]),
-    u("div", E, [
-      i(b, {
-        mapId: t.mapId,
-        colors: (l = t.data) == null ? void 0 : l.colors,
-        sizes: (p = t.data) == null ? void 0 : p.sizes,
-        color: s.baseColor,
-        changeOpacityItem: "true",
-        cluster: "true"
-      }, null, 8, ["mapId", "colors", "sizes", "color"]),
-      i(w, {
-        map: t.map,
-        bbox: (d = t.data) == null ? void 0 : d.bounds
-      }, null, 8, ["map", "bbox"]),
-      i(M, {
-        mapId: t.mapId,
-        source: (c = t.data) == null ? void 0 : c.rows,
-        total: ((h = t.data) == null ? void 0 : h.total) || 0,
-        count: ((m = t.data) == null ? void 0 : m.count) || 0,
-        onKattotg: a[0] || (a[0] = (V) => s.kattotg = V)
-      }, null, 8, ["mapId", "source", "total", "count"])
-    ])
-  ], 8, B);
-}
-const O = /* @__PURE__ */ C(z, [["render", N]]);
-export {
-  O as default
-};