@opengis/bi 1.2.32 → 1.2.34

package/server/routes/dataset/utils/getLayersData.js

@@ -1,107 +1,107 @@
-import descriptionList from "./descriptionList.js";
-import metaFormat from "./metaFormat.js";
-
-async function getDataByLatLng({ pg, layer, table, id, lat, lng, time = [] }) {
-    // const rclient = getRedis();
-    // const redisKey = `${pg.options.database}:gis-format:${layer}:${lat}:${lng}`;
-    // const cacheData = await rclient.get(redisKey);
-    // if (cacheData && !config.local) return JSON.parse(cacheData);
-
-    const { rows: styles = [] } = await pg.query(`select style_id as id, dataset 
-    from gis.style where style_id=any($1::text[])
-      union all
-    select dataset_id as id, json_build_array(json_build_object('pk', pk, 'table', table_name, 'query', query, 'card', setting->>'card', 'columns', column_list)) as dataset 
-    from bi.dataset a where dataset_id=any($1::text[])`, [layer.split(',')]);
-    time.push(Date.now());
-
-    if (!styles?.length) {
-        return { message: `style not found: ${layer}`, status: 400 };
-    }
-
-    const { srids } = await pg.queryCache?.('select json_agg(srid) as srids from spatial_ref_sys').then((res1) => res1.rows?.[0] || {}) || {};
-
-    const layers = styles.reduce((acc, curr) => {
-        curr.dataset?.filter((el) => el.table && (el.pk || pg.pk?.[el.table]))
-            ?.forEach((el) => acc.push({
-                layer: curr.id,
-                pk: el.pk || pg.pk?.[el.table],
-                key: el.key,
-                table: el.table,
-                query: el.query,
-                template: el.card,
-                column_list: el.column_list,
-                columns: el.columns || el.column_list?.map((el) => el.name)?.join(','),
-                srid: el.srid || '4326',
-                geom: el.geom || 'geom',
-                step: srids?.includes(el.srid - 0) && el.srid !== '4326' ? 10 : 0.0002,
-            }));
-        return acc;
-    }, [])
-        .filter((el) => el.pk && el.layer)
-        .filter((el) => table ? el.table === table : true);
-
-    if (!layers.length) {
-        return { message: 'data not found', status: 404 };
-    }
-
-    const point = `srid=4326;point(${lng} ${lat})`;
-
-    // ${el.columns?.split?.filter?.((el) => el) ? `,${el.columns?.split?.filter?.((el) => el) || ''}` : ''}
-
-    const q = layers.map((el) => `select ${el.pk}, '${el.layer}' as layer,
-    row_to_json(t) as data,
-    st_asgeojson(${el.geom})::json as geom from ${el.table} t 
-    where ${el.query || '1=1'} and ${id ? `${el.pk}::text='${id.replace(/'/g, "''")}'` : '1=1'}
-    and case
-      when ST_GeometryType(geom) in ('ST_Polygon','ST_MultiPolygon')
-      then st_intersects(geom,st_buffer('${point}',${el.step}))
-  
-      when ST_GeometryType(geom) in ('ST_Line','ST_MultiLineString')
-      then st_distance(geom,'${point}') < ${el.step}
-    else false end`).join(' union all ');
-
-    // if (config.local && config.debug) console.log(q);
-    const { rows: objects = [] } = await pg.query(q) || {};
-    time.push(Date.now());
-
-    const rows = objects.map((row) => {
-        const layerData = layers.find((el) => el.layer === row?.layer) || {};
-        const rowData = layerData?.columns?.split?.filter?.((el) => el) ? layerData?.columns?.split?.filter?.((el) => el).reduce((acc, curr) => Object.assign(acc, { [curr]: row.data?.[curr] }), {}) : row.data;
-        return {
-            ...rowData,
-            ...row,
-            ...layerData,
-            data: undefined,
-            id: layerData.pk ? row?.[layerData.pk] : undefined,
-            geom: row.geom,
-        };
-    });
-
-    const { pk, layer: layerId, card, template } = rows[0] || {};
-
-    const dataset = layers.find((el) => el.layer === rows?.[0]?.layer) || {};
-
-    const columnList = (dataset.column_list || dataset.columns)?.reduce?.((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua || curr.name }), {}) || {};
-
-    const columns = card
-        ? Object.keys(card).map(el => `${el}| ${card[el]}`).join('|')
-        : Object.keys(columnList)?.map((key) => `${columnList[key]}| ${key}`).join('|');
-
-    const html = columns && rows?.[0] ? await descriptionList(rows[0], { hash: { columns } }) : undefined;
-    time.push(Date.now());
-
-    await Promise.all(rows.map(async () => {
-        const layerData = layers.find((el) => el.layer === rows?.[0]?.layer) || {};
-        const columns = layerData.column_list || layerData.columns;
-        if (columns?.length && Array.isArray(columns)) {
-            await metaFormat({ rows, columns });
-        }
-    }));
-    time.push(Date.now());
-
-    const resp = { id: rows?.[0]?.[pk], layers: layerId, template, data: rows?.[0], rows, html };
-
-    // await rclient.set(redisKey, JSON.stringify(resp), 'EX', 5 * 60);
-    return resp;
-}
+import descriptionList from "./descriptionList.js";
+import metaFormat from "./metaFormat.js";
+
+async function getDataByLatLng({ pg, layer, table, id, lat, lng, time = [] }) {
+    // const rclient = getRedis();
+    // const redisKey = `${pg.options.database}:gis-format:${layer}:${lat}:${lng}`;
+    // const cacheData = await rclient.get(redisKey);
+    // if (cacheData && !config.local) return JSON.parse(cacheData);
+
+    const { rows: styles = [] } = await pg.query(`select style_id as id, dataset 
+    from gis.style where style_id=any($1::text[])
+      union all
+    select dataset_id as id, json_build_array(json_build_object('pk', pk, 'table', table_name, 'query', query, 'card', setting->>'card', 'columns', column_list)) as dataset 
+    from bi.dataset a where dataset_id=any($1::text[])`, [layer.split(',')]);
+    time.push(Date.now());
+
+    if (!styles?.length) {
+        return { message: `style not found: ${layer}`, status: 400 };
+    }
+
+    const { srids } = await pg.queryCache?.('select json_agg(srid) as srids from spatial_ref_sys').then((res1) => res1.rows?.[0] || {}) || {};
+
+    const layers = styles.reduce((acc, curr) => {
+        curr.dataset?.filter((el) => el.table && (el.pk || pg.pk?.[el.table]))
+            ?.forEach((el) => acc.push({
+                layer: curr.id,
+                pk: el.pk || pg.pk?.[el.table],
+                key: el.key,
+                table: el.table,
+                query: el.query,
+                template: el.card,
+                column_list: el.column_list,
+                columns: el.columns || el.column_list?.map((el) => el.name)?.join(','),
+                srid: el.srid || '4326',
+                geom: el.geom || 'geom',
+                step: srids?.includes(el.srid - 0) && el.srid !== '4326' ? 10 : 0.0002,
+            }));
+        return acc;
+    }, [])
+        .filter((el) => el.pk && el.layer)
+        .filter((el) => table ? el.table === table : true);
+
+    if (!layers.length) {
+        return { message: 'data not found', status: 404 };
+    }
+
+    const point = `srid=4326;point(${lng} ${lat})`;
+
+    // ${el.columns?.split?.filter?.((el) => el) ? `,${el.columns?.split?.filter?.((el) => el) || ''}` : ''}
+
+    const q = layers.map((el) => `select ${el.pk}, '${el.layer}' as layer,
+    row_to_json(t) as data,
+    st_asgeojson(${el.geom})::json as geom from ${el.table} t 
+    where ${el.query || '1=1'} and ${id ? `${el.pk}::text='${id.replace(/'/g, "''")}'` : '1=1'}
+    and case
+      when ST_GeometryType(geom) in ('ST_Polygon','ST_MultiPolygon')
+      then st_intersects(geom,st_buffer('${point}',${el.step}))
+  
+      when ST_GeometryType(geom) in ('ST_Line','ST_MultiLineString')
+      then st_distance(geom,'${point}') < ${el.step}
+    else false end`).join(' union all ');
+
+    // if (config.local && config.debug) console.log(q);
+    const { rows: objects = [] } = await pg.query(q) || {};
+    time.push(Date.now());
+
+    const rows = objects.map((row) => {
+        const layerData = layers.find((el) => el.layer === row?.layer) || {};
+        const rowData = layerData?.columns?.split?.filter?.((el) => el) ? layerData?.columns?.split?.filter?.((el) => el).reduce((acc, curr) => Object.assign(acc, { [curr]: row.data?.[curr] }), {}) : row.data;
+        return {
+            ...rowData,
+            ...row,
+            ...layerData,
+            data: undefined,
+            id: layerData.pk ? row?.[layerData.pk] : undefined,
+            geom: row.geom,
+        };
+    });
+
+    const { pk, layer: layerId, card, template } = rows[0] || {};
+
+    const dataset = layers.find((el) => el.layer === rows?.[0]?.layer) || {};
+
+    const columnList = (dataset.column_list || dataset.columns)?.reduce?.((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua || curr.name }), {}) || {};
+
+    const columns = card
+        ? Object.keys(card).map(el => `${el}| ${card[el]}`).join('|')
+        : Object.keys(columnList)?.map((key) => `${columnList[key]}| ${key}`).join('|');
+
+    const html = columns && rows?.[0] ? await descriptionList(rows[0], { hash: { columns } }) : undefined;
+    time.push(Date.now());
+
+    await Promise.all(rows.map(async () => {
+        const layerData = layers.find((el) => el.layer === rows?.[0]?.layer) || {};
+        const columns = layerData.column_list || layerData.columns;
+        if (columns?.length && Array.isArray(columns)) {
+            await metaFormat({ rows, columns });
+        }
+    }));
+    time.push(Date.now());
+
+    const resp = { id: rows?.[0]?.[pk], layers: layerId, template, data: rows?.[0], rows, html };
+
+    // await rclient.set(redisKey, JSON.stringify(resp), 'EX', 5 * 60);
+    return resp;
+}
 export default getDataByLatLng

package/server/routes/dataset/utils/getTableData.js

@@ -1,47 +1,47 @@
-import { handlebars } from "@opengis/fastify-table/utils.js";
-
-import descriptionList from "./descriptionList.js";
-// import metaFormat from "./metaFormat.js";
-
-async function getDataById({ pg, table, id, time = [] }) {
-    const dataset = await pg.query(`select dataset_id as id, pk, query, table_name, column_list, setting
-    from bi.dataset where dataset_id=$1`, [table]).then((res) => res.rows[0] || {});
-    time.push(Date.now());
-
-    if (!dataset?.id) {
-        return { message: `dataset not found: ${table}`, status: 400 };
-    }
-
-    if (!dataset?.table_name) {
-        return { message: 'invalid dataset: empty params table', status: 400 };
-    }
-
-    const pk = dataset.pk || pg.pk?.[dataset.table_name];
-
-    const { rows = [] } = pk ? await pg.query(`select *, ${pk}, geom::json from ${dataset.table_name} where ${dataset.query || '1=1'} and ${pk}=$1`, [id]) || {} : {};
-    if (pk) rows.forEach((row) => Object.assign(row, { id: row?.[pk] }));
-    time.push(Date.now());
-
-    // sql columns
-    const sql = `select attname as name, pg_catalog.col_description(attrelid,attnum) as title, atttypid::regtype as type from  pg_catalog.pg_attribute a 
-                        where attrelid='${dataset.table_name}'::regclass and attnum>0 
-                        and attname not in ('editor_id','editor_date','cdate','geom','id','uid','cdate')
-                        and atttypid::regtype not in ('json','geometry')`;
-
-    // card or auto
-    const type = dataset.setting?.card_type || 'auto';
-    const list = dataset.setting?.card_list || [];
-    const { rows: all } = await pg.query(sql).then(el => el);
-    const columns = all.filter(el => type === 'list' ? list.includes(el.name) : true)
-        .map(el => `${el.title || el.name}| ${el.name}`).join('|')
-
-
-    const { body } = type === 'html' && dataset?.setting?.card ? await pg.query(`select body->>'body' as body from admin.doc_template where title=$1`, [dataset?.setting?.card]).then(el => el.rows[0] || {}) : {}
-
-    const html = body ? await handlebars.compile(body)(rows[0]) : await descriptionList(rows[0], { hash: { columns } });
-    time.push(Date.now());
-
-
-    return { id: rows?.[0]?.id, template: dataset?.setting?.card, rows, html, body };
-}
+import { handlebars } from "@opengis/fastify-table/utils.js";
+
+import descriptionList from "./descriptionList.js";
+// import metaFormat from "./metaFormat.js";
+
+async function getDataById({ pg, table, id, time = [] }) {
+    const dataset = await pg.query(`select dataset_id as id, pk, query, table_name, column_list, setting
+    from bi.dataset where dataset_id=$1`, [table]).then((res) => res.rows[0] || {});
+    time.push(Date.now());
+
+    if (!dataset?.id) {
+        return { message: `dataset not found: ${table}`, status: 400 };
+    }
+
+    if (!dataset?.table_name) {
+        return { message: 'invalid dataset: empty params table', status: 400 };
+    }
+
+    const pk = dataset.pk || pg.pk?.[dataset.table_name];
+
+    const { rows = [] } = pk ? await pg.query(`select *, ${pk}, geom::json from ${dataset.table_name} where ${dataset.query || '1=1'} and ${pk}=$1`, [id]) || {} : {};
+    if (pk) rows.forEach((row) => Object.assign(row, { id: row?.[pk] }));
+    time.push(Date.now());
+
+    // sql columns
+    const sql = `select attname as name, pg_catalog.col_description(attrelid,attnum) as title, atttypid::regtype as type from  pg_catalog.pg_attribute a 
+                        where attrelid='${dataset.table_name}'::regclass and attnum>0 
+                        and attname not in ('editor_id','editor_date','cdate','geom','id','uid','cdate')
+                        and atttypid::regtype not in ('json','geometry')`;
+
+    // card or auto
+    const type = dataset.setting?.card_type || 'auto';
+    const list = dataset.setting?.card_list || [];
+    const { rows: all } = await pg.query(sql).then(el => el);
+    const columns = all.filter(el => type === 'list' ? list.includes(el.name) : true)
+        .map(el => `${el.title || el.name}| ${el.name}`).join('|')
+
+
+    const { body } = type === 'html' && dataset?.setting?.card ? await pg.query(`select body->>'body' as body from admin.doc_template where title=$1`, [dataset?.setting?.card]).then(el => el.rows[0] || {}) : {}
+
+    const html = body ? await handlebars.compile(body)(rows[0]) : await descriptionList(rows[0], { hash: { columns } });
+    time.push(Date.now());
+
+
+    return { id: rows?.[0]?.id, template: dataset?.setting?.card, rows, html, body };
+}
 export default getDataById

package/server/routes/dataset/utils/insertDataQuery.js

@@ -1,12 +1,12 @@
-export default function insertDataQuery(columns, data, table) {
-  const columnList = columns?.map((el) => el.name)?.join(',');
-  const features = data?.features || [];
-  if (!features?.length) return null;
-
-  const insertData = `INSERT into ${table} (geom ${columns?.length ? ','.concat(columnList) : ''}) SELECT public.ST_GeomFromGeoJSON((features->>'geometry')::json) AS geom 
-        ${columns?.length ? ','.concat(columns?.map((el) => `features->'properties'->>'${el.title}'`)?.join(',')) : ''} FROM 
-        (SELECT json_array_elements('${JSON.stringify(features).replace(/'/g, "''")}'::json) AS features)q`;
-
-  // console.log(insertData);
-  return insertData;
-}
+export default function insertDataQuery(columns, data, table) {
+  const columnList = columns?.map((el) => el.name)?.join(',');
+  const features = data?.features || [];
+  if (!features?.length) return null;
+
+  const insertData = `INSERT into ${table} (geom ${columns?.length ? ','.concat(columnList) : ''}) SELECT public.ST_GeomFromGeoJSON((features->>'geometry')::json) AS geom 
+        ${columns?.length ? ','.concat(columns?.map((el) => `features->'properties'->>'${el.title}'`)?.join(',')) : ''} FROM 
+        (SELECT json_array_elements('${JSON.stringify(features).replace(/'/g, "''")}'::json) AS features)q`;
+
+  // console.log(insertData);
+  return insertData;
+}

