@isoftdata/utility-dashboard-backend 1.4.4 → 1.4.6

package/chart-helper.js

@@ -154,7 +154,7 @@ module.exports = {
 			const rowWithValidValue = data.find(row => row[columnProp] !== null)
 			let nullReplacement = ''
 
-			if ((destinationType && destinationType === 'number') || (typeof rowWithValidValue[columnProp] === 'number')) {
+			if ((destinationType && destinationType === 'number') || (rowWithValidValue && typeof rowWithValidValue[columnProp] === 'number')) {
 				nullReplacement = 0
 			}
 
@@ -237,12 +237,13 @@ module.exports = {
 				return {
 					property: field,
 					name: field,
-					class: 'text-right',
+					class: 'text-right border-top-0',
 				}
 			}
 			return {
 				property: field,
 				name: field,
+				class: 'border-top-0',
 			}
 		})
 		return {

package/index.js

@@ -21,6 +21,9 @@ const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
 			case 'TreeMap':
 				//tree charts need the 2nd columns to be not null
 				resultSet = coerceNullColumn(Object.keys(resultSet[0])[1], resultSet)
+				if (resultSet.length === 1) {
+					resultSet[0].id = 'No Data'
+				}
 				break
 			default:
 				//all charts need the first column to be not null
@@ -31,14 +34,14 @@ const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
 	return resultSet
 }
 
-const loadChartData = async(mysqlConnection, { name, query: queryObject, formatting, chartWrapper, multiSeries, parameters, ...theRest }) => { // needs database connection
+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 })
 
 	if (chartWrapper.chartType === 'Table') {
 		return {
 			...theRest,
 			chartWrapper,
-			table: dataTable,
+			table: { ...table, ...dataTable }, // combine the data and any table setting overrides
 			formatting: processedFormatting,
 		}
 	}
@@ -99,9 +102,14 @@ const loadOptionList = async(mysqlConnection, optionListQuery, optionList = [])
 	]
 }
 
-const loadOutputParameterValues = async(mysqlConnection, { definitionList, selectionList = [], forClient = false }) => {
+const loadOutputParameterValues = async(mysqlConnection, { definitionList = [], selectionList = [], forClient = false }) => {
 	let parameterValues = []
 
+	// If definitionList is not an Array, there are no parameters, so just return []
+	if (!(definitionList instanceof Array)) {
+		return []
+	}
+
 	for (const definition of definitionList) {
 		const matchingParameterSelection = selectionList.find(param => param.name === definition.name)
 

package/package.json

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