@isoftdata/utility-dashboard-backend 1.4.4 → 1.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/chart-helper.js +2 -1
- package/index.js +8 -3
- package/package.json +1 -1
package/chart-helper.js
CHANGED
|
@@ -237,12 +237,13 @@ module.exports = {
|
|
|
237
237
|
return {
|
|
238
238
|
property: field,
|
|
239
239
|
name: field,
|
|
240
|
-
class: 'text-right',
|
|
240
|
+
class: 'text-right border-top-0',
|
|
241
241
|
}
|
|
242
242
|
}
|
|
243
243
|
return {
|
|
244
244
|
property: field,
|
|
245
245
|
name: field,
|
|
246
|
+
class: 'border-top-0',
|
|
246
247
|
}
|
|
247
248
|
})
|
|
248
249
|
return {
|
package/index.js
CHANGED
|
@@ -31,14 +31,14 @@ const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
|
|
|
31
31
|
return resultSet
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
const loadChartData = async(mysqlConnection, { name, query: queryObject, formatting, chartWrapper, multiSeries, parameters, ...theRest }) => { // needs database connection
|
|
34
|
+
const loadChartData = async(mysqlConnection, { name, query: queryObject, formatting, chartWrapper, multiSeries, table, parameters, ...theRest }) => { // needs database connection
|
|
35
35
|
const { dataTable, processedFormatting } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType: chartWrapper.chartType })
|
|
36
36
|
|
|
37
37
|
if (chartWrapper.chartType === 'Table') {
|
|
38
38
|
return {
|
|
39
39
|
...theRest,
|
|
40
40
|
chartWrapper,
|
|
41
|
-
table: dataTable,
|
|
41
|
+
table: { ...table, ...dataTable }, // combine the data and any table setting overrides
|
|
42
42
|
formatting: processedFormatting,
|
|
43
43
|
}
|
|
44
44
|
}
|
|
@@ -99,9 +99,14 @@ const loadOptionList = async(mysqlConnection, optionListQuery, optionList = [])
|
|
|
99
99
|
]
|
|
100
100
|
}
|
|
101
101
|
|
|
102
|
-
const loadOutputParameterValues = async(mysqlConnection, { definitionList, selectionList = [], forClient = false }) => {
|
|
102
|
+
const loadOutputParameterValues = async(mysqlConnection, { definitionList = [], selectionList = [], forClient = false }) => {
|
|
103
103
|
let parameterValues = []
|
|
104
104
|
|
|
105
|
+
// If definitionList is not an Array, there are no parameters, so just return []
|
|
106
|
+
if (!(definitionList instanceof Array)) {
|
|
107
|
+
return []
|
|
108
|
+
}
|
|
109
|
+
|
|
105
110
|
for (const definition of definitionList) {
|
|
106
111
|
const matchingParameterSelection = selectionList.find(param => param.name === definition.name)
|
|
107
112
|
|
package/package.json
CHANGED