@quillsql/react 2.10.38 → 2.11.0

package/dist/cjs/ReportBuilder.js

@@ -3,1002 +3,2111 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPostgresBasicType = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-// @ts-nocheck
 const react_1 = require("react");
-// import './nightOwlLight.css';
-const Context_1 = require("./Context");
-const SQLEditor_1 = require("./SQLEditor");
+const axios_1 = __importDefault(require("axios"));
+const UiComponents_1 = require("./components/UiComponents");
+const core_1 = require("@dnd-kit/core");
+const sortable_1 = require("@dnd-kit/sortable");
+const utilities_1 = require("@dnd-kit/utilities");
 const date_fns_1 = require("date-fns");
-const PivotModal_1 = require("./internals/ReportBuilder/PivotModal");
-const dataFetcher_1 = require("./utils/dataFetcher");
-const dateRangePickerUtils_1 = require("./DateRangePicker/dateRangePickerUtils");
+const Context_1 = require("./Context");
+const ast_1 = require("./components/ReportBuilder/ast");
 const ChartBuilder_1 = __importDefault(require("./ChartBuilder"));
-const UiComponents_1 = require("./components/UiComponents");
-function ReportBuilder({ onChangeQuery, onChangeData, onChangeColumns, onChangeLoading, onChangePivot, onDateFilterChange, onChangeFields, onError, TextInput = UiComponents_1.MemoizedTextInput, containerStyle, Select = UiComponents_1.MemoizedSelect, Button = UiComponents_1.MemoizedButton, SecondaryButton = UiComponents_1.MemoizedSecondaryButton, Header = UiComponents_1.MemoizedHeader, Label = UiComponents_1.MemoizedLabel, DeleteButton = UiComponents_1.MemoizedDeleteButton, Text = UiComponents_1.MemoizedText, Modal = UiComponents_1.MemoizedModal, Popover = UiComponents_1.MemoizedPopover, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, tagStyle, tableName, dateColumn, selectedTagBorderColor, chartBuilderEnabled = false, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, editSQLEnabled, navigateToSQLEditor, }) {
-    const [data, setData] = (0, react_1.useState)([]);
-    const [client, setClient] = (0, react_1.useContext)(Context_1.ClientContext);
-    const [schema, setSchema] = (0, react_1.useContext)(Context_1.SchemaContext);
-    const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
-    const [columns, setColumns] = (0, react_1.useState)([]);
-    const [fields, setFields] = (0, react_1.useState)([]);
+const ui_1 = require("./components/ReportBuilder/ui");
+const postgres_1 = require("./components/ReportBuilder/postgres");
+const convert_1 = require("./components/ReportBuilder/convert");
+const util_1 = require("./components/ReportBuilder/util");
+const operators_1 = require("./components/ReportBuilder/operators");
+const crypto_1 = require("./utils/crypto");
+const constants_1 = require("./components/ReportBuilder/constants");
+const AddColumnPopover_1 = __importDefault(require("./components/ReportBuilder/AddColumnPopover"));
+/**
+ * Quill Report Builder
+ *
+ * Allows non-technical users to build SQL queries using either UI or AI and
+ * then edit them on the fly. Once users have constructed a query they like,
+ * they can click a button and add that report to their dashboard or export it
+ * as a CSV.
+ */
+function ReportBuilder({ path = '', initialTableName = 'transactions', onAddToDashboardComplete = () => void null, destinationDashboard = undefined, dashboardItem = undefined, organizationName = '', Button = ui_1.QuillButton, SecondaryButton = ui_1.QuillSecondaryButton, TextInput = ui_1.QuillTextInput, Select = ui_1.QuillSelect, Table = ui_1.QuillReportBuilderTable, Popover = ui_1.QuillPopover, Tabs = ui_1.QuillTabs, Checkbox = UiComponents_1.MemoizedCheckbox, Sidebar = ui_1.QuillSidebar, Container = ui_1.CustomContainer, HandleButton = ui_1.QuillHandleButton, SelectColumn = ui_1.QuillSelectColumn, DraggableColumn = ui_1.QuillDraggableColumn, ButtonLoadingState = ui_1.QuillButtonLoadingState, TableLoadingState = ui_1.QuillTableLoadingState, SidebarHeading = ui_1.QuillSidebarHeading, SidebarSubHeading = ui_1.QuillSidebarSubHeading, FilterPopover = ui_1.QuillFilterPopover, }) {
+    const [aiPrompt, setAiPrompt] = (0, react_1.useState)('');
+    const [errorMessage, setErrorMessage] = (0, react_1.useState)('');
+    const [baseAst, setBaseAst] = (0, react_1.useState)(null);
+    const [formData, setFormData] = (0, react_1.useState)(null);
+    const [orderedColumnNames, setOrderedColumnNames] = (0, react_1.useState)([]);
+    const [selectedColumns, setSelectedColumns] = (0, react_1.useState)([]);
+    const [schemaTables, setSchemaTables] = (0, react_1.useState)([]);
+    const [activeQuery, setActiveQuery] = (0, react_1.useState)('');
+    const [activeEditItem, setActiveEditItem] = (0, react_1.useState)(null);
+    const [activePath, setActivePath] = (0, react_1.useState)(null);
+    const [openPopover, setOpenPopover] = (0, react_1.useState)(null);
     const [loading, setLoading] = (0, react_1.useState)(false);
-    const [selectedPivot, setSelectedPivot] = (0, react_1.useState)(null);
-    const defaultDateRange = [null, null, null];
-    const [dateRange, setDateRange] = (0, react_1.useState)(defaultDateRange);
+    const [isChartBuilderOpen, setIsChartBuilderOpen] = (0, react_1.useState)(false);
+    const [isPending, setIsPending] = (0, react_1.useState)(false);
+    const [isCopying, setIsCopying] = (0, react_1.useState)(false);
+    const [rows, setRows] = (0, react_1.useState)([]);
+    const [fields, setFields] = (0, react_1.useState)([]);
+    const [topLevelBinaryOperator, setTopLevelBinaryOperator] = (0, react_1.useState)('AND');
+    const [editPopoverKey, setEditPopoverKey] = (0, react_1.useState)(null);
+    const [uniqueValues, setUniqueValues] = (0, react_1.useState)({});
+    const [pivot, setPivot] = (0, react_1.useState)(null);
+    const [pivotData, setPivotData] = (0, react_1.useState)(null);
+    // eslint-disable-next-line no-unused-vars
+    const [client, _setClient] = (0, react_1.useContext)(Context_1.ClientContext);
+    const enforceOrderOnColumns = (columnNames) => {
+        if (pivot) {
+            const rowName = pivot.rowField;
+            const sortFn = (a, b) => a === rowName ? -1 : b === rowName ? 1 : 0;
+            const columnsInPivot = getColumnsInPivotExpanded();
+            return columnNames
+                .sort(sortFn)
+                .filter((c) => columnsInPivot.includes(c));
+        }
+        return columnNames;
+    };
+    /**
+     * Transforms an array of column names into an array of columnInfo objects
+     * with label, field, format, and fieldType keys.
+     */
+    const processColumnsForChartBuilder = (columns) => {
+        return columns.map((col) => ({
+            label: col,
+            name: col,
+            displayName: col,
+            field: col,
+            format: (0, util_1.getPostgresBasicType)(fields.find((f) => f.name === col))?.replace('number', 'whole_number') || 'string',
+            fieldType: schemaTables
+                .flatMap((t) => t.columns)
+                .find((c) => c.name === col)?.fieldType || 'text',
+        }));
+    };
+    const clearAllState = () => {
+        // We're trying to not block the main thread while resetting all the state.
+        // This shouldn't be an issue since the dispatches shouldn't block, but
+        // this seems to work for now. ¯\_(ツ)_/¯
+        setTimeout(() => {
+            setAiPrompt('');
+            setBaseAst(null);
+            setFormData(null);
+            setOrderedColumnNames([]);
+            setSelectedColumns([]);
+            setSchemaTables([]);
+            setActiveQuery('');
+            setActiveEditItem(null);
+            setActivePath(null);
+            setOpenPopover(null);
+            setLoading(false);
+            setIsPending(false);
+            setRows([]);
+            setFields([]);
+            setTopLevelBinaryOperator('AND');
+            setEditPopoverKey(null);
+            // setUniqueValues({});
+            setPivot(null);
+            setPivotData(null);
+        }, 0);
+    };
     (0, react_1.useEffect)(() => {
-        let isSubscribed = true;
-        async function getClient() {
-            try {
-                const resp = await (0, dataFetcher_1.getDataFromCloud)(client, `client/${client.publicKey}/`, null, 'GET');
-                if (resp) {
-                    setClient({ ...client, ...resp.client });
-                }
-            }
-            catch (error) {
-                console.error('ERROR getting client:', error);
+        clearAllState();
+    }, [client]);
+    (0, react_1.useEffect)(() => {
+        if (activePath !== null) {
+            // update the modal with the new subtree
+            setActiveEditItem(getByKey(formData, activePath));
+        }
+    }, [formData]);
+    const getByKey = (formData, path) => {
+        if (!path)
+            return (0, util_1.deepCopy)(formData);
+        // Function to immutably update or delete nodes based on their path
+        const paths = path.split('.');
+        let current = (0, util_1.deepCopy)(formData);
+        for (let i = 0; i < paths.length; i++) {
+            if (current[paths[i]]) {
+                current = current[paths[i]];
             }
         }
-        if (isSubscribed) {
-            getClient();
+        return current;
+    };
+    const copyToClipboard = (str) => {
+        setIsCopying(true);
+        navigator.clipboard.writeText(str);
+        setTimeout(() => setIsCopying(false), 800);
+    };
+    const clearCheckboxes = () => {
+        const checkboxes = uniqueValues;
+        const newValues = {};
+        for (let table of Object.keys(checkboxes)) {
+            newValues[table] = {};
+            for (let column of Object.keys(checkboxes[table])) {
+                newValues[table][column] = {};
+                for (let variant of Object.keys(checkboxes[table][column])) {
+                    newValues[table][column][variant] = false;
+                }
+            }
         }
-        return () => {
-            isSubscribed = false;
-        };
-    }, []);
-    (0, react_1.useEffect)(() => {
-        let isSubscribed = true;
-        async function getSchema() {
-            const { queryEndpoint, queryHeaders, publicKey } = client;
-            const response = await fetch(`${queryEndpoint}`, {
-                method: 'POST',
-                headers: {
-                    ...queryHeaders,
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
-                    metadata: {
-                        clientId: publicKey,
-                        publicKey: publicKey,
-                        task: 'schema',
-                    },
-                }),
-            });
-            const data = await response.json();
-            if (isSubscribed) {
-                setSchema(data.data.tables);
+        setUniqueValues(newValues);
+    };
+    const setCheckboxes = (node) => {
+        if (!['IN', 'NOT IN'].includes(node.operator))
+            return;
+        const selectedItems = node.right.value.flatMap((v) => v.args.value.map((x) => x.value.toLowerCase()));
+        const checkboxes = uniqueValues;
+        const newValues = {};
+        for (let table of Object.keys(checkboxes)) {
+            newValues[table] = {};
+            for (let column of Object.keys(checkboxes[table])) {
+                newValues[table][column] = {};
+                for (let variant of Object.keys(checkboxes[table][column])) {
+                    newValues[table][column][variant] = selectedItems.includes(variant.toLowerCase());
+                }
             }
         }
-        if (isSubscribed) {
-            getSchema();
+        setUniqueValues(newValues);
+    };
+    const fetchSqlQuery = async () => {
+        try {
+            const response = await axios_1.default.post(`https://quill-344421.uc.r.appspot.com/sqlify`, { ast: { ...baseAst, where: formData }, publicKey: client.publicKey });
+            setActiveQuery(response.data.query);
+            console.info(`%c[Query]: ${response.data.query}`, 'color: dimgray');
+            console.info(`%c[AST]:`, 'color: dimgray', baseAst);
+            fetchUponChange();
         }
-        return () => {
-            isSubscribed = false;
-        };
-    }, []);
+        catch (error) {
+            console.error(error);
+        }
+    };
     (0, react_1.useEffect)(() => {
-        if (onDateFilterChange) {
-            onDateFilterChange(dateRange);
+        setErrorMessage('');
+        if (baseAst || formData) {
+            fetchSqlQuery();
+        }
+    }, [baseAst]);
+    // Returns an array of all the column names in the pivot config
+    // if there are any, otherwise returns [].
+    const getColumnsInPivot = () => {
+        if (!pivot)
+            return [];
+        const { valueField, rowField, columnField } = pivot;
+        return [valueField, rowField, columnField].filter(Boolean);
+    };
+    // It's just like getColumnsInPivot but we expand the columnField
+    // if there is one to include all the variants just like it would
+    // show up in the table. (eg. category -> ...[Fuel, Food, Other])
+    const getColumnsInPivotExpanded = () => {
+        if (!pivot)
+            return [];
+        const tables = (0, ast_1.getTableNames)(baseAst);
+        if (tables.length !== 1)
+            return [];
+        const result = [];
+        const table = tables[0];
+        const { valueField, rowField, columnField } = pivot;
+        if (columnField && uniqueValues[table][columnField]) {
+            result.push(...Object.keys(uniqueValues[table][columnField]));
         }
-    }, [dateRange]);
+        result.push(valueField, rowField);
+        return result.filter(Boolean);
+    };
     (0, react_1.useEffect)(() => {
-        if (onDateFilterChange) {
-            onDateFilterChange(defaultDateRange);
+        if (errorMessage) {
+            console.error(errorMessage);
         }
-    }, []);
+    }, [errorMessage]);
     (0, react_1.useEffect)(() => {
-        setColumns([]);
-    }, [tableName]);
-    const runQuery = async (query) => {
-        setLoading(true);
-        const hostedBody = {
-            metadata: {
-                query,
-                task: 'query',
-                orgId: client.customerId || '*',
-                databaseType: client?.databaseType,
-            },
+        const fetchDistinctHelper = async (column, table) => {
+            try {
+                const query = `SELECT DISTINCT ${column} FROM ${table};`;
+                const response = await axios_1.default.post(`https://quill-344421.uc.r.appspot.com/dashquery`, { orgId: 2, publicKey: client.publicKey, query: query });
+                if (response.data.errorMessage) {
+                    console.error(response.data.errorMessage);
+                    return null;
+                }
+                const options = response.data.rows.map((r) => r[column]);
+                const newCheckboxValues = options.reduce((obj, col) => {
+                    obj[col] = false;
+                    return obj;
+                }, {});
+                return { table, column, values: newCheckboxValues };
+            }
+            catch (e) {
+                console.error(e);
+                return null;
+            }
         };
-        const cloudBody = { query };
-        const resp = await (0, dataFetcher_1.getData)(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
-        if (resp && resp.errorMessage) {
-            onError(resp.errorMessage);
-            setData([]);
-            // onChangeData([]);
-            setColumns([]);
-            // onChangeColumns([]);
-            setFields([]);
-            if (onChangeFields) {
-                onChangeFields([]);
+        const fetchSchema = async () => {
+            try {
+                const response = await fetch(`https://quill-344421.uc.r.appspot.com/schema2/${client.publicKey}`).then((res) => res.json());
+                // Filter out hidden columns on tables back from schema2.
+                const tables = response?.tables;
+                for (const table of tables) {
+                    table.columns = table.columns.filter((column) => 
+                    // Quick and dirty fix for removing org ids from response.
+                    // TODO: Fix this on the backend or something.
+                    column.isVisible && column.displayName !== 'pm_company_id');
+                }
+                setSchemaTables(tables ?? []);
+                setOrderedColumnNames((tables ?? [])
+                    // .filter((t: any) => t.displayName === initialTableName)
+                    .flatMap((table) => table.columns.map((c) => `${table.displayName}.${c.displayName}`)));
+                // Fetch all the unique values in parallel
+                const pendingFetches = [];
+                for (let table of tables ?? []) {
+                    for (let column of table.columns) {
+                        if (!(0, ast_1.isTextColumnType)(column.fieldType))
+                            continue;
+                        const fetchPromise = fetchDistinctHelper(column.name, table.displayName);
+                        pendingFetches.push(fetchPromise);
+                    }
+                }
+                const newUniqueValues = {};
+                const resolvedPromises = await Promise.all(pendingFetches);
+                for (const resolvedData of resolvedPromises) {
+                    if (resolvedData) {
+                        const { table, column, values } = resolvedData;
+                        if (!newUniqueValues[table]) {
+                            newUniqueValues[table] = {};
+                        }
+                        newUniqueValues[table][column] = values;
+                    }
+                }
+                if ((0, crypto_1.hashCode)(uniqueValues) !== (0, crypto_1.hashCode)(newUniqueValues)) {
+                    setUniqueValues(newUniqueValues);
+                }
             }
-            setLoading(false);
-            return;
-        }
-        setData(resp.rows);
-        setColumns(resp.fields.map((elem) => (0, SQLEditor_1.convertPostgresColumn)(elem)));
-        if (selectedPivot) {
-            const { rows, columns } = (0, PivotModal_1.generatePivotTable)(selectedPivot, resp.rows, dateRange);
-            if (onChangePivot) {
-                onChangePivot(selectedPivot, columns, rows);
+            catch (error) {
+                console.error(error);
             }
+        };
+        if (schemaTables.length === 0) {
+            fetchSchema();
         }
-        else {
-            if (onChangeData) {
-                onChangeData(resp.rows);
+    }, [schemaTables]);
+    const updateFormData = (updates, { isDeletion = false, isInsertion = false, isReplaceSubtree = false, isAddVariant = false, isDeleteVariant = false, topLevelBinOp = 'OR', isCondition = undefined, }) => {
+        // Function to immutably update or delete nodes based on their path
+        // TODO: fix the following horible code
+        updates.forEach(({ path, value }) => {
+            const globalPath = [
+                activePath ?? isDeletion ? path : '',
+                isDeletion || isReplaceSubtree ? '' : path,
+            ]
+                .filter(Boolean)
+                .join('.');
+            const paths = globalPath.split('.').filter((p) => p);
+            if (paths.length === 0 && !isInsertion && !isReplaceSubtree) {
+                setFormData(null);
+                setBaseAst((0, util_1.deepCopy)({
+                    ...constants_1.defaultAST,
+                    ...baseAst,
+                    ...(!baseAst?.columns && {
+                        columns: getAllPossibleColumns().map((c) => {
+                            const newColumn = (0, util_1.deepCopy)(constants_1.defaultColumn);
+                            newColumn.expr.column = c.name;
+                            return newColumn;
+                        }),
+                    }),
+                    ...(!baseAst?.from && {
+                        from: [{ ...constants_1.defaultTable, table: initialTableName }],
+                    }),
+                    where: null,
+                }));
+                return;
             }
-            if (onChangeColumns) {
-                onChangeColumns(resp.fields.map((elem) => (0, SQLEditor_1.convertPostgresColumn)(elem)));
+            if (!formData && isInsertion) {
+                setFormData(value);
+                setBaseAst((0, util_1.deepCopy)({
+                    ...constants_1.defaultAST,
+                    ...baseAst,
+                    ...(!baseAst?.columns && {
+                        columns: getAllPossibleColumns().map((c) => {
+                            const newColumn = (0, util_1.deepCopy)(constants_1.defaultColumn);
+                            newColumn.expr.column = c.name;
+                            return newColumn;
+                        }),
+                    }),
+                    ...(!baseAst?.from && {
+                        from: [{ ...constants_1.defaultTable, table: initialTableName }],
+                    }),
+                    where: value,
+                }));
+                return;
             }
-        }
-        setFields(resp.fields);
-        if (onChangeFields) {
-            onChangeFields(resp.fields);
-        }
-        setLoading(false);
-    };
-    (0, react_1.useEffect)(() => {
-        if (onChangeLoading) {
-            onChangeLoading(loading);
-        }
-    }, [loading]);
-    if (!schema || !schema.length || !tableName) {
-        return null;
-    }
-    return ((0, jsx_runtime_1.jsx)(ReportingTool, { containerStyle: containerStyle, destinationDashboard: destinationDashboard, client: client, editSQLEnabled: editSQLEnabled, navigateToSQLEditor: navigateToSQLEditor, theme: theme, data: data, columns: columns, fields: fields, chartBuilderTitle: chartBuilderTitle, chartBuilderButtonLabel: chartBuilderButtonLabel, onChangeData: onChangeData, onChangeColumns: onChangeColumns, onChangePivot: onChangePivot, selectedPivot: selectedPivot, setSelectedPivot: (pivot) => {
-            setSelectedPivot(pivot);
-            if (onChangePivot) {
-                const table = pivot
-                    ? (0, PivotModal_1.generatePivotTable)(pivot, data, dateRange)
-                    : { rows: null, columns: null };
-                onChangePivot(pivot, table.columns, table.rows);
-            }
-        }, schema: schema, tableName: tableName, dateColumn: dateColumn, selectedTagBorderColor: selectedTagBorderColor, onChangeQuery: onChangeQuery, runQuery: runQuery, dateRange: dateRange, setDateRange: setDateRange, defaultDateRange: defaultDateRange, chartBuilderEnabled: chartBuilderEnabled, HeaderComponent: Header, LabelComponent: Label, SelectComponent: Select, TextComponent: Text, ButtonComponent: Button, SecondaryButtonComponent: SecondaryButton, ModalComponent: Modal, PopoverComponent: Popover, TextInputComponent: TextInput, tagStyle: tagStyle, showTableFormatOptions: showTableFormatOptions, showDateFieldOptions: showDateFieldOptions, showAccessControlOptions: showAccessControlOptions }));
-}
-exports.default = ReportBuilder;
-function getPostgresBasicType(column) {
-    let format;
-    // first check if column.dataTypeID exists
-    if (column.dataTypeID) {
-        switch (column.dataTypeID) {
-            case 20: // int8
-            case 21: // int2
-            case 23: // int4
-            case 700: // float4
-            case 701: // float8
-            case 1700: // numeric
-                format = 'number';
-                break;
-            case 1082: // date
-            case 1083: // time
-            case 1184: // timestamptz
-            case 1114: // timestamp
-                format = 'date';
-                break;
-            case 1043: // varchar
-            default:
-                format = 'string';
-        }
-    }
-    else if (column.fieldType) {
-        // if column.dataTypeID doesn't exist, check column.fieldType
-        switch (column.fieldType) {
-            case 'int8':
-            case 'int2':
-            case 'int4':
-            case 'float4':
-            case 'float8':
-            case 'numeric':
-                format = 'number';
-                break;
-            case 'date':
-            case 'time':
-            case 'timestamptz':
-            case 'timestamp':
-                format = 'date';
-                break;
-            case 'varchar':
-            default:
-                format = 'string';
-        }
-    }
-    return format;
-}
-exports.getPostgresBasicType = getPostgresBasicType;
-const newDateWhereAST = (column, dateRange, databaseType) => {
-    // all time means no filter
-    if (dateRange[2] === 'at') {
-        return null;
-    }
-    // if using preset
-    if (dateRange[2]) {
-        const timeInterval = dateRangePickerUtils_1.reportBuilderOptions.find((elem) => elem.value === dateRange[2])?.dayInterval;
-        switch (databaseType) {
-            case 'BigQuery': {
-                return {
+            let newState = (0, util_1.deepCopy)(formData);
+            let current = newState;
+            let parent = null;
+            let parentKey = null;
+            for (let i = 0; i < paths.length - 1; i++) {
+                if (current[paths[i]]) {
+                    parent = current;
+                    parentKey = paths[i];
+                    current = current[paths[i]];
+                }
+            }
+            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) {
+                newState = {
                     type: 'binary_expr',
-                    operator: 'BETWEEN',
-                    left: {
-                        type: 'function',
-                        name: 'Date',
-                        args: {
-                            type: 'expr_list',
-                            value: [
-                                {
-                                    type: 'column_ref',
-                                    table: null,
-                                    column: column,
-                                },
-                            ],
-                        },
-                        over: null,
-                    },
-                    right: {
-                        type: 'expr_list',
-                        value: [
-                            {
-                                type: 'function',
-                                name: 'DATE_SUB',
-                                args: {
-                                    type: 'expr_list',
-                                    value: [
-                                        {
-                                            type: 'function',
-                                            name: 'CURRENT_DATE',
-                                            args: {
-                                                type: 'expr_list',
-                                                value: [],
-                                            },
-                                            over: null,
-                                        },
-                                        {
-                                            type: 'interval',
-                                            expr: {
-                                                type: 'number',
-                                                value: timeInterval,
-                                            },
-                                            unit: 'day',
-                                        },
-                                    ],
-                                },
-                                over: null,
-                            },
-                            {
-                                type: 'function',
-                                name: 'CURRENT_DATE',
-                                args: {
-                                    type: 'expr_list',
-                                    value: [],
-                                },
-                                over: null,
-                            },
-                        ],
-                    },
+                    operator: topLevelBinOp,
+                    isCondition: isCondition,
+                    left: newState,
+                    right: value,
                 };
             }
-            default: {
-                return {
+            else if (isAddVariant) {
+                const newVariant = (0, util_1.deepCopy)(constants_1.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 === name), 1);
+                }
+                else {
+                    current[lastKey].pop();
+                }
+            }
+            else if (isReplaceSubtree) {
+                if (lastKey) {
+                    current[lastKey] = value;
+                }
+                else {
+                    newState = value;
+                }
+            }
+            else {
+                if (typeof current[lastKey] === 'object' && current[lastKey] !== null) {
+                    current[lastKey].value = value;
+                }
+                else {
+                    current[lastKey] = value;
+                }
+            }
+            setFormData(newState);
+            setBaseAst({
+                ...constants_1.defaultAST,
+                ...baseAst,
+                ...(!baseAst?.columns && {
+                    columns: getAllPossibleColumns().map((c) => {
+                        const newColumn = (0, util_1.deepCopy)(constants_1.defaultColumn);
+                        newColumn.expr.column = c.name;
+                        return newColumn;
+                    }),
+                }),
+                ...(!baseAst?.from && {
+                    from: [{ ...constants_1.defaultTable, table: initialTableName }],
+                }),
+                where: { ...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 = (0, util_1.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: {
-                        type: 'binary_expr',
-                        operator: '>=',
-                        left: {
-                            type: 'column_ref',
-                            table: null,
-                            column: column,
-                        },
-                        right: {
-                            type: 'binary_expr',
-                            operator: '-',
-                            left: {
-                                type: 'function',
-                                name: 'now',
-                                args: {
-                                    type: 'expr_list',
-                                    value: [],
-                                },
-                            },
-                            right: {
-                                type: 'interval',
-                                expr: {
-                                    type: 'single_quote_string',
-                                    value: `${timeInterval} day`,
-                                },
-                                unit: '',
-                            },
-                        },
-                    },
+                    left: newState,
                     right: {
-                        type: 'binary_expr',
-                        operator: '<=',
+                        ...constants_1.defaultEntry,
                         left: {
-                            type: 'column_ref',
-                            table: null,
-                            column: column,
-                        },
-                        right: {
-                            type: 'function',
-                            name: 'now',
-                            args: {
-                                type: 'expr_list',
-                                value: [],
-                            },
+                            ...constants_1.defaultEntry.left,
+                            column: defaultColumn,
                         },
                     },
                 };
             }
-        }
-    }
-    else {
-        return {
-            type: 'binary_expr',
-            operator: 'BETWEEN',
-            left: {
-                type: 'column_ref',
-                table: null,
-                column: column,
-            },
-            right: {
-                type: 'expr_list',
-                value: [
-                    {
-                        type: 'single_quote_string',
-                        value: (0, date_fns_1.format)(new Date(dateRange[0]), 'MM/dd/yyyy'),
-                    },
-                    {
-                        type: 'single_quote_string',
-                        value: (0, date_fns_1.format)(new Date(dateRange[1]), 'MM/dd/yyyy'),
-                    },
-                ],
-            },
-        };
-    }
-};
-function ReportingTool({ schema, data, columns, runQuery, SelectComponent, ButtonComponent, SecondaryButtonComponent, editSQLEnabled, navigateToSQLEditor, onChangeQuery, onChangePivot, selectedPivot, setSelectedPivot, theme, ModalComponent, HeaderComponent, PopoverComponent, TextComponent, TextInputComponent, LabelComponent, tagStyle, tableName, dateColumn, selectedTagBorderColor, dateRange, setDateRange, defaultDateRange, chartBuilderEnabled, fields, containerStyle, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, client, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, }) {
-    const selectedTable = (0, react_1.useMemo)(() => schema.find((t) => t.displayName === tableName), [schema, tableName]);
-    const [selectedColumn, setSelectedColumn] = (0, react_1.useState)(schema[0].columns.find((elem) => elem.name !== 'id'));
-    const parentRef = (0, react_1.useRef)();
-    const [filters, setFilters] = (0, react_1.useState)([]);
-    const [AST, setAST] = (0, react_1.useState)({
-        with: null,
-        type: 'select',
-        options: null,
-        distinct: { type: null },
-        columns: '*',
-        into: { position: null },
-        from: [{ db: null, table: selectedTable.displayName, as: null }],
-        // where: newDateWhereAST(dateColumn, defaultDateRange),
-        where: null,
-        groupby: null,
-        having: null,
-        orderby: null,
-        limit: { seperator: '', value: [] },
-        window: null,
-    });
-    const [ASTNoDateColumn, setASTNoDateColumn] = (0, react_1.useState)(AST);
-    const [numberStart, setNumberStart] = (0, react_1.useState)(0);
-    const [numberEnd, setNumberEnd] = (0, react_1.useState)(0);
-    const [filterDateRange, setFilterDateRange] = (0, react_1.useState)((0, dateRangePickerUtils_1.getRangeFromPreset)('90d'));
-    const [computedColumns, setComputedColumns] = (0, react_1.useState)({});
-    const [stringFilterValues, setStringFilterValues] = (0, react_1.useState)([]);
-    const [columnType, setColumnType] = (0, react_1.useState)(getPostgresBasicType(schema[0].columns[0]));
-    const [sqlQuery, setSqlQuery] = (0, react_1.useState)('');
-    const [sqlQueryNoDateColumn, setSqlQueryNoDateColumn] = (0, react_1.useState)('');
-    const [indexBeingEdited, setIndexBeingEdited] = (0, react_1.useState)(-1);
-    const [isAddFilterModalOpen, setIsAddFilterModalOpen] = (0, react_1.useState)(false);
-    const [isEdittingPivot, setIsEdittingPivot] = (0, react_1.useState)(false);
-    const [isPivotModalOpen, setIsPivotModalOpen] = (0, react_1.useState)(false);
-    const [isChartBuilderOpen, setIsChartBuilderOpen] = (0, react_1.useState)(false);
-    const [selectedPivotIndex, setSelectedPivotIndex] = (0, react_1.useState)(-1);
-    const [createdPivots, setCreatedPivots] = (0, react_1.useState)([]);
-    const [recommendedPivots, setRecommendedPivots] = (0, react_1.useState)([]);
-    const [pivotRowField, setPivotRowField] = (0, react_1.useState)(undefined);
-    const [pivotColumnField, setPivotColumnField] = (0, react_1.useState)(undefined);
-    const [pivotValueField, setPivotValueField] = (0, react_1.useState)(undefined);
-    const [pivotAggregation, setPivotAggregation] = (0, react_1.useState)(undefined);
-    const [pivotPopUpTitle, setPivotPopUpTitle] = (0, react_1.useState)('Add Pivot');
-    (0, react_1.useEffect)(() => {
-        setColumnType(getPostgresBasicType(selectedColumn));
-    }, [selectedColumn]);
-    (0, react_1.useEffect)(() => {
-        removePivot();
-        setCreatedPivots([]);
-        setRecommendedPivots([]);
-    }, [selectedTable]);
-    const selectFilter = (index) => {
-        const filter = filters[index];
-        const matchingColumn = selectedTable.columns.find((column) => column.name === filter.column);
-        if (indexBeingEdited === index) {
-            setIndexBeingEdited(-1);
-            setStringFilterValues([]);
-            setNumberStart(0);
-            setNumberEnd(0);
-            setFilterDateRange((0, dateRangePickerUtils_1.getRangeFromPreset)('90d'));
-            return;
-        }
-        setSelectedColumn(matchingColumn);
-        if (filter.columnType === 'string') {
-            setStringFilterValues(filter.stringFilterValues);
-            setIndexBeingEdited(index);
-        }
-        else if (filter.columnType === 'number') {
-            setNumberStart(filter.numberStart);
-            setNumberEnd(filter.numberEnd);
-            setIndexBeingEdited(index);
-        }
-        else if (filter.columnType === 'date') {
-            setFilterDateRange(filter.filterDateRange);
-            setIndexBeingEdited(index);
-        }
+            else if (isAddVariant) {
+                const newVariant = (0, util_1.deepCopy)(constants_1.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 = (0, util_1.deepCopy)(constants_1.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 (operators_1.OPERATOR_GROUPS[oldOp] === operators_1.OPERATOR_GROUPS[newOp]) {
+                    current[lastKey] = value;
+                }
+                else {
+                    const group = operators_1.OPERATOR_GROUPS[newOp];
+                    const subtree = (0, operators_1.getDefaultOperatorSubtrees)(group, newOp, column, '', client.databaseType);
+                    if (parentKey) {
+                        parent[parentKey] = (0, util_1.deepCopy)(subtree);
+                    }
+                    else {
+                        newState = (0, util_1.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, {});
     };
-    const selectedPivotTable = (0, react_1.useMemo)(() => {
-        if (selectedPivot && data) {
-            return (0, PivotModal_1.generatePivotTable)(selectedPivot, data, dateRange);
+    // Function to handle operator changes
+    const handleOperatorChange = (value, node, keyPrefix, column = null) => {
+        if (isPending) {
+            updateActiveItem([{ path: keyPrefix + 'operator', value }], { column });
         }
         else {
-            return {};
-        }
-    }, [selectedPivot, data, dateRange]);
-    const removePivot = () => {
-        setSelectedPivotIndex(-1);
-        setSelectedPivot(null);
-        if (onChangePivot) {
-            onChangePivot(null, null, null);
+            updateFormData([{ path: keyPrefix + 'operator', value }], { column });
         }
     };
-    const selectPivot = (pivot, index) => {
-        setSelectedPivotIndex(index);
-        setSelectedPivot(pivot);
-        const pivotTable = (0, PivotModal_1.generatePivotTable)(pivot, data, dateRange);
-        if (onChangePivot) {
-            onChangePivot(pivot, pivotTable.columns, pivotTable.rows);
-        }
+    // 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,
+        });
     };
-    const updateFilter = (index) => {
-        if (selectedColumn && columnType) {
-            if (columnType === 'string') {
-                setFilters((filters) => {
-                    const newFilters = [...filters];
-                    newFilters[index] = {
-                        column: selectedColumn.name,
-                        columnType,
-                        stringFilterValues,
-                        tag: `${selectedColumn.name} (${stringFilterValues.join(', ')})`,
-                    };
-                    return newFilters;
-                });
-            }
-            else if (columnType === 'number') {
-                setFilters((filters) => {
-                    const newFilters = [...filters];
-                    newFilters[index] = {
-                        column: selectedColumn.name,
-                        columnType,
-                        numberStart,
-                        numberEnd,
-                        tag: `${numberStart} < ${selectedColumn.name} < ${numberEnd}`,
-                    };
-                    return newFilters;
-                });
-            }
-            else if (columnType === 'date') {
-                const label = filterDateRange[2]
-                    ? dateRangePickerUtils_1.reportBuilderOptions.find((elem) => elem.value === filterDateRange[2])?.text
-                    : `${(0, date_fns_1.format)(new Date(filterDateRange[0]), 'MMM dd')} - ${(0, date_fns_1.format)(new Date(filterDateRange[1]), 'MMM dd')}`;
-                setFilters((filters) => {
-                    const newFilters = [...filters];
-                    newFilters[index] = {
-                        column: selectedColumn.name,
-                        columnType,
-                        filterDateRange,
-                        tag: `${selectedColumn.name} (${label})`,
-                    };
-                    return newFilters;
-                });
-            }
-            setStringFilterValues([]);
-            setNumberStart(0);
-            setNumberEnd(0);
-            setFilterDateRange((0, dateRangePickerUtils_1.getRangeFromPreset)('90d'));
-            setIndexBeingEdited(-1);
-            return;
-        }
+    // Function to handle the deletion of expressions
+    const handleDelete = (key) => {
+        updateFormData([{ path: path + key, value: null }], { isDeletion: true });
     };
-    // ADD FILTER TO "FILTERS" ARRAY
-    const addFilter = async () => {
-        if (selectedColumn && columnType) {
-            //   const type = getPostgresBasicType(selectedColumn);
-            let newCondition;
-            if (columnType === 'string') {
-                setFilters((filters) => {
-                    return [
-                        ...filters,
-                        {
-                            column: selectedColumn.name,
-                            columnType,
-                            stringFilterValues,
-                            tag: `${selectedColumn.name} (${stringFilterValues.join(', ')})`,
-                        },
+    // Function to handle the insertion of expressions
+    const handleInsertion = (value, op = 'OR', isCondition = undefined) => {
+        updateFormData([{ path, value }], {
+            isInsertion: true,
+            topLevelBinOp: op,
+            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: 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: 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.
+     *
+     * Searches the known schema and returns the fieldType of the first column
+     * it can find with the given name. Will first search through the current
+     * list of fields in the current query if any, then will default to searching
+     * through the whole schema.
+     *
+     * If more than one column exist with the given name, it will return the first
+     * one that it finds. This might not be the one that you intended.
+     *
+     * TODO: pass an optional table param to limit the search to a given table.
+     *
+     * @param columnName the name to search for.
+     * @returns the fieldType string or undefined if not found.
+     */
+    const getColumnTypeByName = (columnName) => {
+        const field = fields.find((f) => f.name === columnName);
+        if (field)
+            return (0, util_1.getPostgresBasicType)(field);
+        const column = schemaTables
+            .flatMap((t) => t.columns)
+            .find((c) => c.name === columnName);
+        return column?.fieldType;
+    };
+    /**
+     * 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 = (0, util_1.formatDateComparisonNode)(node);
+        switch (node.type) {
+            case 'binary_expr':
+                if (dateComparisonPartialMatch ||
+                    ((0, util_1.isDateTruncEquals)(node) && client.databaseType !== 'BigQuery')) {
+                    const { dateColumn, 
+                    // see onChange callback handleChange
+                    // eslint-disable-next-line no-unused-vars
+                    dateColumnPath, dateFilterType, intervalCount, intervalType, intervalPaths, } = (0, util_1.getDateFilterInfo)(node);
+                    const isPlural = intervalCount && intervalCount > 1 ? '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 ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', gap: 20 }, children: [(0, jsx_runtime_1.jsx)(Select, { value: dateColumn, onChange: (value) => {
+                                    const columnType = getColumnTypeByName(value);
+                                    if ((0, ast_1.isDateishColumnType)(columnType)) {
+                                        // handleChange(value, keyPrefix + dateColumnPath, "text");
+                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, value);
+                                    }
+                                    else if ((0, ast_1.isNumericColumnType)(columnType)) {
+                                        const newSubtree = (0, util_1.deepCopy)(constants_1.defaultNumericComparison);
+                                        newSubtree.left.column = value;
+                                        handleReplaceSubtree(keyPrefix, newSubtree);
+                                    }
+                                    else {
+                                        const newSubtree = (0, util_1.deepCopy)(constants_1.defaultEntry);
+                                        newSubtree.left.args.value[0].column = value;
+                                        handleReplaceSubtree(keyPrefix, newSubtree);
+                                    }
+                                }, options: getAllPossibleColumns().map((column) => ({
+                                    label: column.displayName,
+                                    value: column.name,
+                                })) }), (0, jsx_runtime_1.jsx)(Select, { value: dateFilterType, onChange: (value) => {
+                                    if (value === dateFilterType)
+                                        return null;
+                                    let newSubtree = {};
+                                    // TODO: implement one for each database type (eg. pg, snowflake, etc.)
+                                    if (value === 'in the last') {
+                                        newSubtree = (0, postgres_1.generateLastNPeriodsPostgres)({
+                                            dateField: dateColumn,
+                                            intervalPeriod: `${intervalCount ?? 1} ${intervalType}`,
+                                        });
+                                    }
+                                    else if (value === 'in the previous') {
+                                        newSubtree = (0, postgres_1.generatePreviousPeriodPostgres)({
+                                            dateField: dateColumn,
+                                            intervalPeriod: `${intervalCount ?? 1} ${intervalType}`,
+                                            currentPeriod: intervalType,
+                                        });
+                                    }
+                                    else if (value === 'in the current') {
+                                        newSubtree = (0, postgres_1.generateCurrentPeriodPostgres)({
+                                            dateField: dateColumn,
+                                            currentPeriod: intervalType,
+                                        });
+                                    }
+                                    else if (value === 'equals') {
+                                        newSubtree = (0, postgres_1.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' },
+                                ] }), !['in the current', 'equals'].includes(dateFilterType) && ((0, jsx_runtime_1.jsx)(TextInput, { value: intervalCount, type: "number", style: { width: '70px' }, onChange: (e) => {
+                                    const isPluralNow = e.target.value > 1 ? 's' : '';
+                                    intervalPaths.forEach((intervalPath) => handleChangeText([
+                                        {
+                                            value: `${e.target.value} ${intervalType}${isPluralNow}`,
+                                            path: keyPrefix + intervalPath,
+                                        },
+                                    ]));
+                                } })), (0, jsx_runtime_1.jsx)(Select, { value: intervalType, onChange: (value) => {
+                                    if (intervalPaths.length === 1) {
+                                        handleChangeText([
+                                            {
+                                                value: intervalCount !== null
+                                                    ? `${intervalCount} ${value}${isPlural}`
+                                                    : value,
+                                                path: keyPrefix + intervalPaths[0],
+                                            },
+                                        ]);
+                                        return;
+                                    }
+                                    let newSubtree;
+                                    if (dateFilterType === 'equals') {
+                                        newSubtree = (0, postgres_1.generateEqualsPostgres)({
+                                            dateField: dateColumn,
+                                            currentPeriod: value,
+                                            timestamp: rawDateStringEquals,
+                                        });
+                                    }
+                                    else {
+                                        newSubtree = (0, postgres_1.generateCurrentPeriodPostgres)({
+                                            dateField: dateColumn,
+                                            currentPeriod: value,
+                                        });
+                                    }
+                                    handleReplaceSubtree(keyPrefix, newSubtree);
+                                }, options: [
+                                    { 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' },
+                                ] }), dateFilterType === 'equals' && ((0, jsx_runtime_1.jsx)(TextInput, { value: rawDateStringEquals, type: "text", style: { width: '120px' }, onChange: (e) => {
+                                    handleChangeText([
+                                        {
+                                            value: e.target.value,
+                                            path: keyPrefix + rawDateStringEqualsPath,
+                                        },
+                                    ]);
+                                } }))] }));
+                }
+                else if ((0, util_1.isInTheLastInterval)(node, client.databaseType)) {
+                    const { dateColumn, dateFilterType, intervalCount, intervalType } = (0, util_1.getDateFilterInfo)(node);
+                    const options = getAllPossibleColumns().map((column) => ({
+                        label: column.displayName,
+                        value: column.name,
+                    }));
+                    const plural = node.right.args.value[1].expr.value > 1 ? 's' : '';
+                    return ((0, jsx_runtime_1.jsxs)("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 20,
+                        }, children: [(0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(Select, { value: node.left.column, onChange: (value) => {
+                                        const columnType = getColumnTypeByName(value);
+                                        if ((0, ast_1.isDateishColumnType)(columnType)) {
+                                            // handleChange(value, keyPrefix + dateColumnPath, "text");
+                                            handleOperatorChange('IN_THE_LAST', node, keyPrefix, value);
+                                        }
+                                        else if ((0, ast_1.isNumericColumnType)(columnType)) {
+                                            const newSubtree = (0, util_1.deepCopy)(constants_1.defaultNumericComparison);
+                                            newSubtree.left.column = value;
+                                            handleReplaceSubtree(keyPrefix, newSubtree);
+                                        }
+                                        else {
+                                            const newSubtree = (0, util_1.deepCopy)(constants_1.defaultEntry);
+                                            newSubtree.left.args.value[0].column = value;
+                                            handleReplaceSubtree(keyPrefix, newSubtree);
+                                        }
+                                    }, options: options }) }), (0, jsx_runtime_1.jsx)(Select, { value: dateFilterType, onChange: (value) => {
+                                    handleOperatorChange(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' },
+                                ] }), (0, jsx_runtime_1.jsx)(TextInput, { defaultValue: node.right.args.value[1].expr.value, type: "number", style: { width: '120px', height: '42px' }, min: 0, onBlur: (e) => {
+                                    handleChange([
+                                        {
+                                            value: e.target.value,
+                                            path: keyPrefix + 'right.args.value||1.expr.value',
+                                        },
+                                    ]);
+                                } }), (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(Select, { value: node.right.args.value[1].unit, onChange: (value) => handleChange([
+                                        { 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' },
+                                    ] }) })] }));
+                }
+                else if ((0, util_1.isTheCurrentInterval)(node, client.databaseType)) {
+                    const { dateFilterType } = (0, util_1.getDateFilterInfo)(node);
+                    const options = getAllPossibleColumns().map((column) => ({
+                        label: column.displayName,
+                        value: column.name,
+                    }));
+                    return ((0, jsx_runtime_1.jsxs)("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 20,
+                        }, children: [(0, jsx_runtime_1.jsx)(Select, { value: node.left.column, onChange: (value) => {
+                                    const columnType = getColumnTypeByName(value);
+                                    if ((0, ast_1.isDateishColumnType)(columnType)) {
+                                        // handleChange(value, keyPrefix + dateColumnPath, "text");
+                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, value);
+                                    }
+                                    else if ((0, ast_1.isNumericColumnType)(columnType)) {
+                                        const newSubtree = (0, util_1.deepCopy)(constants_1.defaultNumericComparison);
+                                        newSubtree.left.column = value;
+                                        handleReplaceSubtree(keyPrefix, newSubtree);
+                                    }
+                                    else {
+                                        const newSubtree = (0, util_1.deepCopy)(constants_1.defaultEntry);
+                                        newSubtree.left.args.value[0].column = value;
+                                        handleReplaceSubtree(keyPrefix, newSubtree);
+                                    }
+                                }, options: options }), (0, jsx_runtime_1.jsx)(Select, { value: 'IN_THE_CURRENT', onChange: (value) => {
+                                    handleOperatorChange(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' },
+                                ] }), (0, jsx_runtime_1.jsx)(Select, { value: node.left.args.value[1].column, onChange: (value) => {
+                                    handleChange([
+                                        { value, path: 'right.args.value||1.column' },
+                                        { value, path: 'left.args.value||1.column' },
+                                    ]);
+                                }, options: [
+                                    { label: `year`, value: 'YEAR' },
+                                    { label: `quarter`, value: 'QUARTER' },
+                                    { label: `month`, value: 'MONTH' },
+                                    { label: `week`, value: 'WEEK' },
+                                ] })] }));
+                }
+                else if ((0, util_1.isThePreviousInterval)(node, client.databaseType)) {
+                    const options = getAllPossibleColumns().map((column) => ({
+                        label: column.displayName,
+                        value: column.name,
+                    }));
+                    return ((0, jsx_runtime_1.jsxs)("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 20,
+                        }, children: [(0, jsx_runtime_1.jsx)(Select, { value: node.left.column, onChange: (value) => {
+                                    const columnType = getColumnTypeByName(value);
+                                    if ((0, ast_1.isDateishColumnType)(columnType)) {
+                                        // handleChange(value, keyPrefix + dateColumnPath, "text");
+                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, value);
+                                    }
+                                    else if ((0, ast_1.isNumericColumnType)(columnType)) {
+                                        const newSubtree = (0, util_1.deepCopy)(constants_1.defaultNumericComparison);
+                                        newSubtree.left.column = value;
+                                        handleReplaceSubtree(keyPrefix, newSubtree);
+                                    }
+                                    else {
+                                        const newSubtree = (0, util_1.deepCopy)(constants_1.defaultEntry);
+                                        newSubtree.left.args.value[0].column = value;
+                                        handleReplaceSubtree(keyPrefix, newSubtree);
+                                    }
+                                }, opt: true, options: options }), (0, jsx_runtime_1.jsx)(Select, { value: 'IN_THE_PREVIOUS', onChange: (value) => {
+                                    handleOperatorChange(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' },
+                                ] }), (0, jsx_runtime_1.jsx)(Select, { value: node.left.args.value[1].column, onChange: (value) => {
+                                    const dayConversion = {
+                                        YEAR: 365,
+                                        QUARTER: 90,
+                                        MONTH: 30,
+                                        WEEK: 7,
+                                    };
+                                    handleChange([
+                                        {
+                                            value,
+                                            path: 'left.args.value||1.column',
+                                        },
+                                        {
+                                            value,
+                                            path: 'right.args.value||1.column',
+                                        },
+                                        {
+                                            value: dayConversion[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' },
+                                ] })] }));
+                }
+                else if ((0, util_1.isColumnComparison)(node)) {
+                    const options = getAllPossibleColumns().map((column) => ({
+                        label: 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 column = schemaTables
+                        .flatMap((t) => t.columns)
+                        .find((col) => col.name === leftChildValue);
+                    const tables = (0, ast_1.getTableNames)(baseAst);
+                    const table = tables.length === 1 ? tables[0] : initialTableName;
+                    const columnType = column?.fieldType;
+                    const operatorOptions = [
+                        ...((0, ast_1.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' },
+                            ]
+                            : []),
+                        ...((0, ast_1.isTextColumnType)(columnType)
+                            ? [
+                                { label: 'is', value: 'LIKE' },
+                                { label: 'is not', value: 'NOT LIKE' },
+                                { label: 'is one of', value: 'IN' },
+                                { label: 'is not one of', value: 'NOT IN' },
+                                { label: 'is not null', value: 'IS NOT' },
+                                { label: 'is null', value: 'IS' },
+                            ]
+                            : []),
+                        ...((0, ast_1.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' },
+                            ]
+                            : []),
                     ];
-                });
-                setStringFilterValues([]);
-                setNumberStart(0);
-                setNumberEnd(0);
-                setFilterDateRange((0, dateRangePickerUtils_1.getRangeFromPreset)('90d'));
-                return;
+                    return ((0, jsx_runtime_1.jsxs)("div", { style: {
+                            display: 'flex',
+                            gap: 12,
+                            flexDirection: 'column',
+                            width: '100%',
+                        }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
+                                    display: 'flex',
+                                    gap: 20,
+                                    // justifyContent: "space-between",
+                                    flexDirection: (0, util_1.showNodeAsRow)(node, formData)
+                                        ? 'row'
+                                        : 'column',
+                                    width: '100%',
+                                }, children: [(0, jsx_runtime_1.jsx)(Select, { style: { width: 'min-content' }, value: leftChildValue, onChange: (value) => {
+                                            const columnType = getColumnTypeByName(value);
+                                            if ((0, ast_1.isDateishColumnType)(columnType)) {
+                                                handleOperatorChange('IN_THE_LAST', node, keyPrefix, value);
+                                            }
+                                            else if ((0, ast_1.isNumericColumnType)(columnType)) {
+                                                const newSubtree = (0, util_1.deepCopy)(constants_1.defaultNumericComparison);
+                                                newSubtree.left.column = value;
+                                                handleReplaceSubtree(keyPrefix, newSubtree);
+                                            }
+                                            else {
+                                                const newSubtree = (0, util_1.deepCopy)(constants_1.defaultEntry);
+                                                newSubtree.left.args.value[0].column = value;
+                                                handleReplaceSubtree(keyPrefix, newSubtree);
+                                            }
+                                        }, options: options }), operatorOptions.length > 0 && ((0, jsx_runtime_1.jsx)(Select, { value: node.operator, onChange: (value) => {
+                                            handleOperatorChange(value, node, keyPrefix, leftChildValue);
+                                        }, style: { width: 'min-content' }, options: operatorOptions })), node.right &&
+                                        node.right.type !== 'expr_list' &&
+                                        renderNode(node.right, keyPrefix + 'right.')] }, keyPrefix), node.right && node.right.type === 'expr_list' && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                    display: 'grid',
+                                    gridTemplateColumns: 'repeat(2, 1fr)',
+                                    gap: 12,
+                                }, children: Object.keys(uniqueValues[table][leftChildValue] ?? {}).map((key) => ((0, jsx_runtime_1.jsxs)("label", { style: { display: 'flex', gap: 2 }, children: [(0, jsx_runtime_1.jsx)(Checkbox, { checked: uniqueValues[table][leftChildValue][key], onChange: (checked) => {
+                                                const newValues = (0, util_1.deepCopy)(uniqueValues);
+                                                newValues[table][leftChildValue][key] = checked;
+                                                setUniqueValues(newValues);
+                                                if (checked) {
+                                                    handleInsertVariant(keyPrefix + 'right.' + 'value', key);
+                                                }
+                                                else {
+                                                    handleDeleteVariant(keyPrefix + 'right.' + 'value', key);
+                                                }
+                                            } }), (0, jsx_runtime_1.jsx)("span", { children: key })] }, key))) }, keyPrefix + 'right.'))] }));
+                }
+                else {
+                    const columnName = node.left.column;
+                    const column = schemaTables[0]?.columns.find((col) => col.name === columnName);
+                    const columnType = column?.fieldType;
+                    return ((0, jsx_runtime_1.jsxs)("div", { style: {
+                            display: 'flex',
+                            gap: 12,
+                            justifyContent: 'space-between',
+                            flexDirection: (0, util_1.showNodeAsRow)(node, formData) ? 'row' : 'column',
+                            width: '100%',
+                        }, children: [node.left && renderNode(node.left, keyPrefix + 'left.'), (0, jsx_runtime_1.jsx)(Select, { value: node.operator, onChange: (value) => {
+                                    handleOperatorChange(value, node, keyPrefix);
+                                }, style: { width: `100%` }, options: [
+                                    // { label: `and`, value: "AND" },
+                                    // { label: `or`, value: "OR" },
+                                    ...((0, ast_1.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' },
+                                        ]
+                                        : []),
+                                    ...((0, ast_1.isTextColumnType)(columnType)
+                                        ? [
+                                            { label: 'is', value: 'LIKE' },
+                                            { label: 'is not', value: 'NOT LIKE' },
+                                            { label: 'is one of', value: 'IN' },
+                                            { label: 'is not one of', value: 'NOT IN' },
+                                            { label: 'is not null', value: 'IS NOT' },
+                                            { label: 'is null', value: 'IS' },
+                                        ]
+                                        : []),
+                                    ...((0, ast_1.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: 'is not null', value: 'IS NOT' },
+                                            { label: 'is null', value: 'IS' },
+                                        ]
+                                        : []),
+                                    // { label: `minus`, value: "-" },
+                                    // { label: `plus`, value: "+" },
+                                ] }), node.right && renderNode(node.right, keyPrefix + 'right.')] }, keyPrefix));
+                }
+            case 'column_ref': {
+                const options = getAllPossibleColumns().map((column) => ({
+                    label: column.displayName,
+                    value: column.name,
+                }));
+                return ((0, jsx_runtime_1.jsx)(Select, { style: { width: '120px' }, value: node.column ?? options[0]?.value, onChange: (value) => {
+                        handleChange([{ value, path: keyPrefix + 'column' }]);
+                    }, options: options }));
             }
-            else if (columnType === 'number') {
-                setFilters((filters) => {
-                    return [
-                        ...filters,
-                        {
-                            column: selectedColumn.name,
-                            columnType,
-                            numberStart,
-                            numberEnd,
-                            tag: `${numberStart} < ${selectedColumn.name} < ${numberEnd}`,
-                        },
-                    ];
-                });
-                setStringFilterValues([]);
-                setNumberStart(0);
-                setNumberEnd(0);
-                setFilterDateRange((0, dateRangePickerUtils_1.getRangeFromPreset)('90d'));
-                return;
+            case 'expr_list': {
+                const len = node.value.length;
+                return ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'row', gap: 12 }, children: [node.value.map((elem, index) => {
+                            if (elem.value) {
+                                return ((0, jsx_runtime_1.jsx)(TextInput, { type: elem.type === 'number' ? 'number' : 'text', defaultValue: elem.value, onBlur: (e) => handleChange([
+                                        {
+                                            value: elem.type === 'number'
+                                                ? parseFloat(e.target.value)
+                                                : e.target.value,
+                                            path: keyPrefix + `value.${index}.`,
+                                        },
+                                    ]) }, `input_${index}`));
+                            }
+                            return renderNode(elem, keyPrefix + `value.${index}.`);
+                        }), len > 1 && ((0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => handleDeleteVariant(keyPrefix + 'value'), children: "-" })), (0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => handleInsertVariant(keyPrefix + 'value'), children: "+" })] }, keyPrefix));
             }
-            else if (columnType === 'date') {
-                const label = filterDateRange[2]
-                    ? dateRangePickerUtils_1.reportBuilderOptions.find((elem) => elem.value === filterDateRange[2])?.text
-                    : `${(0, date_fns_1.format)(new Date(filterDateRange[0]), 'MMM dd')} - ${(0, date_fns_1.format)(new Date(filterDateRange[1]), 'MMM dd')}`;
-                setFilters((filters) => {
-                    return [
-                        ...filters,
+            case 'double_quote_string':
+            case 'single_quote_string':
+                return ((0, jsx_runtime_1.jsx)(TextInput, { type: "text", defaultValue: node.value.replaceAll('%', ''), style: { width: '120px' }, onBlur: (e) => handleChange([
                         {
-                            column: selectedColumn.name,
-                            columnType,
-                            filterDateRange,
-                            tag: `${selectedColumn.name} (${label})`,
+                            value: node.type === 'number'
+                                ? parseFloat(e.target.value)
+                                : e.target.value,
+                            path: keyPrefix + 'value',
                         },
-                    ];
-                });
-                setStringFilterValues([]);
-                setNumberStart(0);
-                setNumberEnd(0);
-                setFilterDateRange((0, dateRangePickerUtils_1.getRangeFromPreset)('90d'));
-            }
+                    ]) }));
+            case 'null':
+                return (0, jsx_runtime_1.jsx)("div", {});
+            case 'number':
+                return ((0, jsx_runtime_1.jsx)(TextInput, { defaultValue: node.value, type: "number", style: { width: '120px' }, onBlur: (e) => {
+                        handleChange([
+                            {
+                                value: node.type === 'number'
+                                    ? parseFloat(e.target.value)
+                                    : e.target.value,
+                                path: keyPrefix + 'value',
+                            },
+                        ]);
+                    } }));
+            case 'function':
+                if (!node.args) {
+                    return (0, jsx_runtime_1.jsx)("label", {});
+                }
+                else if (node.args.type === 'expr_list' &&
+                    node.args.value.length === 1) {
+                    return ((0, jsx_runtime_1.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 ((0, jsx_runtime_1.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 ((0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', flexDirection: 'row', gap: 20 }, children: renderNode(node.expr, keyPrefix + 'expr.') }));
+            default:
+                return null;
         }
     };
-    const handleRunQuery = (newSqlQuery) => {
-        const queryToUse = newSqlQuery || sqlQuery;
-        if (queryToUse && queryToUse.length) {
-            runQuery(queryToUse);
+    const renderSentence = (formData, node, keyPrefix = '', 
+    // @depreciated TODO: remove next update
+    // eslint-disable-next-line no-unused-vars
+    isTopLevel = false, 
+    // @depreciated TODO: remove next update
+    // eslint-disable-next-line no-unused-vars
+    isTopLevelAnd = false, isParentRow = false) => {
+        const isInTheCurrentIntervalSentence = (0, util_1.isTheCurrentInterval)(node, client.databaseType)
+            ? (0, util_1.getInTheCurrentIntervalSentence)(node, client.databaseType)
+            : null;
+        const isInTheLastIntervalSentence = (0, util_1.isInTheLastInterval)(node, client.databaseType)
+            ? (0, util_1.getInTheLastIntervalSentence)(node, client.databaseType)
+            : null;
+        const isInThePreviousIntervalSentence = (0, util_1.isThePreviousInterval)(node, client.databaseType)
+            ? (0, util_1.getInThePreviousIntervalSentence)(node, client.databaseType)
+            : null;
+        let dateComparisonPartialMatch = null;
+        let dateEqualityPartialMatch = null;
+        if (client.databaseType !== 'BigQuery') {
+            dateComparisonPartialMatch = (0, util_1.formatDateComparisonNode)(node);
+            dateEqualityPartialMatch = (0, util_1.tryConvertDateEquality)(node, client.databaseType);
+        }
+        const isRow = !(0, util_1.isTopLevelBoolean)(node);
+        const isCard = isRow && !isParentRow;
+        const OPS = {
+            AND: 'and',
+            OR: 'or',
+            LIKE: 'is',
+            BETWEEN: 'is between',
+            IN: 'is one of',
+            'NOT IN': 'is not one of',
+            'NOT LIKE': 'is not',
+            '!=': 'is not',
+            '=': 'is',
+            '<': 'is less than',
+            '>': 'is greater than',
+            '<=': 'is less than or equal to',
+            '>=': 'is greater than or equal to',
+            '<>': 'is not',
+            '-': 'minus',
+            'IS NOT': 'is not',
+            IS: 'is ',
+        };
+        switch (node.type) {
+            case 'binary_expr':
+                return ((0, jsx_runtime_1.jsx)(ui_1.TagWrapper, { keyPrefix: keyPrefix, formData: formData, activeEditItem: activeEditItem, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setCheckboxes: setCheckboxes, handleReplaceSubtree: handleReplaceSubtree, FilterPopover: FilterPopover, setActivePath: setActivePath, setOpenPopover: setOpenPopover, setIsPending: setIsPending, clearCheckboxes: clearCheckboxes, fetchSqlQuery: fetchSqlQuery, handleDelete: handleDelete, editPopoverKey: editPopoverKey, isCard: isCard, isRow: isRow, getByKey: getByKey, node: node, EditPopover: ui_1.EditPopover, Button: Button, renderNode: renderNode, Popover: Popover, style: {
+                        display: 'flex',
+                        gap: 3,
+                        flexDirection: isRow ? 'row' : 'column',
+                        padding: '1px',
+                        border: isCard ? '1px solid black' : 'none',
+                        whiteSpace: 'nowrap',
+                        overflow: 'hidden',
+                        textOverflow: 'ellipsis',
+                    }, children: dateComparisonPartialMatch ??
+                        dateEqualityPartialMatch ??
+                        isInTheCurrentIntervalSentence ??
+                        isInTheLastIntervalSentence ??
+                        isInThePreviousIntervalSentence ?? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [node.left &&
+                                renderSentence(formData, node.left, keyPrefix + 'left.', false, false, isRow), isRow ? (' ' + OPS[node.operator] + ' ') : topLevelBinaryOperator === 'OR' ? ((0, jsx_runtime_1.jsx)(TopLevelBooleanSwitch, { node: node, keyPrefix: keyPrefix, handleOperatorChange: handleOperatorChange, Select: Select })) : null, node.right &&
+                                renderSentence(formData, node.right, keyPrefix + 'right.', false, false, isRow)] })) }));
+            case 'column_ref':
+                return node.column;
+            case 'expr_list':
+                if (node.value.length === 1) {
+                    const subQuery = renderSentence(formData, node.value[0]);
+                    if (subQuery) {
+                        return `${subQuery}`;
+                    }
+                    return '()';
+                }
+                return `${node.value
+                    .map((elem) => renderSentence(formData, elem))
+                    .join(', ')}`;
+            case 'single_quote_string':
+                return node.value.replaceAll('%', '');
+            case 'double_quote_string':
+            case 'number':
+                return node.value;
+            case 'null':
+                return 'null';
+            case 'interval':
+                if (node.unit) {
+                    // eg. `INTERVAL '90' DAY` -> "90 days"
+                    return `${node.expr.value} ${node.unit}s`;
+                }
+                return node.expr.value;
+            case 'function':
+                if (node.name.toLowerCase() === 'lower' ||
+                    node.name.toLowerCase() === 'upper') {
+                    // how many transactions were above 20 and not fuel or made in the last 90 days (hint: use lower)
+                    if (node.args.value.length < 1)
+                        return null;
+                    if (node.args.value[0].value) {
+                        return node.args.value[0].value.replaceAll('%', '');
+                    }
+                    if (node.args.value[0].column)
+                        return node.args.value[0].column.replaceAll('%', '');
+                    return null;
+                }
+                if (node.name.toLowerCase() === 'current_date' ||
+                    node.name.toLowerCase() === 'now') {
+                    return 'today';
+                }
+                if (node.name.toLowerCase() === 'date_trunc') {
+                    // eg. date_trunc('month', now())
+                    if (!node.args)
+                        return null;
+                    if (node.args.type !== 'expr_list')
+                        return null;
+                    if (node.args.value?.length !== 2)
+                        return null;
+                    const interval = renderSentence(formData, node.args.value[0]);
+                    const timestamp = renderSentence(formData, node.args.value[1]);
+                    return `start of the ${interval} of ${timestamp}`;
+                }
+                return null;
+            default:
+                return null;
         }
     };
-    (0, react_1.useEffect)(() => {
-        // if selected table changes, clear everything
-        if (selectedTable.displayName !== AST.from.table) {
-            setSelectedColumn(selectedTable.columns.find((elem) => elem.name !== 'id'));
-            setFilters([]);
-            removePivot();
-            const resetAST = {
-                with: null,
-                type: 'select',
-                options: null,
-                distinct: { type: null },
-                columns: '*',
-                into: { position: null },
-                // where: newDateWhereAST(dateColumn, defaultDateRange),
-                where: null,
-                groupby: null,
-                having: null,
-                orderby: null,
-                limit: { seperator: '', value: [] },
-                window: null,
-                from: [{ db: null, table: selectedTable.displayName, as: null }],
-            };
-            setAST(resetAST);
-            setASTNoDateColumn(resetAST);
-            return;
+    const getAllPossibleColumns = () => {
+        if (!baseAst || !baseAst.from) {
+            return schemaTables.flatMap((table) => table.columns.map((c) => ({
+                ...c,
+                table: table.displayName,
+            })));
         }
-    }, [selectedTable]);
-    const generateNewAST = (includeDateColumn) => {
-        if (filters.length || dateRange) {
-            const newAST = {
-                with: null,
-                type: 'select',
-                options: null,
-                distinct: null,
-                columns: '*',
-                into: { position: null },
-                from: [{ db: null, table: selectedTable.displayName, as: null }],
-                // where: newDateWhereAST(dateColumn, dateRange || defaultDateRange),
-                where: null,
-                groupby: null,
-                having: null,
-                orderby: null,
-                limit: null,
-                window: null,
-            };
-            // FILTERS
-            for (let i = 0; i < filters.length; i++) {
-                const filter = filters[i];
-                const { column, columnType, stringFilterValues, numberStart, numberEnd, filterDateRange, } = filter;
-                let newCondition;
-                if (column === dateColumn && !includeDateColumn) {
-                    continue;
-                }
-                if (columnType === 'string') {
-                    newCondition = {
-                        type: 'binary_expr',
-                        operator: 'IN',
-                        left: {
-                            type: 'column_ref',
-                            table: null,
-                            column: column,
-                        },
-                        right: {
-                            type: 'expr_list',
-                            value: stringFilterValues.map((value) => ({
-                                type: 'single_quote_string',
-                                value,
-                            })),
-                        },
-                    };
-                }
-                else if (columnType === 'number') {
-                    newCondition = {
-                        type: 'binary_expr',
-                        operator: 'BETWEEN',
-                        left: {
-                            type: 'column_ref',
-                            table: null,
-                            column: column,
-                        },
-                        right: {
-                            type: 'expr_list',
-                            value: [
-                                { type: 'number', value: numberStart },
-                                { type: 'number', value: numberEnd },
-                            ],
-                        },
-                    };
+        // 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 schemaTables
+            .filter((t) => tableNamesInQuery.includes(t.displayName))
+            .flatMap((table) => table.columns.map((c) => ({
+            ...c,
+            table: table.displayName,
+        })));
+    };
+    const getDateColumns = () => {
+        const allColumns = getAllPossibleColumns();
+        return allColumns.filter((c) => (0, ast_1.isDateishColumnType)(c.fieldType));
+    };
+    const getNumericColumns = () => {
+        const allColumns = getAllPossibleColumns();
+        const selectedColumnNames = selectedColumns.map((col) => col.split('.')[1]);
+        return allColumns
+            .filter((column) => {
+            return selectedColumnNames.includes(column.name);
+        })
+            .filter((c) => (0, ast_1.isNumericColumnType)(c.fieldType));
+    };
+    const getNonNumericColumns = () => {
+        const allColumns = getAllPossibleColumns();
+        const selectedColumnNames = selectedColumns.map((col) => col.split('.')[1]);
+        return allColumns
+            .filter((column) => selectedColumnNames.includes(column.name))
+            .filter((c) => !(0, ast_1.isNumericColumnType)(c.fieldType));
+    };
+    const getStringColumns = () => {
+        const allColumns = getAllPossibleColumns();
+        const selectedColumnNames = selectedColumns.map((col) => col.split('.')[1]);
+        return allColumns
+            .filter((column) => selectedColumnNames.includes(column.name))
+            .filter((c) => (0, ast_1.isTextColumnType)(c.fieldType));
+    };
+    /**
+     * Return whether all columns have been selected (used to hide select all
+     * and show clear button).
+     */
+    const isSelectedAllColumns = () => {
+        if (selectedColumns.length < 1)
+            return false;
+        const allColumns = orderedColumnNames.filter((row) => {
+            const [table, _] = row.split('.');
+            return selectedColumns[0].startsWith(table);
+        });
+        return selectedColumns.length === allColumns.length;
+    };
+    const nameToColumn = (name) => ({
+        type: 'expr',
+        expr: {
+            type: 'column_ref',
+            table: null,
+            column: name,
+        },
+        as: null,
+    });
+    const SortableItem = ({ id, label, setSelectedColumns, selectedColumns, }) => {
+        const { attributes, listeners, setNodeRef, transform, transition } = (0, sortable_1.useSortable)({ id: id });
+        const style = {
+            transform: utilities_1.CSS.Transform.toString(transform),
+            transition,
+        };
+        const handleSelect = () => {
+            setSelectedColumns((selectedColumns) => {
+                if (selectedColumns.includes(id)) {
+                    return selectedColumns.filter((column) => column !== id);
                 }
-                else if (columnType === 'date') {
-                    newCondition = newDateWhereAST(column, filterDateRange, client.databaseType);
+                else {
+                    return [...selectedColumns, id];
                 }
-                if (!newAST.where) {
-                    newAST.where = newCondition;
+            });
+        };
+        return ((0, jsx_runtime_1.jsx)("div", { style: { userSelect: 'none', ...style }, ref: setNodeRef, children: (0, jsx_runtime_1.jsx)(SelectColumn, { selected: selectedColumns?.includes(id), setSelected: handleSelect, label: label, children: (0, jsx_runtime_1.jsx)("div", { style: {
+                        cursor: 'grab',
+                    }, ...attributes, ...listeners, children: (0, jsx_runtime_1.jsx)(HandleButton, {}) }) }) }));
+    };
+    const AddConditionPopover = ({ onSave }) => {
+        return ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'column', gap: 2 }, children: [(0, jsx_runtime_1.jsx)("h1", { style: {
+                        fontWeight: '600',
+                        fontSize: 18,
+                        margin: 0,
+                        textAlign: 'left',
+                    }, children: "Add condition" }), (0, jsx_runtime_1.jsx)(Tabs, { defaultValue: topLevelBinaryOperator, options: ui_1.DEFAULT_TAB_OPTIONS, onValueChange: (value) => setTopLevelBinaryOperator(value) }), activeEditItem && renderNode(activeEditItem), (0, jsx_runtime_1.jsx)("div", { style: {
+                        display: 'flex',
+                        flexDirection: 'row',
+                        gap: 8,
+                        justifyContent: 'end',
+                    }, children: (0, jsx_runtime_1.jsx)(Button, { onMouseUp: onSave, children: "Add condition" }) })] }));
+    };
+    const fetchUponChange = async () => {
+        if ((formData || baseAst) && !loading) {
+            try {
+                setLoading(true);
+                const res2 = await fetch('https://quill-344421.uc.r.appspot.com/patterns', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                    },
+                    body: JSON.stringify({
+                        ast: { ...baseAst, where: formData },
+                        publicKey: client.publicKey,
+                        orgId: '2',
+                    }),
+                });
+                const data2 = await res2.json();
+                if (data2.rows && data2.rows.length) {
+                    const tables = (0, ast_1.getTableNames)(baseAst);
+                    const table = tables.length >= 1 ? tables[0] : initialTableName;
+                    if (pivot) {
+                        // Do all of this to make sure we have the right unique columns when applying a pivot
+                        let uniqueFormatted = {};
+                        const uniqueRecords = Array.from(new Set(data2.rows.map((row) => row[pivot.columnField]))).reduce((acc, curr) => {
+                            acc[curr] = false;
+                            return acc;
+                        }, {});
+                        uniqueFormatted[pivot.columnField] = uniqueRecords;
+                        const pivotedData = (0, convert_1.applyPivot)(data2, pivot, uniqueFormatted);
+                        console.info(`%c[Pivot]: ${JSON.stringify(pivot)}`, 'color: dimgray');
+                        setPivotData(pivotedData);
+                    }
+                    else {
+                        setRows(data2.rows);
+                        setFields(data2.fields);
+                        if (data2.errorMessage) {
+                            setErrorMessage(`Error: ${data2.errorMessage}`);
+                        }
+                    }
                 }
                 else {
-                    newAST.where = {
-                        type: 'binary_expr',
-                        operator: 'AND',
-                        left: newAST.where,
-                        right: newCondition,
-                    };
+                    setRows([]);
+                    setFields([]);
                 }
             }
-            return newAST;
+            catch (e) {
+                console.error(e);
+            }
+            finally {
+                setLoading(false);
+            }
         }
     };
-    // USE EFFECT HOOK THAT TRANSFORMS "FILTERS ARRAY INTO AST"
-    (0, react_1.useEffect)(() => {
-        if (filters.length || dateRange) {
-            setAST(generateNewAST(true));
-            setASTNoDateColumn(generateNewAST(false));
+    // Convert an array of columns to a map where the name is the
+    // key and the value is the column node.
+    const columnArrayToMap = (columns) => {
+        const columnMap = {};
+        for (const col of columns) {
+            const key = col.expr?.value ?? col.expr?.column ?? col.as;
+            columnMap[key] = col;
         }
-    }, [filters, dateRange]);
-    const removeFilter = index => {
-        setFilters(oldFilters => {
-            const newFilters = [...oldFilters];
-            newFilters.splice(index, 1);
-            return newFilters;
-        });
-        setIndexBeingEdited(-1);
-    };
-    const computeStats = (0, react_1.useCallback)(column => {
-        if ((!computedColumns[column.name] ||
-            computedColumns[column.name].length === 0) &&
-            data) {
-            const basicType = getPostgresBasicType(column);
-            let result;
-            if (basicType === 'number') {
-                let min = Infinity, max = -Infinity;
-                data.forEach(row => {
-                    const value = row[column.name];
-                    min = Math.min(min, value);
-                    max = Math.max(max, value);
-                });
-                result = { min, max };
-            }
-            else if (basicType === 'string') {
-                const freqMap = {};
-                data.forEach(row => {
-                    const value = row[column.name];
-                    if (value !== null && value !== undefined) {
-                        freqMap[value] = (freqMap[value] || 0) + 1;
+        return columnMap;
+    };
+    const applyFormatting = (response, columns) => {
+        const columnFormatters = {};
+        const columnMap = columnArrayToMap(columns);
+        response.fields.forEach((field) => {
+            // TODO: columnMap[field.name] silently breaks for columnField columns
+            const formatType = (0, util_1.getPostgresBasicType)(field);
+            if (formatType === 'date') {
+                columnFormatters[field.name] = (x) => {
+                    const d = new Date(x);
+                    // check if d is a valid date
+                    if (isNaN(d.getTime())) {
+                        return 'Invalid Date';
                     }
-                });
-                result = Object.entries(freqMap)
-                    .sort((a, b) => b[1] - a[1])
-                    .slice(0, 6)
-                    .map(([key]) => key);
+                    d.setMinutes(d.getMinutes() + d.getTimezoneOffset()); // TZ adjust
+                    if (columnMap[field.name]?.expr.type === 'function' &&
+                        columnMap[field.name]?.expr.name.toLowerCase() === 'date_trunc' &&
+                        columnMap[field.name]?.expr.args.value[0].value.toLowerCase() ===
+                            'month') {
+                        return d.toLocaleString('default', {
+                            month: 'short',
+                            year: 'numeric',
+                        });
+                    }
+                    else if (columnMap[field.name]?.expr.type === 'function' &&
+                        columnMap[field.name]?.expr.name.toLowerCase() === 'date_trunc' &&
+                        columnMap[field.name]?.expr.args.value[0].value.toLowerCase() ===
+                            'quarter') {
+                        return `Q${(0, date_fns_1.getQuarter)(d)} ${d.getFullYear()}`;
+                    }
+                    else if (columnMap[field.name]?.expr.type === 'function' &&
+                        columnMap[field.name]?.expr.name.toLowerCase() === 'date_trunc' &&
+                        columnMap[field.name]?.expr.args.value[0].value.toLowerCase() ===
+                            'year') {
+                        return d.toLocaleString('default', {
+                            year: 'numeric',
+                        });
+                    }
+                    return constants_1.DATE_FMT.format(d);
+                };
+            }
+            else if (formatType === 'number') {
+                columnFormatters[field.name] = (x) => {
+                    if (columnMap[field.name]?.expr.type === 'extract' &&
+                        columnMap[field.name]?.expr.args.field.toLowerCase() === 'dow') {
+                        return constants_1.DAY_OF_WEEK[x];
+                    }
+                    else if (columnMap[field.name]?.expr.type === 'extract' &&
+                        columnMap[field.name]?.expr.args.field.toLowerCase() === 'month') {
+                        return constants_1.MONTH_OF_YEAR[x - 1];
+                    }
+                    else if (`${x}`.includes('.')) {
+                        // return MONEY_FMT.format(Number(x ?? 0.0));
+                        return Number(x ?? 0.0).toFixed(2);
+                    }
+                    return x ?? 0.0;
+                };
             }
             else {
-                // Handle other column types if necessary
+                columnFormatters[field.name] = (x) => x;
+            }
+        });
+        return response.rows.map((row) => {
+            const newRow = {};
+            Object.keys(row).forEach((key) => (newRow[key] = columnFormatters[key]
+                ? columnFormatters[key](row[key])
+                : row[key]));
+            return newRow;
+        });
+    };
+    // 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;
             }
-            setComputedColumns({
-                ...computedColumns,
-                [column.name]: result,
-            });
         }
-    }, [data, computedColumns]);
-    // Call this function whenever the selected column changes
-    (0, react_1.useEffect)(() => {
-        computeStats(selectedColumn);
-    }, [selectedColumn, data]);
-    // Use the results directly in your component
-    const columnStats = computedColumns[selectedColumn.name];
-    // useEffect(() => {
-    //   if (AST && AST.from[0].table) {
-    //     const parser = new Parser();
-    //     const sqlQuery = parser.sqlify(AST, { database: "PostgresQL" });
-    //     if (sqlQuery) {
-    //       runQuery(sqlQuery);
-    //       return;
-    //     }
-    //   }
-    // }, [AST]);
-    (0, react_1.useEffect)(() => {
-        const getSqlQueryFromAST = async () => {
-            try {
-                if (AST && AST.from[0].table) {
-                    const resp = await (0, dataFetcher_1.getDataFromCloud)(client, 'sqlify', {
-                        ast: AST,
+        return false;
+    };
+    const handleAsk = async () => {
+        if (!aiPrompt) {
+            return;
+        }
+        try {
+            setLoading(true);
+            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('https://quill-344421.uc.r.appspot.com/magic', {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify({
+                            initialQuestion: aiPrompt,
+                            publicKey: client.publicKey,
+                        }),
                     });
-                    const newSqlQuery = resp.query; // assuming the response contains the SQL query
-                    if (newSqlQuery && newSqlQuery !== sqlQuery) {
-                        onChangeQuery(newSqlQuery);
-                        setSqlQuery(newSqlQuery);
-                        handleRunQuery(newSqlQuery);
+                }
+                else {
+                    res = await fetch('https://quill-344421.uc.r.appspot.com/magic/edit', {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify({
+                            sqlQuery: activeQuery,
+                            initialQuestion: aiPrompt,
+                            publicKey: client.publicKey,
+                        }),
+                    });
+                }
+                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 newAst, groupByPivot;
+            if (ast) {
+                // Unwrap the ast object, supporting many possible types
+                ast = ast.length ? ast[0] : ast;
+                newAst = (0, convert_1.convertBigQuery)(ast);
+                newAst = (0, convert_1.convertWildcardColumns)(newAst, schemaTables); // must go before groupby
+                ({ ast: newAst, pivot: groupByPivot } = (0, convert_1.convertGroupBy)(newAst, pivot, schemaTables));
+                newAst = (0, convert_1.convertStringComparison)(newAst, client.databaseType);
+                newAst = (0, convert_1.convertRemoveSimpleParentheses)(newAst);
+                // newAst = convertDateComparison(newAst); // TODO
+                ast = newAst; // so we fetch data for newAst later.
+                const table = (0, ast_1.getTableNames)(newAst)[0] ?? initialTableName;
+                setPivot(groupByPivot);
+                setSelectedColumns((0, util_1.deepCopy)(newAst).columns?.map((column) => {
+                    if (column.expr.type === 'column_ref') {
+                        return `${table}.${column.expr.column}`;
+                    }
+                    else if (column.as) {
+                        return `${table}.${column.as}`;
                     }
+                    return `${table}.${column.expr.value}`;
+                }));
+                setBaseAst((0, util_1.deepCopy)({ ...newAst }));
+                setFormData((0, util_1.deepCopy)(newAst.where));
+                setTopLevelBinaryOperator(
+                // @ts-ignore
+                newAst?.where ? newAst?.where?.operator : 'AND');
+                if (groupByPivot)
+                    return; // the useEffect will handle the rest
+            }
+            const res2 = await fetch('https://quill-344421.uc.r.appspot.com/patterns', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    ast: ast,
+                    publicKey: client.publicKey,
+                    orgId: '2',
+                }),
+            });
+            const data2 = await res2.json();
+            if (data2.rows && data2.rows.length) {
+                const tables = (0, ast_1.getTableNames)(newAst);
+                const table = tables.length >= 1 ? tables[0] : initialTableName;
+                if (groupByPivot) {
+                    const pivotedData = (0, convert_1.applyPivot)(data2, groupByPivot, uniqueValues[table]);
+                    console.info(`%c[Pivot]: ${JSON.stringify(groupByPivot)}`, 'color: dimgray');
+                    setPivotData(pivotedData);
+                }
+                else {
+                    setRows(data2.rows);
+                    setFields(data2.fields);
                 }
             }
-            catch (err) {
-                console.error(err);
+            else {
+                setRows([]);
+                setFields([]);
+            }
+            if (data2.query) {
+                setActiveQuery(data2.query);
+            }
+            else {
+                setActiveQuery('');
+            }
+            if (data2.errorMessage) {
+                setErrorMessage(`Error: ${data2.errorMessage}`);
+            }
+            else {
+                setErrorMessage('');
             }
+        }
+        catch (e) {
+            console.error(e);
+            setErrorMessage(`${e.name}: ${e.message}`);
+        }
+        finally {
+            setLoading(false);
+            setAiPrompt('');
+        }
+    };
+    const handleDeleteColumn = (name) => {
+        if (!baseAst || !baseAst.columns.length || selectedColumns.length === 1) {
+            clearAllState();
+            return;
+        }
+        setSelectedColumns((selectedColumns) => selectedColumns.filter((column) => !column.endsWith(name)));
+        const columns = baseAst.columns.filter((col) => {
+            if (col.expr.type === 'column_ref') {
+                return col.expr.column !== name;
+            }
+            else if (col.as) {
+                return col.as !== name;
+            }
+            return col.expr.value !== name;
+        });
+        if (columns.length === 0) {
+            clearAllState();
+            return;
+        }
+        const newAst = { ...baseAst, columns };
+        setBaseAst((0, util_1.deepCopy)(newAst));
+    };
+    function TopLevelBooleanSwitch({ node, keyPrefix, handleOperatorChange, }) {
+        return ((0, jsx_runtime_1.jsx)("div", { style: { width: 'fit-content' }, children: (0, jsx_runtime_1.jsx)(Tabs, { defaultValue: node.operator, options: ui_1.DEFAULT_TAB_OPTIONS, onValueChange: (value) => handleOperatorChange(value, node, keyPrefix) }) }));
+    }
+    const DraggableItem = ({ id, label, onDelete }) => {
+        const { attributes, listeners, setNodeRef, transform, transition } = (0, sortable_1.useSortable)({ id: id });
+        const style = {
+            transform: utilities_1.CSS.Transform.toString(transform),
+            transition,
         };
-        getSqlQueryFromAST();
-    }, [AST]);
-    (0, react_1.useEffect)(() => {
-        const getSqlQueryFromAST = async () => {
-            try {
-                if (ASTNoDateColumn && ASTNoDateColumn.from[0].table) {
-                    const resp = await (0, dataFetcher_1.getDataFromCloud)(client, 'sqlify', {
-                        ast: ASTNoDateColumn,
-                    });
-                    const newSqlQuery = resp.query; // assuming the response contains the SQL query
-                    if (newSqlQuery && newSqlQuery !== sqlQueryNoDateColumn) {
-                        setSqlQueryNoDateColumn(newSqlQuery);
+        return ((0, jsx_runtime_1.jsx)("div", { style: { ...style }, ref: setNodeRef, children: (0, jsx_runtime_1.jsx)(DraggableColumn, { label: label, onDelete: onDelete, children: (0, jsx_runtime_1.jsx)("div", { style: {
+                        cursor: 'grab',
+                    }, ...attributes, ...listeners, children: (0, jsx_runtime_1.jsx)(HandleButton, {}) }) }) }));
+    };
+    function DraggableColumns() {
+        const sensors = (0, core_1.useSensors)((0, core_1.useSensor)(core_1.PointerSensor), (0, core_1.useSensor)(core_1.KeyboardSensor, {
+            coordinateGetter: sortable_1.sortableKeyboardCoordinates,
+        }));
+        // When a drag event ends, switch the item order.
+        function handleDragEnd(event) {
+            const { active, over } = event;
+            if (active.id !== over.id) {
+                const oldIndex = orderedColumnNames.findIndex((c) => c.endsWith(active.id));
+                const newIndex = orderedColumnNames.findIndex((c) => c.endsWith(over.id));
+                const newOrder = (0, sortable_1.arrayMove)(orderedColumnNames, oldIndex, newIndex);
+                setOrderedColumnNames(newOrder);
+                const orderedSelectedColumns = [];
+                for (const value of newOrder) {
+                    const [_, column] = value.split('.');
+                    if (selectedColumns.includes(value)) {
+                        orderedSelectedColumns.push(column);
                     }
                 }
+                // If there is already an AST saved in state, only update the columns
+                // otherwise fill in the defaultAST shape and also update columns.
+                const fallbackAST = {
+                    ...constants_1.defaultAST,
+                    from: [{ ...constants_1.defaultTable }],
+                    columns: orderedSelectedColumns.map((name) => nameToColumn(name)),
+                };
+                const newBaseAst = {
+                    ...baseAst,
+                    columns: baseAst?.columns.length
+                        ? orderedSelectedColumns.map((name) => nameToColumn(name))
+                        : baseAst?.columns,
+                };
+                const newAst = baseAst ? newBaseAst : fallbackAST;
+                setBaseAst(newAst);
             }
-            catch (err) {
-                console.error(err);
+        }
+        const columnNamesInAst = baseAst?.columns.map((col) => {
+            if (col.expr.type === 'column_ref') {
+                return col.expr.column;
             }
-        };
-        getSqlQueryFromAST();
-    }, [ASTNoDateColumn]);
-    if (!schema || !schema.length) {
-        return null;
+            else if (col.as) {
+                return col.as;
+            }
+            else if (col.expr && col.expr.type === 'aggr_func') {
+                if (col.expr.args) {
+                    return `${col.expr.name.toLowerCase()}(${col.expr.args.expr.value})`;
+                }
+                return col.expr.name;
+            }
+            return col.expr.value;
+        }) ?? [];
+        return ((0, jsx_runtime_1.jsx)(core_1.DndContext, { sensors: sensors, collisionDetection: core_1.closestCenter, onDragEnd: handleDragEnd, children: (0, jsx_runtime_1.jsx)(sortable_1.SortableContext, { items: columnNamesInAst, strategy: sortable_1.verticalListSortingStrategy, children: (0, jsx_runtime_1.jsxs)("div", { style: {
+                        display: 'flex',
+                        flexDirection: 'column',
+                        gap: 8,
+                    }, children: [columnNamesInAst.map((name) => ((0, jsx_runtime_1.jsx)(DraggableItem, { id: name, label: name, onDelete: () => handleDeleteColumn(name) }, name))), columnNamesInAst?.length > 0 && (0, jsx_runtime_1.jsx)("div", { style: { height: 6 } })] }) }) }));
     }
-    return ((0, jsx_runtime_1.jsxs)("div", { style: { fontFamily: theme?.fontFamily, ...containerStyle }, ref: parentRef, children: [(0, jsx_runtime_1.jsx)("div", { style: {
-                    display: 'flex',
-                    // marginLeft: '25px',
-                    // marginRight: '25px',
-                    justifyContent: 'end',
-                }, children: (0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'row', gap: '12px' }, children: [editSQLEnabled && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => {
-                                if (navigateToSQLEditor) {
-                                    navigateToSQLEditor(sqlQuery);
-                                }
-                            }, label: "Edit Query" })), (0, jsx_runtime_1.jsx)(AddFilterModal2, { filters: filters, selectedColumn: selectedColumn, numberStart: numberStart, numberEnd: numberEnd, setDateRange: setFilterDateRange, dateRange: filterDateRange, columnStats: columnStats, stringFilterValues: stringFilterValues, setStringFilterValues: setStringFilterValues, addFilter: addFilter, parentRef: parentRef, setSelectedColumn: setSelectedColumn, setNumberStart: setNumberStart, setNumberEnd: setNumberEnd, selectedTable: selectedTable, columnType: columnType, removeFilter: removeFilter, selectFilter: selectFilter, indexBeingEdited: indexBeingEdited, updateFilter: updateFilter, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, PopoverComponent: PopoverComponent, TextInputComponent: TextInputComponent, LabelComponent: LabelComponent, tagStyle: tagStyle, theme: theme, setIsOpen: setIsAddFilterModalOpen, isOpen: isAddFilterModalOpen, selectedTagBorderColor: selectedTagBorderColor }), (0, jsx_runtime_1.jsx)(PivotModal_1.PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, selectedTable: selectedTable, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, PopoverComponent: PopoverComponent, LabelComponent: LabelComponent, HeaderComponent: HeaderComponent, TextComponent: TextComponent, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, theme: theme, data: data, parentRef: parentRef, columns: columns, setIsOpen: setIsPivotModalOpen, isOpen: isPivotModalOpen, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: removePivot, selectPivot: selectPivot, dateRange: dateRange, rightAlign: true })] }) }), chartBuilderEnabled && columns.length > 0 && ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("div", { style: {
-                            display: 'flex',
-                            flexDirection: 'row',
-                            alignItems: 'center',
-                            justifyContent: 'flex-end',
-                            width: '100%',
-                            height: '70px',
-                            gap: '8px',
-                        }, children: (0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: () => setIsChartBuilderOpen(true), label: "Add to dashboard" }) }), (0, jsx_runtime_1.jsx)(ChartBuilder_1.default, { rows: data, columns: columns, fields: fields, query: sqlQuery, queryNoDateColumn: sqlQueryNoDateColumn, pivot: selectedPivot, title: chartBuilderTitle, buttonLabel: chartBuilderButtonLabel, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, showTableFormatOptions: showTableFormatOptions, showDateFieldOptions: showDateFieldOptions, showAccessControlOptions: showAccessControlOptions, dateRange: dateRange, recommendedPivots: recommendedPivots, destinationDashboard: destinationDashboard, dateColumn: dateColumn })] }))] }));
-}
-function FilterTag({ Label, id, label, removeFilter, isSelected, index, setIsOpen, selectFilter, theme, tagStyle, selectedTagBorderColor, }) {
-    const handleRemoveFilter = () => {
-        removeFilter(index);
-    };
-    const handleSelectFilter = () => {
-        selectFilter(index);
-        setIsOpen(true);
-    };
-    const styles = tagStyle || {
-        cursor: 'pointer',
-        borderRadius: 8,
-        border: '1px solid',
-        backgroundColor: '#EFF0FC',
-        paddingLeft: '12px',
-        paddingRight: '8px',
-        height: 30,
-        display: 'flex',
-        alignItems: 'center',
-        fontSize: 13,
-        fontWeight: 'medium',
-        color: theme?.primaryTextColor,
-        fontFamily: theme?.fontFamily,
-        whiteSpace: 'nowrap',
-        textOverflow: 'ellipsis',
-        outline: 'none',
-        maxWidth: 120,
-    };
-    const borderColor = {
-        borderColor: isSelected
-            ? selectedTagBorderColor || '#B3B4BD'
-            : styles.borderColor || '#EFF0FC',
-    };
-    return ((0, jsx_runtime_1.jsxs)("div", { id: id, onClick: handleSelectFilter, style: { ...styles, ...borderColor }, children: [(0, jsx_runtime_1.jsx)("div", { style: {
-                    textOverflow: 'ellipsis',
-                    whiteSpace: 'nowrap',
-                    overflow: 'hidden',
-                }, children: label }), (0, jsx_runtime_1.jsx)("div", { 
-                // onClick={handleRemoveFilter}
-                onClick: e => {
-                    e.stopPropagation(); // Prevents the event from bubbling up to the parent
-                    handleRemoveFilter();
-                }, style: {
-                    display: 'flex',
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    cursor: 'pointer',
-                    paddingLeft: '6px',
-                }, children: (0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", fill: tagStyle?.color || theme?.primaryTextColor, height: "20", width: "20", children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M5.47 5.47a.75.75 0 011.06 0L12 10.94l5.47-5.47a.75.75 0 111.06 1.06L13.06 12l5.47 5.47a.75.75 0 11-1.06 1.06L12 13.06l-5.47 5.47a.75.75 0 01-1.06-1.06L10.94 12 5.47 6.53a.75.75 0 010-1.06z", clipRule: "evenodd" }) }) })] }));
-}
-const AddFilterModal2 = ({ filters, selectedColumn, numberStart, numberEnd, setDateRange, dateRange, columnStats, stringFilterValues, setStringFilterValues, addFilter, setSelectedColumn, setNumberStart, setNumberEnd, selectedTable, columnType, removeFilter, selectFilter, indexBeingEdited, updateFilter, SelectComponent, ButtonComponent, PopoverComponent, LabelComponent, theme, TextInputComponent, tagStyle, selectedTagBorderColor, parentRef, }) => {
-    const [isOpen, setIsOpen] = (0, react_1.useState)(false);
-    return ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'column' }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
-                    position: 'relative',
-                    display: 'inline-block',
-                    textAlign: 'left',
-                }, children: [(0, jsx_runtime_1.jsx)("div", { style: {
-                            display: 'flex',
-                            flexDirection: 'row',
-                            alignItems: 'center',
-                        }, children: filters.length > 0 && ((0, jsx_runtime_1.jsx)("span", { style: {
-                                height: 10,
-                                width: 10,
-                                backgroundColor: theme.primaryButtonColor,
-                                borderRadius: '50%',
-                                position: 'absolute',
-                                top: -2,
-                                right: -2,
-                            } })) }), (0, jsx_runtime_1.jsx)(PopoverComponent, { parentRef: parentRef, label: "Add filter", style: { right: 0, minWidth: 400, overflow: 'visible' }, isOpen: isOpen, onClose: () => setIsOpen(false), title: "Add filter", setIsOpen: setIsOpen, children: (0, jsx_runtime_1.jsxs)("div", { style: {
-                                backgroundColor: 'rgb(255, 255, 255)',
+    const allNumericColumns = getNumericColumns().map((column) => ({
+        label: column.displayName,
+        value: column.name,
+    }));
+    const allNonNumericColumns = getNonNumericColumns().map((column) => ({
+        label: column.displayName,
+        value: column.name,
+    }));
+    const allStringColumns = getStringColumns().map((column) => ({
+        label: column.displayName,
+        value: column.name,
+    }));
+    if (loading) {
+        return ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'row', height: '100%' }, children: [(0, jsx_runtime_1.jsxs)(Sidebar, { children: [(0, jsx_runtime_1.jsx)(SidebarHeading, { label: "Columns" }), (0, jsx_runtime_1.jsx)("div", { style: { height: 4, width: '100%' } }), (0, jsx_runtime_1.jsx)(DraggableColumns, {}), (0, jsx_runtime_1.jsx)(Popover, { isOpen: openPopover === 'AddColumnPopover', trigger: (0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => {
+                                    if (!openPopover) {
+                                        setOpenPopover('AddColumnPopover');
+                                    }
+                                }, children: "Select columns" }), title: "Select columns", onClose: () => {
+                                setIsPending(false);
+                                setActiveEditItem(null);
+                                setActivePath(null);
+                                setOpenPopover(null);
+                            }, children: (0, jsx_runtime_1.jsx)(AddColumnPopover_1.default, { onSave: () => {
+                                    setActiveEditItem(null);
+                                    setActivePath(null);
+                                    setOpenPopover(null);
+                                }, orderedColumnNames: orderedColumnNames, setOrderedColumnNames: setOrderedColumnNames, selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, isSelectedAllColumns: isSelectedAllColumns, clearAllState: clearAllState, nameToColumn: nameToColumn, baseAst: baseAst, setBaseAst: setBaseAst, pivot: pivot, initialTableName: initialTableName, defaultAST: constants_1.defaultAST, defaultTable: constants_1.defaultTable, setPivot: setPivot, TextInput: TextInput, SelectColumn: SelectColumn, SecondaryButton: SecondaryButton, Button: Button, HandleButton: HandleButton }) }), (0, jsx_runtime_1.jsx)("div", { style: { height: 28, width: '100%' } }), (0, jsx_runtime_1.jsx)(SidebarHeading, { label: "Filters" }), (0, jsx_runtime_1.jsx)("div", { style: { height: 4, width: '100%' } }), formData && ((0, jsx_runtime_1.jsx)("div", { style: {
                                 display: 'flex',
                                 flexDirection: 'column',
-                            }, children: [filters.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: { paddingBottom: 20 }, children: (0, jsx_runtime_1.jsx)("div", { style: {
-                                            overflowY: 'scroll',
-                                            maxHeight: '300px',
-                                            display: 'flex',
-                                            gap: '5px',
-                                            flexDirection: 'row',
-                                            flexWrap: 'wrap',
-                                            alignItems: 'center',
-                                        }, children: filters.map((elem, index) => ((0, jsx_runtime_1.jsx)(FilterTag, { id: "filter-tag", Label: LabelComponent, label: elem.tag, removeFilter: removeFilter, selectFilter: selectFilter, isSelected: index === indexBeingEdited, index: index, theme: theme, setIsOpen: setIsOpen, tagStyle: tagStyle, selectedTagBorderColor: selectedTagBorderColor }, 'filter' + index))) }) })), (0, jsx_runtime_1.jsx)(LabelComponent, { children: "Column" }), (0, jsx_runtime_1.jsx)(SelectComponent, { label: 'Column', id: "custom-select", value: selectedColumn.name, onChange: e => {
-                                        const column = selectedTable.columns.find(c => c.name === e);
-                                        setSelectedColumn(column);
-                                    }, options: selectedTable.columns
-                                        .filter(elem => !(elem.name === 'id' || elem.name.endsWith('_id')))
-                                        .map(elem => {
-                                        return { label: elem.name, value: elem.name };
-                                    }) }), columnType === 'number' && ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsxs)("div", { style: {
-                                            display: 'flex',
-                                            flexDirection: 'row',
-                                            alignItems: 'center',
-                                            justifyContent: 'space-between',
-                                        }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
-                                                    display: 'flex',
-                                                    flexDirection: 'column',
-                                                    marginTop: '20px',
-                                                }, children: [(0, jsx_runtime_1.jsx)(LabelComponent, { children: "Minimum" }), (0, jsx_runtime_1.jsx)(TextInputComponent, { id: "min-input", value: numberStart, placeholder: "Minimum", onChange: value => setNumberStart(value) })] }), (0, jsx_runtime_1.jsx)("div", { style: { width: 16 } }), (0, jsx_runtime_1.jsxs)("div", { style: {
-                                                    display: 'flex',
-                                                    flexDirection: 'column',
-                                                    marginTop: '20px',
-                                                }, children: [(0, jsx_runtime_1.jsx)(LabelComponent, { children: "Maximum" }), (0, jsx_runtime_1.jsx)(TextInputComponent, { id: "max-input", placeholder: "Maximum", value: numberEnd, onChange: value => setNumberEnd(value) })] })] }) })), columnType === 'date' && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                gap: 8,
+                                marginBottom: 12,
+                            }, children: renderSentence(formData, formData, '', true) })), (0, jsx_runtime_1.jsxs)("div", { style: {
+                                display: 'flex',
+                                flexDirection: 'column',
+                                gap: 2.5,
+                                alignItems: 'flex-start',
+                            }, children: [(0, jsx_runtime_1.jsx)(Popover, { isOpen: openPopover === 'AddFilterPopover', title: 'Add filter', trigger: (0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => {
+                                            if (!openPopover) {
+                                                const value = orderedColumnNames[0];
+                                                const [_table, column] = value.split('.');
+                                                const columnType = getColumnTypeByName(column);
+                                                if ((0, ast_1.isNumericColumnType)(columnType)) {
+                                                    const newSubtree = (0, util_1.deepCopy)(constants_1.defaultNumericComparison);
+                                                    newSubtree.left.column = column;
+                                                    setActiveEditItem(newSubtree);
+                                                }
+                                                else {
+                                                    const newSubtree = (0, util_1.deepCopy)(constants_1.defaultEntry);
+                                                    newSubtree.left.args.value[0].column = column;
+                                                    setActiveEditItem(newSubtree);
+                                                }
+                                                setOpenPopover('AddFilterPopover');
+                                                setActivePath('');
+                                                setIsPending(true);
+                                            }
+                                        }, children: "Add filter" }), onClose: () => {
+                                        setIsPending(false);
+                                        setActivePath(null);
+                                        setOpenPopover(null);
+                                        clearCheckboxes();
+                                        setTimeout(() => {
+                                            setActiveEditItem(null);
+                                        }, 300);
+                                    }, children: (0, jsx_runtime_1.jsx)(ui_1.AddFilterPopover, { onSave: () => {
+                                            if ((0, util_1.isNodeEmptyCollection)(activeEditItem)) {
+                                                setIsPending(false);
+                                                setActivePath(null);
+                                                setOpenPopover(null);
+                                                clearCheckboxes();
+                                                setTimeout(() => {
+                                                    setActiveEditItem(null);
+                                                }, 300);
+                                            }
+                                            else {
+                                                setIsPending(false);
+                                                handleInsertion(activeEditItem, 'AND', false);
+                                                setActivePath(null);
+                                                setOpenPopover(null);
+                                                clearCheckboxes();
+                                                setTimeout(() => {
+                                                    setActiveEditItem(null);
+                                                }, 300);
+                                            }
+                                        }, Button: Button, renderNode: renderNode, activeEditItem: activeEditItem }) }), baseAst?.where &&
+                                    false && ( // temp removed the AddConditionPopover
+                                (0, jsx_runtime_1.jsx)(Popover, { isOpen: openPopover === 'AddConditionPopover', trigger: (0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => {
+                                            if (!openPopover) {
+                                                setActiveEditItem((0, util_1.deepCopy)(constants_1.defaultEntry));
+                                                setOpenPopover('AddConditionPopover');
+                                                setActivePath('');
+                                                setIsPending(true);
+                                            }
+                                        }, children: "Add condition" }), onClose: () => {
+                                        setIsPending(false);
+                                        setTimeout(() => {
+                                            setActiveEditItem(null);
+                                        }, 300);
+                                        setActivePath(null);
+                                        setOpenPopover(null);
+                                        clearCheckboxes();
+                                    }, children: (0, jsx_runtime_1.jsx)(AddConditionPopover, { onSave: () => {
+                                            if ((0, util_1.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();
+                                            }
+                                        } }) }))] }), (0, jsx_runtime_1.jsx)("div", { style: { height: 28, width: '100%' } }), (0, jsx_runtime_1.jsx)(SidebarHeading, { label: "Pivot" }), (0, jsx_runtime_1.jsx)("div", { style: { height: 4, width: '100%' } }), pivot !== null && ((0, jsx_runtime_1.jsxs)("div", { style: {
+                                display: 'flex',
+                                flexDirection: 'column',
+                                gap: 12,
+                                marginBottom: 12,
+                            }, children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(SidebarSubHeading, { label: "Aggregation" }), (0, jsx_runtime_1.jsx)(Select, { onChange: void null, value: pivot.aggregationType, options: [
+                                                { label: 'sum', value: 'sum' },
+                                                { label: 'avg', value: 'avg' },
+                                                { label: 'min', value: 'min' },
+                                                { label: 'max', value: 'max' },
+                                                { label: 'count', value: 'count' },
+                                            ] })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(SidebarSubHeading, { label: "Value field" }), (0, jsx_runtime_1.jsx)(Select, { onChange: void null, value: pivot.valueField, options: [
+                                                { label: 'Select', value: '' },
+                                                ...allNumericColumns,
+                                            ] })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(SidebarSubHeading, { label: "Group rows by" }), (0, jsx_runtime_1.jsx)(Select, { onChange: void null, value: pivot.rowField ?? '', options: allNonNumericColumns })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(SidebarSubHeading, { label: "Group columns by" }), (0, jsx_runtime_1.jsx)(Select, { onChange: void null, value: pivot.columnField ?? '', options: [
+                                                { label: 'Select', value: '' },
+                                                ...allStringColumns,
+                                            ] })] })] })), (0, jsx_runtime_1.jsx)(SecondaryButton, { children: pivot === null ? 'Add pivot' : 'Delete pivot' })] }), (0, jsx_runtime_1.jsxs)(Container, { children: [(0, jsx_runtime_1.jsxs)("form", { style: {
+                                display: 'flex',
+                                flexDirection: 'row',
+                                gap: 12,
+                                padding: 1,
+                            }, children: [(0, jsx_runtime_1.jsx)(TextInput, { placeholder: "Ask a question...", type: "text", style: { width: '100%', fontSize: 14 }, value: aiPrompt }), (0, jsx_runtime_1.jsx)(ButtonLoadingState, {}), baseAst && ((0, jsx_runtime_1.jsx)(SecondaryButton, { type: "button", onClick: clearAllState, children: "New report" }))] }), baseAst && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(TableLoadingState, {}), (0, jsx_runtime_1.jsxs)("div", { style: {
                                         display: 'flex',
                                         flexDirection: 'row',
-                                        justifyContent: 'space-between',
-                                        marginTop: 20,
-                                    }, children: (0, jsx_runtime_1.jsx)(QuillDateRangePicker, { dateRange: dateRange ? [dateRange[0], dateRange[1]] : [null, null], label: '', onChangeDateRange: dateRange => {
-                                            setDateRange([dateRange[0], dateRange[1], null]);
-                                        }, preset: dateRange && dateRange.length === 3 && dateRange[2] !== null
-                                            ? dateRange[2]
-                                            : '', onChangePreset: preset => {
-                                            if (typeof preset === 'string') {
-                                                setDateRange((0, dateRangePickerUtils_1.getRangeFromPreset)(preset));
-                                                return;
-                                            }
-                                            setDateRange([
-                                                preset?.startDate || null,
-                                                new Date(),
-                                                preset?.value || '',
-                                            ]);
-                                        }, presetOptions: dateRangePickerUtils_1.reportBuilderOptions }) })), columnType === 'string' &&
-                                    columnStats &&
-                                    columnStats.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: {
-                                        flex: 'flex',
-                                        flexDirection: 'column',
-                                        marginTop: '14px',
-                                        overflow: 'hidden',
-                                    }, children: columnStats.map(value => ((0, jsx_runtime_1.jsx)("div", { style: {
-                                            display: 'flex',
-                                            flexDirection: 'row',
-                                            alignItems: 'center',
-                                        }, children: (0, jsx_runtime_1.jsxs)("div", { style: {
-                                                display: 'flex',
-                                                flexDirection: 'row',
-                                                alignItems: 'center',
-                                                paddingTop: 6,
-                                                paddingBottom: 6,
-                                            }, children: [(0, jsx_runtime_1.jsx)(DivCheckbox, { theme: theme, checked: stringFilterValues.includes(value), onChange: () => {
-                                                        setStringFilterValues(prev => prev.includes(value)
-                                                            ? prev.filter(v => v !== value)
-                                                            : [...prev, value]);
-                                                    } }), (0, jsx_runtime_1.jsx)("div", { style: {
-                                                        marginLeft: 6,
-                                                        display: 'block',
-                                                        overflow: 'hidden',
-                                                        textOverflow: 'ellipsis',
-                                                        whiteSpace: 'nowrap',
-                                                        color: theme?.primaryTextColor,
-                                                        fontFamily: theme?.fontFamily,
-                                                    }, children: value })] }, value) }, value))) })), (0, jsx_runtime_1.jsx)("div", { style: { height: 20 } }), (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(ButtonComponent, { id: "custom-button", onClick: () => {
-                                            if (columnType === 'date' && !dateRange) {
-                                                return;
+                                        gap: '12px',
+                                    }, children: [(0, jsx_runtime_1.jsx)("div", { style: { width: '100%' } }), (0, jsx_runtime_1.jsx)(SecondaryButton, { type: "button", onClick: () => copyToClipboard(activeQuery), children: isCopying ? '✅ Copied' : 'Copy SQL' }), (0, jsx_runtime_1.jsx)(Button, { children: "Add to dashboard" })] })] }))] }), (0, jsx_runtime_1.jsx)("style", { children: `body{margin:0;}` })] }));
+    }
+    return ((0, jsx_runtime_1.jsxs)("div", { style: {
+            display: 'flex',
+            flexDirection: 'row',
+            height: '100%',
+            overflowY: 'auto',
+        }, children: [(0, jsx_runtime_1.jsxs)(Sidebar, { children: [(0, jsx_runtime_1.jsx)(SidebarHeading, { label: "Columns" }), (0, jsx_runtime_1.jsx)("div", { style: { height: 4, width: '100%' } }), (0, jsx_runtime_1.jsx)(DraggableColumns, {}), (0, jsx_runtime_1.jsx)(Popover, { isOpen: openPopover === 'AddColumnPopover', title: "Select columns", trigger: (0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => {
+                                if (!openPopover) {
+                                    setOpenPopover('AddColumnPopover');
+                                }
+                            }, children: "Select columns" }), onClose: () => {
+                            // delay onClose callback so onClick no-ops
+                            setTimeout(() => {
+                                setIsPending(false);
+                                setActiveEditItem(null);
+                                setActivePath(null);
+                                setOpenPopover(null);
+                            }, 100);
+                        }, children: (0, jsx_runtime_1.jsx)(AddColumnPopover_1.default, { onSave: () => {
+                                setActiveEditItem(null);
+                                setActivePath(null);
+                                setOpenPopover(null);
+                            }, orderedColumnNames: orderedColumnNames, setOrderedColumnNames: setOrderedColumnNames, selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, isSelectedAllColumns: isSelectedAllColumns, clearAllState: clearAllState, nameToColumn: nameToColumn, baseAst: baseAst, setBaseAst: setBaseAst, pivot: pivot, initialTableName: initialTableName, defaultAST: constants_1.defaultAST, defaultTable: constants_1.defaultTable, setPivot: setPivot, TextInput: TextInput, SelectColumn: SelectColumn, SecondaryButton: SecondaryButton, Button: Button, HandleButton: HandleButton }) }), (0, jsx_runtime_1.jsx)("div", { style: { height: 28, width: '100%' } }), (0, jsx_runtime_1.jsx)(SidebarHeading, { label: "Filters" }), (0, jsx_runtime_1.jsx)("div", { style: { height: 4, width: '100%' } }), formData && ((0, jsx_runtime_1.jsx)("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'column',
+                            gap: 8,
+                            marginBottom: 12,
+                        }, children: renderSentence(formData, formData, '', true) })), (0, jsx_runtime_1.jsxs)("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'column',
+                            gap: 2.5,
+                            alignItems: 'flex-start',
+                        }, children: [(0, jsx_runtime_1.jsx)(Popover, { title: 'Add filter', isOpen: openPopover === 'AddFilterPopover', trigger: (0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: (_e) => {
+                                        if (!openPopover) {
+                                            const value = orderedColumnNames[0];
+                                            const [_table, column] = value.split('.');
+                                            const columnType = getColumnTypeByName(column);
+                                            if ((0, ast_1.isNumericColumnType)(columnType)) {
+                                                const newSubtree = (0, util_1.deepCopy)(constants_1.defaultNumericComparison);
+                                                newSubtree.left.column = column;
+                                                setActiveEditItem(newSubtree);
                                             }
-                                            if (indexBeingEdited > -1) {
-                                                updateFilter(indexBeingEdited);
-                                                return;
+                                            else {
+                                                const newSubtree = (0, util_1.deepCopy)(constants_1.defaultEntry);
+                                                newSubtree.left.args.value[0].column = column;
+                                                setActiveEditItem(newSubtree);
                                             }
-                                            addFilter();
-                                        }, label: indexBeingEdited > -1 ? 'Edit filter' : 'Add filter' }) })] }) })] }), (0, jsx_runtime_1.jsx)("div", { style: { height: '12px' } })] }));
-};
-const DivCheckbox = ({ onChange, checked, theme }) => {
-    const toggleCheckbox = () => {
-        if (onChange) {
-            onChange(!checked);
-        }
-    };
-    const style = {
-        // display: 'inline-block',
-        width: '18px',
-        height: '18px',
-        background: checked ? '#384151' : '#fff',
-        border: checked ? '1px solid #384151' : '1px solid #E7E7E7',
-        borderRadius: '4px',
-        position: 'relative',
-        cursor: 'pointer',
-        boxShadow: '0 1px 2px 0 rgba(0, 0, 0, 0.05)',
-        fontFamily: theme?.fontFamily,
-        display: 'flex',
-        flexDirection: 'column',
-        alignItems: 'center',
-        justifyContent: 'center',
-    };
-    return ((0, jsx_runtime_1.jsx)("div", { style: style, onClick: toggleCheckbox, "aria-checked": checked, 
-        // className="shadow-sm"
-        role: "checkbox", children: checked && (
-        // <CheckIcon
-        //   style={{ color: theme?.backgroundColor, height: 16, width: 16 }}
-        //   className="text-white"
-        //   aria-hidden="true"
-        // />
-        (0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", fill: theme?.backgroundColor, height: "16", width: "16", children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M19.916 4.626a.75.75 0 01.208 1.04l-9 13.5a.75.75 0 01-1.154.114l-6-6a.75.75 0 011.06-1.06l5.353 5.353 8.493-12.739a.75.75 0 011.04-.208z", clipRule: "evenodd" }) })) }));
-};
+                                            setOpenPopover('AddFilterPopover');
+                                            setActivePath('');
+                                            setIsPending(true);
+                                        }
+                                    }, children: "Add filter" }), onClose: () => {
+                                    // delay onClose callback so onClick no-ops
+                                    setTimeout(() => {
+                                        setIsPending(false);
+                                        setActivePath(null);
+                                        setOpenPopover(null);
+                                        clearCheckboxes();
+                                        setActiveEditItem(null);
+                                    }, 200);
+                                }, children: (0, jsx_runtime_1.jsx)(ui_1.AddFilterPopover, { onSave: () => {
+                                        if ((0, util_1.isNodeEmptyCollection)(activeEditItem)) {
+                                            setIsPending(false);
+                                            setActivePath(null);
+                                            setOpenPopover(null);
+                                            clearCheckboxes();
+                                            setTimeout(() => {
+                                                setActiveEditItem(null);
+                                            }, 300);
+                                        }
+                                        else {
+                                            setIsPending(false);
+                                            handleInsertion(activeEditItem, 'AND', false);
+                                            setActivePath(null);
+                                            setOpenPopover(null);
+                                            clearCheckboxes();
+                                            setTimeout(() => {
+                                                setActiveEditItem(null);
+                                            }, 300);
+                                        }
+                                    }, Button: Button, renderNode: renderNode, activeEditItem: activeEditItem }) }), baseAst?.where &&
+                                false && ( // temp removed the AddConditionPopover
+                            (0, jsx_runtime_1.jsx)(Popover, { isOpen: openPopover === 'AddConditionPopover', trigger: (0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => {
+                                        if (!openPopover) {
+                                            setActiveEditItem((0, util_1.deepCopy)(constants_1.defaultEntry));
+                                            setOpenPopover('AddConditionPopover');
+                                            setActivePath('');
+                                            setIsPending(true);
+                                        }
+                                    }, children: "Add condition" }), onClose: () => {
+                                    // delay onClose callback so onClick no-ops
+                                    setTimeout(() => {
+                                        setIsPending(false);
+                                        setActiveEditItem(null);
+                                        setActivePath(null);
+                                        setOpenPopover(null);
+                                        clearCheckboxes();
+                                    }, 200);
+                                }, children: (0, jsx_runtime_1.jsx)(AddConditionPopover, { onSave: () => {
+                                        if ((0, util_1.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();
+                                        }
+                                    } }) }))] }), (0, jsx_runtime_1.jsx)("div", { style: { height: 28, width: '100%' } }), (0, jsx_runtime_1.jsx)(SidebarHeading, { label: "Pivot" }), (0, jsx_runtime_1.jsx)("div", { style: { height: 4, width: '100%' } }), pivot !== null && ((0, jsx_runtime_1.jsxs)("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'column',
+                            gap: 12,
+                            marginBottom: 12,
+                        }, children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(SidebarSubHeading, { label: "Aggregation" }), (0, jsx_runtime_1.jsx)(Select, { value: pivot.aggregationType, onChange: (value) => {
+                                            setBaseAst((0, util_1.deepCopy)(baseAst)); // trigger refetch
+                                            setPivot({ ...pivot, aggregationType: value });
+                                        }, options: [
+                                            { label: 'sum', value: 'sum' },
+                                            { label: 'avg', value: 'avg' },
+                                            { label: 'min', value: 'min' },
+                                            { label: 'max', value: 'max' },
+                                            { label: 'count', value: 'count' },
+                                        ] })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(SidebarSubHeading, { label: "Value field" }), (0, jsx_runtime_1.jsx)(Select, { value: pivot.valueField, onChange: (value) => {
+                                            setBaseAst((0, util_1.deepCopy)(baseAst)); // trigger refetch
+                                            setPivot({ ...pivot, valueField: value });
+                                        }, options: [{ label: 'Select', value: '' }, ...allNumericColumns] })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(SidebarSubHeading, { label: "Group rows by" }), (0, jsx_runtime_1.jsx)(Select, { value: pivot.rowField ?? '', onChange: (value) => {
+                                            setBaseAst((0, util_1.deepCopy)(baseAst)); // trigger refetch
+                                            setPivot({
+                                                ...pivot,
+                                                rowField: value === '' ? undefined : value,
+                                            });
+                                        }, options: [
+                                            { label: 'Select', value: '' },
+                                            ...allNonNumericColumns,
+                                        ] })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(SidebarSubHeading, { label: "Group columns by" }), (0, jsx_runtime_1.jsx)(Select, { value: pivot.columnField ?? '', onChange: (value) => {
+                                            setBaseAst((0, util_1.deepCopy)(baseAst)); // trigger refetch
+                                            setPivot({
+                                                ...pivot,
+                                                columnField: value === '' ? undefined : value,
+                                            });
+                                        }, options: [
+                                            { label: 'Select', value: '' },
+                                            ...allStringColumns,
+                                        ].filter((option) => option.value !== pivot.rowField) })] })] })), (0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => {
+                            if (pivot) {
+                                setBaseAst((0, util_1.deepCopy)(baseAst));
+                                setPivot(null);
+                                setPivotData(null);
+                            }
+                            else {
+                                if (allNumericColumns.length === 0) {
+                                    setErrorMessage('Unable to create pivot: Unsupported Schema.');
+                                    return;
+                                }
+                                if (!baseAst) {
+                                    let ast = (0, util_1.deepCopy)({
+                                        ...constants_1.defaultAST,
+                                        columns: getAllPossibleColumns()
+                                            .filter((c) => c.table === initialTableName)
+                                            .map((c) => {
+                                            const newColumn = (0, util_1.deepCopy)(constants_1.defaultColumn);
+                                            newColumn.expr.column = c.name;
+                                            return newColumn;
+                                        }),
+                                        from: [{ ...constants_1.defaultTable, table: initialTableName }],
+                                        where: null,
+                                    });
+                                    ast = (0, convert_1.convertWildcardColumns)(ast, schemaTables);
+                                    setBaseAst(ast);
+                                }
+                                else {
+                                    setBaseAst((0, util_1.deepCopy)(baseAst));
+                                }
+                                setPivot({
+                                    aggregationType: 'sum',
+                                    valueField: allNumericColumns[0].value,
+                                    rowField: allNonNumericColumns[0]?.value,
+                                    columnField: undefined,
+                                });
+                            }
+                        }, children: pivot === null ? 'Add pivot' : 'Delete pivot' }), (0, jsx_runtime_1.jsx)("div", { style: { height: 12, width: '100%' } })] }), (0, jsx_runtime_1.jsxs)(Container, { children: [(0, jsx_runtime_1.jsxs)("form", { onSubmit: handleAsk, style: {
+                            display: 'flex',
+                            flexDirection: 'row',
+                            gap: 12,
+                            padding: 1,
+                        }, children: [(0, jsx_runtime_1.jsx)(TextInput, { type: "text", value: aiPrompt, style: { width: '100%', fontSize: 14 }, onChange: (e) => setAiPrompt(e.target.value), placeholder: baseAst ? 'Ask a follow-up question...' : 'Ask a question...' }), (0, jsx_runtime_1.jsx)(Button, { type: "submit", onClick: handleAsk, children: "Ask AI" }), baseAst && ((0, jsx_runtime_1.jsx)(SecondaryButton, { type: "button", onClick: clearAllState, children: "New report" }))] }), baseAst && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [loading && errorMessage.length === 0 ? ((0, jsx_runtime_1.jsx)(TableLoadingState, {})) : ((0, jsx_runtime_1.jsx)(Table, { rows: applyFormatting({
+                                    rows: pivotData?.rows || rows,
+                                    fields: pivotData?.fields || fields,
+                                }, baseAst?.columns ?? []), columns: enforceOrderOnColumns(Object.keys((pivotData?.rows[0] || rows[0]) ?? {})), error: errorMessage, rowsPerPage: 20 })), (0, jsx_runtime_1.jsxs)("div", { style: {
+                                    display: 'flex',
+                                    flexDirection: 'row',
+                                    gap: '12px',
+                                }, children: [errorMessage && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                            color: 'red',
+                                            fontSize: 14,
+                                            padding: '12px',
+                                            whiteSpace: 'nowrap',
+                                        }, children: errorMessage })), (0, jsx_runtime_1.jsx)("div", { style: { width: '100%' } }), (0, jsx_runtime_1.jsx)(SecondaryButton, { type: "button", onClick: () => copyToClipboard(activeQuery), children: isCopying ? '✅ Copied' : 'Copy SQL' }), (0, jsx_runtime_1.jsx)(Button, { onClick: () => {
+                                            setIsChartBuilderOpen(true);
+                                        }, children: "Add to dashboard" })] })] }))] }), (0, jsx_runtime_1.jsx)("style", { children: `body{margin:0;}` }), (0, jsx_runtime_1.jsx)(ChartBuilder_1.default, { rows: applyFormatting({ rows, fields }, baseAst?.columns ?? []), columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), fields: fields, pivot: pivot, query: activeQuery, showTableFormatOptions: true, showDateFieldOptions: true, showAccessControlOptions: true, title: "Add to dashboard", isEditMode: false, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: onAddToDashboardComplete, destinationDashboard: destinationDashboard, dashboardItem: dashboardItem, organizationName: organizationName })] }));
+}
+exports.default = ReportBuilder;