package/server/routes/dataset/utils/metaFormat.js

@@ -1,24 +1,24 @@
-import { getSelectVal } from '@opengis/fastify-table/utils.js';
-
-export default async function metaFormat({ rows, columns }) {
-  const selectCols = columns?.filter?.((el) => el.data);
-  if (!selectCols?.length) return rows;
-
-  await Promise.all(selectCols.map(async (attr) => {
-    const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => (typeof el === 'boolean' ? true : el));
-    if (!values.length) return null;
-
-    const cls = await getSelectVal({ name: attr.data, values });
-    if (!cls) return null;
-
-    rows.forEach(el => {
-      const val = el[attr.name]?.map?.(c => cls[c.toString()] || cls[c] || c) || cls[el[attr.name]?.toString()] || cls[el[attr.name]] || el[attr.name];
-      if (!val) return;
-      Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
-    });
-
-    return null;
-  }));
-
-  return rows;
-}
+import { getSelectVal } from '@opengis/fastify-table/utils.js';
+
+export default async function metaFormat({ rows, columns }) {
+  const selectCols = columns?.filter?.((el) => el.data);
+  if (!selectCols?.length) return rows;
+
+  await Promise.all(selectCols.map(async (attr) => {
+    const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => (typeof el === 'boolean' ? true : el));
+    if (!values.length) return null;
+
+    const cls = await getSelectVal({ name: attr.data, values });
+    if (!cls) return null;
+
+    rows.forEach(el => {
+      const val = el[attr.name]?.map?.(c => cls[c.toString()] || cls[c] || c) || cls[el[attr.name]?.toString()] || cls[el[attr.name]] || el[attr.name];
+      if (!val) return;
+      Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
+    });
+
+    return null;
+  }));
+
+  return rows;
+}

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

