@isoftdata/utility-dashboard-backend 1.5.0 → 1.5.2

package/index.js

@@ -35,10 +35,10 @@ const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
 	return resultSet
 }
 
-const loadChartData = async(mysqlConnection, { name, query: queryObject, formatting, chartWrapper, multiSeries, table, parameters, ...theRest }) => { // needs database connection
-	const { dataTable, processedFormatting } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType: chartWrapper.chartType })
+const loadChartData = async(mysqlConnection, { name, query: queryObject, formatting, chartWrapper, multiSeries, table, parameters, supertype, ...theRest }) => { // needs database connection
+	const { dataTable, processedFormatting } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType: chartWrapper?.chartType || supertype })
 
-	if (chartWrapper.chartType === 'Table') {
+	if (chartWrapper?.chartType === 'Table') {
 		return {
 			...theRest,
 			chartWrapper,
@@ -174,6 +174,13 @@ const loadOutputParameterValues = async(mysqlConnection, { definitionList = [],
  * @returns {{sql: string, values: Array}}
  */
 const parameterizeQuery = (query, parameterValues) => {
+	// Don't parameterize a lack of a query
+	if (!query) {
+		return {
+			sql: '',
+			values: [],
+		}
+	}
 	const queryParameterValues = parameterValues.reduce((acc, val) => {
 		return val.queryValues ? {
 			...acc,

package/package.json

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