@isoftdata/utility-dashboard-backend 3.2.2 → 3.2.5

package/dist/index.js

@@ -170,7 +170,7 @@ export async function loadOutputParameterValues(mysqlConnection, { definitionLis
             typedParameter.value = value;
         }
         if (typedParameter.type === 'dateRange') {
-            const validDateRangeValue = isValidDateRangeValue(value) ? value : 'Last 30 Days';
+            const validDateRangeValue = value && isValidDateRangeValue(value) ? value : 'Last 30 Days';
             typedParameter = {
                 ...typedParameter,
                 value: validDateRangeValue,
@@ -209,7 +209,7 @@ export async function loadOutputParameterValues(mysqlConnection, { definitionLis
                 permission: definition?.permission,
                 optionList: [],
             };
-            typedParameter.value = typedParameter.value ?? session.siteId ?? session[`${site}Id`];
+            typedParameter.value = typedParameter.value ?? session.siteId?.toString() ?? session[`${site}Id`]?.toString() ?? null;
             siteIdColumn = siteIdColumn ? mysqlConnection.escapeId(siteIdColumn) : mysqlConnection.escapeId(`${site}id`);
             siteNameColumn = siteNameColumn ? mysqlConnection.escapeId(siteNameColumn) : 'name';
             const siteTableName = mysqlConnection.escapeId(site);
@@ -335,12 +335,14 @@ export async function formatChartDataForReport(mysqlConnection, { reportParamete
             reportChart.jsonOverride.chartWrapper = chartWrapper;
         }
         const combinedChart = deepmerge(chart, reportChart.jsonOverride ?? {});
+        if (combinedChart.supertype === 'embed' && combinedChart.url) {
+            combinedChart.formattedUrl = parameterizeUrl(combinedChart.url, parameterValues);
+        }
         return await loadChartData(mysqlConnection, {
             ...combinedChart,
             rank: reportChart.rank,
             reportChartId: reportChart.reportChartId,
             description: combinedChart.description ?? '',
-            url: chart.supertype === 'embed' ? parameterizeUrl(chart.url ?? '', parameterValues) : undefined,
         }, parameterizeQuery(chart.query, parameterValues), customDataSource);
     }
     catch (err) {
@@ -348,4 +350,4 @@ export async function formatChartDataForReport(mysqlConnection, { reportParamete
         throw err;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/types/chart.d.ts

@@ -1,3 +1,4 @@
+import type { MergeDeep } from 'type-fest';
 import type { NumberFormatOptions, MediumDateFormatOptions, LongDateFormatOptions } from '../formatting-templates.js';
 export type GoogleDataTableCell = {
     v?: unknown;
@@ -161,7 +162,12 @@ export interface ChartBase extends ChartJson {
 }
 export interface ChartJson {
     allowExport?: boolean;
-    chartWrapper: ChartWrapper;
+    chartWrapper: MergeDeep<ChartWrapper, {
+        options: {
+            width: number;
+            height: number;
+        };
+    }>;
     cumulative?: boolean;
     formatting?: Formatting;
     greedyHeight?: boolean;
@@ -185,6 +191,7 @@ interface TableChart extends ChartBase {
 interface EmbedChart extends ChartBase {
     supertype: 'embed';
     url: NonNullable<ChartBase['url']>;
+    formattedUrl?: string;
     query?: never;
 }
 export type Chart = GoogleChart | TableChart | EmbedChart;

package/dist/types/parameter.d.ts

@@ -1,4 +1,5 @@
 import type { NamedDateRange } from '@isoftdata/utility-date-time';
+type MaybeArray<T> = T | T[];
 export interface OptionListEntry {
     id: number | string;
     name: string;
@@ -9,9 +10,9 @@ export type OptionList = Array<OptionListEntry>;
 export interface DashboardReportBaseParameter {
     name: string;
     title: string;
-    default: string;
-    value: string;
-    queryValues: Record<string, string | string[]>;
+    default: string | null;
+    value: string | null;
+    queryValues: Record<string, MaybeArray<string | null>>;
 }
 export interface DashboardReportDateParameter extends DashboardReportBaseParameter {
     type: 'date';
@@ -38,3 +39,4 @@ export interface DashboardReportSessionParameter extends DashboardReportBasePara
     type: 'session';
 }
 export type DashboardReportParameter = DashboardReportDateParameter | DashboardReportSelectionParameter | DashboardReportSiteSelectionParameter | DashboardReportDateRangeParameter | DashboardReportSessionParameter;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isoftdata/utility-dashboard-backend",
-  "version": "3.2.2",
+  "version": "3.2.5",
   "description": "A utility for formatting chart and report data to be usable by the frontend dashboard component.",
   "main": "dist/index.js",
   "type": "module",