@@ -1,36 +1,36 @@
-import { pgClients, dataInsert, getPGAsync } from "@opengis/fastify-table/utils.js";
-
-export default async function dashboardAdd(req, reply) {
-  const {
-    pg = pgClients.client,
-    body = {},
-  } = req;
-  const time = Date.now();
-
-  if (body?.db) {
-    try {
-      const pg1 = await getPGAsync(body.db);
-      await pg1.query('select 1');
-    } catch (err) {
-      return reply.status(400).send('Некоректна база даних');
-    }
-  }
-
-  const res = await dataInsert({
-    pg,
-    table: 'bi.dashboard',
-    data: body,
-  }).then(el => el.rows?.[0] || {});
-
-  if (res.dashboard_id && body.dataset) {
-    await pg.query(`update bi.dataset set dashboard_list=coalesce(dashboard_list, '{}'::text[]) || array[$1]
-    where dataset_id=$2`, [res.dashboard_id, body.dataset]);
-  }
-
-  return {
-    time: Date.now() - time,
-    id: res.dashboard_id,
-    title: res.title,
-    name: res.name,
-  };
-}
+import { pgClients, dataInsert, getPGAsync } from "@opengis/fastify-table/utils.js";
+
+export default async function dashboardAdd(req, reply) {
+  const {
+    pg = pgClients.client,
+    body = {},
+  } = req;
+  const time = Date.now();
+
+  if (body?.db) {
+    try {
+      const pg1 = await getPGAsync(body.db);
+      await pg1.query('select 1');
+    } catch (err) {
+      return reply.status(400).send('Некоректна база даних');
+    }
+  }
+
+  const res = await dataInsert({
+    pg,
+    table: 'bi.dashboard',
+    data: body,
+  }).then(el => el.rows?.[0] || {});
+
+  if (res.dashboard_id && body.dataset) {
+    await pg.query(`update bi.dataset set dashboard_list=coalesce(dashboard_list, '{}'::text[]) || array[$1]
+    where dataset_id=$2`, [res.dashboard_id, body.dataset]);
+  }
+
+  return {
+    time: Date.now() - time,
+    id: res.dashboard_id,
+    title: res.title,
+    name: res.name,
+  };
+}

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

