@opengis/bi 1.2.31 → 1.2.34

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

@@ -20,14 +20,15 @@ export default async function dashboard({
 
   const fileDashboard = dashboards.find((el) => el[0] === id);
   if (!fileDashboard) {
-    const sql = `select title, description, table_name, panels, grid, widgets, filters, style, words, db, public 
+    const sql = `select title, description, table_name, panels, grid, widgets, filters, style, words, db, public, updated_at as last_update 
     from bi.dashboard where $1 in (dashboard_id, name)`;
 
     const data = await pg1.query(sql, [id]).then(el => el.rows?.[0] || {});
 
     let pg = pg1;
     try {
-      pg = data.pg || (data.db ? await getPGAsync(data.db) : null) || pg1;
+      const db = typeof data.db === 'string' && data.db.startsWith('{') ? JSON.parse(data.db) : { database: data.db };
+      pg = data.pg || (data.db ? await getPGAsync(db) : null) || pg1;
     } catch (err) {
       data.error = err.toString();
     }

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

@@ -24,7 +24,7 @@ export default async function dashboardList({
   const where = [search ? `lower(title) ~ $1` : null, type === 'viewer' ? `left(table_name,5)='demo.'` : null].filter(Boolean).join(' and ') || 'true';
   const q1 = `select count(*)::int as total, count(*) filter(where ${where})::int as filtered from bi.dashboard`;
 
-  const q = `select dashboard_id as name, 'db' as type, title, description, table_name, words, public from bi.dashboard where ${where} limit ${limit} offset ${offset}`;
+  const q = `select dashboard_id as name, 'db' as type, title, description, table_name, words, public, updated_at as last_update from bi.dashboard where ${where} limit ${limit} offset ${offset}`;
 
   if (user?.user_type?.includes('admin') && ['db', 'viewer'].includes(type) && sql) {
     return `${q1};${q}`;

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

@@ -189,6 +189,7 @@ export default async function dataAPI(req, reply) {
 
   const res = {
     time: Date.now() - time,
+    last_update: widgetData?.last_update,
     error: error || errorSql || (!widgetData.sql ? widgetData.error : undefined),
     dimensions,
     filter: xName,

package/server/utils/getWidget.js

@@ -10,7 +10,7 @@ async function getWidget({ pg: pg1 = pgClients.client, dashboard, widget }) {
     ? await getTemplate('dashboard', dashboard)
     : null;
 
-  const dashboardData1 = await pg1.query(`select db, table_name, widgets as "dashboardWidgets" from bi.dashboard where dashboard_id=$1`, [dashboard])
+  const dashboardData1 = await pg1.query(`select db, table_name, widgets as "dashboardWidgets", updated_at as "updatedAt" from bi.dashboard where dashboard_id=$1`, [dashboard])
     .then(el => el.rows?.[0] || {});
   const { dashboardWidgets = [] } = dashboardData1;
   const dashboardDb = typeof dashboardData1?.db === 'string' && dashboardData1?.db?.startsWith('{') ? JSON.parse(dashboardData1?.db) : dashboardData1?.db;
@@ -18,9 +18,9 @@ async function getWidget({ pg: pg1 = pgClients.client, dashboard, widget }) {
   const dashboardIndex = dashboardData?.find((el) => el[0] == 'index.yml')?.[1]; // dashboardData?.find((el) => el[2] == 'index')?.[1]
   const pg = dashboardDb || dashboardIndex?.db ? await getPGAsync(dashboardDb || dashboardIndex?.db) : pg1;
 
-  const { id, tableName } =
+  const { id, tableName, updatedAt } =
     !dashboardData && !dashboardData1 && pg.pk['bi.dashboard'] && dashboard
-      ? await pg1.query(`select dashboard_id as id, table_name as "tableName" from bi.dashboard where $1 in (dashboard_id, name)`, [dashboard])
+      ? await pg1.query(`select dashboard_id as id, table_name as "tableName", updated_at as "updatedAt" from bi.dashboard where $1 in (dashboard_id, name)`, [dashboard])
         .then(el => el.rows?.[0] || {})
       : {};
 
@@ -55,7 +55,8 @@ async function getWidget({ pg: pg1 = pgClients.client, dashboard, widget }) {
     controls,
     style,
     options,
-    yml
+    yml,
+    updated_at: widgetUpdatedAt,
   } = widgetData ||
     (await pg
       .query(q, [id || dashboard, widget])
@@ -104,7 +105,7 @@ async function getWidget({ pg: pg1 = pgClients.client, dashboard, widget }) {
 
   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 };
+  const res = { ...main, pg: widgetDb, sql: widgetData?.sql, limit: widgetData?.limit, tableSQL, data, type, text, controls, style, options, yml, last_update: { dashboard: dashboardData1?.updatedAt || updatedAt, widget: widgetUpdatedAt || dashboardData1?.updatedAt || updatedAt } };
   if (res.x && !columnList.includes(res.x) && !loadTemplate?.table && !tableSQL?.includes?.(res.x)) {
     Object.assign(res, { x: null, error: `column does not exists: ${res.x} at table ${res.table}` });
   }