@isoftdata/utility-dashboard-backend 4.0.7 → 4.1.0-beta.2

package/README.md

@@ -1,201 +1,201 @@
-# utility-dashboard-backend
-
- A backend utility for formatting and loading dashboard chart and report data to be usable by the [frontend dashboard component](https://github.com/ISoft-Data-Systems/ractive-component-web-dashboard).
-
-## Installation
-
-```bash
-npm i @isoftdata/utility-dashboard-backend
-```
-
-> Breaking change in version 3: ESM style exports
-
-## Prerequisites
->
-> Version 3.Y.Z of the frontend component is required for use with version 2.Y.Z of the backend component.
-
-* A MySQL database schema as outlined in [schema.md](schema.md)
-* A backend that can fetches rows from the chart, report, and report chart tables from the database with their primary keys. Any json columns should be parsed as objects.
-* A connection or pool of connections from the `mysql` NPM module for running the charts' queries
-* The [dashboard Ractive component](https://github.com/ISoft-Data-Systems/ractive-component-web-dashboard) on the client
-
-## API
-
-### formatReportMetadata
-
-This function returns data in the format expected for the `loadReportMetadata` function on the dashboard client component.
-
-#### Function signature
-
-```js
-async formatReportMetadata(mysqlConnection, { report, chartsInReport, session })
-```
-
-#### Example Usage (From Pro Web `server/chart-loader.js`)
-
-```js
-async function loadReportMetadata({ dashboardReportId, chartId, session }) {
- const report = await db.dashboardReport.loadById({ dashboardReportId }) // gets a report by its id
- const chartsInReport = await db.dashboardChart.loadByReport({ dashboardReportId, chartId }) // gets all charts for a specified report, or if `chartId` is specified, only gets that chart for that report.
- return await formatReportMetadata(db.pool, { report, chartsInReport, session })
-}
-```
-
-#### mysqlConnection
-
-A connection or pool of connections from the `mysql` npm module.
-
-#### report
-
-A report `object`, a single row from the `dashboard_report`/`wa_dashboard_report` table/view. The `parameters` Array from the `json` column should also be parsed from JSON and appended to this object.
-
-Example:
-
-```js
-{
-  dashboardReportId: 1,
-  reportName: 'report_overview',
-  reportTitle: 'Overview',
-  shareType: 'everyone',
-  shareId: null,
-  ownerId: null,
-  parameters: [ // parameters deconstructed from `json` column after parsing
-    {
-      name: 'date_range',
-      type: 'dateRange',
-      title: 'Date Range',
-      default: 'This Year'
-    }
-  ]
-}
-```
-
-#### chartsInReport
-
-An `Array` of chart `object`s, one for each chart in the report, multiple rows from the `dashboard_chart`/`wa_dashboard_chart` table/view joined with `dashboard_report_chart`/`wa_dashboard_report_chart` to get the chart's rank.
-
-Example:
-
-```js
-[
-  {
-    chartId: 10,
-    name: 'line_sales_over_time_and_previous_period',
-    title: 'Sales over Time',
-    supertype: 'google',
-    formatting: { Sales: [Object] },
-    multiSeries: {
-      value: 'Sales',
-      series: 'Period',
-      tooltip: 'Tooltip',
-      groupXAxisBy: 'Date'
-    },
-    chartWrapper: { options: [Object], chartType: 'LineChart' },
-    rank: 1
-  },
-  {
-    chartId: 16,
-    name: 'map_sales_by_lat_long',
-    title: 'Sales Map',
-    supertype: 'google',
-    formatting: { Sales: [Object] },
-    chartWrapper: { options: [Object], chartType: 'GeoChart' },
-    rank: 2
-  }
-]
-```
-
-#### session
-
-Session object from the Auth Module
-
-#### site (optional)
-
-The 'type' of site for the product this is used in. Determines the MySQL table to query for site selection parameters, and used to calculate `siteIdColumn` if that is not specified.
-
-#### siteIdColumn (optional)
-
-The name of the column that stores the site id in the site table. Defaults to `${site}id`.
-
-#### siteNameColumn (optional)
-
-The store name column.
-
-### formatChartDataForReport
-
-This function returns data in the format expected for the `loadChartDataForReport` function on the dashboard client component, including applying any report-specific chart options overrides and running the chart's query.
-
-#### Function signature
-
-```js
-async formatChartDataForReport(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList, session })
-```
-
-#### Example usage: (from Pro Web `server/chart-loader.js`)
-
-```js
-async function loadChartDataForReport ({ dashboardReportId, chartId, parameterSelectionList, session }) {
- const report = await db.dashboardReport.loadById({ dashboardReportId }) // get the report object
- const chart = await db.dashboardChart.loadById({ chartId }) // get the chart object
- const reportChart = await db.dashboardReportChart.loadByReportAndChartId({ chartId, dashboardReportId }) // get the report chart for the rank/overrides
- try {
-  const chartData = await formatChartDataForReport(db.pool, { reportParameters: report.parameters, chart, reportChart, parameterSelectionList, session })
-  return chartData
- } catch (err) {
-  console.error(err)
-  return { isErrored: true }
- }
-}
-```
-
-#### mysqlConnection
-
-A connection or pool of connections from the `mysql` npm module.
-
-#### reportParameters
-
-The `parameters` array from a report object.
-
-#### chartId
-
-The id of a chart row in `wa_dashboard_chart`.
-
-#### parameterSelectionList
-
-The array of selected parameters sent from the client dashboard.
-
-#### session
-
-Session object from the Auth Module
-
-### loadOutputParameterValues
-
-This function outputs the report's parameter values in the format expected by the dashboard client and backend. When sending to the client, including `forClient: true` will not include the properties only needed by the backend.
-
-### Function signature
-
-```js
-async function loadOutputParameterValues(mysqlConnection, { definitionList, selectionList = [], forClient = false })
-```
-
-#### Example Usage
-
-#### mysqlConnection
-
-A connection or pool of connections from the `mysql` npm module.
-
-#### definitionList
-
-The `parameters` property from the `json` column of a row in the `dashboard_report` table.
-
-#### selectionList
-
-An array of objects representing the selected parameters sent from the client. Only needed when loading the chart data, not when loading the report "metadata". Each parameter object should match the format specified in [schema.md](schema.md).
-
-#### forClient
-
-If this value is truthy, parameters' `queryValues` properties will be excluded, as the client does not need them.
-
-### Returns
-
-An array of objects matching the format outlined in [schema.md](schema.md)
+# utility-dashboard-backend
+
+ A backend utility for formatting and loading dashboard chart and report data to be usable by the [frontend dashboard component](https://github.com/ISoft-Data-Systems/ractive-component-web-dashboard).
+
+## Installation
+
+```bash
+npm i @isoftdata/utility-dashboard-backend
+```
+
+> Breaking change in version 3: ESM style exports
+
+## Prerequisites
+>
+> Version 3.Y.Z of the frontend component is required for use with version 2.Y.Z of the backend component.
+
+* A MySQL database schema as outlined in [schema.md](schema.md)
+* A backend that can fetches rows from the chart, report, and report chart tables from the database with their primary keys. Any json columns should be parsed as objects.
+* A connection or pool of connections from the `mysql` NPM module for running the charts' queries
+* The [dashboard Ractive component](https://github.com/ISoft-Data-Systems/ractive-component-web-dashboard) on the client
+
+## API
+
+### formatReportMetadata
+
+This function returns data in the format expected for the `loadReportMetadata` function on the dashboard client component.
+
+#### Function signature
+
+```js
+async formatReportMetadata(mysqlConnection, { report, chartsInReport, session })
+```
+
+#### Example Usage (From Pro Web `server/chart-loader.js`)
+
+```js
+async function loadReportMetadata({ dashboardReportId, chartId, session }) {
+ const report = await db.dashboardReport.loadById({ dashboardReportId }) // gets a report by its id
+ const chartsInReport = await db.dashboardChart.loadByReport({ dashboardReportId, chartId }) // gets all charts for a specified report, or if `chartId` is specified, only gets that chart for that report.
+ return await formatReportMetadata(db.pool, { report, chartsInReport, session })
+}
+```
+
+#### mysqlConnection
+
+A connection or pool of connections from the `mysql` npm module.
+
+#### report
+
+A report `object`, a single row from the `dashboard_report`/`wa_dashboard_report` table/view. The `parameters` Array from the `json` column should also be parsed from JSON and appended to this object.
+
+Example:
+
+```js
+{
+  dashboardReportId: 1,
+  reportName: 'report_overview',
+  reportTitle: 'Overview',
+  shareType: 'everyone',
+  shareId: null,
+  ownerId: null,
+  parameters: [ // parameters deconstructed from `json` column after parsing
+    {
+      name: 'date_range',
+      type: 'dateRange',
+      title: 'Date Range',
+      default: 'This Year'
+    }
+  ]
+}
+```
+
+#### chartsInReport
+
+An `Array` of chart `object`s, one for each chart in the report, multiple rows from the `dashboard_chart`/`wa_dashboard_chart` table/view joined with `dashboard_report_chart`/`wa_dashboard_report_chart` to get the chart's rank.
+
+Example:
+
+```js
+[
+  {
+    chartId: 10,
+    name: 'line_sales_over_time_and_previous_period',
+    title: 'Sales over Time',
+    supertype: 'google',
+    formatting: { Sales: [Object] },
+    multiSeries: {
+      value: 'Sales',
+      series: 'Period',
+      tooltip: 'Tooltip',
+      groupXAxisBy: 'Date'
+    },
+    chartWrapper: { options: [Object], chartType: 'LineChart' },
+    rank: 1
+  },
+  {
+    chartId: 16,
+    name: 'map_sales_by_lat_long',
+    title: 'Sales Map',
+    supertype: 'google',
+    formatting: { Sales: [Object] },
+    chartWrapper: { options: [Object], chartType: 'GeoChart' },
+    rank: 2
+  }
+]
+```
+
+#### session
+
+Session object from the Auth Module
+
+#### site (optional)
+
+The 'type' of site for the product this is used in. Determines the MySQL table to query for site selection parameters, and used to calculate `siteIdColumn` if that is not specified.
+
+#### siteIdColumn (optional)
+
+The name of the column that stores the site id in the site table. Defaults to `${site}id`.
+
+#### siteNameColumn (optional)
+
+The store name column.
+
+### formatChartDataForReport
+
+This function returns data in the format expected for the `loadChartDataForReport` function on the dashboard client component, including applying any report-specific chart options overrides and running the chart's query.
+
+#### Function signature
+
+```js
+async formatChartDataForReport(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList, session })
+```
+
+#### Example usage: (from Pro Web `server/chart-loader.js`)
+
+```js
+async function loadChartDataForReport ({ dashboardReportId, chartId, parameterSelectionList, session }) {
+ const report = await db.dashboardReport.loadById({ dashboardReportId }) // get the report object
+ const chart = await db.dashboardChart.loadById({ chartId }) // get the chart object
+ const reportChart = await db.dashboardReportChart.loadByReportAndChartId({ chartId, dashboardReportId }) // get the report chart for the rank/overrides
+ try {
+  const chartData = await formatChartDataForReport(db.pool, { reportParameters: report.parameters, chart, reportChart, parameterSelectionList, session })
+  return chartData
+ } catch (err) {
+  console.error(err)
+  return { isErrored: true }
+ }
+}
+```
+
+#### mysqlConnection
+
+A connection or pool of connections from the `mysql` npm module.
+
+#### reportParameters
+
+The `parameters` array from a report object.
+
+#### chartId
+
+The id of a chart row in `wa_dashboard_chart`.
+
+#### parameterSelectionList
+
+The array of selected parameters sent from the client dashboard.
+
+#### session
+
+Session object from the Auth Module
+
+### loadOutputParameterValues
+
+This function outputs the report's parameter values in the format expected by the dashboard client and backend. When sending to the client, including `forClient: true` will not include the properties only needed by the backend.
+
+### Function signature
+
+```js
+async function loadOutputParameterValues(mysqlConnection, { definitionList, selectionList = [], forClient = false })
+```
+
+#### Example Usage
+
+#### mysqlConnection
+
+A connection or pool of connections from the `mysql` npm module.
+
+#### definitionList
+
+The `parameters` property from the `json` column of a row in the `dashboard_report` table.
+
+#### selectionList
+
+An array of objects representing the selected parameters sent from the client. Only needed when loading the chart data, not when loading the report "metadata". Each parameter object should match the format specified in [schema.md](schema.md).
+
+#### forClient
+
+If this value is truthy, parameters' `queryValues` properties will be excluded, as the client does not need them.
+
+### Returns
+
+An array of objects matching the format outlined in [schema.md](schema.md)

package/dist/chart-helper.js

@@ -1,4 +1,4 @@
-import { FieldTypeLookup } from '@isoftdata/utility-db';
+import { FieldTypeLookup, } from '@isoftdata/utility-db';
 import formattingTemplates from './formatting-templates.js';
 import toSnakeCase from 'to-snake-case';
 import styleTableRow from './style-templates.js';
@@ -69,10 +69,18 @@ function makeDataTableCol(key, fields, role = null) {
     };
 }
 function resultsIsObjectArray(results) {
-    return (Array.isArray(results) && results.length === 0) || (Array.isArray(results) && results.length > 0 && typeof results[0] === 'object' && results[0] !== null && !Array.isArray(results[0]));
+    return ((Array.isArray(results) && results.length === 0) ||
+        (Array.isArray(results) &&
+            results.length > 0 &&
+            typeof results[0] === 'object' &&
+            results[0] !== null &&
+            !Array.isArray(results[0])));
 }
 function fieldsIsFieldPacketArray(fields) {
-    return (Array.isArray(fields) && fields.length === 0) || (Array.isArray(fields) && fields.length > 0 && ((fields[0].constructor.name === 'FieldPacket' || fields[0].constructor.name === 'ColumnDefinition')));
+    return ((Array.isArray(fields) && fields.length === 0) ||
+        (Array.isArray(fields) &&
+            fields.length > 0 &&
+            (fields[0].constructor.name === 'FieldPacket' || fields[0].constructor.name === 'ColumnDefinition')));
 }
 export async function queryWithFields(connection, query) {
     try {
@@ -190,7 +198,8 @@ export function coerceNullColumn(columnProp, data, destinationType) {
     if (hasNullValue) {
         const rowWithValidValue = data.find(row => row[columnProp] !== null);
         let nullReplacement = '';
-        if ((destinationType && destinationType === 'number') || (rowWithValidValue && typeof rowWithValidValue[columnProp] === 'number')) {
+        if ((destinationType && destinationType === 'number') ||
+            (rowWithValidValue && typeof rowWithValidValue[columnProp] === 'number')) {
             nullReplacement = 0;
         }
         return data.map(row => {
@@ -304,4 +313,4 @@ export function getSvelteDataTableFormat(rows, fields, formatting, styleTemplate
     };
 }
 export { getSvelteDataTableFormat as getRactiveDataTableFormat };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-helper.js","sourceRoot":"","sources":["../src/chart-helper.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-helper.js","sourceRoot":"","sources":["../src/chart-helper.ts"],"names":[],"mappings":"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"}

package/dist/formatting-templates.js

@@ -12,4 +12,4 @@ const formattingTemplates = {
     },
 };
 export default formattingTemplates;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGluZy10ZW1wbGF0ZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZm9ybWF0dGluZy10ZW1wbGF0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBY0EsTUFBTSxtQkFBbUIsR0FBd0I7SUFDaEQsUUFBUSxFQUFFO1FBQ1QsTUFBTSxFQUFFLEdBQUc7UUFDWCxjQUFjLEVBQUUsQ0FBQztRQUNqQixjQUFjLEVBQUUsR0FBRztLQUNuQjtJQUNELFVBQVUsRUFBRTtRQUNYLE1BQU0sRUFBRSxRQUFRO0tBQ2hCO0lBQ0QsUUFBUSxFQUFFO1FBQ1QsTUFBTSxFQUFFLE1BQU07S0FDZDtDQUNELENBQUE7QUFDRCxlQUFlLG1CQUFtQixDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGluZy10ZW1wbGF0ZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZm9ybWF0dGluZy10ZW1wbGF0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBaUJBLE1BQU0sbUJBQW1CLEdBQXdCO0lBQ2hELFFBQVEsRUFBRTtRQUNULE1BQU0sRUFBRSxHQUFHO1FBQ1gsY0FBYyxFQUFFLENBQUM7UUFDakIsY0FBYyxFQUFFLEdBQUc7S0FDbkI7SUFDRCxVQUFVLEVBQUU7UUFDWCxNQUFNLEVBQUUsUUFBUTtLQUNoQjtJQUNELFFBQVEsRUFBRTtRQUNULE1BQU0sRUFBRSxNQUFNO0tBQ2Q7Q0FDRCxDQUFBO0FBQ0QsZUFBZSxtQkFBbUIsQ0FBQSJ9

package/dist/index.d.ts

@@ -24,7 +24,7 @@ export type LoadDataTableAndProcessedFormattingOptions = {
     table?: Table;
     customDataSource?: CustomDataSourceFunction | null;
 };
-export declare function loadDataTableAndProcessedFormatting(mysqlConnection: DatabaseConnectionInterface, { query: queryObject, multiSeries, formatting, chartType, cumulative, table, customDataSource }: LoadDataTableAndProcessedFormattingOptions): Promise<{
+export declare function loadDataTableAndProcessedFormatting(mysqlConnection: DatabaseConnectionInterface, { query: queryObject, multiSeries, formatting, chartType, cumulative, table, customDataSource, }: LoadDataTableAndProcessedFormattingOptions): Promise<{
     dataTable: GoogleDataTable | Table;
     processedFormatting: ProcessedFormatting;
     fields: QueryFieldsObject;
@@ -54,10 +54,11 @@ type LoadOutputParameterValuesOptions = {
     siteIdColumn?: string;
     siteNameColumn?: string;
 };
-export declare function loadOutputParameterValues(mysqlConnection: DatabaseConnectionInterface, { definitionList, selectionList, forClient, session, site, siteIdColumn, siteNameColumn }: LoadOutputParameterValuesOptions): Promise<DashboardReportParameter[]>;
+export declare function loadOutputParameterValues(mysqlConnection: DatabaseConnectionInterface, { definitionList, selectionList, forClient, session, site, siteIdColumn, siteNameColumn, }: LoadOutputParameterValuesOptions): Promise<DashboardReportParameter[]>;
 export declare const parameterRegex: RegExp;
 export declare function parameterizeQuery(queryString: string | undefined, parameterValues: DashboardReportParameter[]): QueryCommand;
-export declare function parameterizeUrl(url: string, parameterValues: DashboardReportParameter[]): string;
+export declare function parameterizeString(str: string, parameterValues: DashboardReportParameter[]): string;
+export { parameterizeString as parameterizeUrl };
 type FormatReportMetadataOptions = {
     report: ReportInput;
     chartsInReport: Chart[];
@@ -84,4 +85,4 @@ export type FormatChartDataForReportOptions = {
     siteNameColumn?: string;
     customDataSource?: CustomDataSourceFunction | null;
 };
-export declare function formatChartDataForReport(mysqlConnection: DatabaseConnectionInterface, { reportParameters, chart, reportChart, parameterSelectionList, session, site, siteIdColumn, siteNameColumn, customDataSource }: FormatChartDataForReportOptions): Promise<Omit<Chart, 'query'>>;
+export declare function formatChartDataForReport(mysqlConnection: DatabaseConnectionInterface, { reportParameters, chart, reportChart, parameterSelectionList, session, site, siteIdColumn, siteNameColumn, customDataSource, }: FormatChartDataForReportOptions): Promise<Omit<Chart, 'query'>>;

package/dist/index.js

@@ -25,7 +25,7 @@ const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
     }
     return resultSet;
 };
-async function loadChartData(mysqlConnection, chart, queryObject, customDataSource) {
+async function loadChartData(mysqlConnection, chart, parameterValues, customDataSource) {
     let { formatting, chartWrapper, multiSeries, table, cumulative, url, ...theRest } = chart;
     if (!chartWrapper) {
         throw new Error('No chartWrapper found in chart!');
@@ -34,7 +34,7 @@ async function loadChartData(mysqlConnection, chart, queryObject, customDataSour
     let dataTable = {}, processedFormatting = {};
     try {
         const dataTableAndProcessedFormatting = await loadDataTableAndProcessedFormatting(mysqlConnection, {
-            query: queryObject,
+            query: parameterizeQuery(theRest.query ?? '', parameterValues),
             multiSeries,
             formatting,
             chartType: chartWrapper.chartType ?? chart.supertype,
@@ -66,9 +66,20 @@ async function loadChartData(mysqlConnection, chart, queryObject, customDataSour
             ...theRest,
             chartWrapper,
             url: url ?? '',
+            formattedUrl: parameterizeString(url ?? '', parameterValues),
             formatting: processedFormatting,
         };
     }
+    else if (theRest.supertype === 'markdown') {
+        return {
+            ...theRest,
+            chartWrapper,
+            markdown: {
+                ...theRest.markdown,
+                formattedContent: parameterizeString(theRest.markdown.content, parameterValues),
+            },
+        };
+    }
     else {
         return {
             ...theRest,
@@ -81,7 +92,7 @@ async function loadChartData(mysqlConnection, chart, queryObject, customDataSour
         };
     }
 }
-export async function loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType, cumulative = false, table = {}, customDataSource }) {
+export async function loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType, cumulative = false, table = {}, customDataSource, }) {
     let results = [];
     let fields = {};
     let jsonOverride = undefined;
@@ -124,12 +135,20 @@ export async function loadDataTableAndProcessedFormatting(mysqlConnection, { que
     };
 }
 export async function loadDataTable(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType }) {
-    const { dataTable } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType });
+    const { dataTable } = await loadDataTableAndProcessedFormatting(mysqlConnection, {
+        query: queryObject,
+        multiSeries,
+        formatting,
+        chartType,
+    });
     return dataTable;
 }
 const loadOptionList = async (mysqlConnection, optionListQuery, optionList = []) => {
     const optionsFromQuery = (optionListQuery && (await mysqlConnection.query({ sql: optionListQuery }))) || [];
-    return [...optionList, ...optionsFromQuery.map((option) => ({ ...option, fromQuery: true }))];
+    return [
+        ...optionList,
+        ...optionsFromQuery.map((option) => ({ ...option, fromQuery: true })),
+    ];
 };
 const isValidDateRangeValue = (value) => {
     return (!!value &&
@@ -152,7 +171,7 @@ const isValidDateRangeValue = (value) => {
             'Custom',
         ].includes(value));
 };
-export async function loadOutputParameterValues(mysqlConnection, { definitionList = [], selectionList = [], forClient = false, session, site = 'store', siteIdColumn, siteNameColumn }) {
+export async function loadOutputParameterValues(mysqlConnection, { definitionList = [], selectionList = [], forClient = false, session, site = 'store', siteIdColumn, siteNameColumn, }) {
     if (!(definitionList instanceof Array) || !definitionList.length) {
         return [];
     }
@@ -178,12 +197,17 @@ export async function loadOutputParameterValues(mysqlConnection, { definitionLis
             typedParameter.value = value;
         }
         if (typedParameter.type === 'dateRange') {
-            const validDateRangeValue = value && isValidDateRangeValue(value) ? value : definition.default && isValidDateRangeValue(definition.default) ? definition.default : 'Last 30 Days';
+            const validDateRangeValue = value && isValidDateRangeValue(value)
+                ? value
+                : definition.default && isValidDateRangeValue(definition.default)
+                    ? definition.default
+                    : 'Last 30 Days';
             typedParameter = {
                 ...typedParameter,
                 value: validDateRangeValue,
                 type: 'dateRange',
-                dates: matchingParameterSelection?.dates ?? (validDateRangeValue !== 'Custom' ? datesFromRange(validDateRangeValue) : { from: '', to: '' }),
+                dates: matchingParameterSelection?.dates ??
+                    (validDateRangeValue !== 'Custom' ? datesFromRange(validDateRangeValue) : { from: '', to: '' }),
             };
             if (!forClient) {
                 typedParameter.queryValues = {
@@ -217,7 +241,8 @@ export async function loadOutputParameterValues(mysqlConnection, { definitionLis
                 permission: definition?.permission,
                 optionList: [],
             };
-            typedParameter.value = typedParameter.value ?? session.siteId?.toString() ?? session[`${site}Id`]?.toString() ?? null;
+            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);
@@ -233,7 +258,10 @@ export async function loadOutputParameterValues(mysqlConnection, { definitionLis
                     values: [session.userAccountId],
                 });
             }
-            typedParameter.optionList = typedParameter.optionList.map(option => ({ id: option.id?.toString(), name: option.name }));
+            typedParameter.optionList = typedParameter.optionList.map(option => ({
+                id: option.id?.toString(),
+                name: option.name,
+            }));
             if (typedParameter.optionList.length > 1) {
                 typedParameter.optionList = typedParameter.optionList.map(option => ({ ...option, fromQuery: true }));
                 typedParameter.optionList.unshift({ id: '0', name: 'All', fromQuery: true });
@@ -299,8 +327,8 @@ export function parameterizeQuery(queryString, parameterValues) {
         values: queryParameters,
     };
 }
-export function parameterizeUrl(url, parameterValues) {
-    if (!url) {
+export function parameterizeString(str, parameterValues) {
+    if (!str) {
         return '';
     }
     const queryParameterValues = parameterValues.reduce((acc, val) => {
@@ -311,15 +339,23 @@ export function parameterizeUrl(url, parameterValues) {
             }
             : acc;
     }, {});
-    const queryParameterKeys = [...url.matchAll(parameterRegex)].map(([, insideToken]) => insideToken.trim());
+    const queryParameterKeys = [...str.matchAll(parameterRegex)].map(([, insideToken]) => insideToken.trim());
     const formattedUrl = queryParameterKeys.reduce((acc, key) => {
         return acc.replace(`\${${key}}`, queryParameterValues[key] || '');
-    }, url);
+    }, str);
     return formattedUrl;
 }
+export { parameterizeString as parameterizeUrl };
 export async function formatReportMetadata(mysqlConnection, { report, chartsInReport, session = {}, site, siteIdColumn, siteNameColumn }) {
     try {
-        const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: report.parameters, forClient: true, session, site, siteIdColumn, siteNameColumn });
+        const parameterValues = await loadOutputParameterValues(mysqlConnection, {
+            definitionList: report.parameters,
+            forClient: true,
+            session,
+            site,
+            siteIdColumn,
+            siteNameColumn,
+        });
         return {
             dashboardReportId: report.dashboardReportId,
             name: report.reportName,
@@ -336,27 +372,31 @@ export async function formatReportMetadata(mysqlConnection, { report, chartsInRe
         throw err;
     }
 }
-export async function formatChartDataForReport(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList, session = {}, site, siteIdColumn, siteNameColumn, customDataSource }) {
+export async function formatChartDataForReport(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList, session = {}, site, siteIdColumn, siteNameColumn, customDataSource, }) {
     try {
-        const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: reportParameters, selectionList: parameterSelectionList, session, site, siteIdColumn, siteNameColumn });
+        const parameterValues = await loadOutputParameterValues(mysqlConnection, {
+            definitionList: reportParameters,
+            selectionList: parameterSelectionList,
+            session,
+            site,
+            siteIdColumn,
+            siteNameColumn,
+        });
         if (reportChart?.jsonOverride?.chartWrapper?.dataTable) {
             const { dataTable, ...chartWrapper } = reportChart.jsonOverride.chartWrapper;
             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 ?? '',
-        }, parameterizeQuery(chart.query, parameterValues), customDataSource);
+        }, parameterValues, customDataSource);
     }
     catch (err) {
         console.error(err);
         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/style-templates.js

@@ -42,4 +42,4 @@ function styleRow(row, templates) {
     return outRow;
 }
 export default styleRow;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R5bGUtdGVtcGxhdGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3N0eWxlLXRlbXBsYXRlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUNwQyxPQUFPLFdBQVcsTUFBTSxlQUFlLENBQUE7QUFFdkMsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ3hCLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDWCxNQUFNLEVBQUUsQ0FBQyxLQUFhLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxjQUFjLEVBQUU7SUFDakQsUUFBUSxFQUFFLENBQUMsS0FBYSxFQUFFLE1BQWMsRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUM7SUFDbkUsSUFBSSxFQUFFLENBQUMsSUFBWSxFQUFFLElBQWEsRUFBRSxFQUFFO1FBQ3JDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDekIsSUFBSSxHQUFHLE9BQU8sSUFBSSxFQUFFLENBQUE7UUFDckIsQ0FBQztRQUNELE9BQU8sYUFBYSxJQUFJLFVBQVUsSUFBSSxFQUFFLENBQUE7SUFDekMsQ0FBQztJQUNELElBQUksRUFBRSxDQUFDLElBQVksRUFBRSxJQUFZLEVBQUUsTUFBTSxHQUFHLGdCQUFnQixFQUFFLEVBQUU7UUFDL0QsT0FBTyxjQUFjLE1BQU0sV0FBVyxJQUFJLEtBQUssSUFBSSxNQUFNLENBQUE7SUFDMUQsQ0FBQztDQUNELENBQUMsQ0FBQTtBQUVGLFNBQVMsNkJBQTZCLENBQUMsR0FBa0IsRUFBRSxhQUFxQixFQUFFLFNBQW1DO0lBQ3BILE1BQU0sT0FBTyxHQUFvQyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQTtJQUM5RSxJQUFJLGFBQWEsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNoQyxNQUFNLEtBQUssR0FBRyxjQUFjLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNoRCxLQUFLLE1BQU0sR0FBRyxJQUFJLFNBQVMsQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO1lBQzVDLElBQUksQ0FBQztnQkFDSixNQUFNLFVBQVUsR0FBRyxTQUFTLENBQUMsYUFBYSxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFBO2dCQUN0RCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLENBQUE7WUFDaEQsQ0FBQztZQUFDLE9BQU8sR0FBUSxFQUFFLENBQUM7Z0JBQ25CLE9BQU8sQ0FBQyxLQUFLLENBQUMsaUNBQWlDLFNBQVMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFBO2dCQUV2RixPQUFPLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUE7WUFDNUIsQ0FBQztRQUNGLENBQUM7SUFDRixDQUFDO0lBQ0QsT0FBTyxPQUFPLENBQUE7QUFDZixDQUFDO0FBRUQsU0FBUyxjQUFjLENBQUMsR0FBa0IsRUFBRSxTQUEwQjtJQUVyRSxPQUFPLE1BQU0sQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEdBQUcsR0FBRyxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsRUFBRSxLQUFLLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQy9ILENBQUM7QUFFRCxTQUFTLFFBQVEsQ0FBQyxHQUFrQixFQUFFLFNBQW1DO0lBQ3hFLE1BQU0sTUFBTSxHQUFHLEVBQW1CLENBQUE7SUFDbEMsS0FBSyxNQUFNLFVBQVUsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUM5QixNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsNkJBQTZCLENBQUMsR0FBRyxFQUFFLFVBQVUsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUMvRSxDQUFDO0lBQ0QsT0FBTyxNQUFNLENBQUE7QUFDZCxDQUFDO0FBRUQsZUFBZSxRQUFRLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R5bGUtdGVtcGxhdGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3N0eWxlLXRlbXBsYXRlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUNwQyxPQUFPLFdBQVcsTUFBTSxlQUFlLENBQUE7QUFFdkMsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ3hCLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDWCxNQUFNLEVBQUUsQ0FBQyxLQUFhLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxjQUFjLEVBQUU7SUFDakQsUUFBUSxFQUFFLENBQUMsS0FBYSxFQUFFLE1BQWMsRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUM7SUFDbkUsSUFBSSxFQUFFLENBQUMsSUFBWSxFQUFFLElBQWEsRUFBRSxFQUFFO1FBQ3JDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDekIsSUFBSSxHQUFHLE9BQU8sSUFBSSxFQUFFLENBQUE7UUFDckIsQ0FBQztRQUNELE9BQU8sYUFBYSxJQUFJLFVBQVUsSUFBSSxFQUFFLENBQUE7SUFDekMsQ0FBQztJQUNELElBQUksRUFBRSxDQUFDLElBQVksRUFBRSxJQUFZLEVBQUUsTUFBTSxHQUFHLGdCQUFnQixFQUFFLEVBQUU7UUFDL0QsT0FBTyxjQUFjLE1BQU0sV0FBVyxJQUFJLEtBQUssSUFBSSxNQUFNLENBQUE7SUFDMUQsQ0FBQztDQUNELENBQUMsQ0FBQTtBQUVGLFNBQVMsNkJBQTZCLENBQUMsR0FBa0IsRUFBRSxhQUFxQixFQUFFLFNBQW1DO0lBQ3BILE1BQU0sT0FBTyxHQUFvQyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQTtJQUM5RSxJQUFJLGFBQWEsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNoQyxNQUFNLEtBQUssR0FBRyxjQUFjLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNoRCxLQUFLLE1BQU0sR0FBRyxJQUFJLFNBQVMsQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO1lBQzVDLElBQUksQ0FBQztnQkFDSixNQUFNLFVBQVUsR0FBRyxTQUFTLENBQUMsYUFBYSxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFBO2dCQUN0RCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLENBQUE7WUFDaEQsQ0FBQztZQUFDLE9BQU8sR0FBUSxFQUFFLENBQUM7Z0JBQ25CLE9BQU8sQ0FBQyxLQUFLLENBQUMsaUNBQWlDLFNBQVMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFBO2dCQUV2RixPQUFPLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUE7WUFDNUIsQ0FBQztRQUNGLENBQUM7SUFDRixDQUFDO0lBQ0QsT0FBTyxPQUFPLENBQUE7QUFDZixDQUFDO0FBRUQsU0FBUyxjQUFjLENBQUMsR0FBa0IsRUFBRSxTQUEwQjtJQUVyRSxPQUFPLE1BQU0sQ0FBQyxXQUFXLENBQ3hCLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBRSxHQUFHLEdBQUcsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQ25HLENBQUE7QUFDRixDQUFDO0FBRUQsU0FBUyxRQUFRLENBQUMsR0FBa0IsRUFBRSxTQUFtQztJQUN4RSxNQUFNLE1BQU0sR0FBRyxFQUFtQixDQUFBO0lBQ2xDLEtBQUssTUFBTSxVQUFVLElBQUksR0FBRyxFQUFFLENBQUM7UUFDOUIsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLDZCQUE2QixDQUFDLEdBQUcsRUFBRSxVQUFVLEVBQUUsU0FBUyxDQUFDLENBQUE7SUFDL0UsQ0FBQztJQUNELE9BQU8sTUFBTSxDQUFBO0FBQ2QsQ0FBQztBQUVELGVBQWUsUUFBUSxDQUFBIn0=

package/dist/types/chart.d.ts

@@ -149,7 +149,7 @@ export type TableStyleTemplate = {
     html?: string;
     [key: string]: string | undefined;
 };
-export type ChartSuperType = 'google' | 'table' | 'embed';
+export type ChartSuperType = 'google' | 'table' | 'embed' | 'markdown';
 export interface ChartBase extends ChartJson {
     chartId: number;
     name: string;
@@ -179,6 +179,9 @@ export interface ChartJson {
     showFooter?: boolean;
     table?: Table;
     url?: string;
+    markdown?: {
+        content: string;
+    };
 }
 interface GoogleChart extends ChartBase {
     query: string;
@@ -195,5 +198,13 @@ interface EmbedChart extends ChartBase {
     formattedUrl?: string;
     query?: never;
 }
-export type Chart = GoogleChart | TableChart | EmbedChart;
+interface MarkdownChart extends ChartBase {
+    supertype: 'markdown';
+    query?: never;
+    markdown: {
+        content: string;
+        formattedContent?: string;
+    };
+}
+export type Chart = GoogleChart | TableChart | EmbedChart | MarkdownChart;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isoftdata/utility-dashboard-backend",
-  "version": "4.0.7",
+  "version": "4.1.0-beta.2",
   "description": "A utility for formatting chart and report data to be usable by the frontend dashboard component.",
   "main": "dist/index.js",
   "type": "module",
@@ -21,7 +21,7 @@
     }
   },
   "dependencies": {
-    "@isoftdata/utility-date-time": "^4.3.0",
+    "@isoftdata/utility-date-time": "^4.3.1",
     "camelcase": "^6.3.0",
     "date-fns": "^4.1.0",
     "deepmerge": "^4.2.2",
@@ -30,12 +30,11 @@
     "to-snake-case": "^1.0.0"
   },
   "devDependencies": {
-    "@isoftdata/eslint-config-typescript": "^2.0.0",
-    "@isoftdata/prettier-config": "^2.0.6",
+    "@isoftdata/eslint-config-typescript": "^3.1.4",
+    "@isoftdata/prettier-config-base": "^1.0.3",
     "@types/google.visualization": "^0.0.68",
     "@types/node": "^18.19.130",
     "@types/to-snake-case": "^1.0.2",
-    "eslint": "^7.32.0",
     "package-preview": "^4.0.0",
     "prettier": "^3.7.4",
     "type-fest": "^4.41.0",
@@ -44,17 +43,7 @@
   "peerDependencies": {
     "@isoftdata/utility-db": ">4.2.0"
   },
-  "prettier": "@isoftdata/prettier-config",
-  "eslintConfig": {
-    "extends": [
-      "@isoftdata/typescript",
-      "prettier"
-    ],
-    "ignorePatterns": "dist/**",
-    "rules": {
-      "@typescript-eslint/no-var-requires": 0
-    }
-  },
+  "prettier": "@isoftdata/prettier-config-base",
   "engines": {
     "pnpm": "10.x"
   },