@quillsql/react 2.13.1 → 2.13.3

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

@@ -28,38 +28,69 @@ const constructReportFromItem = (item) => {
         filtersApplied: item.filtersApplied,
     };
 };
-function DataLoader({ item, children, filters, }) {
+function filterValuesEquivalent(filters1, filters2) {
+    if (filters1.length !== filters2.length) {
+        return false;
+    }
+    // The two filters arrays aren't necessarily in the same order
+    // we can build two dictionaries of [label, filter] and compare them
+    const mappedFilters1 = filters1.reduce((acc, filter) => {
+        acc[filter.label] = filter;
+        return acc;
+    }, {});
+    const mappedFilters2 = filters2.reduce((acc, filter) => {
+        acc[filter.label] = filter;
+        return acc;
+    }, {});
+    for (const key in mappedFilters1) {
+        if (mappedFilters1[key].selectedValue !==
+            mappedFilters2[key]?.selectedValue ||
+            mappedFilters1[key].values !== mappedFilters2[key]?.values ||
+            mappedFilters1[key].field !== mappedFilters2[key]?.field ||
+            mappedFilters1[key].label !== mappedFilters2[key]?.label ||
+            mappedFilters1[key].table !== mappedFilters2[key]?.table ||
+            mappedFilters1[key].filterType !== mappedFilters2[key]?.filterType ||
+            mappedFilters1[key].startDate !== mappedFilters2[key]?.startDate ||
+            mappedFilters1[key].endDate !== mappedFilters2[key]?.endDate ||
+            mappedFilters1[key].comparisonRange !==
+                mappedFilters2[key]?.comparisonRange) {
+            return false;
+        }
+    }
+    return true;
+}
+function DataLoader({ item, children, filters, additionalProcessing: defaultAdditionalProcessing, }) {
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
     const [dashboard, dispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
     const [loading, setLoading] = (0, react_1.useState)(false);
     const [error, setError] = (0, react_1.useState)(undefined);
     const [previousPage, setPreviousPage] = (0, react_1.useState)(0);
-    const [report, setReport] = (0, react_1.useState)(dashboard[item._id] ?? constructReportFromItem(item));
-    const [additionalProcessing, setAdditionProcessing] = (0, react_1.useState)({
-        page: paginationProcessing_1.DEFAULT_PAGINATION,
-    });
+    const [report, setReport] = (0, react_1.useState)(dashboard[item.id] ?? constructReportFromItem(item));
+    const [additionalProcessing, setAdditionProcessing] = (0, react_1.useState)(defaultAdditionalProcessing);
     const previousFilters = (0, react_1.useRef)(null);
-    const [rowCount, setRowCount] = (0, react_1.useState)(dashboard[item._id]?.rowCount ?? 0);
+    const [rowCount, setRowCount] = (0, react_1.useState)(dashboard[item.id]?.rowCount ?? 0);
     const [rowCountIsLoading, setRowCountIsLoading] = (0, react_1.useState)(false);
     const fetchRowCount = async (processing) => {
         if (!client || !filters) {
             return;
         }
         setRowCountIsLoading(true);
-        const rowCount = await (0, report_1.fetchReportRowCount)(item._id, client, true, filters, processing, schemaData.customFields);
-        dispatch({
-            type: 'UPDATE_DASHBOARD_ITEM',
-            id: item._id,
-            data: { rowCount },
-        });
-        setRowCount(rowCount);
+        const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, true, filters, processing, schemaData.customFields);
+        if (rowCount) {
+            dispatch({
+                type: 'UPDATE_DASHBOARD_ITEM',
+                id: item.id,
+                data: { rowCount },
+            });
+            setRowCount(rowCount);
+        }
         setRowCountIsLoading(false);
     };
     const onPageChange = (page) => {
         if (additionalProcessing &&
             additionalProcessing.page &&
-            (0, paginationProcessing_1.shouldFetchMore)(paginationProcessing_1.DEFAULT_PAGINATION, page, previousPage)) {
+            (0, paginationProcessing_1.shouldFetchMore)(additionalProcessing.page, page, previousPage)) {
             const newPagination = { ...additionalProcessing.page, page };
             const updatedProcessing = {
                 ...additionalProcessing,
@@ -89,7 +120,7 @@ function DataLoader({ item, children, filters, }) {
             setLoading(true);
             try {
                 const updatedProcessing = { ...additionalProcessing, ...processing };
-                const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(report.id, client, updatedProcessing, filters, schemaData.customFields);
+                const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(report.id, client, updatedProcessing, filters, schemaData.customFields, true);
                 if (paginatedRows.error) {
                     throw new Error('Error fetching chart');
                 }
@@ -111,26 +142,26 @@ function DataLoader({ item, children, filters, }) {
         if (!client || !filters) {
             return;
         }
-        if (dashboard[item._id] &&
-            !(0, Chart_1.didFiltersChange)(dashboard[item._id], filters) &&
+        if (dashboard[item.id] &&
+            !(0, Chart_1.didFiltersChange)(dashboard[item.id], filters) &&
             !loading &&
             // @ts-ignore
-            !dashboard[item._id].triggerReload) {
+            !dashboard[item.id].triggerReload) {
             setLoading(false);
             const convertedReport = (0, report_1.convertInternalReportToReport)(
             // @ts-ignore
-            dashboard[item._id]);
+            dashboard[item.id]);
             setReport(convertedReport);
             return;
         }
         setLoading(true);
-        const { report: fetchedReport, error } = await (0, report_1.fetchReport)(item._id, client, true, filters, processing, undefined, schemaData.customFields);
-        fetchRowCount(processing);
+        const { report: fetchedReport, error } = await (0, report_1.fetchReport)(item.id, client, true, filters, processing, undefined, schemaData.customFields, true);
         dispatch({
             type: 'ADD_DASHBOARD_ITEM',
-            id: item._id,
-            data: { ...fetchedReport, triggerReload: false },
+            id: item.id,
+            data: { ...fetchedReport, triggerReload: false, rowCount: 0 }, // rowCount 0 indicates it's still loading if row length is nonzero
         });
+        fetchRowCount(processing);
         const convertedReport = (0, report_1.convertInternalReportToReport)(fetchedReport);
         setReport(convertedReport);
         setAdditionProcessing(processing);
@@ -146,50 +177,21 @@ function DataLoader({ item, children, filters, }) {
             return;
         }
         previousFilters.current = filters;
+        setPreviousPage(0);
         fetchReportHelper(additionalProcessing);
-    }, [filters, item._id]);
-    function filterValuesEquivalent(filters1, filters2) {
-        if (filters1.length !== filters2.length) {
-            return false;
-        }
-        // The two filters arrays aren't necessarily in the same order
-        // we can build two dictionaries of [label, filter] and compare them
-        const mappedFilters1 = filters1.reduce((acc, filter) => {
-            acc[filter.label] = filter;
-            return acc;
-        }, {});
-        const mappedFilters2 = filters2.reduce((acc, filter) => {
-            acc[filter.label] = filter;
-            return acc;
-        }, {});
-        for (const key in mappedFilters1) {
-            if (mappedFilters1[key].selectedValue !==
-                mappedFilters2[key]?.selectedValue ||
-                mappedFilters1[key].values !== mappedFilters2[key]?.values ||
-                mappedFilters1[key].field !== mappedFilters2[key]?.field ||
-                mappedFilters1[key].label !== mappedFilters2[key]?.label ||
-                mappedFilters1[key].table !== mappedFilters2[key]?.table ||
-                mappedFilters1[key].filterType !== mappedFilters2[key]?.filterType ||
-                mappedFilters1[key].startDate !== mappedFilters2[key]?.startDate ||
-                mappedFilters1[key].endDate !== mappedFilters2[key]?.endDate) {
-                return false;
-            }
-        }
-        return true;
-    }
+    }, [filters, item.id]);
     (0, react_1.useEffect)(() => {
-        // @ts-ignore
-        if (dashboard[item._id] && dashboard[item._id].triggerReload) {
+        if (dashboard[item.id]?.triggerReload) {
             fetchReportHelper(additionalProcessing);
         }
-    }, [dashboard[item._id]]);
+    }, [dashboard[item.id]]);
     return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children({
             isLoading: loading,
             error,
             onPageChange,
             onSortChange,
             data: report,
-            rowCount,
+            rowCount: report.pivot ? report.rowCount : rowCount,
             rowCountIsLoading,
         }) }));
 }