@@ -1,39 +1,39 @@
-import path from 'node:path';
-import { existsSync, readdirSync } from 'node:fs';
-
-import { pgClients, dataDelete } from '@opengis/fastify-table/utils.js';
-
-const cwd = process.cwd();
-const dashboardDir = path.join(cwd, 'server/templates/dashboard');
-
-export default async function dashboardDelete({ pg = pgClients.client, params = {}, user }, reply) {
-  if (!params?.id) {
-    return reply.status(400).send('not enough params: id');
-  }
-
-  const dirContent = existsSync(dashboardDir)
-    ? readdirSync(dashboardDir)
-    : [];
-
-  if (dirContent.includes(params.id)) {
-    return reply.status(403).send(`access restricted: ${params.id}`);
-  }
-
-  const { rowCount = 0 } = pg.pk?.['bi.dashboard']
-    ? await pg.query('select * from bi.dashboard where $1 in (dashboard_id,name)', [params.id])
-    : {};
-
-  if (rowCount === 0) {
-    return reply.status(404).send(`not found ${params.id}`);
-  }
-
-  await pg.query(`delete from bi.widget where $1 in (dashboard_id)`, [params.id]);
-  await dataDelete({
-    pg,
-    table: 'bi.dashboard',
-    id: params.id,
-    uid: user?.uid,
-  });
-
-  return reply.status(200).send('successfully deleted');
-}
+import path from 'node:path';
+import { existsSync, readdirSync } from 'node:fs';
+
+import { pgClients, dataDelete } from '@opengis/fastify-table/utils.js';
+
+const cwd = process.cwd();
+const dashboardDir = path.join(cwd, 'server/templates/dashboard');
+
+export default async function dashboardDelete({ pg = pgClients.client, params = {}, user }, reply) {
+  if (!params?.id) {
+    return reply.status(400).send('not enough params: id');
+  }
+
+  const dirContent = existsSync(dashboardDir)
+    ? readdirSync(dashboardDir)
+    : [];
+
+  if (dirContent.includes(params.id)) {
+    return reply.status(403).send(`access restricted: ${params.id}`);
+  }
+
+  const { rowCount = 0 } = pg.pk?.['bi.dashboard']
+    ? await pg.query('select * from bi.dashboard where $1 in (dashboard_id,name)', [params.id])
+    : {};
+
+  if (rowCount === 0) {
+    return reply.status(404).send(`not found ${params.id}`);
+  }
+
+  await pg.query(`delete from bi.widget where $1 in (dashboard_id)`, [params.id]);
+  await dataDelete({
+    pg,
+    table: 'bi.dashboard',
+    id: params.id,
+    uid: user?.uid,
+  });
+
+  return reply.status(200).send('successfully deleted');
+}

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

