@isoftdata/utility-dashboard-backend 3.2.20 → 3.2.22

package/README.md

@@ -1,4 +1,5 @@
 # utility-dashboard-backend
+
  A backend utility for formatting and loading dashboard chart and report data to be usable by the [frontend dashboard component](https://github.com/ISoft-Data-Systems/ractive-component-web-dashboard).
 
 ## Installation
@@ -10,7 +11,9 @@ npm i @isoftdata/utility-dashboard-backend
 > Breaking change in version 3: ESM style exports
 
 ## Prerequisites
+>
 > Version 3.Y.Z of the frontend component is required for use with version 2.Y.Z of the backend component.
+
 * A MySQL database schema as outlined in [schema.md](schema.md)
 * A backend that can fetches rows from the chart, report, and report chart tables from the database with their primary keys. Any json columns should be parsed as objects.
 * A connection or pool of connections from the `mysql` NPM module for running the charts' queries
@@ -32,13 +35,14 @@ async formatReportMetadata(mysqlConnection, { report, chartsInReport, session })
 
 ```js
 async function loadReportMetadata({ dashboardReportId, chartId, session }) {
-	const report = await db.dashboardReport.loadById({ dashboardReportId }) // gets a report by its id
-	const chartsInReport = await db.dashboardChart.loadByReport({ dashboardReportId, chartId }) // gets all charts for a specified report, or if `chartId` is specified, only gets that chart for that report.
-	return await formatReportMetadata(db.pool, { report, chartsInReport, session })
+ const report = await db.dashboardReport.loadById({ dashboardReportId }) // gets a report by its id
+ const chartsInReport = await db.dashboardChart.loadByReport({ dashboardReportId, chartId }) // gets all charts for a specified report, or if `chartId` is specified, only gets that chart for that report.
+ return await formatReportMetadata(db.pool, { report, chartsInReport, session })
 }
 ```
 
 #### mysqlConnection
+
 A connection or pool of connections from the `mysql` npm module.
 
 #### report
@@ -102,13 +106,19 @@ Example:
 ```
 
 #### session
+
 Session object from the Auth Module
 
 #### site (optional)
+
 The 'type' of site for the product this is used in. Determines the MySQL table to query for site selection parameters, and used to calculate `siteIdColumn` if that is not specified.
+
 #### siteIdColumn (optional)
+
 The name of the column that stores the site id in the site table. Defaults to `${site}id`.
+
 #### siteNameColumn (optional)
+
 The store name column.
 
 ### formatChartDataForReport
@@ -125,32 +135,37 @@ async formatChartDataForReport(mysqlConnection, { reportParameters, chart, repor
 
 ```js
 async function loadChartDataForReport ({ dashboardReportId, chartId, parameterSelectionList, session }) {
-	const report = await db.dashboardReport.loadById({ dashboardReportId }) // get the report object
-	const chart = await db.dashboardChart.loadById({ chartId }) // get the chart object
-	const reportChart = await db.dashboardReportChart.loadByReportAndChartId({ chartId, dashboardReportId }) // get the report chart for the rank/overrides
-	try {
-		const chartData = await formatChartDataForReport(db.pool, { reportParameters: report.parameters, chart, reportChart, parameterSelectionList, session })
-		return chartData
-	} catch (err) {
-		console.error(err)
-		return { isErrored: true }
-	}
+ const report = await db.dashboardReport.loadById({ dashboardReportId }) // get the report object
+ const chart = await db.dashboardChart.loadById({ chartId }) // get the chart object
+ const reportChart = await db.dashboardReportChart.loadByReportAndChartId({ chartId, dashboardReportId }) // get the report chart for the rank/overrides
+ try {
+  const chartData = await formatChartDataForReport(db.pool, { reportParameters: report.parameters, chart, reportChart, parameterSelectionList, session })
+  return chartData
+ } catch (err) {
+  console.error(err)
+  return { isErrored: true }
+ }
 }
 ```
 
 #### mysqlConnection
+
 A connection or pool of connections from the `mysql` npm module.
 
 #### reportParameters
+
 The `parameters` array from a report object.
 
 #### chartId
+
 The id of a chart row in `wa_dashboard_chart`.
 
 #### parameterSelectionList
+
 The array of selected parameters sent from the client dashboard.
 
 #### session
+
 Session object from the Auth Module
 
 ### loadOutputParameterValues
@@ -166,6 +181,7 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList, sele
 #### Example Usage
 
 #### mysqlConnection
+
 A connection or pool of connections from the `mysql` npm module.
 
 #### definitionList

package/dist/chart-helper.js

@@ -85,11 +85,11 @@ export function queryWithFields(connection, query) {
 export function getMultiSeriesData({ data: queryResult, seriesOptions, formatting, fields }) {
     const { groupXAxisBy, series, value, tooltip } = seriesOptions;
     const allOfTheKeysInTheSeries = new Set(queryResult.map(row => row[series]));
-    const objectOfAllKeysWithNullValues = {};
+    const objectOfAllKeys = {};
     for (const key of allOfTheKeysInTheSeries) {
-        objectOfAllKeysWithNullValues[key] = null;
+        objectOfAllKeys[key] = [];
         if (tooltip) {
-            objectOfAllKeysWithNullValues[`${tooltip} ${key}`] = null;
+            objectOfAllKeys[`${tooltip} ${key}`] = [];
         }
     }
     const grouped = {};
@@ -98,11 +98,11 @@ export function getMultiSeriesData({ data: queryResult, seriesOptions, formattin
         groupedByDate || (groupedByDate = row[groupXAxisBy] instanceof Date);
         const groupXAxisByValue = groupedByDate ? row[groupXAxisBy].toISOString() : row[groupXAxisBy];
         if (!grouped[groupXAxisByValue]) {
-            grouped[groupXAxisByValue] = { ...objectOfAllKeysWithNullValues };
+            grouped[groupXAxisByValue] = { ...objectOfAllKeys };
         }
-        grouped[groupXAxisByValue][row[series]] = row[value];
+        grouped[groupXAxisByValue][row[series]].push(row[value]);
         if (tooltip) {
-            grouped[groupXAxisByValue][`${tooltip} ${row[series]}`] = row[tooltip];
+            grouped[groupXAxisByValue][`${tooltip} ${row[series]}`].push(row[tooltip]);
         }
     }
     const seriesFields = { [groupXAxisBy]: fields[groupXAxisBy] };
@@ -118,10 +118,15 @@ export function getMultiSeriesData({ data: queryResult, seriesOptions, formattin
     }
     const multiSeriesData = [];
     for (const key in grouped) {
-        multiSeriesData.push({
-            [groupXAxisBy]: groupedByDate ? new Date(key) : key,
-            ...grouped[key],
-        });
+        const longestColumn = Math.max(...Object.values(grouped[key]).map(arr => arr.length));
+        const groupedKeys = Object.keys(grouped[key]);
+        for (let i = 0; i < longestColumn; i++) {
+            const obj = { [groupXAxisBy]: groupedByDate ? new Date(key) : key };
+            for (const groupedKey of groupedKeys) {
+                obj[groupedKey] = grouped[key][groupedKey][i] ?? null;
+            }
+            multiSeriesData.push(obj);
+        }
     }
     return {
         data: multiSeriesData,
@@ -262,4 +267,4 @@ export function getSvelteDataTableFormat(rows, fields, formatting, styleTemplate
     };
 }
 export { getSvelteDataTableFormat as getRactiveDataTableFormat };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-helper.js","sourceRoot":"","sources":["../src/chart-helper.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-helper.js","sourceRoot":"","sources":["../src/chart-helper.ts"],"names":[],"mappings":"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"}

package/dist/types/parameter.d.ts

@@ -1,7 +1,7 @@
 import type { NamedDateRange } from '@isoftdata/utility-date-time';
 type MaybeArray<T> = T | T[];
 export interface OptionListEntry {
-    id: number | string;
+    id: string;
     name: string;
     rawSql?: boolean;
     fromQuery?: boolean;

package/package.json

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