@quillsql/react 2.12.40 → 2.12.42

package/dist/esm/ReportBuilder.js

@@ -1,20 +1,17 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useContext, useEffect, useRef, useState, } from 'react';
-import { DEFAULT_TAB_OPTIONS, MemoizedButton, MemoizedCheckbox, MemoizedDeleteButton, MemoizedHeader, MemoizedLabel, MemoizedSecondaryButton, MemoizedText, MemoizedPopover, QuillTabs, MemoizedModal, QuillChartBuilderInputRowContainer, QuillChartBuilderInputColumnContainer, MemoizedSubHeader, QuillErrorMessageComponent, QuillPivotRowContainer, QuillPivotColumnContainer, QuillColumnSearchEmptyState, QuillChartBuilderFormContainer, QuillLoadingComponent, QuillTableSQLEditorComponent, } from './components/UiComponents';
+import { DEFAULT_TAB_OPTIONS, MemoizedButton, MemoizedDeleteButton, MemoizedHeader, MemoizedLabel, MemoizedSecondaryButton, MemoizedText, MemoizedPopover, QuillTabs, MemoizedModal, QuillChartBuilderInputRowContainer, QuillChartBuilderInputColumnContainer, MemoizedSubHeader, QuillErrorMessageComponent, QuillPivotRowContainer, QuillPivotColumnContainer, QuillColumnSearchEmptyState, QuillChartBuilderFormContainer, QuillLoadingComponent, QuillTableSQLEditorComponent, } from './components/UiComponents';
 import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors, } from '@dnd-kit/core';
 import { arrayMove, SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy, useSortable, } from '@dnd-kit/sortable';
 import { CSS as DND_CSS } from '@dnd-kit/utilities';
-import { ClientContext, CustomFieldContext, SchemaContext, ThemeContext, } from './Context';
-import { extractColumnish, getTableAliases, getTableNames, isBoolColumnType, isDateishColumnType, isNumericColumnType, isTextColumnType, } from './components/ReportBuilder/ast';
-import { ChartBuilderWithModal, createInitialFormData } from './ChartBuilder';
+import { ClientContext, CustomFieldContext, DashboardContext, SchemaContext, ThemeContext, } from './Context';
+import { getTableNames, isNumericColumnType, isTextColumnType, } from './components/ReportBuilder/ast';
+import { ChartBuilderWithModal } from './ChartBuilder';
 import { QuillTextInput } from './components/UiComponents';
 import { QuillSidebar, CustomContainer, QuillSelectColumn, QuillDraggableColumn, QuillSidebarHeading, QuillFilterPopover, QuillSortPopover, QuillLimitPopover, FilterPopoverWrapper, } from './components/ReportBuilder/ui';
-import { generateCurrentPeriodPostgres, generateEqualsPostgres, generateLastNPeriodsPostgres, generatePreviousPeriodPostgres, } from './components/ReportBuilder/postgres';
-import { convertBigQuery, convertGroupBy, convertRemoveSimpleParentheses, convertStringComparison, convertWildcardColumns, convertUnaryToBinary, } from './components/ReportBuilder/convert';
-import { deepCopy, formatDateComparisonNode, getDateFilterInfo, isColumnComparison, isDateTruncEquals, isInTheLastInterval, isNodeEmptyCollection, isTheCurrentInterval, isThePreviousInterval, showNodeAsRow, removeNonSelectedTableReferences, isEquals, } from './components/ReportBuilder/util';
-import { getDefaultOperatorSubtrees, OPERATOR_GROUPS, } from './components/ReportBuilder/operators';
+import { deepCopy } from './components/ReportBuilder/util';
 import { hashCode } from './utils/crypto';
-import { defaultAST, defaultBoolComparison, defaultColumn, defaultEntry, defaultNumericComparison, defaultTable, defaultVariant, } from './components/ReportBuilder/constants';
+import { defaultAST, defaultColumn, defaultEntry, defaultNumericComparison, defaultTable, defaultVariant, } from './components/ReportBuilder/constants';
 import AddColumnModal from './components/ReportBuilder/AddColumnModal';
 import { AddSortPopover, SortSentence, } from './components/ReportBuilder/AddSortPopover';
 import { PivotModal, generatePivotTable, } from './internals/ReportBuilder/PivotModal';
@@ -23,14 +20,10 @@ import { AddLimitPopover, LimitSentence, } from './components/ReportBuilder/AddL
 import { updateFirstChildWidth } from './utils/width';
 import { QuillSelectComponent } from './components/QuillSelect';
 import { QuillCard } from './components/QuillCard';
-import { getData } from './utils/dataFetcher';
 import { DATE_FORMAT_TYPES, quillFormat } from './utils/valueFormatter';
-import { getPossiblePivotFieldOptions, pivotToSql, } from './utils/pivotProcessing';
+import { pivotToSql } from './utils/pivotProcessing';
 import { getUniqueValuesByColumns, getDateRangeByColumns, getCountsByColumns, fetchTableByQuery, } from './utils/tableProcessing';
-import { useQuill } from './hooks/useQuill';
-import { getDataFromCloud } from './utils/dataFetcher';
-import { convertColumnInfoToColumnInternal, convertPostgresColumn, } from './utils/columnProcessing';
-import { getSelectFromAST, processApostrophe, processStarColumn, } from './utils/astProcessing';
+import { fetchAndProcessASTFromPrompt, fetchASTFromQuillReport, getAllPossibleColumns, } from './utils/astProcessing';
 import PivotForm from './internals/ReportBuilder/PivotForm';
 import { getSchemaInfoWithCustomFields } from './utils/schema';
 import { getDateBucketFromRange } from './utils/dates';
@@ -40,8 +33,7 @@ import useAstToFilterTree from './hooks/useAstToFilterTree';
 import { filterSentence } from './utils/filterProcessing';
 import { QuillMultiSelectComponentWithCombo } from './components/QuillMultiSelectWithCombo';
 import { shouldFetchMore, DEFAULT_PAGINATION, shouldSortInMemory, } from './utils/paginationProcessing';
-import { EMPTY_REPORT, formatRowsFromReport } from './utils/report';
-import { parseValueFromBigQueryDates } from './utils/dataProcessing';
+import { EMPTY_INTERNAL_REPORT, fetchReportBuilderDataFromAST, formatRowsFromReport, } from './utils/report';
 export const QUILL_SERVER = (typeof process !== 'undefined' && process?.env?.QUILL_SERVER_HOST) ||
     'https://quill-344421.uc.r.appspot.com';
 /**
@@ -75,8 +67,12 @@ export const QUILL_SERVER = (typeof process !== 'undefined' && process?.env?.QUI
  * ### Report Builder API
  * @see https://docs.quillsql.com/components/report-builder
  */
-export default function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void null, onSubmitCreateReport = () => void null, destinationDashboard = undefined, organizationName = '', ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, ModalComponent = MemoizedModal, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, MultiSelectComponent = QuillMultiSelectComponentWithCombo, TableComponent = QuillTableSQLEditorComponent, PopoverComponent = MemoizedPopover, TabsComponent = QuillTabs, CheckboxComponent = MemoizedCheckbox, SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectColumnComponent = QuillSelectColumn, DraggableColumnComponent = QuillDraggableColumn, SidebarHeadingComponent = QuillSidebarHeading, FilterPopoverComponent = QuillFilterPopover, SortPopoverComponent = QuillSortPopover, LimitPopoverComponent = QuillLimitPopover, CardComponent = QuillCard, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, SubHeaderComponent = MemoizedSubHeader, TextComponent = MemoizedText, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, LoadingComponent = QuillLoadingComponent, ColumnSearchEmptyState = QuillColumnSearchEmptyState, ChartBuilderFormContainer = QuillChartBuilderFormContainer, ChartBuilderModalComponent = MemoizedModal, isAdminEnabled = false, isAIEnabled = true, showChartBuilderTableFormatOptions = true, containerStyle, className, pivotRecommendationsEnabled = true, reportId, hideCopySQL = true, isChartBuilderHorizontalView = true, onClickChartElement, }) {
-    const { data: report } = useQuill(reportId || '');
+export default function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void null, onSubmitCreateReport = () => void null, destinationDashboard = undefined, organizationName = '', ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, ModalComponent = MemoizedModal, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, MultiSelectComponent = QuillMultiSelectComponentWithCombo, TableComponent = QuillTableSQLEditorComponent, PopoverComponent = MemoizedPopover, TabsComponent = QuillTabs, 
+// CheckboxComponent = MemoizedCheckbox,
+SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectColumnComponent = QuillSelectColumn, DraggableColumnComponent = QuillDraggableColumn, SidebarHeadingComponent = QuillSidebarHeading, FilterPopoverComponent = QuillFilterPopover, SortPopoverComponent = QuillSortPopover, LimitPopoverComponent = QuillLimitPopover, CardComponent = QuillCard, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, SubHeaderComponent = MemoizedSubHeader, TextComponent = MemoizedText, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, LoadingComponent = QuillLoadingComponent, ColumnSearchEmptyState = QuillColumnSearchEmptyState, ChartBuilderFormContainer = QuillChartBuilderFormContainer, ChartBuilderModalComponent = MemoizedModal, isAdminEnabled = false, isAIEnabled = true, showChartBuilderTableFormatOptions = true, containerStyle, className, pivotRecommendationsEnabled = true, reportId, hideCopySQL = true, isChartBuilderHorizontalView = true, onClickChartElement, }) {
+    const [dashboard] = useContext(DashboardContext);
+    const [schema, setSchema] = useContext(SchemaContext);
+    const [reportInfo, setReportInfo] = useState(null);
     const [aiPrompt, setAiPrompt] = useState('');
     const [errorMessage, setErrorMessage] = useState('');
     const [baseAst, setBaseAst] = useState(null);
@@ -84,22 +80,20 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
     const [orderedColumnNames, setOrderedColumnNames] = useState([]);
     const [selectedColumns, setSelectedColumns] = useState([]);
     const [selectedOrderedColumns, setSelectedOrderedColumns] = useState([]);
-    const [schema, setSchema] = useContext(SchemaContext);
     const [activeQuery, setActiveQuery] = useState('');
-    const [activeEditItem, setActiveEditItem] = useState(null);
+    const [, setActiveEditItem] = useState(null);
     const [activePath, setActivePath] = useState(null);
     const [openPopover, setOpenPopover] = useState(null);
     const [loading, setLoading] = useState(!!initialTableName);
     const [loadingSchema, setLoadingSchema] = useState(false);
     const [isChartBuilderOpen, setIsChartBuilderOpen] = useState(false);
-    const [isPending, setIsPending] = useState(false);
+    const [, setIsPending] = useState(false);
     const [isCopying, setIsCopying] = useState(false);
     const [dataDisplayed, setDataDisplayed] = useState(false);
     const [rows, setRows] = useState([]);
     const [formattedRows, setFormattedRows] = useState([]);
     const [columns, setColumns] = useState([]);
-    const [tempReport, setTempReport] = useState(EMPTY_REPORT);
-    const [topLevelBinaryOperator, setTopLevelBinaryOperator] = useState('AND');
+    const [tempReport, setTempReport] = useState(EMPTY_INTERNAL_REPORT);
     const [uniqueValues, setUniqueValues] = useState({});
     const [pivot, setPivot] = useState(null);
     const [pivotData, setPivotData] = useState(null);
@@ -146,20 +140,18 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
         updateFirstChildWidth(askAILoadingContainerRef, setAskAILoadingContainerWidth, { gap: 12 });
     }, [dataDisplayed]);
     // Whenever unique values changes, update the fieldValuesMap, used in FilterModals
