@opengis/bi 1.0.15 → 1.0.16

package/server/utils/getWidget.js

@@ -1,85 +1,85 @@
-import { getTemplate, pgClients } from '@opengis/fastify-table/utils.js';
-
-const pg = pgClients.client;
-
-async function getWidget({ dashboard, widget }) {
-  if (!dashboard && !widget) {
-    return { message: `not enough params: dashboard / widget`, status: 400 };
-  }
-  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,
-    yml
-  } = 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, ...data?.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, yml };
-}
-export default getWidget;
+import { getTemplate, pgClients } from '@opengis/fastify-table/utils.js';
+
+const pg = pgClients.client;
+
+async function getWidget({ dashboard, widget }) {
+  if (!dashboard && !widget) {
+    return { message: `not enough params: dashboard / widget`, status: 400 };
+  }
+  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,
+    yml
+  } = 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, ...data?.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, yml };
+}
+export default getWidget;

package/utils.js

@@ -1,12 +1,12 @@
-// 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';
-import yamlSafe from './server/routes/dashboard/controllers/utils/yaml.js';
-
-export {
-  // getTemplatePath,
-  yamlSafe,
-  getWidget,
-};
+// 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';
+import yamlSafe from './server/routes/dashboard/controllers/utils/yaml.js';
+
+export {
+  // getTemplatePath,
+  yamlSafe,
+  getWidget,
+};