@opengis/bi 1.0.39 → 1.0.41

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.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;

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

@@ -1,4 +1,4 @@
-import { pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
+import { pgClients, getFilterSQL, getSelectVal } from '@opengis/fastify-table/utils.js';
 
 import { getWidget } from '../../../../utils.js';
 
@@ -29,6 +29,12 @@ export default async function map(req) {
     const { rows = [] } = await pg.query(
       `select count(*), "${data.color}" as val from ${data.table} where ${data.query || '1=1'} group by "${data.color}"`
     );
+    if (data?.cls) {
+      const vals = await getSelectVal({
+        pg, name: data.cls, values: rows.map(el => el.val),
+      });
+      rows.forEach(row => Object.assign(row, { val: vals?.[row.val || ''] || row.val }));
+    }
     Object.assign(res, { colors: rows }); // кольори для легенди
   }
   if (data?.metrics?.length) {
@@ -40,13 +46,13 @@ export default async function map(req) {
                     PERCENTILE_CONT(1) WITHIN GROUP (ORDER BY "${metric}") as "100" from ${data.table} where ${data.query || '1=1'} and ${q || '1=1'}`;
     const sizes = await pg
       .query(q1)
-      .then((res1) => Object.values(res1.rows?.[0] || {}));
+      .then(el => Object.values(el.rows?.[0] || {}));
     Object.assign(res, { sizes }); // розміри для легенди
   }
   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 ${data.table} where ${data.query || '1=1'}`).then((res) => res.rows?.[0] || {});
+  from ${data.table} where ${data.query || '1=1'}`).then(el => el.rows?.[0] || {});
   const extent = extentStr ? extentStr.split(',') : undefined;
 
   Object.assign(res, {

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
-};