@isoftdata/utility-dashboard-backend 1.5.2 → 1.5.4

package/empty dashboard schema.sql

@@ -0,0 +1,65 @@
+/*
+SQLyog Ultimate v13.1.7 (64 bit)
+MySQL - 5.7.15-log : Database - itrackpro
+*********************************************************************
+*/
+
+/*!40101 SET NAMES utf8 */;
+
+/*!40101 SET SQL_MODE=''*/;
+
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+/*Table structure for table `dashboard_chart` */
+
+DROP TABLE IF EXISTS `dashboard_chart`;
+
+CREATE TABLE `dashboard_chart` (
+  `chart_id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `name` VARCHAR(64) NOT NULL COMMENT 'Internal name.',
+  `title` VARCHAR(64) NOT NULL COMMENT 'Title shown to user.',
+  `supertype` ENUM('google','table','embed') NOT NULL DEFAULT 'google' COMMENT 'Designates how the chart needs to be loaded and displayed.',
+  `json` TEXT NOT NULL COMMENT 'JSON options for charts.',
+  `show_chart` BIT(1) NOT NULL DEFAULT b'1' COMMENT 'Whether to show the chart in the charts list in the configuration screen.',
+  PRIMARY KEY (`chart_id`)
+) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+/*Table structure for table `dashboard_report` */
+
+DROP TABLE IF EXISTS `dashboard_report`;
+
+CREATE TABLE `dashboard_report` (
+  `dashboard_report_id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `report_name` VARCHAR(64) NOT NULL COMMENT 'Used internally in the program. Snake case.',
+  `report_title` VARCHAR(64) NOT NULL COMMENT 'Shown to the user.',
+  `json` TEXT NOT NULL COMMENT 'Parameters for the report. Array of objects.',
+  `share_type` ENUM('user','group','store','everyone') NOT NULL DEFAULT 'everyone' COMMENT 'The type of id to use for sharing',
+  `share_id` INT(11) DEFAULT NULL COMMENT 'User/Group/Store Id',
+  `owner_id` INT(10) DEFAULT NULL COMMENT 'ID of the user who created the report. Used to control edit permissions on the client.',
+  PRIMARY KEY (`dashboard_report_id`)
+) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+/*Table structure for table `dashboard_report_chart` */
+
+DROP TABLE IF EXISTS `dashboard_report_chart`;
+
+CREATE TABLE `dashboard_report_chart` (
+  `report_chart_id` INT(11) NOT NULL AUTO_INCREMENT,
+  `dashboard_report_id` INT(10) UNSIGNED NOT NULL,
+  `chart_id` INT(10) UNSIGNED NOT NULL,
+  `rank` TINYINT(3) UNSIGNED NOT NULL DEFAULT '1' COMMENT 'Order to display this chart in this report.',
+  `json_override` TEXT COMMENT 'Json - report-specific overrides for chart options.',
+  PRIMARY KEY (`report_chart_id`),
+  UNIQUE KEY `UC_Report_Chart` (`dashboard_report_id`,`chart_id`),
+  KEY `maptochart` (`chart_id`),
+  KEY `reporttomap` (`dashboard_report_id`),
+  CONSTRAINT `maptochart` FOREIGN KEY (`chart_id`) REFERENCES `dashboard_chart` (`chart_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `reporttomap` FOREIGN KEY (`dashboard_report_id`) REFERENCES `dashboard_report` (`dashboard_report_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

package/index.js

@@ -36,7 +36,15 @@ const handleChartTypeSpecificQuirks = (chartType, resultSet) => {
 }
 
 const loadChartData = async(mysqlConnection, { name, query: queryObject, formatting, chartWrapper, multiSeries, table, parameters, supertype, ...theRest }) => { // needs database connection
-	const { dataTable, processedFormatting } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType: chartWrapper?.chartType || supertype })
+	if (!chartWrapper) {
+		chartWrapper = {
+			chartType: supertype,
+			options: {
+				height: 450, width: 800,
+			},
+		}
+	}
+	const { dataTable, processedFormatting } = await loadDataTableAndProcessedFormatting(mysqlConnection, { query: queryObject, multiSeries, formatting, chartType: chartWrapper?.chartType })
 
 	if (chartWrapper?.chartType === 'Table') {
 		return {
@@ -75,7 +83,7 @@ const loadDataTableAndProcessedFormatting = async(mysqlConnection, { query: quer
 
 	const processedFormatting = handleFormattingTemplates(formatting)
 
-	if (chartType.toLowerCase() === 'table') {
+	if (chartType?.toLowerCase() === 'table') {
 		return { dataTable: getRactiveTableDataFormat(data, fields, processedFormatting), processedFormatting }
 	}
 
@@ -230,6 +238,7 @@ module.exports = {
 			}
 			return await loadChartData(mysqlConnection, {
 				...chart,
+				rank: reportChart.rank,
 				reportChartId: reportChart.reportChartId,
 				...reportChart.jsonOverride, // overwrites whole chart wrapper :\
 				query: parameterizeQuery(chart.query, parameterValues),

package/package.json

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