@quillsql/react 2.11.16 → 2.11.18

package/dist/cjs/internals/ReportBuilder/PivotList.d.ts

@@ -1,4 +1,5 @@
-export declare const PivotCard: ({ pivotTable, theme, index, onSelectPivot, selectedPivotIndex, onEditPivot, ButtonComponent, showEdit, clickable, onClose, minHeight, LabelComponent, TextComponent, HeaderComponent, }: {
+import { QuillCard } from '../../components/QuillCard';
+export declare const PivotCard: ({ pivotTable, theme, index, onSelectPivot, selectedPivotIndex, onEditPivot, ButtonComponent, showEdit, clickable, onClose, minHeight, CardComponent, LabelComponent, TextComponent, HeaderComponent, }: {
     pivotTable: any;
     theme: any;
     index: any;
@@ -10,11 +11,12 @@ export declare const PivotCard: ({ pivotTable, theme, index, onSelectPivot, sele
     clickable?: boolean | undefined;
     onClose?: (() => void) | undefined;
     minHeight?: number | undefined;
+    CardComponent?: typeof QuillCard | undefined;
     LabelComponent: any;
     TextComponent: any;
     HeaderComponent: any;
 }) => import("react/jsx-runtime").JSX.Element;
-export declare const PivotList: ({ recommendedPivotTables, createdPivotTables, onSelectRecommendedPivot, onSelectCreatedPivot, theme, selectedPivotIndex, selectedPivotType, ButtonComponent, showCreatePivot, onEditRecommendedPivot, onEditCreatedPivot, showPivotEditButton, LabelComponent, TextComponent, HeaderComponent, }: {
+export declare const PivotList: ({ recommendedPivotTables, createdPivotTables, onSelectRecommendedPivot, onSelectCreatedPivot, theme, selectedPivotIndex, selectedPivotType, ButtonComponent, showCreatePivot, onEditRecommendedPivot, onEditCreatedPivot, showPivotEditButton, CardComponent, LabelComponent, TextComponent, HeaderComponent, }: {
     recommendedPivotTables: any;
     createdPivotTables: any;
     onSelectRecommendedPivot: any;
@@ -27,6 +29,7 @@ export declare const PivotList: ({ recommendedPivotTables, createdPivotTables, o
     onEditRecommendedPivot: any;
     onEditCreatedPivot: any;
     showPivotEditButton?: boolean | undefined;
+    CardComponent?: typeof QuillCard | undefined;
     LabelComponent: any;
     TextComponent: any;
     HeaderComponent: any;

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

@@ -1 +1 @@
-{"version":3,"file":"PivotList.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotList.tsx"],"names":[],"mappings":"AAMA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;6CA8MrB,CAAC;AAEF,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;6CAmFrB,CAAC"}
+{"version":3,"file":"PivotList.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotList.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;6CAiNrB,CAAC;AAEF,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;6CAqFrB,CAAC"}

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

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PivotList = exports.PivotCard = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const QuillCard_1 = require("../../components/QuillCard");
+// @ts-nocheck
 const valueFormatter_1 = require("../../utils/valueFormatter");
 const textProcessing_1 = require("../../utils/textProcessing");
-const PivotCard = ({ pivotTable, theme, index, onSelectPivot, selectedPivotIndex, onEditPivot, ButtonComponent, showEdit = false, clickable = true, onClose = () => { }, minHeight = 0, LabelComponent, TextComponent, HeaderComponent, }) => {
+const QuillCard_1 = require("../../components/QuillCard");
+const PivotCard = ({ pivotTable, theme, index, onSelectPivot, selectedPivotIndex, onEditPivot, ButtonComponent, showEdit = false, clickable = true, onClose = () => { }, minHeight = 0, CardComponent = QuillCard_1.QuillCard, LabelComponent, TextComponent, HeaderComponent, }) => {
     const maxRowsInPivotPeak = 5;
-    return ((0, jsx_runtime_1.jsx)(QuillCard_1.QuillCard, { theme: theme, onClick: () => onSelectPivot(pivotTable.pivot, index), isSelected: index === selectedPivotIndex, clickable: clickable, onClose: onClose, minHeight: minHeight, children: (0, jsx_runtime_1.jsxs)("div", { style: {
+    return ((0, jsx_runtime_1.jsx)(CardComponent, { onClick: () => onSelectPivot(pivotTable.pivot, index), onDelete: onClose, children: (0, jsx_runtime_1.jsxs)("div", { style: {
                 fontSize: 14,
                 display: 'flex',
                 flexDirection: 'column',
@@ -21,21 +22,21 @@ const PivotCard = ({ pivotTable, theme, index, onSelectPivot, selectedPivotIndex
                                 whiteSpace: 'nowrap',
                                 textOverflow: 'ellipsis',
                                 paddingBottom: 6,
-                            }, children: (0, jsx_runtime_1.jsx)(HeaderComponent, { children: pivotTable.pivot.title }) })), pivotTable.columns.length === 0 ? ((0, jsx_runtime_1.jsxs)("table", { children: [(0, jsx_runtime_1.jsx)("thead", { children: (0, jsx_runtime_1.jsxs)("tr", { children: [pivotTable.pivot.rowField && ((0, jsx_runtime_1.jsx)("th", { style: {
+                            }, children: (0, jsx_runtime_1.jsx)(HeaderComponent, { label: pivotTable.pivot.title }) })), pivotTable.columns.length === 0 ? ((0, jsx_runtime_1.jsxs)("table", { children: [(0, jsx_runtime_1.jsx)("thead", { children: (0, jsx_runtime_1.jsxs)("tr", { children: [pivotTable.pivot.rowField && ((0, jsx_runtime_1.jsx)("th", { style: {
                                                     fontWeight: 600,
                                                     paddingRight: 5,
                                                     flex: 1,
                                                     textAlign: 'left',
                                                     whiteSpace: 'nowrap',
                                                     textOverflow: 'ellipsis',
-                                                }, children: (0, jsx_runtime_1.jsx)(LabelComponent, { children: (0, textProcessing_1.snakeCaseToTitleCase)(pivotTable.pivot.rowField) }) }, pivotTable.pivot.rowField)), pivotTable.pivot.columnField && ((0, jsx_runtime_1.jsx)("th", { style: {
+                                                }, children: (0, jsx_runtime_1.jsx)(LabelComponent, { label: (0, textProcessing_1.snakeCaseToTitleCase)(pivotTable.pivot.rowField) }) }, pivotTable.pivot.rowField)), pivotTable.pivot.columnField && ((0, jsx_runtime_1.jsx)("th", { style: {
                                                     fontWeight: 600,
                                                     paddingRight: 5,
                                                     flex: 1,
                                                     textAlign: 'left',
                                                     whiteSpace: 'nowrap',
                                                     textOverflow: 'ellipsis',
-                                                }, children: (0, jsx_runtime_1.jsx)(LabelComponent, { children: (0, textProcessing_1.snakeCaseToTitleCase)(pivotTable.pivot.columnField) }) }, pivotTable.pivot.columnField)), !pivotTable.pivot.columnField &&
+                                                }, children: (0, jsx_runtime_1.jsx)(LabelComponent, { label: (0, textProcessing_1.snakeCaseToTitleCase)(pivotTable.pivot.columnField) }) }, pivotTable.pivot.columnField)), !pivotTable.pivot.columnField &&
                                                 pivotTable.pivot.valueField && ((0, jsx_runtime_1.jsx)("th", { style: {
                                                     fontWeight: 600,
                                                     paddingRight: 5,
@@ -43,24 +44,24 @@ const PivotCard = ({ pivotTable, theme, index, onSelectPivot, selectedPivotIndex
                                                     textAlign: 'left',
                                                     whiteSpace: 'nowrap',
                                                     textOverflow: 'ellipsis',
-                                                }, children: (0, jsx_runtime_1.jsx)(LabelComponent, { children: (0, textProcessing_1.snakeCaseToTitleCase)(pivotTable.pivot.valueField) }) }, pivotTable.pivot.valueField))] }) }), (0, jsx_runtime_1.jsx)("div", { style: {
+                                                }, children: (0, jsx_runtime_1.jsx)(LabelComponent, { label: (0, textProcessing_1.snakeCaseToTitleCase)(pivotTable.pivot.valueField) }) }, pivotTable.pivot.valueField))] }) }), (0, jsx_runtime_1.jsx)("div", { style: {
                                         paddingLeft: '2px',
                                         width: '100%',
-                                    }, children: (0, jsx_runtime_1.jsx)(TextComponent, { children: "No results" }) })] })) : ((0, jsx_runtime_1.jsxs)("table", { children: [(0, jsx_runtime_1.jsx)("thead", { children: (0, jsx_runtime_1.jsx)("tr", { children: pivotTable.columns.map((column) => ((0, jsx_runtime_1.jsx)("th", { style: {
+                                    }, children: (0, jsx_runtime_1.jsx)(TextComponent, { label: 'No results' }) })] })) : ((0, jsx_runtime_1.jsxs)("table", { children: [(0, jsx_runtime_1.jsx)("thead", { children: (0, jsx_runtime_1.jsx)("tr", { children: pivotTable.columns.map((column) => ((0, jsx_runtime_1.jsx)("th", { style: {
                                                 fontWeight: 600,
                                                 paddingRight: 5,
                                                 flex: 1,
                                                 textAlign: 'left',
                                                 whiteSpace: 'nowrap',
                                                 textOverflow: 'ellipsis',
-                                            }, children: (0, jsx_runtime_1.jsx)(LabelComponent, { children: column.label }) }, column.field))) }) }), (0, jsx_runtime_1.jsx)("tbody", { children: pivotTable.rows
+                                            }, children: (0, jsx_runtime_1.jsx)(LabelComponent, { label: column.label }) }, column.field))) }) }), (0, jsx_runtime_1.jsx)("tbody", { children: pivotTable.rows
                                         .slice(0, maxRowsInPivotPeak)
                                         .map((row, index) => ((0, jsx_runtime_1.jsx)("tr", { children: pivotTable.columns.map((colum, i) => ((0, jsx_runtime_1.jsx)("td", { style: {
                                                 paddingRight: 5,
                                                 flex: 1,
                                                 whiteSpace: 'nowrap',
                                                 textOverflow: 'ellipsis',
-                                            }, children: (0, jsx_runtime_1.jsx)(TextComponent, { children: pivotTable.pivot.valueFieldType && i !== 0
+                                            }, children: (0, jsx_runtime_1.jsx)(TextComponent, { label: pivotTable.pivot.valueFieldType && i !== 0
                                                     ? (0, valueFormatter_1.quillFormat)({
                                                         value: row[colum.field],
                                                         format: pivotTable.pivot.valueFieldType,
@@ -68,26 +69,25 @@ const PivotCard = ({ pivotTable, theme, index, onSelectPivot, selectedPivotIndex
                                                     : row[colum.field] }) }, i))) }, index))) })] }))] }), (0, jsx_runtime_1.jsxs)("div", { style: {
                         display: 'flex',
                         justifyContent: 'space-between',
-                    }, children: [pivotTable.rows.length > maxRowsInPivotPeak ? ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsxs)(TextComponent, { children: ["...", pivotTable.rows.length - maxRowsInPivotPeak < 5
-                                        ? ''
-                                        : pivotTable.rows.length - maxRowsInPivotPeak, ' ', "more rows"] }) })) : ((0, jsx_runtime_1.jsx)("div", {})), showEdit && ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(ButtonComponent, { id: "edit-pivot", primary: false, onClick: (e) => {
+                    }, children: [pivotTable.rows.length > maxRowsInPivotPeak ? ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(TextComponent, { label: `... ${pivotTable.rows.length - maxRowsInPivotPeak < 5
+                                    ? ''
+                                    : pivotTable.rows.length - maxRowsInPivotPeak} more rows` }) })) : ((0, jsx_runtime_1.jsx)("div", {})), showEdit && ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(ButtonComponent, { id: "edit-pivot", primary: false, onClick: (e) => {
                                     e.stopPropagation();
                                     onEditPivot(pivotTable.pivot, index);
                                 }, label: 'Edit' }) }))] })] }) }));
 };
 exports.PivotCard = PivotCard;
-const PivotList = ({ recommendedPivotTables, createdPivotTables, onSelectRecommendedPivot, onSelectCreatedPivot, theme, selectedPivotIndex, selectedPivotType, ButtonComponent, showCreatePivot = false, onEditRecommendedPivot, onEditCreatedPivot, showPivotEditButton = false, LabelComponent, TextComponent, HeaderComponent, }) => {
+const PivotList = ({ recommendedPivotTables, createdPivotTables, onSelectRecommendedPivot, onSelectCreatedPivot, theme, selectedPivotIndex, selectedPivotType, ButtonComponent, showCreatePivot = false, onEditRecommendedPivot, onEditCreatedPivot, showPivotEditButton = false, CardComponent = QuillCard_1.QuillCard, LabelComponent, TextComponent, HeaderComponent, }) => {
     return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsxs)("div", { style: {
                 display: 'grid',
                 gridTemplateColumns: 'repeat(2, 1fr)',
                 gap: 16,
                 gridAutoRows: '220px',
-            }, children: [recommendedPivotTables.map((pivotTable, index) => ((0, jsx_runtime_1.jsx)(exports.PivotCard, { pivotTable: pivotTable, theme: theme, index: index, onSelectPivot: onSelectRecommendedPivot, selectedPivotIndex: selectedPivotType === 'recommended' ? selectedPivotIndex : -1, onEditPivot: onEditRecommendedPivot, ButtonComponent: ButtonComponent, showPivotEditButton: showPivotEditButton, minHeight: 180, LabelComponent: LabelComponent, TextComponent: TextComponent, HeaderComponent: HeaderComponent }, index))), createdPivotTables.map((pivotTable, index) => ((0, jsx_runtime_1.jsx)(exports.PivotCard, { pivotTable: pivotTable, theme: theme, index: index, onSelectPivot: onSelectCreatedPivot, selectedPivotIndex: selectedPivotType === 'created' ? selectedPivotIndex : -1, onEditPivot: onEditCreatedPivot, ButtonComponent: ButtonComponent, showPivotEditButton: showPivotEditButton, minHeight: 180, LabelComponent: LabelComponent, TextComponent: TextComponent, HeaderComponent: HeaderComponent }, index))), showCreatePivot && ((0, jsx_runtime_1.jsx)(QuillCard_1.QuillCard, { theme: theme, onClick: () => onEditCreatedPivot({}, null), style: {
-                        display: 'flex',
-                        justifyContent: 'center',
-                        alignItems: 'center',
-                        border: `1px dashed ${theme.borderColor || '#e7e7e7'}`,
-                        boxShadow: 'none',
-                    }, children: "Create pivot +" }))] }) }));
+            }, children: [recommendedPivotTables.map((pivotTable, index) => ((0, jsx_runtime_1.jsx)(exports.PivotCard, { pivotTable: pivotTable, theme: theme, index: index, onSelectPivot: onSelectRecommendedPivot, selectedPivotIndex: selectedPivotType === 'recommended' ? selectedPivotIndex : -1, onEditPivot: onEditRecommendedPivot, ButtonComponent: ButtonComponent, showPivotEditButton: showPivotEditButton, minHeight: 180, CardComponent: CardComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, HeaderComponent: HeaderComponent }, index))), createdPivotTables.map((pivotTable, index) => ((0, jsx_runtime_1.jsx)(exports.PivotCard, { pivotTable: pivotTable, theme: theme, index: index, onSelectPivot: onSelectCreatedPivot, selectedPivotIndex: selectedPivotType === 'created' ? selectedPivotIndex : -1, onEditPivot: onEditCreatedPivot, ButtonComponent: ButtonComponent, showPivotEditButton: showPivotEditButton, minHeight: 180, CardComponent: CardComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, HeaderComponent: HeaderComponent }, index))), showCreatePivot && ((0, jsx_runtime_1.jsx)(CardComponent, { onClick: () => onEditCreatedPivot({}, null), children: (0, jsx_runtime_1.jsx)("div", { style: {
+                            display: 'flex',
+                            justifyContent: 'center',
+                            alignItems: 'center',
+                            width: '100%',
+                        }, children: "Create pivot +" }) }))] }) }));
 };
 exports.PivotList = PivotList;

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

