@isoftdata/utility-dashboard-backend 3.3.0 → 3.4.1

package/README.md

@@ -1,201 +1,201 @@
-# 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
-
-```bash
-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
-* The [dashboard Ractive component](https://github.com/ISoft-Data-Systems/ractive-component-web-dashboard) on the client
-
-## API
-
-### formatReportMetadata
-
-This function returns data in the format expected for the `loadReportMetadata` function on the dashboard client component.
-
-#### Function signature
-
-```js
-async formatReportMetadata(mysqlConnection, { report, chartsInReport, session })
-```
-
-#### Example Usage (From Pro Web `server/chart-loader.js`)
-
-```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 })
-}
-```
-
-#### mysqlConnection
-
-A connection or pool of connections from the `mysql` npm module.
-
-#### report
-
-A report `object`, a single row from the `dashboard_report`/`wa_dashboard_report` table/view. The `parameters` Array from the `json` column should also be parsed from JSON and appended to this object.
-
-Example:
-
-```js
-{
-  dashboardReportId: 1,
-  reportName: 'report_overview',
-  reportTitle: 'Overview',
-  shareType: 'everyone',
-  shareId: null,
-  ownerId: null,
-  parameters: [ // parameters deconstructed from `json` column after parsing
-    {
-      name: 'date_range',
-      type: 'dateRange',
-      title: 'Date Range',
-      default: 'This Year'
-    }
-  ]
-}
-```
-
-#### chartsInReport
-
-An `Array` of chart `object`s, one for each chart in the report, multiple rows from the `dashboard_chart`/`wa_dashboard_chart` table/view joined with `dashboard_report_chart`/`wa_dashboard_report_chart` to get the chart's rank.
-
-Example:
-
-```js
-[
-  {
-    chartId: 10,
-    name: 'line_sales_over_time_and_previous_period',
-    title: 'Sales over Time',
-    supertype: 'google',
-    formatting: { Sales: [Object] },
-    multiSeries: {
-      value: 'Sales',
-      series: 'Period',
-      tooltip: 'Tooltip',
-      groupXAxisBy: 'Date'
-    },
-    chartWrapper: { options: [Object], chartType: 'LineChart' },
-    rank: 1
-  },
-  {
-    chartId: 16,
-    name: 'map_sales_by_lat_long',
-    title: 'Sales Map',
-    supertype: 'google',
-    formatting: { Sales: [Object] },
-    chartWrapper: { options: [Object], chartType: 'GeoChart' },
-    rank: 2
-  }
-]
-```
-
-#### 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
-
-This function returns data in the format expected for the `loadChartDataForReport` function on the dashboard client component, including applying any report-specific chart options overrides and running the chart's query.
-
-#### Function signature
-
-```js
-async formatChartDataForReport(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList, session })
-```
-
-#### Example usage: (from Pro Web `server/chart-loader.js`)
-
-```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 }
- }
-}
-```
-
-#### 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
-
-This function outputs the report's parameter values in the format expected by the dashboard client and backend. When sending to the client, including `forClient: true` will not include the properties only needed by the backend.
-
-### Function signature
-
-```js
-async function loadOutputParameterValues(mysqlConnection, { definitionList, selectionList = [], forClient = false })
-```
-
-#### Example Usage
-
-#### mysqlConnection
-
-A connection or pool of connections from the `mysql` npm module.
-
-#### definitionList
-
-The `parameters` property from the `json` column of a row in the `dashboard_report` table.
-
-#### selectionList
-
-An array of objects representing the selected parameters sent from the client. Only needed when loading the chart data, not when loading the report "metadata". Each parameter object should match the format specified in [schema.md](schema.md).
-
-#### forClient
-
-If this value is truthy, parameters' `queryValues` properties will be excluded, as the client does not need them.
-
-### Returns
-
-An array of objects matching the format outlined in [schema.md](schema.md)
+# 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
+
+```bash
+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
+* The [dashboard Ractive component](https://github.com/ISoft-Data-Systems/ractive-component-web-dashboard) on the client
+
+## API
+
+### formatReportMetadata
+
+This function returns data in the format expected for the `loadReportMetadata` function on the dashboard client component.
+
+#### Function signature
+
+```js
+async formatReportMetadata(mysqlConnection, { report, chartsInReport, session })
+```
+
+#### Example Usage (From Pro Web `server/chart-loader.js`)
+
+```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 })
+}
+```
+
+#### mysqlConnection
+
+A connection or pool of connections from the `mysql` npm module.
+
+#### report
+
+A report `object`, a single row from the `dashboard_report`/`wa_dashboard_report` table/view. The `parameters` Array from the `json` column should also be parsed from JSON and appended to this object.
+
+Example:
+
+```js
+{
+  dashboardReportId: 1,
+  reportName: 'report_overview',
+  reportTitle: 'Overview',
+  shareType: 'everyone',
+  shareId: null,
+  ownerId: null,
+  parameters: [ // parameters deconstructed from `json` column after parsing
+    {
+      name: 'date_range',
+      type: 'dateRange',
+      title: 'Date Range',
+      default: 'This Year'
+    }
+  ]
+}
+```
+
+#### chartsInReport
+
+An `Array` of chart `object`s, one for each chart in the report, multiple rows from the `dashboard_chart`/`wa_dashboard_chart` table/view joined with `dashboard_report_chart`/`wa_dashboard_report_chart` to get the chart's rank.
+
+Example:
+
+```js
+[
+  {
+    chartId: 10,
+    name: 'line_sales_over_time_and_previous_period',
+    title: 'Sales over Time',
+    supertype: 'google',
+    formatting: { Sales: [Object] },
+    multiSeries: {
+      value: 'Sales',
+      series: 'Period',
+      tooltip: 'Tooltip',
+      groupXAxisBy: 'Date'
+    },
+    chartWrapper: { options: [Object], chartType: 'LineChart' },
+    rank: 1
+  },
+  {
+    chartId: 16,
+    name: 'map_sales_by_lat_long',
+    title: 'Sales Map',
+    supertype: 'google',
+    formatting: { Sales: [Object] },
+    chartWrapper: { options: [Object], chartType: 'GeoChart' },
+    rank: 2
+  }
+]
+```
+
+#### 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
+
+This function returns data in the format expected for the `loadChartDataForReport` function on the dashboard client component, including applying any report-specific chart options overrides and running the chart's query.
+
+#### Function signature
+
+```js
+async formatChartDataForReport(mysqlConnection, { reportParameters, chart, reportChart, parameterSelectionList, session })
+```
+
+#### Example usage: (from Pro Web `server/chart-loader.js`)
+
+```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 }
+ }
+}
+```
+
+#### 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
+
+This function outputs the report's parameter values in the format expected by the dashboard client and backend. When sending to the client, including `forClient: true` will not include the properties only needed by the backend.
+
+### Function signature
+
+```js
+async function loadOutputParameterValues(mysqlConnection, { definitionList, selectionList = [], forClient = false })
+```
+
+#### Example Usage
+
+#### mysqlConnection
+
+A connection or pool of connections from the `mysql` npm module.
+
+#### definitionList
+
+The `parameters` property from the `json` column of a row in the `dashboard_report` table.
+
+#### selectionList
+
+An array of objects representing the selected parameters sent from the client. Only needed when loading the chart data, not when loading the report "metadata". Each parameter object should match the format specified in [schema.md](schema.md).
+
+#### forClient
+
+If this value is truthy, parameters' `queryValues` properties will be excluded, as the client does not need them.
+
+### Returns
+
+An array of objects matching the format outlined in [schema.md](schema.md)

package/dist/chart-helper.d.ts

@@ -1,6 +1,6 @@
 import { Connection, RowDataPacket } from 'mysql';
 import type { Formatting, GoogleDataTable, MultiSeriesOptions, ProcessedFormatting, Table } from './types/chart.js';
-export type FieldType = 'string' | 'number' | 'datetime' | 'timeofday' | 'date';
+export type FieldType = 'string' | 'number' | 'datetime' | 'timeofday' | 'date' | 'boolean';
 export type QueryFieldsObject = Record<string, FieldType>;
 export declare function queryWithFields(connection: Connection, query: {
     sql: string;

package/dist/chart-helper.js

@@ -37,6 +37,29 @@ 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(),
@@ -69,9 +92,10 @@ export function queryWithFields(connection, query) {
                     resolve({
                         results,
                         fields: fields?.reduce((sum, field) => {
+                            const fieldType = mysqlToGoogleChartsDataTypeMap(mysqlDataTypes[field.type] || field.type);
                             return {
                                 ...sum,
-                                [field.name]: mysqlToGoogleChartsDataTypeMap(mysqlDataTypes[field.type] || field.type),
+                                [field.name]: field.name.startsWith('role:') ? getColumnRoleType(field.name, fieldType) : fieldType,
                             };
                         }, {}) ?? {},
                     });
@@ -85,12 +109,21 @@ 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 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 = {};
     for (const key of allOfTheKeysInTheSeries) {
         objectOfAllKeys[key] = [];
-        if (tooltip) {
-            objectOfAllKeys[`${tooltip} ${key}`] = [];
+        if (tooltip && !key.startsWith('role:')) {
+            objectOfAllKeys[`role:tooltip-${key}`] = [];
         }
     }
     const grouped = {};
@@ -102,16 +135,25 @@ export function getMultiSeriesData({ data: queryResult, seriesOptions, formattin
             grouped[groupXAxisByValue] = { ...klona(objectOfAllKeys) };
         }
         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]);
+        });
         if (tooltip) {
-            grouped[groupXAxisByValue][`${tooltip} ${row[series]}`].push(row[tooltip]);
+            grouped[groupXAxisByValue][`role:tooltip-${row[series]}`].push(row[tooltip]);
         }
     }
     const seriesFields = { [groupXAxisBy]: fields[groupXAxisBy] };
     const seriesFormatting = {};
     for (const key of allOfTheKeysInTheSeries) {
-        seriesFields[key] = fields[value];
-        if (tooltip) {
-            seriesFields[`${tooltip} ${key}`] = fields[tooltip];
+        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];
         }
         if (formatting && value in formatting) {
             seriesFormatting[key] = formatting[value];
@@ -187,7 +229,7 @@ function getSeriesRole(seriesName, multiSeries) {
             seriesName,
         };
     }
-    const match = seriesName.match(/^role:(\w+)\s(.*)/);
+    const match = seriesName.match(roleRegex);
     if (match) {
         return { role: match[1], seriesName: seriesName };
     }
@@ -268,4 +310,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/package.json

@@ -1,67 +1,66 @@
-{
-  "name": "@isoftdata/utility-dashboard-backend",
-  "version": "3.3.0",
-  "description": "A utility for formatting chart and report data to be usable by the frontend dashboard component.",
-  "main": "dist/index.js",
-  "type": "module",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc",
-    "prepublishOnly": "npm run build"
-  },
-  "author": "Charles Kaup",
-  "license": "ISC",
-  "files": [
-    "dist/**/*.*"
-  ],
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
-    },
-    "./chart-helper": {
-      "import": "./dist/chart-helper.js",
-      "types": "./dist/chart-helper.d.ts"
-    }
-  },
-  "dependencies": {
-    "@isoftdata/utility-date-time": "^4.0.1",
-    "@isoftdata/utility-db": "^3.2.1",
-    "@types/to-snake-case": "^1.0.2",
-    "camelcase": "^6.3.0",
-    "date-fns": "^3.6.0",
-    "deepmerge": "^4.2.2",
-    "klona": "^2.0.6",
-    "mathjs": "^11.5.0",
-    "mysql": "^2.18.1",
-    "snakeize": "^0.1.0",
-    "to-snake-case": "^1.0.0"
-  },
-  "devDependencies": {
-    "@isoftdata/eslint-config-typescript": "^2.0.0",
-    "@isoftdata/prettier-config": "^1.0.3",
-    "@types/google.visualization": "^0.0.68",
-    "@types/mysql": "github:types/mysql",
-    "@types/node": "^18.11.18",
-    "eslint": "^7.32.0",
-    "package-preview": "^4.0.0",
-    "prettier": "^3.3.3",
-    "type-fest": "^4.26.1",
-    "typescript": "^5.6.2"
-  },
-  "prettier": "@isoftdata/prettier-config",
-  "eslintConfig": {
-    "extends": [
-      "@isoftdata/typescript",
-      "prettier"
-    ],
-    "ignorePatterns": "dist/**",
-    "rules": {
-      "@typescript-eslint/no-var-requires": 0
-    }
-  },
-  "engines": {
-    "pnpm": "10.x"
-  }
-}
+{
+  "name": "@isoftdata/utility-dashboard-backend",
+  "version": "3.4.1",
+  "description": "A utility for formatting chart and report data to be usable by the frontend dashboard component.",
+  "main": "dist/index.js",
+  "type": "module",
+  "author": "Charles Kaup",
+  "license": "ISC",
+  "files": [
+    "dist/**/*.*"
+  ],
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./chart-helper": {
+      "import": "./dist/chart-helper.js",
+      "types": "./dist/chart-helper.d.ts"
+    }
+  },
+  "dependencies": {
+    "@isoftdata/utility-date-time": "^4.0.1",
+    "@isoftdata/utility-db": "^3.2.1",
+    "@types/to-snake-case": "^1.0.2",
+    "camelcase": "^6.3.0",
+    "date-fns": "^4.1.0",
+    "deepmerge": "^4.2.2",
+    "klona": "^2.0.6",
+    "mathjs": "^11.5.0",
+    "mysql": "^2.18.1",
+    "snakeize": "^0.1.0",
+    "to-snake-case": "^1.0.0"
+  },
+  "devDependencies": {
+    "@isoftdata/eslint-config-typescript": "^2.0.0",
+    "@isoftdata/prettier-config": "^1.0.3",
+    "@types/google.visualization": "^0.0.68",
+    "@types/mysql": "github:types/mysql",
+    "@types/node": "^18.11.18",
+    "eslint": "^7.32.0",
+    "package-preview": "^4.0.0",
+    "prettier": "^3.3.3",
+    "type-fest": "^4.26.1",
+    "typescript": "^5.6.2"
+  },
+  "prettier": "@isoftdata/prettier-config",
+  "eslintConfig": {
+    "extends": [
+      "@isoftdata/typescript",
+      "prettier"
+    ],
+    "ignorePatterns": "dist/**",
+    "rules": {
+      "@typescript-eslint/no-var-requires": 0
+    }
+  },
+  "engines": {
+    "pnpm": "10.x"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc"
+  }
+}