@@ -1,61 +1,61 @@
-import { dataUpdate, pgClients, getPGAsync } from "@opengis/fastify-table/utils.js";
-
-export default async function dashboardEdit({
-  pg = pgClients.client, params = {}, body = {},
-}, reply) {
-  const { name: dashboardName } = params;
-  const { panels, widgets, table_name: tableName } = body;
-
-  if (body?.db) {
-    try {
-      const pg1 = await getPGAsync(body.db);
-      await pg1.query('select 1');
-    } catch (err) {
-      return reply.status(400).send('Некоректна база даних');
-    }
-  }
-
-  if (!dashboardName) {
-    return reply.status(400).send('not enough params: name');
-  }
-
-  if (!tableName) {
-    return reply.status(400).send('not enough params: table_name');
-  }
-
-  const row = await pg.query('select dashboard_id, widgets, panels from bi.dashboard where $1 in (dashboard_id, name)', [dashboardName])
-    .then(el => el.rows?.[0] || {});
-  const { dashboard_id: dashboardId } = row;
-
-  if (!dashboardId) {
-    return reply.status(400).send('dashboard not found');
-  }
-
-  if (panels?.length && !widgets?.length) {
-    (row.widgets || []).forEach((el) => {
-      const { title } = panels?.find?.(item => item.widget === el.name) || {};
-      if (el.data) {
-        // console.log('el.title', el.title, 'title', title);
-        el.data.title = title;
-      }
-    });
-    Object.assign(body, { widgets: row.widgets });
-  }
-
-  const res = await dataUpdate({
-    pg,
-    table: 'bi.dashboard',
-    id: dashboardId,
-    data: body,
-  });
-
-  if (!Object.keys(res)?.length) {
-    return reply.status(404).send('not found data');
-  }
-
-  return {
-    message: `updated ${dashboardName}`,
-    status: 200,
-    rows: res,
-  };
-}
+import { dataUpdate, pgClients, getPGAsync } from "@opengis/fastify-table/utils.js";
+
+export default async function dashboardEdit({
+  pg = pgClients.client, params = {}, body = {},
+}, reply) {
+  const { name: dashboardName } = params;
+  const { panels, widgets, table_name: tableName } = body;
+
+  if (body?.db) {
+    try {
+      const pg1 = await getPGAsync(body.db);
+      await pg1.query('select 1');
+    } catch (err) {
+      return reply.status(400).send('Некоректна база даних');
+    }
+  }
+
+  if (!dashboardName) {
+    return reply.status(400).send('not enough params: name');
+  }
+
+  if (!tableName) {
+    return reply.status(400).send('not enough params: table_name');
+  }
+
+  const row = await pg.query('select dashboard_id, widgets, panels from bi.dashboard where $1 in (dashboard_id, name)', [dashboardName])
+    .then(el => el.rows?.[0] || {});
+  const { dashboard_id: dashboardId } = row;
+
+  if (!dashboardId) {
+    return reply.status(400).send('dashboard not found');
+  }
+
+  if (panels?.length && !widgets?.length) {
+    (row.widgets || []).forEach((el) => {
+      const { title } = panels?.find?.(item => item.widget === el.name) || {};
+      if (el.data) {
+        // console.log('el.title', el.title, 'title', title);
+        el.data.title = title;
+      }
+    });
+    Object.assign(body, { widgets: row.widgets });
+  }
+
+  const res = await dataUpdate({
+    pg,
+    table: 'bi.dashboard',
+    id: dashboardId,
+    data: body,
+  });
+
+  if (!Object.keys(res)?.length) {
+    return reply.status(404).send('not found data');
+  }
+
+  return {
+    message: `updated ${dashboardName}`,
+    status: 200,
+    rows: res,
+  };
+}