@isoftdata/utility-dashboard-backend 2.0.2 → 2.1.1
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/README.md +19 -6
- package/dist/chart-helper.d.ts +32 -0
- package/dist/chart-helper.js +238 -0
- package/dist/formatting-templates.d.ts +3 -0
- package/dist/formatting-templates.js +17 -0
- package/dist/index.d.ts +73 -0
- package/dist/index.js +296 -0
- package/dist/style-templates.d.ts +4 -0
- package/dist/style-templates.js +31 -0
- package/dist/types/chart.d.ts +91 -0
- package/dist/types/chart.js +3 -0
- package/dist/types/parameter.d.ts +37 -0
- package/dist/types/parameter.js +3 -0
- package/dist/types/report.d.ts +24 -0
- package/dist/types/report.js +3 -0
- package/dist/types/session.d.ts +9 -0
- package/dist/types/session.js +3 -0
- package/package.json +26 -5
- package/.gitattributes +0 -2
- package/chart-helper.js +0 -268
- package/empty dashboard schema.sql +0 -65
- package/formatter-templates.json +0 -15
- package/index.js +0 -284
- package/schema.md +0 -125
- package/style-templates.js +0 -31
- package/stylingTest.jsonc +0 -37
package/dist/index.js
ADDED
|
@@ -0,0 +1,296 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatterTemplates = exports.handleFormattingTemplates = exports.parameterizeQuery = exports.loadDataTableAndProcessedFormatting = exports.loadDataTable = exports.loadOutputParameterValues = exports.formatChartDataForReport = exports.formatReportMetadata = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const db = require('@isoftdata/utility-db');
|
|
6
|
+
const chart_helper_js_1 = require("./chart-helper.js");
|
|
7
|
+
Object.defineProperty(exports, "handleFormattingTemplates", { enumerable: true, get: function () { return chart_helper_js_1.handleFormattingTemplates; } });
|
|
8
|
+
const utility_date_time_1 = require("@isoftdata/utility-date-time");
|
|
9
|
+
const formatterTemplates = tslib_1.__importStar(require("./formatting-templates"));
|
|
10
|
+
exports.formatterTemplates = formatterTemplates;
|
|
11
|
+
const formatDate = require('date-fns/format');
|
|
12
|
+
const camelcase_1 = tslib_1.__importDefault(require("camelcase"));
|
|
13
|
+
const mysql = require('mysql');
|
|
14
|
+
const deepmerge = require('deepmerge');
|
|
15
|
+
const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
|
|
16
|
+
if (resultSet.length) {
|
|
17
|
+
switch (chartType) {
|
|
18
|
+
case 'PieChart':
|
|
19
|
+
resultSet = (0, chart_helper_js_1.makeNegativeNumbericValuesZero)(resultSet);
|
|
20
|
+
break;
|
|
21
|
+
case 'TreeMap':
|
|
22
|
+
resultSet = (0, chart_helper_js_1.coerceNullColumn)(Object.keys(resultSet[0])[1], resultSet);
|
|
23
|
+
if (resultSet.length === 1) {
|
|
24
|
+
resultSet[0].id = 'No Data';
|
|
25
|
+
}
|
|
26
|
+
break;
|
|
27
|
+
default:
|
|
28
|
+
resultSet = (0, chart_helper_js_1.coerceNullColumn)(Object.keys(resultSet[0])[0], resultSet);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return resultSet;
|
|
32
|
+
};
|
|
33
|
+
async function loadChartData(mysqlConnection, chart, queryObject) {
|
|
34
|
+
let { formatting, chartWrapper, multiSeries, table, supertype, cumulative, ...theRest } = chart;
|
|
35
|
+
if (!chartWrapper) {
|
|
36
|
+
chartWrapper = {
|
|
37
|
+
chartType: supertype,
|
|
38
|
+
options: {
|
|
39
|
+
height: 450, width: 800,
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
cumulative = cumulative || (chartWrapper?.chartType === 'AreaChart' && cumulative !== false);
|
|
44
|
+
let dataTable = {}, processedFormatting = {};
|
|
45
|
+
try {
|
|
46
|
+
const dataTableAndProcessedFormatting = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType: chartWrapper?.chartType, cumulative, table });
|
|
47
|
+
dataTable = dataTableAndProcessedFormatting.dataTable;
|
|
48
|
+
processedFormatting = dataTableAndProcessedFormatting.processedFormatting;
|
|
49
|
+
}
|
|
50
|
+
catch (err) {
|
|
51
|
+
console.error('Error loading dataTable / processedFormatting');
|
|
52
|
+
throw err;
|
|
53
|
+
}
|
|
54
|
+
if (chartWrapper?.chartType === 'Table') {
|
|
55
|
+
return {
|
|
56
|
+
...theRest,
|
|
57
|
+
supertype,
|
|
58
|
+
chartWrapper,
|
|
59
|
+
table: { ...table, ...dataTable },
|
|
60
|
+
formatting: processedFormatting,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
return {
|
|
64
|
+
...theRest,
|
|
65
|
+
cumulative,
|
|
66
|
+
supertype,
|
|
67
|
+
chartWrapper: {
|
|
68
|
+
...chartWrapper,
|
|
69
|
+
dataTable: dataTable,
|
|
70
|
+
},
|
|
71
|
+
formatting: processedFormatting,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
async function loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType, cumulative = false, table = {} }) {
|
|
75
|
+
let { results: queryResultSet, fields } = (queryObject?.sql) ? await (0, chart_helper_js_1.queryWithFields)(mysqlConnection, queryObject) : { fields: {}, results: [] };
|
|
76
|
+
queryResultSet = queryResultSet;
|
|
77
|
+
let data = handleChartTypeSpecificQuirks(chartType, queryResultSet);
|
|
78
|
+
if (multiSeries) {
|
|
79
|
+
({ data, formatting, fields } = (0, chart_helper_js_1.getMultiSeriesData)({
|
|
80
|
+
data,
|
|
81
|
+
seriesOptions: multiSeries,
|
|
82
|
+
formatting,
|
|
83
|
+
fields,
|
|
84
|
+
}));
|
|
85
|
+
}
|
|
86
|
+
const processedFormatting = (0, chart_helper_js_1.handleFormattingTemplates)(formatting);
|
|
87
|
+
if (chartType?.toLowerCase() === 'table') {
|
|
88
|
+
return { dataTable: (0, chart_helper_js_1.getRactiveTableDataFormat)(data, fields, processedFormatting, table?.style), processedFormatting };
|
|
89
|
+
}
|
|
90
|
+
let dataTable = (0, chart_helper_js_1.getDataTableFormat)(data, fields, multiSeries);
|
|
91
|
+
if (cumulative || chartType === 'AreaChart') {
|
|
92
|
+
dataTable = (0, chart_helper_js_1.makeDataCumulative)(dataTable, cumulative);
|
|
93
|
+
}
|
|
94
|
+
return { dataTable, processedFormatting };
|
|
95
|
+
}
|
|
96
|
+
exports.loadDataTableAndProcessedFormatting = loadDataTableAndProcessedFormatting;
|
|
97
|
+
async function loadDataTable(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType }) {
|
|
98
|
+
const { dataTable } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType });
|
|
99
|
+
return dataTable;
|
|
100
|
+
}
|
|
101
|
+
exports.loadDataTable = loadDataTable;
|
|
102
|
+
const loadOptionList = async (mysqlConnection, optionListQuery, optionList = []) => {
|
|
103
|
+
return [
|
|
104
|
+
...optionList,
|
|
105
|
+
...(optionListQuery && await db.query(mysqlConnection, optionListQuery)) || [],
|
|
106
|
+
];
|
|
107
|
+
};
|
|
108
|
+
async function loadOutputParameterValues(mysqlConnection, { definitionList = [], selectionList = [], forClient = false, session, site = 'store', siteIdColumn, siteNameColumn }) {
|
|
109
|
+
if (!(definitionList instanceof Array) || !definitionList.length) {
|
|
110
|
+
return [];
|
|
111
|
+
}
|
|
112
|
+
const parameterValues = [];
|
|
113
|
+
for (const definition of definitionList) {
|
|
114
|
+
const matchingParameterSelection = selectionList.find(param => param.name === definition.name);
|
|
115
|
+
let typedParameter;
|
|
116
|
+
const baseParameter = {
|
|
117
|
+
name: definition.name,
|
|
118
|
+
title: definition.title || definition.name,
|
|
119
|
+
default: definition.default,
|
|
120
|
+
value: (matchingParameterSelection?.value) ?? definition.default,
|
|
121
|
+
queryValues: {},
|
|
122
|
+
};
|
|
123
|
+
if (definition.type === 'dateRange') {
|
|
124
|
+
baseParameter.value = baseParameter.value || 'Last 30 Days';
|
|
125
|
+
typedParameter = {
|
|
126
|
+
...baseParameter,
|
|
127
|
+
type: 'dateRange',
|
|
128
|
+
dates: matchingParameterSelection?.dates ?? (0, utility_date_time_1.datesFromRange)(baseParameter.value),
|
|
129
|
+
};
|
|
130
|
+
if (typedParameter.value !== 'Custom') {
|
|
131
|
+
typedParameter.dates = (0, utility_date_time_1.datesFromRange)(typedParameter.value);
|
|
132
|
+
}
|
|
133
|
+
if (!forClient) {
|
|
134
|
+
typedParameter.queryValues = {
|
|
135
|
+
[`${typedParameter.name}_start_date`]: typedParameter.dates.from,
|
|
136
|
+
[`${typedParameter.name}_end_date`]: typedParameter.dates.to,
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
else if (definition.type === 'selection') {
|
|
141
|
+
typedParameter = {
|
|
142
|
+
...baseParameter,
|
|
143
|
+
type: 'selection',
|
|
144
|
+
optionListQuery: definition?.optionListQuery,
|
|
145
|
+
optionList: definition?.optionList,
|
|
146
|
+
};
|
|
147
|
+
typedParameter.optionList = await loadOptionList(mysqlConnection, typedParameter.optionListQuery, typedParameter.optionList);
|
|
148
|
+
if (!typedParameter.optionList.some(option => option.id?.toString() === typedParameter.value?.toString())) {
|
|
149
|
+
typedParameter.value = typedParameter.optionList?.[0]?.id?.toString();
|
|
150
|
+
}
|
|
151
|
+
const option = typedParameter.optionList.find(option => option.id.toString() === typedParameter.value);
|
|
152
|
+
if (!forClient) {
|
|
153
|
+
typedParameter.queryValues = {
|
|
154
|
+
[typedParameter.name]: option?.rawSql ? mysql.raw(typedParameter.value) : typedParameter.value,
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
else if (definition.type === 'siteSelection') {
|
|
159
|
+
typedParameter = {
|
|
160
|
+
...baseParameter,
|
|
161
|
+
type: 'siteSelection',
|
|
162
|
+
permission: definition?.permission,
|
|
163
|
+
optionList: definition?.optionList,
|
|
164
|
+
};
|
|
165
|
+
typedParameter.value = typedParameter.value ?? (session.siteId ?? session[`${site}Id`]);
|
|
166
|
+
siteIdColumn = siteIdColumn ? mysqlConnection.escapeId(siteIdColumn) : mysqlConnection.escapeId(`${site}id`);
|
|
167
|
+
siteNameColumn = siteNameColumn ? mysqlConnection.escapeId(siteNameColumn) : 'name';
|
|
168
|
+
const siteTableName = mysqlConnection.escapeId(site);
|
|
169
|
+
if (typedParameter.permission) {
|
|
170
|
+
typedParameter.optionList = await db.query(mysqlConnection, {
|
|
171
|
+
sql: `SELECT ${siteIdColumn} AS id, ${siteNameColumn} AS \`name\` FROM ${siteTableName} WHERE f_check_user_permission(?, ?, ${siteIdColumn})`,
|
|
172
|
+
values: [session.userAccountId, definition.permission],
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
typedParameter.optionList = await db.query(mysqlConnection, {
|
|
177
|
+
sql: `SELECT ${siteIdColumn} AS id, ${siteNameColumn} AS \`name\` FROM ${siteTableName} WHERE f_useraccount_has_site_access(?, ${siteIdColumn})`,
|
|
178
|
+
values: [session.userAccountId],
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
if (typedParameter.optionList.length > 1) {
|
|
182
|
+
typedParameter.optionList.unshift({ id: 0, name: 'All' });
|
|
183
|
+
}
|
|
184
|
+
if (!typedParameter.optionList.some(option => option.id?.toString() === baseParameter.value?.toString())) {
|
|
185
|
+
typedParameter.value = typedParameter.optionList?.[0]?.id.toString();
|
|
186
|
+
}
|
|
187
|
+
if (!forClient && typedParameter.value?.toString() === '0') {
|
|
188
|
+
typedParameter.queryValues = {
|
|
189
|
+
[typedParameter.name]: typedParameter.optionList
|
|
190
|
+
.filter(({ id }) => id > 0)
|
|
191
|
+
.map(({ id }) => id?.toString()),
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
else if (!forClient) {
|
|
195
|
+
typedParameter.queryValues = {
|
|
196
|
+
[typedParameter.name]: [typedParameter.value],
|
|
197
|
+
};
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
else if (definition.type === 'date') {
|
|
201
|
+
typedParameter = {
|
|
202
|
+
...baseParameter,
|
|
203
|
+
type: 'date',
|
|
204
|
+
};
|
|
205
|
+
typedParameter.value = typedParameter.value || formatDate(new Date(), 'yyyy-MM-dd');
|
|
206
|
+
if (!forClient) {
|
|
207
|
+
typedParameter.queryValues = {
|
|
208
|
+
[typedParameter.name]: typedParameter.value,
|
|
209
|
+
};
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
else if (definition.type === 'session') {
|
|
213
|
+
typedParameter = {
|
|
214
|
+
...baseParameter,
|
|
215
|
+
type: 'session',
|
|
216
|
+
};
|
|
217
|
+
const parameterName = (0, camelcase_1.default)(definition.name);
|
|
218
|
+
baseParameter.value = (session[parameterName] ?? '').toString();
|
|
219
|
+
if (!forClient) {
|
|
220
|
+
typedParameter.queryValues = {
|
|
221
|
+
[typedParameter.name]: typedParameter.value,
|
|
222
|
+
};
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
else {
|
|
226
|
+
throw new Error(`Parameter type mismatch for ${baseParameter.name}`);
|
|
227
|
+
}
|
|
228
|
+
parameterValues.push(typedParameter);
|
|
229
|
+
}
|
|
230
|
+
return parameterValues;
|
|
231
|
+
}
|
|
232
|
+
exports.loadOutputParameterValues = loadOutputParameterValues;
|
|
233
|
+
const parameterizeQuery = (queryString, parameterValues) => {
|
|
234
|
+
if (!queryString) {
|
|
235
|
+
return {
|
|
236
|
+
sql: '',
|
|
237
|
+
values: [],
|
|
238
|
+
};
|
|
239
|
+
}
|
|
240
|
+
const queryParameterValues = parameterValues.reduce((acc, val) => {
|
|
241
|
+
return val.queryValues ? {
|
|
242
|
+
...acc,
|
|
243
|
+
...val.queryValues,
|
|
244
|
+
} : acc;
|
|
245
|
+
}, {});
|
|
246
|
+
const regexp = /\${([^}]+)}/g;
|
|
247
|
+
const queryParameterKeys = [...queryString.matchAll(regexp)].map(([, insideToken]) => insideToken.trim());
|
|
248
|
+
const queryParameters = queryParameterKeys.map(key => queryParameterValues[key] || null);
|
|
249
|
+
return {
|
|
250
|
+
sql: queryString.replace(regexp, '?'),
|
|
251
|
+
values: queryParameters,
|
|
252
|
+
};
|
|
253
|
+
};
|
|
254
|
+
exports.parameterizeQuery = parameterizeQuery;
|
|
255
|
+
async function formatReportMetadata(mysqlConnection, { report, chartsInReport, session = {}, site, siteIdColumn, siteNameColumn }) {
|
|
256
|
+
try {
|
|
257
|
+
const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: report.parameters, forClient: true, session, site, siteIdColumn, siteNameColumn });
|
|
258
|
+
return {
|
|
259
|
+
dashboardReportId: report.dashboardReportId,
|
|
260
|
+
name: report.reportName,
|
|
261
|
+
title: report.reportTitle,
|
|
262
|
+
charts: chartsInReport,
|
|
263
|
+
parameterValues,
|
|
264
|
+
ownerId: report.ownerId,
|
|
265
|
+
autoRefreshInterval: report.autoRefreshInterval,
|
|
266
|
+
description: report.description ?? '',
|
|
267
|
+
};
|
|
268
|
+
}
|
|
269
|
+
catch (err) {
|
|
270
|
+
console.error(err);
|
|
271
|
+
throw err;
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
exports.formatReportMetadata = formatReportMetadata;
|
|
275
|
+
async function formatChartDataForReport(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList, session = {}, site, siteIdColumn, siteNameColumn }) {
|
|
276
|
+
try {
|
|
277
|
+
const parameterValues = await loadOutputParameterValues(mysqlConnection, { definitionList: reportParameters, selectionList: parameterSelectionList, session, site, siteIdColumn, siteNameColumn });
|
|
278
|
+
if (reportChart?.jsonOverride?.chartWrapper?.dataTable) {
|
|
279
|
+
const { dataTable, ...chartWrapper } = reportChart.jsonOverride.chartWrapper;
|
|
280
|
+
reportChart.jsonOverride.chartWrapper = chartWrapper;
|
|
281
|
+
}
|
|
282
|
+
const combinedChart = deepmerge(chart, reportChart.jsonOverride ?? {});
|
|
283
|
+
return await loadChartData(mysqlConnection, {
|
|
284
|
+
...combinedChart,
|
|
285
|
+
rank: reportChart.rank,
|
|
286
|
+
reportChartId: reportChart.reportChartId,
|
|
287
|
+
description: combinedChart.description ?? '',
|
|
288
|
+
}, parameterizeQuery(chart.query, parameterValues));
|
|
289
|
+
}
|
|
290
|
+
catch (err) {
|
|
291
|
+
console.error(err);
|
|
292
|
+
throw err;
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
exports.formatChartDataForReport = formatChartDataForReport;
|
|
296
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const mathjs_1 = require("mathjs");
|
|
5
|
+
const snakecase_keys_1 = tslib_1.__importDefault(require("snakecase-keys"));
|
|
6
|
+
const klona_1 = require("klona");
|
|
7
|
+
function handleMathJsCellStyleTemplate(row, columnToStyle, templates) {
|
|
8
|
+
const outCell = { value: row[columnToStyle]?.toString() };
|
|
9
|
+
if (columnToStyle in templates) {
|
|
10
|
+
const scope = (0, snakecase_keys_1.default)((0, klona_1.klona)(row), { deep: true });
|
|
11
|
+
for (const key in templates[columnToStyle]) {
|
|
12
|
+
try {
|
|
13
|
+
const expression = templates[columnToStyle][key] ?? '';
|
|
14
|
+
outCell[key] = (0, mathjs_1.evaluate)(expression, scope);
|
|
15
|
+
}
|
|
16
|
+
catch (err) {
|
|
17
|
+
console.error(`Error evaluating expression: '${templates[columnToStyle][key]}'\n`, err);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return outCell;
|
|
22
|
+
}
|
|
23
|
+
function styleRow(row, templates) {
|
|
24
|
+
const outRow = {};
|
|
25
|
+
for (const columnName in row) {
|
|
26
|
+
outRow[columnName] = handleMathJsCellStyleTemplate(row, columnName, templates);
|
|
27
|
+
}
|
|
28
|
+
return outRow;
|
|
29
|
+
}
|
|
30
|
+
exports.default = styleRow;
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R5bGUtdGVtcGxhdGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3N0eWxlLXRlbXBsYXRlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFJQSxtQ0FBaUM7QUFFakMsNEVBQTBDO0FBQzFDLGlDQUE2QjtBQUU3QixTQUFTLDZCQUE2QixDQUFDLEdBQWtCLEVBQUUsYUFBcUIsRUFBRSxTQUFtQztJQUNwSCxNQUFNLE9BQU8sR0FBRyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsYUFBYSxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQXFDLENBQUE7SUFDNUYsSUFBSSxhQUFhLElBQUksU0FBUyxFQUFFO1FBRS9CLE1BQU0sS0FBSyxHQUFHLElBQUEsd0JBQWEsRUFBQyxJQUFBLGFBQUssRUFBQyxHQUFHLENBQUMsRUFBRSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO1FBQ3ZELEtBQUssTUFBTSxHQUFHLElBQUksU0FBUyxDQUFDLGFBQWEsQ0FBQyxFQUFFO1lBQzNDLElBQUk7Z0JBQ0gsTUFBTSxVQUFVLEdBQUcsU0FBUyxDQUFDLGFBQWEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtnQkFDdEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLElBQUEsaUJBQVEsRUFBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLENBQUE7YUFDMUM7WUFBQyxPQUFPLEdBQUcsRUFBRTtnQkFHYixPQUFPLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxTQUFTLENBQUMsYUFBYSxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQTthQUN2RjtTQUNEO0tBQ0Q7SUFDRCxPQUFPLE9BQU8sQ0FBQTtBQUNmLENBQUM7QUFFRCxTQUFTLFFBQVEsQ0FBQyxHQUFrQixFQUFFLFNBQW1DO0lBQ3hFLE1BQU0sTUFBTSxHQUFHLEVBQW1CLENBQUE7SUFDbEMsS0FBSyxNQUFNLFVBQVUsSUFBSSxHQUFHLEVBQUU7UUFDN0IsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLDZCQUE2QixDQUFDLEdBQUcsRUFBRSxVQUFVLEVBQUUsU0FBUyxDQUFDLENBQUE7S0FDOUU7SUFDRCxPQUFPLE1BQU0sQ0FBQTtBQUNkLENBQUM7QUFFRCxrQkFBZSxRQUFRLENBQUEifQ==
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
export type GoogleDataTableCell = {
|
|
2
|
+
v?: any;
|
|
3
|
+
f?: string | undefined;
|
|
4
|
+
p?: any;
|
|
5
|
+
};
|
|
6
|
+
export type GoogleDataTableColumn = {
|
|
7
|
+
type: string;
|
|
8
|
+
id?: string | undefined;
|
|
9
|
+
label?: string | undefined;
|
|
10
|
+
pattern?: string | undefined;
|
|
11
|
+
p?: any;
|
|
12
|
+
};
|
|
13
|
+
export type GoogleDataTableRow = {
|
|
14
|
+
c: GoogleDataTableCell[];
|
|
15
|
+
p?: any;
|
|
16
|
+
};
|
|
17
|
+
export type GoogleDataTable = {
|
|
18
|
+
cols: GoogleDataTableColumn[];
|
|
19
|
+
rows: GoogleDataTableRow[];
|
|
20
|
+
p?: any;
|
|
21
|
+
};
|
|
22
|
+
export type ChartWrapper = {
|
|
23
|
+
options: Record<string, unknown>;
|
|
24
|
+
dataTable?: GoogleDataTable;
|
|
25
|
+
chartType: string;
|
|
26
|
+
};
|
|
27
|
+
export type MultiSeriesOptions = {
|
|
28
|
+
value: string;
|
|
29
|
+
series: string;
|
|
30
|
+
groupXAxisBy: string;
|
|
31
|
+
tooltip?: string;
|
|
32
|
+
};
|
|
33
|
+
export type FormattingRule = {
|
|
34
|
+
type: string;
|
|
35
|
+
format: string;
|
|
36
|
+
};
|
|
37
|
+
export type Formatting = Record<string, FormattingRule>;
|
|
38
|
+
export type FormattingTemplates = Record<string, FormattingTemplate>;
|
|
39
|
+
export type FormattingTemplate = {
|
|
40
|
+
prefix?: string;
|
|
41
|
+
fractionDigits?: number;
|
|
42
|
+
groupingSymbol?: string;
|
|
43
|
+
format?: string;
|
|
44
|
+
};
|
|
45
|
+
export type ProcessedFormatting = {
|
|
46
|
+
[key: string]: {
|
|
47
|
+
type: string;
|
|
48
|
+
format: FormattingTemplate | null;
|
|
49
|
+
};
|
|
50
|
+
};
|
|
51
|
+
export type TableColumn = {
|
|
52
|
+
property: string;
|
|
53
|
+
name: string;
|
|
54
|
+
class: string;
|
|
55
|
+
};
|
|
56
|
+
export type TableRow = {
|
|
57
|
+
[key: string]: unknown;
|
|
58
|
+
};
|
|
59
|
+
export type Table = {
|
|
60
|
+
rows: TableRow[];
|
|
61
|
+
columns: TableColumn[];
|
|
62
|
+
style?: TableStyleTemplateObject;
|
|
63
|
+
filterEnabled?: boolean;
|
|
64
|
+
perPageCount?: number;
|
|
65
|
+
};
|
|
66
|
+
export type TableStyleTemplateObject = Record<string, TableStyleTemplate>;
|
|
67
|
+
export type TableStyleTemplate = {
|
|
68
|
+
class?: string;
|
|
69
|
+
html?: string;
|
|
70
|
+
[key: string]: string | undefined;
|
|
71
|
+
};
|
|
72
|
+
export type ChartSuperType = 'google' | 'table' | 'embed';
|
|
73
|
+
export type Chart = {
|
|
74
|
+
chartId: string;
|
|
75
|
+
query: string;
|
|
76
|
+
multiSeries?: MultiSeriesOptions;
|
|
77
|
+
formatting?: Formatting;
|
|
78
|
+
chartWrapper: ChartWrapper;
|
|
79
|
+
table?: Table;
|
|
80
|
+
cumulative?: boolean;
|
|
81
|
+
greedyHeight?: boolean;
|
|
82
|
+
greedyWidth?: boolean;
|
|
83
|
+
hideTitle?: boolean;
|
|
84
|
+
name: string;
|
|
85
|
+
showChart: boolean;
|
|
86
|
+
supertype: ChartSuperType;
|
|
87
|
+
title: string;
|
|
88
|
+
description?: string;
|
|
89
|
+
rank?: number;
|
|
90
|
+
reportChartId?: number;
|
|
91
|
+
};
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHlwZXMvY2hhcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
export interface OptionListEntry {
|
|
2
|
+
id: number | string;
|
|
3
|
+
name: string;
|
|
4
|
+
rawSql?: boolean;
|
|
5
|
+
}
|
|
6
|
+
export type OptionList = Array<OptionListEntry>;
|
|
7
|
+
export interface DashboardReportBaseParameter {
|
|
8
|
+
name: string;
|
|
9
|
+
title: string;
|
|
10
|
+
default: string;
|
|
11
|
+
value: string;
|
|
12
|
+
queryValues: Record<string, string | string[]>;
|
|
13
|
+
}
|
|
14
|
+
export interface DashboardReportDateParameter extends DashboardReportBaseParameter {
|
|
15
|
+
type: 'date';
|
|
16
|
+
}
|
|
17
|
+
export interface DashboardReportDateRangeParameter extends DashboardReportBaseParameter {
|
|
18
|
+
type: 'dateRange';
|
|
19
|
+
dates: {
|
|
20
|
+
from: string;
|
|
21
|
+
to: string;
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
export interface DashboardReportSelectionParameter extends DashboardReportBaseParameter {
|
|
25
|
+
type: 'selection';
|
|
26
|
+
optionList: OptionList;
|
|
27
|
+
optionListQuery?: string;
|
|
28
|
+
}
|
|
29
|
+
export interface DashboardReportSiteSelectionParameter extends DashboardReportBaseParameter {
|
|
30
|
+
type: 'siteSelection';
|
|
31
|
+
optionList: OptionList;
|
|
32
|
+
permission?: string;
|
|
33
|
+
}
|
|
34
|
+
export interface DashboardReportSessionParameter extends DashboardReportBaseParameter {
|
|
35
|
+
type: 'session';
|
|
36
|
+
}
|
|
37
|
+
export type DashboardReportParameter = DashboardReportDateParameter | DashboardReportSelectionParameter | DashboardReportSiteSelectionParameter | DashboardReportDateRangeParameter | DashboardReportSessionParameter;
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1ldGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R5cGVzL3BhcmFtZXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { Chart } from './chart';
|
|
2
|
+
import { DashboardReportParameter } from './parameter';
|
|
3
|
+
export interface Report {
|
|
4
|
+
dashboardReportId: number;
|
|
5
|
+
name: string;
|
|
6
|
+
title: string;
|
|
7
|
+
description: string;
|
|
8
|
+
charts: Chart[];
|
|
9
|
+
ownerId: number | null;
|
|
10
|
+
parameterValues: DashboardReportParameter[];
|
|
11
|
+
autoRefreshInterval: number | null;
|
|
12
|
+
}
|
|
13
|
+
export interface ReportInput {
|
|
14
|
+
dashboardReportId: number;
|
|
15
|
+
reportName: string;
|
|
16
|
+
reportTitle: string;
|
|
17
|
+
description?: string;
|
|
18
|
+
shareId: number | null;
|
|
19
|
+
shareType: ShareType;
|
|
20
|
+
ownerId: number | null;
|
|
21
|
+
autoRefreshInterval: number | null;
|
|
22
|
+
parameters: DashboardReportParameter[];
|
|
23
|
+
}
|
|
24
|
+
export type ShareType = 'everyone' | 'owner' | 'user' | 'group';
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R5cGVzL3JlcG9ydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vzc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eXBlcy9zZXNzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
|
package/package.json
CHANGED
|
@@ -1,24 +1,45 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@isoftdata/utility-dashboard-backend",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.1.1",
|
|
4
4
|
"description": "A utility for formatting chart and report data to be usable by the frontend dashboard component.",
|
|
5
|
-
"main": "index.js",
|
|
5
|
+
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
7
|
-
"test": "echo \"Error: no test specified\" && exit 1"
|
|
7
|
+
"test": "echo \"Error: no test specified\" && exit 1",
|
|
8
|
+
"build": "npx tsc",
|
|
9
|
+
"prepublishOnly": "npm run build"
|
|
8
10
|
},
|
|
9
11
|
"author": "Charles Kaup",
|
|
10
12
|
"license": "ISC",
|
|
13
|
+
"files": [
|
|
14
|
+
"dist/**/*.*"
|
|
15
|
+
],
|
|
16
|
+
"eslintConfig": {
|
|
17
|
+
"extends": "@isoftdata/typescript",
|
|
18
|
+
"ignorePatterns": "dist/**",
|
|
19
|
+
"rules": {
|
|
20
|
+
"@typescript-eslint/no-var-requires": 0
|
|
21
|
+
}
|
|
22
|
+
},
|
|
11
23
|
"dependencies": {
|
|
12
24
|
"@isoftdata/utility-date-time": "^2.0.3",
|
|
13
25
|
"@isoftdata/utility-db": "^1.4.0",
|
|
14
|
-
"camelcase": "^
|
|
26
|
+
"camelcase": "^6.3.0",
|
|
15
27
|
"date-fns": "^2.23.0",
|
|
16
28
|
"deepmerge": "^4.2.2",
|
|
17
|
-
"klona": "^
|
|
29
|
+
"klona": "^2.0.5",
|
|
18
30
|
"mathjs": "^11.5.0",
|
|
19
31
|
"mysql": "^2.18.1",
|
|
20
32
|
"snakecase-keys": "^5.4.4",
|
|
21
33
|
"snakeize": "^0.1.0",
|
|
22
34
|
"to-snake-case": "^1.0.0"
|
|
35
|
+
},
|
|
36
|
+
"devDependencies": {
|
|
37
|
+
"@isoftdata/eslint-config-typescript": "^1.0.13",
|
|
38
|
+
"@types/google.visualization": "^0.0.68",
|
|
39
|
+
"@types/mysql": "github:types/mysql",
|
|
40
|
+
"@types/node": "^18.11.18",
|
|
41
|
+
"eslint": "^7.32.0",
|
|
42
|
+
"package-preview": "^4.0.0",
|
|
43
|
+
"typescript": "^4.9.4"
|
|
23
44
|
}
|
|
24
45
|
}
|
package/.gitattributes
DELETED