@quillsql/react 2.13.7 → 2.13.9

package/dist/cjs/ReportBuilder.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = ReportBuilder;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const UiComponents_1 = require("./components/UiComponents");
@@ -72,7 +73,7 @@ const constants_2 = require("./utils/constants");
  * ### Report Builder API
  * @see https://docs.quillsql.com/components/report-builder
  */
-function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void null, onSubmitCreateReport = () => void null, onDiscardChanges = undefined, onSaveChanges = undefined, onCloseChartBuilder = undefined, destinationDashboard = undefined, organizationName = '', ButtonComponent = UiComponents_1.MemoizedButton, SecondaryButtonComponent = UiComponents_1.MemoizedSecondaryButton, DeleteButtonComponent = UiComponents_1.MemoizedDeleteButton, ModalComponent = UiComponents_1.MemoizedModal, TextInputComponent = UiComponents_2.QuillTextInput, SelectComponent = QuillSelect_1.QuillSelectComponent, MultiSelectComponent = QuillMultiSelectWithCombo_1.QuillMultiSelectComponentWithCombo, TableComponent = UiComponents_1.QuillTableSQLEditorComponent, PopoverComponent = UiComponents_1.MemoizedPopover, TabsComponent = UiComponents_1.QuillTabs, 
+function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void null, onSubmitCreateReport = () => void null, onDiscardChanges = undefined, onSaveChanges = undefined, onCloseChartBuilder = undefined, destinationDashboard = undefined, organizationName = '', ButtonComponent = UiComponents_1.MemoizedButton, SecondaryButtonComponent = UiComponents_1.MemoizedSecondaryButton, DeleteButtonComponent = UiComponents_1.MemoizedDeleteButton, ModalComponent = UiComponents_1.MemoizedModal, TextInputComponent = UiComponents_2.QuillTextInput, SelectComponent = QuillSelect_1.QuillSelectComponent, MultiSelectComponent = QuillMultiSelectWithCombo_1.QuillMultiSelectComponentWithCombo, TableComponent = UiComponents_1.QuillTableReportBuilderComponent, PopoverComponent = UiComponents_1.MemoizedPopover, TabsComponent = UiComponents_1.QuillTabs, 
 // CheckboxComponent = MemoizedCheckbox,
 SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer, SelectColumnComponent = ui_1.QuillSelectColumn, DraggableColumnComponent = ui_1.QuillDraggableColumn, SidebarHeadingComponent = ui_1.QuillSidebarHeading, FilterPopoverComponent = ui_1.QuillFilterPopover, SortPopoverComponent = ui_1.QuillSortPopover, LimitPopoverComponent = ui_1.QuillLimitPopover, CardComponent = QuillCard_1.QuillCard, LabelComponent = UiComponents_1.MemoizedLabel, HeaderComponent = UiComponents_1.MemoizedHeader, SubHeaderComponent = UiComponents_1.MemoizedSubHeader, TextComponent = UiComponents_1.MemoizedText, ErrorMessageComponent = UiComponents_1.QuillErrorMessageComponent, ChartBuilderInputRowContainer = UiComponents_1.QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = UiComponents_1.QuillChartBuilderInputColumnContainer, PivotRowContainer = UiComponents_1.QuillPivotRowContainer, PivotColumnContainer = UiComponents_1.QuillPivotColumnContainer, LoadingComponent = UiComponents_1.QuillLoadingComponent, ColumnSearchEmptyState = UiComponents_1.QuillColumnSearchEmptyState, ChartBuilderFormContainer = UiComponents_1.QuillChartBuilderFormContainer, ChartBuilderModalComponent = UiComponents_1.MemoizedModal, isAdminEnabled = false, isAIEnabled = true, showChartBuilderTableFormatOptions = true, containerStyle, className, pivotRecommendationsEnabled = true, reportId, hideCopySQL = true, isChartBuilderHorizontalView = true, onClickChartElement, }) {
     const [dashboard] = (0, react_1.useContext)(Context_1.DashboardContext);
@@ -100,10 +101,11 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
     const [openPopover, setOpenPopover] = (0, react_1.useState)(null);
     const [loading, setLoading] = (0, react_1.useState)(!!initialTableName);
     const [isChartBuilderOpen, setIsChartBuilderOpen] = (0, react_1.useState)(false);
-    const [isAddLoading, setIsAddLoading] = (0, react_1.useState)(false);
     const [isCopying, setIsCopying] = (0, react_1.useState)(false);
     const [dataDisplayed, setDataDisplayed] = (0, react_1.useState)(false);
     const [rows, setRows] = (0, react_1.useState)([]);
+    const [filteredRows, setFilteredRows] = (0, react_1.useState)([]);
+    const [chartBuilderInFilteredPreview, setChartBuilderInFilteredPreview] = (0, react_1.useState)(true);
     const [formattedRows, setFormattedRows] = (0, react_1.useState)([]);
     const [columns, setColumns] = (0, react_1.useState)([]);
     const [tempReport, setTempReport] = (0, react_1.useState)(report_1.EMPTY_INTERNAL_REPORT);
@@ -116,8 +118,8 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
     const [pivotPopUpTitle, setPivotPopUpTitle] = (0, react_1.useState)('Add pivot');
     const [showPivotPopover, setShowPivotPopover] = (0, react_1.useState)(false);
     const [isEditingPivot, setIsEditingPivot] = (0, react_1.useState)(false);
-    const [initialChartLoad, setInitialChartLoad] = (0, react_1.useState)(false);
     const [askedAQuestion, setAskedAQuestion] = (0, react_1.useState)(false);
+    const [askAILoading, setAskAILoading] = (0, react_1.useState)(false);
     const [selectedPivotIndex, setSelectedPivotIndex] = (0, react_1.useState)(-1);
     const [initialLoad, setInitialLoad] = (0, react_1.useState)(!!initialTableName || !!reportId);
     const [currentTable, setCurrentTable] = (0, react_1.useState)(initialTableName || '');
@@ -130,9 +132,14 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
     const [pivotRowField, setPivotRowField] = (0, react_1.useState)(undefined);
     const [pivotColumnField, setPivotColumnField] = (0, react_1.useState)(undefined);
     const [pivotValueField, setPivotValueField] = (0, react_1.useState)(undefined);
+    const [pivotValueField2, setPivotValueField2] = (0, react_1.useState)(undefined);
     const [pivotAggregation, setPivotAggregation] = (0, react_1.useState)(undefined);
+    const [pivotHint, setPivotHint] = (0, react_1.useState)('');
+    /* eslint-disable-next-line */
+    const [pivotError, setPivotError] = (0, react_1.useState)(undefined);
     const [dateRanges, setDateRanges] = (0, react_1.useState)(null);
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
+    const [currentOrganizationId, setCurrentOrganizationId] = (0, react_1.useState)(client.organizationId);
     const [fieldValuesMap, setFieldValuesMap] = (0, react_1.useState)({}); // Mapping of unique values per field, used in string filter 'in' and 'not in'
     const [globalUniqueValues, setGlobalUniqueValues] = (0, react_1.useState)({});
     const [globalUniqueValuesIsLoading, setGlobalUniqueValuesIsLoading] = (0, react_1.useState)(false);
@@ -144,6 +151,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         rowsPerPage: 20,
         rowsPerRequest: 1000,
     };
+    const [unresolvedReportMessage, setUnresolvedReportMessage] = (0, react_1.useState)('');
     (0, react_1.useEffect)(() => {
         if (!client) {
             return;
@@ -217,6 +225,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         }
         let distinctValuesForQuery = {};
         setPivot(newPivot);
+        setPivotHint('');
         if (newPivot.columnField) {
             distinctValuesForQuery = await (0, tableProcessing_1.getUniqueValuesByColumns)([
                 {
@@ -226,11 +235,25 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                 },
             ], activeQuery, [], client, schemaData.customFields ?? []);
         }
-        const pivotedData = await (0, PivotModal_1.generatePivotTable)(newPivot, rows, undefined, false, -1, undefined, dateBucket, tempReport, client, distinctValuesForQuery);
-        setPivotData(pivotedData || []);
-        const formattedRows = formatRows(pivotedData.rows, columns, true, newPivot.aggregationType);
-        setFormattedRows(formattedRows);
-        setTableLoading(false);
+        try {
+            const pivotedData = await (0, PivotModal_1.generatePivotTable)({
+                pivot: newPivot,
+                dateBucket,
+                report: tempReport,
+                client,
+                uniqueValues: distinctValuesForQuery,
+            });
+            setPivotData(pivotedData || []);
+            const formattedRows = formatRows(pivotedData.rows, columns, true, newPivot.aggregationType);
+            setFormattedRows(formattedRows);
+        }
+        catch (e) {
+            if (e instanceof Error)
+                setPivotError(e.message);
+        }
+        finally {
+            setTableLoading(false);
+        }
     };
     const enforceOrderOnColumns = (columnNames) => {
         if (pivot) {
@@ -262,11 +285,13 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
             setLoading(false);
             setDataDisplayed(false);
             setRows([]);
+            setFilteredRows([]);
             setColumns([]);
             setErrorMessage('');
             setFormattedRows([]);
             // setUniqueValues({});
             setPivot(null);
+            setPivotHint('');
             setPivotData(null);
             setRecommendedPivots([]);
         }, 0);
@@ -286,7 +311,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
             uniqueValuesDependenciesRef.current = { client, columns, currentTable };
         }
     }, [client, columns, currentTable, memoizedFetchGlobalUniqueValues]);
