@isoftdata/utility-dashboard-backend 1.0.3 → 1.1.0

package/index.js

@@ -81,7 +81,7 @@ const loadOptionList = async(mysqlConnection, optionListQuery, optionList = [])
 	]
 }
 
-const loadOutputParameterValues = async(mysqlConnection, definitionList, selectionList = []) => {
+const loadOutputParameterValues = async(mysqlConnection, { definitionList, selectionList = [], forClient = false }) => {
 	let parameterValues = []
 
 	for (const definition of definitionList) {
@@ -102,20 +102,25 @@ const loadOutputParameterValues = async(mysqlConnection, definitionList, selecti
 			if (parameter.value !== 'Custom') {
 				parameter.dates = datesFromRange(parameter.value)
 			}
-			parameter.queryValues = {
-				[`${parameter.name}_start_date`]: parameter.dates.from,
-				[`${parameter.name}_end_date`]: parameter.dates.to,
+			if (!forClient) {
+				parameter.queryValues = {
+					[`${parameter.name}_start_date`]: parameter.dates.from,
+					[`${parameter.name}_end_date`]: parameter.dates.to,
+				}
 			}
 		} else if (definition.type === 'selection') {
 			parameter.optionList = await loadOptionList(mysqlConnection, definition.optionListQuery, definition.optionList) // queries db
-			parameter.queryValues = {
-				[parameter.name]: parameter.value,
+			if (!forClient) {
+				parameter.queryValues = {
+					[parameter.name]: parameter.value,
+				}
 			}
 		} else if (definition.type === 'date') {
 			parameter.value = parameter.value || formatDate(new Date(), 'yyyy-MM-dd')
-
-			parameter.queryValues = {
-				[parameter.name]: parameter.value,
+			if (!forClient) {
+				parameter.queryValues = {
+					[parameter.name]: parameter.value,
+				}
 			}
 		}
 
@@ -150,18 +155,14 @@ const parameterizeQuery = (query, parameterValues) => {
 module.exports = {
 	formatReportMetadata: async(mysqlConnection, { report, chartsInReport }) => {
 		try {
-			const parameterValues = await loadOutputParameterValues(mysqlConnection, report.parameters)
-			const parameterValuesForClient = parameterValues.map(param => {
-				const { queryValues, ...parameterValuesForClient } = param
-				return parameterValuesForClient
-			})
+			const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: report.parameters, forClient: true })
 
 			return {
 				dashboardReportId: report.dashboardReportId,
 				name: report.reportName,
 				title: report.reportTitle,
 				charts: chartsInReport,
-				parameterValues: parameterValuesForClient,
+				parameterValues,
 				ownerId: report.ownerId,
 			}
 		} catch (err) {
@@ -171,7 +172,7 @@ module.exports = {
 	},
 	formatChartDataForReport: async(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList }) => {
 		try {
-			const parameterValues = await loadOutputParameterValues(mysqlConnection, reportParameters, parameterSelectionList)
+			const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: reportParameters, selectionList: parameterSelectionList })
 			return await loadChartData(mysqlConnection, {
 				...chart,
 				reportChartId: reportChart.reportChartId,
@@ -183,4 +184,5 @@ module.exports = {
 			throw err
 		}
 	},
+	loadOutputParameterValues,
 }

package/package.json

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