npm - @isoftdata/utility-dashboard-backend - Versions diffs - 3.4.1 → 4.0.0-beta.1 - Mend

@isoftdata/utility-dashboard-backend 3.4.1 → 4.0.0-beta.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.

Files changed (14) hide show

package/README.md CHANGED Viewed

@@ -1,5 +1,4 @@
 # 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
@@ -11,9 +10,7 @@ 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
@@ -35,14 +32,13 @@ 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
@@ -106,19 +102,13 @@ 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
@@ -135,37 +125,32 @@ 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
@@ -181,7 +166,6 @@ 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.d.ts CHANGED Viewed

@@ -1,12 +1,9 @@
-import { Connection, RowDataPacket } from 'mysql';
-import type { Formatting, GoogleDataTable, MultiSeriesOptions, ProcessedFormatting, Table } from './types/chart.js';
-export type FieldType = 'string' | 'number' | 'datetime' | 'timeofday' | 'date' | 'boolean';
+import { DatabaseConnectionInterface, QueryCommand, RowDataPacket } from '@isoftdata/utility-db';
+import type { Formatting, GoogleDataTable, MultiSeriesOptions, ProcessedFormatting, Table } from './types/chart';
+export type FieldType = 'string' | 'number' | 'datetime' | 'timeofday' | 'date';
 export type QueryFieldsObject = Record<string, FieldType>;