-    const formatRows = (rows, columns, pivot, aggregationType) => {
+    const formatRows = (rows, columns, pivot, aggregationType, dateBucket) => {
         const copiedRows = (0, util_1.deepCopy)(rows);
         if (pivot) {
             const formattedRows = copiedRows.map((row) => {
@@ -302,7 +327,9 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                     }
                     else {
                         format = valueFormatter_1.DATE_FORMAT_TYPES.includes(column.format)
-                            ? 'MMM_yyyy'
+                            ? dateBucket
+                                ? (0, dates_1.getDateFormatFromBucket)(dateBucket)
+                                : 'MMM_yyyy'
                             : 'string';
                     }
                     const formattedValue = (0, valueFormatter_1.quillFormat)({
@@ -374,6 +401,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
             });
             const data = await response.json();
             setActiveQuery(data.query);
+            fetchFilteredRows(data.query);
             if (fetchData) {
                 fetchReportFromASTHelper(ast, formData);
             }
@@ -394,7 +422,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         const dateColumnNames = dateColumns.map((column) => {
             return column.field;
         });
-        const dateRanges = await (0, tableProcessing_1.getDateRangeByColumns)(dateColumns, `Select ${dateColumnNames.join(', ')} from ${tableName}`, client, schemaData.customFields ?? []);
+        const dateRanges = await (0, tableProcessing_1.getQueryDateRangeByColumns)(dateColumns, `Select ${dateColumnNames.join(', ')} from ${tableName}`, client, schemaData.customFields ?? []);
         return dateRanges;
     };
     // It's just like getColumnsInPivot but we expand the columnField
@@ -502,10 +530,13 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                 setActiveQuery(query);
             }
             catch (err) {
-                setInitialChartLoad(false);
+                console.error(err);
+                setErrorMessage('Error when loading chart');
             }
         };
-        loadChart();
+        if (reportId) {
+            loadChart();
+        }
     }, [dashboard[reportId || '']]);
     (0, react_1.useEffect)(() => {
         onSchemaChange();
@@ -737,7 +768,8 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         setPreviousPage(0);
     };
     const onFilterPreviewChange = (preview) => {
-        handleRunQuery(currentProcessing, true, preview);
+        setChartBuilderInFilteredPreview(preview);
+        // handleRunQuery(currentProcessing, true, preview);
     };
     const fetchRowCount = async (processing, includeFilters) => {
         if (!client || !activeQuery) {
@@ -749,6 +781,11 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
             : undefined, false, true);
         if (tableInfo.rowCount) {
             setNumberOfRows(tableInfo.rowCount);
+            // @ts-ignore
+            setTempReport((tempReport) => ({
+                ...tempReport,
+                rowCount: tableInfo.rowCount,
+            }));
         }
         setRowCountIsLoading(false);
     };
@@ -757,33 +794,52 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         const tableData = await (0, tableProcessing_1.fetchTableByAST)({ ...ast, where }, client, { page: REPORT_BUILDER_PAGINATION }, undefined, false, true);
         if (tableData.rowCount) {
             setNumberOfRows(tableData.rowCount);
+            // @ts-ignore
+            setTempReport((tempReport) => ({
+                ...tempReport,
+                rowCount: tableData.rowCount,
+            }));
         }
         setRowCountIsLoading(false);
     };
+    const fetchFilteredRows = async (query) => {
+        const filteredTableInfo = await (0, tableProcessing_1.fetchResultsByQuery)(query, client, currentProcessing, schemaData.customFields, specificDashboardFilters, tempReport.dateField, true);
+        if (filteredTableInfo.error) {
+            throw new Error(filteredTableInfo.error);
+        }
+        setFilteredRows([...filteredRows, ...filteredTableInfo.rows]);
+    };
     const handleRunQuery = async (processing, resetRows = false, includeFilters = false) => {
         try {
             setErrorMessage('');
             setTableLoading(true);
-            const tableInfo = await (0, tableProcessing_1.fetchResultsByQuery)(activeQuery, client, processing, schemaData.customFields, includeFilters ? specificDashboardFilters : undefined, includeFilters ? tempReport.dateField : undefined, true);
+            const tableInfo = await (0, tableProcessing_1.fetchResultsByQuery)(activeQuery, client, processing, schemaData.customFields, undefined, undefined, true);
+            const filteredTableInfo = await (0, tableProcessing_1.fetchResultsByQuery)(activeQuery, client, processing, schemaData.customFields, specificDashboardFilters, tempReport.dateField, true);
             if (tableInfo.error) {
                 throw new Error(tableInfo.error);
             }
+            else if (filteredTableInfo.error) {
+                throw new Error(filteredTableInfo.error);
+            }
             else if (tableInfo.rows.length === 0) {
                 throw new Error('No data found');
             }
             fetchRowCount(processing, includeFilters);
             setCurrentProcessing(processing);
             let tempRows = [...rows, ...tableInfo.rows];
+            let tempFilteredRows = [...filteredRows, ...filteredTableInfo.rows];
             if (resetRows) {
                 tempRows = tableInfo.rows;
+                tempFilteredRows = filteredTableInfo.rows;
             }
             setRows(tempRows);
+            setFilteredRows(tempFilteredRows);
             setFormattedRows((0, report_1.formatRowsFromReport)({ rows: tempRows, columns: tableInfo.columns }));
-            setTempReport({
+            setTempReport((tempReport) => ({
                 ...tempReport,
                 rows: tempRows,
                 rowCount: tableInfo.rowCount ?? tempReport.rowCount,
-            });
+            }));
             setColumns(tableInfo.columns);
             setTableLoading(false);
         }
@@ -791,6 +847,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
             setTableLoading(false);
             setErrorMessage('Failed to run SQL query: ' + e.message);
             setRows([]);
+            setFilteredRows([]);
             setColumns([]);
             return;
         }
@@ -819,12 +876,13 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         as: null,
     });
     const updateUniqueValue = (uniqueStrings, table) => {
-        const uniqueStringsObj = {};
+        const uniqueStringsObj = uniqueValues ?? {};
         uniqueStringsObj[table] = uniqueStrings ?? {};
         setUniqueValues(uniqueStringsObj);
         updateFieldValuesMap(uniqueStringsObj, table);
+        return uniqueStringsObj;
     };
