@quillsql/react 2.12.18 → 2.12.20

package/dist/esm/utils/dashboard.js

@@ -1,5 +1,6 @@
 import { valueFormatter } from './valueFormatter';
 import { generatePivotTable, generatePivotTableYAxis, } from '../internals/ReportBuilder/PivotModal';
+import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 const defaultDashboardItem = {
     id: '',
     name: '',
@@ -43,8 +44,12 @@ export function cleanDashboardItem(item, dashboardFilters) {
         name: item.name,
         dashboardName: item.dashboardName,
         rows: item.rows,
+        pivotRows: pivotTable ? pivotTable.rows : undefined,
+        pivotColumns: pivotTable ? pivotTable.columns : undefined,
         compareRows: item.compareRows,
-        columns: item.columns,
+        columns: item.columns.map((col) => {
+            return { ...col, label: snakeAndCamelCaseToTitleCase(col.label) };
+        }),
         chartType: item.chartType,
         dateField: item.dateField,
         pivot: item.pivot,
@@ -100,13 +105,13 @@ function formatAggragation(item, value) {
 /**
  * Extract and transform the data from itemInfo.
  */
-function getPivotTable(itemInfo, dashboardFilters, config = undefined) {
-    if (!itemInfo)
-        return [];
+function getPivotTable(report, dashboardFilters) {
+    if (!report)
+        return undefined;
     const dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType == 'date_range');
-    const pivot = itemInfo?.pivot || config?.pivot;
-    const data = itemInfo ? itemInfo : config;
-    return pivot && data?.rows
+    const pivot = report?.pivot;
+    const data = report || {};
+    return pivot && data.rows
         ? generatePivotTable(pivot, JSON.parse(JSON.stringify(data.rows)), // deep copy
         dateFilter?.startDate && dateFilter?.endDate
             ? { start: dateFilter.startDate, end: dateFilter.endDate }
@@ -117,7 +122,7 @@ function getPivotTable(itemInfo, dashboardFilters, config = undefined) {
                 end: dateFilter.comparisonRange.endDate,
             }
             : undefined)
-        : null;
+        : undefined;
 }
 /**
  * Returns the data list based on whether the table is pivoted and if there is
@@ -140,11 +145,11 @@ function extractPivotedYAxis(pivotTable, itemInfo, config = undefined) {
     if (!pivotTable)
         return itemInfo?.yAxisFields ?? [];
     const pivot = itemInfo?.pivot || config?.pivot;
-    if (!pivot.columnField)
+    if (!pivot.columnField && !pivot.rowField)
         return itemInfo?.yAxisFields ?? [];
     const yAxisFields = config ? config.yAxisFields : itemInfo?.yAxisFields;
     const pivotTableYAxis = yAxisFields
-        ? generatePivotTableYAxis(pivot, pivotTable.columns, yAxisFields?.[0]?.format)
+        ? generatePivotTableYAxis(pivot, pivotTable.columns, yAxisFields[0])
         : null;
     const fields = pivotTableYAxis
         ? pivotTableYAxis
@@ -156,7 +161,7 @@ function extractPivotedYAxis(pivotTable, itemInfo, config = undefined) {
         fields[fields.length] = {
             ...sampleField,
             field: `comparison_${sampleField.field}`,
-            label: `Comparison ${sampleField.label}`,
+            label: `comparison ${sampleField.label}`,
         };
     }
     return fields;

package/dist/esm/utils/dates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UASxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAY/C"}
+{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAY/C"}

package/dist/esm/utils/dates.js

@@ -1,14 +1,17 @@
+import { COMPARISON_OPTIONS } from '../DateRangePicker/dateRangePickerUtils';
 /**
  * Converts the comparison range label to match the date filter range if the
  * comparison range is dynamic (ie. "Previous Period" -> "Previous 6 months").
  */
 export function convertComparisonRange(primaryRange, comparisonRange) {
-    if (comparisonRange !== 'Previous Period')
-        return comparisonRange;
+    const comparisonLabel = COMPARISON_OPTIONS.find((option) => option.value === comparisonRange)
+        ?.text || '';
+    if (comparisonLabel !== 'Previous Period')
+        return comparisonLabel;
     if (!primaryRange)
-        return comparisonRange;
+        return comparisonLabel;
     if (primaryRange === 'All time')
-        return comparisonRange;
+        return comparisonLabel;
     const primaryRangeSuffix = primaryRange
         .replace('Last ', '')
         .replace('This ', '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.12.18",
+  "version": "2.12.20",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",