@isoftdata/utility-dashboard-backend 2.4.13 → 2.4.15

package/dist/index.js

@@ -37,7 +37,7 @@ exports.formatChartDataForReport = formatChartDataForReport;
 const db = require('@isoftdata/utility-db');
 const chart_helper_js_1 = require("./chart-helper.js");
 const utility_date_time_1 = require("@isoftdata/utility-date-time");
-const formatDate = require('date-fns/format');
+const date_fns_1 = require("date-fns");
 const camelcase_1 = __importDefault(require("camelcase"));
 const mysql = require('mysql');
 const deepmerge = require('deepmerge');
@@ -156,6 +156,26 @@ const loadOptionList = async (mysqlConnection, optionListQuery, optionList = [])
     const optionsFromQuery = (optionListQuery && (await db.query(mysqlConnection, optionListQuery))) || [];
     return [...optionList, ...optionsFromQuery.map((option) => ({ ...option, fromQuery: true }))];
 };
+const isValidDateRangeValue = (value) => {
+    return [
+        'Always',
+        'Today',
+        'Yesterday',
+        'Last 7 Days',
+        'Last 30 Days',
+        'Last 90 Days',
+        'Last 365 Days',
+        'This Week',
+        'This Month',
+        'This Quarter',
+        'This Year',
+        'Previous Week',
+        'Previous Month',
+        'Previous Quarter',
+        'Previous Year',
+        'Custom',
+    ].includes(value);
+};
 async function loadOutputParameterValues(mysqlConnection, { definitionList = [], selectionList = [], forClient = false, session, site = 'store', siteIdColumn, siteNameColumn }) {
     if (!(definitionList instanceof Array) || !definitionList.length) {
         return [];
@@ -163,24 +183,21 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList = [],
     const parameterValues = [];
     for (const definition of definitionList) {
         const matchingParameterSelection = selectionList.find(param => param.name === definition.name);
-        let typedParameter;
-        const baseParameter = {
-            name: definition.name,
+        let typedParameter = {
+            ...definition,
             title: definition.title || definition.name,
-            default: definition.default,
-            value: matchingParameterSelection?.value ?? definition.default,
             queryValues: {},
         };
-        if (definition.type === 'dateRange') {
-            baseParameter.value = baseParameter.value || 'Last 30 Days';
+        if (typedParameter.type !== 'dateRange') {
+            typedParameter.value = matchingParameterSelection?.value ?? definition.default;
+        }
+        if (typedParameter.type === 'dateRange') {
+            typedParameter.value = isValidDateRangeValue(typedParameter.value) ? typedParameter.value : 'Last 30 Days';
             typedParameter = {
-                ...baseParameter,
+                ...typedParameter,
                 type: 'dateRange',
-                dates: matchingParameterSelection?.dates ?? (0, utility_date_time_1.datesFromRange)(baseParameter.value),
+                dates: matchingParameterSelection?.dates ?? (typedParameter.value !== 'Custom' ? (0, utility_date_time_1.datesFromRange)(typedParameter.value) : { from: '', to: '' }),
             };
-            if (typedParameter.value !== 'Custom') {
-                typedParameter.dates = (0, utility_date_time_1.datesFromRange)(typedParameter.value);
-            }
             if (!forClient) {
                 typedParameter.queryValues = {
                     [`${typedParameter.name}_start_date`]: typedParameter.dates.from,
@@ -190,7 +207,7 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList = [],
         }
         else if (definition.type === 'selection') {
             typedParameter = {
-                ...baseParameter,
+                ...typedParameter,
                 type: 'selection',
                 optionListQuery: definition?.optionListQuery,
                 optionList: definition?.optionList,
@@ -208,7 +225,7 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList = [],
         }
         else if (definition.type === 'siteSelection') {
             typedParameter = {
-                ...baseParameter,
+                ...typedParameter,
                 type: 'siteSelection',
                 permission: definition?.permission,
                 optionList: [],
@@ -247,23 +264,15 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList = [],
                 };
             }
         }
-        else if (definition.type === 'date') {
-            typedParameter = {
-                ...baseParameter,
-                type: 'date',
-            };
-            typedParameter.value = typedParameter.value || formatDate(new Date(), 'yyyy-MM-dd');
+        else if (typedParameter.type === 'date') {
+            typedParameter.value = typedParameter.value || (0, date_fns_1.format)(new Date(), 'yyyy-MM-dd');
             if (!forClient) {
                 typedParameter.queryValues = {
                     [typedParameter.name]: typedParameter.value,
                 };
             }
         }
-        else if (definition.type === 'session') {
-            typedParameter = {
-                ...baseParameter,
-                type: 'session',
-            };
+        else if (typedParameter.type === 'session') {
             const parameterName = (0, camelcase_1.default)(definition.name);
             typedParameter.value = (session[parameterName] ?? '').toString();
             if (!forClient) {
@@ -273,7 +282,7 @@ async function loadOutputParameterValues(mysqlConnection, { definitionList = [],
             }
         }
         else {
-            throw new Error(`Parameter type mismatch for ${baseParameter.name}`);
+            throw new Error(`Parameter type mismatch for ${typedParameter.name}`);
         }
         parameterValues.push(typedParameter);
     }
@@ -359,4 +368,4 @@ async function formatChartDataForReport(mysqlConnection, { reportParameters, cha
         throw err;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/types/parameter.d.ts

@@ -1,3 +1,4 @@
+import type { NamedDateRange } from '@isoftdata/utility-date-time';
 export interface OptionListEntry {
     id: number | string;
     name: string;
@@ -17,6 +18,7 @@ export interface DashboardReportDateParameter extends DashboardReportBaseParamet
 }
 export interface DashboardReportDateRangeParameter extends DashboardReportBaseParameter {
     type: 'dateRange';
+    value: NamedDateRange | 'Custom';
     dates: {
         from: string;
         to: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@isoftdata/utility-dashboard-backend",
-	"version": "2.4.13",
+	"version": "2.4.15",
 	"description": "A utility for formatting chart and report data to be usable by the frontend dashboard component.",
 	"main": "dist/index.js",
 	"scripts": {
@@ -25,10 +25,10 @@
 		}
 	},
 	"dependencies": {
-		"@isoftdata/utility-date-time": "^2.0.3",
+		"@isoftdata/utility-date-time": "^4.0.1",
 		"@isoftdata/utility-db": "^1.4.0",
 		"camelcase": "^6.3.0",
-		"date-fns": "^2.23.0",
+		"date-fns": "^3.6.0",
 		"deepmerge": "^4.2.2",
 		"klona": "^2.0.5",
 		"mathjs": "^11.5.0",