-    const fetchReportFromASTHelper = async (baseAst, newFormData, curPivot, curSchema, previousReport) => {
+    const fetchReportFromASTHelper = async (baseAst, newFormData, curPivot, curSchema, previousReport, keepPivotHint = false) => {
         const curFormData = newFormData !== undefined ? newFormData : formData;
         let reportBuilderInfo = undefined;
         try {
@@ -848,6 +906,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
             setErrorMessage('Failed to fetch');
             return;
         }
+        setTempReport(reportBuilderInfo.report);
         fetchRowCountFromAST(baseAst, curFormData);
         const reportTable = reportBuilderInfo.table;
         const reportBuilderInfoColumns = reportBuilderInfo.columns.map((column) => {
@@ -855,39 +914,105 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         });
         const prevFormData = formData;
         const prevTable = currentTable;
+        const prevOrganization = currentOrganizationId;
         setRows(reportBuilderInfo.rows);
-        setColumns(reportBuilderInfo.columns);
-        // setNumberOfRows(reportBuilderInfo.rowCount);
+        setFilteredRows(reportBuilderInfo.rows);
+        if (!(client.databaseType.toLowerCase() === 'bigquery') ||
+            (reportBuilderInfo.rows && reportBuilderInfo.rows.length > 0)) {
+            setColumns(reportBuilderInfo.columns);
+            setSelectedColumns(reportBuilderInfoColumns);
+        }
+        setNumberOfRows(reportBuilderInfo.rowCount);
         setPivot(reportBuilderInfo.pivot);
+        if (!keepPivotHint) {
+            setPivotHint('');
+        }
         setPivotData(reportBuilderInfo.pivotData);
         setDateRanges(reportBuilderInfo.dateRanges);
         setFormattedRows(reportBuilderInfo.formattedRows);
-        setTempReport(reportBuilderInfo.report);
-        setSelectedColumns(reportBuilderInfoColumns);
-        setLoading(false);
         setDataDisplayed(true);
         setCurrentTable(reportBuilderInfo.table);
+        setCurrentOrganizationId(client.organizationId);
         setFormData(curFormData);
         if (reportBuilderInfo.pivot) {
             setPivotRowField(reportBuilderInfo.pivot.rowField);
             setPivotAggregation(reportBuilderInfo.pivot.aggregationType);
             setPivotColumnField(reportBuilderInfo.pivot.columnField);
             setPivotValueField(reportBuilderInfo.pivot.valueField);
+            setPivotValueField2(reportBuilderInfo.pivot.valueField2);
+        }
+        else {
+            setLoading(false);
         }
         setReportInfo(reportBuilderInfo.report);
         // fetch unique values after everything else since it is the most expensive
         if (prevTable !== reportBuilderInfo.table ||
-            !(0, fast_deep_equal_1.default)(prevFormData, curFormData)) {
+            !(0, fast_deep_equal_1.default)(prevFormData, curFormData) ||
+            prevOrganization !== client.organizationId) {
             try {
                 setUniqueValuesIsLoading(true);
+                if (reportBuilderInfo.pivot) {
+                    setUnresolvedReportMessage('Processing pivot selection options...');
+                }
                 const schema = curSchema ?? schemaData.schema;
                 const tableInfo = schema.find((tableInfo) => tableInfo.name === reportBuilderInfo?.table);
                 if (!reportBuilderInfo.table || !tableInfo) {
                     throw new Error('No table found;');
                 }
-                const uniqueStrings = await (0, tableProcessing_1.getUniqueStringValues)(tableInfo.columns, reportBuilderInfo.table, client, schemaData.customFields, undefined, true, reportBuilderInfo.query);
-                updateUniqueValue(uniqueStrings, reportBuilderInfo.table);
+                let query = reportBuilderInfo.query;
+                if (!query) {
+                    const queryResult = await fetchSqlQuery({
+                        ...(0, astProcessing_1.createBasicSelectASTFromColumns)(tableInfo.columns, reportBuilderInfo.table),
+                        where: curFormData,
+                    }, curFormData, false);
+                    if (queryResult.error) {
+                        console.error(queryResult.error);
+                    }
+                    else {
+                        query = queryResult.query;
+                    }
+                }
+                const uniqueStrings = await (0, tableProcessing_1.getUniqueStringValues)(tableInfo.columns, reportBuilderInfo.table, client, schemaData.customFields, undefined, true, query);
+                const newUnique = updateUniqueValue(uniqueStrings, reportBuilderInfo.table);
+                let pivotChanged = false;
+                let newPivot;
+                if (reportBuilderInfo.pivot &&
+                    !isValidPivotForReport(reportBuilderInfo.pivot, newUnique)) {
+                    // try flipping row and column field
+                    newPivot = {
+                        ...reportBuilderInfo.pivot,
+                        rowField: reportBuilderInfo.pivot.columnField,
+                        columnField: reportBuilderInfo.pivot.rowField,
+                    };
+                    if (isValidPivotForReport(newPivot, newUnique)) {
+                        setPivot(newPivot);
+                        pivotChanged = true;
+                        setPivotHint('Flipped pivot row and column fields to maintain validity');
+                    }
+                    else if (isValidPivotForReport({ ...reportBuilderInfo.pivot, columnField: undefined }, newUnique)) {
+                        // try removing column field
+                        newPivot = {
+                            ...reportBuilderInfo.pivot,
+                            columnField: undefined,
+                        };
+                        setPivot(newPivot);
+                        pivotChanged = true;
+                        setPivotHint('Removed column field to maintain validity');
+                    }
+                    else {
+                        setUnresolvedReportMessage('Not a valid pivot');
+                    }
+                }
+                else {
+                    setUnresolvedReportMessage('');
+                }
                 setUniqueValuesIsLoading(false);
+                if (pivotChanged) {
+                    fetchReportFromASTHelper(baseAst, curFormData, newPivot, curSchema, previousReport, true);
+                }
+                else {
+                    setLoading(false);
+                }
             }
             catch (err) {
                 if (err instanceof Error) {
@@ -910,6 +1035,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         }
         try {
             setLoading(true);
+            setAskAILoading(true);
             astInfo = await (0, astProcessing_1.fetchAndProcessASTFromPrompt)(prompt, schemaData.schema, client, pivot, activeQuery);
             if (astInfo.error) {
                 throw new Error(astInfo.error);
@@ -918,10 +1044,16 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         catch (err) {
             if (err instanceof Error) {
                 setErrorMessage(err.message);
-                setLoading(false);
             }
+            setLoading(false);
+            setAskAILoading(false);
             return;
         }
+        // check if pivot works with ReportBuilder constraints
+        if (astInfo.pivot && !isValidPivotForReport(astInfo.pivot)) {
+            astInfo.pivot = null;
+            astInfo.ast.groupby = null;
+        }
         // parse the whereAst first
         const filterTree = (0, astFilterProcessing_1.astToFilterTree)(astInfo.whereAST, client.databaseType?.toLowerCase());
         const cleanAst = filterTree
@@ -931,8 +1063,34 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         astInfo.ast.where = cleanAst;
         setBaseAst(astInfo.ast);
         fetchSqlQuery(astInfo.ast, cleanAst, false);
+        setAskAILoading(false);
         await fetchReportFromASTHelper(astInfo.ast, cleanAst, astInfo.pivot);
     };
+    const isValidPivotForReport = (pivot, uniqueValuesForPivot) => {
+        if (!pivotProcessing_1.isValidPivot) {
+            return false;
+        }
+        const uniqueValuesToCheck = uniqueValuesForPivot ?? uniqueValues;
+        // check that pivot rows and columns
+        const possibleOptions = (0, pivotProcessing_1.getPossiblePivotFieldOptions)(columns, uniqueValuesToCheck[currentTable] ?? {});
+        if (pivot.rowField &&
+            pivot.columnField &&
+            pivot.rowField === pivot.columnField) {
+            return false;
+        }
+        if (pivot.rowField && !possibleOptions.rowFields.includes(pivot.rowField)) {
+            return false;
+        }
+        if (pivot.columnField &&
+            !possibleOptions.columnFields.includes(pivot.columnField)) {
+            return false;
+        }
+        if (pivot.valueField &&
+            !possibleOptions.valueFields.includes(pivot.valueField)) {
+            return false;
+        }
+        return true;
+    };
     const handleDeleteColumn = (name) => {
         if (!baseAst || !baseAst.columns.length || selectedColumns.length === 1) {
             clearAllState();
@@ -965,7 +1123,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         };
         return ((0, jsx_runtime_1.jsx)("div", { style: { ...style }, ref: setNodeRef, children: (0, jsx_runtime_1.jsx)(DraggableColumnComponent, { label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(label), onDelete: onDelete, DragHandle: (props) => ((0, jsx_runtime_1.jsx)("div", { style: {
                         cursor: 'grab',
-                    }, ...attributes, ...listeners, children: (0, jsx_runtime_1.jsx)(props.dragIcon, {}) })), deleteDisabled: loading }) }));
+                    }, ...attributes, ...listeners, children: (0, jsx_runtime_1.jsx)(props.dragIcon, {}) })), deleteDisabled: loading || tableLoading }) }));
     };
     function DraggableColumns() {
         const sensors = (0, core_1.useSensors)((0, core_1.useSensor)(core_1.PointerSensor), (0, core_1.useSensor)(core_1.KeyboardSensor, {
@@ -1042,240 +1200,6 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                         gap: 8,
                     }, children: [columnNamesInAst.map((name) => ((0, jsx_runtime_1.jsx)(DraggableItem, { id: name, label: name, onDelete: () => !loading && handleDeleteColumn(name) }, name))), columnNamesInAst?.length > 0 && (0, jsx_runtime_1.jsx)("div", { style: { height: 6 } })] }) }) }));
     }
