@isoftdata/utility-dashboard-backend 1.4.1 → 1.4.2

package/index.js

@@ -31,7 +31,7 @@ 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, parameters, ...theRest }) => { // needs database connection
 	const dataTable = await loadDataTable(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType: chartWrapper.chartType })
 
 	const proccessedFormatting = handleFormattingTemplates(formatting)
@@ -58,19 +58,21 @@ const loadChartData = async (mysqlConnection, { name, query: queryObject, format
 *	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 loadDataTable = 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, formatting)
+		return getRactiveTableDataFormat(data, fields, proccessedFormatting)
 	}
 
 	if (multiSeries) {
 		({ data, formatting, fields } = getMultiSeriesData({
 			data,
 			seriesOptions: multiSeries,
-			formatting,
+			formatting: proccessedFormatting,
 			fields,
 		}))
 	}
@@ -86,7 +88,7 @@ const loadDataTable = async (mysqlConnection, { query: queryObject, multiSeries,
 	return dataTable
 }
 
-const loadOptionList = async (mysqlConnection, optionListQuery, optionList = []) => {
+const loadOptionList = async(mysqlConnection, optionListQuery, optionList = []) => {
 	return [
 		...optionList,
 		// ...(optionListQuery && await query(mysqlConnection, optionListQuery)) || [],
@@ -95,7 +97,7 @@ const loadOptionList = async (mysqlConnection, optionListQuery, optionList = [])
 	]
 }
 
-const loadOutputParameterValues = async (mysqlConnection, { definitionList, selectionList = [], forClient = false }) => {
+const loadOutputParameterValues = async(mysqlConnection, { definitionList, selectionList = [], forClient = false }) => {
 	let parameterValues = []
 
 	for (const definition of definitionList) {
@@ -156,7 +158,7 @@ const parameterizeQuery = (query, parameterValues) => {
 	//Then include a capture group to get the inner part of that to use as a key
 	const regexp = /\${([^}]+)}/g
 
-	const queryParameterKeys = [...query.matchAll(regexp)].map(([fullToken, insideToken]) => insideToken.trim())
+	const queryParameterKeys = [ ...query.matchAll(regexp) ].map(([ fullToken, insideToken ]) => insideToken.trim())
 	//if they put a token in the query that isn't one of the defined parameters of the report, just return null?
 	const queryParameters = queryParameterKeys.map(key => queryParameterValues[key] || null)
 
@@ -167,7 +169,7 @@ const parameterizeQuery = (query, parameterValues) => {
 }
 
 module.exports = {
-	formatReportMetadata: async (mysqlConnection, { report, chartsInReport }) => {
+	formatReportMetadata: async(mysqlConnection, { report, chartsInReport }) => {
 		try {
 			const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: report.parameters, forClient: true })
 
@@ -184,7 +186,7 @@ module.exports = {
 			throw err
 		}
 	},
-	formatChartDataForReport: async (mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList }) => {
+	formatChartDataForReport: async(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList }) => {
 		try {
 			const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: reportParameters, selectionList: parameterSelectionList })
 			if (reportChart?.jsonOverride?.chartWrapper?.dataTable) {

package/package.json

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