@@ -1,3 +1,5 @@
+import { ReactNode } from 'react';
+import { ButtonComponentProps } from '../../components/UiComponents';
 export interface Pivot {
     rowField: string;
     rowFieldType: string;
@@ -8,7 +10,7 @@ export interface Pivot {
     title?: string;
     triggerButtonText?: string;
 }
-export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText, showPivotEditButton, showEditOnPivotClick, selectPivotOnEdit, showTrigger, rightAlign, parentRef, recommendPivotCount, }: {
+export interface PivotModalProps {
     pivotRowField: any;
     setPivotRowField: any;
     pivotColumnField: any;
@@ -22,11 +24,24 @@ export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumn
     selectedTable: any;
     SelectComponent: any;
     ButtonComponent: any;
-    SecondaryButtonComponent: any;
-    PopoverComponent: any;
-    HeaderComponent: any;
-    LabelComponent: any;
-    TextComponent: any;
+    CardComponent: any;
+    SecondaryButtonComponent: (props: ButtonComponentProps) => JSX.Element;
+    PopoverComponent: (props: {
+        isOpen: boolean;
+        setIsOpen: (isOpen: boolean) => void;
+        triggerLabel?: string | undefined;
+        popoverTitle?: string | undefined;
+        popoverChildren: ReactNode;
+    }) => JSX.Element;
+    HeaderComponent: (props: {
+        label: string;
+    }) => JSX.Element;
+    LabelComponent: (props: {
+        label: string;
+    }) => JSX.Element;
+    TextComponent: (props: {
+        label: string;
+    }) => JSX.Element;
     selectedPivotIndex: any;
     setSelectedPivotIndex: any;
     removePivot: any;
@@ -43,15 +58,16 @@ export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumn
     setCreatedPivots: any;
     recommendedPivots: any;
     setRecommendedPivots: any;
-    triggerButtonText?: string | undefined;
-    showPivotEditButton?: boolean | undefined;
-    showEditOnPivotClick?: boolean | undefined;
-    selectPivotOnEdit?: boolean | undefined;
-    showTrigger?: boolean | undefined;
-    rightAlign?: boolean | undefined;
+    triggerButtonText?: string;
+    showPivotEditButton?: boolean;
+    showEditOnPivotClick?: boolean;
+    selectPivotOnEdit?: boolean;
+    showTrigger?: boolean;
+    rightAlign?: boolean;
     parentRef: any;
-    recommendPivotCount?: number | undefined;
-}) => import("react/jsx-runtime").JSX.Element;
+    recommendPivotCount?: number;
+}
+export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, CardComponent, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText, showPivotEditButton, showEditOnPivotClick, selectPivotOnEdit, showTrigger, rightAlign, parentRef, recommendPivotCount, }: PivotModalProps) => import("react/jsx-runtime").JSX.Element;
 export declare function generatePivotTableYAxis(pivot: any, cols: any, format: any): any;
 export declare function isDateField(fieldType: any): boolean;
 export declare function generatePivotTable(pivot: Pivot, data: any, dateRange: any, isComparison: boolean, rowLimit?: number, compRange?: any): {

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

@@ -1 +1 @@
-{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"AA+BA,MAAM,WAAW,KAAK;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAkBD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6CA0tBtB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,KAAK,KAAA,EAAE,IAAI,KAAA,EAAE,MAAM,KAAA,OAyB1D;AAkHD,wBAAgB,WAAW,CAAC,SAAS,KAAA,WAYpC;AAgCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,GAAG,EACT,SAAS,EAAE,GAAG,EACd,YAAY,EAAE,OAAO,EACrB,QAAQ,SAAK,EACb,SAAS,GAAE,GAAU;;;;;;EA6btB"}
+{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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"}

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

@@ -11,6 +11,9 @@ const date_fns_1 = require("date-fns");
 const valueFormatter_1 = require("../../utils/valueFormatter");
 const ChartBuilder_1 = require("../../ChartBuilder");
 const textProcessing_1 = require("../../utils/textProcessing");
+const util_1 = require("../../components/ReportBuilder/util");
+const ast_1 = require("../../components/ReportBuilder/ast");
+const QuillCard_1 = require("../../components/QuillCard");
 const QuillHover = () => {
     return ((0, jsx_runtime_1.jsx)("style", { children: `
   .quill-hover {
@@ -24,7 +27,7 @@ const QuillHover = () => {
   }
 ` }));
 };
-const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText = 'Pivot', showPivotEditButton = false, showEditOnPivotClick = true, selectPivotOnEdit = false, showTrigger = true, rightAlign = false, parentRef, recommendPivotCount = 6, }) => {
+const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, CardComponent = QuillCard_1.QuillCard, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText = 'Pivot', showPivotEditButton = false, showEditOnPivotClick = true, selectPivotOnEdit = false, showTrigger = true, rightAlign = false, parentRef, recommendPivotCount = 6, }) => {
     const [isLoading, setIsLoading] = (0, react_1.useState)(false);
     const [pivotUpdateIndex, setPivotUpdateIndex] = (0, react_1.useState)(null);
     const [selectedPivotType, setSelectedPivotType] = (0, react_1.useState)('recommended');
@@ -73,7 +76,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
         return (columns || []).reduce((map, col) => {
             // only use columns shown in the report builder's table
             // also filter out id
-            if (col.field !== 'id' && !col.field.endsWith('_id')) {
+            if (col.field !== 'id') {
                 map[col.field] = col.fieldType || col.format;
             }
             return map;
@@ -193,7 +196,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
         return pts;
     }, [createdPivots, data]);
     const samplePivotTable = (0, react_1.useMemo)(() => {
-        if (!pivotAggregation || !pivotRowField) {
+        if (!pivotAggregation) {
             return null;
         }
         const pivot = {
@@ -229,10 +232,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                             position: 'absolute',
                             top: -2,
                             right: -2,
-                        } })) }), (0, jsx_runtime_1.jsx)(PopoverComponent, { onClose: () => {
-                        setShowUpdatePivot(false);
-                        setPopUpTitle('Add Pivot');
-                    }, style: rightAlign ? { right: 0 } : {}, parentRef: parentRef, showTrigger: showTrigger, label: triggerButtonText, isOpen: isOpen, setIsOpen: setIsOpen, onClick: () => {
+                        } })) }), showTrigger && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => {
                         if (columns.length === 0) {
                             setIsOpen(false);
                         }
@@ -243,15 +243,19 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                         if (!isOpen && recommendedPivots.length === 0) {
                             refreshPivots();
                         }
+                        setIsOpen(!isOpen);
                         setShowUpdatePivot(false);
-                    }, children: (0, jsx_runtime_1.jsx)("div", { children: showUpdatePivot ? ((0, jsx_runtime_1.jsxs)("div", { className: "ref-in-use", ref: editModalRef, style: {
+                    }, label: triggerButtonText })), (0, jsx_runtime_1.jsx)(PopoverComponent, { isOpen: isOpen, setIsOpen: (isOpen) => {
+                        if (!isOpen) {
+                            setShowUpdatePivot(false);
+                            setPopUpTitle('Add Pivot');
+                        }
+                        setIsOpen(isOpen);
+                    }, popoverChildren: (0, jsx_runtime_1.jsx)("div", { children: showUpdatePivot ? ((0, jsx_runtime_1.jsxs)("div", { className: "ref-in-use", ref: editModalRef, style: {
                                 backgroundColor: 'rgb(255, 255, 255)',
                                 display: 'flex',
                                 flexDirection: 'column',
-                            }, children: [(0, jsx_runtime_1.jsx)(HeaderComponent, { children: popUpTitle }), (0, jsx_runtime_1.jsx)("div", { style: { height: 12 } }), (0, jsx_runtime_1.jsx)("div", { style: { width: divWidth }, children: samplePivotTable && ((0, jsx_runtime_1.jsx)("div", { style: {
-                                            marginBottom: 20,
-                                            minHeight: 160,
-                                        }, children: (0, jsx_runtime_1.jsx)(PivotList_1.PivotCard, { pivotTable: samplePivotTable, theme: theme, index: 0, onSelectPivot: () => { }, selectedPivotIndex: -1, onEditPivot: () => { }, ButtonComponent: ButtonComponent, showEdit: false, clickable: false, minHeight: 140, LabelComponent: LabelComponent, TextComponent: TextComponent, HeaderComponent: HeaderComponent }) })) }), (0, jsx_runtime_1.jsxs)("div", { style: {
+                            }, children: [(0, jsx_runtime_1.jsx)(HeaderComponent, { label: popUpTitle }), (0, jsx_runtime_1.jsx)("div", { style: { height: 12 } }), (0, jsx_runtime_1.jsxs)("div", { style: {
                                         display: 'flex',
                                         flexDirection: 'column',
                                         gap: 10,
@@ -262,49 +266,55 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                                                 flexDirection: 'row',
                                                 gap: 20,
                                                 marginBottom: 5,
-                                            }, children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { children: "Row Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotRowField, onChange: (e) => {
-                                                                setPivotRowField(e === '' ? undefined : e);
+                                            }, children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { label: "Row Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotRowField, onChange: (e) => {
+                                                                setPivotRowField(e.target.value === ''
+                                                                    ? undefined
+                                                                    : e.target.value);
                                                             }, options: [
                                                                 ...columnSelectOptions.filter((option) => {
                                                                     const format = columns.find((col) => col.field === option.value)?.format;
                                                                     return (format === 'string' ||
-                                                                        ChartBuilder_1.dateFormatOptions.includes(format));
+                                                                        ChartBuilder_1.dateFormatOptions.includes(format) ||
+                                                                        (0, util_1.isIdColumn)(option.value));
                                                                 }),
-                                                            ], theme: theme })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { children: "Column Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotColumnField, onChange: (e) => {
-                                                                setPivotColumnField(e === '' ? undefined : e);
+                                                            ] })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { label: "Column Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotColumnField, onChange: (e) => {
+                                                                setPivotColumnField(e.target.value === ''
+                                                                    ? undefined
+                                                                    : e.target.value);
                                                             }, options: [
                                                                 ...columnSelectOptions.filter((option) => {
-                                                                    return (columns.find((col) => col.field === option.value)
-                                                                        ?.format === 'string');
+                                                                    return (columns.find((col) => col.field === option.value)?.format === 'string');
                                                                 }),
-                                                            ], theme: theme })] })] }), (0, jsx_runtime_1.jsxs)("div", { style: {
+                                                            ] })] })] }), (0, jsx_runtime_1.jsxs)("div", { style: {
                                                 display: 'flex',
                                                 flexDirection: 'row',
                                                 gap: 20,
                                                 marginBottom: 20,
-                                            }, children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { children: "Value Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotValueField, onChange: (e) => {
-                                                                setPivotValueField(e === '' ? undefined : e);
+                                            }, children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { label: "Value Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotValueField, onChange: (e) => {
+                                                                setPivotValueField(e.target.value === ''
+                                                                    ? undefined
+                                                                    : e.target.value);
                                                             }, options: [
                                                                 ...columnSelectOptions.filter((option) => {
-                                                                    return (option.value === '' ||
-                                                                        ChartBuilder_1.numberFormatOptions.includes(columns.find((col) => col.field === option.value)?.format));
+                                                                    return ((option.value === '' ||
+                                                                        ChartBuilder_1.numberFormatOptions.includes(columns.find((col) => col.field === option.value)?.format)) &&
+                                                                        !(0, util_1.isIdColumn)(option.value));
                                                                 }),
-                                                            ], theme: theme })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { children: "Aggregation Type" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotAggregation, theme: theme, onChange: (e) => {
-                                                                if (e !== 'count' &&
+                                                            ] })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { label: "Aggregation Type" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotAggregation, onChange: (e) => {
+                                                                if (e.target.value !== 'count' &&
                                                                     pivotValueField &&
                                                                     !ChartBuilder_1.numberFormatOptions.includes(columns.find((col) => col.field === pivotValueField)?.format)) {
                                                                     setPivotValueField(null);
                                                                 }
-                                                                setPivotAggregation(e === '' ? undefined : e);
+                                                                setPivotAggregation(e.target.value === ''
+                                                                    ? undefined
+                                                                    : e.target.value);
                                                             }, options: [
                                                                 ...['sum', 'average', 'count', 'max', 'min'].map((option) => {
                                                                     return { label: option, value: option };
                                                                 }),
                                                             ] })] })] })] }), (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(ButtonComponent, { id: "custom-button", onClick: () => {
                                             const errors = [];
-                                            if (!pivotRowField) {
-                                                errors.push('Row field cannot be empty');
-                                            }
                                             if (!pivotValueField && pivotAggregation !== 'count') {
                                                 errors.push("Value field cannot be empty when aggregation is not 'count'");
                                             }
@@ -359,7 +369,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                                             columns: selectedPivotTable?.columns,
                                         }, theme: theme, index: 0, onSelectPivot: () => { }, selectedPivotIndex: -1, onEditPivot: () => { }, ButtonComponent: ButtonComponent, showEdit: false, onClose: () => {
                                             removePivot();
-                                        }, clickable: true, minHeight: 180, LabelComponent: LabelComponent, TextComponent: TextComponent, HeaderComponent: HeaderComponent }) }) })) : ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'column' }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
+                                        }, clickable: true, minHeight: 180, CardComponent: CardComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, HeaderComponent: HeaderComponent }) }) })) : ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'column' }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'row',
                                             width: '100%',