-    // TODO: Refactor this part
-    if (loading || initialChartLoad) {
-        return ((0, jsx_runtime_1.jsxs)("div", { style: {
-                display: 'flex',
-                flexDirection: 'row',
-                height: '100%',
-                ...containerStyle,
-            }, className: className, ref: parentRef, children: [(0, jsx_runtime_1.jsxs)(SidebarComponent, { children: [(0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Columns" }), (0, jsx_runtime_1.jsx)(DraggableColumns, {}), (0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => {
-                                        if (!openPopover) {
-                                            setOpenPopover('AddColumnModal');
-                                        }
-                                    }, label: 'Select columns', disabled: true }), (0, jsx_runtime_1.jsx)(ModalComponent, { isOpen: openPopover === 'AddColumnModal', setIsOpen: (isOpen) => {
-                                        if (!isOpen) {
-                                            // delay onClose callback so onClick no-ops
-                                            setTimeout(() => {
-                                                setActiveEditItem(null);
-                                                setActivePath(null);
-                                                setOpenPopover(null);
-                                            }, 100);
-                                        }
-                                    }, title: "Select columns", children: (0, jsx_runtime_1.jsx)(AddColumnModal_1.default, { onSave: () => {
-                                            setActiveEditItem(null);
-                                            setActivePath(null);
-                                            setOpenPopover(null);
-                                        }, orderedColumnNames: orderedColumnNames, setOrderedColumnNames: setOrderedColumnNames, selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, isSelectedAllColumns: isSelectedAllColumns, clearAllState: clearAllState, nameToColumn: nameToColumn, baseAst: baseAst, setBaseAst: (ast) => {
-                                            setBaseAst(ast);
-                                            fetchSqlQuery(ast);
-                                        }, pivot: pivot, initialTableName: initialTableName, defaultAST: constants_1.defaultAST, defaultTable: constants_1.defaultTable, setPivot: setPivot, TextInputComponent: TextInputComponent, SelectColumn: SelectColumnComponent, SecondaryButton: SecondaryButtonComponent, Button: ButtonComponent, ColumnSearchEmptyState: ColumnSearchEmptyState, LoadingComponent: LoadingComponent }) })] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Filters" }), formData && ((0, jsx_runtime_1.jsx)("div", { style: {
-                                        display: 'flex',
-                                        flexDirection: 'column',
-                                        gap: 8,
-                                        marginBottom: 12,
-                                    }, children: (0, jsx_runtime_1.jsx)(FilterStack_1.default, { client: client, filterStack: filterStack, filterTree: filterTree, defaultAST: constants_1.defaultAST, baseAst: baseAst, setBaseAst: setBaseAst, setFormData: setFormData, fetchSqlQuery: fetchSqlQuery, schemaData: schemaData, defaultColumn: constants_1.defaultColumn, defaultTable: constants_1.defaultTable, currentTable: currentTable, initialTableName: initialTableName, globalUniqueValues: globalUniqueValues, globalUniqueValuesIsLoading: globalUniqueValuesIsLoading, columns: columns, removingFilter: removingFilter, setRemovingFilter: setRemovingFilter, TabsComponent: TabsComponent, FilterPopoverComponent: FilterPopoverComponent, FilterModal: FilterModal_1.default, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent, actionsEnabled: false }) })), (0, jsx_runtime_1.jsxs)("div", { style: {
-                                        display: 'flex',
-                                        flexDirection: 'column',
-                                        alignItems: 'flex-start',
-                                    }, children: [(0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => {
-                                                if (!selectedColumns ||
-                                                    selectedColumns.length === 0 ||
-                                                    loading) {
-                                                    return;
-                                                }
-                                                if (!openPopover) {
-                                                    const value = orderedColumnNames[0];
-                                                    const column = value.split('.')[1];
-                                                    const columnType = getColumnTypeByName(column);
-                                                    if ((0, ast_1.isNumericColumnType)(columnType)) {
-                                                        const newSubtree = (0, util_1.deepCopy)(constants_1.defaultNumericComparison);
-                                                        newSubtree.left.column = column;
-                                                        setActiveEditItem(newSubtree);
-                                                    }
-                                                    else {
-                                                        const newSubtree = (0, util_1.deepCopy)(constants_1.defaultEntry);
-                                                        newSubtree.left.args.value[0].column = column;
-                                                        setActiveEditItem(newSubtree);
-                                                    }
-                                                    setOpenPopover('AddFilterPopover');
-                                                    setActivePath('');
-                                                }
-                                            }, label: 'Add filter', disabled: true }), (0, jsx_runtime_1.jsx)("div", { style: {
-                                                position: 'relative',
-                                                ...(openPopover === 'AddFilterPopover' && { top: 12 }),
-                                            }, children: (0, jsx_runtime_1.jsx)(PopoverComponent, { isOpen: openPopover === 'AddFilterPopover', setIsOpen: (isOpen) => {
-                                                    if (!isOpen) {
-                                                        setActivePath(null);
-                                                        setOpenPopover(null);
-                                                        setTimeout(() => {
-                                                            clearCheckboxes();
-                                                            setActiveEditItem(null);
-                                                        }, 300);
-                                                    }
-                                                }, popoverTitle: 'Add filter', popoverChildren: (0, jsx_runtime_1.jsx)(FilterModal_1.default, { schema: schemaData.schema.find((s) => s.name === currentTable ||
-                                                        s.displayName === currentTable) ?? schemaData.schema[0], fieldValuesMap: uniqueValues[(0, ast_1.getTableNames)(baseAst).length === 1
-                                                        ? (0, ast_1.getTableNames)(baseAst)[0]
-                                                        : initialTableName], fieldValuesMapIsLoading: uniqueValuesIsLoading, onSubmitFilter: (filter) => {
-                                                        setOpenPopover(null);
-                                                        const item = (0, astFilterProcessing_1.filterToAst)(filter, client.databaseType.toLowerCase());
-                                                        handleInsertion(item, 'AND', false);
-                                                    }, onDeleteFilter: () => { }, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, SecondaryButtonComponent: SecondaryButtonComponent, MultiSelectComponent: MultiSelectComponent }) }) })] })] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Pivot" }), (0, jsx_runtime_1.jsx)(PivotModal_1.PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, CardComponent: CardComponent, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, PopoverComponent: PopoverComponent, TextComponent: TextComponent, ErrorMessageComponent: ErrorMessageComponent, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, LoadingComponent: LoadingComponent, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEditingPivot, setShowUpdatePivot: setIsEditingPivot, parentRef: parentRef, data: rows, columns: columns, triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
-                                        setPivot(null);
-                                        setPivotData(null);
-                                        const formattedRows = formatRows(rows, columns, false);
-                                        setFormattedRows(formattedRows);
-                                    }, 
-                                    // TODOs
-                                    selectPivot: () => {
-                                        return;
-                                    }, selectPivotOnEdit: true, showTrigger: !pivot, theme: theme, LabelComponent: LabelComponent, HeaderComponent: HeaderComponent, dateRange: undefined, pivotCountRequest: 4, SecondaryButtonComponent: SecondaryButtonComponent, query: activeQuery, initialUniqueValues: uniqueValues[currentTable], disabled: true, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, report: tempReport ?? reportInfo }), pivot && ((0, jsx_runtime_1.jsx)(PivotForm_1.default, { columns: columns, uniqueValues: uniqueValues[currentTable], uniqueValuesIsLoading: uniqueValuesIsLoading, setPivotRowField: (value) => {
-                                        setPivotRowField(value);
-                                    }, setPivotColumnField: setPivotColumnField, setPivotValueField: setPivotValueField, setPivotAggregation: setPivotAggregation, pivotRowField: pivotRowField, pivotColumnField: pivotColumnField, pivotValueField: pivotValueField, pivotAggregation: pivotAggregation, onDelete: () => {
-                                        setPivot(null);
-                                        setPivotData([]);
-                                        const formattedRows = formatRows(rows, columns, false);
-                                        setFormattedRows(formattedRows);
-                                    }, isLoading: tableLoading, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, PivotColumnContainer: PivotColumnContainer }))] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Sort" }), pivot && pivot.sort && ((0, jsx_runtime_1.jsx)("div", { style: {
-                                        display: 'flex',
-                                        flexDirection: 'column',
-                                        gap: 8,
-                                        marginBottom: 12,
-                                    }, children: (0, jsx_runtime_1.jsx)(AddSortPopover_1.SortSentence, { sortData: {
-                                            type: pivot.sortDirection,
-                                            expr: { type: 'column_ref', column: pivot.sortField },
-                                        }, columns: selectedColumns, setIsPending: () => { }, setEditPopoverKey: () => { }, setActiveEditItem: setActiveEditItem, setActivePath: setActivePath, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover_1.AddSortPopover, handleDelete: () => {
-                                            setPivot({ ...pivot, sort: false });
-                                            setBaseAst((0, util_1.deepCopy)(baseAst));
-                                            if (!pivot) {
-                                                fetchSqlQuery(baseAst);
-                                            }
-                                        }, onSave: (column, direction) => {
-                                            const sortFieldType = column === (pivot.valueField || 'count')
-                                                ? 'number'
-                                                : pivot.rowFieldType;
-                                            setPivot({
-                                                ...pivot,
-                                                sort: true,
-                                                sortDirection: direction,
-                                                sortField: column,
-                                                sortFieldType: sortFieldType,
-                                            });
-                                            setOpenPopover(null);
-                                            setBaseAst((0, util_1.deepCopy)(baseAst));
-                                            if (!pivot) {
-                                                fetchSqlQuery(baseAst);
-                                            }
-                                        }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent }, `sort-sentence-pivot`) })), baseAst && baseAst.orderby && ((0, jsx_runtime_1.jsx)("div", { style: {
-                                        display: 'flex',
-                                        flexDirection: 'column',
-                                        gap: 8,
-                                        marginBottom: 12,
-                                    }, children: baseAst.orderby.map((sortData, id) => ((0, jsx_runtime_1.jsx)(AddSortPopover_1.SortSentence, { sortData: sortData, columns: selectedColumns, onSave: (column, direction) => {
-                                            setActiveEditItem(null);
-                                            setOpenPopover(null);
-                                            if (column === '')
-                                                return;
-                                            const newAst = { ...baseAst };
-                                            newAst.orderby[id] = {
-                                                expr: {
-                                                    type: 'column_ref',
-                                                    table: null,
-                                                    column: column,
-                                                },
-                                                type: direction,
-                                            };
-                                            // look through the columns
-                                            setActivePath(null);
-                                            setOpenPopover(null);
-                                            setBaseAst((0, util_1.deepCopy)(newAst));
-                                            if (!pivot) {
-                                                fetchSqlQuery(newAst);
-                                            }
-                                        }, setIsPending: () => { }, setEditPopoverKey: () => { }, setActiveEditItem: setActiveEditItem, setActivePath: setActivePath, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover_1.AddSortPopover, handleDelete: () => {
-                                            const newAst = { ...baseAst };
-                                            newAst.orderby.splice(id, 1);
-                                            setBaseAst((0, util_1.deepCopy)(newAst));
-                                            if (!pivot) {
-                                                fetchSqlQuery(newAst);
-                                            }
-                                        }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, disabled: true }, `sort-sentence-${id}`))) })), (0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => {
-                                        if (!selectedColumns ||
-                                            selectedColumns.length === 0 ||
-                                            loading) {
-                                            return;
-                                        }
-                                        if (!openPopover) {
-                                            setOpenPopover('AddSortPopover');
-                                        }
-                                    }, label: "Add sort", disabled: true }), (0, jsx_runtime_1.jsx)(PopoverComponent, { isOpen: openPopover === 'AddSortPopover', setIsOpen: (isOpen) => {
-                                        if (!isOpen) {
-                                            setActiveEditItem(null);
-                                            setActivePath(null);
-                                            setOpenPopover(null);
-                                        }
-                                    }, popoverTitle: "Sort by", popoverChildren: (0, jsx_runtime_1.jsx)(AddSortPopover_1.AddSortPopover, { columns: selectedColumns, Select: SelectComponent, Button: ButtonComponent, onSave: () => { } }) })] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Limit" }), baseAst && baseAst.limit && baseAst.limit.value?.length > 0 ? ((0, jsx_runtime_1.jsx)("div", { style: {
-                                        display: 'flex',
-                                        flexDirection: 'column',
-                                        gap: 8,
-                                        marginBottom: 12,
-                                    }, children: (0, jsx_runtime_1.jsx)(AddLimitPopover_1.LimitSentence, { limit: baseAst.limit, setOpenPopover: setOpenPopover, LimitPopover: LimitPopoverComponent, EditPopover: AddLimitPopover_1.AddLimitPopover, handleDelete: () => {
-                                            const newAst = { ...baseAst };
-                                            newAst.limit = null;
-                                            setBaseAst((0, util_1.deepCopy)(newAst));
-                                            fetchSqlQuery(newAst);
-                                        }, onSave: (limit) => {
-                                            const newAst = { ...baseAst };
-                                            newAst.limit = {
-                                                seperator: '',
-                                                value: [
-                                                    {
-                                                        type: 'number',
-                                                        value: limit,
-                                                    },
-                                                ],
-                                            };
-                                            setOpenPopover(null);
-                                            setBaseAst((0, util_1.deepCopy)(newAst));
-                                            fetchSqlQuery(newAst);
-                                        }, TextInput: TextInputComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, disabled: true }) })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => {
-                                                if (!selectedColumns ||
-                                                    selectedColumns.length === 0 ||
-                                                    loading) {
-                                                    return;
-                                                }
-                                                if (!openPopover) {
-                                                    setOpenPopover('AddLimitPopover');
-                                                }
-                                            }, label: 'Add limit', disabled: true }), (0, jsx_runtime_1.jsx)(PopoverComponent, { isOpen: openPopover === 'AddLimitPopover', setIsOpen: (isOpen) => {
-                                                if (!isOpen) {
-                                                    setActiveEditItem(null);
-                                                    setActivePath(null);
-                                                    setOpenPopover(null);
-                                                }
-                                            }, popoverTitle: "Add limit", popoverChildren: (0, jsx_runtime_1.jsx)(AddLimitPopover_1.AddLimitPopover, { TextInputComponent: TextInputComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, onSave: () => { } }) })] }))] })] }), (0, jsx_runtime_1.jsxs)(ContainerComponent, { children: [isAIEnabled && ((0, jsx_runtime_1.jsx)("form", { ref: askAILoadingContainerRef, onSubmit: (event) => {
-                                event.preventDefault();
-                            }, style: {
-                                display: 'flex',
-                                flexDirection: 'row',
-                                gap: 12,
-                                visibility: askAIInputWidth === -1 && askAILoadingContainerWidth === -1
-                                    ? 'hidden'
-                                    : 'visible',
-                            }, children: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(TextInputComponent, { id: "ask_ai_loading_bar", placeholder: askedAQuestion
-                                            ? 'Ask a follow-up question...'
-                                            : 'Ask a question...', width: askAIInputWidth !== -1
-                                            ? askAIInputWidth
-                                            : askAILoadingContainerWidth, value: aiPrompt, onChange: () => { } }), (0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: () => { }, label: "Ask AI" }), ((baseAst && dataDisplayed) ||
-                                        initialLoad ||
-                                        initialChartLoad) &&
-                                        !reportId && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => { }, label: "New report" }))] }) })), (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(TableComponent, { isLoading: true, rows: [], columns: [] }), baseAst && dataDisplayed && !initialChartLoad && ((0, jsx_runtime_1.jsxs)("div", { style: {
-                                        display: 'flex',
-                                        flexDirection: 'row',
-                                        gap: '12px',
-                                        marginTop: 'auto',
-                                    }, children: [(0, jsx_runtime_1.jsx)("div", { style: { width: '100%' } }), onDiscardChanges && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: onDiscardChanges, label: "Discard changes" })), !hideCopySQL && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => copySQLToClipboard(), label: isCopying ? 'Copied' : 'Copy SQL' })), (0, jsx_runtime_1.jsx)(ButtonComponent, { label: reportInfo ? 'Save changes' : 'Add to dashboard', onClick: () => { } })] }))] })] }), (0, jsx_runtime_1.jsx)("style", { children: `body{margin:0;}` })] }));
-    }
     return ((0, jsx_runtime_1.jsxs)("div", { style: { backgroundColor: theme?.backgroundColor, ...containerStyle }, className: className, children: [(!isChartBuilderHorizontalView ||
                 (isChartBuilderHorizontalView && !isChartBuilderOpen)) && ((0, jsx_runtime_1.jsxs)("div", { ref: parentRef, style: {
                     display: 'flex',
@@ -1291,7 +1215,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                             if (!openPopover) {
                                                 setOpenPopover('AddColumnModal');
                                             }
-                                        }, label: "Select columns" }), (0, jsx_runtime_1.jsx)(ModalComponent, { isOpen: openPopover === 'AddColumnModal', setIsOpen: (isOpen) => {
+                                        }, label: "Select columns", disabled: tableLoading || loading }), (0, jsx_runtime_1.jsx)(ModalComponent, { isOpen: openPopover === 'AddColumnModal', setIsOpen: (isOpen) => {
                                             if (!isOpen) {
                                                 // delay onClose callback so onClick no-ops
                                                 setTimeout(() => {
@@ -1305,18 +1229,32 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                 setActivePath(null);
                                                 setOpenPopover(null);
                                             }, orderedColumnNames: orderedColumnNames, setOrderedColumnNames: setOrderedColumnNames, selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, isSelectedAllColumns: isSelectedAllColumns, clearAllState: clearAllState, nameToColumn: nameToColumn, baseAst: baseAst, setBaseAst: (ast) => {
-                                                setBaseAst(ast);
-                                                fetchSqlQuery(ast);
+                                                if (baseAst &&
+                                                    ast?.from?.[0]?.table !== baseAst?.from?.[0]?.table) {
+                                                    // table changed, past presets no longer valid
+                                                    setFormData(null);
+                                                    setRecommendedPivots([]);
+                                                    setCreatedPivots([]);
+                                                    ast.where = null;
+                                                    ast.orderby = null;
+                                                    ast.limit = null;
+                                                    setBaseAst(ast);
+                                                    fetchSqlQuery(ast, null);
+                                                }
+                                                else {
+                                                    setBaseAst(ast);
+                                                    fetchSqlQuery(ast);
+                                                }
                                             }, pivot: pivot, initialTableName: initialTableName, defaultAST: constants_1.defaultAST, defaultTable: constants_1.defaultTable, schemaLoading: schemaData.isSchemaLoading, setPivot: setPivot, TextInputComponent: TextInputComponent, SelectColumn: SelectColumnComponent, SecondaryButton: SecondaryButtonComponent, Button: ButtonComponent, ColumnSearchEmptyState: ColumnSearchEmptyState, LoadingComponent: LoadingComponent }) })] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Filters" }), formData && ((0, jsx_runtime_1.jsx)("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'column',
                                             gap: 8,
                                             marginBottom: 12,
-                                        }, children: (0, jsx_runtime_1.jsx)(FilterStack_1.default, { client: client, filterStack: filterStack, filterTree: filterTree, defaultAST: constants_1.defaultAST, baseAst: baseAst, setBaseAst: setBaseAst, setFormData: setFormData, fetchSqlQuery: fetchSqlQuery, schemaData: schemaData, defaultColumn: constants_1.defaultColumn, defaultTable: constants_1.defaultTable, currentTable: currentTable, initialTableName: initialTableName, globalUniqueValues: globalUniqueValues, globalUniqueValuesIsLoading: globalUniqueValuesIsLoading, columns: columns, removingFilter: removingFilter, setRemovingFilter: setRemovingFilter, TabsComponent: TabsComponent, FilterPopoverComponent: FilterPopoverComponent, FilterModal: FilterModal_1.default, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent, actionsEnabled: true }) })), (0, jsx_runtime_1.jsxs)("div", { style: {
+                                        }, children: (0, jsx_runtime_1.jsx)(FilterStack_1.default, { client: client, filterStack: filterStack, filterTree: filterTree, defaultAST: constants_1.defaultAST, baseAst: baseAst, setBaseAst: setBaseAst, setFormData: setFormData, fetchSqlQuery: fetchSqlQuery, schemaData: schemaData, defaultColumn: constants_1.defaultColumn, defaultTable: constants_1.defaultTable, currentTable: currentTable, initialTableName: initialTableName, globalUniqueValues: globalUniqueValues, globalUniqueValuesIsLoading: globalUniqueValuesIsLoading, columns: columns, removingFilter: removingFilter, setRemovingFilter: setRemovingFilter, TabsComponent: TabsComponent, FilterPopoverComponent: FilterPopoverComponent, FilterModal: FilterModal_1.default, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent, actionsEnabled: !tableLoading && !loading }) })), (0, jsx_runtime_1.jsxs)("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'column',
                                             alignItems: 'flex-start',
-                                        }, children: [(0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { disabled: !baseAst || !dataDisplayed, onClick: () => {
+                                        }, children: [(0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { disabled: !baseAst || !dataDisplayed || loading || tableLoading, onClick: () => {
                                                     if (!selectedColumns ||
                                                         selectedColumns.length === 0 ||
                                                         loading) {
@@ -1357,8 +1295,9 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                             setOpenPopover(null);
                                                             const item = (0, astFilterProcessing_1.filterToAst)(filter, client.databaseType.toLowerCase());
                                                             handleInsertion(item, 'AND', false);
-                                                        }, onDeleteFilter: () => { }, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent }) }) })] })] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Pivot" }), (0, jsx_runtime_1.jsx)(PivotModal_1.PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, CardComponent: CardComponent, SecondaryButtonComponent: SecondaryButtonComponent, PopoverComponent: PopoverComponent, TextComponent: TextComponent, ErrorMessageComponent: ErrorMessageComponent, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, LoadingComponent: LoadingComponent, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEditingPivot, setShowUpdatePivot: setIsEditingPivot, parentRef: parentRef, data: rows, columns: columns, triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
+                                                        }, onDeleteFilter: () => { }, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent }) }) })] })] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Pivot" }), (0, jsx_runtime_1.jsx)(PivotModal_1.PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, pivotValueField2: pivotValueField2, setPivotValueField: setPivotValueField, setPivotValueField2: setPivotValueField2, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, CardComponent: CardComponent, SecondaryButtonComponent: SecondaryButtonComponent, PopoverComponent: PopoverComponent, TextComponent: TextComponent, ErrorMessageComponent: ErrorMessageComponent, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, LoadingComponent: LoadingComponent, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEditingPivot, setShowUpdatePivot: setIsEditingPivot, parentRef: parentRef, data: rows, columns: columns, triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
                                             setPivot(null);
