@isoftdata/utility-dashboard-backend 1.4.3 → 1.4.5

package/chart-helper.js

@@ -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

@@ -31,17 +31,15 @@ const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
 	return resultSet
 }
 
-const loadChartData = async(mysqlConnection, { name, query: queryObject, formatting, chartWrapper, multiSeries, parameters, ...theRest }) => { // needs database connection
-	const dataTable = await loadDataTable(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType: chartWrapper.chartType })
-
-	const proccessedFormatting = handleFormattingTemplates(formatting)
+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,
-			formatting: proccessedFormatting,
+			table: { ...table, ...dataTable }, // combine the data and any table setting overrides
+			formatting: processedFormatting,
 		}
 	}
 	return {
@@ -50,7 +48,7 @@ const loadChartData = async(mysqlConnection, { name, query: queryObject, formatt
 			...chartWrapper,
 			dataTable,
 		},
-		formatting: proccessedFormatting,
+		formatting: processedFormatting,
 	}
 }
 /*
@@ -58,25 +56,25 @@ const loadChartData = async(mysqlConnection, { name, query: queryObject, formatt
 *	Otherwise, it will return data in the google chart Datatable object literal format.
 *	multiSeries, formatting properties should be deconstructed from the chart object, chartType should be deconstructed from the chart's chartWrapper property
 */
-const loadDataTable = async(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType }) => {
+const loadDataTableAndProcessedFormatting = async(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType }) => {
 	let { results: queryResultSet, fields } = (queryObject && queryObject.sql) ? await queryWithFields(mysqlConnection, queryObject) : { fields: [], results: [] }
 	let data = handleChartTypeSpecificQuirks(chartType, queryResultSet)
 
-	const proccessedFormatting = handleFormattingTemplates(formatting)
-
-	if (chartType.toLowerCase() === 'table') {
-		return getRactiveTableDataFormat(data, fields, proccessedFormatting)
-	}
-
 	if (multiSeries) {
 		({ data, formatting, fields } = getMultiSeriesData({
 			data,
 			seriesOptions: multiSeries,
-			formatting: proccessedFormatting,
+			formatting,
 			fields,
 		}))
 	}
 
+	const processedFormatting = handleFormattingTemplates(formatting)
+
+	if (chartType.toLowerCase() === 'table') {
+		return { dataTable: getRactiveTableDataFormat(data, fields, processedFormatting), processedFormatting }
+	}
+
 	let dataTable = getDataTableFormat(data, fields, multiSeries) //per the Google Charts docs, the DataTable object literal format is the most performant, so we'll turn it into that format before returning
 
 	// Stacked area charts will have holes / jagged lines if there are nulls in the middle of a column
@@ -85,9 +83,13 @@ const loadDataTable = async(mysqlConnection, { query: queryObject, multiSeries,
 		dataTable = makeDataCumulative(dataTable)
 	}
 
-	return dataTable
+	return { dataTable, processedFormatting }
 }
 
+const loadDataTable = async(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType }) => {
+	const { dataTable } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType })
+	return dataTable
+}
 const loadOptionList = async(mysqlConnection, optionListQuery, optionList = []) => {
 	return [
 		...optionList,
@@ -97,9 +99,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)
 
@@ -206,6 +213,7 @@ module.exports = {
 	},
 	loadOutputParameterValues,
 	loadDataTable,
+	loadDataTableAndProcessedFormatting,
 	parameterizeQuery,
 	handleFormattingTemplates,
 }

package/package.json

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