@@ -387,7 +397,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                                             display: 'flex',
                                             margin: '0px auto',
                                             justifyContent: 'center',
-                                        }, children: [(0, jsx_runtime_1.jsx)("div", { style: { height: 100 } }), (0, jsx_runtime_1.jsxs)("svg", { width: "24", height: "24", children: [(0, jsx_runtime_1.jsx)("circle", { cx: "12", cy: "12", r: "9.375", strokeWidth: "3.75", strokeDasharray: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 2 / 3)", strokeDashoffset: "calc(2 * 3.14 * 9.375 / 6)", stroke: theme?.primaryTextColor || '#364153', fill: "none", transform: "rotate(-90 12 12)", children: (0, jsx_runtime_1.jsx)("animateTransform", { attributeName: "transform", attributeType: "XML", type: "rotate", from: "-180 12 12", to: "180 12 12", dur: "0.8s", repeatCount: "indefinite" }) }), (0, jsx_runtime_1.jsx)("circle", { cx: "12", cy: "12", r: "9.375", strokeWidth: "3.75", strokeDasharray: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 1 / 3)", strokeDashoffset: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 2 / 3)", stroke: '#ADB1B9', fill: "none", transform: "rotate(90 12 12)", children: (0, jsx_runtime_1.jsx)("animateTransform", { attributeName: "transform", attributeType: "XML", type: "rotate", from: "0 12 12", to: "360 12 12", dur: "0.8s", repeatCount: "indefinite" }) })] })] })) : ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(PivotList_1.PivotList, { recommendedPivotTables: recommendedPivotTables, createdPivotTables: createdPivotTables, theme: theme, onSelectRecommendedPivot: onSelectRecommendedPivot, onSelectCreatedPivot: onSelectCreatedPivot, selectedPivotIndex: selectedPivotIndex, selectedPivotType: selectedPivotType, ButtonComponent: ButtonComponent, HeaderComponent: HeaderComponent, onEditRecommendedPivot: onEditRecommendedPivot, onEditCreatedPivot: onEditPivot, showCreatePivot: true, showPivotEditButton: showPivotEditButton, LabelComponent: LabelComponent, TextComponent: TextComponent }) }))] })) })) }) })] }) }));
+                                        }, children: [(0, jsx_runtime_1.jsx)("div", { style: { height: 100 } }), (0, jsx_runtime_1.jsxs)("svg", { width: "24", height: "24", children: [(0, jsx_runtime_1.jsx)("circle", { cx: "12", cy: "12", r: "9.375", strokeWidth: "3.75", strokeDasharray: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 2 / 3)", strokeDashoffset: "calc(2 * 3.14 * 9.375 / 6)", stroke: theme?.primaryTextColor || '#364153', fill: "none", transform: "rotate(-90 12 12)", children: (0, jsx_runtime_1.jsx)("animateTransform", { attributeName: "transform", attributeType: "XML", type: "rotate", from: "-180 12 12", to: "180 12 12", dur: "0.8s", repeatCount: "indefinite" }) }), (0, jsx_runtime_1.jsx)("circle", { cx: "12", cy: "12", r: "9.375", strokeWidth: "3.75", strokeDasharray: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 1 / 3)", strokeDashoffset: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 2 / 3)", stroke: '#ADB1B9', fill: "none", transform: "rotate(90 12 12)", children: (0, jsx_runtime_1.jsx)("animateTransform", { attributeName: "transform", attributeType: "XML", type: "rotate", from: "0 12 12", to: "360 12 12", dur: "0.8s", repeatCount: "indefinite" }) })] })] })) : ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(PivotList_1.PivotList, { recommendedPivotTables: recommendedPivotTables, createdPivotTables: createdPivotTables, theme: theme, onSelectRecommendedPivot: onSelectRecommendedPivot, onSelectCreatedPivot: onSelectCreatedPivot, selectedPivotIndex: selectedPivotIndex, selectedPivotType: selectedPivotType, ButtonComponent: ButtonComponent, HeaderComponent: HeaderComponent, onEditRecommendedPivot: onEditRecommendedPivot, onEditCreatedPivot: onEditPivot, showCreatePivot: true, showPivotEditButton: showPivotEditButton, LabelComponent: LabelComponent, TextComponent: TextComponent, CardComponent: CardComponent }) }))] })) })) }) })] }) }));
 };
 exports.PivotModal = PivotModal;
 function generatePivotTableYAxis(pivot, cols, format) {
@@ -547,7 +557,7 @@ const fixBigQueryData = (data = []) => {
 function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = null) {
     // If there is no rowField, aggregate on the valueField
     if (!pivot.rowField) {
-        return valueFieldAggregation(data, pivot.valueField, pivot.aggregationType);
+        return valueFieldAggregation(data, pivot.valueField, pivot.aggregationType, isComparison);
     }
     // Handle edge-case for BigQuery objects.
     data = fixBigQueryData(data);
@@ -767,15 +777,6 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
                     }
                     break;
                 case 'average':
-                    value = filteredData.length
-                        ? filteredData.reduce((sum, item) => sum + parseFloat(item[key] ?? 0), 0) / filteredData.length
-                        : 0;
-                    if (isComparison) {
-                        comparisonValue = comparisonFilteredData.length
-                            ? comparisonFilteredData.reduce((sum, item) => sum + parseFloat(item[key] ?? 0), 0) / comparisonFilteredData.length
-                            : 0;
-                    }
-                    break;
                 case 'avg':
                     value = filteredData.length
                         ? filteredData.reduce((sum, item) => sum + parseFloat(item[key] ?? 0), 0) / filteredData.length
@@ -879,12 +880,18 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
                 if (pivot.rowFieldType === 'date') {
                     return new Date(a[pivot.rowField]) - new Date(b[pivot.rowField]);
                 }
+                else if ((0, ast_1.isNumericColumnType)(pivot.rowFieldType)) {
+                    return a[pivot.rowField] - b[pivot.rowField];
+                }
                 return a[pivot.rowField].localeCompare(b[pivot.rowField]);
             }
             else {
                 if (pivot.rowFieldType === 'date') {
                     return new Date(b[pivot.rowField]) - new Date(a[pivot.rowField]);
                 }
+                else if ((0, ast_1.isNumericColumnType)(pivot.rowFieldType)) {
+                    return a[pivot.rowField] - b[pivot.rowField];
+                }
                 return b[pivot.rowField].localeCompare(a[pivot.rowField]);
             }
         });
@@ -892,30 +899,45 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
     return { rows: pivotRows, columns };
 }
 exports.generatePivotTable = generatePivotTable;
-function valueFieldAggregation(data, valueField, aggregationType) {
-    let value;
+function valueFieldAggregation(data, valueField, aggregationType, isComparison) {
+    let value = 0;
+    let comparisonValue = 0;
     switch (aggregationType) {
         case 'sum':
             value = data.reduce((sum, item) => sum + parseFloat(item[valueField] ?? 0), 0);
+            if (isComparison) {
+                comparisonValue = data.reduce((sum, item) => sum + parseFloat(item[`comparison_${valueField}`] ?? 0), 0);
+            }
             break;
         case 'count':
-            value = data.length;
+            value = data.reduce((count, item) => count + (item[valueField] ? 1 : 0), 0);
+            if (isComparison) {
+                comparisonValue = data.reduce((count, item) => count + (item[`comparison_${valueField}`] ? 1 : 0), 0);
+            }
             break;
         case 'avg':
-            value = data.length
-                ? data.reduce((sum, item) => sum + parseFloat(item[valueField] ?? 0), 0) / data.length
-                : 0;
-            break;
         case 'average':
-            value = data.length
-                ? data.reduce((sum, item) => sum + parseFloat(item[valueField] ?? 0), 0) / data.length
-                : 0;
+            const count = data.reduce((count, item) => count + (item[valueField] ? 1 : 0), 0);
+            value =
+                data.reduce((sum, item) => sum + parseFloat(item[valueField] ?? 0), 0) /
+                    (count === 0 ? 1 : count);
+            if (isComparison) {
+                const comparisonCount = data.reduce((count, item) => count + (item[`comparison_${valueField}`] ? 1 : 0), 0);
+                comparisonValue =
+                    data.reduce((sum, item) => sum + parseFloat(item[`comparison_${valueField}`] ?? 0), 0) / (comparisonCount === 0 ? 1 : comparisonCount);
+            }
             break;
         case 'max':
             value = data.reduce((max, item) => Math.max(max, parseFloat(item[valueField] ?? 0)), -Infinity);
+            if (isComparison) {
+                comparisonValue = data.reduce((max, item) => Math.max(max, parseFloat(item[`comparison_${valueField}`] ?? 0)), -Infinity);
+            }
             break;
         case 'min':
             value = data.reduce((min, item) => Math.min(min, parseFloat(item[valueField] ?? 0)), Infinity);
+            if (isComparison) {
+                comparisonValue = data.reduce((min, item) => Math.min(min, parseFloat(item[`comparison_${valueField}`] ?? 0)), Infinity);
+            }
             break;
         // Implement other aggregation types as needed
         default:
@@ -923,6 +945,9 @@ function valueFieldAggregation(data, valueField, aggregationType) {
     }
     const row = {};
     row[valueField] = value;
+    if (isComparison) {
+        row[`comparison_${valueField}`] = comparisonValue;
+    }
     return {
         rows: [row],
         columns: [{ label: (0, textProcessing_1.snakeCaseToTitleCase)(valueField), field: valueField }],

package/dist/cjs/utils/dataFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAEA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA8DhB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA+BhB"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAEA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgEhB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA+BhB"}

package/dist/cjs/utils/dataFetcher.js

@@ -23,6 +23,7 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
             let result;
             if (responseJson.data?.data) {
                 result = {
+                    fields: responseJson?.data.queries?.queryResults[0]?.fields,
                     ...responseJson.data.data,
                     rows: responseJson?.data.queries?.queryResults[0]?.rows,
                     compareRows: responseJson?.data.queries?.queryResults[1]?.rows,
@@ -30,6 +31,7 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
             }
             else {
                 result = {
+                    fields: responseJson?.queries?.queryResults[0]?.fields,
                     ...responseJson.data,
                     rows: responseJson?.queries?.queryResults[0]?.rows,
                     compareRows: responseJson?.queries?.queryResults[1]?.rows,

package/dist/cjs/utils/parserBigQuery.d.ts

@@ -0,0 +1,6 @@
+export declare const isInTheLastIntervalBigQuery: (node: any) => boolean;
+export declare const isAfterBigQuery: (node: any) => boolean;
+export declare const isBeforeBigQuery: (node: any) => boolean;
+export declare const isTheCurrentIntervalBigQuery: (node: any) => boolean;
+export declare const isEqualsBigQuery: (node: any) => any;
+//# sourceMappingURL=parserBigQuery.d.ts.map

package/dist/cjs/utils/parserBigQuery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parserBigQuery.d.ts","sourceRoot":"","sources":["../../../src/utils/parserBigQuery.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,2BAA2B,SAAU,GAAG,YAYpD,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,GAAG,YAUxC,CAAC;AAEF,eAAO,MAAM,gBAAgB,SAAU,GAAG,YAUzC,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,GAAG,KAAG,OAUxD,CAAC;AAEF,eAAO,MAAM,gBAAgB,SAAU,GAAG,QASzC,CAAC"}