+                                            setPivotHint('');
                                             setPivotData(null);
                                             const formattedRows = formatRows(rows, columns, false);
                                             setFormattedRows(formattedRows);
@@ -1377,17 +1316,32 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                 dateBucket = (0, dates_1.getDateBucketFromRange)(dateRange);
                                             }
                                             setPivot(selectedPivot);
-                                            if (!pivotTable) {
-                                                setTableLoading(true);
-                                                pivotTable = await (0, PivotModal_1.generatePivotTable)(selectedPivot, rows, undefined, false, -1, undefined, dateBucket, tempReport, client, uniqueValues);
+                                            setPivotHint('');
+                                            try {
+                                                if (!pivotTable) {
+                                                    setTableLoading(true);
+                                                    pivotTable = await (0, PivotModal_1.generatePivotTable)({
+                                                        pivot: selectedPivot,
+                                                        dateBucket,
+                                                        report: tempReport,
+                                                        client,
+                                                        uniqueValues,
+                                                    });
+                                                }
+                                                setPivotData(pivotTable || []);
+                                                const formattedRows = formatRows(pivotTable.rows, columns, true, selectedPivot.aggregationType, dateBucket);
+                                                setFormattedRows(formattedRows);
+                                                setErrorMessage('');
+                                                setPivotError(undefined);
                                             }
-                                            // no other calls made
-                                            setPivotData(pivotTable || []);
-                                            const formattedRows = formatRows(pivotTable.rows, columns, true, selectedPivot.aggregationType);
-                                            setFormattedRows(formattedRows);
-                                            setErrorMessage('');
-                                            setTableLoading(false); // only set to false if this was the final call
-                                        }, selectPivotOnEdit: true, showTrigger: !pivot, theme: theme, LabelComponent: LabelComponent, HeaderComponent: HeaderComponent, dateRange: undefined, pivotCountRequest: 4, query: activeQuery, initialUniqueValues: uniqueValues[currentTable], uniqueValuesIsLoading: uniqueValuesIsLoading, disabled: !baseAst || !dataDisplayed || tableLoading, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, report: tempReport }), pivot && ((0, jsx_runtime_1.jsx)(PivotForm_1.default, { columns: columns, uniqueValues: uniqueValues[currentTable], uniqueValuesIsLoading: uniqueValuesIsLoading, setPivotRowField: (value) => {
+                                            catch (e) {
+                                                if (e instanceof Error)
+                                                    setPivotError(e.message);
+                                            }
+                                            finally {
+                                                setTableLoading(false);
+                                            }
+                                        }, selectPivotOnEdit: true, showTrigger: !pivot, theme: theme, LabelComponent: LabelComponent, HeaderComponent: HeaderComponent, dateRange: undefined, pivotCountRequest: 4, query: activeQuery, initialUniqueValues: uniqueValues[currentTable], uniqueValuesIsLoading: uniqueValuesIsLoading, disabled: !baseAst || !dataDisplayed || tableLoading || loading, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, report: tempReport }), pivot && ((0, jsx_runtime_1.jsx)(PivotForm_1.default, { columns: columns, uniqueValues: uniqueValues[currentTable], uniqueValuesIsLoading: uniqueValuesIsLoading, setPivotRowField: (value) => {
                                             setPivotRowField(value);
                                             updatePivot(value, 'rowField');
                                         }, setPivotColumnField: (value) => {
@@ -1396,15 +1350,19 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                         }, setPivotValueField: (value) => {
                                             setPivotValueField(value);
                                             updatePivot(value, 'valueField');
+                                        }, setPivotValueField2: (value) => {
+                                            setPivotValueField2(value);
+                                            updatePivot(value, 'valueField2');
                                         }, setPivotAggregation: (value) => {
                                             setPivotAggregation(value);
                                             updatePivot(value, 'aggregationType');
                                         }, onDelete: () => {
                                             setPivot(null);
+                                            setPivotHint('');
                                             setPivotData([]);
                                             const formattedRows = formatRows(rows, columns, false);
                                             setFormattedRows(formattedRows);
-                                        }, isLoading: tableLoading, pivotRowField: pivotRowField, pivotColumnField: pivotColumnField, pivotValueField: pivotValueField, pivotAggregation: pivotAggregation, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, PivotColumnContainer: PivotColumnContainer }))] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Sort" }), pivot && pivot.sort && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                        }, isLoading: tableLoading || loading, pivotRowField: pivotRowField, pivotColumnField: pivotColumnField, pivotValueField: pivotValueField, pivotValueField2: pivotValueField2, pivotAggregation: pivotAggregation, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, PivotColumnContainer: PivotColumnContainer, pivotHint: pivotHint }))] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Sort" }), pivot && pivot.sort && ((0, jsx_runtime_1.jsx)("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'column',
                                             gap: 8,
@@ -1420,56 +1378,87 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                         `.${pivot.valueField || 'count'}`,
                                                     ]
                                                 : selectedColumns, setIsPending: () => { }, setEditPopoverKey: () => { }, setActiveEditItem: setActiveEditItem, setActivePath: setActivePath, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover_1.AddSortPopover, handleDelete: async () => {
-                                                if (pivot) {
-                                                    const tempPivot = { ...pivot, sort: false };
-                                                    let dateBucket = undefined;
-                                                    const tempDateRange = dateRanges &&
-                                                        pivot.rowField &&
-                                                        dateRanges[pivot.rowField];
-                                                    if (tempDateRange) {
-                                                        dateBucket = (0, dates_1.getDateBucketFromRange)(tempDateRange.dateRange);
-                                                    }
-                                                    setPivot(tempPivot);
-                                                    const pivotedData = await (0, PivotModal_1.generatePivotTable)(tempPivot, rows, undefined, false, -1, undefined, dateBucket, tempReport, client, uniqueValues[currentTable]);
+                                                if (!pivot) {
+                                                    setBaseAst((0, util_1.deepCopy)(baseAst));
+                                                    fetchSqlQuery((0, util_1.deepCopy)(baseAst));
+                                                    return;
+                                                }
+                                                const tempPivot = { ...pivot, sort: false };
+                                                let dateBucket = undefined;
+                                                const tempDateRange = dateRanges &&
+                                                    pivot.rowField &&
+                                                    dateRanges[pivot.rowField];
+                                                if (tempDateRange) {
+                                                    dateBucket = (0, dates_1.getDateBucketFromRange)(tempDateRange.dateRange);
+                                                }
+                                                setPivot(tempPivot);
+                                                setPivotHint('');
+                                                try {
+                                                    const pivotedData = await (0, PivotModal_1.generatePivotTable)({
+                                                        pivot: tempPivot,
+                                                        rowLimit: -1,
+                                                        dateBucket,
+                                                        report: tempReport,
+                                                        client,
+                                                        uniqueValues: uniqueValues[currentTable],
+                                                    });
                                                     setPivotData(pivotedData || []);
-                                                    const formattedRows = formatRows(pivotedData.rows, columns, true, pivot.aggregationType);
+                                                    const formattedRows = formatRows(pivotedData.rows, columns, true, pivot.aggregationType, dateBucket);
                                                     setFormattedRows(formattedRows);
                                                     setErrorMessage('');
-                                                    return;
                                                 }
-                                                setBaseAst((0, util_1.deepCopy)(baseAst));
-                                                fetchSqlQuery((0, util_1.deepCopy)(baseAst));
+                                                catch (e) {
+                                                    if (e instanceof Error)
+                                                        setPivotError(e.message);
+                                                }
+                                                finally {
+                                                    setTableLoading(false);
+                                                }
                                             }, onSave: async (column, direction) => {
-                                                if (pivot) {
-                                                    const sortFieldType = column === (pivot.valueField || 'count')
-                                                        ? 'number'
-                                                        : pivot.rowFieldType;
-                                                    const tempPivot = {
-                                                        ...pivot,
-                                                        sort: true,
-                                                        sortDirection: direction,
-                                                        sortField: column,
-                                                        sortFieldType: sortFieldType,
-                                                    };
-                                                    setPivot(tempPivot);
-                                                    let dateBucket = undefined;
-                                                    const tempDateRange = dateRanges &&
-                                                        pivot.rowField &&
-                                                        dateRanges[pivot.rowField];
-                                                    if (tempDateRange) {
-                                                        dateBucket = (0, dates_1.getDateBucketFromRange)(tempDateRange.dateRange);
-                                                    }
-                                                    const pivotedData = await (0, PivotModal_1.generatePivotTable)(tempPivot, rows, undefined, false, -1, undefined, dateBucket, tempReport, client, uniqueValues[currentTable]);
+                                                if (!pivot) {
+                                                    setOpenPopover(null);
+                                                    setBaseAst((0, util_1.deepCopy)(baseAst));
+                                                    fetchSqlQuery((0, util_1.deepCopy)(baseAst));
+                                                    return;
+                                                }
+                                                const sortFieldType = column === (pivot.valueField || 'count')
+                                                    ? 'number'
+                                                    : pivot.rowFieldType;
+                                                const tempPivot = {
+                                                    ...pivot,
+                                                    sort: true,
+                                                    sortDirection: direction,
+                                                    sortField: column,
+                                                    sortFieldType: sortFieldType,
+                                                };
+                                                setPivot(tempPivot);
+                                                setPivotHint('');
+                                                let dateBucket = undefined;
+                                                const tempDateRange = dateRanges &&
+                                                    pivot.rowField &&
+                                                    dateRanges[pivot.rowField];
+                                                if (tempDateRange) {
+                                                    dateBucket = (0, dates_1.getDateBucketFromRange)(tempDateRange.dateRange);
+                                                }
+                                                try {
+                                                    const pivotedData = await (0, PivotModal_1.generatePivotTable)({
+                                                        pivot: tempPivot,
+                                                        rowLimit: -1,
+                                                        dateBucket,
+                                                        report: tempReport,
+                                                        client,
+                                                        uniqueValues: uniqueValues[currentTable],
+                                                    });
                                                     setPivotData(pivotedData || []);
-                                                    const formattedRows = formatRows(pivotedData.rows, columns, true, pivot.aggregationType);
+                                                    const formattedRows = formatRows(pivotedData.rows, columns, true, pivot.aggregationType, dateBucket);
                                                     setFormattedRows(formattedRows);
                                                     setErrorMessage('');
-                                                    return;
                                                 }
-                                                setOpenPopover(null);
-                                                setBaseAst((0, util_1.deepCopy)(baseAst));
-                                                fetchSqlQuery((0, util_1.deepCopy)(baseAst));
-                                            }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent }, `sort-sentence-pivot`) })), baseAst && baseAst.orderby && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                                catch (e) {
+                                                    if (e instanceof Error)
+                                                        setPivotError(e.message);
+                                                }
+                                            }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, disabled: tableLoading || loading }, `sort-sentence-pivot`) })), baseAst && baseAst.orderby && ((0, jsx_runtime_1.jsx)("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'column',
                                             gap: 8,
@@ -1477,6 +1466,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                         }, children: baseAst.orderby.map((sortData, id) => ((0, jsx_runtime_1.jsx)(AddSortPopover_1.SortSentence, { sortData: sortData, columns: selectedColumns, setIsPending: () => { }, setEditPopoverKey: () => { }, setActiveEditItem: setActiveEditItem, setActivePath: setActivePath, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover_1.AddSortPopover, handleDelete: () => {
                                                 if (pivot) {
                                                     setPivot({ ...pivot, sort: false });
+                                                    setPivotHint('');
                                                     return;
                                                 }
                                                 const newAst = { ...baseAst };
@@ -1495,6 +1485,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                         sortField: column,
                                                         sortFieldType: sortFieldType,
                                                     });
+                                                    setPivotHint('');
                                                     return;
                                                 }
                                                 setActiveEditItem(null);
@@ -1515,7 +1506,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                 setOpenPopover(null);
                                                 setBaseAst((0, util_1.deepCopy)(newAst));
                                                 fetchSqlQuery((0, util_1.deepCopy)(newAst));
-                                            }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent }, `sort-sentence-${id}`))) })), (0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { disabled: !baseAst || !dataDisplayed, onClick: () => {
+                                            }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, disabled: tableLoading || loading }, `sort-sentence-${id}`))) })), (0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { disabled: !baseAst || !dataDisplayed || loading || tableLoading, onClick: () => {
                                             if (!selectedColumns || selectedColumns.length === 0) {
                                                 return;
                                             }
@@ -1553,6 +1544,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                             sortFieldType: sortFieldType,
                                                         };
                                                         setPivot(tempPivot);
+                                                        setPivotHint('');
                                                         let dateBucket = undefined;
                                                         const tempDateRange = dateRanges &&
                                                             pivot.rowField &&
@@ -1560,11 +1552,23 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                         if (tempDateRange) {
                                                             dateBucket = (0, dates_1.getDateBucketFromRange)(tempDateRange.dateRange);
                                                         }
-                                                        const pivotedData = await (0, PivotModal_1.generatePivotTable)(tempPivot, rows, undefined, false, -1, undefined, dateBucket, tempReport, client, uniqueValues[currentTable]);
-                                                        setErrorMessage('');
-                                                        setPivotData(pivotedData || []);
-                                                        const formattedRows = formatRows(pivotedData.rows, columns, true, pivot.aggregationType);
-                                                        setFormattedRows(formattedRows);
+                                                        try {
+                                                            const pivotedData = await (0, PivotModal_1.generatePivotTable)({
+                                                                pivot: tempPivot,
+                                                                dateBucket,
+                                                                report: tempReport,
+                                                                client,
+                                                                uniqueValues: uniqueValues[currentTable],
+                                                            });
+                                                            setErrorMessage('');
+                                                            setPivotData(pivotedData || []);
+                                                            const formattedRows = formatRows(pivotedData.rows, columns, true, pivot.aggregationType, dateBucket);
+                                                            setFormattedRows(formattedRows);
+                                                        }
+                                                        catch (e) {
+                                                            if (e instanceof Error)
+                                                                setPivotError(e.message);
+                                                        }
                                                         setActivePath(null);
                                                         setOpenPopover(null);
                                                         setBaseAst((0, util_1.deepCopy)(baseAst));
@@ -1606,7 +1610,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                 setOpenPopover(null);
                                                 setBaseAst((0, util_1.deepCopy)(newAst));
                                                 fetchSqlQuery((0, util_1.deepCopy)(newAst));
-                                            }, TextInput: TextInputComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent }) })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { disabled: !baseAst || !dataDisplayed, onClick: () => {
+                                            }, TextInput: TextInputComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, disabled: tableLoading || loading }) })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { disabled: !baseAst || !dataDisplayed || loading || tableLoading, onClick: () => {
                                                     if (!selectedColumns || selectedColumns.length === 0) {
                                                         return;
                                                     }
@@ -1654,10 +1658,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                 ? 'Ask a follow-up question...'
                                                 : 'Ask a question...' }), (0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: () => {
                                                 fetchAstFromPromptHelper();
-                                            }, label: 'Ask AI' }), ((baseAst && dataDisplayed) || initialLoad) && !reportId && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { label: 'New report', onClick: clearAllState }))] }) })), baseAst && ((0, jsx_runtime_1.jsx)(TableComponent, { isLoading: !isAddLoading &&
-                                    (tableLoading ||
-                                        (loading && errorMessage.length === 0) ||
-                                        initialChartLoad), rows: formattedRows, rowCount: pivot ? undefined : numberOfRows, rowCountIsLoading: rowCountIsLoading, rowsPerPage: 20, columns: pivot
+                                            }, isLoading: askAILoading && !baseAst, label: 'Ask AI' }), ((baseAst && dataDisplayed) || initialLoad) && !reportId && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { label: 'New report', onClick: clearAllState }))] }) })), baseAst && ((0, jsx_runtime_1.jsx)(TableComponent, { isLoading: tableLoading || (loading && errorMessage.length === 0), rows: formattedRows, rowCount: pivot ? undefined : numberOfRows, rowCountIsLoading: rowCountIsLoading, rowsPerPage: 20, columns: pivot
                                     ? pivotData?.columns || emptyPivotColumns()
                                     : enforceOrderOnColumns(Object.keys(rows[0] ?? {})).map((c) => {
                                         return {
@@ -1681,13 +1682,13 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                             alignItems: 'center',
                                         }, children: [(0, jsx_runtime_1.jsx)(ErrorMessageComponent, { errorMessage: errorMessage }), (0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => {
                                                     fetchAstFromPromptHelper();
-                                                }, label: 'Retry' })] })) : ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' } })), baseAst && dataDisplayed && !initialChartLoad && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [onDiscardChanges && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: onDiscardChanges, label: "Discard changes" })), !hideCopySQL && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { label: isCopying ? 'Copied' : 'Copy SQL', onClick: () => copySQLToClipboard() })), (0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: async () => {
-                                                    setIsAddLoading(true);
-                                                    await handleRunQuery(currentProcessing, true);
-                                                    setIsAddLoading(false);
+                                                }, label: 'Retry' })] })) : ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' } })), baseAst && dataDisplayed && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [onDiscardChanges && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: onDiscardChanges, label: "Discard changes" })), !hideCopySQL && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { label: isCopying ? 'Copied' : 'Copy SQL', onClick: () => copySQLToClipboard() })), (0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: async () => {
                                                     onSaveChanges && onSaveChanges();
                                                     setIsChartBuilderOpen(true);