@@ -202,36 +204,37 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
     const [loading, setLoading] = (0, react_1.useState)(false);
     const [error, setError] = (0, react_1.useState)(undefined);
     const [localDateBucket, setLocalDateBucket] = (0, react_1.useState)(undefined);
-    const [localAdditionalProcessing, setLocalAdditionalProcessing] = (0, react_1.useState)();
-    const [report, setReport] = (0, react_1.useState)(dashboard[item._id] ?? constructReportFromItem(item));
+    const [report, setReport] = (0, react_1.useState)(dashboard[item.id] ?? constructReportFromItem(item));
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
+    const previousFilters = (0, react_1.useRef)(null);
     const fetchReportHelper = async (useReportTask = true) => {
         if (!client || !filters) {
             return;
         }
-        const tempReport = dashboard[item._id];
+        const tempReport = dashboard[item.id];
         if (tempReport &&
             !(0, Chart_1.didFiltersChange)(tempReport, filters) &&
             !tempReport.triggerReload &&
-            dateBucket === localDateBucket &&
-            additionalProcessing?.last === localAdditionalProcessing?.last) {
+            dateBucket === localDateBucket) {
             setLoading(false);
             const convertedReport = (0, report_1.convertInternalReportToReport)(tempReport);
             setReport(convertedReport);
             return;
         }
         setLoading(true);
-        const { report, error } = await (0, report_1.fetchReport)(item._id, client, useReportTask, filters, additionalProcessing, dateBucket, schemaData.customFields);
+        const { report, error } = await (0, report_1.fetchReport)(item.id, client, useReportTask, filters, {
+            ...additionalProcessing,
+            ...(item.pivot ? {} : { page: paginationProcessing_1.DEFAULT_PAGINATION }),
+        }, dateBucket, schemaData.customFields);
         dispatch({
             type: 'ADD_DASHBOARD_ITEM',
-            id: item._id,
+            id: item.id,
             data: { ...report, triggerReload: false },
         });
         const convertedReport = (0, report_1.convertInternalReportToReport)(report);
         setReport(convertedReport);
         setLocalDateBucket(dateBucket);
-        setLocalAdditionalProcessing(additionalProcessing);
         setError(error);
         setLoading(false);
     };