-    useEffect(() => {
-        const tables = getTableNames(baseAst);
-        const table = tables.length === 1 ? tables[0] : initialTableName;
+    const updateFieldValuesMap = (curUnqiueValues, tableName) => {
         const newFieldValues = {};
-        if (uniqueValues[table]) {
-            for (const field of Object.keys(uniqueValues[table])) {
+        if (curUnqiueValues[tableName]) {
+            for (const field of Object.keys(curUnqiueValues[tableName])) {
                 newFieldValues[field] = [];
-                for (const value of Object.keys(uniqueValues[table][field])) {
+                for (const value of Object.keys(curUnqiueValues[tableName][field])) {
                     newFieldValues[field]?.push(value);
                 }
             }
         }
         setFieldValuesMap(newFieldValues);
-    }, [uniqueValues]);
+    };
     useEffect(() => {
         // Since the TextInput component takes a required numeric width parameter,
         // we dynamically calculate the width of this component here.
@@ -183,7 +175,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             const column = columns.find((c) => c.field === changeField);
             if (column?.jsType === 'date') {
                 newPivot.rowFieldType = 'date';
-                newPivot.sort = 'true';
+                newPivot.sort = true;
                 newPivot.sortField = changeField;
                 newPivot.sortFieldType = column.format;
                 newPivot.sortDirection = 'ASC';
@@ -194,7 +186,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             }
         }
         let dateBucket = undefined;
-        const tempDateRange = dateRanges && dateRanges[newPivot.rowField];
+        const tempDateRange = dateRanges && dateRanges[newPivot.rowField || ''];
         if (tempDateRange) {
             dateBucket = getDateBucketFromRange(tempDateRange.dateRange);
         }
@@ -247,7 +239,6 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             setDataDisplayed(false);
             setRows([]);
             setColumns([]);
-            setTopLevelBinaryOperator('AND');
             setErrorMessage('');
             setFormattedRows([]);
             // setUniqueValues({});
@@ -264,12 +255,6 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             clearAllState();
         }
     }, [client]);
-    useEffect(() => {
-        if (activePath !== null) {
-            // update the modal with the new subtree
-            setActiveEditItem(getByKey(formData, activePath));
-        }
-    }, [formData]);
     const formatRows = (rows, columns, pivot, aggregationType) => {
         const copiedRows = deepCopy(rows);
         if (pivot) {
@@ -314,19 +299,6 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             return formattedRows;
         }
     };
-    const getByKey = (formData, path) => {
-        if (!path)
-            return deepCopy(formData);
-        // Function to immutably update or delete nodes based on their path
-        const paths = path.split('.');
-        let current = deepCopy(formData);
-        for (let i = 0; i < paths.length; i++) {
-            if (current[paths[i]]) {
-                current = current[paths[i]];
-            }
-        }
-        return current;
-    };
     const copySQLToClipboard = () => {
         let query = activeQuery;
         if (pivot) {
@@ -349,6 +321,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             }
         }
         setUniqueValues(newValues);
+        updateFieldValuesMap(newValues, currentTable);
     };
     const fetchSqlQuery = async (ast, formData, fetchData = true) => {
         if (fetchData) {
@@ -371,7 +344,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             const data = await response.json();
             setActiveQuery(data.query);
             if (fetchData) {
-                fetchUponChange(ast, formData);
+                fetchReportFromASTHelper(ast, formData);
             }
             return data.query;
         }
@@ -381,11 +354,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
         }
     };
     const getUniqueStringValues = async (columns, tableName) => {
-        const convertedStringColumns = columns
-            .filter((column) => {
+        const convertedStringColumns = columns.filter((column) => {
             return isTextColumnType(column.fieldType);
-        })
-            .map((column) => convertColumnInfoToColumnInternal(column));
+        });
         const stringNames = convertedStringColumns.map((column) => column.field);
         const smallStringColumns = await getCountsByColumns(convertedStringColumns, `Select ${stringNames.join(', ')} from ${tableName}`, client, customFields);
         const smallStringNames = smallStringColumns.map((column) => column.field);
@@ -402,8 +373,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             return {};
         }
         const dateColumnNames = dateColumns.map((column) => {
-            //@ts-ignore
-            return column.field || column.name;
+            return column.field;
         });
         const dateRanges = await getDateRangeByColumns(dateColumns, `Select ${dateColumnNames.join(', ')} from ${tableName}`, client, customFields);
         return dateRanges;
@@ -437,13 +407,14 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             const newUniqueValues = await getUniqueStringValues(tableInfo.columns, initialTableName);
             if (hashCode(uniqueValues) !== hashCode(newUniqueValues)) {
                 setUniqueValues(newUniqueValues);
+                updateFieldValuesMap(newUniqueValues, initialTableName);
             }
             const dateRangesTemp = await getDateRanges(tableInfo.columns, initialTableName);
             setDateRanges(dateRangesTemp);
         }
         const columnsForTable = tables
             .find((t) => t.name === initialTableName)
-            ?.columns.map((c) => c.name)
+            ?.columns.map((c) => c.field)
             .sort((a, b) => {
             const aIsId = a.endsWith('.id') ||
                 a.endsWith('_id') ||
@@ -459,7 +430,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                 return -1;
             return 0;
         });
