@quillsql/react 2.11.16 → 2.11.17

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

@@ -4,25 +4,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
 const dateRangePickerUtils_1 = require("../../DateRangePicker/dateRangePickerUtils");
 const valueFormatter_1 = require("../../utils/valueFormatter");
 const ChartError_1 = __importDefault(require("../Chart/ChartError"));
 const ChartSkeleton_1 = __importDefault(require("../Chart/ChartSkeleton"));
-function QuillMetricComponent({ dashboardItem, onClickDashboardItem, error, isLoading, theme, style, }) {
+const PivotModal_1 = require("../../internals/ReportBuilder/PivotModal");
+const Context_1 = require("../../Context");
+const hooks_1 = require("../../hooks");
+function QuillMetricComponent({ dashboardItem, onClick, error, isLoading, }) {
+    const theme = (0, hooks_1.useTheme)();
+    const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
     const data = dashboardItem;
-    const isComparison = data.rows.length > 0 &&
-        Object.keys(data.rows[0]).includes(`comparison_${data.xAxisField}`);
+    const config = dashboardItem;
+    const dateFilter = Object.values(dashboardFilters).find((filter) => filter.filterType == 'date_range');
+    const pivotTable = (0, react_1.useMemo)(() => {
+        const pivot = config?.pivot;
+        const data = config;
+        return pivot && data?.rows
+            ? (0, PivotModal_1.generatePivotTable)(pivot, JSON.parse(JSON.stringify(data.rows)), // deep copy
+            dateFilter
+                ? [dateFilter.startDate || null, dateFilter.endDate || null, null]
+                : [null, null, null], Boolean(dateFilter?.comparisonRange?.startDate), -1, dateFilter?.comparisonRange?.startDate
+                ? [
+                    dateFilter?.comparisonRange.startDate,
+                    dateFilter?.comparisonRange.endDate,
+                    null,
+                ]
+                : [null, null, null])
+            : null;
+    }, [config?.pivot]);
     const primaryMetricLabel = data?.filtersApplied?.date_range?.preset?.label;
     const comparisonKey = data?.filtersApplied?.date_range?.comparisonRange?.value;
     const comparisonLabel = dateRangePickerUtils_1.COMPARISON_OPTIONS.find((opt) => opt.value === comparisonKey)?.text;
-    return ((0, jsx_runtime_1.jsx)("div", { onClick: onClickDashboardItem
-            ? () => onClickDashboardItem(dashboardItem)
-            : () => { }, style: {
+    const rows = pivotTable?.rows ?? data.rows ?? [];
+    const isComparison = rows.length > 0 &&
+        Object.keys(rows[0]).includes(`comparison_${data.xAxisField}`);
+    return ((0, jsx_runtime_1.jsx)("div", { onClick: () => onClick && onClick(dashboardItem), style: {
             cursor: 'pointer',
             boxSizing: 'content-box',
             borderRadius: 8,
             paddingBottom: isLoading ? 0 : 30,
-            ...style,
         }, children: (0, jsx_runtime_1.jsx)("div", { style: {
                 width: '100%',
                 height: '100%',
@@ -55,7 +77,7 @@ function QuillMetricComponent({ dashboardItem, onClickDashboardItem, error, isLo
                                         display: 'block',
                                         maxWidth: '100%',
                                         overflow: 'hidden',
-                                    }, children: dashboardItem?.name }), onClickDashboardItem ? ((0, jsx_runtime_1.jsx)("div", { style: {
+                                    }, children: dashboardItem?.name }), onClick ? ((0, jsx_runtime_1.jsx)("div", { style: {
                                         fontFamily: theme.fontFamily,
                                         color: theme.primaryTextColor,
                                         boxSizing: 'content-box',
@@ -65,11 +87,13 @@ function QuillMetricComponent({ dashboardItem, onClickDashboardItem, error, isLo
                                         display: 'flex',
                                         alignItems: 'center',
                                         justifyContent: 'flex-end',
-                                    }, children: 'view report →' })) : null] }), isLoading ? ((0, jsx_runtime_1.jsx)(ChartSkeleton_1.default, { containerStyle: { maxHeight: '78px', height: style?.height ?? '100%' } })) : error ? ((0, jsx_runtime_1.jsx)(ChartError_1.default, {})) : data.rows?.length === 0 ||
-                            data.rows[0][data.xAxisField] === null ? ((0, jsx_runtime_1.jsx)("div", { style: {
+                                    }, children: 'view report →' })) : null] }), isLoading ? ((0, jsx_runtime_1.jsx)(ChartSkeleton_1.default, { containerStyle: {
+                                maxHeight: '78px',
+                                height: '100%',
+                            } })) : error ? ((0, jsx_runtime_1.jsx)(ChartError_1.default, {})) : rows?.length === 0 || rows[0][data.xAxisField] === null ? ((0, jsx_runtime_1.jsx)("div", { style: {
                                 display: 'flex',
                                 flex: '1 0 auto',
-                                height: style?.height ?? '100%',
+                                height: '100%',
                                 margin: 'auto',
                                 justifyContent: 'center',
                                 alignItems: 'center',
@@ -77,7 +101,6 @@ function QuillMetricComponent({ dashboardItem, onClickDashboardItem, error, isLo
                                 color: theme.secondaryTextColor,
                                 maxWidth: '100%',
                                 width: '100%',
-                                ...style,
                             }, children: "No results" })) : ((0, jsx_runtime_1.jsx)("div", { style: {
                                 padding: 0,
                                 height: '100%',
@@ -104,9 +127,9 @@ function QuillMetricComponent({ dashboardItem, onClickDashboardItem, error, isLo
                                             gap: 4,
                                             alignItems: 'baseline',
                                             marginRight: 'auto',
-                                        }, children: [(0, jsx_runtime_1.jsx)("span", { children: data.rows.length > 0 &&
+                                        }, children: [(0, jsx_runtime_1.jsx)("span", { children: rows.length > 0 &&
                                                     (0, valueFormatter_1.valueFormatter)({
-                                                        value: data.rows[0][data.xAxisField] ?? 0,
+                                                        value: rows[0][data.xAxisField] ?? 0,
                                                         field: data.xAxisField,
                                                         fields: [
                                                             {
@@ -135,10 +158,9 @@ function QuillMetricComponent({ dashboardItem, onClickDashboardItem, error, isLo
                                                     fontWeight: '500',
                                                     fontFamily: theme?.fontFamily,
                                                     color: theme?.secondaryTextColor,
-                                                }, children: data.rows.length > 0 &&
+                                                }, children: rows.length > 0 &&
                                                     (0, valueFormatter_1.valueFormatter)({
-                                                        value: data.rows[0][`comparison_${data.xAxisField}`] ??
-                                                            0,
+                                                        value: rows[0][`comparison_${data.xAxisField}`] ?? 0,
                                                         field: data.xAxisField,
                                                         fields: [
                                                             {

package/dist/cjs/components/Dashboard/TableComponent.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="react" />
-export default function QuillTableComponent({ dashboardItem, onClickDashboardItem, isLoading, error, theme, style, children, }: any): JSX.Element;
+import { DashboardItemProps } from '../../Dashboard';
+export default function QuillTableComponent({ dashboardItem, onClick, isLoading, error, }: DashboardItemProps): JSX.Element;
 //# sourceMappingURL=TableComponent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AASA,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,KAAK,EACL,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAiKnB"}
+{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,aAAa,EACb,OAAO,EACP,SAAS,EACT,KAAK,GACN,EAAE,kBAAkB,GAAG,GAAG,CAAC,OAAO,CA2JlC"}

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

@@ -12,7 +12,9 @@ const Context_1 = require("../../Context");
 const valueFormatter_1 = require("../../utils/valueFormatter");
 const ChartSkeleton_1 = __importDefault(require("../Chart/ChartSkeleton"));
 const ChartError_1 = __importDefault(require("../Chart/ChartError"));
-function QuillTableComponent({ dashboardItem, onClickDashboardItem, isLoading, error, theme, style, children, }) {
+const hooks_1 = require("../../hooks");
+function QuillTableComponent({ dashboardItem, onClick, isLoading, error, }) {
+    const theme = (0, hooks_1.useTheme)();
     const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
     const config = dashboardItem;
     const data = dashboardItem;
@@ -62,12 +64,7 @@ function QuillTableComponent({ dashboardItem, onClickDashboardItem, isLoading, e
             return formattedRow;
         }, {});
     });
-    return ((0, jsx_runtime_1.jsxs)("div", { style: {
-            cursor: 'pointer',
-            ...style,
-        }, onClick: onClickDashboardItem
-            ? () => onClickDashboardItem(dashboardItem)
-            : () => { }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
+    return ((0, jsx_runtime_1.jsxs)("div", { style: { cursor: 'pointer' }, onClick: () => onClick && onClick(dashboardItem), children: [(0, jsx_runtime_1.jsxs)("div", { style: {
                     display: 'flex',
                     flexDirection: 'row',
                     justifyContent: 'space-between',
@@ -86,7 +83,7 @@ function QuillTableComponent({ dashboardItem, onClickDashboardItem, isLoading, e
                             display: 'block',
                             maxWidth: '100%',
                             overflow: 'hidden',
-                        }, children: dashboardItem?.name }), onClickDashboardItem ? ((0, jsx_runtime_1.jsx)("div", { style: {
+                        }, children: dashboardItem?.name }), onClick ? ((0, jsx_runtime_1.jsx)("div", { style: {
                             fontFamily: theme.fontFamily,
                             color: theme.primaryTextColor,
                             boxSizing: 'content-box',
@@ -102,7 +99,7 @@ function QuillTableComponent({ dashboardItem, onClickDashboardItem, isLoading, e
                 } })) : error ? ((0, jsx_runtime_1.jsx)(ChartError_1.default, { containerStyle: {
                     width: '100%',
                     height: '400px',
-                } })) : ((0, jsx_runtime_1.jsx)(QuillTable_1.default, { rows: formattedRows ?? [], columns: columns ?? data.yAxisFields, rowsPerPage: config?.rowsPerPage || 10, containerStyle: {
+                } })) : ((0, jsx_runtime_1.jsx)(QuillTable_1.default, { rows: formattedRows ?? [], columns: columns ?? data.yAxisFields, rowsPerPage: 10, containerStyle: {
                     width: '100%',
                     height: '400px',
                 }, showDownloadCSVButton: true, downloadCSV: () => {

package/dist/cjs/components/QuillSelect.d.ts

@@ -1,3 +1,6 @@
 import { SelectComponentProps } from './UiComponents';
-export declare function QuillSelectComponent({ options, value, onChange, theme, label, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
+/**
+ * A robust select component that implements the new minimal Select interface.
+ */
+export declare function QuillSelectComponent({ options, value, onChange, label, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=QuillSelect.d.ts.map

package/dist/cjs/components/QuillSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillSelect.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelect.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAGtD,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,GACN,EAAE,oBAAoB,2CAwMtB"}
+{"version":3,"file":"QuillSelect.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelect.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAKtD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,GACN,EAAE,oBAAoB,2CA0MtB"}

package/dist/cjs/components/QuillSelect.js

@@ -4,17 +4,19 @@ exports.QuillSelectComponent = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const hooks_1 = require("../hooks");
 const react_1 = require("react");
-function QuillSelectComponent({ options, value, onChange, theme, label, }) {
+const Context_1 = require("../Context");
+/**
+ * A robust select component that implements the new minimal Select interface.
+ */
+function QuillSelectComponent({ options, value, onChange, label, }) {
+    const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     const [showModal, setShowModal] = (0, react_1.useState)(false);
     const modalRef = (0, react_1.useRef)(null);
-    (0, hooks_1.useOnClickOutside)(modalRef, (e) => {
-        setShowModal(false);
-    });
+    (0, hooks_1.useOnClickOutside)(modalRef, (e) => setShowModal(false));
     return ((0, jsx_runtime_1.jsxs)("div", { style: {
             position: 'relative',
             width: 200,
             minWidth: 200,
-            boxShadow: 'rgba(0, 0, 0, 0.1) 0px 1px 5px 0px',
             borderRadius: '6px',
         }, children: [label && ((0, jsx_runtime_1.jsx)("div", { style: {
                     fontSize: 14,
@@ -65,7 +67,6 @@ function QuillSelectComponent({ options, value, onChange, theme, label, }) {
                     paddingBottom: 6,
                     paddingLeft: 6,
                     paddingRight: 6,
-                    boxShadow: '0px 1px 12px 0px rgba(56, 65, 81, 0.1)',
                     fontFamily: theme.fontFamily,
                     maxHeight: '50vh',
                     overflow: 'scroll',
@@ -88,7 +89,9 @@ function QuillSelectComponent({ options, value, onChange, theme, label, }) {
                             height: 34,
                             minHeight: 34,
                         }, className: "quill-option", onClick: () => {
-                            onChange('');
+                            // Manually create a synthetic ChangeEvent and pass it to callback
+                            const changeEvent = { target: { value: '' } };
+                            onChange(changeEvent);
                             setShowModal(false);
                         }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
                 .quill-option {
@@ -116,7 +119,9 @@ function QuillSelectComponent({ options, value, onChange, theme, label, }) {
                             minHeight: 34,
                             overflow: 'hidden',
                         }, className: "quill-option", onClick: () => {
-                            onChange(option.value);
+                            // Manually create a synthetic ChangeEvent and pass it to callback
+                            const changeEvent = { target: { value: option.value } };
+                            onChange(changeEvent);
                             setShowModal(false);
                         }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
                 .quill-option {

package/dist/cjs/components/QuillTable.d.ts

@@ -1,3 +1,17 @@
-import { TableComponentProps } from './UiComponents';
-export default function QuillTable({ rows, columns, loading, showDownloadCSVButton, downloadFileName, containerStyle, LoadingComponent, rowsPerPage, emptyStateLabel, downloadCSV, }: TableComponentProps): import("react/jsx-runtime").JSX.Element;
+import React from 'react';
+import { ButtonComponentProps } from './UiComponents';
+export interface TableComponentProps {
+    rows: any[];
+    columns: any[];
+    containerStyle?: React.CSSProperties;
+    isLoading?: boolean;
+    showDownloadCSVButton?: boolean;
+    downloadFileName?: string;
+    downloadCSV?: () => void;
+    LoadingComponent?: () => JSX.Element;
+    DownloadCSVButtonComponent?: (props: ButtonComponentProps) => JSX.Element;
+    rowsPerPage?: number;
+    emptyStateLabel?: string;
+}
+export default function QuillTable({ rows, columns, isLoading, showDownloadCSVButton, downloadFileName, containerStyle, LoadingComponent, rowsPerPage, emptyStateLabel, downloadCSV, }: TableComponentProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=QuillTable.d.ts.map

package/dist/cjs/components/QuillTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAMrD,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,gBAA0C,EAC1C,WAAgB,EAChB,eAA8B,EAC9B,WAAW,GACZ,EAAE,mBAAmB,2CAwZrB"}
+{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAKxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,OAAO,EACP,SAAS,EACT,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,gBAA0C,EAC1C,WAAgB,EAChB,eAA8B,EAC9B,WAAW,GACZ,EAAE,mBAAmB,2CAwZrB"}

package/dist/cjs/components/QuillTable.js

@@ -8,7 +8,7 @@ const react_1 = require("react");
 const valueFormatter_1 = require("../utils/valueFormatter");
 const Context_1 = require("../Context");
 const ChartSkeleton_1 = __importDefault(require("./Chart/ChartSkeleton"));
-function QuillTable({ rows, columns, loading, showDownloadCSVButton, downloadFileName, containerStyle, LoadingComponent = () => (0, jsx_runtime_1.jsx)(ChartSkeleton_1.default, {}), rowsPerPage = 10, emptyStateLabel = 'No results', downloadCSV, }) {
+function QuillTable({ rows, columns, isLoading, showDownloadCSVButton, downloadFileName, containerStyle, LoadingComponent = () => (0, jsx_runtime_1.jsx)(ChartSkeleton_1.default, {}), rowsPerPage = 10, emptyStateLabel = 'No results', downloadCSV, }) {
     const [activeRows, setActiveRows] = (0, react_1.useState)([]);
     const [page, setPage] = (0, react_1.useState)(1);
     const [maxPage, setMaxPage] = (0, react_1.useState)(1);
@@ -18,7 +18,7 @@ function QuillTable({ rows, columns, loading, showDownloadCSVButton, downloadFil
     const [isPaginating, setIsPaginating] = (0, react_1.useState)(true);
     (0, react_1.useEffect)(() => {
         setIsPaginating(true);
-        if (rows.length === 0 && loading) {
+        if (rows.length === 0 && isLoading) {
             return;
         }
         const sortedRows = [...rows];
@@ -35,7 +35,7 @@ function QuillTable({ rows, columns, loading, showDownloadCSVButton, downloadFil
         }
         setActiveRows(sortedRows.slice(start, end));
         setIsPaginating(false);
-    }, [page, rows, sortColumn, sortDirection, loading, columns]);
+    }, [page, rows, sortColumn, sortDirection, isLoading, columns]);
     const increasePage = () => {
         if (page === maxPage) {
             return;
@@ -57,7 +57,7 @@ function QuillTable({ rows, columns, loading, showDownloadCSVButton, downloadFil
             setSortDirection('desc');
         }
     };
-    if (loading || isPaginating) {
+    if (isLoading || isPaginating) {
         return ((0, jsx_runtime_1.jsx)("div", { style: {
                 ...containerStyle,
             }, children: (0, jsx_runtime_1.jsx)(LoadingComponent, {}) }));

package/dist/cjs/components/ReportBuilder/AddColumnPopover.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { TextInputComponentProps } from '../UiComponents';
-export default function AddColumnPopover({ onSave, orderedColumnNames, setOrderedColumnNames, selectedColumns, setSelectedColumns, isSelectedAllColumns, clearAllState, nameToColumn, baseAst, setBaseAst, pivot, initialTableName, defaultAST, defaultTable, setPivot, TextInput, SelectColumn, SecondaryButton, Button, HandleButton, }: {
+export default function AddColumnPopover({ onSave, orderedColumnNames, setOrderedColumnNames, selectedColumns, setSelectedColumns, isSelectedAllColumns, clearAllState, nameToColumn, baseAst, setBaseAst, pivot, initialTableName, defaultAST, defaultTable, setPivot, TextInput, SelectColumn, SecondaryButton, Button, }: {
     onSave: any;
     orderedColumnNames: any;
     setOrderedColumnNames: any;
@@ -17,9 +17,15 @@ export default function AddColumnPopover({ onSave, orderedColumnNames, setOrdere
     defaultTable: any;
     setPivot: any;
     TextInput: (props: TextInputComponentProps) => JSX.Element;
-    SelectColumn: any;
+    SelectColumn: (props: {
+        label: string;
+        isSelected: boolean;
+        setSelected: () => void;
+        DragHandle: ({ dragIcon }: {
+            dragIcon: () => JSX.Element;
+        }) => JSX.Element;
+    }) => JSX.Element;
     SecondaryButton: any;
     Button: any;
-    HandleButton: any;
 }): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=AddColumnPopover.d.ts.map

package/dist/cjs/components/ReportBuilder/AddColumnPopover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AddColumnPopover.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddColumnPopover.tsx"],"names":[],"mappings":";AAmBA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAI1D,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,MAAM,EACN,kBAAkB,EAClB,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,OAAO,EACP,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,eAAe,EACf,MAAM,EACN,YAAY,GACb,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,kBAAkB,EAAE,GAAG,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC;IAC3B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;IACX,gBAAgB,EAAE,GAAG,CAAC;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC;IAClB,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC3D,YAAY,EAAE,GAAG,CAAC;IAClB,eAAe,EAAE,GAAG,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC;IACZ,YAAY,EAAE,GAAG,CAAC;CACnB,2CAsNA"}
+{"version":3,"file":"AddColumnPopover.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddColumnPopover.tsx"],"names":[],"mappings":";AAoBA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAI1D,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,MAAM,EACN,kBAAkB,EAClB,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,OAAO,EACP,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,eAAe,EACf,MAAM,GACP,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,kBAAkB,EAAE,GAAG,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC;IAC3B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;IACX,gBAAgB,EAAE,GAAG,CAAC;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC;IAClB,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC3D,YAAY,EAAE,CAAC,KAAK,EAAE;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,EAAE,MAAM,IAAI,CAAC;QACxB,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE;YAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;SAAE,KAAK,GAAG,CAAC,OAAO,CAAC;KAC5E,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,EAAE,GAAG,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC;CACb,2CAoNA"}

package/dist/cjs/components/ReportBuilder/AddColumnPopover.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
+/* eslint-disable no-unused-vars */
 const react_1 = require("react");
 const core_1 = require("@dnd-kit/core");
 const sortable_1 = require("@dnd-kit/sortable");
@@ -8,7 +9,7 @@ const utilities_1 = require("@dnd-kit/utilities");
 const Context_1 = require("../../Context");
 const width_1 = require("../../utils/width");
 const textProcessing_1 = require("../../utils/textProcessing");
-function AddColumnPopover({ onSave, orderedColumnNames, setOrderedColumnNames, selectedColumns, setSelectedColumns, isSelectedAllColumns, clearAllState, nameToColumn, baseAst, setBaseAst, pivot, initialTableName, defaultAST, defaultTable, setPivot, TextInput, SelectColumn, SecondaryButton, Button, HandleButton, }) {
+function AddColumnPopover({ onSave, orderedColumnNames, setOrderedColumnNames, selectedColumns, setSelectedColumns, isSelectedAllColumns, clearAllState, nameToColumn, baseAst, setBaseAst, pivot, initialTableName, defaultAST, defaultTable, setPivot, TextInput, SelectColumn, SecondaryButton, Button, }) {
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     const [search, setSearch] = (0, react_1.useState)('');
     const [searchResults, setSearchResults] = (0, react_1.useState)(orderedColumnNames);
@@ -43,7 +44,8 @@ function AddColumnPopover({ onSave, orderedColumnNames, setOrderedColumnNames, s
         setSearchResults(orderedColumnNames
             .filter((row) => {
             const [table, _column] = row.split('.');
-            return (selectedColumns.length === 0 || selectedColumns[0].startsWith(table));
+            const selectedTable = selectedColumns[0]?.split('.')[0];
+            return selectedColumns.length === 0 || selectedTable === table;
         })
             .filter((row) => search.length === 0 ||
             row.includes(search) ||
@@ -71,7 +73,7 @@ function AddColumnPopover({ onSave, orderedColumnNames, setOrderedColumnNames, s
                             overflowY: 'auto',
                             maxWidth: '300px',
                         }, children: [searchResults.map((value) => {
-                                return ((0, jsx_runtime_1.jsx)(SortableItem, { theme: theme, selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, id: value, label: value.replace('.', ' | '), SelectColumn: SelectColumn, HandleButton: HandleButton }, value));
+                                return ((0, jsx_runtime_1.jsx)(SortableItem, { selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, id: value, label: value.replace('.', ' | '), SelectColumn: SelectColumn }, value));
                             }), search.length > 0 && searchResults.length === 0 && ((0, jsx_runtime_1.jsx)("div", { style: { fontFamily: theme?.fontFamily }, children: "No results found" }))] }) }) }), (0, jsx_runtime_1.jsxs)("div", { style: {
                     display: 'flex',
                     width: '100%',
@@ -125,7 +127,7 @@ function AddColumnPopover({ onSave, orderedColumnNames, setOrderedColumnNames, s
                         }, label: "Select columns" })] })] }));
 }
 exports.default = AddColumnPopover;
-const SortableItem = ({ id, label, setSelectedColumns, theme, selectedColumns, SelectColumn, HandleButton, }) => {
+const SortableItem = ({ id, label, setSelectedColumns, selectedColumns, SelectColumn, }) => {
     const { attributes, listeners, setNodeRef, transform, transition } = (0, sortable_1.useSortable)({ id: id });
     const style = {
         transform: utilities_1.CSS.Transform.toString(transform),
@@ -141,7 +143,7 @@ const SortableItem = ({ id, label, setSelectedColumns, theme, selectedColumns, S
             }
         });
     };
-    return ((0, jsx_runtime_1.jsx)("div", { style: { userSelect: 'none', ...style }, ref: setNodeRef, children: (0, jsx_runtime_1.jsx)(SelectColumn, { selected: selectedColumns?.includes(id), setSelected: handleSelect, label: label, children: (0, jsx_runtime_1.jsx)("div", { style: {
+    return ((0, jsx_runtime_1.jsx)("div", { style: { userSelect: 'none', ...style }, ref: setNodeRef, children: (0, jsx_runtime_1.jsx)(SelectColumn, { isSelected: selectedColumns?.includes(id), setSelected: handleSelect, label: label, DragHandle: (props) => ((0, jsx_runtime_1.jsx)("div", { style: {
                     cursor: 'grab',
-                }, ...attributes, ...listeners, children: (0, jsx_runtime_1.jsx)(HandleButton, {}) }) }) }));
+                }, ...attributes, ...listeners, children: (0, jsx_runtime_1.jsx)(props.dragIcon, {}) })) }) }));
 };

package/dist/cjs/components/ReportBuilder/AddLimitPopover.d.ts

@@ -1,6 +1,18 @@
 /// <reference types="react" />
 import { ButtonComponentProps, TextInputComponentProps } from '../UiComponents';
-export declare const LimitSentence: ({ limit, handleDelete, setOpenPopover, onSave, popoverTitle, LimitPopover, EditPopover, TextInput, Button, SecondaryButton, children, }: any) => import("react/jsx-runtime").JSX.Element;
+import { LimitPopoverComponentProps } from './ui';
+export declare const LimitSentence: ({ limit, handleDelete, setOpenPopover, onSave, popoverTitle, LimitPopover, EditPopover, TextInput, Button, SecondaryButton, }: {
+    limit: any;
+    handleDelete: () => void;
+    setOpenPopover: (arg: any) => void;
+    onSave: (column: any, direction: any) => void;
+    popoverTitle?: string | undefined;
+    LimitPopover: (props: LimitPopoverComponentProps) => JSX.Element;
+    EditPopover: any;
+    TextInput: any;
+    Button: (props: ButtonComponentProps) => JSX.Element;
+    SecondaryButton: (props: ButtonComponentProps) => JSX.Element;
+}) => import("react/jsx-runtime").JSX.Element;
 export interface AddLimitPopoverProps {
     onSave: (limit: number) => void;
     initialLimit?: number;

package/dist/cjs/components/ReportBuilder/AddLimitPopover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AddLimitPopover.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddLimitPopover.tsx"],"names":[],"mappings":";AAEA,OAAO,EACL,oBAAoB,EAIpB,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AAUzB,eAAO,MAAM,aAAa,4IAYvB,GAAG,4CAoCL,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC5D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IACtD,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CAChE;AAED,eAAO,MAAM,eAAe,oFAQzB,oBAAoB,4CA+CtB,CAAC"}
+{"version":3,"file":"AddLimitPopover.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddLimitPopover.tsx"],"names":[],"mappings":";AACA,OAAO,EACL,oBAAoB,EAIpB,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,0BAA0B,EAAE,MAAM,MAAM,CAAC;AAElD,eAAO,MAAM,aAAa;WAYjB,GAAG;kBACI,MAAM,IAAI;0BACF,GAAG,KAAK,IAAI;qBACjB,GAAG,aAAa,GAAG,KAAK,IAAI;;0BAEvB,0BAA0B,KAAK,WAAW;iBACnD,GAAG;eACL,GAAG;oBACE,oBAAoB,KAAK,WAAW;6BAC3B,oBAAoB,KAAK,WAAW;6CAiC9D,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC5D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IACtD,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CAChE;AAED,eAAO,MAAM,eAAe,oFAQzB,oBAAoB,4CA8CtB,CAAC"}

package/dist/cjs/components/ReportBuilder/AddLimitPopover.js

@@ -5,26 +5,16 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const UiComponents_1 = require("../UiComponents");
 const Context_1 = require("../../Context");
-const SORT_VALUE_TO_LABEL = {
-    ASC: 'ascending',
-    DESC: 'descending',
-};
-const LimitSentence = ({ limit, handleDelete, setOpenPopover, onSave, popoverTitle = 'Edit limit', LimitPopover, EditPopover, TextInput = UiComponents_1.QuillTextInput, Button = UiComponents_1.MemoizedButton, SecondaryButton = UiComponents_1.MemoizedSecondaryButton, children, }) => {
+const LimitSentence = ({ limit, handleDelete, setOpenPopover, onSave, popoverTitle = 'Edit limit', LimitPopover, EditPopover, TextInput = UiComponents_1.QuillTextInput, Button = UiComponents_1.MemoizedButton, SecondaryButton = UiComponents_1.MemoizedSecondaryButton, }) => {
     const [isOpen, setIsOpen] = (0, react_1.useState)(false);
     const handleClickDelete = (e) => {
         setOpenPopover(null);
         handleDelete();
     };
-    return ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' }, children: (0, jsx_runtime_1.jsx)(LimitPopover
-        // @ts-ignore
-        , { 
-            // @ts-ignore
-            filterLabel: `limit ${limit.value[0].value}`, onClickDelete: handleClickDelete, popoverTitle: popoverTitle, popoverChildren: (0, jsx_runtime_1.jsx)(EditPopover, { onSave: (column, direction) => {
+    return ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' }, children: (0, jsx_runtime_1.jsx)(LimitPopover, { isOpen: isOpen, setIsOpen: setIsOpen, limitLabel: `limit ${limit.value[0].value}`, onClickDelete: handleClickDelete, popoverTitle: popoverTitle, popoverChildren: (0, jsx_runtime_1.jsx)(EditPopover, { onSave: (column, direction) => {
                     setIsOpen(false);
                     onSave(column, direction);
-                }, isEdit: true, onDelete: handleClickDelete, initialLimit: limit.value[0].value, TextInput: TextInput, Button: Button, SecondaryButton: SecondaryButton }), isOpen: isOpen, setIsOpen: setIsOpen, onDelete: () => {
-                handleDelete();
-            } }) }));
+                }, isEdit: true, onDelete: handleClickDelete, initialLimit: limit.value[0].value, TextInput: TextInput, Button: Button, SecondaryButton: SecondaryButton }) }) }));
 };
 exports.LimitSentence = LimitSentence;
 const AddLimitPopover = ({ onSave, initialLimit = 0, isEdit = false, onDelete = () => { }, TextInput = UiComponents_1.QuillTextInput, Button = UiComponents_1.MemoizedButton, SecondaryButton = UiComponents_1.MemoizedSecondaryButton, }) => {
@@ -35,7 +25,7 @@ const AddLimitPopover = ({ onSave, initialLimit = 0, isEdit = false, onDelete =
                     flexDirection: 'row',
                     gap: 12,
                     padding: '6px 0px',
-                }, children: (0, jsx_runtime_1.jsx)(TextInput, { id: 'add_limit_input', value: limit, width: 200, 
+                }, children: (0, jsx_runtime_1.jsx)(TextInput, { id: 'add_limit_input', value: limit.toString() ?? initialLimit.toString(), width: 200, 
                     // style={{ minHeight: 32, padding: '6px 12px' }}
                     onChange: (e) => {
                         if (Number.isNaN(parseFloat(e.target.value || '0'))) {

package/dist/cjs/components/ReportBuilder/AddSortPopover.d.ts

@@ -1,3 +1,23 @@
-export declare const SortSentence: ({ sortData, keyPrefix, columns, handleDelete, setEditPopoverKey, setOpenPopover, setActiveEditItem, setIsPending, setActivePath, onSave, popoverTitle, SortPopover, EditPopover, Select, Button, SecondaryButton, children, }: any) => import("react/jsx-runtime").JSX.Element | null;
+/// <reference types="react" />
+import { ButtonComponentProps, SelectComponentProps } from '../UiComponents';
+import { SortPopoverComponentProps } from './ui';
+export declare const SortSentence: ({ sortData, keyPrefix, columns, handleDelete, setEditPopoverKey, setOpenPopover, setActiveEditItem, setIsPending, setActivePath, onSave, popoverTitle, SortPopover, EditPopover, Select, Button, SecondaryButton, }: {
+    sortData: any;
+    columns: any;
+    setIsPending: any;
+    setEditPopoverKey: any;
+    setActiveEditItem: any;
+    setOpenPopover: any;
+    setActivePath: any;
+    keyPrefix?: any;
+    handleDelete: any;
+    onSave: any;
+    popoverTitle?: string | undefined;
+    SortPopover: (props: SortPopoverComponentProps) => JSX.Element;
+    EditPopover: any;
+    Select?: ((props: SelectComponentProps) => JSX.Element) | undefined;
+    Button?: ((props: ButtonComponentProps) => JSX.Element) | undefined;
+    SecondaryButton?: ((props: ButtonComponentProps) => JSX.Element) | undefined;
+}) => import("react/jsx-runtime").JSX.Element | null;
 export declare const AddSortPopover: ({ onSave, columns, isEdit, onDelete, column, Select, Button, SecondaryButton, }: any) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=AddSortPopover.d.ts.map

package/dist/cjs/components/ReportBuilder/AddSortPopover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AddSortPopover.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddSortPopover.tsx"],"names":[],"mappings":"AAYA,eAAO,MAAM,YAAY,kOAkBtB,GAAG,mDA8CL,CAAC;AAEF,eAAO,MAAM,cAAc,oFASxB,GAAG,4CAiEL,CAAC"}
+{"version":3,"file":"AddSortPopover.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddSortPopover.tsx"],"names":[],"mappings":";AAEA,OAAO,EACL,oBAAoB,EAGpB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,yBAAyB,EAAE,MAAM,MAAM,CAAC;AAOjD,eAAO,MAAM,YAAY;cAkBb,GAAG;aACJ,GAAG;kBACE,GAAG;uBACE,GAAG;uBACH,GAAG;oBACN,GAAG;mBACJ,GAAG;gBACN,GAAG;kBACD,GAAG;YACT,GAAG;;yBAEU,yBAAyB,KAAK,WAAW;iBACjD,GAAG;sBACC,oBAAoB,KAAK,WAAW;sBACpC,oBAAoB,KAAK,WAAW;+BAC3B,oBAAoB,KAAK,WAAW;oDAoD/D,CAAC;AAEF,eAAO,MAAM,cAAc,oFASxB,GAAG,4CA6DL,CAAC"}

package/dist/cjs/components/ReportBuilder/AddSortPopover.js

@@ -5,14 +5,21 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const QuillSelect_1 = require("../QuillSelect");
 const UiComponents_1 = require("../UiComponents");
-const Context_1 = require("../../Context");
 const textProcessing_1 = require("../../utils/textProcessing");
 const SORT_VALUE_TO_LABEL = {
     ASC: 'ascending',
     DESC: 'descending',
 };
-const SortSentence = ({ sortData, keyPrefix, columns, handleDelete, setEditPopoverKey, setOpenPopover, setActiveEditItem, setIsPending, setActivePath, onSave, popoverTitle = 'Edit Sort', SortPopover, EditPopover, Select = QuillSelect_1.QuillSelectComponent, Button = UiComponents_1.MemoizedButton, SecondaryButton = UiComponents_1.MemoizedSecondaryButton, children, }) => {
+const SortSentence = ({ sortData, keyPrefix, columns, handleDelete, setEditPopoverKey, setOpenPopover, setActiveEditItem, setIsPending, setActivePath, onSave, popoverTitle = 'Edit Sort', SortPopover, EditPopover, Select = QuillSelect_1.QuillSelectComponent, Button = UiComponents_1.MemoizedButton, SecondaryButton = UiComponents_1.MemoizedSecondaryButton, }) => {
     const [isOpen, setIsOpen] = (0, react_1.useState)(false);
+    const handleSetIsOpen = (isOpen) => {
+        setIsOpen(isOpen);
+        if (!isOpen) {
+            setIsPending(false);
+            setActiveEditItem(null);
+            setActivePath(null);
+        }
+    };
     const handleClickDelete = (e) => {
         e.stopPropagation(); // don't call onClick handler
         setIsPending(false);
@@ -24,38 +31,29 @@ const SortSentence = ({ sortData, keyPrefix, columns, handleDelete, setEditPopov
     if (!sortData && (!sortData.expr.column || !sortData.expr.value)) {
         return null;
     }
-    return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(SortPopover
-        // @ts-ignore
-        , { 
-            // @ts-ignore
-            filterLabel: `${(0, textProcessing_1.snakeCaseToTitleCase)(sortData.expr.column) || (0, textProcessing_1.snakeCaseToTitleCase)(sortData.expr.value)} ${SORT_VALUE_TO_LABEL[sortData.type]}`, onClickDelete: handleClickDelete, popoverTitle: popoverTitle, popoverChildren: (0, jsx_runtime_1.jsx)(EditPopover, { onSave: (column, direction) => {
+    return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(SortPopover, { isOpen: isOpen, setIsOpen: handleSetIsOpen, sortLabel: `${(0, textProcessing_1.snakeCaseToTitleCase)(sortData.expr.column) || (0, textProcessing_1.snakeCaseToTitleCase)(sortData.expr.value)} ${SORT_VALUE_TO_LABEL[sortData.type]}`, onClickDelete: handleClickDelete, popoverTitle: popoverTitle, popoverChildren: (0, jsx_runtime_1.jsx)(EditPopover, { onSave: (column, direction) => {
                     setIsOpen(false);
                     onSave(column, direction);
-                }, columns: columns, isEdit: true, onDelete: handleClickDelete, column: sortData.expr.column || sortData.expr.value, Select: Select, Button: Button, SecondaryButton: SecondaryButton }), isOpen: isOpen, setIsOpen: setIsOpen, onDelete: () => {
-                setIsPending(false);
-                setActiveEditItem(null);
-                setActivePath(null);
-            } }) }));
+                }, columns: columns, isEdit: true, onDelete: handleClickDelete, column: sortData.expr.column || sortData.expr.value, Select: Select, Button: Button, SecondaryButton: SecondaryButton }) }) }));
 };
 exports.SortSentence = SortSentence;
 const AddSortPopover = ({ onSave, columns, isEdit, onDelete, column, Select = QuillSelect_1.QuillSelectComponent, Button = UiComponents_1.MemoizedButton, SecondaryButton = UiComponents_1.MemoizedSecondaryButton, }) => {
     const [sortColumn, setSortColumn] = (0, react_1.useState)(column || '');
     const [sortDirection, setSortDirection] = (0, react_1.useState)('ASC');
-    const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     return ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'column', gap: 12 }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
                     display: 'flex',
                     flexDirection: 'row',
                     gap: 12,
                     padding: '6px 0px',
-                }, children: [(0, jsx_runtime_1.jsx)(Select, { theme: theme, value: sortColumn, onChange: (value) => {
-                            setSortColumn(value);
+                }, children: [(0, jsx_runtime_1.jsx)(Select, { value: sortColumn, onChange: (e) => {
+                            setSortColumn(e.target.value);
                         }, options: [
                             ...columns.map((column) => ({
                                 label: (0, textProcessing_1.snakeCaseToTitleCase)(column.split('.')[1] || ''),
                                 value: column.split('.')[1],
                             })),
-                        ] }), (0, jsx_runtime_1.jsx)(Select, { theme: theme, value: sortDirection, onChange: (value) => {
-                            setSortDirection(value);
+                        ] }), (0, jsx_runtime_1.jsx)(Select, { value: sortDirection, onChange: (e) => {
+                            setSortDirection(e.target.value);
                         }, options: [
                             { label: 'Ascending', value: 'ASC' },
                             { label: 'Descending', value: 'DESC' },

package/dist/cjs/components/ReportBuilder/bigDateMap.js

@@ -251,7 +251,7 @@ exports.DATE_DESCRIPTION_MAP = {
                 },
             },
         },
-    })]: (node) => `${cleanDateFieldName(node.left.args.value[1].column)} in the last ${node.right.right.expr.value.toLowerCase()}`,
+    })]: (node) => `${cleanDateFieldName(node.left.args.value[1].column)} in the previous ${node.right.right.expr.value.toLowerCase()}`,
     [JSON.stringify({
         type: 'binary_expr',
         left: {

package/dist/cjs/components/ReportBuilder/convert.d.ts

@@ -20,8 +20,9 @@ export declare function convertGroupBy(ast: AST, prevPivot: Pivot | undefined, s
     pivot: Pivot;
 } | {
     pivot: Partial<{
-        aggregationType: "sum" | "average" | "count" | "min" | "max";
+        aggregationType: "sum" | "average" | "count" | "min" | "max" | "avg";
         valueField: string;
+        valueFieldType?: string | undefined;
         rowField?: string | undefined;
         rowFieldType?: string | undefined;
         columnField?: string | undefined;

package/dist/cjs/components/ReportBuilder/convert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAMJ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAc,SAAS,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAuCpD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,SAAS,EAAE,GACxB,GAAG,CAAC,MAAM,CAwBZ;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,SAAS,mBAAc,EACvB,YAAY,EAAE,SAAS,EAAE;;;;;;;;;;;;;;EA8b1B;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;EA6G5D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyJtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E"}
+{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAMJ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAc,SAAS,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAuCpD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,SAAS,EAAE,GACxB,GAAG,CAAC,MAAM,CAwBZ;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,SAAS,mBAAc,EACvB,YAAY,EAAE,SAAS,EAAE;;;;;;;;;;;;;;;EAwd1B;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;EA6G5D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyJtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E"}