-export declare function queryWithFields(connection: Connection, query: {
-    sql: string;
-    values: unknown[];
-}): Promise<{
-    results: RowDataPacket[];
+export declare function queryWithFields(connection: DatabaseConnectionInterface, query: QueryCommand): Promise<{
+    results: object[];
     fields: QueryFieldsObject;
 }>;
 export type getMultiSeriesDataInput = {
@@ -25,7 +22,6 @@ export declare function coerceNullColumn(columnProp: string, data: RowDataPacket
 export declare function handleFormattingTemplates(formatting?: Formatting): ProcessedFormatting;
 export declare function getDataTableFormat(data: RowDataPacket[], fields: QueryFieldsObject, multiSeries?: MultiSeriesOptions): GoogleDataTable;
 export declare function makeDataCumulative(dataTable: GoogleDataTable, cumulative?: boolean): GoogleDataTable;
-export declare function getSvelteDataTableFormat(rows: RowDataPacket[], fields: {
+export declare function getRactiveTableDataFormat(rows: RowDataPacket[], fields: {
     [key: string]: string;
 }, formatting: ProcessedFormatting, styleTemplates?: {}): Table;
-export { getSvelteDataTableFormat as getRactiveDataTableFormat };

package/dist/chart-helper.js CHANGED Viewed

@@ -2,7 +2,6 @@ import formattingTemplates from './formatting-templates.js';
 import toSnakeCase from 'to-snake-case';
 import mysqlDataTypes from 'mysql/lib/protocol/constants/types.js';
 import styleTableRow from './style-templates.js';
-import { klona } from 'klona';
 function mysqlToGoogleChartsDataTypeMap(mysqlDataType) {
     switch (mysqlDataType) {
         case 'VAR_STRING':
@@ -37,29 +36,6 @@ function mysqlToGoogleChartsDataTypeMap(mysqlDataType) {
             return 'string';
     }
 }
-const roleRegex = /^role:(\w+)([ \-_]\w+)?/;
-function getRoleFromColumnName(name) {
-    const match = name.match(roleRegex);
-    return match?.[1] ?? null;
-}
-function getColumnRoleType(role, dataType) {
-    if (role?.startsWith('role:')) {
-        role = role.replace('role:', '');
-    }
-    switch (role) {
-        case 'certainty':
-        case 'emphasis':
-        case 'scope':
-            return 'boolean';
-        case 'interval':
-            return 'number';
-        case 'domain':
-        case 'data':
-            return dataType;
-        default:
-            return 'string';
-    }
-}
 function makeDataTableCol(key, fields, role = null) {
     return {
         id: toSnakeCase(key).toLowerCase(),
@@ -68,92 +44,65 @@ function makeDataTableCol(key, fields, role = null) {
         role,
     };
 }
-function resultsIsRowDataPacketArray(results) {
-    return (Array.isArray(results) && results.length === 0) || (Array.isArray(results) && results.length > 0 && results[0].constructor.name === 'RowDataPacket');
+function resultsIsObjectArray(results) {
+    return (Array.isArray(results) && results.length === 0)
+        || (Array.isArray(results) && results.length > 0 && typeof results[0] === 'object' && results[0] !== null && !Array.isArray(results[0]));
 }
 function fieldsIsFieldPacketArray(fields) {
     return (Array.isArray(fields) && fields.length === 0) || (Array.isArray(fields) && fields.length > 0 && fields[0].constructor.name === 'FieldPacket');
 }
-export function queryWithFields(connection, query) {
-    return new Promise((resolve, reject) => {
-        connection.query(query, (err, results, fields) => {
-            try {
-                if (err) {
-                    console.error('Error running query for dashboard chart', err);
-                    reject(err);
-                }
-                else if (!resultsIsRowDataPacketArray(results)) {
-                    reject(new Error('Query did not return a valid result set. Ensure that the chart has exactly one valid SELECT query.'));
-                }
-                else if (!fieldsIsFieldPacketArray(fields)) {
-                    reject(new Error('Query did not return a valid field set.'));
-                }
-                else {
-                    resolve({
-                        results,
-                        fields: fields?.reduce((sum, field) => {
-                            const fieldType = mysqlToGoogleChartsDataTypeMap(mysqlDataTypes[field.type] || field.type);
-                            return {
-                                ...sum,
-                                [field.name]: field.name.startsWith('role:') ? getColumnRoleType(field.name, fieldType) : fieldType,
-                            };
-                        }, {}) ?? {},
-                    });
-                }
-            }
-            catch (err) {
-                reject(err);
-            }
-        });
-    });
+export async function queryWithFields(connection, query) {
+    try {
+        const [results, fields] = await connection.queryWithFieldPackets(query);
+        if (!resultsIsObjectArray(results)) {
+            throw new Error('Query did not return a valid result set. Ensure that the chart has exactly one valid SELECT query.');
+        }
+        else if (!fieldsIsFieldPacketArray(fields)) {
+            throw new Error('Query did not return a valid field set.');
+        }
+        else {
+            return {
+                results,
+                fields: fields.reduce((sum, field) => {
+                    return {
+                        ...sum,
+                        [field.name]: mysqlToGoogleChartsDataTypeMap(mysqlDataTypes[field.type] || field.type),
+                    };
+                }, {}) ?? {},
+            };
+        }
+    }
+    catch (err) {
+        console.error('Error running query for dashboard chart', err);
+        throw err;
+    }
 }
 export function getMultiSeriesData({ data: queryResult, seriesOptions, formatting, fields }) {
     const { groupXAxisBy, series, value, tooltip } = seriesOptions;
-    const allOfTheKeysInTheSeries = new Set(queryResult.flatMap(row => {
-        const keys = [row[series]];
-        const roleKeys = Object.keys(row)
-            .filter(key => key.startsWith('role:'))
-            .map(key => `${key}-${row[series]}`);
-        if (roleKeys.length) {
-            keys.push(...roleKeys);
-        }
-        return keys;
-    }));
-    const objectOfAllKeys = {};
+    const allOfTheKeysInTheSeries = new Set(queryResult.map(row => row[series]));
+    const objectOfAllKeysWithNullValues = {};
     for (const key of allOfTheKeysInTheSeries) {
-        objectOfAllKeys[key] = [];
-        if (tooltip && !key.startsWith('role:')) {
-            objectOfAllKeys[`role:tooltip-${key}`] = [];
+        objectOfAllKeysWithNullValues[key] = null;
+        if (tooltip) {
+            objectOfAllKeysWithNullValues[`${tooltip} ${key}`] = null;
         }
     }
     const grouped = {};
-    let groupedByDate = false;
     for (const row of queryResult) {
-        groupedByDate || (groupedByDate = row[groupXAxisBy] instanceof Date);
-        const groupXAxisByValue = groupedByDate ? row[groupXAxisBy].toISOString() : row[groupXAxisBy];
-        if (!grouped[groupXAxisByValue]) {
-            grouped[groupXAxisByValue] = { ...klona(objectOfAllKeys) };
+        if (!grouped[row[groupXAxisBy]]) {
+            grouped[row[groupXAxisBy]] = { ...objectOfAllKeysWithNullValues };
         }
-        grouped[groupXAxisByValue][row[series]].push(row[value]);
-        const roleKeys = Object.keys(row).filter(key => key.startsWith('role:'));
-        roleKeys.forEach(key => {
-            grouped[groupXAxisByValue][`${key}-${row[series]}`].push(row[key]);
-        });
+        grouped[row[groupXAxisBy]][row[series]] = row[value];
         if (tooltip) {
-            grouped[groupXAxisByValue][`role:tooltip-${row[series]}`].push(row[tooltip]);
+            grouped[row[groupXAxisBy]][`${tooltip} ${row[series]}`] = row[tooltip];
         }
     }
     const seriesFields = { [groupXAxisBy]: fields[groupXAxisBy] };
     const seriesFormatting = {};
     for (const key of allOfTheKeysInTheSeries) {
-        if (key.startsWith('role:')) {
-            seriesFields[key] = getColumnRoleType(getRoleFromColumnName(key), fields[value]);
-        }
-        else {
-            seriesFields[key] = fields[value];
-        }
-        if (tooltip && !key.startsWith('role:')) {
-            seriesFields[`role:tooltip-${key}`] = fields[tooltip];
+        seriesFields[key] = fields[value];
+        if (tooltip) {
+            seriesFields[`${tooltip} ${key}`] = fields[tooltip];
         }
         if (formatting && value in formatting) {
             seriesFormatting[key] = formatting[value];
@@ -161,15 +110,10 @@ export function getMultiSeriesData({ data: queryResult, seriesOptions, formattin
     }
     const multiSeriesData = [];
     for (const key in grouped) {
-        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);
-        }
+        multiSeriesData.push({
+            [groupXAxisBy]: key,
+            ...grouped[key],
+        });
     }
     return {
         data: multiSeriesData,
@@ -222,19 +166,6 @@ export function handleFormattingTemplates(formatting) {
     }
     return formattingOutput;
 }
-function getSeriesRole(seriesName, multiSeries) {
-    if (multiSeries?.tooltip && seriesName.startsWith(multiSeries.tooltip)) {
-        return {
-            role: 'tooltip',
-            seriesName,
-        };
-    }
-    const match = seriesName.match(roleRegex);
-    if (match) {
-        return { role: match[1], seriesName: seriesName };
-    }
-    return { role: null, seriesName };
-}
 export function getDataTableFormat(data, fields, multiSeries) {
     let cols = [];
     if (multiSeries) {
@@ -242,8 +173,12 @@ export function getDataTableFormat(data, fields, multiSeries) {
     }
     for (const key in fields) {
         if (!multiSeries || key !== multiSeries.groupXAxisBy) {
-            const { role, seriesName } = getSeriesRole(key, multiSeries);
-            cols.push(makeDataTableCol(seriesName, fields, role));
+            if (multiSeries?.tooltip && key.includes(multiSeries.tooltip)) {
+                cols.push(makeDataTableCol(key, fields, 'tooltip'));
+            }
+            else {
+                cols.push(makeDataTableCol(key, fields));
+            }
         }
     }
     const rows = data.map(row => {
@@ -255,20 +190,6 @@ export function getDataTableFormat(data, fields, multiSeries) {
             c: items,
         };
     });
-    if (!cols.length) {
-        cols.push({
-            id: 'nodata1',
-            label: 'No Data',
-            type: 'number',
-        });
-    }
-    if (cols.length === 1) {
-        cols.push({
-            id: 'nodata2',
-            label: 'No Data',
-            type: 'number',
-        });
-    }
     return { cols, rows };
 }
 export function makeDataCumulative(dataTable, cumulative = true) {
@@ -286,28 +207,29 @@ export function makeDataCumulative(dataTable, cumulative = true) {
     });
     return dataTable;
 }
-export function getSvelteDataTableFormat(rows, fields, formatting, styleTemplates = {}) {
+export function getRactiveTableDataFormat(rows, fields, formatting, styleTemplates = {}) {
     const columns = Object.keys(fields).map(field => {
-        if (formatting?.[field]?.type === 'NumberFormat') {
+        if (formatting?.[field]?.type === 'NumberFormat' && formatting?.[field]?.format?.prefix === '$') {
             return {
                 property: `${field}[value]`,
                 name: field,
-                class: 'text-right text-end',
+                class: 'text-right border-top-0',
             };
         }
         return {
             property: `${field}[value]`,
             name: field,
-            class: '',
+            class: 'border-top-0',
         };
     });
     if (styleTemplates) {
-        rows = rows.map(row => styleTableRow(row, styleTemplates));
+        rows = rows.map(row => {
+            return styleTableRow(row, styleTemplates);
+        });
     }
     return {
         columns,
         rows,
     };
 }
-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/index.d.ts CHANGED Viewed

@@ -1,25 +1,18 @@
-export type * from './types/index.js';
-export * from './types/index.js';
-export { queryWithFields } from './chart-helper.js';
+import { DatabaseConnectionInterface, QueryCommand, RowDataPacket } from '@isoftdata/utility-db';
 import { QueryFieldsObject } from './chart-helper.js';
-import type { DashboardReportParameter, DashboardReportParameterInput } from './types/parameter.js';
-import type { Session, SiteType } from './types/session.js';
-import type { MultiSeriesOptions, Formatting, Chart, Table, GoogleDataTable, ProcessedFormatting, ChartJson } from './types/chart.js';
-import type { Connection, RowDataPacket } from 'mysql';
-import type { Report, ReportInput } from './types/report.js';
-import type { PartialDeep } from 'type-fest';
+import type { DashboardReportParameter } from './types/parameter';
+import type { Session, SiteType } from './types/session';
+import type { MultiSeriesOptions, Formatting, Chart, Table, GoogleDataTable, ProcessedFormatting } from './types/chart';
+import type { Report, ReportInput } from './types/report';
 export * as formatterTemplates from './formatting-templates.js';
 export { handleFormattingTemplates } from './chart-helper.js';
+export type { ReportInput } from './types/report';
 export type CustomDataSourceFunction = (query: string, values?: unknown[]) => Promise<{
     results: RowDataPacket[];
     fields: QueryFieldsObject;
-    jsonOverride?: PartialDeep<ChartJson>;
 }>;
 export type LoadDataTableAndProcessedFormattingOptions = {
-    query: {
-        sql: string;
-        values: unknown[];
-    };
+    query: QueryCommand;
     multiSeries?: MultiSeriesOptions;
     formatting?: Formatting;
     chartType: string;
@@ -27,45 +20,30 @@ export type LoadDataTableAndProcessedFormattingOptions = {
     table?: Table;
     customDataSource?: CustomDataSourceFunction | null;
 };
-export declare function loadDataTableAndProcessedFormatting(mysqlConnection: Connection, { query: queryObject, multiSeries, formatting, chartType, cumulative, table, customDataSource }: LoadDataTableAndProcessedFormattingOptions): Promise<{
+export declare function loadDataTableAndProcessedFormatting(mysqlConnection: DatabaseConnectionInterface, { query: queryObject, multiSeries, formatting, chartType, cumulative, table, customDataSource }: LoadDataTableAndProcessedFormattingOptions): Promise<{
     dataTable: GoogleDataTable | Table;
     processedFormatting: ProcessedFormatting;
     fields: QueryFieldsObject;
-    jsonOverride?: PartialDeep<ChartJson>;
 }>;
 export type loadDataTableOptions = {
-    query: {
-        sql: string;
-        values: unknown[];
-    };
+    query: QueryCommand;
     multiSeries: MultiSeriesOptions;
     formatting: Formatting;
     chartType: string;
 };
-export declare function loadDataTable(mysqlConnection: Connection, { query: queryObject, multiSeries, formatting, chartType }: loadDataTableOptions): Promise<GoogleDataTable>;
-type SelectionParameter = {
-    name: string;
-    value: string;
-    dates?: {
-        from: string;
-        to: string;
-    } | null;
-};
-type LoadOutputParameterValuesOptions = {
-    definitionList: Array<DashboardReportParameterInput>;
-    selectionList?: Array<SelectionParameter>;
+export declare function loadDataTable(mysqlConnection: DatabaseConnectionInterface, { query: queryObject, multiSeries, formatting, chartType }: loadDataTableOptions): Promise<GoogleDataTable>;
+type loadOutputParameterValuesOptions = {
+    definitionList: DashboardReportParameter[];
+    selectionList?: Array<Partial<DashboardReportParameter> & Pick<DashboardReportParameter, 'name'>>;
     forClient?: boolean;
     session: Session;
     site?: SiteType;
     siteIdColumn?: string;
     siteNameColumn?: string;
 };
-export declare function loadOutputParameterValues(mysqlConnection: Connection, { definitionList, selectionList, forClient, session, site, siteIdColumn, siteNameColumn }: LoadOutputParameterValuesOptions): Promise<DashboardReportParameter[]>;
+export declare function loadOutputParameterValues(mysqlConnection: DatabaseConnectionInterface, { definitionList, selectionList, forClient, session, site, siteIdColumn, siteNameColumn }: loadOutputParameterValuesOptions): Promise<DashboardReportParameter[]>;
 export declare const parameterRegex: RegExp;
-export declare function parameterizeQuery(queryString: string | undefined, parameterValues: DashboardReportParameter[]): {
-    sql: string;
-    values: unknown[];
-};
+export declare function parameterizeQuery(queryString: string, parameterValues: DashboardReportParameter[]): QueryCommand;
 export declare function parameterizeUrl(url: string, parameterValues: DashboardReportParameter[]): string;
 type FormatReportMetadataOptions = {
     report: ReportInput;
@@ -75,9 +53,9 @@ type FormatReportMetadataOptions = {
     siteIdColumn?: string;
     siteNameColumn?: string;
 };
-export declare function formatReportMetadata(mysqlConnection: Connection, { report, chartsInReport, session, site, siteIdColumn, siteNameColumn }: FormatReportMetadataOptions): Promise<Report>;
+export declare function formatReportMetadata(mysqlConnection: DatabaseConnectionInterface, { report, chartsInReport, session, site, siteIdColumn, siteNameColumn }: FormatReportMetadataOptions): Promise<Report>;
 export type FormatChartDataForReportOptions = {
-    reportParameters: Array<DashboardReportParameterInput>;
+    reportParameters: DashboardReportParameter[];
     chart: Chart;
     reportChart: {
         chartId: number;
@@ -86,11 +64,11 @@ export type FormatChartDataForReportOptions = {
         rank: number;
         reportChartId: number;
     };
-    parameterSelectionList: SelectionParameter[];
+    parameterSelectionList: DashboardReportParameter[];
     session: Session;
     site: SiteType;
     siteIdColumn?: string;
     siteNameColumn?: string;
     customDataSource?: CustomDataSourceFunction | null;
 };
-export declare function formatChartDataForReport(mysqlConnection: Connection, { reportParameters, chart, reportChart, parameterSelectionList, session, site, siteIdColumn, siteNameColumn, customDataSource }: FormatChartDataForReportOptions): Promise<Omit<Chart, 'query'>>;
+export declare function formatChartDataForReport(mysqlConnection: DatabaseConnectionInterface, { reportParameters, chart, reportChart, parameterSelectionList, session, site, siteIdColumn, siteNameColumn, customDataSource }: FormatChartDataForReportOptions): Promise<Omit<Chart, 'query'>>;