@quillsql/react 2.13.38 → 2.13.40

package/dist/esm/components/UiComponents.js

@@ -72,7 +72,7 @@ export const MemoizedButton = ({ label, onClick, disabled, icon, tooltipText, is
                         visibility: isLoading ? 'hidden' : 'visible',
                     }, children: [icon, label] })] }) }));
 };
-export const MemoizedSecondaryButton = ({ label, onClick, icon, disabled, tooltipText, }) => {
+export const MemoizedSecondaryButton = ({ label, onClick, icon, disabled, tooltipText, width, }) => {
     const [theme] = useContext(ThemeContext);
     return (_jsx(QuillToolTip, { enabled: !!tooltipText && tooltipText !== '', text: tooltipText ?? '', children: _jsxs("button", { className: "quill-secondary-button", onClick: onClick, style: {
                 fontFamily: theme?.fontFamily,
@@ -83,7 +83,7 @@ export const MemoizedSecondaryButton = ({ label, onClick, icon, disabled, toolti
                 borderRadius: '6px',
                 paddingLeft: '16px',
                 paddingRight: '16px',
-                boxSizing: 'content-box',
+                boxSizing: width ? 'border-box' : 'content-box',
                 fontSize: '14px',
                 cursor: 'pointer',
                 whiteSpace: 'nowrap',
@@ -91,6 +91,7 @@ export const MemoizedSecondaryButton = ({ label, onClick, icon, disabled, toolti
                 flexDirection: 'row',
                 alignItems: 'center',
                 gap: 6,
+                width: width,
             }, disabled: disabled, children: [_jsx("style", { children: `
       .quill-secondary-button {
         background-color: white;
@@ -101,7 +102,13 @@ export const MemoizedSecondaryButton = ({ label, onClick, icon, disabled, toolti
       .quill-secondary-button:disabled {
         opacity: 0.5;
       }    
-      ` }), icon, label] }) }));
+      ` }), icon, _jsx("span", { style: {
+                        flexGrow: 1,
+                        minWidth: 0,
+                        whiteSpace: 'nowrap',
+                        textOverflow: 'ellipsis',
+                        overflow: 'hidden',
+                    }, children: label })] }) }));
 };
 export const MemoizedHeader = ({ label }) => {
     const [theme] = useContext(ThemeContext);
@@ -484,7 +491,7 @@ export const QuillPivotColumnContainer = ({ children, }) => {
     return (_jsx("div", { style: {
             display: 'flex',
             flexDirection: 'column',
-            gap: 16,
+            gap: 32,
         }, children: children }));
 };
 export const QuillFilterContainerComponent = ({ children, }) => {

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

@@ -1 +1 @@
-{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAmE/C,eAAO,MAAM,SAAS,cACT,MAAM,mEAMd;IACD,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,GAAG,CAAC,OAAO,CAAC;IAChE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,KACA;IACD,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;CAqPvB,CAAC;AAEF,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}
+{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAiE/C,eAAO,MAAM,SAAS,cACT,MAAM,mEAMd;IACD,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,GAAG,CAAC,OAAO,CAAC;IAChE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,KACA;IACD,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;CAqPvB,CAAC;AAEF,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}

package/dist/esm/hooks/useExport.js

@@ -9,16 +9,15 @@ import { flushSync } from 'react-dom';
 import { fetchReport } from '../utils/report';
 import jsPDF from 'jspdf';
 import { quillFormat } from '../utils/valueFormatter';
-import { mergeComparisonRange } from '../utils/merge';
 async function getExportData(client, dashboardFilters, reportId, tenants, flags) {
     const minimalFilters = Object.values(dashboardFilters).length
         ? Object.values(dashboardFilters).map((filter) => {
             const newFilter = { ...filter };
             if (newFilter.filterType === 'date_range') {
                 delete newFilter['field'];
-                delete newFilter['options'];
                 delete newFilter['selectedValue'];
             }
+            delete newFilter['options'];
             return newFilter;
         })
         : [];
@@ -236,9 +235,9 @@ sectionField, } = {}) => {
 };
 function QuillCustomDocumentComponent({ report }) {
     // const [theme] = useContext(ThemeContext);
-    const chartReport = useMemo(() => {
-        return mergeComparisonRange(report);
-    }, [report]);
+    // const chartReport = useMemo(() => {
+    //   return mergeComparisonRange(report);
+    // }, [report]);
     return (_jsxs("div", { style: { display: 'flex', flexDirection: 'column', margin: '2rem' }, children: [_jsx("div", { style: { display: 'flex', flexDirection: 'row', alignItems: 'center' }, children: _jsx("h2", { style: {
                         fontSize: 18,
                         fontWeight: '600',

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

@@ -1,16 +1,21 @@
 import { ReactNode } from 'react';
 import { ColumnInternal } from '../../models/Columns';
+import { AggregationType } from '../../models/Pivot';
 interface PivotFormProps {
-    pivotRowField: any;
-    setPivotRowField: any;
-    pivotColumnField: any;
-    setPivotColumnField: any;
-    pivotValueField: any;
-    setPivotValueField: any;
-    pivotValueField2: any;
-    setPivotValueField2: any;
-    pivotAggregation: any;
-    setPivotAggregation: any;
+    pivotRowField: string | undefined;
+    setPivotRowField: (value: string | undefined) => void;
+    pivotColumnField: string | undefined;
+    setPivotColumnField: (value: string | undefined) => void;
+    pivotAggregations: Partial<{
+        aggregationType: AggregationType;
+        valueField: string;
+        valueField2: string;
+    }>[];
+    setPivotAggregations: (value: Partial<{
+        aggregationType: AggregationType;
+        valueField: string;
+        valueField2: string;
+    }>[]) => void;
     columns: ColumnInternal[];
     uniqueValues?: any;
     uniqueValuesIsLoading?: boolean;
@@ -21,6 +26,9 @@ interface PivotFormProps {
         disabled?: boolean;
         icon?: ReactNode;
     }) => JSX.Element;
+    DeleteButtonComponent: (props: {
+        onClick: () => void;
+    }) => JSX.Element;
     SelectComponent?: any;
     PivotColumnContainer?: (props: {
         children: ReactNode;
@@ -28,6 +36,6 @@ interface PivotFormProps {
     isLoading?: boolean;
     pivotHint?: string;
 }
-export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotValueField2, setPivotValueField2, pivotAggregation, setPivotAggregation, columns, uniqueValues, uniqueValuesIsLoading, onDelete, SecondaryButtonComponent, SelectComponent, PivotColumnContainer, isLoading, pivotHint, }: PivotFormProps): import("react/jsx-runtime").JSX.Element;
+export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotAggregations, setPivotAggregations, columns, uniqueValues, uniqueValuesIsLoading, onDelete, SecondaryButtonComponent, SelectComponent, PivotColumnContainer, DeleteButtonComponent, isLoading, pivotHint, }: PivotFormProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=PivotForm.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PivotForm.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotForm.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAAmC,MAAM,OAAO,CAAC;AAG1E,OAAO,EAAU,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAO9D,UAAU,cAAc;IACtB,aAAa,EAAE,GAAG,CAAC;IACnB,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QACjC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,IAAI,CAAC,EAAE,SAAS,CAAC;KAClB,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACvE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,OAAO,EACP,YAAY,EACZ,qBAAqB,EACrB,QAAQ,EACR,wBAA+C,EAC/C,eAA+C,EAC/C,oBAAgD,EAChD,SAAS,EACT,SAAS,GACV,EAAE,cAAc,2CAoLhB"}
+{"version":3,"file":"PivotForm.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotForm.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAAmC,MAAM,OAAO,CAAC;AAG1E,OAAO,EAEL,cAAc,EACf,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,UAAU,cAAc;IACtB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IACtD,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAOzD,iBAAiB,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,eAAe,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAC,CAAC,EAAE,CAAC;IAC1G,oBAAoB,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,eAAe,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAC,CAAC,EAAE,KAAK,IAAI,CAAC;IAC9H,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QACjC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,IAAI,CAAC,EAAE,SAAS,CAAC;KAClB,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,qBAAqB,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACvE,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACvE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACpB,OAAO,EACP,YAAY,EACZ,qBAAqB,EACrB,QAAQ,EACR,wBAA+C,EAC/C,eAA+C,EAC/C,oBAAgD,EAChD,qBAA4C,EAC5C,SAAS,EACT,SAAS,GACV,EAAE,cAAc,2CA0RhB"}

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

@@ -1,13 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext, useEffect, useState } from 'react';
-import { QuillPivotColumnContainer } from '../../components/UiComponents';
+import { MemoizedDeleteButton, QuillPivotColumnContainer } from '../../components/UiComponents';
 import { snakeAndCamelCaseToTitleCase } from '../../utils/textProcessing';
-import { numberFormatOptions } from '../../ChartBuilder';
+// import { numberFormatOptions } from '../../ChartBuilder';
 import { getPossiblePivotFieldOptions } from '../../utils/pivotProcessing';
 import { QuillSecondaryButton } from '../../components/ReportBuilder/ui';
 import { QuillSelectComponentWithCombo } from '../../components/QuillSelectWithCombo';
 import { ThemeContext } from '../../Context';
-export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotValueField2, setPivotValueField2, pivotAggregation, setPivotAggregation, columns, uniqueValues, uniqueValuesIsLoading, onDelete, SecondaryButtonComponent = QuillSecondaryButton, SelectComponent = QuillSelectComponentWithCombo, PivotColumnContainer = QuillPivotColumnContainer, isLoading, pivotHint, }) {
+export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotAggregations, setPivotAggregations, columns, uniqueValues, uniqueValuesIsLoading, onDelete, SecondaryButtonComponent = QuillSecondaryButton, SelectComponent = QuillSelectComponentWithCombo, PivotColumnContainer = QuillPivotColumnContainer, DeleteButtonComponent = MemoizedDeleteButton, isLoading, pivotHint, }) {
     const [allowedColumnFields, setAllowedColumnFields] = useState([]);
     const [allowedRowFields, setAllowedRowFields] = useState([]);
     const [allowedValueFields, setAllowedValueFields] = useState([]);
@@ -36,52 +36,66 @@ export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumn
                         label: snakeAndCamelCaseToTitleCase(field),
                         value: field,
                     };
-                }), disabled: isLoading, width: 200 }), _jsx(SelectComponent, { id: "pivot-row-field", label: "Value field", value: pivotValueField, onChange: (e) => {
-                    setPivotValueField(e.target.value === '' ? undefined : e.target.value);
-                }, isLoading: uniqueValuesIsLoading, options: allowedValueFields
-                    .map((field) => {
-                    return {
-                        label: snakeAndCamelCaseToTitleCase(field),
-                        value: field,
-                    };
-                })
-                    .filter((option) => {
-                    return (pivotAggregation !== 'percentage' ||
-                        pivotColumnField ||
-                        option.value !== pivotValueField2);
-                }), disabled: isLoading, width: 200 }), pivotAggregation === 'percentage' ? (_jsx(SelectComponent, { id: "pivot-row-field", label: "Total field", value: pivotValueField2, onChange: (e) => {
-                    setPivotValueField2(e.target.value === '' ? undefined : e.target.value);
-                }, isLoading: uniqueValuesIsLoading, options: allowedValueFields
-                    .map((field) => {
-                    return {
-                        label: snakeAndCamelCaseToTitleCase(field),
-                        value: field,
-                    };
-                })
-                    .filter((option) => {
-                    return (pivotAggregation !== 'percentage' ||
-                        pivotColumnField ||
-                        option.value !== pivotValueField);
-                }), disabled: isLoading, width: 200 })) : null, _jsx(SelectComponent, { id: "pivot-row-field", label: "Aggregation type", value: pivotAggregation, onChange: (e) => {
-                    if (e.target.value !== 'count' &&
-                        pivotValueField &&
-                        !numberFormatOptions.includes(columns.find((col) => col.field === pivotValueField)
-                            .format)) {
-                        setPivotValueField(null);
-                    }
-                    setPivotAggregation(e.target.value === '' ? undefined : e.target.value);
-                }, options: [
-                    ...['sum', 'average', 'count', 'max', 'min', 'percentage']
-                        .map((option) => {
-                        return { label: option, value: option };
-                    })
-                        .filter((option) => {
-                        if (!pivotValueField && option.value !== 'count') {
-                            return false;
-                        }
-                        return true;
-                    }),
-                ], disabled: isLoading, width: 200 }), pivotHint && (_jsx("div", { style: {
+                }), disabled: isLoading, width: 200 }), _jsxs("div", { style: {
+                    display: 'flex',
+                    width: '100%',
+                    flexDirection: 'column',
+                    alignItems: 'flex-start',
+                    gap: 16,
+                }, children: [pivotAggregations.map((pivotAggregation, index) => (_jsxs("div", { style: {
+                            display: 'flex',
+                            gap: 8,
+                            flexDirection: 'row',
+                        }, children: [_jsxs("div", { style: {
+                                    display: 'flex',
+                                    alignItems: 'flex-start',
+                                    flexDirection: 'column',
+                                    gap: 6,
+                                }, children: [_jsx(SelectComponent, { label: index === 0 ? 'Aggregations' : undefined, id: "pivot-row-field", value: pivotAggregation.aggregationType, onChange: (e) => {
+                                            setPivotAggregations([
+                                                ...pivotAggregations.slice(0, index),
+                                                {
+                                                    ...pivotAggregations[index],
+                                                    aggregationType: e.target.value === '' ? undefined : e.target.value,
+                                                },
+                                                ...pivotAggregations.slice(index + 1),
+                                            ]);
+                                        }, options: [
+                                            ...['sum', 'average', 'count', 'max', 'min', ...(pivotRowField ? ['percentage'] : [])]
+                                                .map((option) => {
+                                                return { label: option, value: option };
+                                            })
+                                        ], disabled: isLoading, width: 200 }), _jsx(SelectComponent, { id: "pivot-row-field", value: pivotAggregation.valueField, onChange: (e) => {
+                                            setPivotAggregations([
+                                                ...pivotAggregations.slice(0, index),
+                                                {
+                                                    ...pivotAggregations[index],
+                                                    valueField: e.target.value === '' ? undefined : e.target.value,
+                                                },
+                                                ...pivotAggregations.slice(index + 1),
+                                            ]);
+                                        }, isLoading: uniqueValuesIsLoading, options: allowedValueFields
+                                            .filter((field) => field !== pivotColumnField)
+                                            .map((field) => {
+                                            return {
+                                                label: snakeAndCamelCaseToTitleCase(field),
+                                                value: field,
+                                            };
+                                        }), disabled: isLoading, width: 200 })] }, index), index !== 0 &&
+                                _jsx(DeleteButtonComponent, { onClick: () => {
+                                        setPivotAggregations([
+                                            ...pivotAggregations.slice(0, index),
+                                            ...pivotAggregations.slice(index + 1),
+                                        ]);
+                                    } })] }, index))), _jsx(SecondaryButtonComponent, { onClick: () => {
+                            setPivotAggregations([
+                                ...pivotAggregations,
+                                {
+                                    valueField: undefined,
+                                    aggregationType: undefined,
+                                },
+                            ]);
+                        }, disabled: isLoading, label: 'Add Aggregation' })] }), pivotHint && (_jsx("div", { style: {
                     borderRadius: 8,
                     border: 'solid 1px #FFA000',
                     backgroundColor: '#FFF8E1',

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

@@ -38,14 +38,14 @@ export const PivotCard = ({ pivotTable, index, onSelectPivot, onEditPivot, Butto
                                                     whiteSpace: 'nowrap',
                                                     textOverflow: 'ellipsis',
                                                 }, children: _jsx(LabelComponent, { label: snakeAndCamelCaseToTitleCase(pivotTable.pivot.columnField) }) }, pivotTable.pivot.columnField)), !pivotTable.pivot.columnField &&
-                                                pivotTable.pivot.valueField && (_jsx("th", { style: {
+                                                pivotTable.pivot.aggregations?.[0]?.valueField && (_jsx("th", { style: {
                                                     fontWeight: 600,
                                                     paddingRight: 5,
                                                     flex: 1,
                                                     textAlign: 'left',
                                                     whiteSpace: 'nowrap',
                                                     textOverflow: 'ellipsis',
-                                                }, children: _jsx(LabelComponent, { label: snakeAndCamelCaseToTitleCase(pivotTable.pivot.valueField) }) }, pivotTable.pivot.valueField))] }) }), _jsx("tr", { style: {
+                                                }, children: _jsx(LabelComponent, { label: snakeAndCamelCaseToTitleCase(pivotTable.pivot.aggregations?.[0]?.valueField) }) }, pivotTable.pivot.aggregations?.[0]?.valueField))] }) }), _jsx("tr", { style: {
                                         paddingLeft: '2px',
                                         width: '100%',
                                     }, children: _jsx(TextComponent, { label: 'No results' }) })] })) : (_jsxs("table", { children: [_jsx("thead", { children: _jsx("tr", { children: pivotTable.columns.map((column) => (_jsx("th", { style: {
@@ -72,8 +72,9 @@ export const PivotCard = ({ pivotTable, index, onSelectPivot, onEditPivot, Butto
                                                 }, children: _jsx(TextComponent, { label: i !== 0
                                                         ? quillFormat({
                                                             value: row[column.field],
-                                                            format: pivotTable.pivot.valueFieldType ||
-                                                                defaultValueField,
+                                                            format: 
+                                                            // pivotTable.pivot.valueFieldType ||
+                                                            defaultValueField,
                                                         })
                                                         : row[column.field] }) }, i))) }, index)))] })] }))] }), _jsxs("div", { style: {
                         display: 'flex',

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

@@ -3,23 +3,27 @@ import { ButtonComponentProps } from '../../components/UiComponents';
 import { AdditionalProcessing } from '../../utils/tableProcessing';
 import { ColumnInternal } from '../../models/Columns';
 import { AxisFormat } from '../../Dashboard';
-import { Pivot, PivotData } from '../../models/Pivot';
+import { AggregationType, Pivot, PivotData } from '../../models/Pivot';
 import { QuillProviderClient } from '../../models/Client';
 import { QuillReportInternal } from '../../models/Report';
 import { DashboardDateFilter } from '../../models/Filter';
 export interface PivotModalProps {
-    pivotRowField: any;
-    setPivotRowField: any;
-    pivotColumnField: any;
-    setPivotColumnField: any;
-    pivotValueField: any;
-    setPivotValueField: any;
-    pivotValueField2: any;
-    setPivotValueField2: any;
-    pivotAggregation: any;
-    setPivotAggregation: any;
-    popUpTitle: any;
-    setPopUpTitle: any;
+    pivotRowField: string | undefined;
+    setPivotRowField: (field: string | undefined) => void;
+    pivotColumnField: string | undefined;
+    setPivotColumnField: (field: string | undefined) => void;
+    pivotAggregations: Partial<{
+        valueField?: string;
+        valueField2?: string;
+        aggregationType: AggregationType;
+    }>[];
+    setPivotAggregations: (aggregations: Partial<{
+        valueField?: string;
+        valueField2?: string;
+        aggregationType: AggregationType;
+    }>[]) => void;
+    popUpTitle: string;
+    setPopUpTitle: (title: string) => void;
     selectedTable: any;
     SelectComponent: any;
     ButtonComponent: any;
@@ -36,6 +40,12 @@ export interface PivotModalProps {
     HeaderComponent: (props: {
         label: string;
     }) => JSX.Element;
+    SubheaderComponent: (props: {
+        label: string;
+    }) => JSX.Element;
+    DeleteButtonComponent: (props: {
+        onClick: () => void;
+    }) => JSX.Element;
     LabelComponent: (props: {
         label: string;
     }) => JSX.Element;
@@ -56,13 +66,13 @@ export interface PivotModalProps {
     setSelectedPivotIndex: any;
     removePivot: any;
     selectPivot: any;
-    showUpdatePivot: any;
-    setShowUpdatePivot: any;
+    showUpdatePivot: boolean;
+    setShowUpdatePivot: (showUpdatePivot: boolean) => void;
     data: any;
     columns: ColumnInternal[];
     theme: any;
-    isOpen: any;
-    setIsOpen: any;
+    isOpen: boolean;
+    setIsOpen: (isOpen: boolean) => void;
     dateRange: any;
     createdPivots: any;
     setCreatedPivots: any;
@@ -86,7 +96,7 @@ export interface PivotModalProps {
     dashboardName?: string;
     dateFilter?: DashboardDateFilter;
 }
-export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotValueField2, setPivotValueField2, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, ErrorMessageComponent, PivotRowContainer, PivotColumnContainer, LoadingComponent, CardComponent, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText, showPivotEditButton, showEditOnPivotClick, showTrigger, pivotCountRequest, query, initialUniqueValues, uniqueValuesIsLoading, initialSelectedPivotTable, disabled, pivotRecommendationsEnabled, report, dashboardName, dateFilter, }: PivotModalProps) => import("react/jsx-runtime").JSX.Element;
+export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotAggregations, setPivotAggregations, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, ErrorMessageComponent, PivotRowContainer, PivotColumnContainer, LoadingComponent, CardComponent, HeaderComponent, SubheaderComponent, DeleteButtonComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText, showPivotEditButton, showEditOnPivotClick, showTrigger, pivotCountRequest, query, initialUniqueValues, uniqueValuesIsLoading, initialSelectedPivotTable, disabled, pivotRecommendationsEnabled, report, dashboardName, dateFilter, }: PivotModalProps) => import("react/jsx-runtime").JSX.Element;
 export declare function generatePivotTableYAxis(pivot: Pivot, cols: {
     label: string;
     field: string;
@@ -130,17 +140,4 @@ export declare function generatePivotTable({ pivot, dateBucket, dateFilter, repo
     }[] | (string | number)[];
     additionalProcessing?: AdditionalProcessing;
 }): Promise<PivotData>;
-export declare function generatePivotTableInMemory(pivot: Pivot, data: any[], dateRange: {
-    start: Date;
-    end: Date;
-} | undefined, isComparison: boolean, rowLimit?: number, compRange?: {
-    start: Date;
-    end: Date;
-} | undefined, dateBucket?: string, uniqueValues?: any): {
-    rows: any[];
-    columns: {
-        label: string;
-        field: any;
-    }[];
-};
 //# sourceMappingURL=PivotModal.d.ts.map

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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"}