@quillsql/react 2.12.19 → 2.12.20

package/dist/esm/components/Dashboard/MetricComponent.js

@@ -1,40 +1,24 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useContext, useMemo } from 'react';
+import { useEffect, useState } from 'react';
 import { COMPARISON_OPTIONS } from '../../DateRangePicker/dateRangePickerUtils';
 import { valueFormatter } from '../../utils/valueFormatter';
 import ChartError from '../Chart/ChartError';
 import ChartSkeleton from '../Chart/ChartSkeleton';
-import { generatePivotTable } from '../../internals/ReportBuilder/PivotModal';
-import { DashboardFiltersContext } from '../../Context';
 import { useTheme } from '../../hooks';
+import { usePivot } from '../../hooks/useQuill';
 export default function QuillMetricComponent({ report, onClick, error, isLoading, }) {
     const theme = useTheme();
-    const { dashboardFilters } = useContext(DashboardFiltersContext);
-    const data = report;
-    const config = report;
-    const dateFilter = Object.values(dashboardFilters).find((filter) => filter.filterType == 'date_range');
-    const pivotTable = useMemo(() => {
-        const pivot = config?.pivot;
-        const data = config;
-        return pivot && data?.rows
-            ? generatePivotTable(pivot, JSON.parse(JSON.stringify(data.rows)), // deep copy
-            dateFilter
-                ? { start: dateFilter.startDate, end: dateFilter.endDate }
-                : undefined, Boolean(dateFilter?.comparisonRange?.startDate), -1, dateFilter?.comparisonRange?.startDate &&
-                dateFilter?.comparisonRange?.endDate
-                ? {
-                    start: dateFilter.comparisonRange.startDate,
-                    end: dateFilter.comparisonRange.endDate,
-                }
-                : undefined)
-            : null;
-    }, [config?.pivot]);
-    const primaryMetricLabel = data?.filtersApplied?.date_range?.preset?.label;
-    const comparisonKey = data?.filtersApplied?.date_range?.comparisonRange?.value;
+    const dateFilter = report?.filtersApplied?.find((filter) => filter.filterType == 'date_range');
+    const [rows, setRows] = useState(report?.rows ?? []);
+    const pivotData = usePivot(report.id);
+    useEffect(() => {
+        if (pivotData.data) {
+            setRows(pivotData.data.rows);
+        }
+    }, [pivotData]);
+    const primaryMetricLabel = report?.filtersApplied?.date_range?.preset?.label;
+    const comparisonKey = report?.filtersApplied?.date_range?.comparisonRange?.value;
     const comparisonLabel = COMPARISON_OPTIONS.find((opt) => opt.value === comparisonKey)?.text;
-    const rows = pivotTable?.rows ?? data.rows ?? [];
-    const isComparison = rows.length > 0 &&
-        Object.keys(rows[0]).includes(`comparison_${data.xAxisField}`);
     return (_jsx("div", { onClick: () => onClick && onClick(report), style: {
             cursor: 'pointer',
             boxSizing: 'content-box',
@@ -72,7 +56,7 @@ export default function QuillMetricComponent({ report, onClick, error, isLoading
                                         display: 'block',
                                         maxWidth: '100%',
                                         overflow: 'hidden',
-                                    }, children: report?.name }), onClick ? (_jsx("div", { style: {
+                                    }, children: report?.name }), onClick && report?.name ? (_jsx("div", { style: {
                                         fontFamily: theme.fontFamily,
                                         color: theme.primaryTextColor,
                                         boxSizing: 'content-box',
@@ -85,7 +69,7 @@ export default function QuillMetricComponent({ report, onClick, error, isLoading
                                     }, children: 'view report →' })) : null] }), isLoading ? (_jsx(ChartSkeleton, { containerStyle: {
                                 maxHeight: '78px',
                                 height: '100%',
-                            } })) : error ? (_jsx(ChartError, {})) : rows?.length === 0 || rows[0][data.xAxisField] === null ? (_jsx("div", { style: {
+                            } })) : error ? (_jsx(ChartError, {})) : rows?.length === 0 || rows[0][report.xAxisField] === null ? (_jsx("div", { style: {
                                 display: 'flex',
                                 flex: '1 0 auto',
                                 height: '100%',
@@ -124,17 +108,17 @@ export default function QuillMetricComponent({ report, onClick, error, isLoading
                                             marginRight: 'auto',
                                         }, children: [_jsx("span", { children: rows.length > 0 &&
                                                     valueFormatter({
-                                                        value: rows[0][data.xAxisField] ?? 0,
-                                                        field: data.xAxisField,
+                                                        value: rows[0][report.xAxisField] ?? 0,
+                                                        field: report.xAxisField,
                                                         fields: [
                                                             {
-                                                                field: data.xAxisField,
-                                                                format: data.xAxisFormat,
-                                                                label: data.xAxisLabel,
-                                                                _id: data.id || 'dummy',
+                                                                field: report.xAxisField,
+                                                                format: report.xAxisFormat,
+                                                                label: report.xAxisLabel,
+                                                                _id: report.id || 'dummy',
                                                             },
                                                         ],
-                                                    }) }), isComparison && (_jsx("span", { style: {
+                                                    }) }), dateFilter?.comparison && (_jsx("span", { style: {
                                                     fontSize: 13,
                                                     fontWeight: '500',
                                                     fontFamily: theme?.fontFamily,
@@ -142,7 +126,7 @@ export default function QuillMetricComponent({ report, onClick, error, isLoading
                                                     marginLeft: 2,
                                                 }, children: primaryMetricLabel
                                                     ? `in ${primaryMetricLabel.toLowerCase()}`
-                                                    : 'this period' }))] }), isComparison && (_jsxs("div", { style: {
+                                                    : 'this period' }))] }), dateFilter?.comparison && (_jsxs("div", { style: {
                                             display: 'flex',
                                             gap: 4,
                                             alignItems: 'baseline',
@@ -155,14 +139,14 @@ export default function QuillMetricComponent({ report, onClick, error, isLoading
                                                     color: theme?.secondaryTextColor,
                                                 }, children: rows.length > 0 &&
                                                     valueFormatter({
-                                                        value: rows[0][`comparison_${data.xAxisField}`] ?? 0,
-                                                        field: data.xAxisField,
+                                                        value: rows[0][`comparison_${report.xAxisField}`] ?? 0,
+                                                        field: report.xAxisField,
                                                         fields: [
                                                             {
-                                                                field: data.xAxisField,
-                                                                format: data.xAxisFormat,
-                                                                label: data.xAxisLabel,
-                                                                _id: data.id || 'dummy',
+                                                                field: report.xAxisField,
+                                                                format: report.xAxisFormat,
+                                                                label: report.xAxisLabel,
+                                                                _id: report.id || 'dummy',
                                                             },
                                                         ],
                                                     }) }), _jsx("span", { style: {

package/dist/esm/components/Dashboard/TableComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAInD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,GACb,EAAE,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAuLhC"}
+{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAKnD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,GACb,EAAE,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAiJhC"}

package/dist/esm/components/Dashboard/TableComponent.js

@@ -1,62 +1,34 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useContext, useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';
 import QuillTable from '../QuillTable';
-import { generatePivotTable } from '../../internals/ReportBuilder/PivotModal';
-import { DashboardFiltersContext } from '../../Context';
 import { quillFormat } from '../../utils/valueFormatter';
 import ChartSkeleton from '../Chart/ChartSkeleton';
 import ChartError from '../Chart/ChartError';
 import { useTheme } from '../../hooks';
 import { useExport } from '../../hooks/useExport';
+import { usePivot } from '../../hooks/useQuill';
 export default function QuillTableComponent({ report, onClick, isLoading, error, onPageChange, onSortChange, }) {
     const theme = useTheme();
-    const { dashboardFilters } = useContext(DashboardFiltersContext);
     const [initialLoad, setInitialLoad] = useState(true);
     const { downloadCSV } = useExport(report?.id);
+    const pivotData = usePivot(report.id);
+    const [rows, setRows] = useState(report?.rows ?? []);
+    const [columns, setColumns] = useState(report?.columns ?? report?.yAxisFields ?? []);
+    useEffect(() => {
+        if (report.pivot !== null && pivotData.data) {
+            setRows(pivotData.data.rows);
+            setColumns(pivotData.data.columns);
+        }
+        else {
+            setRows(report?.rows ?? []);
+            setColumns(report?.columns ?? report?.yAxisFields ?? []);
+        }
+    }, [pivotData, report]);
     useEffect(() => {
         if (!isLoading) {
             setInitialLoad(false);
         }
     }, [isLoading]);
-    const config = report;
-    const data = report;
-    const dateFilter = Object.values(dashboardFilters).find((filter) => filter.filterType == 'date_range');
-    const pivotTable = useMemo(() => {
-        const pivot = config?.pivot;
-        const data = config;
-        return pivot && data?.rows
-            ? generatePivotTable(pivot, JSON.parse(JSON.stringify(data.rows)), // deep copy
-            dateFilter
-                ? { start: dateFilter.startDate, end: dateFilter.endDate }
-                : undefined, Boolean(dateFilter?.comparisonRange?.startDate), -1, dateFilter?.comparisonRange?.startDate &&
-                dateFilter?.comparisonRange?.endDate
-                ? {
-                    start: dateFilter.comparisonRange.startDate,
-                    end: dateFilter.comparisonRange.endDate,
-                }
-                : undefined)
-            : null;
-    }, [config?.pivot]);
-    const columns = pivotTable?.columns ?? data.columns ?? data.yAxisFields;
-    const rows = pivotTable?.rows ?? data.rows ?? [];
-    // FOR PIVOTS - ADD THE RIGHT FIELD TYPE FOR THE VALUE COLUMNS
-    const valueFieldType = config?.pivot?.valueFieldType || undefined;
-    // Walk through data.columns and pick off the labels from yAxisFields
-    columns.forEach((col, index) => {
-        // ADD THE RIGHT FIELD TYPE FOR THE VALUE COLUMNS
-        if ((valueFieldType ||
-            ['min', 'max'].includes(config?.pivot?.aggregationType || '')) &&
-            index !== 0) {
-            col.format = valueFieldType || 'two_decimal_places';
-        }
-        if (!data.yAxisFields)
-            return;
-        const matchingCol = data.yAxisFields.find((c) => c.field === col.field);
-        if (!col.label && matchingCol) {
-            col.label = matchingCol.label;
-            col.format = matchingCol.format;
-        }
-    });
     const formattedRows = rows.map((row) => {
         return columns.reduce((formattedRow, column) => {
             // Apply the format function to each field in the row
@@ -69,14 +41,15 @@ export default function QuillTableComponent({ report, onClick, isLoading, error,
         }, {});
     });
     let numberOfRows = undefined;
-    if (data.compareRows &&
-        data.compareRows[0] &&
-        (data.compareRows[0].count || data.compareRows[0].COUNT)) {
-        if (data.compareRows[0].COUNT) {
-            numberOfRows = parseInt(data.compareRows[0].COUNT);
+    if (report &&
+        report.compareRows &&
+        report.compareRows[0] &&
+        (report.compareRows[0].count || report.compareRows[0].COUNT)) {
+        if (report.compareRows[0].COUNT) {
+            numberOfRows = parseInt(report.compareRows[0].COUNT);
         }
-        else if (data.compareRows[0].count) {
-            numberOfRows = parseInt(data.compareRows[0].count);
+        else if (report.compareRows[0].count) {
+            numberOfRows = parseInt(report.compareRows[0].count);
         }
     }
     return (_jsxs("div", { style: { cursor: 'pointer' }, onClick: () => onClick && onClick(report), children: [_jsxs("div", { style: {
@@ -98,7 +71,7 @@ export default function QuillTableComponent({ report, onClick, isLoading, error,
                             display: 'block',
                             maxWidth: '100%',
                             overflow: 'hidden',
-                        }, children: report?.name }), onClick ? (_jsx("div", { style: {
+                        }, children: report?.name }), onClick && report?.name ? (_jsx("div", { style: {
                             fontFamily: theme.fontFamily,
                             color: theme.primaryTextColor,
                             boxSizing: 'content-box',
@@ -114,7 +87,7 @@ export default function QuillTableComponent({ report, onClick, isLoading, error,
                 } })) : error ? (_jsx(ChartError, { containerStyle: {
                     width: '100%',
                     height: '400px',
-                } })) : (_jsx(QuillTable, { isLoading: isLoading, rows: formattedRows ?? [], numberOfRows: numberOfRows, columns: columns ?? data.yAxisFields, rowsPerPage: 10, containerStyle: {
+                } })) : (_jsx(QuillTable, { isLoading: isLoading, rows: formattedRows ?? [], numberOfRows: numberOfRows, columns: columns, rowsPerPage: 10, containerStyle: {
                     width: '100%',
                     height: '400px',
                 }, downloadCSV: () => {
@@ -123,5 +96,5 @@ export default function QuillTableComponent({ report, onClick, isLoading, error,
                     onPageChange && onPageChange(page);
                 }, onSortChange: (sort) => {
                     onSortChange && onSortChange(sort);
-                }, currentPage: data.page, sort: data.sort }))] }, report?.name));
+                }, currentPage: report?.page, sort: report?.sort }))] }, report?.name));
 }

package/dist/esm/hooks/useDashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,kBAAmB,MAAM;;;;qCASF,MAAM;CAiDrD,CAAC"}
+{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,kBAAmB,MAAM;;;;qCASF,MAAM;CAkDrD,CAAC"}

package/dist/esm/hooks/useDashboard.js

@@ -13,9 +13,9 @@ export const useDashboard = (dashboardName) => {
         getDashboards(overrideDashboardName ?? dashboardName);
     };
     async function getDashboards(dashboardName) {
+        setIsLoading(true);
         if (dashboardName === null || dashboardName === undefined)
             return;
-        setIsLoading(true);
         const { databaseType, publicKey, customerId } = client;
         try {
             const searchParams = new URLSearchParams({
@@ -34,14 +34,15 @@ export const useDashboard = (dashboardName) => {
             };
             const resp = await getData(client, `dashconfig?${searchParams}`, 'omit', hostedBody, null, 'GET');
             setData(resp);
+            setIsLoading(false);
             setError(null);
         }
         catch (error) {
             setError(null);
+            setIsLoading(false);
             setError(error);
             console.error('Error fetching data:', error);
         }
-        setIsLoading(false);
     }
     useEffect(() => {
         getDashboards(dashboardName);

package/dist/esm/hooks/useQuill.d.ts

@@ -43,5 +43,12 @@ export declare const useQuill: (reportId?: string) => {
     loading: boolean;
     error: string | null;
 };
+export declare const usePivot: (reportId?: string) => {
+    data: {
+        rows: any[];
+        columns: Column[];
+    } | undefined;
+    error: string | undefined;
+};
 export {};
 //# sourceMappingURL=useQuill.d.ts.map

package/dist/esm/hooks/useQuill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAWA,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,IAAI;CA0FrB,CAAC"}
+{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAWA,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,IAAI;CAkGrB,CAAC;AAaF,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS;WAC7C,MAAM,GAAG,SAAS;CA4C1B,CAAC"}

package/dist/esm/hooks/useQuill.js

@@ -24,6 +24,10 @@ export const useQuill = (reportId) => {
                     return;
                 }
                 try {
+                    const specificDashboardFilter = dashboardFilters.filter((f) => f &&
+                        reportId &&
+                        dashboard[definedReportId] &&
+                        dashboard[definedReportId].dashboardName === f.dashboardName);
                     setLoading(true);
                     const hostedBody = {
                         metadata: {
@@ -32,7 +36,7 @@ export const useQuill = (reportId) => {
                             clientId: client.publicKey,
                             task: 'item',
                             filters: [
-                                ...Object.values(dashboardFilters).filter((elem) => elem
+                                ...Object.values(specificDashboardFilter).filter((elem) => elem
                                     ?.dashboardName === data?.dashboardName),
                             ],
                             databaseType: client?.databaseType,
@@ -41,7 +45,7 @@ export const useQuill = (reportId) => {
                     };
                     const cloudBody = {
                         id: reportId,
-                        filters: [...Object.values(dashboardFilters)],
+                        filters: [...Object.values(specificDashboardFilter)],
                     };
                     const resp = await getData(client, 'itempost', 'same-origin', hostedBody, cloudBody);
                     processFilterErrorList(resp);
@@ -57,7 +61,7 @@ export const useQuill = (reportId) => {
                             dispatch({
                                 type: 'UPDATE_DASHBOARD_ITEM',
                                 id: reportId,
-                                data: { ...resp, filtersApplied: dashboardFilters },
+                                data: { ...resp, filtersApplied: specificDashboardFilter },
                             });
                         }
                     }
@@ -94,3 +98,37 @@ function stringifyIfObject(e) {
     }
     return e; // returns the input as is for other types
 }
+export const usePivot = (reportId) => {
+    const { dashboard } = useContext(DashboardContext);
+    const [data, setData] = useState(undefined);
+    const [error, setError] = useState(undefined);
+    useEffect(() => {
+        if (!reportId ||
+            !dashboard ||
+            !dashboard[reportId] ||
+            !dashboard[reportId].pivotColumns ||
+            !dashboard[reportId].pivotRows) {
+            setError('No data found');
+            return;
+        }
+        setData({
+            rows: dashboard[reportId].pivotRows,
+            columns: dashboard[reportId].pivotColumns
+                .map((col, index) => {
+                if (index === 0) {
+                    return {
+                        ...col,
+                        format: 'string',
+                    };
+                }
+                return {
+                    ...col,
+                    format: dashboard[reportId].yAxisFields[0].format,
+                };
+            })
+                .filter((col) => dashboard[reportId].chartType !== 'table' ||
+                !col.field.startsWith('comparison_')),
+        });
+    }, [dashboard, reportId]);
+    return { data, error };
+};

package/dist/esm/index.d.ts

@@ -14,7 +14,7 @@ export { default as ChartEditor } from './ChartEditor';
 export type { ChartEditorProps } from './ChartEditor';
 export { quillFormat as format } from './utils/valueFormatter';
 export { useDashboard } from './hooks/useDashboard';
-export { useQuill } from './hooks/useQuill';
+export { useQuill, usePivot } from './hooks/useQuill';
 export { useExport } from './hooks/useExport';
 export { useMemoizedRows } from './hooks/useFormat';
 export { downloadCSV } from './utils/csv';

package/dist/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EACV,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,UAAU,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,mBAAmB,EACnB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,0BAA0B,EAC1B,6BAA6B,EAC7B,4BAA4B,EAC5B,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EACV,oBAAoB,EACpB,qBAAqB,EACrB,SAAS,GACV,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EACV,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,UAAU,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,mBAAmB,EACnB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,0BAA0B,EAC1B,6BAA6B,EAC7B,4BAA4B,EAC5B,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EACV,oBAAoB,EACpB,qBAAqB,EACrB,SAAS,GACV,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC"}

package/dist/esm/index.js

@@ -8,7 +8,7 @@ export { default as ReportBuilder } from './ReportBuilder';
 export { default as ChartEditor } from './ChartEditor';
 export { quillFormat as format } from './utils/valueFormatter';
 export { useDashboard } from './hooks/useDashboard';
-export { useQuill } from './hooks/useQuill';
+export { useQuill, usePivot } from './hooks/useQuill';
 export { useExport } from './hooks/useExport';
 export { useMemoizedRows } from './hooks/useFormat';
 export { downloadCSV } from './utils/csv';

package/dist/esm/internals/ReportBuilder/PivotList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PivotList.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotList.tsx"],"names":[],"mappings":"AAKA,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,eAAe,EAAE,GAAG,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,cAAc,EAAE,GAAG,CAAC;IACpB,aAAa,EAAE,GAAG,CAAC;IACnB,eAAe,EAAE,GAAG,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,SAAS,2MAgBnB,cAAc,4CA4MhB,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,sBAAsB,EAAE,GAAG,EAAE,CAAC;IAC9B,kBAAkB,EAAE,GAAG,EAAE,CAAC;IAC1B,wBAAwB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9D,oBAAoB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,KAAK,EAAE,GAAG,CAAC;IACX,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sBAAsB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACnE,kBAAkB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC/D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,cAAc,EAAE,GAAG,CAAC;IACpB,aAAa,EAAE,GAAG,CAAC;IACnB,eAAe,EAAE,GAAG,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,SAAS,mSAgBnB,cAAc,4CAoDhB,CAAC"}
+{"version":3,"file":"PivotList.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotList.tsx"],"names":[],"mappings":"AAQA,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,eAAe,EAAE,GAAG,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,cAAc,EAAE,GAAG,CAAC;IACpB,aAAa,EAAE,GAAG,CAAC;IACnB,eAAe,EAAE,GAAG,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,SAAS,2MAgBnB,cAAc,4CA8MhB,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,sBAAsB,EAAE,GAAG,EAAE,CAAC;IAC9B,kBAAkB,EAAE,GAAG,EAAE,CAAC;IAC1B,wBAAwB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9D,oBAAoB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,KAAK,EAAE,GAAG,CAAC;IACX,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sBAAsB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACnE,kBAAkB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC/D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,cAAc,EAAE,GAAG,CAAC;IACpB,aAAa,EAAE,GAAG,CAAC;IACnB,eAAe,EAAE,GAAG,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,SAAS,mSAgBnB,cAAc,4CAoDhB,CAAC"}

package/dist/esm/internals/ReportBuilder/PivotList.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { quillFormat } from '../../utils/valueFormatter';
-import { snakeAndCamelCaseToTitleCase } from '../../utils/textProcessing';
+import { snakeAndCamelCaseToTitleCase, } from '../../utils/textProcessing';
 import { QuillCard } from '../../components/QuillCard';
 export const PivotCard = ({ pivotTable, theme, index, onSelectPivot, selectedPivotIndex, onEditPivot, ButtonComponent, showEdit = false, clickable = true, onClose, minHeight = 0, CardComponent = QuillCard, LabelComponent, TextComponent, HeaderComponent, }) => {
     const maxRowsInPivotPeak = 5;

package/dist/esm/internals/ReportBuilder/PivotModal.d.ts

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
 import { ButtonComponentProps } from '../../components/UiComponents';
 import { ColumnInternal } from '../../models/Columns';
+import { AxisFormat } from '../../Dashboard';
 export interface Pivot {
     rowField: string;
     rowFieldType: string;
@@ -91,11 +92,15 @@ export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumn
 export declare function generatePivotTableYAxis(pivot: Pivot, cols: {
     label: string;
     field: string;
-}[], format: string): {
+}[], yAxisField: {
     field: string;
     label: string;
-    format: string;
-}[] | null;
+    format: AxisFormat;
+}): {
+    field: string;
+    label: string;
+    format: AxisFormat;
+}[];
 export declare function generatePivotTitle(pivot: Pivot): string;
 export declare function isDateField(fieldType: string): boolean;
 export declare function generatePivotTable(pivot: Pivot, data: any, dateRange: {

package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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"}

package/dist/esm/internals/ReportBuilder/PivotModal.js

@@ -498,11 +498,25 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                                 gap: 8,
                                             }, children: [_jsx(SecondaryButtonComponent, { label: "Regenerate", onClick: refreshPivots, icon: _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", fill: "currentColor", style: { width: 16, height: 16 }, children: _jsx("path", { fillRule: "evenodd", d: "M9 4.5a.75.75 0 0 1 .721.544l.813 2.846a3.75 3.75 0 0 0 2.576 2.576l2.846.813a.75.75 0 0 1 0 1.442l-2.846.813a3.75 3.75 0 0 0-2.576 2.576l-.813 2.846a.75.75 0 0 1-1.442 0l-.813-2.846a3.75 3.75 0 0 0-2.576-2.576l-2.846-.813a.75.75 0 0 1 0-1.442l2.846-.813A3.75 3.75 0 0 0 7.466 7.89l.813-2.846A.75.75 0 0 1 9 4.5ZM18 1.5a.75.75 0 0 1 .728.568l.258 1.036c.236.94.97 1.674 1.91 1.91l1.036.258a.75.75 0 0 1 0 1.456l-1.036.258c-.94.236-1.674.97-1.91 1.91l-.258 1.036a.75.75 0 0 1-1.456 0l-.258-1.036a2.625 2.625 0 0 0-1.91-1.91l-1.036-.258a.75.75 0 0 1 0-1.456l1.036-.258a2.625 2.625 0 0 0 1.91-1.91l.258-1.036A.75.75 0 0 1 18 1.5ZM16.5 15a.75.75 0 0 1 .712.513l.394 1.183c.15.447.5.799.948.948l1.183.395a.75.75 0 0 1 0 1.422l-1.183.395c-.447.15-.799.5-.948.948l-.395 1.183a.75.75 0 0 1-1.422 0l-.395-1.183a1.5 1.5 0 0 0-.948-.948l-1.183-.395a.75.75 0 0 1 0-1.422l1.183-.395c.447-.15.799-.5.948-.948l.395-1.183A.75.75 0 0 1 16.5 15Z", clipRule: "evenodd" }) }) }), _jsx(SecondaryButtonComponent, { label: "Create pivot +", onClick: () => onEditPivot({}, null) })] }), isLoading ? (_jsx(LoadingComponent, {})) : (_jsx("div", { children: _jsx(PivotList, { recommendedPivotTables: recommendedPivotTables, createdPivotTables: createdPivotTables, theme: theme, onSelectRecommendedPivot: onSelectRecommendedPivot, onSelectCreatedPivot: onSelectCreatedPivot, selectedPivotIndex: selectedPivotIndex, selectedPivotType: selectedPivotType, ButtonComponent: ButtonComponent, HeaderComponent: HeaderComponent, onEditRecommendedPivot: onEditRecommendedPivot, onEditCreatedPivot: onEditPivot, showPivotEditButton: showPivotEditButton, LabelComponent: LabelComponent, TextComponent: TextComponent, CardComponent: CardComponent }) }))] })) })) }) }) })] }) }));
 };
-export function generatePivotTableYAxis(pivot, cols, format) {
-    if (!pivot.columnField) {
-        return null;
+export function generatePivotTableYAxis(pivot, cols, yAxisField) {
+    // For count aggregations, use 'count' for the label
+    if (pivot?.aggregationType === 'count') {
+        return [
+            {
+                field: pivot.valueField || 'count',
+                label: yAxisField.label,
+                format: yAxisField.format,
+            },
+        ];
     }
-    return cols.slice(1).map(({ field, label }) => ({ field, label, format }));
+    // otherwise use the default (ie. the field label)
+    return [
+        {
+            field: pivot.valueField,
+            label: yAxisField.label,
+            format: yAxisField.format,
+        },
+    ];
 }
 export function generatePivotTitle(pivot) {
     if (pivot.rowField && !pivot.valueField) {
@@ -1015,11 +1029,7 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
                     ? 'Null'
                     : column === false
                         ? 'False'
-                        : pivot.aggregationType === 'count' &&
-                            !pivot.columnField &&
-                            index === 1
-                            ? 'Count'
-                            : snakeAndCamelCaseToTitleCase(columnName),
+                        : snakeAndCamelCaseToTitleCase(columnName).replace('Comparison', 'comparison'),
                 field: columnName,
             };
         }),
@@ -1036,9 +1046,9 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
                             : pivot.aggregationType === 'count' &&
                                 !pivot.columnField &&
                                 index === 1
-                                ? 'Comparison Count'
+                                ? `comparison Count`
                                 : isDateField(pivot.columnFieldType || '')
-                                    ? COL_DATE_MAP[getDateString(column, dateRange, dateBucket)] ?? 'Comparison'
+                                    ? COL_DATE_MAP[getDateString(column, dateRange, dateBucket)] ?? 'comparison'
                                     : `comparison ${snakeAndCamelCaseToTitleCase(columnName)}`,
                     field: `comparison_${columnName}`,
                 };
@@ -1121,6 +1131,8 @@ function valueFieldAggregation(data, valueField, aggregationType, isComparison)
     }
     return {
         rows: [row],
-        columns: [{ label: snakeAndCamelCaseToTitleCase(valueField), field: valueField }],
+        columns: [
+            { label: snakeAndCamelCaseToTitleCase(valueField), field: valueField },
+        ],
     };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../src/utils/aggregate.tsx"],"names":[],"mappings":"AA2DA,wBAAgB,qBAAqB,CAAC,IAAI,KAAA,EAAE,SAAS,KAAA,UAuCpD;AAED,wBAAgB,UAAU,CAAC,aAAa,KAAA,EAAE,YAAY,KAAA,EAAE,UAAU,KAAA,OAmJjE;AACD,wBAAgB,SAAS,CAAC,aAAa,KAAA,EAAE,YAAY,KAAA,EAAE,UAAU,KAAA,OAqRhE"}
+{"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../src/utils/aggregate.tsx"],"names":[],"mappings":"AA2DA,wBAAgB,qBAAqB,CAAC,IAAI,KAAA,EAAE,SAAS,KAAA,UAuCpD;AAED,wBAAgB,UAAU,CAAC,aAAa,KAAA,EAAE,YAAY,KAAA,EAAE,UAAU,KAAA,OA+IjE;AACD,wBAAgB,SAAS,CAAC,aAAa,KAAA,EAAE,YAAY,KAAA,EAAE,UAAU,KAAA,OAmRhE"}

package/dist/esm/utils/aggregate.js

@@ -113,10 +113,6 @@ export function aggregate2(dashboardItem, bucketFields, dateFilter) {
             [stringField]: str,
             [dashboardItem.yAxisFields[0].field]: aggregation[str][dashboardItem.yAxisFields[0].field].toFixed(2),
         }));
-        // } else {
-        //   console.log('should be in here');
-        //   aggregatedArray = [];
-        // }
         return {
             ...dashboardItem,
             xAxisField: stringField,

package/dist/esm/utils/dashboard.d.ts

@@ -1,4 +1,4 @@
-import { QuillReport } from '../Dashboard';
+import { QuillReportInternal } from '../Dashboard';
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
  * the dashboard item so that we aren't exposing unnecessary details to the
@@ -8,5 +8,5 @@ import { QuillReport } from '../Dashboard';
  */
 export declare function cleanDashboardItem(item: {
     [key: string]: any;
-} | undefined, dashboardFilters: any): QuillReport;
+} | undefined, dashboardFilters: any): QuillReportInternal;
 //# sourceMappingURL=dashboard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,MAAM,cAAc,CAAC;AA6BvD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,GACpB,WAAW,CAsCb"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA6B5E;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,GACpB,mBAAmB,CA0CrB"}