@@ -239,15 +242,20 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
         if (!filters) {
             return;
         }
+        if (previousFilters.current &&
+            filterValuesEquivalent(previousFilters.current, filters)) {
+            return;
+        }
+        previousFilters.current = filters;
         setInitialLoad(false);
         fetchReportHelper();
-    }, [filters, item._id, dateBucket, additionalProcessing]);
+    }, [filters, item.id, dateBucket]);
     (0, react_1.useEffect)(() => {
-        const tempReport = dashboard[item._id];
+        const tempReport = dashboard[item.id];
         if (tempReport && tempReport.triggerReload) {
             fetchReportHelper();
         }
-    }, [dashboard[item._id]]);
+    }, [dashboard[item.id]]);
     return children({
         isLoading: loading || initialLoad,
         data: report,

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

@@ -1 +1 @@
-{"version":3,"file":"MetricComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/MetricComponent.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAMnD,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,MAAM,EACN,OAAO,EACP,KAAK,EACL,SAAS,GACV,EAAE,gBAAgB,GAAG,GAAG,CAAC,OAAO,CA+MhC"}
+{"version":3,"file":"MetricComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/MetricComponent.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAMnD,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,MAAM,EACN,OAAO,EACP,KAAK,EACL,SAAS,GACV,EAAE,gBAAgB,GAAG,GAAG,CAAC,OAAO,CA2NhC"}

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

@@ -15,8 +15,8 @@ function QuillMetricComponent({ report, onClick, error, isLoading, }) {
     const primaryMetricLabel = report?.filtersApplied?.date_range?.preset?.label;
     const comparisonKey = report?.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: () => onClick && !error && onClick(report), style: {
-            cursor: error || !onClick ? 'default' : 'pointer',
+    return ((0, jsx_runtime_1.jsx)("div", { onClick: () => onClick && onClick(report), style: {
+            cursor: !onClick ? 'default' : 'pointer',
             boxSizing: 'content-box',
             borderRadius: 8,
             paddingBottom: isLoading ? 0 : 30,
@@ -56,7 +56,18 @@ function QuillMetricComponent({ report, onClick, error, isLoading, }) {
                                 }, children: report?.name })) }), isLoading ? ((0, jsx_runtime_1.jsx)(ChartSkeleton_1.default, { containerStyle: {
                                 maxHeight: '78px',
                                 height: '100%',
-                            } })) : error ? ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(ChartError_1.default, { errorMessage: error }) })) : report.rows?.length === 0 ||
+                            } })) : error ? ((0, jsx_runtime_1.jsx)(ChartError_1.default, { errorMessage: error, containerStyle: {
+                                display: 'flex',
+                                flex: '1 0 auto',
+                                height: '80%',
+                                margin: 'auto',
+                                justifyContent: 'center',
+                                alignItems: 'center',
+                                fontSize: 13,
+                                color: theme?.secondaryTextColor,
+                                maxWidth: '100%',
+                                width: '100%',
+                            } })) : report.rows?.length === 0 ||
                             report.rows[0][report.xAxisField] === null ? ((0, jsx_runtime_1.jsx)("div", { style: {
                                 display: 'flex',
                                 flex: '1 0 auto',

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":";AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKlD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,YAAY,GACb,EAAE;IACD,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACrE,GAAG,GAAG,CAAC,OAAO,CA0Fd"}
+{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKlD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,YAAY,GACb,EAAE;IACD,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACrE,GAAG,GAAG,CAAC,OAAO,CAkGd"}

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

@@ -15,11 +15,17 @@ function QuillTableComponent({ report, onClick, isLoading, error, rowCount, rowC
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     const [initialLoad, setInitialLoad] = (0, react_1.useState)(true);
     const { downloadCSV } = (0, useExport_1.useExport)(report?.id);
+    const [page, setPage] = (0, react_1.useState)(0);
     (0, react_1.useEffect)(() => {
         if (!isLoading) {
             setInitialLoad(false);
         }
     }, [isLoading]);
+    (0, react_1.useEffect)(() => {
+        if (rowCountIsLoading) {
+            setPage(0);
+        }
+    }, [rowCountIsLoading]);
     return ((0, jsx_runtime_1.jsxs)("div", { style: { cursor: error || !onClick ? 'default' : 'pointer' }, onClick: () => onClick && onClick(report), children: [(0, jsx_runtime_1.jsx)("div", { style: {
                     display: 'flex',
                     flexDirection: 'row',
@@ -52,8 +58,9 @@ function QuillTableComponent({ report, onClick, isLoading, error, rowCount, rowC
                     downloadCSV();
                 }, onPageChange: (page) => {
                     onPageChange && onPageChange(page);
+                    setPage(page);
                 }, onSortChange: (sort) => {
                     onSortChange && onSortChange(sort);
-                }, currentPage: report?.pagination?.page, sort: report?.sort }))] }, report?.name));
+                }, currentPage: report?.pagination?.page ?? page, sort: report?.sort }))] }, report?.name));
 }
 exports.default = QuillTableComponent;

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