-        await handleAsk(`get ${columnsForTable} from ${initialTableName}`);
+        await fetchAstFromPromptHelper(`get ${columnsForTable} from ${initialTableName}`);
         setInitialLoad(false);
     };
     const fetchSchema = async () => {
@@ -469,7 +440,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             setCustomFields(customFieldsByTable);
             setSchema(schemaData ?? []);
             setOrderedColumnNames((schemaData ?? []).flatMap((table) => table.columns
-                .map((c) => `${table.name}.${c.name}`)
+                .map((c) => `${table.name}.${c.field}`)
                 .sort((a, b) => {
                 const aIsId = a.endsWith('.id') ||
                     a.endsWith('_id') ||
@@ -498,106 +469,27 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
     };
     useEffect(() => {
         const loadChart = async () => {
-            setInitialChartLoad(true);
-            // @ts-ignore THIS PROCESS SHOULD BE UPDATED TO NOT USE USEQUILL
-            if (!report || report.referencedTables.length !== 1) {
-                setInitialChartLoad(false);
-                return;
-            }
+            let report;
             try {
-                // @ts-ignore THIS PROCESS SHOULD BE UPDATED TO NOT USE USEQUILL
-                const tableName = report.referencedTables[0];
-                if (!tableName) {
-                    return;
-                }
-                const resp = await getDataFromCloud(client, `astify`, {
-                    // @ts-ignore THIS PROCESS SHOULD BE UPDATED TO NOT USE USEQUILL
-                    query: report.queryString,
-                    useNewNodeSql: true,
-                });
-                if (resp.success === false) {
-                    setErrorMessage(resp.message);
-                    return;
-                }
-                const ast = getSelectFromAST(resp.ast);
-                let convertedAst = processStarColumn(ast, report.columns);
-                processApostrophe(convertedAst, ['type', 'value']);
-                convertedAst = convertBigQuery(convertedAst);
-                const schemaInfo = schema.length !== 0 ? schema : await fetchSchema();
-                let newAst;
-                let groupByPivot = {};
-                ({ ast: newAst, pivot: groupByPivot } = convertGroupBy(convertedAst, 
-                // @ts-ignore
-                report.pivot, schemaInfo));
-                if (convertedAst.where) {
-                    setFormData(deepCopy(convertedAst.where));
-                }
-                // @ts-ignore THIS PROCESS SHOULD BE UPDATED TO NOT USE USEQUILL
-                setActiveQuery(report.queryString);
-                newAst = groupByPivot ? newAst : convertedAst;
-                const initialRows = await fetchUponChange(newAst, undefined);
-                if (initialRows.error) {
-                    setBaseAst(null);
-                    setErrorMessage(initialRows.message);
-                    setInitialChartLoad(false);
-                    return;
-                }
-                setBaseAst(newAst);
-                const tableInfo = schemaInfo.find((table) => table.name === tableName);
-                let newUniqueValues = undefined;
-                let dateRangesTemp = undefined;
-                if (tableName) {
-                    newUniqueValues = await getUniqueStringValues(tableInfo.columns, tableName);
-                    setUniqueValues(newUniqueValues);
-                    dateRangesTemp = await getDateRanges(tableInfo.columns, tableName);
-                    setDateRanges(dateRangesTemp);
-                }
-                if (groupByPivot) {
-                    // @ts-ignore
-                    setPivotRowField(groupByPivot.rowField);
-                    // @ts-ignore
-                    setPivotAggregation(groupByPivot.aggregationType);
-                    // @ts-ignore
-                    setPivotColumnField(groupByPivot.columnField);
-                    // @ts-ignore
-                    setPivotValueField(groupByPivot.valueField);
-                    setPivot(groupByPivot);
-                    let dateBucket = undefined;
-                    const tempDateRange = dateRangesTemp &&
-                        groupByPivot.rowField &&
-                        dateRangesTemp[groupByPivot.rowField];
-                    if (tempDateRange) {
-                        dateBucket = getDateBucketFromRange(tempDateRange.dateRange);
-                    }
-                    const pivotedData = await generatePivotTable(
-                    // @ts-ignore
-                    groupByPivot, initialRows, tempDateRange, false, -1, undefined, dateBucket, report, client, newUniqueValues[tableName]);
-                    setPivotData(pivotedData || []);
-                    const formattedRows = formatRows(pivotedData.rows, report.columns, true, 
-                    // @ts-ignore
-                    groupByPivot.aggregationType);
-                    setFormattedRows(formattedRows);
-                }
-                else {
-                    const formattedRows = formatRows(report.rows, report.columns);
-                    setFormattedRows(formattedRows);
-                }
-                setCurrentTable(tableName);
+                if (!reportId) {
+                    throw new Error('Report ID is required');
+                }
+                report = dashboard[reportId];
+                if (!report || report.referencedTables?.length !== 1) {
+                    throw new Error('Report not found');
+                }
+                const { ast: newAst, pivot: newPivot, schema: curSchema, } = await fetchASTFromQuillReport(report, client, schema);
+                setBaseAst({ ...newAst, where: null });
+                await fetchReportFromASTHelper({ ...newAst, where: null }, newAst.where, newPivot, curSchema, report);
+                await fetchSchema();
+                setReportInfo(report);
             }
-            catch (error) {
-                console.error(error);
-                setErrorMessage('Error loading report');
-            }
-            // This handles a flashing issue
-            setTimeout(() => {
+            catch (err) {
                 setInitialChartLoad(false);
-            }, 500);
+            }
         };
-        // @ts-ignore THIS PROCESS SHOULD BE UPDATED TO NOT USE USEQUILL
-        if (report && report.referencedTables.length === 1) {
-            loadChart();
-        }
-    }, [report]);
+        loadChart();
+    }, [dashboard[reportId || '']]);
     useEffect(() => {
         if (schema.length === 0) {
             fetchSchema();
@@ -620,9 +512,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                     ...defaultAST,
                     ...baseAst,
                     ...(!baseAst?.columns && {
-                        columns: getAllPossibleColumns().map((c) => {
+                        columns: getAllPossibleColumns(baseAst, schema).map((c) => {
                             const newColumn = deepCopy(defaultColumn);
-                            newColumn.expr.column = c.name;
+                            newColumn.expr.column = c.field;
                             return newColumn;
                         }),
                     }),
@@ -640,9 +532,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                     ...defaultAST,
                     ...baseAst,
                     ...(!baseAst?.columns && {
-                        columns: getAllPossibleColumns().map((c) => {
+                        columns: getAllPossibleColumns(baseAst, schema).map((c) => {
                             const newColumn = deepCopy(defaultColumn);
-                            newColumn.expr.column = c.name;
+                            newColumn.expr.column = c.field;
                             return newColumn;
                         }),
                     }),
@@ -741,9 +633,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                 ...defaultAST,
                 ...baseAst,
                 ...(!baseAst?.columns && {
-                    columns: getAllPossibleColumns().map((c) => {
+                    columns: getAllPossibleColumns(baseAst, schema).map((c) => {
                         const newColumn = deepCopy(defaultColumn);
-                        newColumn.expr.column = c.name;
+                        newColumn.expr.column = c.field;
                         return newColumn;
                     }),
                 }),
@@ -756,169 +648,6 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             fetchSqlQuery(newAst, newState);
         });
     };
-    // TODO: Merge this function with the updateFormData function
-    const updateActiveItem = (updates, { isDeletion = false, isInsertion = false, isReplaceSubtree = false, isAddVariant = false, isDeleteVariant = false, column = undefined, }) => {
-        let newState = deepCopy(activeEditItem);
-        updates.forEach(({ path, value }) => {
-            let current = newState;
-            const globalPath = path;
-            const paths = globalPath.split('.').filter((p) => p);
-            if (paths.length === 0 && !isInsertion && !isReplaceSubtree) {
-                setActiveEditItem(null);
-                return;
-            }
-            const isOperatorChange = paths[paths.length - 1] === 'operator';
-            let parent = null;
-            let parentKey = null;
-            for (let i = 0; i < paths.length - 1; i++) {
-                let currentPath = paths[i];
-                let index;
-                if (paths[i].includes('||')) {
-                    const splitPath = paths[i].split('||');
-                    currentPath = splitPath[0];
-                    index = splitPath[1];
-                }
-                if (current[currentPath]) {
-                    parent = current;
-                    parentKey = currentPath;
-                    current = current[currentPath];
-                }
-                if (index) {
-                    current = current[parseInt(index)];
-                }
-            }
-            const lastKey = paths[paths.length - 1];
-            if (isDeletion) {
-                if (lastKey === 'left' || lastKey === 'right') {
-                    if (parent) {
-                        if (lastKey === 'right') {
-                            parent[parentKey] = parent[parentKey].left;
-                        }
-                        else {
-                            parent[parentKey] = parent[parentKey].right;
-                        }
-                    }
-                    else {
-                        delete current[lastKey];
-                        if (newState?.left && !newState?.right) {
-                            newState = newState.left;
-                        }
-                        else if (newState?.right && !newState?.left) {
-                            newState = newState.right;
-                        }
-                    }
-                }
-            }
-            else if (isInsertion) {
-                const columns = getAllPossibleColumns();
-                const defaultColumn = columns[0].name;
-                // TODO: I think this is a bug, take a closer look here
-                newState = {
-                    type: 'binary_expr',
-                    operator: 'AND',
-                    left: newState,
-                    right: {
-                        ...defaultEntry,
-                        left: {
-                            ...defaultEntry.left,
-                            column: defaultColumn,
-                        },
-                    },
-                };
-            }
-            else if (isAddVariant) {
-                const newVariant = deepCopy(defaultVariant);
-                if (value) {
-                    newVariant.args.value[0].value = value;
-                    // if there is already a single default value there,
-                    // let's remove it so when we push we replace.
-                    if (current[lastKey].length === 1 &&
-                        current[lastKey][0].args.value[0].value === '') {
-                        current[lastKey].pop();
-                    }
-                }
-                current[lastKey].push(newVariant);
-            }
-            else if (isDeleteVariant) {
-                if (value) {
-                    const argList = current[lastKey];
-                    argList.splice(argList.findIndex((arg) => arg.args.value[0].value === value), 1);
-                }
-                else {
-                    current[lastKey].pop();
-                }
-                // add back in a phantom element to prevent app from crashing
-                // when the user removes all variants and hits save.
-                if (current[lastKey].length === 0) {
-                    const newVariant = deepCopy(defaultVariant);
-                    newVariant.args.value[0].value = '';
-                    current[lastKey].push(newVariant);
-                }
-            }
-            else if (isReplaceSubtree) {
-                if (lastKey) {
-                    current[lastKey] = value;
-                }
-                else {
-                    newState = value;
-                }
-            }
-            else if (isOperatorChange) {
-                const newOp = value;
-                const oldOp = current[lastKey];
-                if (OPERATOR_GROUPS[oldOp] === OPERATOR_GROUPS[newOp]) {
-                    current[lastKey] = value;
-                }
-                else {
-                    const group = OPERATOR_GROUPS[newOp];
-                    const subtree = getDefaultOperatorSubtrees(group, newOp, column, '', client.databaseType);
-                    if (parentKey) {
-                        parent[parentKey] = deepCopy(subtree);
-                    }
-                    else {
-                        newState = deepCopy(subtree);
-                    }
-                }
-            }
-            else {
-                if (typeof current[lastKey] === 'object' && current[lastKey] !== null) {
-                    current[lastKey].value = value;
-                }
-                else {
-                    current[lastKey] = value;
-                }
-            }
-        });
-        // Function to immutably update or delete nodes based on their path
-        setActiveEditItem(newState);
-    };
-    const handleChange = (updates) => {
-        const callback = isPending ? updateActiveItem : updateFormData;
-        callback(updates, {});
-    };
-    const handleChangeText = (updates) => {
-        const callback = isPending ? updateActiveItem : updateFormData;
-        callback(updates, {});
-    };
-    // Function to handle operator changes
-    const handleOperatorChange = (value, node, keyPrefix, column = null) => {
-        if (!keyPrefix) {
-            setTopLevelBinaryOperator(value);
-        }
-        if (isPending) {
-            updateActiveItem([{ path: keyPrefix + 'operator', value }], { column });
-        }
-        else {
-            updateFormData([{ path: keyPrefix + 'operator', value }], { column });
-        }
-    };
-    // Function to replace an entire subtree with a given value.
-    const handleReplaceSubtree = (keyPrefix, newValue, pending = isPending) => {
-        const callback = pending ? updateActiveItem : updateFormData;
-        callback([{ path: keyPrefix, value: newValue }], {
-            isReplaceSubtree: true,
-        });
-    };
     // Function to handle the insertion of expressions
     const handleInsertion = (value, op = 'OR', isCondition = undefined) => {
         updateFormData([{ path: '', value }], {
@@ -927,23 +656,6 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             isCondition,
         });
     };
-    // Function to handle the insertion of expr_list variants
-    const handleInsertVariant = (key, name = null) => {
-        // note: if name, treat that as the name of the value to insert
-        const callback = isPending ? updateActiveItem : updateFormData;
-        callback([{ path: key, value: name }], { isAddVariant: true });
-    };
-    // Function to handle the insertion of expr_list variants
-    const handleDeleteVariant = (key, name = null) => {
-        // note: if name, treat that as the name of the valeu to delete
-        const callback = isPending ? updateActiveItem : updateFormData;
-        callback([{ path: key, value: name }], { isDeleteVariant: true });
-    };
-    const getColumnValueForColumnComparison = (node) => node.left.value ??
-        node.left.column ??
-        node.left.args?.value[0]?.value ??
-        node.left.args?.value[0]?.column ??
-        undefined;
     /**
      * Searches for the column by name and returns the field type.
      *
@@ -1040,676 +752,6 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
             return;
         }
     };
-    /**
-     * Render form fields based on the type of the node
-     * @param node the AST or subtree to render recursively
-     * @param keyPrefix a stringified version of the path from the root
-     *
-     * Note: The keyPrefix should be separated by '.' characters and each item
-     * should be a valid index into the node (eg. 'left.right.value' is a valid
-     * keyPrefix but 'left.args[0].value' is not -- should be 'left.args.0.value')
-     */
-    const renderNode = (node, keyPrefix = '') => {
-        const dateComparisonPartialMatch = formatDateComparisonNode(node);
-        switch (node.type) {
-            case 'binary_expr':
-                if (dateComparisonPartialMatch ||
-                    (isDateTruncEquals(node) && client.databaseType !== 'BigQuery')) {
-                    const { dateColumn, dateFilterType, intervalCount, intervalType, intervalPaths, } = getDateFilterInfo(node);
-                    const isPlural = intervalCount !== 1 && dateFilterType !== 'in the current'
-                        ? 's'
-                        : '';
-                    // Pull off the string literal date for "equals" comparisons
-                    const rawDateStringEquals = node.right?.value ??
-                        node.right?.args?.value[1]?.column ??
-                        node.right?.args?.value[1]?.value;
-                    const rawDateStringEqualsPath = (node.right?.value && 'node.right.value') ??
-                        (node.right?.args?.value[1]?.column &&
-                            'node.right.args.value.1.column') ??
-                        (node.right?.args?.value[1]?.value &&
-                            'node.right.args.value.1.value');
-                    return (_jsxs("div", { style: { display: 'flex', gap: 20 }, children: [_jsx(SelectComponent, { value: dateColumn, onChange: (event) => {
-                                    const columnType = getColumnTypeByName(event.target.value);
-                                    if (isDateishColumnType(columnType)) {
-                                        // handleChange(value, keyPrefix + dateColumnPath, "text");
-                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
-                                    }
-                                    else if (isNumericColumnType(columnType)) {
-                                        const newSubtree = deepCopy(defaultNumericComparison);
-                                        newSubtree.left.column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                    else if (isBoolColumnType(columnType)) {
-                                        const newSubtree = deepCopy(defaultBoolComparison);
-                                        newSubtree.left.column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                    else {
-                                        const newSubtree = deepCopy(defaultEntry);
-                                        newSubtree.left.args.value[0].column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                }, options: getAllPossibleColumns().map((column) => ({
-                                    label: snakeAndCamelCaseToTitleCase(column.displayName),
-                                    value: column.name,
-                                })), width: 200 }), _jsx(SelectComponent, { value: dateFilterType, onChange: (event) => {
-                                    if (event.target.value === dateFilterType)
-                                        return null;
-                                    let newSubtree = {};
-                                    // TODO: implement one for each database type (eg. pg, snowflake, etc.)
-                                    if (event.target.value === 'in the last') {
-                                        newSubtree = generateLastNPeriodsPostgres({
-                                            dateField: dateColumn,
-                                            intervalPeriod: `${intervalCount ?? 1} ${intervalType}`,
-                                        });
-                                    }
-                                    else if (event.target.value === 'in the previous') {
-                                        newSubtree = generatePreviousPeriodPostgres({
-                                            dateField: dateColumn,
-                                            intervalPeriod: `${intervalCount ?? 1} ${intervalType}`,
-                                            currentPeriod: intervalType,
-                                        });
-                                    }
-                                    else if (event.target.value === 'in the current') {
-                                        newSubtree = generateCurrentPeriodPostgres({
-                                            dateField: dateColumn,
-                                            currentPeriod: intervalType,
-                                        });
-                                    }
-                                    else if (event.target.value === 'equals') {
-                                        newSubtree = generateEqualsPostgres({
-                                            dateField: dateColumn,
-                                            currentPeriod: intervalType,
-                                            timestamp: '2024-01-01',
-                                        });
-                                    }
-                                    // replace the entire subtree for this filter
-                                    handleReplaceSubtree(keyPrefix, newSubtree);
-                                }, options: [
-                                    { label: 'in the last', value: 'in the last' },
-                                    { label: 'in the previous', value: 'in the previous' },
-                                    { label: 'in the current', value: 'in the current' },
-                                    { label: 'equals', value: 'equals' },
-                                ], width: 200 }), !['in the current', 'equals'].includes(dateFilterType) && (_jsx(TextInputComponent, { id: "date_filter_interval_count", value: intervalCount?.toString() ?? '', width: 70, onChange: (e) => {
-                                    if (Number.isNaN(parseFloat(e.target.value || '0'))) {
-                                        alert('Please input a number.');
-                                        return;
-                                    }
-                                    const isPluralNow = parseFloat(e.target.value || '0') !== 1 ? 's' : '';
-                                    intervalPaths.forEach((intervalPath) => handleChangeText([
-                                        {
-                                            value: `${e.target.value || 0} ${intervalType}${isPluralNow}`,
-                                            path: keyPrefix + intervalPath,
-                                        },
-                                    ]));
-                                } })), _jsx(SelectComponent, { value: intervalType, onChange: (event) => {
-                                    if (intervalPaths.length === 1 &&
-                                        dateFilterType !== 'in the previous') {
-                                        handleChangeText([
-                                            {
-                                                value: intervalCount !== null
-                                                    ? `${intervalCount} ${event.target.value}${isPlural}`
-                                                    : event.target.value,
-                                                path: keyPrefix + intervalPaths[0],
-                                            },
-                                        ]);
-                                        return;
-                                    }
-                                    let newSubtree;
-                                    if (dateFilterType === 'in the previous') {
-                                        newSubtree = generatePreviousPeriodPostgres({
-                                            dateField: dateColumn,
-                                            intervalPeriod: `${intervalCount ?? 1} ${event.target.value}`,
-                                            currentPeriod: event.target.value,
-                                        });
-                                    }
-                                    else if (dateFilterType === 'equals') {
-                                        newSubtree = generateEqualsPostgres({
-                                            dateField: dateColumn,
-                                            currentPeriod: event.target.value,
-                                            timestamp: rawDateStringEquals,
-                                        });
-                                    }
-                                    else {
-                                        newSubtree = generateCurrentPeriodPostgres({
-                                            dateField: dateColumn,
-                                            currentPeriod: event.target.value,
-                                        });
-                                    }
-                                    handleReplaceSubtree(keyPrefix, newSubtree);
-                                }, options: dateFilterType === 'in the previous' ||
-                                    dateFilterType === 'in the last'
-                                    ? [
-                                        { label: `year${isPlural}`, value: 'year' },
-                                        { label: `month${isPlural}`, value: 'month' },
-                                        { label: `week${isPlural}`, value: 'week' },
-                                        { label: `day${isPlural}`, value: 'day' },
-                                        { label: `hour${isPlural}`, value: 'hour' },
-                                    ]
-                                    : [
-                                        { label: `year${isPlural}`, value: 'year' },
-                                        { label: `quarter${isPlural}`, value: 'quarter' },
-                                        { label: `month${isPlural}`, value: 'month' },
-                                        { label: `week${isPlural}`, value: 'week' },
-                                        { label: `day${isPlural}`, value: 'day' },
-                                        { label: `hour${isPlural}`, value: 'hour' },
-                                    ], width: 200 }), dateFilterType === 'equals' && (_jsx(TextInputComponent, { id: "date_filter_equals_raw_date", value: rawDateStringEquals, width: 120, onChange: (e) => {
-                                    handleChangeText([
-                                        {
-                                            value: e.target.value,
-                                            path: keyPrefix + rawDateStringEqualsPath,
-                                        },
-                                    ]);
-                                } }))] }));
-                }
-                else if (isInTheLastInterval(node, client.databaseType)) {
-                    const { dateColumn } = getDateFilterInfo(node);
-                    const options = getAllPossibleColumns().map((column) => ({
-                        label: snakeAndCamelCaseToTitleCase(column.displayName),
-                        value: column.name,
-                    }));
-                    const plural = node.right.args.value[1].expr.value !== 1 ? 's' : '';
-                    return (_jsxs("div", { style: {
-                            display: 'flex',
-                            flexDirection: 'row',
-                            alignItems: 'center',
-                            gap: 20,
-                        }, children: [_jsx(SelectComponent, { value: node.left.column, onChange: (event) => {
-                                    const columnType = getColumnTypeByName(event.target.value);
-                                    if (isDateishColumnType(columnType)) {
-                                        // handleChange(value, keyPrefix + dateColumnPath, "text");
-                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
-                                    }
-                                    else if (isNumericColumnType(columnType)) {
-                                        const newSubtree = deepCopy(defaultNumericComparison);
-                                        newSubtree.left.column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                    else if (isBoolColumnType(columnType)) {
-                                        const newSubtree = deepCopy(defaultBoolComparison);
-                                        newSubtree.left.column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                    else {
-                                        const newSubtree = deepCopy(defaultEntry);
-                                        newSubtree.left.args.value[0].column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                }, options: options, width: 200 }), _jsx(SelectComponent, { value: 'IN_THE_LAST', onChange: (event) => {
-                                    handleOperatorChange(event.target.value, node, keyPrefix, dateColumn);
-                                }, options: [
-                                    { label: 'in the last', value: 'IN_THE_LAST' },
-                                    { label: 'in the previous', value: 'IN_THE_PREVIOUS' },
-                                    { label: 'in the current', value: 'IN_THE_CURRENT' },
-                                    { label: 'equals', value: 'EQUALS' },
-                                    { label: 'is not null', value: 'IS NOT' },
-                                    { label: 'is null', value: 'IS' },
-                                ], width: 200 }), _jsx(TextInputComponent, { id: 'date_window_interval_count', value: node.right.args.value[1].expr.value, width: 120, onChange: (e) => {
-                                    handleChange([
-                                        {
-                                            value: e.target.value,
-                                            path: keyPrefix + 'right.args.value||1.expr.value',
-                                        },
-                                    ]);
-                                } }), _jsx("div", { children: _jsx(SelectComponent, { value: node.right.args.value[1].unit, onChange: (event) => handleChange([
-                                        {
-                                            value: event.target.value,
-                                            path: keyPrefix + 'right.args.value||1.unit',
-                                        },
-                                    ]), options: [
-                                        { label: `year${plural}`, value: '* 365 DAY' },
-                                        { label: `month${plural}`, value: '* 30 DAY' },
-                                        { label: `week${plural}`, value: '* 7 DAY' },
-                                        { label: `day${plural}`, value: 'DAY' },
-                                    ], width: 200 }) })] }));
-                }
-                else if (isTheCurrentInterval(node, client.databaseType)) {
-                    const options = getAllPossibleColumns().map((column) => ({
-                        label: snakeAndCamelCaseToTitleCase(column.displayName),
-                        value: column.name,
-                    }));
-                    return (_jsxs("div", { style: {
-                            display: 'flex',
-                            flexDirection: 'row',
-                            alignItems: 'center',
-                            gap: 20,
-                        }, children: [_jsx(SelectComponent, { value: node.left.column, onChange: (event) => {
-                                    const columnType = getColumnTypeByName(event.target.value);
-                                    if (isDateishColumnType(columnType)) {
-                                        // handleChange(value, keyPrefix + dateColumnPath, "text");
-                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
-                                    }
-                                    else if (isNumericColumnType(columnType)) {
-                                        const newSubtree = deepCopy(defaultNumericComparison);
-                                        newSubtree.left.column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                    else if (isBoolColumnType(columnType)) {
-                                        const newSubtree = deepCopy(defaultBoolComparison);
-                                        newSubtree.left.column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                    else {
-                                        const newSubtree = deepCopy(defaultEntry);
-                                        newSubtree.left.args.value[0].column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                }, options: options, width: 200 }), _jsx(SelectComponent, { value: 'IN_THE_CURRENT', onChange: (event) => {
-                                    handleOperatorChange(event.target.value, node, keyPrefix, node.left.column);
-                                }, options: [
-                                    { label: 'in the last', value: 'IN_THE_LAST' },
-                                    { label: 'in the previous', value: 'IN_THE_PREVIOUS' },
-                                    { label: 'in the current', value: 'IN_THE_CURRENT' },
-                                    { label: 'equals', value: 'EQUALS' },
-                                    { label: 'is not null', value: 'IS NOT' },
-                                    { label: 'is null', value: 'IS' },
-                                    // { label: 'equals', value: 'equals' },
-                                ], width: 200 }), _jsx(SelectComponent, { value: node.left.args.value[1].column, onChange: (event) => {
-                                    handleChange([
-                                        {
-                                            value: event.target.value,
-                                            path: 'right.args.value||1.column',
-                                        },
-                                        {
-                                            value: event.target.value,
-                                            path: 'left.args.value||1.column',
-                                        },
-                                    ]);
-                                }, options: [
-                                    { label: `year`, value: 'YEAR' },
-                                    { label: `quarter`, value: 'QUARTER' },
-                                    { label: `month`, value: 'MONTH' },
-                                    { label: `week`, value: 'WEEK' },
-                                ], width: 200 })] }));
-                }
-                else if (isThePreviousInterval(node)) {
-                    const options = getAllPossibleColumns().map((column) => ({
-                        label: snakeAndCamelCaseToTitleCase(column.displayName),
-                        value: column.name,
-                    }));
-                    return (_jsxs("div", { style: {
-                            display: 'flex',
-                            flexDirection: 'row',
-                            alignItems: 'center',
-                            gap: 20,
-                        }, children: [_jsx(SelectComponent, { value: node.left.column, onChange: (event) => {
-                                    const columnType = getColumnTypeByName(event.target.value);
-                                    if (isDateishColumnType(columnType)) {
-                                        // handleChange(value, keyPrefix + dateColumnPath, "text");
-                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
-                                    }
-                                    else if (isNumericColumnType(columnType)) {
-                                        const newSubtree = deepCopy(defaultNumericComparison);
-                                        newSubtree.left.column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                    else if (isBoolColumnType(columnType)) {
-                                        const newSubtree = deepCopy(defaultBoolComparison);
-                                        newSubtree.left.column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                    else {
-                                        const newSubtree = deepCopy(defaultEntry);
-                                        newSubtree.left.args.value[0].column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                }, options: options, width: 200 }), _jsx(SelectComponent, { value: 'IN_THE_PREVIOUS', onChange: (event) => {
-                                    handleOperatorChange(event.target.value, node, keyPrefix, node.left.column);
-                                }, options: [
-                                    { label: 'in the last', value: 'IN_THE_LAST' },
-                                    { label: 'in the previous', value: 'IN_THE_PREVIOUS' },
-                                    { label: 'in the current', value: 'IN_THE_CURRENT' },
-                                    { label: 'equals', value: 'EQUALS' },
-                                    { label: 'is not null', value: 'IS NOT' },
-                                    { label: 'is null', value: 'IS' },
-                                    // { label: 'equals', value: 'equals' },
-                                ], width: 200 }), _jsx(SelectComponent, { value: node.left.args.value[1].column, onChange: (event) => {
-                                    const dayConversion = {
-                                        YEAR: 365,
-                                        QUARTER: 90,
-                                        MONTH: 30,
-                                        WEEK: 7,
-                                    };
-                                    handleChange([
-                                        {
-                                            value: event.target.value,
-                                            path: 'left.args.value||1.column',
-                                        },
-                                        {
-                                            value: event.target.value,
-                                            path: 'right.args.value||1.column',
-                                        },
-                                        {
-                                            value: dayConversion[event.target.value] || 30,
-                                            path: 'right.args.value||0.args.value||1.expr.value',
-                                        },
-                                    ]);
-                                }, options: [
-                                    { label: `year`, value: 'YEAR' },
-                                    { label: `quarter`, value: 'QUARTER' },
-                                    { label: `month`, value: 'MONTH' },
-                                    { label: `week`, value: 'WEEK' },
-                                ], width: 200 })] }));
-                }
-                else if (isEquals(node, client.databaseType)) {
-                    const options = getAllPossibleColumns().map((column) => ({
-                        label: snakeAndCamelCaseToTitleCase(column.displayName),
-                        value: column.name,
-                    }));
-                    return (_jsxs("div", { style: {
-                            display: 'flex',
-                            flexDirection: 'row',
-                            alignItems: 'center',
-                            gap: 20,
-                        }, children: [_jsx(SelectComponent, { value: node.left.column, onChange: (event) => {
-                                    const columnType = getColumnTypeByName(event.target.value);
-                                    if (isDateishColumnType(columnType)) {
-                                        // handleChange(value, keyPrefix + dateColumnPath, "text");
-                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
-                                    }
-                                    else if (isNumericColumnType(columnType)) {
-                                        const newSubtree = deepCopy(defaultNumericComparison);
-                                        newSubtree.left.column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                    else if (isBoolColumnType(columnType)) {
-                                        const newSubtree = deepCopy(defaultBoolComparison);
-                                        newSubtree.left.column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                    else {
-                                        const newSubtree = deepCopy(defaultEntry);
-                                        newSubtree.left.args.value[0].column = event.target.value;
-                                        handleReplaceSubtree(keyPrefix, newSubtree);
-                                    }
-                                }, options: options, width: 200 }), _jsx(SelectComponent, { value: 'EQUALS', onChange: (event) => {
-                                    handleOperatorChange(event.target.value, node, keyPrefix, node.left.column);
-                                }, options: [
-                                    { label: 'in the last', value: 'IN_THE_LAST' },
-                                    { label: 'in the previous', value: 'IN_THE_PREVIOUS' },
-                                    { label: 'in the current', value: 'IN_THE_CURRENT' },
-                                    { label: 'equals', value: 'EQUALS' },
-                                    { label: 'is not null', value: 'IS NOT' },
-                                    { label: 'is null', value: 'IS' },
-                                    // { label: 'equals', value: 'equals' },
-                                ], width: 200 }), _jsx(SelectComponent, { value: node.right.args.value[1].column, onChange: (event) => {
-                                    handleChange([
-                                        {
-                                            value: event.target.value,
-                                            path: 'right.args.value||1.column',
-                                        },
-                                        {
-                                            value: event.target.value,
-                                            path: 'left.args.value||1.column',
-                                        },
-                                    ]);
-                                }, options: [
-                                    { label: `year`, value: 'YEAR' },
-                                    { label: `quarter`, value: 'QUARTER' },
-                                    { label: `month`, value: 'MONTH' },
-                                    { label: `week`, value: 'WEEK' },
-                                ], width: 200 }), _jsx(TextInputComponent, { id: 'quoted_string', value: node.right.args.value[0].value, width: 120, onChange: (e) => handleChange([
-                                    {
-                                        value: e.target.value,
-                                        path: 'right.args.value||0.value',
-                                    },
-                                ]) })] }));
-                }
-                else if (isColumnComparison(node)) {
-                    const options = getAllPossibleColumns().map((column) => ({
-                        label: snakeAndCamelCaseToTitleCase(column.displayName),
-                        value: column.name,
-                    }));
-                    // grab the value of the left child of the column comparison
-                    // operator (ie. the column name)
-                    const leftChildValue = getColumnValueForColumnComparison(node);
-                    const tables = getTableNames(baseAst);
-                    const table = tables.length === 1 ? tables[0] : initialTableName;
-                    const column = schema
-                        .find((tableInfo) => tableInfo.name === table)
-                        ?.columns.find((col) => col.name === leftChildValue);
-                    const columnType = column?.fieldType;
-                    const operatorOptions = [
-                        ...(isNumericColumnType(columnType)
-                            ? [
-                                { label: 'equal to', value: '=' },
-                                { label: 'not equal to', value: '!=' },
-                                { label: 'greater than', value: '>' },
-                                { label: 'less than', value: '<' },
-                                { label: 'greater than or equal to', value: '>=' },
-                                { label: 'less than or equal to', value: '<=' },
-                                { label: 'is not null', value: 'IS NOT' },
-                                { label: 'is null', value: 'IS' },
-                            ]
-                            : []),
-                        ...(isTextColumnType(columnType)
-                            ? [
-                                { label: 'is exactly', value: 'LIKE' },
-                                { label: 'is not exactly', value: 'NOT LIKE' },
-                                { label: 'is', value: 'IN' },
-                                { label: 'is not', value: 'NOT IN' },
-                                { label: 'is not null', value: 'IS NOT' },
-                                { label: 'is null', value: 'IS' },
-                            ]
-                            : []),
-                        ...(isDateishColumnType(columnType)
-                            ? [
-                                { label: 'in the last', value: 'IN_THE_LAST' },
-                                {
-                                    label: 'in the previous',
-                                    value: 'IN_THE_PREVIOUS',
-                                },
-                                { label: 'in the current', value: 'IN_THE_CURRENT' },
-                                { label: 'equals', value: 'equals' },
-                            ]
-                            : []),
-                    ];
-                    return (_jsxs("div", { style: {
-                            display: 'flex',
-                            gap: 12,
-                            flexDirection: 'column',
-                            width: '100%',
-                            padding: '6px 0px',
-                        }, children: [_jsxs("div", { style: {
-                                    display: 'flex',
-                                    gap: 20,
-                                    flexDirection: showNodeAsRow(node, formData)
-                                        ? 'row'
-                                        : 'column',
-                                    width: '100%',
-                                }, children: [_jsx(SelectComponent, { value: leftChildValue, onChange: (event) => {
-                                            const columnType = getColumnTypeByName(event.target.value);
-                                            if (isDateishColumnType(columnType)) {
-                                                handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
-                                            }
-                                            else if (isNumericColumnType(columnType)) {
-                                                const newSubtree = deepCopy(defaultNumericComparison);
-                                                newSubtree.left.column = event.target.value;
-                                                handleReplaceSubtree(keyPrefix, newSubtree);
-                                            }
-                                            else if (isBoolColumnType(columnType)) {
-                                                const newSubtree = deepCopy(defaultBoolComparison);
-                                                newSubtree.left.column = event.target.value;
-                                                handleReplaceSubtree(keyPrefix, newSubtree);
-                                            }
-                                            else {
-                                                const newSubtree = deepCopy(defaultEntry);
-                                                newSubtree.left.args.value[0].column = event.target.value;
-                                                handleReplaceSubtree(keyPrefix, newSubtree);
-                                            }
-                                        }, options: options, width: 200 }), operatorOptions.length > 0 && (_jsx(SelectComponent, { value: node.operator, onChange: (event) => {
-                                            handleOperatorChange(event.target.value, node, keyPrefix, leftChildValue);
-                                        }, options: operatorOptions, width: 200 })), node.right &&
-                                        node.right.type !== 'expr_list' &&
-                                        renderNode(node.right, keyPrefix + 'right.')] }, keyPrefix), node.right && node.right.type === 'expr_list' && (_jsx("div", { style: {
-                                    display: 'grid',
-                                    gridTemplateColumns: 'repeat(2, 1fr)',
-                                    gap: 12,
-                                }, children: uniqueValues[table] &&
-                                    Object.keys(uniqueValues[table][leftChildValue] ?? {}).map((key) => (_jsx(CheckboxComponent, { label: key, isChecked: uniqueValues[table][leftChildValue][key], onChange: (event) => {
-                                            const newValues = deepCopy(uniqueValues);
-                                            newValues[table][leftChildValue][key] =
-                                                event.target.checked;
-                                            setUniqueValues(newValues);
-                                            if (event.target.checked) {
-                                                handleInsertVariant(keyPrefix + 'right.' + 'value', key);
-                                            }
-                                            else {
-                                                handleDeleteVariant(keyPrefix + 'right.' + 'value', key);
-                                            }
-                                        } }))) }, keyPrefix + 'right.'))] }));
-                }
-                else {
-                    const columnName = node.left.column;
-                    const column = schema
-                        .find((tableInfo) => tableInfo.name === currentTable)
-                        ?.columns.find((col) => col.name === columnName);
-                    const columnType = column?.fieldType;
-                    return (_jsxs("div", { style: {
-                            display: 'flex',
-                            gap: 12,
-                            justifyContent: 'space-between',
-                            flexDirection: showNodeAsRow(node, formData) ? 'row' : 'column',
-                            width: '100%',
-                        }, children: [node.left && renderNode(node.left, keyPrefix + 'left.'), _jsx(SelectComponent, { value: node.operator, onChange: (event) => {
-                                    handleOperatorChange(event.target.value, node, keyPrefix);
-                                }, options: [
-                                    // { label: `and`, value: "AND" },
-                                    // { label: `or`, value: "OR" },
-                                    ...(isNumericColumnType(columnType)
-                                        ? [
-                                            { label: 'equal to', value: '=' },
-                                            { label: 'not equal to', value: '!=' },
-                                            { label: 'greater than', value: '>' },
-                                            { label: 'less than', value: '<' },
-                                            { label: 'greater than or equal to', value: '>=' },
-                                            { label: 'less than or equal to', value: '<=' },
-                                            { label: 'is not null', value: 'IS NOT' },
-                                            { label: 'is null', value: 'IS' },
-                                        ]
-                                        : []),
-                                    ...(isTextColumnType(columnType)
-                                        ? [
-                                            { label: 'is exactly', value: 'LIKE' },
-                                            { label: 'is not exactly', value: 'NOT LIKE' },
-                                            { label: 'is', value: 'IN' },
-                                            { label: 'is not', value: 'NOT IN' },
-                                            { label: 'is not null', value: 'IS NOT' },
-                                            { label: 'is null', value: 'IS' },
-                                        ]
-                                        : []),
-                                    ...(isDateishColumnType(columnType)
-                                        ? [
-                                            { label: 'in the last', value: 'IN_THE_LAST' },
-                                            { label: 'in the previous', value: 'IN_THE_PREVIOUS' },
-                                            { label: 'in the current', value: 'IN_THE_CURRENT' },
-                                            { label: 'equals', value: 'EQUALS' },
-                                            { label: 'is not null', value: 'IS NOT' },
-                                            { label: 'is null', value: 'IS' },
-                                        ]
-                                        : []),
-                                    // { label: `minus`, value: "-" },
-                                    // { label: `plus`, value: "+" },
-                                ], width: 200 }), node.right && renderNode(node.right, keyPrefix + 'right.')] }, keyPrefix));
-                }
-            case 'column_ref': {
-                const options = getAllPossibleColumns().map((column) => ({
-                    label: snakeAndCamelCaseToTitleCase(column.displayName),
-                    value: column.name,
-                }));
-                return (_jsx(SelectComponent, { value: node.column ?? options[0]?.value, onChange: (event) => {
-                        handleChange([
-                            { value: event.target.value, path: keyPrefix + 'column' },
-                        ]);
-                    }, options: options, width: 200 }));
-            }
-            case 'expr_list': {
-                const len = node.value.length;
-                return (_jsxs("div", { style: { display: 'flex', flexDirection: 'row', gap: 12 }, children: [node.value.map((elem, index) => {
-                            if (elem.value) {
-                                return (_jsx(TextInputComponent, { id: `expr_list_${index}`, width: 200, value: elem.value, onChange: (e) => handleChange([
-                                        {
-                                            value: e.target.value,
-                                            path: keyPrefix + `value.${index}.`,
-                                        },
-                                    ]) }, `input_${index}`));
-                            }
-                            return renderNode(elem, keyPrefix + `value.${index}.`);
-                        }), len > 1 && (_jsx(SecondaryButtonComponent, { label: '-', onClick: () => handleDeleteVariant(keyPrefix + 'value') })), _jsx(SecondaryButtonComponent, { onClick: () => handleInsertVariant(keyPrefix + 'value'), label: '+' })] }, keyPrefix));
-            }
-            case 'double_quote_string':
-            case 'single_quote_string':
-                return (_jsx(TextInputComponent, { id: 'quoted_string', value: node.value.replaceAll('%', ''), width: 120, onChange: (e) => handleChange([
-                        {
-                            value: e.target.value,
-                            path: keyPrefix + 'value',
-                        },
-                    ]) }));
-            case 'null':
-                return _jsx("div", {});
-            case 'number':
-                return (_jsx(TextInputComponent, { id: "quill_number_input", value: node.value, width: 120, onChange: (e) => {
-                        handleChange([
-                            {
-                                value: e.target.value,
-                                path: keyPrefix + 'value',
-                            },
-                        ]);
-                    } }));
-            case 'bool':
-                return (_jsx(SelectComponent, { value: node.value.toString(), onChange: (event) => {
-                        let formatted = true;
-                        if (event.target.value === 'false') {
-                            formatted = false;
-                        }
-                        handleChange([
-                            {
-                                value: formatted,
-                                path: keyPrefix + 'value',
-                            },
-                        ]);
-                    }, options: [
-                        { label: 'is true', value: 'true' },
-                        { label: 'is false', value: 'false' },
-                    ], width: 200 }));
-            case 'function':
-                if (!node.args) {
-                    return _jsx("label", {});
-                }
-                else if (node.args.type === 'expr_list' &&
-                    node.args.value.length === 1) {
-                    return (_jsx("div", { style: { display: 'flex', flexDirection: 'row' }, children: node.args.value[0] &&
-                            renderNode(node.args.value[0], keyPrefix + 'args.value.0.') }));
-                }
-                else if (node.args.type === 'expr_list' &&
-                    node.args.value.length === 2) {
-                    return (_jsxs("div", { style: { display: 'flex', flexDirection: 'row', gap: 20 }, children: [node.args.value[0] &&
-                                renderNode(node.args.value[0], keyPrefix + 'args.value.0.'), node.args.value[1] &&
-                                renderNode(node.args.value[1], keyPrefix + 'args.value.1.')] }));
-                }
-                return node.name;
-            case 'interval':
-                return (_jsx("div", { style: { display: 'flex', flexDirection: 'row', gap: 20 }, children: renderNode(node.expr, keyPrefix + 'expr.') }));
-            default:
-                return null;
-        }
-    };
-    const isValidPivot = (fields) => {
-        let validPivot = true;
-        if (pivot.rowField &&
-            !fields.find((field) => field.name === pivot.rowField)) {
-            validPivot = false;
-        }
-        if (pivot.valueField &&
-            !fields.find((field) => field.name === pivot.valueField)) {
-            validPivot = false;
-        }
-        if (pivot.columnField &&
-            !fields.find((field) => field.name === pivot.columnField)) {
-            validPivot = false;
-        }
-        return validPivot;
-    };
     /**
      * @param filterTree
      * Returns a list of filters to be displayed
@@ -1805,9 +847,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                                     ...defaultAST,
                                     ...baseAst,
                                     ...(!baseAst?.columns && {
-                                        columns: getAllPossibleColumns().map((c) => {
+                                        columns: getAllPossibleColumns(baseAst, schema).map((c) => {
                                             const newColumn = deepCopy(defaultColumn);
-                                            newColumn.expr.column = c.name;
+                                            newColumn.expr.column = c.field;
                                             return newColumn;
                                         }),
                                     }),
@@ -1832,9 +874,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                                 ...defaultAST,
                                 ...baseAst,
                                 ...(!baseAst?.columns && {
-                                    columns: getAllPossibleColumns().map((c) => {
+                                    columns: getAllPossibleColumns(baseAst, schema).map((c) => {
                                         const newColumn = deepCopy(defaultColumn);
-                                        newColumn.expr.column = c.name;
+                                        newColumn.expr.column = c.field;
                                         return newColumn;
                                     }),
                                 }),
@@ -1867,9 +909,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                                 ...defaultAST,
                                 ...baseAst,
                                 ...(!baseAst?.columns && {
-                                    columns: getAllPossibleColumns().map((c) => {
+                                    columns: getAllPossibleColumns(baseAst, schema).map((c) => {
                                         const newColumn = deepCopy(defaultColumn);
-                                        newColumn.expr.column = c.name;
+                                        newColumn.expr.column = c.field;
                                         return newColumn;
                                     }),
                                 }),
@@ -1885,38 +927,6 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                 }
             }) }));
     };
-    const getAllPossibleColumns = () => {
-        if (!baseAst || !baseAst.from) {
-            return schema.flatMap((table) => table.columns.map((c) => ({
-                ...c,
-                table: table.displayName,
-            })));
-        }
-        // TODO: support infinitely nested FROM table lookups.
-        // This currently only supports top-level table names in the FROM section
-        // of queries (eg. FROM "table_name", not "FROM (SELECT * FROM other) AS table_name")
-        const tableNamesInQuery = baseAst.from.map((tbl) => tbl.table);
-        return schema
-            .filter((t) => tableNamesInQuery.includes(t.displayName))
-            .flatMap((table) => table.columns
-            .map((c) => ({
-            ...c,
-            table: table.displayName,
-        }))
-            .sort((a, b) => {
-            const aIsId = a.name.toLowerCase() === 'id' ||
-                a.name.toLowerCase().endsWith('_id') ||
-                a.name.endsWith('Id');
-            const bIsId = b.name.toLowerCase() === 'id' ||
-                b.name.toLowerCase().endsWith('_id') ||
-                b.name.endsWith('Id');
-            if (aIsId && !bIsId)
-                return 1;
-            if (bIsId && !aIsId)
-                return -1;
-            return 0;
-        }));
-    };
     /**
      * Return whether all columns have been selected (used to hide select all
      * and show clear button).
@@ -1940,497 +950,82 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
         },
         as: null,
     });
-    const AddConditionPopover = ({ onSave }) => {
-        return (_jsxs("div", { style: { display: 'flex', flexDirection: 'column', gap: 2 }, children: [_jsx("h1", { style: {
-                        fontWeight: '600',
-                        fontSize: 18,
-                        margin: 0,
-                        textAlign: 'left',
-                    }, children: "Add condition" }), _jsx(TabsComponent, { value: topLevelBinaryOperator, options: DEFAULT_TAB_OPTIONS, onChange: (event) => setTopLevelBinaryOperator(event.target.value) }), activeEditItem && renderNode(activeEditItem), _jsx("div", { style: {
-                        display: 'flex',
-                        flexDirection: 'row',
-                        gap: 8,
-                        justifyContent: 'end',
-                    }, children: _jsx(ButtonComponent, { onClick: onSave, label: 'Add condition' }) })] }));
-    };
-    const fetchUponChange = async (baseAst, newFormData) => {
-        // if newFormData is null still use it
+    const fetchReportFromASTHelper = async (baseAst, newFormData, curPivot, curSchema, previousReport) => {
         const curFormData = newFormData !== undefined ? newFormData : formData;
-        let rows;
-        if ((curFormData || baseAst) && !loading) {
-            try {
-                setLoading(true);
-                const hostedBody = {
-                    metadata: {
-                        clientId: client.publicKey,
-                        ast: { ...baseAst, where: curFormData },
-                        publicKey: client.publicKey,
-                        orgId: client.customerId,
-                        task: 'patterns',
-                        getCustomFields: false,
-                        customFields,
-                        additionalProcessing: { page: { currentPage: 0, rowsPerPage: 20 } },
-                        useUpdatedDataGathering: true,
-                        useNewNodeSql: true, // new flag
-                    },
-                };
-                const tables = getTableNames(baseAst);
-                const table = tables.length >= 1 ? tables[0] : initialTableName;
-                let newUniqueValues = uniqueValues;
-                let dateRangesTemp = dateRanges;
-                let curReport = tempReport;
-                if ((newUniqueValues && Object.keys(newUniqueValues).length === 0) ||
-                    table !== currentTable) {
-                    const tableInfo = schema.find((tableInfo) => tableInfo.name === table);
-                    if (tableInfo) {
-                        newUniqueValues = await getUniqueStringValues(tableInfo.columns, table);
-                        if (hashCode(uniqueValues) !== hashCode(newUniqueValues)) {
-                            setUniqueValues(newUniqueValues);
-                        }
-                        dateRangesTemp = await getDateRanges(tableInfo.columns, table);
-                        setDateRanges(dateRangesTemp || {});
-                    }
-                    setCurrentTable(table);
-                }
-                const cloudBody = {};
-                const data2 = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
-                if (data2.success === false) {
-                    throw new Error(data2.errorMessage);
-                }
-                if (client.databaseType &&
-                    client.databaseType.toLowerCase() === 'bigquery') {
-                    parseValueFromBigQueryDates(data2.rows, columns);
-                }
-                rows = data2.rows;
-                if (data2.rowCount) {
-                    setNumberOfRows(data2.rowCount);
-                }
-                if (data2.rows && data2.rows.length) {
-                    if (pivot) {
-                        // check if any of the pivot fields aren't in the data2.fields array
-                        if (!isValidPivot(data2.fields)) {
-                            const processedFields = data2.fields.map((elem) => convertPostgresColumn(elem));
-                            setPivot(null);
-                            setPivotData(null);
-                            setRows(data2.rows);
-                            setColumns(processedFields);
-                            if (data2.rowCount) {
-                                const processedFormData = report
-                                    ? report
-                                    : createInitialFormData(processedFields);
-                                setNumberOfRows(data2.rowCount);
-                                curReport = {
-                                    ...formData,
-                                    ...processedFormData,
-                                    itemQuery: data2.itemQuery,
-                                    rowCount: data2.rowCount,
-                                    filtersApplied: [],
-                                    rows: data2.rows,
-                                    columns: processedFields,
-                                };
-                                setTempReport(curReport);
-                            }
-                            const formattedRows = formatRows(data2.rows, processedFields, false);
-                            setFormattedRows(formattedRows);
-                            return;
-                        }
-                        curReport = {
-                            ...formData,
-                            itemQuery: data2.itemQuery,
-                            rowCount: data2.rowCount,
-                            filtersApplied: [],
-                            rows: data2.rows,
-                        };
-                        // Do all of this to make sure we have the right unique columns when applying a pivot
-                        let dateBucket = undefined;
-                        const tempDateRange = dateRangesTemp &&
-                            pivot.rowField &&
-                            dateRangesTemp[pivot.rowField];
-                        if (tempDateRange) {
-                            dateBucket = getDateBucketFromRange(tempDateRange.dateRange);
-                        }
-                        let distinctValuesForQuery = {};
-                        if (pivot.columnField) {
-                            const sqlQuery = await fetchSqlQuery({ ...baseAst, where: curFormData }, null, false);
-                            distinctValuesForQuery = await getUniqueValuesByColumns([
-                                {
-                                    field: pivot.columnField,
-                                    label: pivot.columnField,
-                                    format: 'string',
-                                },
-                            ], sqlQuery, [], client, customFields);
-                        }
-                        const pivotedData = await generatePivotTable(
-                        // @ts-ignore
-                        pivot, data2.rows, undefined, false, -1, undefined, dateBucket, curReport, client, distinctValuesForQuery ? distinctValuesForQuery : undefined);
-                        console.info(`%c[Pivot]: ${JSON.stringify(pivot)}`, 'color: dimgray');
-                        const processedFields = data2.fields.map((elem) => convertPostgresColumn(elem));
-                        setPivotData(pivotedData);
-                        setRows(data2.rows);
-                        setColumns(processedFields);
-                        if (data2.rowCount) {
-                            const processedFormData = report
-                                ? report
-                                : createInitialFormData(processedFields);
-                            setNumberOfRows(data2.rowCount);
-                            setTempReport({
-                                ...formData,
-                                ...processedFormData,
-                                itemQuery: data2.itemQuery,
-                                rowCount: data2.rowCount,
-                                filtersApplied: [],
-                                rows: data2.rows,
-                                columns: processedFields,
-                            });
-                        }
-                        const formattedRows = formatRows(pivotedData.rows, processedFields, true, pivot.aggregationType);
-                        setSelectedColumns(processedFields.map((column) => {
-                            return `${table}.${column.field}`;
-                        }));
-                        setFormattedRows(formattedRows);
-                    }
-                    else {
-                        const processedFields = data2.fields.map((elem) => convertPostgresColumn(elem));
-                        setRows(data2.rows);
-                        setColumns(processedFields);
-                        if (data2.rowCount) {
-                            const processedFormData = report
-                                ? report
-                                : createInitialFormData(processedFields);
-                            setNumberOfRows(data2.rowCount);
-                            setTempReport({
-                                ...formData,
-                                ...processedFormData,
-                                itemQuery: data2.itemQuery,
-                                rowCount: data2.rowCount,
-                                filtersApplied: [],
-                                rows: data2.rows,
-                                columns: processedFields,
-                            });
-                        }
-                        setSelectedColumns(processedFields.map((column) => {
-                            return `${table}.${column.field}`;
-                        }));
-                        const formattedRows = formatRows(data2.rows, processedFields, false);
-                        setFormattedRows(formattedRows);
-                        if (data2.errorMessage) {
-                            setErrorMessage(`Error: ${data2.errorMessage}`);
-                        }
-                    }
-                }
-                else {
-                    setRows([]);
-                    setColumns([]);
-                    setFormattedRows([]);
-                    setPivotData(null);
-                }
-                setLoading(false);
-                setDataDisplayed(true);
-                return rows;
+        let reportBuilderInfo = undefined;
+        try {
+            setLoading(true);
+            reportBuilderInfo = await fetchReportBuilderDataFromAST(baseAst, curFormData, curSchema ?? schema, client, curPivot ?? pivot, formData, currentTable, { uniqueStrings: uniqueValues, dateRanges: dateRanges ?? {} }, previousReport ?? reportInfo ?? undefined, customFields);
+            if (reportBuilderInfo.error) {
+                throw new Error(reportBuilderInfo.error);
             }
-            catch (e) {
-                setErrorMessage(e.message);
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                setErrorMessage(err.message);
                 setLoading(false);
-                setDataDisplayed(true);
-                setRows([]);
-                setColumns([]);
-                setFormattedRows([]);
-                setPivotData(null);
-                return { error: true, message: e.message };
+                return { error: true, message: err.message, rows: [] };
             }
+            setLoading(false);
+            setErrorMessage('Failed to fetch');
+            return { error: true, message: 'Failed to fetch', rows: [] };
         }
-    };
-    // Returns whether a where-clause contains a nested subquery.
-    const isSubquery = (node) => {
-        if (!node)
-            return false;
-        if (node.ast)
-            return true;
-        if (node.left && isSubquery(node.left))
-            return true;
-        if (node.right && isSubquery(node.right))
-            return true;
-        if (node.value && Array.isArray(node.value)) {
-            for (const value of node.value) {
-                if (isSubquery(value))
-                    return true;
-            }
+        if (!reportBuilderInfo) {
+            setErrorMessage('Failed to fetch');
+            return;
+        }
+        const reportTable = reportBuilderInfo.table;
+        const reportBuilderInfoColumns = reportBuilderInfo.columns.map((column) => {
+            return `${reportTable}.${column.field}`;
+        });
+        setRows(reportBuilderInfo.rows);
+        setColumns(reportBuilderInfo.columns);
+        setNumberOfRows(reportBuilderInfo.rowCount);
+        setPivot(reportBuilderInfo.pivot);
+        setPivotData(reportBuilderInfo.pivotData);
+        setFormattedRows(reportBuilderInfo.formattedRows);
+        setTempReport(reportBuilderInfo.report);
+        setSelectedColumns(reportBuilderInfoColumns);
+        setUniqueValues(reportBuilderInfo.uniqueValues);
+        updateFieldValuesMap(reportBuilderInfo.uniqueValues, reportBuilderInfo.table);
+        setDateRanges(reportBuilderInfo.dateRanges);
+        setLoading(false);
+        setDataDisplayed(true);
+        setCurrentTable(reportBuilderInfo.table);
+        setFormData(curFormData);
+        if (reportBuilderInfo.pivot) {
+            setPivotRowField(reportBuilderInfo.pivot.rowField);
+            setPivotAggregation(reportBuilderInfo.pivot.aggregationType);
+            setPivotColumnField(reportBuilderInfo.pivot.columnField);
+            setPivotValueField(reportBuilderInfo.pivot.valueField);
         }
-        return false;
+        setReportInfo(reportBuilderInfo.report);
     };
-    const handleAsk = async (overridePrompt = '') => {
-        if (!aiPrompt && !overridePrompt) {
+    const fetchAstFromPromptHelper = async (overridePrompt) => {
+        let astInfo = {};
+        const prompt = overridePrompt || aiPrompt;
+        if (!prompt) {
+            setErrorMessage('Please supply a prompt.');
             return;
         }
         try {
             setLoading(true);
-            setAskedAQuestion(true);
-            setErrorMessage('');
-            let res, data, ast;
-            let numRetries = 0;
-            const MAX_RETRIES = 3;
-            // refetch the request if it comes back and we know it's invalid.
-            // TODO: remove this to allow joins later down the road
-            let isTableJoin = !ast || !ast.from || ast.from.length !== 1;
-            while (isTableJoin || isSubquery(ast?.where)) {
-                if (numRetries === MAX_RETRIES)
-                    break;
-                if (!activeQuery || (ast && (isTableJoin || isSubquery(ast?.where)))) {
-                    res = await fetch(`${QUILL_SERVER}/magic`, {
-                        method: 'POST',
-                        headers: { 'Content-Type': 'application/json' },
-                        body: JSON.stringify({
-                            initialQuestion: aiPrompt || overridePrompt,
-                            publicKey: client.publicKey,
-                            useNewNodeSql: true, // new flag
-                        }),
-                    });
-                }
-                else {
-                    res = await fetch(`${QUILL_SERVER}/magic/edit`, {
-                        method: 'POST',
-                        headers: { 'Content-Type': 'application/json' },
-                        body: JSON.stringify({
-                            sqlQuery: activeQuery,
-                            initialQuestion: aiPrompt,
-                            publicKey: client.publicKey,
-                            useNewNodeSql: true, // new flag
-                        }),
-                    });
-                }
-                data = await res.json();
-                ast = data?.ast?.length ? data?.ast[0] : data?.ast;
-                // TODO: Debug invalid table joins in handleAsk
-                isTableJoin =
-                    ast?.type !== 'bigquery' &&
-                        (!ast || !ast.from || ast.from.length !== 1);
-                numRetries += 1;
-            }
-            if (numRetries === MAX_RETRIES) {
-                console.error('[Error]: Max retries exceeded.');
-                console.info(`%c[Prompt]: ${aiPrompt}`, 'color: dimgray');
-                setErrorMessage("Error: Couldn't process your request, please re-word your prompt.");
-                return;
-            }
-            let currentSchema = schema;
-            if (currentSchema && currentSchema.length === 0) {
-                currentSchema = await fetchSchema();
-            }
-            let newAst, groupByPivot;
-            if (ast) {
-                // Unwrap the ast object, supporting many possible types
-                ast = ast.length ? ast[0] : ast;
-                newAst = convertBigQuery(ast);
-                newAst = convertWildcardColumns(newAst, currentSchema); // must go before groupby
-                ({ ast: newAst, pivot: groupByPivot } = convertGroupBy(newAst, pivot, currentSchema));
-                newAst = convertStringComparison(newAst, client.databaseType);
-                newAst = convertRemoveSimpleParentheses(newAst);
-                const table = getTableNames(newAst)[0] ?? initialTableName;
-                const tableAlias = getTableAliases(newAst)[0] ?? initialTableName;
-                newAst = convertUnaryToBinary(newAst);
-                newAst = removeNonSelectedTableReferences(newAst, tableAlias ?? table, getAllPossibleColumns().map((col) => col.name));
-                const procesedColumns = deepCopy(newAst).columns?.map((column) => {
-                    if (column.expr.type === 'column_ref') {
-                        const columnName = extractColumnish(column.expr);
-                        return `${table}.${columnName}`;
-                    }
-                    else if (column.as) {
-                        return `${table}.${column.as}`;
-                    }
-                    return `${table}.${column.expr.value}`;
-                });
-                setSelectedColumns(procesedColumns);
-                if (groupByPivot) {
-                    setBaseAst(deepCopy({ ...newAst, orderby: null, limit: null }));
-                    newAst = deepCopy({ ...newAst, orderby: null, limit: null });
-                }
-                else {
-                    setBaseAst(deepCopy({ ...newAst }));
-                }
-                setFormData(deepCopy(newAst.where));
-                setTopLevelBinaryOperator(
-                // @ts-ignore
-                newAst?.where ? newAst?.where?.operator : 'AND');
-            }
-            ast = newAst; // so we fetch data for newAst later.
-            fetchSqlQuery(ast, undefined, false);
-            const table = getTableNames(newAst)[0] ?? initialTableName;
-            const hostedBody = {
-                metadata: {
-                    clientId: client.publicKey,
-                    ast,
-                    publicKey: client.publicKey,
-                    orgId: client.customerId,
-                    task: 'patterns',
-                    additionalProcessing: { page: { currentPage: 0, rowsPerPage: 20 } },
-                    useUpdatedDataGathering: true,
-                    pivot: groupByPivot,
-                    useNewNodeSql: true, // new flag
-                },
-            };
-            let currentUniqueValues = uniqueValues;
-            let dateRangesTemp = dateRanges;
-            if ((currentUniqueValues &&
-                currentUniqueValues[table] &&
-                Object.keys(currentUniqueValues[table]).length === 0) ||
-                table !== currentTable) {
-                const tableInfo = currentSchema.find((tableInfo) => tableInfo.name === table);
-                if (tableInfo) {
-                    const newUniqueValues = await getUniqueStringValues(tableInfo.columns, table);
-                    currentUniqueValues = newUniqueValues;
-                    if (hashCode(uniqueValues) !== hashCode(newUniqueValues)) {
-                        setUniqueValues(newUniqueValues);
-                    }
-                    dateRangesTemp = await getDateRanges(tableInfo.columns, table);
-                    setDateRanges(dateRangesTemp);
-                }
-                setCurrentTable(table);
-            }
-            const cloudBody = {};
-            const data2 = await getData(client, 'patterns', 'same-origin', hostedBody, cloudBody);
-            if (!data2 || data2.status === 'error') {
-                throw new Error('Error querying data from patterns');
+            astInfo = await fetchAndProcessASTFromPrompt(prompt, schema, client, pivot, activeQuery);
+            if (astInfo.error) {
+                throw new Error(astInfo.error);
             }
-            if (data2.rows && data2.rows.length) {
-                const processedFields = data2.fields
-                    .map((elem) => convertPostgresColumn(elem))
-                    .map((elem) => {
-                    const tableInfo = currentSchema.find((t) => t.name === table);
-                    const columnInfo = tableInfo?.columns.find((column) => column.name === elem.field);
-                    return columnInfo
-                        ? convertColumnInfoToColumnInternal(columnInfo)
-                        : null;
-                })
-                    .filter((elem) => elem);
-                let possiblePivot = true;
-                const possibleColumns = getPossiblePivotFieldOptions(processedFields, currentUniqueValues[table]);
-                if (groupByPivot &&
-                    ((groupByPivot.columnField &&
-                        !possibleColumns.columnFields.includes(groupByPivot?.columnField)) ||
-                        (groupByPivot.rowField &&
-                            !possibleColumns.rowFields.includes(groupByPivot?.rowField)) ||
-                        (groupByPivot.valueField &&
-                            !possibleColumns.valueFields.includes(groupByPivot?.valueField || '')))) {
-                    possiblePivot = false;
-                    let errorMessageEnding = '';
-                    if (groupByPivot.columnField &&
-                        !possibleColumns.columnFields.includes(groupByPivot?.columnField || '')) {
-                        if (currentUniqueValues[table]?.[groupByPivot?.columnField || '']) {
-                            errorMessageEnding = `The column ${groupByPivot?.columnField} has more than 24 unique values to pivot on.`;
-                        }
-                        else {
-                            errorMessageEnding = `The column ${groupByPivot?.columnField} is not a proper column field.`;
-                        }
-                    }
-                    else if (groupByPivot.rowField &&
-                        !possibleColumns.rowFields.includes(groupByPivot?.rowField || '')) {
-                        if (currentUniqueValues[table]?.[groupByPivot?.rowField || '']) {
-                            errorMessageEnding = `The column ${groupByPivot?.rowField} has more than 36 unique values to pivot on.`;
-                        }
-                        else {
-                            errorMessageEnding = `The column ${groupByPivot?.rowField} is not a proper row field.`;
-                        }
-                    }
-                    else if (groupByPivot.valueField &&
-                        !possibleColumns.valueFields.includes(groupByPivot?.valueField || '')) {
-                        errorMessageEnding = `The column ${groupByPivot?.valueField} is not a proper value field.`;
-                    }
-                    setErrorMessage(`The requested pivot is not supported. ${errorMessageEnding}`);
-                }
-                if (groupByPivot && possiblePivot) {
-                    let curReport = report ? report : undefined;
-                    if (data2.rowCount) {
-                        const processedFormData = report
-                            ? report
-                            : createInitialFormData(processedFields);
-                        setNumberOfRows(data2.rowCount);
-                        curReport = {
-                            ...formData,
-                            ...processedFormData,
-                            itemQuery: data2.itemQuery,
-                            rowCount: data2.rowCount,
-                            filtersApplied: [],
-                            rows: data2.rows,
-                            columns: processedFields,
-                        };
-                        setTempReport(curReport || null);
-                    }
-                    let dateBucket = undefined;
-                    const tempDateRange = dateRangesTemp &&
-                        groupByPivot.rowField &&
-                        dateRangesTemp[groupByPivot.rowField];
-                    if (tempDateRange) {
-                        dateBucket = getDateBucketFromRange(tempDateRange.dateRange);
-                    }
-                    const pivotedData = await generatePivotTable(
-                    // @ts-ignore
-                    groupByPivot, data2.rows, undefined, false, -1, undefined, dateBucket, curReport, client, groupByPivot.columnField
-                        ? currentUniqueValues[groupByPivot.columnField]
-                        : undefined);
-                    console.info(`%c[Pivot]: ${JSON.stringify(groupByPivot)}`, 'color: dimgray');
-                    setPivotData(pivotedData);
-                    setPivot(groupByPivot);
-                    if (client.databaseType &&
-                        client.databaseType.toLowerCase() === 'bigquery') {
-                        parseValueFromBigQueryDates(data2.rows, processedFields);
-                    }
-                    setRows(data2.rows);
-                    setPivotRowField(groupByPivot?.rowField);
-                    setPivotColumnField(groupByPivot?.columnField);
-                    setPivotValueField(groupByPivot?.valueField);
-                    setPivotAggregation(groupByPivot?.aggregationType);
-                    setColumns(processedFields);
-                    const formattedRows = formatRows(pivotedData.rows, processedFields, true, groupByPivot.aggregationType);
-                    setFormattedRows(formattedRows);
-                }
-                else {
-                    const processedFields = data2.fields.map((elem) => convertPostgresColumn(elem));
-                    if (client.databaseType &&
-                        client.databaseType.toLowerCase() === 'bigquery') {
-                        parseValueFromBigQueryDates(data2.rows, processedFields);
-                    }
-                    setRows(data2.rows);
-                    setColumns(processedFields);
-                    if (data2.rowCount) {
-                        setNumberOfRows(data2.rowCount);
-                        setTempReport({
-                            ...formData,
-                            itemQuery: data2.itemQuery,
-                            rowCount: data2.rowCount,
-                            filtersApplied: [],
-                            rows: data2.rows,
-                            columns: processedFields,
-                        });
-                    }
-                    const formattedRows = formatRows(data2.rows, processedFields, false);
-                    setFormattedRows(formattedRows);
-                }
-                return data2.rows;
-            }
-            else {
-                setPivotData([]);
-                setRows([]);
-                setColumns([]);
-                setFormattedRows([]);
-            }
-            if (data2.query) {
-                setActiveQuery(data2.query);
-            }
-            else {
-                setActiveQuery('');
-            }
-            if (data2.errorMessage) {
-                setErrorMessage(`Error: Couldn't process your request, please re-word your prompt.`);
-            }
-        }
-        catch (e) {
-            console.error(e);
-            setErrorMessage(`Error: Couldn't process your request, please re-word your prompt.`);
         }
-        finally {
-            setLoading(false);
-            setDataDisplayed(true);
+        catch (err) {
+            if (err instanceof Error) {
+                setErrorMessage(err.message);
+                setLoading(false);
+            }
+            return;
         }
+        setBaseAst(astInfo.ast);
+        setFormData(astInfo.whereAst);
+        fetchSqlQuery(astInfo.ast, astInfo.whereAst, false);
+        await fetchReportFromASTHelper(astInfo.ast, astInfo.whereAST, astInfo.pivot);
     };
     const handleDeleteColumn = (name) => {
         if (!baseAst || !baseAst.columns.length || selectedColumns.length === 1) {
@@ -2622,46 +1217,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                                                         setIsPending(false);
                                                         const item = filterToAst(filter, client.databaseType.toLowerCase());
                                                         handleInsertion(item, 'AND', false);
-                                                    }, onDeleteFilter: () => { }, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, SecondaryButtonComponent: SecondaryButtonComponent, MultiSelectComponent: MultiSelectComponent }) }) }), baseAst?.where &&
-                                            false && ( // temp removed the AddConditionPopover
-                                        _jsxs(_Fragment, { children: [_jsx(SecondaryButtonComponent, { onClick: () => {
-                                                        if (!openPopover) {
-                                                            setActiveEditItem(deepCopy(defaultEntry));
-                                                            setOpenPopover('AddConditionPopover');
-                                                            setActivePath('');
-                                                            setIsPending(true);
-                                                        }
-                                                    }, label: "Add condition" }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddConditionPopover', setIsOpen: (isOpen) => {
-                                                        if (!isOpen) {
-                                                            setIsPending(false);
-                                                            setTimeout(() => {
-                                                                clearCheckboxes();
-                                                                setActiveEditItem(null);
-                                                            }, 300);
-                                                            setActivePath(null);
-                                                            setOpenPopover(null);
-                                                        }
-                                                    }, popoverTitle: "Add condition", popoverChildren: _jsx(AddConditionPopover, { onSave: () => {
-                                                            if (isNodeEmptyCollection(activeEditItem)) {
-                                                                setIsPending(false);
-                                                                setTimeout(() => {
-                                                                    setActiveEditItem(null);
-                                                                    clearCheckboxes();
-                                                                }, 300);
-                                                                setActivePath(null);
-                                                                setOpenPopover(null);
-                                                            }
-                                                            else {
-                                                                setIsPending(false);
-                                                                handleInsertion(activeEditItem, topLevelBinaryOperator, true);
-                                                                setTimeout(() => {
-                                                                    setActiveEditItem(null);
-                                                                    clearCheckboxes();
-                                                                }, 300);
-                                                                setActivePath(null);
-                                                                setOpenPopover(null);
-                                                            }
-                                                        } }) })] }))] })] }), _jsxs("div", { style: { width: '100%' }, children: [_jsx(SidebarHeadingComponent, { label: "Pivot" }), _jsx(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: () => {
+                                                    }, onDeleteFilter: () => { }, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, SecondaryButtonComponent: SecondaryButtonComponent, MultiSelectComponent: MultiSelectComponent }) }) })] })] }), _jsxs("div", { style: { width: '100%' }, children: [_jsx(SidebarHeadingComponent, { label: "Pivot" }), _jsx(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);
@@ -2670,7 +1226,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                                     // 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: !loading && (!baseAst || !dataDisplayed), pivotRecommendationsEnabled: pivotRecommendationsEnabled && overrideRecommendations, report: tempReport ?? report }), pivot && (_jsx(PivotForm, { columns: columns, uniqueValues: uniqueValues[currentTable], setPivotRowField: (value) => {
+                                    }, selectPivotOnEdit: true, showTrigger: !pivot, theme: theme, LabelComponent: LabelComponent, HeaderComponent: HeaderComponent, dateRange: undefined, pivotCountRequest: 4, SecondaryButtonComponent: SecondaryButtonComponent, query: activeQuery, initialUniqueValues: uniqueValues[currentTable], disabled: !loading && (!baseAst || !dataDisplayed), pivotRecommendationsEnabled: pivotRecommendationsEnabled && overrideRecommendations, report: tempReport ?? reportInfo }), pivot && (_jsx(PivotForm, { columns: columns, uniqueValues: uniqueValues[currentTable], setPivotRowField: (value) => {
                                         setPivotRowField(value);
                                     }, setPivotColumnField: setPivotColumnField, setPivotValueField: setPivotValueField, setPivotAggregation: setPivotAggregation, pivotRowField: pivotRowField, pivotColumnField: pivotColumnField, pivotValueField: pivotValueField, pivotAggregation: pivotAggregation, onDelete: () => {
                                         setPivot(null);
@@ -2816,9 +1372,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                                         display: 'flex',
                                         flexDirection: 'row',
                                         gap: '12px',
-                                    }, children: [_jsx("div", { style: { width: '100%' } }), !hideCopySQL && (_jsx(SecondaryButtonComponent, { onClick: () => copySQLToClipboard(), label: isCopying ? '✅ Copied' : 'Copy SQL' })), _jsx(ButtonComponent, { label: report ? 'Save changes' : 'Add to dashboard', onClick: () => { } })] }))] })] }), _jsx("style", { children: `body{margin:0;}` })] }));
+                                    }, children: [_jsx("div", { style: { width: '100%' } }), !hideCopySQL && (_jsx(SecondaryButtonComponent, { onClick: () => copySQLToClipboard(), label: isCopying ? '✅ Copied' : 'Copy SQL' })), _jsx(ButtonComponent, { label: reportInfo ? 'Save changes' : 'Add to dashboard', onClick: () => { } })] }))] })] }), _jsx("style", { children: `body{margin:0;}` })] }));
     }
-    return (_jsxs("div", { style: { backgroundColor: theme.backgroundColor, ...containerStyle }, className: className, children: [(!isChartBuilderHorizontalView ||
+    return (_jsxs("div", { style: { backgroundColor: theme?.backgroundColor, ...containerStyle }, className: className, children: [(!isChartBuilderHorizontalView ||
                 (isChartBuilderHorizontalView && !isChartBuilderOpen)) && (_jsxs("div", { ref: parentRef, style: {
                     display: 'flex',
                     flexDirection: 'row',
@@ -2903,47 +1459,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                                                             setIsPending(false);
                                                             const item = filterToAst(filter, client.databaseType.toLowerCase());
                                                             handleInsertion(item, 'AND', false);
-                                                        }, onDeleteFilter: () => { }, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent }) }) }), baseAst?.where &&
-                                                false && ( // temp removed the AddConditionPopover
-                                            _jsxs(_Fragment, { children: [_jsx(SecondaryButtonComponent, { onClick: () => {
-                                                            if (!openPopover) {
-                                                                setActiveEditItem(deepCopy(defaultEntry));
-                                                                setOpenPopover('AddConditionPopover');
-                                                                setActivePath('');
-                                                                setIsPending(true);
-                                                            }
-                                                        }, label: 'Add condition' }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddConditionPopover', setIsOpen: (isOpen) => {
-                                                            if (!isOpen) {
-                                                                // delay onClose callback so onClick no-ops
-                                                                setTimeout(() => {
-                                                                    setIsPending(false);
-                                                                    setActiveEditItem(null);
-                                                                    setActivePath(null);
-                                                                    setOpenPopover(null);
-                                                                    clearCheckboxes();
-                                                                }, 200);
-                                                            }
-                                                        }, popoverChildren: _jsx(AddConditionPopover, { onSave: () => {
-                                                                if (isNodeEmptyCollection(activeEditItem)) {
-                                                                    setIsPending(false);
-                                                                    setTimeout(() => {
-                                                                        setActiveEditItem(null);
-                                                                    }, 300);
-                                                                    setActivePath(null);
-                                                                    setOpenPopover(null);
-                                                                    clearCheckboxes();
-                                                                }
-                                                                else {
-                                                                    setIsPending(false);
-                                                                    handleInsertion(activeEditItem, topLevelBinaryOperator, true);
-                                                                    setTimeout(() => {
-                                                                        setActiveEditItem(null);
-                                                                    }, 300);
-                                                                    setActivePath(null);
-                                                                    setOpenPopover(null);
-                                                                    clearCheckboxes();
-                                                                }
-                                                            } }) })] }))] })] }), _jsxs("div", { style: { width: '100%' }, children: [_jsx(SidebarHeadingComponent, { label: "Pivot" }), _jsx(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 }) }) })] })] }), _jsxs("div", { style: { width: '100%' }, children: [_jsx(SidebarHeadingComponent, { label: "Pivot" }), _jsx(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: () => {
                                             setPivot(null);
                                             setPivotData(null);
                                             const formattedRows = formatRows(rows, columns, false);
@@ -3238,7 +1754,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                                                 ? askAIInputWidth
                                                 : askAILoadingContainerWidth, onChange: (e) => setAiPrompt(e.target.value), placeholder: askedAQuestion
                                                 ? 'Ask a follow-up question...'
-                                                : 'Ask a question...' }), _jsx(ButtonComponent, { onClick: handleAsk, label: 'Ask AI' }), ((baseAst && dataDisplayed) || initialLoad) && (_jsx(SecondaryButtonComponent, { label: 'New report', onClick: clearAllState }))] }) })), baseAst && (_jsx(TableComponent, { isLoading: tableLoading ||
+                                                : 'Ask a question...' }), _jsx(ButtonComponent, { onClick: () => {
+                                                fetchAstFromPromptHelper();
+                                            }, label: 'Ask AI' }), ((baseAst && dataDisplayed) || initialLoad) && (_jsx(SecondaryButtonComponent, { label: 'New report', onClick: clearAllState }))] }) })), baseAst && (_jsx(TableComponent, { isLoading: tableLoading ||
                                     (loading && errorMessage.length === 0) ||
                                     initialChartLoad, rows: formattedRows, rowCount: pivot ? undefined : numberOfRows, columns: pivot
                                     ? pivotData?.columns || emptyPivotColumns()
@@ -3259,15 +1777,17 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                                             width: '100%',
                                             gap: 12,
                                             alignItems: 'center',
-                                        }, children: [_jsx(ErrorMessageComponent, { errorMessage: errorMessage }), _jsx(SecondaryButtonComponent, { onClick: handleAsk, label: 'Retry' })] })) : (_jsx("div", { style: { width: '100%' } })), baseAst && dataDisplayed && !initialChartLoad && (_jsxs(_Fragment, { children: [!hideCopySQL && (_jsx(SecondaryButtonComponent, { label: isCopying ? '✅ Copied' : 'Copy SQL', onClick: () => copySQLToClipboard() })), _jsx(ButtonComponent, { onClick: () => {
+                                        }, children: [_jsx(ErrorMessageComponent, { errorMessage: errorMessage }), _jsx(SecondaryButtonComponent, { onClick: () => {
+                                                    fetchAstFromPromptHelper();
+                                                }, label: 'Retry' })] })) : (_jsx("div", { style: { width: '100%' } })), baseAst && dataDisplayed && !initialChartLoad && (_jsxs(_Fragment, { children: [!hideCopySQL && (_jsx(SecondaryButtonComponent, { label: isCopying ? '✅ Copied' : 'Copy SQL', onClick: () => copySQLToClipboard() })), _jsx(ButtonComponent, { onClick: () => {
                                                     setIsChartBuilderOpen(true);
-                                                }, disabled: !!errorMessage, label: report ? 'Save changes' : 'Add to dashboard' })] }))] })] }), _jsx("style", { children: `body{margin:0;}` })] })), (!isChartBuilderHorizontalView || isChartBuilderOpen) && (_jsx(ChartBuilderWithModal, { report: report
+                                                }, disabled: !!errorMessage, label: reportId ? 'Save changes' : 'Add to dashboard' })] }))] })] }), _jsx("style", { children: `body{margin:0;}` })] })), (!isChartBuilderHorizontalView || isChartBuilderOpen) && (_jsx(ChartBuilderWithModal, { report: reportInfo
                     ? {
-                        ...report,
+                        ...reportInfo,
                         ...tempReport,
                         pivot: pivot,
-                        yAxisFields: report.pivot && !pivot ? [] : report.yAxisFields,
-                        columns: report.columns.filter((col) => {
+                        yAxisFields: reportInfo.pivot && !pivot ? [] : reportInfo.yAxisFields,
+                        columns: reportInfo.columns.filter((col) => {
                             return columns.find((c) => {
                                 return col.field === c.field;
                             });
@@ -3275,5 +1795,5 @@ export default function ReportBuilder({ initialTableName = '', onSubmitEditRepor
                         queryString: activeQuery,
                         rows: rows,
                     }
-                    : tempReport, rows: rows, columns: columns, pivot: pivot, query: activeQuery, showTableFormatOptions: showChartBuilderTableFormatOptions, showDateFieldOptions: isAdminEnabled, showAccessControlOptions: isAdminEnabled, title: report ? 'Save changes' : 'Add to dashboard', isHorizontalView: true, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: report ? onSubmitEditReport : onSubmitCreateReport, destinationDashboard: destinationDashboard, organizationName: organizationName, pivotData: pivotData, initialUniqueValues: uniqueValues[currentTable], pivotRecommendationsEnabled: pivotRecommendationsEnabled && overrideRecommendations, 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: report ? 'Save changes' : 'Add to dashboard', onClickChartElement: onClickChartElement, rowCount: numberOfRows, onPageChange: onPageChange, onSortChange: onSortChange, isLoading: tableLoading }))] }));
+                    : tempReport, rows: rows, columns: columns, pivot: pivot, query: activeQuery, showTableFormatOptions: showChartBuilderTableFormatOptions, showDateFieldOptions: isAdminEnabled, showAccessControlOptions: 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], pivotRecommendationsEnabled: pivotRecommendationsEnabled && overrideRecommendations, 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, isLoading: tableLoading }))] }));
 }