@opengis/bi 1.0.11 → 1.0.13

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

@@ -0,0 +1,57 @@
+
+
+import { getWidget } from '../../../../utils.js';
+
+
+export default async function map({
+    pg, funcs = {}, query = {},
+}) {
+
+    const { dashboard, widget } = query;
+
+    const { data, type, layers } = await getWidget({ dashboard, widget });
+
+
+    if (!['map'].includes(type)) {
+        return { message: 'access restricted: invalid widget type', status: 403 };
+    }
+    if (!data?.table) {
+        return { message: 'invalid widget: param table is required', status: 400 };
+    }
+    if (!pg.pk[data?.table]) {
+        return { message: 'invalid widget: table pkey not found', status: 400 };
+    }
+
+    const { q = '' } = await funcs.getFilterSQL({
+        pg, table: data?.table, filter: query.filter,
+    });
+
+    const res = {};
+    if (data?.color) {
+        const { rows = [] } = await pg.query(`select count(*), "${data.color}" as val from ${data.table} where ${data.query || '1=1'} group by "${data.color}"`);
+        Object.assign(res, { colors: rows }); // кольори для легенди
+    }
+    if (data?.metrics?.length) {
+        const metric = data?.metrics[0];
+        const q1 = `select PERCENTILE_CONT(0)  WITHIN GROUP (ORDER BY "${metric}") as "0",
+                    PERCENTILE_CONT(0.25) WITHIN GROUP (ORDER BY "${metric}") as "25",
+                    PERCENTILE_CONT(0.50) WITHIN GROUP (ORDER BY "${metric}") as "50",
+                    PERCENTILE_CONT(0.75) WITHIN GROUP (ORDER BY "${metric}") as "75",
+                    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] || {}));
+        Object.assign(res, { sizes }); // розміри для легенди
+    }
+    const { bbox } = await pg.query(`select st_asgeojson(box2d(geom))::json as bbox from ${data.table} where ${data.query || '1=1'}`).then((res1) => res1.rows?.[0] || {});
+    Object.assign(res, {
+
+        layers,
+        columns: data.columns,
+        bbox,                                   // Map bounds
+
+        top: [],                                // 10 найкращих 
+        bottom: [],                             // 10 найгірших
+    });
+    return res;
+
+
+}

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

@@ -4,6 +4,7 @@ import path from 'path';
 import { createHash } from 'crypto';
 import { writeFile, mkdir } from 'fs/promises';
 import { existsSync, /*readdirSync, */ readFileSync } from 'fs';
+import { getWidget } from '../../../../utils.js';
 
 import yaml from '../../dashboard/controllers/utils/yaml.js';
 import normalizeData from '../../data/controllers/util/normalizeData.js';
@@ -34,9 +35,9 @@ export default async function vtile(req, reply) {
     pg, params = {}, query = {}, funcs = {}, log,
   } = req;
 
-  const { filter, widget, sql, cluster, type, nocache, geom = 'geom', pointZoom = 0 } = query;
+  const { filter, widget, dashboard, sql, cluster, type, nocache, geom = 'geom', pointZoom = 0 } = query;
+
 
-  const { config = {} } = funcs;
 
   if (!widget) {
     return { message: 'not enough params: widget', status: 400 };
@@ -49,18 +50,11 @@ export default async function vtile(req, reply) {
     return { message: 'not enough params: xyz', status: 400 };
   }
 
-  const cwd = process.cwd();
-  const widgetDir = path.join(cwd, 'server/templates/widget');
-
-  const filePath = path.join(widgetDir, widget + '.yml');
-
-  if (!existsSync(filePath)) {
-    return { message: { root: config?.local ? widgetDir : undefined, error: `not found`, widget }, status: 404 };
-  }
+  const { data } = await getWidget({ widget, dashboard })
 
   const headers = {
     'Content-Type': 'application/x-protobuf',
-    'Cache-Control': nocache || sql || config?.local
+    'Cache-Control': nocache || sql
       ? 'no-cache'
       : 'public, max-age=86400',
   };
@@ -71,12 +65,7 @@ export default async function vtile(req, reply) {
   const file = path.join(root, `/map/vtile/${widget}/${hash ? `${createHash('sha1').update(hash).digest('base64')}/` : ''}${z}/${x}/${y}.mvt`);
 
   try {
-    const fileData = readFileSync(filePath, 'utf-8');
-    const { data = {} } = filePath.includes('.yml') ? yaml.loadSafe(fileData) : {};
 
-    if (!data?.table) {
-      return { message: `invalid ${widget ? 'widget' : 'dashboard'}: table not specified`, status: 400 };
-    }
 
     const pkey = pg.pk?.[data?.table];
     if (!pkey) {
@@ -84,15 +73,18 @@ export default async function vtile(req, reply) {
     }
 
     // data param 
-    const { table, where = '1=1', xName = {} } = normalizeData(data, query);
+    const { table, where = '1=1', xName = {}, metric } = normalizeData(data, query);
 
-    if (!xName?.name) {
-      return { message: `invalid ${widget ? 'widget' : 'dashboard'}: x axis column not specified`, status: 400 };
-    }
 
     // get sql
-    const filterQ = filter ? await funcs.getFilterSQL({ pg, table, filter, query }) : undefined;
-    const q = `select "${pkey}", "${xName?.name}", /* st_asgeojson(geom)::json as */ ${geom} as geom from ${filterQ ? `(${filterQ})` : table} q where ${where}`;
+    const columns = data.columns?.map(el => el.name || el)?.join(',') || '1';
+    const filterQ = filter ? await funcs.getFilterSQL({ pg, table, filter }) : undefined;
+    const q = `select "${pkey}", 
+                      ${data?.color ? `"${data?.color}"` : '0'} as x, 
+                      ${data.metrics?.[0] ? `"${data.metrics[0]}"::float` : '0'} as metric, 
+                      ${columns}, 
+                      ${geom} as geom 
+                      from ${filterQ ? `(${filterQ})` : table} q where ${where}`;
 
     if (sql === '1') return q;
 
@@ -100,17 +92,18 @@ export default async function vtile(req, reply) {
       10: 0.1, 11: 0.05, 12: 0.005, 13: 0.0002, 14: 0.00005,
     }[z] || 0.000001;
 
-    const geomCol = parseInt(z, 10) < parseInt(pointZoom, 10)
+    const geomCol = parseInt(z, 10) < parseInt(pointZoom, 10) || true
       ? `ST_Centroid(${geom})`
       : geom;
-    
+
     const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
     const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
 
     const areaZoom = area[z] && false ? ` and (st_area(st_transform(${geom},3857)))>'${area[z]}'` : '';
 
+
     const q1 = cluster > z
-      ? `SELECT ST_AsMVT(q, '${table}', 4096, 'geom','row') as tile
+      ? `SELECT ST_AsMVT(q, 'bi', 4096, 'geom','row') as tile
         FROM (
           SELECT floor(random() * 100000 + 1)::int + row_number() over() as row, count(*) as point_count,
           ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
@@ -122,14 +115,15 @@ export default async function vtile(req, reply) {
           ORDER BY 1 DESC
         )q`
 
-      : `SELECT ST_AsMVT(q, '${table}', 4096, 'geom','row') as tile
+      : `SELECT ST_AsMVT(q, 'bi', 4096, 'geom','row') as tile
           FROM (
             SELECT  
               floor(random() * 100000 + 1)::int + row_number() over() as row,
 
               ${pkey} as id, 
-              ${xName?.name} as x,
-
+              x,
+              metric,
+              ${columns},
               ST_AsMVTGeom(st_transform(${geomCol}, 3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
 
               FROM (select * from (${q})q where ${geom} && ${bbox2d} 
@@ -144,9 +138,8 @@ export default async function vtile(req, reply) {
           ) q`;
 
     if (sql === '2') return q1;
-    
-    // auto Index
-    funcs.autoIndex({ table, columns: [xName.name] });
+
+
 
     const { rows = [] } = await pg.query(q1);
 
@@ -154,7 +147,7 @@ export default async function vtile(req, reply) {
 
     const buffer = Buffer.concat(rows.map((el) => Buffer.from(el.tile)));
 
-    if (!nocache && !config.local) {
+    if (!nocache) {
       await mkdir(path.dirname(file), { recursive: true });
       await writeFile(file, buffer, 'binary');
     }

package/server/routes/map/index.mjs

@@ -1,8 +1,10 @@
-// import config from '../../../config.js';
-
+import map from './controllers/map.js';
 import geojson from './controllers/geojson.js';
 import vtile from './controllers/vtile.js';
 
+import cluster from './controllers/cluster.js';
+import clusterVtile from './controllers/clusterVtile.js';
+
 const biSchema = {
   querystring: {
     widget: { type: 'string', pattern: '^([\\d\\w]+)$' },
@@ -14,9 +16,10 @@ const biSchema = {
   },
 };
 
-
 export default async function route(fastify, opts) {
-  // const prefix = opts?.prefix || config.prefix || '/api';
+  fastify.get('/bi-map', { schema: biSchema }, map);
   fastify.get('/bi-geojson', { schema: biSchema }, geojson);
   fastify.get('/bi-vtile/:z/:y/:x', { schema: biSchema }, vtile);
+  fastify.get('/bi-cluster', { schema: biSchema }, cluster);
+  fastify.get('/bi-cluster-vtile/:z/:y/:x', { schema: biSchema }, clusterVtile);
 }

package/server/utils/getWidget.js

@@ -0,0 +1,56 @@
+import { getTemplate } from '@opengis/fastify-table/utils.js';
+import pgClients from '@opengis/fastify-table/pg/pgClients.js'
+const pg = pgClients.client;
+
+async function getWidget({ dashboard, widget }) {
+
+    const dashboardData = dashboard ? await getTemplate('dashboard', dashboard) : null;
+
+    const { id, tableName } = !dashboardData && pg.pk['bi.dashboard'] && dashboard ?
+        await pg.query(`select dashboard_id as id, table_name as "tableName" from bi.dashboard where $1 in (dashboard_id, name)`, [dashboard]).then((res1) => res1.rows?.[0] || {}) : {};
+
+    if (!dashboardData && dashboard && !id) {
+        return { message: `dashboard not found: ${dashboard}`, status: 404 };
+    }
+
+    dashboardData?.forEach(el => {
+        el[2] = el[0].split('.')[0]
+    })
+    const dashboardIndex = dashboardData?.find(el => el[2] == 'index')?.[1];
+
+    const widgetData = dashboard ? dashboardData?.find(el => el[2] === (widget || 'index'))?.[1] : await getTemplate('widget', widget);
+    if (typeof widgetData === 'string') {
+        return { source: widgetData, status: 200 }
+    }
+    if (!id && !dashboardData && !widgetData) {
+        return { message: `not found ${widget} ${dashboard}`, status: 404 };
+    }
+
+    const q = `select *, coalesce(data::jsonb, '{}'::jsonb) || jsonb_build_object('table', table_name) as data from bi.widget where dashboard_id=$1 and name=$2`;
+
+    const { type, text, data = {}, controls, style, options } = widgetData || await pg.query(q, [id || dashboard, widget]).then((res1) => res1.rows?.[0] || {});
+
+    if (!type) {
+        return { message: `widget not found: ${widget}`, status: 404 };
+    }
+
+    Object.assign(data, {
+        table: data.table
+            || tableName
+            || widgetData?.table_name
+            || dashboardIndex?.table
+            || dashboardIndex?.table_name,
+        db: dashboardIndex?.db || pgClients.client?.options?.database,
+    });
+    const main = { ...dashboardIndex || {}, ...widgetData, ...data };
+
+    if (!main?.table) {
+        return { message: /* json.error || */ `invalid ${widget ? 'widget' : 'dashboard'}: 1`, status: 404 };
+    }
+
+    const tableSQL = main?.sql?.map((el, i) => `left join lateral(${el})t${i + 1} on 1=1`);
+
+    return { ...main, tableSQL, data, type, text, controls, style, options };
+
+}
+export default getWidget;   

package/utils.js

@@ -0,0 +1,11 @@
+// This file contains code that we reuse
+// between our tests.
+
+// import getTemplatePath from '@opengis/fastify-table/table/controllers/utils/getTemplatePath.js';
+import getWidget from './server/utils/getWidget.js';
+
+export default null;
+export {
+    // getTemplatePath,
+    getWidget
+};

package/dist/vs-number-DKF5ptAP.js

@@ -1,34 +0,0 @@
-import { _ as t, f as o } from "./import-file-D6RYWvi_.js";
-import { openBlock as s, createElementBlock as n, toDisplayString as m } from "vue";
-const c = {
-  props: ["source", "dimensions"],
-  data() {
-    return {
-      number: ""
-    };
-  },
-  computed: {
-    formattedNumber() {
-      return o(this.number);
-    }
-  },
-  mounted() {
-    this.getNumber();
-  },
-  methods: {
-    async getNumber() {
-      try {
-        this.number = this.source[0][this.dimensions[0]];
-      } catch (e) {
-        console.error(e);
-      }
-    }
-  }
-}, a = { class: "font-[Inter,_Helvetica,_Arial] p-4 w-full text-[28px] pt-[10px] min-h-[130px] border-0" };
-function i(e, u, p, d, f, r) {
-  return s(), n("div", a, " $" + m(r.formattedNumber), 1);
-}
-const b = /* @__PURE__ */ t(c, [["render", i]]);
-export {
-  b as default
-};

package/server/templates/dashboard/erobota/bar_area.yml

@@ -1,17 +0,0 @@
-type: bar
-text: Quarterly Revenue (By Product Line)
-
-data:
-  table: demo.parcel_object # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: obj_area
-      operator: sum
-      title: obj_area
-
-  x: region
-
-controls:
-style:
-  stack: true

package/server/templates/dashboard/erobota/bar_culture.yml

@@ -1,18 +0,0 @@
-type: bar
-text: Розподіл культур за регіонами
-
-data:
-  table: demo.parcel_object_culture # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: obj_area
-      operator: sum
-      title: obj_area
-
-  x: region
-  groupby: culture
-
-controls:
-style:
-  stack: true

package/server/templates/dashboard/erobota/bar_grand.yml

@@ -1,18 +0,0 @@
-type: bar
-text: Сума виплачених грантів
-
-data:
-  table: demo.parcel_object # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: grant_sum
-      operator: sum
-      title: grant_sum
-
-  x: region
-  orderby: region
-
-controls:
-style:
-

package/server/templates/dashboard/erobota/count_grand.yml

@@ -1,8 +0,0 @@
-type: number
-text: Кількість грантів
-
-data:
-  table: demo.parcel_object # Назва таблиці
-  query: 1=1 # Запит
-  metrics: object_id
-controls:

package/server/templates/dashboard/erobota/index.yml

@@ -1,47 +0,0 @@
-title: Гранти на розвиток садівництва та тепличного господарства
-description: Ініціатива реалізована в межах Програми USAID з аграрного і сільського розвитку (АГРО)
-table_name: demo.parcel
-panels:
-  - type: column
-    col: 4
-    widgets:
-      - total_area
-
-  - widget: total_grand
-    col: 4
-
-  - widget: count_grand
-    col: 4
-
-  - widget: pie_area
-    col: 4
-
-  - widget: bar_area
-    col: 8
-
-  - widget: pie_grant
-    col: 4
-
-  - widget: bar_grand
-    col: 8
-
-  - widget: bar_culture
-    col: 12
-
-  - widget: list_culture
-    col: 6
-
-  - widget: list_grant
-    col: 6
-
-
-
-
-style:
-  color:
-  stack: true # only for bar
-  orientation: vertical # only for bar, line
-  date_format: smart_date # d3 format number
-  number_format: smart_date # d3 format number
-  label: fff
-  tooltip: 333

package/server/templates/dashboard/erobota/list_culture.yml

@@ -1,12 +0,0 @@
-type: listbar
-text: Розподіл за культурами. га
-
-data:
-  table: demo.parcel_object_culture # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: obj_area
-      operator: sum
-      title: obj_area
-  x: culture

package/server/templates/dashboard/erobota/list_grant.yml

@@ -1,12 +0,0 @@
-type: listbar
-text: Сума виплачених грантів, тис. грн
-
-data:
-  table: demo.parcel_object # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: grant_sum
-      operator: sum
-      title: grant_sum
-  x: region

package/server/templates/dashboard/erobota/map.yml

@@ -1,4 +0,0 @@
-type: map
-text: Регіональний розподіл
-
-data:

package/server/templates/dashboard/erobota/pie_area.yml

@@ -1,17 +0,0 @@
-type: pie
-text: Площа, га
-
-data:
-  table: demo.parcel_object # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: obj_area
-      operator: sum
-      title: obj_area
-  x: object_type
-
-style:
-  donut: true
-  innerRadius: 30
-  outerRadius: 70

package/server/templates/dashboard/erobota/pie_grant.yml

@@ -1,17 +0,0 @@
-type: pie
-text: Виплата грантів
-
-data:
-  table: demo.parcel_object # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: grant_sum
-      operator: sum
-      title: grant_sum
-  x: object_type
-
-style:
-  donut: true
-  innerRadius: 30
-  outerRadius: 70

package/server/templates/dashboard/erobota/total_area.yml

@@ -1,9 +0,0 @@
-type: number
-text: Площа, га
-
-data:
-  table: demo.parcel_object # Назва таблиці
-  query: 1=1 # Запит
-  metrics: obj_area
-controls:
-

package/server/templates/dashboard/erobota/total_grand.yml

@@ -1,9 +0,0 @@
-type: number
-text: Сума грантів, тис. грн
-
-data:
-  table: demo.parcel_object # Назва таблиці
-  query: 1=1 # Запит
-  metrics: grant_sum
-controls:
-

package/server/templates/dashboard/sales/index.yml

@@ -1,40 +0,0 @@
-title: Sales Dashboard
-description: This example dashboard provides insight into the business operations of vehicle seller
-table_name: demo.cleaned_sales_data
-panels:
-  # row 1
-  - type: column
-    col: 3
-    widgets:
-      - total_revenue
-      - total_products_sold
-
-  - widget: quarterly_revenue
-    col: 6
-  - widget: vehicle_sales_info
-    col: 3
-
-  # row 2
-  - widget: total_products_sold_by_product_line
-    col: 3
-  - widget: quarterly_revenue_by_product_line
-    col: 6
-  - widget: total_revenue_by_product_line
-    col: 3
-
-grid: # сітка якщо є
-  - { "x": 0, "y": 0, "w": 2, "h": 2, "i": 0, widget: "quarterly_revenue" }
-  - { "x": 1, "y": 0, "w": 2, "h": 2, "i": 0, widget: "total_revenue" }
-
-widgets: null # самі віджети
-
-filters: null # фільтри
-
-style:
-  color:
-  stack: true # only for bar
-  orientation: vertical # only for bar, line
-  date_format: smart_date # d3 format number
-  number_format: smart_date # d3 format number
-  label: 222
-  tooltip: 333

package/server/templates/dashboard/sales/quarterly_revenue.yml

@@ -1,19 +0,0 @@
-type: bar
-text: Quarterly Revenue
-
-data:
-  table: demo.cleaned_sales_data # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: sales
-      operator: sum
-      title: sales
-
-  x: order_date
-  granularity: quarter
-  orderby: year
-
-controls:
-style:
-  horizontal: false

package/server/templates/dashboard/sales/quarterly_revenue_by_product_line.yml

@@ -1,19 +0,0 @@
-type: bar
-text: Quarterly Revenue (By Product Line)
-
-data:
-  table: demo.cleaned_sales_data # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: sales
-      operator: sum
-      title: sales
-
-  x: order_date
-  granularity: quarter
-  groupby: product_line
-
-controls:
-style:
-  stack: true

package/server/templates/dashboard/sales/total_products_sold.yml

@@ -1,9 +0,0 @@
-type: number
-text: Total Products Sold
-
-data:
-  table: demo.cleaned_sales_data # Назва таблиці
-  query: 1=1 # Запит
-  metrics:
-    - quantity_ordered
-controls:

package/server/templates/dashboard/sales/total_products_sold_by_product_line.yml

@@ -1,12 +0,0 @@
-type: listbar
-text: Total Products Sold (By Product Line)
-
-data:
-  table: demo.cleaned_sales_data # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: quantity_ordered
-      operator: sum
-      title: quantity_sold
-  x: product_line

package/server/templates/dashboard/sales/total_revenue.yml

@@ -1,8 +0,0 @@
-type: number
-text: Total Revenue
-
-data:
-  table: demo.cleaned_sales_data # Назва таблиці
-  query: 1=1 # Запит
-  metrics: sales
-controls:

package/server/templates/dashboard/sales/total_revenue_by_product_line.yml

@@ -1,17 +0,0 @@
-type: pie
-text: Total Revenue (By Product Line)
-
-data:
-  table: demo.cleaned_sales_data # Назва таблиці
-  query: 1=1 # Запит
-
-  metrics: # Групування
-    - name: sales
-      operator: sum
-      title: sales
-  x: product_line
-
-style:
-  donut: true
-  innerRadius: 30
-  outerRadius: 70