@@ -2,7 +2,7 @@ import { MultiSelectComponentProps } from './UiComponents';
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-export declare function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, isLoading, }: MultiSelectComponentProps): import("react/jsx-runtime").JSX.Element;
+export declare function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, isLoading, disabled, }: MultiSelectComponentProps): import("react/jsx-runtime").JSX.Element;
 export declare const ListboxTextInput: ({ value, onChange, placeholder, }: {
     value: string;
     onChange: (e: string) => void;

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

@@ -1 +1 @@
-{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAiC3E;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EACL,SAAS,GACV,EAAE,yBAAyB,2CA4U3B;AAED,eAAO,MAAM,gBAAgB;WAKpB,MAAM;kBACC,MAAM,KAAK,IAAI;iBAChB,MAAM;6CAwDpB,CAAC"}
+{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAiC3E;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EACL,SAAS,EACT,QAAQ,GACT,EAAE,yBAAyB,2CAiV3B;AAED,eAAO,MAAM,gBAAgB;WAKpB,MAAM;kBACC,MAAM,KAAK,IAAI;iBAChB,MAAM;6CAwDpB,CAAC"}

package/dist/cjs/components/QuillMultiSelectWithCombo.js

@@ -47,7 +47,7 @@ function displaySelectedOptionLabels({ options, value, }) {
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, isLoading, }) {
+function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, isLoading, disabled, }) {
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     const [selectedOptions, setSelectedOptions] = (0, react_1.useState)([]);
     const [showModal, setShowModal] = (0, react_1.useState)(false);
@@ -150,8 +150,12 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                     height: 40,
                     minHeight: 40,
                     maxHeight: 40,
-                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [(0, jsx_runtime_1.jsx)("style", { children: ` .quill-select-button { background: ${theme?.backgroundColor}; } 
+                }, className: 'quill-select-button', onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, children: [(0, jsx_runtime_1.jsx)("style", { children: ` .quill-select-button { background: ${theme?.backgroundColor}; } 
           .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }
+          .quill-select-button:disabled {
+            cursor: not-allowed;
+            background: ${theme?.hoverBackgroundColor};
+          }
         ` }), (0, jsx_runtime_1.jsx)("span", { style: {
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',

package/dist/cjs/components/QuillSelect.js

@@ -66,8 +66,8 @@ function QuillSelectComponent({ options, value, width, onChange, label, isLoadin
                 }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, children: [(0, jsx_runtime_1.jsx)("style", { children: ` 
             .quill-select-button { background: ${theme?.backgroundColor}; } 
             .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }
-            .quill-select-button:disabled {
-              opacity: 0.5;
+            .quill-select-button:disabled, {
+              background: ${theme?.hoverBackgroundColor};
               cursor: not-allowed;
             }        
           ` }), (0, jsx_runtime_1.jsx)("span", { style: {
@@ -94,7 +94,7 @@ function QuillSelectComponent({ options, value, width, onChange, label, isLoadin
                     fontFamily: theme?.fontFamily,
                     maxHeight: '50vh',
                     overflow: 'scroll',
-                }, children: [!isLoading && !hideEmptyOption && ((0, jsx_runtime_1.jsxs)("button", { style: {
+                }, children: [!isLoading && (!hideEmptyOption || !options.length) && ((0, jsx_runtime_1.jsxs)("button", { style: {
                             display: 'flex',
                             alignItems: 'center',
                             justifyContent: 'space-between',

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

@@ -2,5 +2,5 @@ import { SelectComponentProps } from './UiComponents';
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-export declare function QuillSelectComponentWithCombo({ options, value, width, onChange, label, isLoading, hideEmptyOption, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
+export declare function QuillSelectComponentWithCombo({ options, value, width, onChange, label, isLoading, hideEmptyOption, disabled, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=QuillSelectWithCombo.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAWtE;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,EACT,eAAe,GAChB,EAAE,oBAAoB,2CA8QtB"}
+{"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAWtE;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,EACT,eAAe,EACf,QAAQ,GACT,EAAE,oBAAoB,2CAyRtB"}

package/dist/cjs/components/QuillSelectWithCombo.js

@@ -33,7 +33,7 @@ const QuillMultiSelectWithCombo_1 = require("./QuillMultiSelectWithCombo");
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-function QuillSelectComponentWithCombo({ options, value, width, onChange, label, isLoading, hideEmptyOption, }) {
+function QuillSelectComponentWithCombo({ options, value, width, onChange, label, isLoading, hideEmptyOption, disabled, }) {
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     const [showModal, setShowModal] = (0, react_1.useState)(false);
     const modalRef = (0, react_1.useRef)(null);
@@ -116,7 +116,15 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
                     height: 40,
                     minHeight: 40,
                     maxHeight: 40,
-                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [(0, jsx_runtime_1.jsx)("style", { children: ` .quill-select-button { background: ${theme?.backgroundColor}; } .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }` }), (0, jsx_runtime_1.jsx)("span", { style: {
+                }, className: 'quill-select-button', onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, children: [(0, jsx_runtime_1.jsx)("style", { children: ` 
+          .quill-select-button { background: ${theme?.backgroundColor}; }
+          .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }
+          .quill-select-button:disabled { 
+            cursor: not-allowed;
+            background: ${theme?.hoverBackgroundColor}; 
+          }
+
+        ` }), (0, jsx_runtime_1.jsx)("span", { style: {
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',
                             overflow: 'hidden',
@@ -143,7 +151,9 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
                     fontSize: 14,
                 }, children: [options && options.length > 20 && !isLoading && ((0, jsx_runtime_1.jsx)(QuillMultiSelectWithCombo_1.ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
                             setSearchQuery(value);
-                        } })), searchQuery === '' && !isLoading && !hideEmptyOption && ((0, jsx_runtime_1.jsxs)("button", { style: {
+                        } })), searchQuery === '' &&
+                        !isLoading &&
+                        (!hideEmptyOption || !options.length) && ((0, jsx_runtime_1.jsxs)("button", { style: {
                             display: 'flex',
                             alignItems: 'center',
                             justifyContent: 'space-between',

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

@@ -8,7 +8,7 @@ export interface TableComponentProps {
         label: string;
         field: string;
     }[];
-    currentPage?: number;
+    currentPage: number;
     sort?: {
         field: string;
         direction: string;

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

@@ -1 +1 @@
-{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAG/D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,gBAAgB,CAAC;AAE7E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,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;IACzB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACrE;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,WAAW,EACX,IAAI,EACJ,qBAA4B,EAC5B,cAAc,EACd,SAAS,EACT,gBAAwC,EACxC,WAAgB,EAChB,eAA8B,EAC9B,WAAW,EACX,YAAY,EACZ,YAAY,GACb,EAAE,mBAAmB,2CAwdrB"}
+{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAG/D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,gBAAgB,CAAC;AAE7E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,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;IACzB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACrE;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,WAAW,EACX,IAAI,EACJ,qBAA4B,EAC5B,cAAc,EACd,SAAS,EACT,gBAAwC,EACxC,WAAgB,EAChB,eAA8B,EAC9B,WAAW,EACX,YAAY,EACZ,YAAY,GACb,EAAE,mBAAmB,2CA+drB"}

package/dist/cjs/components/QuillTable.js

@@ -7,7 +7,6 @@ const Context_1 = require("../Context");
 const UiComponents_1 = require("./UiComponents");
 function QuillTable({ rows, rowCount, rowCountIsLoading, columns, isLoading, currentPage, sort, hideCSVDownloadButton = true, containerStyle, className, LoadingComponent = UiComponents_1.QuillLoadingComponent, rowsPerPage = 10, emptyStateLabel = 'No results', downloadCSV, onPageChange, onSortChange, }) {
     const [activeRows, setActiveRows] = (0, react_1.useState)([]);
-    const [pageIndex, setPageIndex] = (0, react_1.useState)(currentPage || 0);
     const [maxPage, setMaxPage] = (0, react_1.useState)(1);
     const [sortColumn, setSortColumn] = (0, react_1.useState)(sort?.field || '');
     const [sortDirection, setSortDirection] = (0, react_1.useState)(sort?.direction || 'desc');
@@ -23,8 +22,8 @@ function QuillTable({ rows, rowCount, rowCountIsLoading, columns, isLoading, cur
             return;
         }
         setIsPaginating(true);
-        const start = pageIndex * rowsPerPage;
-        const end = (pageIndex + 1) * rowsPerPage;
+        const start = currentPage * rowsPerPage;
+        const end = (currentPage + 1) * rowsPerPage;
         if (rowCount && onSortChange && rowCount !== rows.length) {
             setMaxPage(Math.ceil(rowCount / rowsPerPage));
             setActiveRows(rows.slice(start, end));
@@ -42,25 +41,29 @@ function QuillTable({ rows, rowCount, rowCountIsLoading, columns, isLoading, cur
         }
         setIsPaginating(false);
         setInitialLoad(false);
-    }, [pageIndex, rows, sortColumn, sortDirection, columns, rowCount]);
+    }, [currentPage, rows, sortColumn, sortDirection, columns, rowCount]);
+    (0, react_1.useEffect)(() => {
+        if (rows.length < (currentPage + 1) * rowsPerPage) {
+            onPageChange && onPageChange(0);
+            setMaxPage(1);
+        }
+    }, [rows]);
     const increasePage = () => {
-        if (pageIndex + 1 === maxPage) {
+        if (!rowCountIsLoading && currentPage + 1 === maxPage) {
             return;
         }
-        setPageIndex((pageIndex) => pageIndex + 1);
-        onPageChange && onPageChange(pageIndex + 1);
+        onPageChange && onPageChange(currentPage + 1);
     };
     const decreasePage = () => {
-        if (pageIndex === 0) {
+        if (currentPage === 0) {
             return;
         }
-        setPageIndex((pageIndex) => pageIndex - 1);
-        onPageChange && onPageChange(pageIndex - 1);
+        onPageChange && onPageChange(currentPage - 1);
     };
     const toggleSort = (column) => {
         if (sortColumn === column.field) {
             setSortDirection(sortDirection === 'asc' ? 'desc' : 'asc');
-            setPageIndex(0);
+            onPageChange && onPageChange(0);
             if (onSortChange) {
                 onSortChange({
                     field: column.field,
@@ -71,7 +74,7 @@ function QuillTable({ rows, rowCount, rowCountIsLoading, columns, isLoading, cur
         else {
             setSortColumn(column.field);
             setSortDirection('desc');
-            setPageIndex(0);
+            onPageChange && onPageChange(0);
             if (onSortChange) {
                 onSortChange({
                     field: column.field,
@@ -169,7 +172,7 @@ function QuillTable({ rows, rowCount, rowCountIsLoading, columns, isLoading, cur
                                                             transform: sortDirection === 'desc'
                                                                 ? 'rotate(180deg)'
                                                                 : undefined,
-                                                        }, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M10 3a.75.75 0 01.75.75v10.638l3.96-4.158a.75.75 0 111.08 1.04l-5.25 5.5a.75.75 0 01-1.08 0l-5.25-5.5a.75.75 0 111.08-1.04l3.96 4.158V3.75A.75.75 0 0110 3z", clipRule: "evenodd" }) }))] }, 'sqlcol' + index))) }) }), (isPaginating || isLoading) && ((0, jsx_runtime_1.jsx)("div", { className: className, children: (0, jsx_runtime_1.jsx)(LoadingComponent, {}) })), (activeRows && activeRows.length === 0) ||
+                                                        }, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M10 3a.75.75 0 01.75.75v10.638l3.96-4.158a.75.75 0 111.08 1.04l-5.25 5.5a.75.75 0 01-1.08 0l-5.25-5.5a.75.75 0 111.08-1.04l3.96 4.158V3.75A.75.75 0 0110 3z", clipRule: "evenodd" }) }))] }, 'sqlcol' + index))) }) }), (isPaginating || isLoading) && ((0, jsx_runtime_1.jsx)("div", { className: className, style: { position: 'absolute', width: '100%' }, children: (0, jsx_runtime_1.jsx)(LoadingComponent, {}) })), (activeRows && activeRows.length === 0) ||
                                     (columns && columns.length === 0) ? ((0, jsx_runtime_1.jsx)("div", { style: {
                                         padding: '30px 0',
                                         display: isPaginating || isLoading ? 'none' : 'flex',
@@ -265,7 +268,7 @@ function QuillTable({ rows, rowCount, rowCountIsLoading, columns, isLoading, cur
                                                 fontSize: 12,
                                                 fontFamily: theme?.fontFamily,
                                                 color: theme?.primaryTextColor,
-                                            }, children: [pageIndex + 1, ' of ', rowCountIsLoading && maxPage >= 30 ? 'many' : maxPage] }), (0, jsx_runtime_1.jsx)("div", { style: { width: 8 } }), (0, jsx_runtime_1.jsx)("button", { onClick: (e) => {
+                                            }, children: [currentPage + 1, ' of ', rowCountIsLoading && maxPage > 1 ? 'many' : maxPage] }), (0, jsx_runtime_1.jsx)("div", { style: { width: 8 } }), (0, jsx_runtime_1.jsx)("button", { onClick: (e) => {
                                                 decreasePage();
                                                 e.stopPropagation();
                                             }, style: {

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

@@ -0,0 +1,33 @@
+import { FilterTreeNode } from '../../utils/astFilterProcessing';
+interface FilterStackProps {
+    client: any;
+    filterStack: FilterTreeNode[];
+    filterTree: FilterTreeNode | null;
+    defaultAST: any;
+    baseAst: any;
+    setBaseAst: any;
+    setFormData: any;
+    fetchSqlQuery: any;
+    schemaData: any;
+    defaultColumn: any;
+    defaultTable: any;
+    currentTable: any;
+    initialTableName: string;
+    globalUniqueValues: any;
+    globalUniqueValuesIsLoading: boolean;
+    columns: any;
+    removingFilter: any;
+    setRemovingFilter: any;
+    TabsComponent: any;
+    FilterPopoverComponent: any;
+    FilterModal: any;
+    ButtonComponent: any;
+    SecondaryButtonComponent: any;
+    SelectComponent: any;
+    TextInputComponent: any;
+    MultiSelectComponent: any;
+    actionsEnabled: boolean;
+}
+export default function FilterStack({ client, filterStack, filterTree, defaultAST, baseAst, setBaseAst, setFormData, fetchSqlQuery, schemaData, defaultColumn, defaultTable, currentTable, initialTableName, globalUniqueValues, globalUniqueValuesIsLoading, columns, removingFilter, setRemovingFilter, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled, }: FilterStackProps): import("react/jsx-runtime").JSX.Element;
+export {};
+//# sourceMappingURL=FilterStack.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FilterStack.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterStack.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EAEf,MAAM,iCAAiC,CAAC;AAUzC,UAAU,gBAAgB;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,UAAU,EAAE,cAAc,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,UAAU,EAAE,GAAG,CAAC;IAChB,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,GAAG,CAAC;IACxB,2BAA2B,EAAE,OAAO,CAAC;IACrC,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,EAAE,GAAG,CAAC;IACpB,iBAAiB,EAAE,GAAG,CAAC;IACvB,aAAa,EAAE,GAAG,CAAC;IACnB,sBAAsB,EAAE,GAAG,CAAC;IAC5B,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;IAC9B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,WAAW,EACX,UAAU,EACV,UAAU,EACV,OAAO,EACP,UAAU,EACV,WAAW,EACX,aAAa,EACb,UAAU,EACV,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC3B,OAAO,EACP,cAAc,EACd,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,cAAqB,GACtB,EAAE,gBAAgB,2CAgLlB"}