-                                                }, disabled: !!errorMessage, label: reportId ? 'Save changes' : 'Add to dashboard', isLoading: isAddLoading })] }))] })] }), (0, jsx_runtime_1.jsx)("style", { children: `body{margin:0;}` })] })), (!isChartBuilderHorizontalView || isChartBuilderOpen) && ((0, jsx_runtime_1.jsx)(ChartBuilder_1.ChartBuilderWithModal, { report: reportInfo
+                                                }, disabled: !!errorMessage ||
+                                                    tableLoading ||
+                                                    loading ||
+                                                    unresolvedReportMessage, label: reportId ? 'Save changes' : 'Add to dashboard', tooltipText: unresolvedReportMessage })] }))] })] }), (0, jsx_runtime_1.jsx)("style", { children: `body{margin:0;}` })] })), (!isChartBuilderHorizontalView || isChartBuilderOpen) && ((0, jsx_runtime_1.jsx)(ChartBuilder_1.ChartBuilderWithModal, { report: reportInfo
                     ? {
                         ...reportInfo,
                         ...tempReport,
@@ -1705,6 +1706,5 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                     : {
                         ...tempReport,
                         filtersApplied: specificDashboardFilters,
-                    }, rows: rows, columns: columns, pivot: pivot, query: activeQuery, showTableFormatOptions: showChartBuilderTableFormatOptions, showDateFieldOptions: isAdminEnabled, showAccessControlOptions: isAdminEnabled, isAdmin: isAdminEnabled, title: reportId ? 'Save changes' : 'Add to dashboard', isHorizontalView: true, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: reportId ? onSubmitEditReport : onSubmitCreateReport, destinationDashboard: destinationDashboard, organizationName: organizationName, pivotData: pivotData, initialUniqueValues: uniqueValues[currentTable], initialUniqueValuesIsLoading: uniqueValuesIsLoading, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, CardComponent: CardComponent, ModalComponent: ChartBuilderModalComponent, PopoverComponent: PopoverComponent, TableComponent: TableComponent, DeleteButtonComponent: DeleteButtonComponent, LoadingComponent: LoadingComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, FormContainer: ChartBuilderFormContainer, hideDateRangeFilter: true, buttonLabel: !!reportId ? 'Save changes' : 'Add to dashboard', onClickChartElement: onClickChartElement, rowCount: numberOfRows, onPageChange: onPageChange, onSortChange: onSortChange, onFilterPreviewChange: onFilterPreviewChange, isLoading: tableLoading || isAddLoading, isEditingMode: true }))] }));
+                    }, rows: chartBuilderInFilteredPreview ? filteredRows : rows, columns: columns, pivot: pivot, query: activeQuery, showTableFormatOptions: showChartBuilderTableFormatOptions, showDateFieldOptions: isAdminEnabled, showAccessControlOptions: isAdminEnabled, isAdmin: isAdminEnabled, title: reportId ? 'Save changes' : 'Add to dashboard', isHorizontalView: true, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: reportId ? onSubmitEditReport : onSubmitCreateReport, destinationDashboard: destinationDashboard, organizationName: organizationName, pivotData: pivotData, initialUniqueValues: uniqueValues[currentTable], initialUniqueValuesIsLoading: uniqueValuesIsLoading, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, CardComponent: CardComponent, ModalComponent: ChartBuilderModalComponent, PopoverComponent: PopoverComponent, TableComponent: TableComponent, DeleteButtonComponent: DeleteButtonComponent, LoadingComponent: LoadingComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, FormContainer: ChartBuilderFormContainer, hideDateRangeFilter: true, buttonLabel: !!reportId ? 'Save changes' : 'Add to dashboard', onClickChartElement: onClickChartElement, rowCount: numberOfRows, onPageChange: onPageChange, onSortChange: onSortChange, onFilterPreviewChange: onFilterPreviewChange, isLoading: tableLoading, isEditingMode: true }))] }));
 }
-exports.default = ReportBuilder;