@quillsql/react 2.11.16 → 2.11.18

package/dist/esm/ReportBuilder.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+/* eslint-disable no-unused-vars */
 import { useContext, useEffect, useRef, useState, } from 'react';
-import { MemoizedButton, MemoizedCheckbox, MemoizedDeleteButton, MemoizedHeader, MemoizedLabel, MemoizedPopover, MemoizedSecondaryButton, MemoizedText, } from './components/UiComponents';
+import { DEFAULT_TAB_OPTIONS, MemoizedButton, MemoizedCheckbox, MemoizedDeleteButton, MemoizedHeader, MemoizedLabel, MemoizedSecondaryButton, MemoizedText, MemoizedPopover, QuillTableComponent, QuillTabs, MemoizedModal, } from './components/UiComponents';
 import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors, } from '@dnd-kit/core';
 import { arrayMove, SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy, useSortable, } from '@dnd-kit/sortable';
 import { CSS as DND_CSS } from '@dnd-kit/utilities';
@@ -9,10 +10,10 @@ import { ClientContext, ThemeContext } from './Context';
 import { getTableAliases, getTableNames, isDateishColumnType, isNumericColumnType, isTextColumnType, } from './components/ReportBuilder/ast';
 import { ChartBuilderWithModal } from './ChartBuilder';
 import { QuillTextInput } from './components/UiComponents';
-import { QuillPopover, QuillTabs, QuillSidebar, CustomContainer, QuillHandleButton, QuillSelectColumn, QuillDraggableColumn, QuillButtonLoadingState, QuillTableLoadingState, QuillSidebarHeading, QuillSidebarSubHeading, QuillFilterPopover, QuillSortPopover, DEFAULT_TAB_OPTIONS, TagWrapper, EditPopover, AddFilterPopover, } from './components/ReportBuilder/ui';
+import { QuillSidebar, CustomContainer, QuillSelectColumn, QuillDraggableColumn, QuillSidebarHeading, QuillFilterPopover, QuillSortPopover, TagWrapper, EditPopover, AddFilterPopover, QuillLimitPopover, } from './components/ReportBuilder/ui';
 import { generateCurrentPeriodPostgres, generateEqualsPostgres, generateLastNPeriodsPostgres, generatePreviousPeriodPostgres, } from './components/ReportBuilder/postgres';
 import { convertBigQuery, convertGroupBy, convertRemoveSimpleParentheses, convertStringComparison, convertWildcardColumns, } from './components/ReportBuilder/convert';
-import { deepCopy, formatDateComparisonNode, getDateFilterInfo, getInTheCurrentIntervalSentence, getInTheLastIntervalSentence, getInThePreviousIntervalSentence, getPostgresBasicType, isColumnComparison, isDateTruncEquals, isInTheLastInterval, isNodeEmptyCollection, isTheCurrentInterval, isThePreviousInterval, isTopLevelBoolean, showNodeAsRow, tryConvertDateEquality, removeNonSelectedTableReferences, } from './components/ReportBuilder/util';
+import { deepCopy, formatDateComparisonNode, getDateFilterInfo, getPostgresBasicType, isColumnComparison, isDateTruncEquals, isInTheLastInterval, isNodeEmptyCollection, isTheCurrentInterval, isThePreviousInterval, isTopLevelBoolean, showNodeAsRow, tryConvertDateEquality, removeNonSelectedTableReferences, getCustomSentence, isEquals, } from './components/ReportBuilder/util';
 import { getDefaultOperatorSubtrees, OPERATOR_GROUPS, } from './components/ReportBuilder/operators';
 import { hashCode } from './utils/crypto';
 import { DATE_FMT, DAY_OF_WEEK, defaultAST, defaultColumn, defaultEntry, defaultNumericComparison, defaultTable, defaultVariant, MONTH_OF_YEAR, } from './components/ReportBuilder/constants';
@@ -20,11 +21,11 @@ import AddColumnPopover from './components/ReportBuilder/AddColumnPopover';
 import { AddSortPopover, SortSentence, } from './components/ReportBuilder/AddSortPopover';
 import { PivotModal, generatePivotTable, } from './internals/ReportBuilder/PivotModal';
 import { PivotCard } from './internals/ReportBuilder/PivotList';
-import QuillTable from './components/QuillTable';
-import { QuillSelectComponent } from './components/QuillSelect';
 import { snakeCaseToTitleCase } from './utils/textProcessing';
 import { AddLimitPopover, LimitSentence, } from './components/ReportBuilder/AddLimitPopover';
 import { updateFirstChildWidth } from './utils/width';
+import { QuillSelectComponent } from './components/QuillSelect';
+import { QuillCard } from './components/QuillCard';
 /**
  * Quill Report Builder
  *
@@ -32,14 +33,38 @@ import { updateFirstChildWidth } from './utils/width';
  * 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.
+ *
+ * @example
+ * ```js
+ * // Usage without custom components
+ * <ReportBuilder />
+ * ```
+ *
+ * @example
+ * ```js
+ * // You can also pass your own components
+ * <ReportBuilder
+ *   initialTableName="transactions"
+ *   TableComponent={MyTable}
+ *   SelectComponent={MySelect}
+ *   ButtonComponent={MyButton}
+ *   PopoverComponent={MyPopover}
+ *   TextInputComponent={MyTextInput}
+ *   containerStyle={{ backgroundColor: 'white', padding: '10px' }}
+ * />
+ * ```
+ *
+ * ### Report Builder API
+ * @see https://docs.quillsql.com/components/report-builder
  */
-export default function ReportBuilder({ initialTableName = '', onAddToDashboardComplete = () => void null, destinationDashboard = undefined, organizationName = '', Button = MemoizedButton, SecondaryButton = MemoizedSecondaryButton, DeleteButton = MemoizedDeleteButton, TextInput = QuillTextInput, Select = QuillSelectComponent, Table = QuillTable, Popover = QuillPopover, Tabs = QuillTabs, Checkbox = MemoizedCheckbox, Sidebar = QuillSidebar, Container = CustomContainer, HandleButton = QuillHandleButton, SelectColumn = QuillSelectColumn, DraggableColumn = QuillDraggableColumn, ButtonLoadingState = QuillButtonLoadingState, TableLoadingState = QuillTableLoadingState, SidebarHeading = QuillSidebarHeading, SidebarSubHeading = QuillSidebarSubHeading, FilterPopover = QuillFilterPopover, SortPopover = QuillSortPopover, Label = MemoizedLabel, Header = MemoizedHeader, Text = MemoizedText, PivotPopover = MemoizedPopover, admin = false, hideAi = false, containerStyle, }) {
+export default function ReportBuilder({ initialTableName = '', onSubmitChartBuilder = () => void null, destinationDashboard = undefined, organizationName = '', ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, ModalComponent = MemoizedModal, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, TableComponent = QuillTableComponent, PopoverComponent = MemoizedPopover, TabsComponent = QuillTabs, CheckboxComponent = MemoizedCheckbox, SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectColumnComponent = QuillSelectColumn, DraggableColumnComponent = QuillDraggableColumn, SidebarHeadingComponent = QuillSidebarHeading, FilterPopoverComponent = QuillFilterPopover, SortPopoverComponent = QuillSortPopover, LimitPopoverComponent = QuillLimitPopover, CardComponent = QuillCard, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, TextComponent = MemoizedText, isAdminEnabled = false, isAIEnabled = true, containerStyle, }) {
     const [aiPrompt, setAiPrompt] = useState('');
     const [errorMessage, setErrorMessage] = useState('');
     const [baseAst, setBaseAst] = useState(null);
     const [formData, setFormData] = useState(null);
     const [orderedColumnNames, setOrderedColumnNames] = useState([]);
     const [selectedColumns, setSelectedColumns] = useState([]);
+    const [selectedOrderedColumns, setSelectedOrderedColumns] = useState([]);
     const [schemaTables, setSchemaTables] = useState([]);
     const [activeQuery, setActiveQuery] = useState('');
     const [activeEditItem, setActiveEditItem] = useState(null);
@@ -99,7 +124,9 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                 .sort(sortFn)
                 .filter((c) => columnsInPivot.includes(c));
         }
-        return columnNames;
+        // make the columnNames match the order of the selectedOrderedColumns
+        return columnNames.sort((a, b) => selectedOrderedColumns.indexOf(a) - selectedOrderedColumns.indexOf(b));
+        // return columnNames;
     };
     /**
      * Transforms an array of column names into an array of columnInfo objects
@@ -125,9 +152,9 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
             setAiPrompt('');
             setBaseAst(null);
             setFormData(null);
-            setOrderedColumnNames([]);
             setSelectedColumns([]);
             setSchemaTables([]);
+            setOrderedColumnNames([]);
             setActiveQuery('');
             setActiveEditItem(null);
             setActivePath(null);
@@ -138,6 +165,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
             setFields([]);
             setTopLevelBinaryOperator('AND');
             setEditPopoverKey(null);
+            setErrorMessage('');
             // setUniqueValues({});
             setPivot(null);
             setPivotData(null);
@@ -202,23 +230,28 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
         }
         setUniqueValues(newValues);
     };
-    const fetchSqlQuery = async (ast, formData) => {
-        setLoading(true);
+    const fetchSqlQuery = async (ast, formData, fetchData = true) => {
+        if (fetchData) {
+            setLoading(true);
+        }
         setErrorMessage('');
         try {
+            const where = formData ? formData : ast?.where || null;
             const response = await fetch(`https://quill-344421.uc.r.appspot.com/sqlify`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
                 },
                 body: JSON.stringify({
-                    ast: { ...ast, where: formData },
+                    ast: { ...ast, where },
                     publicKey: client.publicKey,
                 }),
             });
             const data = await response.json();
             setActiveQuery(data.query);
-            fetchUponChange(ast, formData);
+            if (fetchData) {
+                fetchUponChange(ast, formData);
+            }
         }
         catch (error) {
             setLoading(false);
@@ -237,7 +270,9 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
         const result = [];
         const table = tables[0];
         const { valueField, rowField, columnField } = pivot;
-        if (columnField && uniqueValues[table][columnField]) {
+        if (columnField &&
+            uniqueValues[table] &&
+            uniqueValues[table][columnField]) {
             result.push(...Object.keys(uniqueValues[table][columnField]));
         }
         result.push(valueField, rowField);
@@ -275,6 +310,32 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
         }
     };
     useEffect(() => {
+        const loadTable = async (tables) => {
+            if (!tables)
+                return;
+            setLoading(true);
+            await getDistinctValues(initialTableName, tables);
+            const columnsForTable = tables
+                .find((t) => t.name === initialTableName)
+                ?.columns.map((c) => c.name)
+                .sort((a, b) => {
+                const aIsId = a.endsWith('.id') ||
+                    a.endsWith('_id') ||
+                    a.endsWith('Id') ||
+                    a === 'id';
+                const bIsId = b.endsWith('.id') ||
+                    b.endsWith('_id') ||
+                    b.endsWith('Id') ||
+                    b === 'id';
+                if (aIsId && !bIsId)
+                    return 1;
+                if (bIsId && !aIsId)
+                    return -1;
+                return 0;
+            });
+            await handleAsk(`get ${columnsForTable} from ${initialTableName}`);
+            setInitialLoad(false);
+        };
         const fetchSchema = async () => {
             try {
                 setLoadingSchema(true);
@@ -300,8 +361,14 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                 setOrderedColumnNames((tables ?? []).flatMap((table) => table.columns
                     .map((c) => `${table.name}.${c.name}`)
                     .sort((a, b) => {
-                    const aIsId = a.endsWith('.id') || a.endsWith('_id');
-                    const bIsId = b.endsWith('.id') || b.endsWith('_id');
+                    const aIsId = a.endsWith('.id') ||
+                        a.endsWith('_id') ||
+                        a.endsWith('Id') ||
+                        a === 'id';
+                    const bIsId = b.endsWith('.id') ||
+                        b.endsWith('_id') ||
+                        b.endsWith('Id') ||
+                        b === 'id';
                     if (aIsId && !bIsId)
                         return 1;
                     if (bIsId && !aIsId)
@@ -309,13 +376,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                     return 0;
                 })));
                 if (initialTableName && initialLoad) {
-                    setInitialLoad(false);
-                    setLoading(true);
-                    await getDistinctValues(initialTableName, tables);
-                    const columnsForTable = tables
-                        .find((t) => t.name === initialTableName)
-                        ?.columns.map((c) => c.name);
-                    await handleAsk(`get ${columnsForTable} from ${initialTableName}`);
+                    await loadTable(tables);
                 }
                 setLoadingSchema(false);
             }
@@ -325,8 +386,9 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
         };
         if (schemaTables.length === 0) {
             fetchSchema();
+            setInitialLoad(false);
         }
-    }, [schemaTables]);
+    }, [schemaTables, initialTableName]);
     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
@@ -733,7 +795,9 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                     // see onChange callback handleChange
                     // eslint-disable-next-line no-unused-vars
                     dateColumnPath, dateFilterType, intervalCount, intervalType, intervalPaths, } = getDateFilterInfo(node);
-                    const isPlural = intervalCount !== 1 ? 's' : '';
+                    const isPlural = intervalCount !== 1 && dateFilterType !== 'in the current'
+                        ? 's'
+                        : '';
                     // Pull off the string literal date for "equals" comparisons
                     const rawDateStringEquals = node.right?.value ??
                         node.right?.args?.value[1]?.column ??
@@ -743,50 +807,50 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             'node.right.args.value.1.column') ??
                         (node.right?.args?.value[1]?.value &&
                             'node.right.args.value.1.value');
-                    return (_jsxs("div", { style: { display: 'flex', gap: 20 }, children: [_jsx(Select, { theme: theme, value: dateColumn, onChange: (value) => {
-                                    const columnType = getColumnTypeByName(value);
+                    return (_jsxs("div", { style: { display: 'flex', gap: 20 }, children: [_jsx(SelectComponent, { value: dateColumn, onChange: (event) => {
+                                    const columnType = getColumnTypeByName(event.target.value);
                                     if (isDateishColumnType(columnType)) {
                                         // handleChange(value, keyPrefix + dateColumnPath, "text");
-                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, value);
+                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
                                     }
                                     else if (isNumericColumnType(columnType)) {
                                         const newSubtree = deepCopy(defaultNumericComparison);
-                                        newSubtree.left.column = value;
+                                        newSubtree.left.column = event.target.value;
                                         handleReplaceSubtree(keyPrefix, newSubtree);
                                     }
                                     else {
                                         const newSubtree = deepCopy(defaultEntry);
-                                        newSubtree.left.args.value[0].column = value;
+                                        newSubtree.left.args.value[0].column = event.target.value;
                                         handleReplaceSubtree(keyPrefix, newSubtree);
                                     }
                                 }, options: getAllPossibleColumns().map((column) => ({
                                     label: snakeCaseToTitleCase(column.displayName),
                                     value: column.name,
-                                })) }), _jsx(Select, { theme: theme, value: dateFilterType, onChange: (value) => {
-                                    if (value === dateFilterType)
+                                })) }), _jsx(SelectComponent, { value: dateFilterType, onChange: (event) => {
+                                    if (event.target.value === dateFilterType)
                                         return null;
                                     let newSubtree = {};
                                     // TODO: implement one for each database type (eg. pg, snowflake, etc.)
-                                    if (value === 'in the last') {
+                                    if (event.target.value === 'in the last') {
                                         newSubtree = generateLastNPeriodsPostgres({
                                             dateField: dateColumn,
                                             intervalPeriod: `${intervalCount ?? 1} ${intervalType}`,
                                         });
                                     }
-                                    else if (value === 'in the previous') {
+                                    else if (event.target.value === 'in the previous') {
                                         newSubtree = generatePreviousPeriodPostgres({
                                             dateField: dateColumn,
                                             intervalPeriod: `${intervalCount ?? 1} ${intervalType}`,
                                             currentPeriod: intervalType,
                                         });
                                     }
-                                    else if (value === 'in the current') {
+                                    else if (event.target.value === 'in the current') {
                                         newSubtree = generateCurrentPeriodPostgres({
                                             dateField: dateColumn,
                                             currentPeriod: intervalType,
                                         });
                                     }
-                                    else if (value === 'equals') {
+                                    else if (event.target.value === 'equals') {
                                         newSubtree = generateEqualsPostgres({
                                             dateField: dateColumn,
                                             currentPeriod: intervalType,
@@ -800,7 +864,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                     { 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) && (_jsx(TextInput, { id: "date_filter_interval_count", value: intervalCount, width: 70, onChange: (e) => {
+                                ] }), !['in the current', 'equals'].includes(dateFilterType) && (_jsx(TextInputComponent, { id: "date_filter_interval_count", value: intervalCount?.toString() ?? '', width: 70, onChange: (e) => {
                                     if (Number.isNaN(parseFloat(e.target.value || '0'))) {
                                         alert('Please input a number.');
                                         return;
@@ -812,13 +876,13 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                             path: keyPrefix + intervalPath,
                                         },
                                     ]));
-                                } })), _jsx(Select, { theme: theme, value: intervalType, onChange: (value) => {
+                                } })), _jsx(SelectComponent, { value: intervalType, onChange: (event) => {
                                     if (intervalPaths.length === 1) {
                                         handleChangeText([
                                             {
                                                 value: intervalCount !== null
-                                                    ? `${intervalCount} ${value}${isPlural}`
-                                                    : value,
+                                                    ? `${intervalCount} ${event.target.value}${isPlural}`
+                                                    : event.target.value,
                                                 path: keyPrefix + intervalPaths[0],
                                             },
                                         ]);
@@ -828,14 +892,14 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                     if (dateFilterType === 'equals') {
                                         newSubtree = generateEqualsPostgres({
                                             dateField: dateColumn,
-                                            currentPeriod: value,
+                                            currentPeriod: event.target.value,
                                             timestamp: rawDateStringEquals,
                                         });
                                     }
                                     else {
                                         newSubtree = generateCurrentPeriodPostgres({
                                             dateField: dateColumn,
-                                            currentPeriod: value,
+                                            currentPeriod: event.target.value,
                                         });
                                     }
                                     handleReplaceSubtree(keyPrefix, newSubtree);
@@ -846,7 +910,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                     { label: `week${isPlural}`, value: 'week' },
                                     { label: `day${isPlural}`, value: 'day' },
                                     { label: `hour${isPlural}`, value: 'hour' },
-                                ] }), dateFilterType === 'equals' && (_jsx(TextInput, { id: "date_filter_equals_raw_date", value: rawDateStringEquals, width: 120, onChange: (e) => {
+                                ] }), dateFilterType === 'equals' && (_jsx(TextInputComponent, { id: "date_filter_equals_raw_date", value: rawDateStringEquals, width: 120, onChange: (e) => {
                                     handleChangeText([
                                         {
                                             value: e.target.value,
@@ -867,40 +931,44 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             flexDirection: 'row',
                             alignItems: 'center',
                             gap: 20,
-                        }, children: [_jsx(Select, { theme: theme, value: node.left.column, onChange: (value) => {
-                                    const columnType = getColumnTypeByName(value);
+                        }, children: [_jsx(SelectComponent, { value: node.left.column, onChange: (event) => {
+                                    const columnType = getColumnTypeByName(event.target.value);
                                     if (isDateishColumnType(columnType)) {
                                         // handleChange(value, keyPrefix + dateColumnPath, "text");
-                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, value);
+                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
                                     }
                                     else if (isNumericColumnType(columnType)) {
                                         const newSubtree = deepCopy(defaultNumericComparison);
-                                        newSubtree.left.column = value;
+                                        newSubtree.left.column = event.target.value;
                                         handleReplaceSubtree(keyPrefix, newSubtree);
                                     }
                                     else {
                                         const newSubtree = deepCopy(defaultEntry);
-                                        newSubtree.left.args.value[0].column = value;
+                                        newSubtree.left.args.value[0].column = event.target.value;
                                         handleReplaceSubtree(keyPrefix, newSubtree);
                                     }
-                                }, options: options }), _jsx(Select, { theme: theme, value: 'IN_THE_LAST', onChange: (value) => {
-                                    handleOperatorChange(value, node, keyPrefix, dateColumn);
+                                }, options: options }), _jsx(SelectComponent, { value: 'IN_THE_LAST', onChange: (event) => {
+                                    handleOperatorChange(event.target.value, node, keyPrefix, dateColumn);
                                 }, options: [
                                     { label: 'in the last', value: 'IN_THE_LAST' },
                                     { label: 'in the previous', value: 'IN_THE_PREVIOUS' },
                                     { label: 'in the current', value: 'IN_THE_CURRENT' },
+                                    { label: 'equals', value: 'EQUALS' },
                                     { label: 'is not null', value: 'IS NOT' },
                                     { label: 'is null', value: 'IS' },
                                     // { label: 'equals', value: 'equals' },
-                                ] }), _jsx(TextInput, { id: 'date_window_interval_count', value: node.right.args.value[1].expr.value, width: 120, onChange: (e) => {
+                                ] }), _jsx(TextInputComponent, { id: 'date_window_interval_count', value: node.right.args.value[1].expr.value, width: 120, onChange: (e) => {
                                     handleChange([
                                         {
                                             value: e.target.value,
                                             path: keyPrefix + 'right.args.value||1.expr.value',
                                         },
                                     ]);
-                                } }), _jsx("div", { children: _jsx(Select, { theme: theme, value: node.right.args.value[1].unit, onChange: (value) => handleChange([
-                                        { value, path: keyPrefix + 'right.args.value||1.unit' },
+                                } }), _jsx("div", { children: _jsx(SelectComponent, { value: node.right.args.value[1].unit, onChange: (event) => handleChange([
+                                        {
+                                            value: event.target.value,
+                                            path: keyPrefix + 'right.args.value||1.unit',
+                                        },
                                     ]), options: [
                                         { label: `year${plural}`, value: '* 365 DAY' },
                                         { label: `month${plural}`, value: '* 30 DAY' },
@@ -919,35 +987,42 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             flexDirection: 'row',
                             alignItems: 'center',
                             gap: 20,
-                        }, children: [_jsx(Select, { theme: theme, value: node.left.column, onChange: (value) => {
-                                    const columnType = getColumnTypeByName(value);
+                        }, children: [_jsx(SelectComponent, { value: node.left.column, onChange: (event) => {
+                                    const columnType = getColumnTypeByName(event.target.value);
                                     if (isDateishColumnType(columnType)) {
                                         // handleChange(value, keyPrefix + dateColumnPath, "text");
-                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, value);
+                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
                                     }
                                     else if (isNumericColumnType(columnType)) {
                                         const newSubtree = deepCopy(defaultNumericComparison);
-                                        newSubtree.left.column = value;
+                                        newSubtree.left.column = event.target.value;
                                         handleReplaceSubtree(keyPrefix, newSubtree);
                                     }
                                     else {
                                         const newSubtree = deepCopy(defaultEntry);
-                                        newSubtree.left.args.value[0].column = value;
+                                        newSubtree.left.args.value[0].column = event.target.value;
                                         handleReplaceSubtree(keyPrefix, newSubtree);
                                     }
-                                }, options: options }), _jsx(Select, { theme: theme, value: 'IN_THE_CURRENT', onChange: (value) => {
-                                    handleOperatorChange(value, node, keyPrefix, node.left.column);
+                                }, options: options }), _jsx(SelectComponent, { value: 'IN_THE_CURRENT', onChange: (event) => {
+                                    handleOperatorChange(event.target.value, node, keyPrefix, node.left.column);
                                 }, options: [
                                     { label: 'in the last', value: 'IN_THE_LAST' },
                                     { label: 'in the previous', value: 'IN_THE_PREVIOUS' },
                                     { label: 'in the current', value: 'IN_THE_CURRENT' },
+                                    { label: 'equals', value: 'EQUALS' },
                                     { label: 'is not null', value: 'IS NOT' },
                                     { label: 'is null', value: 'IS' },
                                     // { label: 'equals', value: 'equals' },
-                                ] }), _jsx(Select, { theme: theme, value: node.left.args.value[1].column, onChange: (value) => {
+                                ] }), _jsx(SelectComponent, { value: node.left.args.value[1].column, onChange: (event) => {
                                     handleChange([
-                                        { value, path: 'right.args.value||1.column' },
-                                        { value, path: 'left.args.value||1.column' },
+                                        {
+                                            value: event.target.value,
+                                            path: 'right.args.value||1.column',
+                                        },
+                                        {
+                                            value: event.target.value,
+                                            path: 'left.args.value||1.column',
+                                        },
                                     ]);
                                 }, options: [
                                     { label: `year`, value: 'YEAR' },
@@ -966,32 +1041,33 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             flexDirection: 'row',
                             alignItems: 'center',
                             gap: 20,
-                        }, children: [_jsx(Select, { theme: theme, value: node.left.column, onChange: (value) => {
-                                    const columnType = getColumnTypeByName(value);
+                        }, children: [_jsx(SelectComponent, { value: node.left.column, onChange: (event) => {
+                                    const columnType = getColumnTypeByName(event.target.value);
                                     if (isDateishColumnType(columnType)) {
                                         // handleChange(value, keyPrefix + dateColumnPath, "text");
-                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, value);
+                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
                                     }
                                     else if (isNumericColumnType(columnType)) {
                                         const newSubtree = deepCopy(defaultNumericComparison);
-                                        newSubtree.left.column = value;
+                                        newSubtree.left.column = event.target.value;
                                         handleReplaceSubtree(keyPrefix, newSubtree);
                                     }
                                     else {
                                         const newSubtree = deepCopy(defaultEntry);
-                                        newSubtree.left.args.value[0].column = value;
+                                        newSubtree.left.args.value[0].column = event.target.value;
                                         handleReplaceSubtree(keyPrefix, newSubtree);
                                     }
-                                }, options: options }), _jsx(Select, { theme: theme, value: 'IN_THE_PREVIOUS', onChange: (value) => {
-                                    handleOperatorChange(value, node, keyPrefix, node.left.column);
+                                }, options: options }), _jsx(SelectComponent, { value: 'IN_THE_PREVIOUS', onChange: (event) => {
+                                    handleOperatorChange(event.target.value, node, keyPrefix, node.left.column);
                                 }, options: [
                                     { label: 'in the last', value: 'IN_THE_LAST' },
                                     { label: 'in the previous', value: 'IN_THE_PREVIOUS' },
                                     { label: 'in the current', value: 'IN_THE_CURRENT' },
+                                    { label: 'equals', value: 'EQUALS' },
                                     { label: 'is not null', value: 'IS NOT' },
                                     { label: 'is null', value: 'IS' },
                                     // { label: 'equals', value: 'equals' },
-                                ] }), _jsx(Select, { theme: theme, value: node.left.args.value[1].column, onChange: (value) => {
+                                ] }), _jsx(SelectComponent, { value: node.left.args.value[1].column, onChange: (event) => {
                                     const dayConversion = {
                                         YEAR: 365,
                                         QUARTER: 90,
@@ -1000,15 +1076,15 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                     };
                                     handleChange([
                                         {
-                                            value,
+                                            value: event.target.value,
                                             path: 'left.args.value||1.column',
                                         },
                                         {
-                                            value,
+                                            value: event.target.value,
                                             path: 'right.args.value||1.column',
                                         },
                                         {
-                                            value: dayConversion[value] || 30,
+                                            value: dayConversion[event.target.value] || 30,
                                             path: 'right.args.value||0.args.value||1.expr.value',
                                         },
                                     ]);
@@ -1019,6 +1095,65 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                     { label: `week`, value: 'WEEK' },
                                 ] })] }));
                 }
+                else if (isEquals(node, client.databaseType)) {
+                    const options = getAllPossibleColumns().map((column) => ({
+                        label: snakeCaseToTitleCase(column.displayName),
+                        value: column.name,
+                    }));
+                    return (_jsxs("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            gap: 20,
+                        }, children: [_jsx(SelectComponent, { value: node.left.column, onChange: (event) => {
+                                    const columnType = getColumnTypeByName(event.target.value);
+                                    if (isDateishColumnType(columnType)) {
+                                        // handleChange(value, keyPrefix + dateColumnPath, "text");
+                                        handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
+                                    }
+                                    else if (isNumericColumnType(columnType)) {
+                                        const newSubtree = deepCopy(defaultNumericComparison);
+                                        newSubtree.left.column = event.target.value;
+                                        handleReplaceSubtree(keyPrefix, newSubtree);
+                                    }
+                                    else {
+                                        const newSubtree = deepCopy(defaultEntry);
+                                        newSubtree.left.args.value[0].column = event.target.value;
+                                        handleReplaceSubtree(keyPrefix, newSubtree);
+                                    }
+                                }, options: options }), _jsx(SelectComponent, { value: 'EQUALS', onChange: (event) => {
+                                    handleOperatorChange(event.target.value, node, keyPrefix, node.left.column);
+                                }, options: [
+                                    { label: 'in the last', value: 'IN_THE_LAST' },
+                                    { label: 'in the previous', value: 'IN_THE_PREVIOUS' },
+                                    { label: 'in the current', value: 'IN_THE_CURRENT' },
+                                    { label: 'equals', value: 'EQUALS' },
+                                    { label: 'is not null', value: 'IS NOT' },
+                                    { label: 'is null', value: 'IS' },
+                                    // { label: 'equals', value: 'equals' },
+                                ] }), _jsx(SelectComponent, { value: node.right.args.value[1].column, onChange: (event) => {
+                                    handleChange([
+                                        {
+                                            value: event.target.value,
+                                            path: 'right.args.value||1.column',
+                                        },
+                                        {
+                                            value: event.target.value,
+                                            path: 'left.args.value||1.column',
+                                        },
+                                    ]);
+                                }, options: [
+                                    { label: `year`, value: 'YEAR' },
+                                    { label: `quarter`, value: 'QUARTER' },
+                                    { label: `month`, value: 'MONTH' },
+                                    { label: `week`, value: 'WEEK' },
+                                ] }), _jsx(TextInputComponent, { id: 'quoted_string', value: node.right.args.value[0].value, width: 120, onChange: (e) => handleChange([
+                                    {
+                                        value: e.target.value,
+                                        path: 'right.args.value||0.value',
+                                    },
+                                ]) })] }));
+                }
                 else if (isColumnComparison(node)) {
                     const options = getAllPossibleColumns().map((column) => ({
                         label: snakeCaseToTitleCase(column.displayName),
@@ -1048,10 +1183,10 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             : []),
                         ...(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 exactly', value: 'LIKE' },
+                                { label: 'is not exactly', value: 'NOT LIKE' },
+                                { label: 'is', value: 'IN' },
+                                { label: 'is not', value: 'NOT IN' },
                                 { label: 'is not null', value: 'IS NOT' },
                                 { label: 'is null', value: 'IS' },
                             ]
@@ -1070,10 +1205,6 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             ]
                             : []),
                     ];
-                    if (client.databaseType === 'BigQuery' &&
-                        isDateishColumnType(columnType)) {
-                        operatorOptions = operatorOptions.filter((option) => option.value !== 'equals');
-                    }
                     return (_jsxs("div", { style: {
                             display: 'flex',
                             gap: 12,
@@ -1083,45 +1214,49 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                         }, children: [_jsxs("div", { style: {
                                     display: 'flex',
                                     gap: 20,
-                                    // justifyContent: "space-between",
                                     flexDirection: showNodeAsRow(node, formData)
                                         ? 'row'
                                         : 'column',
                                     width: '100%',
-                                }, children: [_jsx(Select, { theme: theme, style: { width: 'min-content' }, value: leftChildValue, onChange: (value) => {
-                                            const columnType = getColumnTypeByName(value);
+                                }, children: [_jsx(SelectComponent, { value: leftChildValue, onChange: (event) => {
+                                            const columnType = getColumnTypeByName(event.target.value);
                                             if (isDateishColumnType(columnType)) {
-                                                handleOperatorChange('IN_THE_LAST', node, keyPrefix, value);
+                                                handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
                                             }
                                             else if (isNumericColumnType(columnType)) {
                                                 const newSubtree = deepCopy(defaultNumericComparison);
-                                                newSubtree.left.column = value;
+                                                newSubtree.left.column = event.target.value;
                                                 handleReplaceSubtree(keyPrefix, newSubtree);
                                             }
                                             else {
                                                 const newSubtree = deepCopy(defaultEntry);
-                                                newSubtree.left.args.value[0].column = value;
+                                                newSubtree.left.args.value[0].column = event.target.value;
                                                 handleReplaceSubtree(keyPrefix, newSubtree);
                                             }
-                                        }, options: options }), operatorOptions.length > 0 && (_jsx(Select, { theme: theme, value: node.operator, onChange: (value) => {
-                                            handleOperatorChange(value, node, keyPrefix, leftChildValue);
-                                        }, style: { width: 'min-content' }, options: operatorOptions })), node.right &&
+                                        }, options: options }), operatorOptions.length > 0 && (_jsx(SelectComponent, { value: node.operator, onChange: (event) => {
+                                            handleOperatorChange(event.target.value, node, keyPrefix, leftChildValue);
+                                        }, options: operatorOptions })), node.right &&
                                         node.right.type !== 'expr_list' &&
                                         renderNode(node.right, keyPrefix + 'right.')] }, keyPrefix), node.right && node.right.type === 'expr_list' && (_jsx("div", { style: {
                                     display: 'grid',
                                     gridTemplateColumns: 'repeat(2, 1fr)',
                                     gap: 12,
-                                }, children: Object.keys(uniqueValues[table][leftChildValue] ?? {}).map((key) => (_jsxs("label", { style: { display: 'flex', gap: 2 }, children: [_jsx(Checkbox, { checked: uniqueValues[table][leftChildValue][key], onChange: (checked) => {
-                                                const newValues = deepCopy(uniqueValues);
-                                                newValues[table][leftChildValue][key] = checked;
-                                                setUniqueValues(newValues);
-                                                if (checked) {
-                                                    handleInsertVariant(keyPrefix + 'right.' + 'value', key);
-                                                }
-                                                else {
-                                                    handleDeleteVariant(keyPrefix + 'right.' + 'value', key);
-                                                }
-                                            } }), _jsx("span", { style: { fontFamily: theme.fontFamily }, children: key })] }, key))) }, keyPrefix + 'right.'))] }));
+                                }, children: uniqueValues[table] &&
+                                    Object.keys(uniqueValues[table][leftChildValue] ?? {}).map((key) => (_jsxs("label", { style: { display: 'flex', gap: 4 }, children: [_jsx(CheckboxComponent, { isChecked: uniqueValues[table][leftChildValue][key], onChange: (event) => {
+                                                    const newValues = deepCopy(uniqueValues);
+                                                    newValues[table][leftChildValue][key] =
+                                                        event.target.checked;
+                                                    setUniqueValues(newValues);
+                                                    if (event.target.checked) {
+                                                        handleInsertVariant(keyPrefix + 'right.' + 'value', key);
+                                                    }
+                                                    else {
+                                                        handleDeleteVariant(keyPrefix + 'right.' + 'value', key);
+                                                    }
+                                                } }), _jsx("span", { style: {
+                                                    fontFamily: theme.fontFamily,
+                                                    margin: 'auto 0',
+                                                }, children: key })] }, key))) }, keyPrefix + 'right.'))] }));
                 }
                 else {
                     const columnName = node.left.column;
@@ -1133,9 +1268,9 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             justifyContent: 'space-between',
                             flexDirection: showNodeAsRow(node, formData) ? 'row' : 'column',
                             width: '100%',
-                        }, children: [node.left && renderNode(node.left, keyPrefix + 'left.'), _jsx(Select, { theme: theme, value: node.operator, onChange: (value) => {
-                                    handleOperatorChange(value, node, keyPrefix);
-                                }, style: { width: `100%` }, options: [
+                        }, children: [node.left && renderNode(node.left, keyPrefix + 'left.'), _jsx(SelectComponent, { value: node.operator, onChange: (event) => {
+                                    handleOperatorChange(event.target.value, node, keyPrefix);
+                                }, options: [
                                     // { label: `and`, value: "AND" },
                                     // { label: `or`, value: "OR" },
                                     ...(isNumericColumnType(columnType)
@@ -1152,10 +1287,10 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                         : []),
                                     ...(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 exactly', value: 'LIKE' },
+                                            { label: 'is not exactly', value: 'NOT LIKE' },
+                                            { label: 'is', value: 'IN' },
+                                            { label: 'is not', value: 'NOT IN' },
                                             { label: 'is not null', value: 'IS NOT' },
                                             { label: 'is null', value: 'IS' },
                                         ]
@@ -1165,6 +1300,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                             { 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' },
                                         ]
@@ -1178,15 +1314,17 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                     label: snakeCaseToTitleCase(column.displayName),
                     value: column.name,
                 }));
-                return (_jsx(Select, { theme: theme, style: { width: '120px' }, value: node.column ?? options[0]?.value, onChange: (value) => {
-                        handleChange([{ value, path: keyPrefix + 'column' }]);
+                return (_jsx(SelectComponent, { value: node.column ?? options[0]?.value, onChange: (event) => {
+                        handleChange([
+                            { value: event.target.value, path: keyPrefix + 'column' },
+                        ]);
                     }, options: options }));
             }
             case 'expr_list': {
                 const len = node.value.length;
                 return (_jsxs("div", { style: { display: 'flex', flexDirection: 'row', gap: 12 }, children: [node.value.map((elem, index) => {
                             if (elem.value) {
-                                return (_jsx(TextInput, { id: `expr_list_${index}`, width: 200, value: elem.value, onChange: (e) => handleChange([
+                                return (_jsx(TextInputComponent, { id: `expr_list_${index}`, width: 200, value: elem.value, onChange: (e) => handleChange([
                                         {
                                             value: e.target.value,
                                             path: keyPrefix + `value.${index}.`,
@@ -1194,11 +1332,11 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                     ]) }, `input_${index}`));
                             }
                             return renderNode(elem, keyPrefix + `value.${index}.`);
-                        }), len > 1 && (_jsx(SecondaryButton, { label: '-', onClick: () => handleDeleteVariant(keyPrefix + 'value') })), _jsx(SecondaryButton, { onClick: () => handleInsertVariant(keyPrefix + 'value'), label: '+' })] }, keyPrefix));
+                        }), len > 1 && (_jsx(SecondaryButtonComponent, { label: '-', onClick: () => handleDeleteVariant(keyPrefix + 'value') })), _jsx(SecondaryButtonComponent, { onClick: () => handleInsertVariant(keyPrefix + 'value'), label: '+' })] }, keyPrefix));
             }
             case 'double_quote_string':
             case 'single_quote_string':
-                return (_jsx(TextInput, { id: 'quoted_string', value: node.value.replaceAll('%', ''), width: 120, onChange: (e) => handleChange([
+                return (_jsx(TextInputComponent, { id: 'quoted_string', value: node.value.replaceAll('%', ''), width: 120, onChange: (e) => handleChange([
                         {
                             value: e.target.value,
                             path: keyPrefix + 'value',
@@ -1207,7 +1345,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
             case 'null':
                 return _jsx("div", {});
             case 'number':
-                return (_jsx(TextInput, { id: "quill_number_input", value: node.value, width: 120, onChange: (e) => {
+                return (_jsx(TextInputComponent, { id: "quill_number_input", value: node.value, width: 120, onChange: (e) => {
                         handleChange([
                             {
                                 value: e.target.value,
@@ -1260,15 +1398,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
     // @depreciated TODO: remove next update
     // eslint-disable-next-line no-unused-vars
     isTopLevelAnd = false, isParentRow = false) => {
-        const isInTheCurrentIntervalSentence = isTheCurrentInterval(node, client.databaseType)
-            ? getInTheCurrentIntervalSentence(node, client.databaseType)
-            : null;
-        const isInTheLastIntervalSentence = isInTheLastInterval(node, client.databaseType)
-            ? getInTheLastIntervalSentence(node, client.databaseType)
-            : null;
-        const isInThePreviousIntervalSentence = isThePreviousInterval(node, client.databaseType)
-            ? getInThePreviousIntervalSentence(node, client.databaseType)
-            : null;
+        const uniqueSentence = getCustomSentence(node, client.databaseType);
         let dateComparisonPartialMatch = null;
         let dateEqualityPartialMatch = null;
         if (client.databaseType !== 'BigQuery') {
@@ -1280,13 +1410,13 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
         const OPS = {
             AND: 'and',
             OR: 'or',
-            LIKE: 'is',
+            LIKE: 'is exactly',
             BETWEEN: 'is between',
-            IN: 'is one of',
-            'NOT IN': 'is not one of',
-            'NOT LIKE': 'is not',
-            '!=': 'is not',
-            '=': 'is',
+            IN: 'is',
+            'NOT IN': 'is not',
+            'NOT LIKE': 'is not exactly',
+            '!=': 'is not exactly',
+            '=': 'is exactly',
             '<': 'is less than',
             '>': 'is greater than',
             '<=': 'is less than or equal to',
@@ -1294,25 +1424,14 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
             '<>': 'is not',
             '-': 'minus',
             'IS NOT': 'is not',
-            IS: 'is ',
+            IS: 'is',
         };
         switch (node.type) {
             case 'binary_expr':
-                return (_jsx(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: 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 ??
+                return (_jsx(TagWrapper, { keyPrefix: keyPrefix, formData: formData, activeEditItem: activeEditItem, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setCheckboxes: setCheckboxes, handleReplaceSubtree: handleReplaceSubtree, FilterPopover: FilterPopoverComponent, setActivePath: setActivePath, setOpenPopover: setOpenPopover, setIsPending: setIsPending, clearCheckboxes: clearCheckboxes, handleDelete: handleDelete, editPopoverKey: editPopoverKey, isCard: isCard, isRow: isRow, getByKey: getByKey, EditPopover: EditPopover, Button: ButtonComponent, renderNode: renderNode, children: dateComparisonPartialMatch ??
                         dateEqualityPartialMatch ??
-                        isInTheCurrentIntervalSentence ??
-                        isInTheLastIntervalSentence ??
-                        isInThePreviousIntervalSentence ?? (_jsxs(_Fragment, { children: [node.left &&
-                                renderSentence(formData, node.left, keyPrefix + 'left.', false, false, isRow), isRow ? (' ' + OPS[node.operator] + ' ') : isTopLevel || topLevelBinaryOperator === 'OR' ? (_jsx(TopLevelBooleanSwitch, { node: node, keyPrefix: keyPrefix, handleOperatorChange: handleOperatorChange, Select: Select })) : null, node.right &&
+                        uniqueSentence ?? (_jsxs(_Fragment, { children: [node.left &&
+                                renderSentence(formData, node.left, keyPrefix + 'left.', false, false, isRow), isRow ? (' ' + OPS[node.operator] + ' ') : isTopLevel || topLevelBinaryOperator === 'OR' ? (_jsx(TopLevelBooleanSwitch, { node: node, keyPrefix: keyPrefix, handleOperatorChange: handleOperatorChange, Select: SelectComponent })) : null, node.right &&
                                 renderSentence(formData, node.right, keyPrefix + 'right.', false, false, isRow)] })) }));
             case 'column_ref':
                 return snakeCaseToTitleCase(node.column);
@@ -1347,6 +1466,9 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                     if (node.args.value.length < 1)
                         return null;
                     if (node.args.value[0].value) {
+                        if (node.args.value[0].type === 'single_quote_string') {
+                            return node.args.value[0].value.replaceAll('%', '');
+                        }
                         return snakeCaseToTitleCase(node.args.value[0].value.replaceAll('%', ''));
                     }
                     if (node.args.value[0].column)
@@ -1394,9 +1516,11 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
         }))
             .sort((a, b) => {
             const aIsId = a.name.toLowerCase() === 'id' ||
-                a.name.toLowerCase().endsWith('_id');
+                a.name.toLowerCase().endsWith('_id') ||
+                a.name.endsWith('Id');
             const bIsId = b.name.toLowerCase() === 'id' ||
-                b.name.toLowerCase().endsWith('_id');
+                b.name.toLowerCase().endsWith('_id') ||
+                b.name.endsWith('Id');
             if (aIsId && !bIsId)
                 return 1;
             if (bIsId && !aIsId)
@@ -1413,7 +1537,8 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
             return false;
         const allColumns = orderedColumnNames.filter((row) => {
             const [table, _] = row.split('.');
-            return selectedColumns[0].startsWith(table);
+            const selectedTable = selectedColumns[0].split('.')[0];
+            return selectedTable === table;
         });
         return selectedColumns.length === allColumns.length;
     };
@@ -1432,12 +1557,12 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                         fontSize: 18,
                         margin: 0,
                         textAlign: 'left',
-                    }, children: "Add condition" }), _jsx(Tabs, { defaultValue: topLevelBinaryOperator, options: DEFAULT_TAB_OPTIONS, onValueChange: (value) => setTopLevelBinaryOperator(value) }), activeEditItem && renderNode(activeEditItem), _jsx("div", { style: {
+                    }, children: "Add condition" }), _jsx(TabsComponent, { value: topLevelBinaryOperator, options: DEFAULT_TAB_OPTIONS, onChange: (event) => setTopLevelBinaryOperator(event.target.value) }), activeEditItem && renderNode(activeEditItem), _jsx("div", { style: {
                         display: 'flex',
                         flexDirection: 'row',
                         gap: 8,
                         justifyContent: 'end',
-                    }, children: _jsx(Button, { onClick: onSave, label: 'Add condition' }) })] }));
+                    }, children: _jsx(ButtonComponent, { onClick: onSave, label: 'Add condition' }) })] }));
     };
     const fetchUponChange = async (baseAst, newFormData) => {
         // if newFormData is null still use it
@@ -1698,9 +1823,8 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                 newAst = convertRemoveSimpleParentheses(newAst);
                 const table = getTableNames(newAst)[0] ?? initialTableName;
                 const tableAlias = getTableAliases(newAst)[0] ?? initialTableName;
-                newAst = removeNonSelectedTableReferences(newAst, tableAlias ?? table);
+                newAst = removeNonSelectedTableReferences(newAst, tableAlias ?? table, getAllPossibleColumns().map((col) => col.name));
                 // newAst = convertDateComparison(newAst); // TODO
-                ast = newAst; // so we fetch data for newAst later.
                 if (table !== currentTable) {
                     await getDistinctValues(table);
                     setCurrentTable(table);
@@ -1720,6 +1844,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                 }));
                 if (groupByPivot) {
                     setBaseAst(deepCopy({ ...newAst, orderby: null, limit: null }));
+                    newAst = deepCopy({ ...newAst, orderby: null, limit: null });
                 }
                 else {
                     setBaseAst(deepCopy({ ...newAst }));
@@ -1729,6 +1854,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                 // @ts-ignore
                 newAst?.where ? newAst?.where?.operator : 'AND');
             }
+            ast = newAst; // so we fetch data for newAst later.
             const res2 = await fetch('https://quill-344421.uc.r.appspot.com/patterns', {
                 method: 'POST',
                 headers: {
@@ -1809,11 +1935,11 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
         fetchSqlQuery(newAst);
     };
     function TopLevelBooleanSwitch({ node, keyPrefix, handleOperatorChange, }) {
-        return (_jsx("div", { style: { width: 'fit-content' }, children: _jsx(Tabs, { defaultValue: node.operator, options: DEFAULT_TAB_OPTIONS, onValueChange: (value) => {
+        return (_jsx("div", { style: { width: 'fit-content' }, children: _jsx(TabsComponent, { value: node.operator, options: DEFAULT_TAB_OPTIONS, onChange: (event) => {
                     if (loading) {
                         return;
                     }
-                    handleOperatorChange(value, node, keyPrefix);
+                    handleOperatorChange(event.target.value, node, keyPrefix);
                 } }) }));
     }
     const DraggableItem = ({ id, label, onDelete }) => {
@@ -1822,9 +1948,9 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
             transform: DND_CSS.Transform.toString(transform),
             transition,
         };
-        return (_jsx("div", { style: { ...style }, ref: setNodeRef, children: _jsx(DraggableColumn, { label: snakeCaseToTitleCase(label), onDelete: onDelete, children: _jsx("div", { style: {
+        return (_jsx("div", { style: { ...style }, ref: setNodeRef, children: _jsx(DraggableColumnComponent, { label: snakeCaseToTitleCase(label), onDelete: onDelete, DragHandle: (props) => (_jsx("div", { style: {
                         cursor: 'grab',
-                    }, ...attributes, ...listeners, children: _jsx(HandleButton, {}) }) }) }));
+                    }, ...attributes, ...listeners, children: _jsx(props.dragIcon, {}) })) }) }));
     };
     function DraggableColumns() {
         const sensors = useSensors(useSensor(PointerSensor), useSensor(KeyboardSensor, {
@@ -1833,9 +1959,11 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
         // When a drag event ends, switch the item order.
         function handleDragEnd(event) {
             const { active, over } = event;
+            if (!active || !over)
+                return;
             if (active.id !== over.id) {
-                const oldIndex = orderedColumnNames.findIndex((c) => c.endsWith(active.id));
-                const newIndex = orderedColumnNames.findIndex((c) => c.endsWith(over.id));
+                const oldIndex = orderedColumnNames.findIndex((c) => c.endsWith(`${currentTable}.${active.id}`));
+                const newIndex = orderedColumnNames.findIndex((c) => c.endsWith(`${currentTable}.${over.id}`));
                 const newOrder = arrayMove(orderedColumnNames, oldIndex, newIndex);
                 setOrderedColumnNames(newOrder);
                 const orderedSelectedColumns = [];
@@ -1845,6 +1973,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                         orderedSelectedColumns.push(column);
                     }
                 }
+                setSelectedOrderedColumns(orderedSelectedColumns);
                 // 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 = {
@@ -1860,7 +1989,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                 };
                 const newAst = baseAst ? newBaseAst : fallbackAST;
                 setBaseAst(newAst);
-                fetchSqlQuery(newAst);
+                fetchSqlQuery(newAst, undefined, false);
             }
         }
         const columnNamesInAst = baseAst?.columns.map((col) => {
@@ -1890,25 +2019,27 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                 flexDirection: 'row',
                 height: '100%',
                 ...containerStyle,
-            }, ref: parentRef, children: [_jsxs(Sidebar, { children: [_jsx(SidebarHeading, { label: "Columns" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(DraggableColumns, {}), _jsx(Popover, { isOpen: openPopover === 'AddColumnPopover', trigger: _jsx(SecondaryButton, { onClick: () => {
-                                    if (loadingSchema)
-                                        return;
-                                    if (!openPopover) {
-                                        setOpenPopover('AddColumnPopover');
-                                    }
-                                }, label: 'Select columns' }), label: "Select columns", onClose: () => {
-                                setIsPending(false);
-                                setActiveEditItem(null);
-                                setActivePath(null);
-                                setOpenPopover(null);
-                            }, children: _jsx(AddColumnPopover, { onSave: () => {
+            }, ref: parentRef, children: [_jsxs(SidebarComponent, { children: [_jsx(SidebarHeadingComponent, { label: "Columns" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(DraggableColumns, {}), _jsx(SecondaryButtonComponent, { onClick: () => {
+                                if (loadingSchema)
+                                    return;
+                                if (!openPopover) {
+                                    setOpenPopover('AddColumnPopover');
+                                }
+                            }, label: 'Select columns' }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddColumnPopover', setIsOpen: (isOpen) => {
+                                if (!isOpen) {
+                                    setIsPending(false);
+                                    setActiveEditItem(null);
+                                    setActivePath(null);
+                                    setOpenPopover(null);
+                                }
+                            }, popoverTitle: "Select columns", popoverChildren: _jsx(AddColumnPopover, { onSave: () => {
                                     setActiveEditItem(null);
                                     setActivePath(null);
                                     setOpenPopover(null);
                                 }, orderedColumnNames: orderedColumnNames, setOrderedColumnNames: setOrderedColumnNames, selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, isSelectedAllColumns: isSelectedAllColumns, clearAllState: clearAllState, nameToColumn: nameToColumn, baseAst: baseAst, setBaseAst: (newAst) => {
                                     setBaseAst(newAst);
                                     fetchSqlQuery(newAst);
-                                }, pivot: pivot, initialTableName: initialTableName, defaultAST: defaultAST, defaultTable: defaultTable, setPivot: setPivot, TextInput: TextInput, SelectColumn: SelectColumn, SecondaryButton: SecondaryButton, Button: Button, HandleButton: HandleButton }) }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeading, { label: "Filters" }), _jsx("div", { style: { height: 4, width: '100%' } }), formData && (_jsx("div", { style: {
+                                }, pivot: pivot, initialTableName: initialTableName, defaultAST: defaultAST, defaultTable: defaultTable, setPivot: setPivot, TextInput: TextInputComponent, SelectColumn: SelectColumnComponent, SecondaryButton: SecondaryButtonComponent, Button: ButtonComponent }) }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Filters" }), _jsx("div", { style: { height: 4, width: '100%' } }), formData && (_jsx("div", { style: {
                                 display: 'flex',
                                 flexDirection: 'column',
                                 gap: 8,
@@ -1918,39 +2049,41 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                 flexDirection: 'column',
                                 gap: 2.5,
                                 alignItems: 'flex-start',
-                            }, children: [_jsx(Popover, { isOpen: openPopover === 'AddFilterPopover', title: 'Add filter', trigger: _jsx(SecondaryButton, { onClick: () => {
-                                            if (!selectedColumns ||
-                                                selectedColumns.length === 0 ||
-                                                loading) {
-                                                return;
+                            }, children: [_jsx(SecondaryButtonComponent, { onClick: () => {
+                                        if (!selectedColumns ||
+                                            selectedColumns.length === 0 ||
+                                            loading) {
+                                            return;
+                                        }
+                                        if (!openPopover) {
+                                            const value = orderedColumnNames[0];
+                                            const [_table, column] = value.split('.');
+                                            const columnType = getColumnTypeByName(column);
+                                            if (isNumericColumnType(columnType)) {
+                                                const newSubtree = deepCopy(defaultNumericComparison);
+                                                newSubtree.left.column = column;
+                                                setActiveEditItem(newSubtree);
                                             }
-                                            if (!openPopover) {
-                                                const value = orderedColumnNames[0];
-                                                const [_table, column] = value.split('.');
-                                                const columnType = getColumnTypeByName(column);
-                                                if (isNumericColumnType(columnType)) {
-                                                    const newSubtree = deepCopy(defaultNumericComparison);
-                                                    newSubtree.left.column = column;
-                                                    setActiveEditItem(newSubtree);
-                                                }
-                                                else {
-                                                    const newSubtree = deepCopy(defaultEntry);
-                                                    newSubtree.left.args.value[0].column = column;
-                                                    setActiveEditItem(newSubtree);
-                                                }
-                                                setOpenPopover('AddFilterPopover');
-                                                setActivePath('');
-                                                setIsPending(true);
+                                            else {
+                                                const newSubtree = deepCopy(defaultEntry);
+                                                newSubtree.left.args.value[0].column = column;
+                                                setActiveEditItem(newSubtree);
                                             }
-                                        }, label: 'Add filter' }), onClose: () => {
-                                        setIsPending(false);
-                                        setActivePath(null);
-                                        setOpenPopover(null);
-                                        clearCheckboxes();
-                                        setTimeout(() => {
-                                            setActiveEditItem(null);
-                                        }, 300);
-                                    }, children: _jsx(AddFilterPopover, { onSave: () => {
+                                            setOpenPopover('AddFilterPopover');
+                                            setActivePath('');
+                                            setIsPending(true);
+                                        }
+                                    }, label: 'Add filter' }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddFilterPopover', setIsOpen: (isOpen) => {
+                                        if (!isOpen) {
+                                            setIsPending(false);
+                                            setActivePath(null);
+                                            setOpenPopover(null);
+                                            clearCheckboxes();
+                                            setTimeout(() => {
+                                                setActiveEditItem(null);
+                                            }, 300);
+                                        }
+                                    }, popoverTitle: 'Add filter', popoverChildren: _jsx(AddFilterPopover, { onSave: () => {
                                             if (isNodeEmptyCollection(activeEditItem)) {
                                                 setIsPending(false);
                                                 setActivePath(null);
@@ -1970,44 +2103,46 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                                     setActiveEditItem(null);
                                                 }, 300);
                                             }
-                                        }, Button: Button, renderNode: renderNode, activeEditItem: activeEditItem }) }), baseAst?.where &&
+                                        }, Button: ButtonComponent, renderNode: renderNode, activeEditItem: activeEditItem }) }), baseAst?.where &&
                                     false && ( // temp removed the AddConditionPopover
-                                _jsx(Popover, { isOpen: openPopover === 'AddConditionPopover', trigger: _jsx(SecondaryButton, { onClick: () => {
-                                            if (!openPopover) {
-                                                setActiveEditItem(deepCopy(defaultEntry));
-                                                setOpenPopover('AddConditionPopover');
-                                                setActivePath('');
-                                                setIsPending(true);
-                                            }
-                                        }, label: 'Add condition' }), onClose: () => {
-                                        setIsPending(false);
-                                        setTimeout(() => {
-                                            setActiveEditItem(null);
-                                        }, 300);
-                                        setActivePath(null);
-                                        setOpenPopover(null);
-                                        clearCheckboxes();
-                                    }, children: _jsx(AddConditionPopover, { onSave: () => {
-                                            if (isNodeEmptyCollection(activeEditItem)) {
-                                                setIsPending(false);
-                                                setTimeout(() => {
-                                                    setActiveEditItem(null);
-                                                }, 300);
-                                                setActivePath(null);
-                                                setOpenPopover(null);
-                                                clearCheckboxes();
-                                            }
-                                            else {
-                                                setIsPending(false);
-                                                handleInsertion(activeEditItem, topLevelBinaryOperator, true);
-                                                setTimeout(() => {
-                                                    setActiveEditItem(null);
-                                                }, 300);
-                                                setActivePath(null);
-                                                setOpenPopover(null);
-                                                clearCheckboxes();
-                                            }
-                                        } }) }))] }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeading, { label: "Pivot" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, SelectComponent: Select, ButtonComponent: Button, PopoverComponent: PivotPopover, TextComponent: Text, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, parentRef: parentRef, data: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
+                                _jsxs(_Fragment, { children: [_jsx(SecondaryButtonComponent, { onClick: () => {
+                                                if (!openPopover) {
+                                                    setActiveEditItem(deepCopy(defaultEntry));
+                                                    setOpenPopover('AddConditionPopover');
+                                                    setActivePath('');
+                                                    setIsPending(true);
+                                                }
+                                            }, label: "Add condition" }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddConditionPopover', setIsOpen: (isOpen) => {
+                                                if (!isOpen) {
+                                                    setIsPending(false);
+                                                    setTimeout(() => {
+                                                        setActiveEditItem(null);
+                                                    }, 300);
+                                                    setActivePath(null);
+                                                    setOpenPopover(null);
+                                                    clearCheckboxes();
+                                                }
+                                            }, popoverTitle: "Add condition", popoverChildren: _jsx(AddConditionPopover, { onSave: () => {
+                                                    if (isNodeEmptyCollection(activeEditItem)) {
+                                                        setIsPending(false);
+                                                        setTimeout(() => {
+                                                            setActiveEditItem(null);
+                                                        }, 300);
+                                                        setActivePath(null);
+                                                        setOpenPopover(null);
+                                                        clearCheckboxes();
+                                                    }
+                                                    else {
+                                                        setIsPending(false);
+                                                        handleInsertion(activeEditItem, topLevelBinaryOperator, true);
+                                                        setTimeout(() => {
+                                                            setActiveEditItem(null);
+                                                        }, 300);
+                                                        setActivePath(null);
+                                                        setOpenPopover(null);
+                                                        clearCheckboxes();
+                                                    }
+                                                } }) })] }))] }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Pivot" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, CardComponent: CardComponent, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, PopoverComponent: PopoverComponent, TextComponent: TextComponent, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, parentRef: parentRef, data: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
                                 setPivot(null);
                                 setPivotData(null);
                             }, 
@@ -2021,7 +2156,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                 setPivot(pivot);
                                 const pivotedData = generatePivotTable(pivot, rows, [null, null, null], false);
                                 setPivotData(pivotedData || []);
-                            }, selectPivotOnEdit: true, showTrigger: !pivot, theme: theme, LabelComponent: Label, HeaderComponent: Header, dateRange: [null, null, null], recommendPivotCount: 3, SecondaryButtonComponent: SecondaryButton }), pivot && (_jsx(PivotCard, { pivotTable: {
+                            }, selectPivotOnEdit: true, showTrigger: !pivot, theme: theme, LabelComponent: LabelComponent, HeaderComponent: HeaderComponent, dateRange: [null, null, null], recommendPivotCount: 3, SecondaryButtonComponent: SecondaryButtonComponent }), pivot && (_jsx(PivotCard, { pivotTable: {
                                 pivot: pivot,
                                 rows: pivotData?.rows || [],
                                 columns: pivotData?.columns || [],
@@ -2033,11 +2168,11 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                 setPivotValueField(pivot?.valueField);
                                 setPivotAggregation(pivot?.aggregationType);
                                 setPivotPopUpTitle('Edit Pivot');
-                            }, selectedPivotIndex: -1, onEditPivot: () => { }, ButtonComponent: Button, HeaderComponent: Header, showEdit: false, onClose: () => {
+                            }, selectedPivotIndex: -1, onEditPivot: () => { }, CardComponent: CardComponent, ButtonComponent: ButtonComponent, HeaderComponent: HeaderComponent, showEdit: false, onClose: () => {
                                 setPivot(null);
                                 setPivotData(null);
                                 setBaseAst(deepCopy(baseAst)); // trigger refetch
-                            }, minHeight: 180, LabelComponent: Label, TextComponent: Text })), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeading, { label: "Sort" }), _jsx("div", { style: { height: 4, width: '100%' } }), pivot && pivot.sort && (_jsx("div", { style: {
+                            }, minHeight: 180, LabelComponent: LabelComponent, TextComponent: TextComponent })), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Sort" }), _jsx("div", { style: { height: 4, width: '100%' } }), pivot && pivot.sort && (_jsx("div", { style: {
                                 display: 'flex',
                                 flexDirection: 'column',
                                 gap: 8,
@@ -2045,7 +2180,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             }, children: _jsx(SortSentence, { sortData: {
                                     type: pivot.sortDirection,
                                     expr: { type: 'column_ref', column: pivot.rowField },
-                                }, columns: selectedColumns, setIsPending: setIsPending, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setOpenPopover: setOpenPopover, SortPopover: SortPopover, EditPopover: AddSortPopover, handleDelete: () => {
+                                }, columns: selectedColumns, setIsPending: setIsPending, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setActivePath: setActivePath, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover, handleDelete: () => {
                                     setPivot({ ...pivot, sort: false });
                                     setBaseAst(deepCopy(baseAst));
                                     if (!pivot) {
@@ -2058,7 +2193,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                     if (!pivot) {
                                         fetchSqlQuery(baseAst);
                                     }
-                                }, Select: Select, Button: Button, SecondaryButton: SecondaryButton }, `sort-sentence-pivot`) })), baseAst && baseAst.orderby && (_jsx("div", { style: {
+                                }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent }, `sort-sentence-pivot`) })), baseAst && baseAst.orderby && (_jsx("div", { style: {
                                 display: 'flex',
                                 flexDirection: 'column',
                                 gap: 8,
@@ -2085,31 +2220,33 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                     if (!pivot) {
                                         fetchSqlQuery(newAst);
                                     }
-                                }, setIsPending: setIsPending, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setOpenPopover: setOpenPopover, SortPopover: SortPopover, EditPopover: AddSortPopover, handleDelete: () => {
+                                }, setIsPending: setIsPending, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setActivePath: setActivePath, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover, handleDelete: () => {
                                     const newAst = { ...baseAst };
                                     newAst.orderby.splice(id, 1);
                                     setBaseAst(deepCopy(newAst));
                                     if (!pivot) {
                                         fetchSqlQuery(newAst);
                                     }
-                                }, Select: Select, Button: Button, SecondaryButton: SecondaryButton }, `sort-sentence-${id}`))) })), _jsx(Popover, { isOpen: openPopover === 'AddSortPopover', setIsOpen: () => { }, trigger: _jsx(SecondaryButton, { onClick: () => {
-                                    if (!selectedColumns || selectedColumns.length === 0) {
-                                        return;
-                                    }
-                                    if (!openPopover) {
-                                        setOpenPopover('AddSortPopover');
-                                    }
-                                }, label: 'Add sort' }), title: "Sort By", onClose: () => {
-                                setIsPending(false);
-                                setActiveEditItem(null);
-                                setActivePath(null);
-                                setOpenPopover(null);
-                            }, children: _jsx(AddSortPopover, { columns: selectedColumns, Select: Select, Button: Button, onSave: () => { } }) }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeading, { label: "Limit" }), _jsx("div", { style: { height: 4, width: '100%' } }), baseAst && baseAst.limit ? (_jsx("div", { style: {
+                                }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent }, `sort-sentence-${id}`))) })), _jsx(SecondaryButtonComponent, { onClick: () => {
+                                if (!selectedColumns || selectedColumns.length === 0) {
+                                    return;
+                                }
+                                if (!openPopover) {
+                                    setOpenPopover('AddSortPopover');
+                                }
+                            }, label: "Add sort" }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddSortPopover', setIsOpen: (isOpen) => {
+                                if (!isOpen) {
+                                    setIsPending(false);
+                                    setActiveEditItem(null);
+                                    setActivePath(null);
+                                    setOpenPopover(null);
+                                }
+                            }, popoverTitle: "Sort by", popoverChildren: _jsx(AddSortPopover, { columns: selectedColumns, Select: SelectComponent, Button: ButtonComponent, onSave: () => { } }) }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Limit" }), _jsx("div", { style: { height: 4, width: '100%' } }), baseAst && baseAst.limit ? (_jsx("div", { style: {
                                 display: 'flex',
                                 flexDirection: 'column',
                                 gap: 8,
                                 marginBottom: 12,
-                            }, children: _jsx(LimitSentence, { limit: baseAst.limit, setOpenPopover: setOpenPopover, LimitPopover: SortPopover, EditPopover: AddLimitPopover, handleDelete: () => {
+                            }, children: _jsx(LimitSentence, { limit: baseAst.limit, setOpenPopover: setOpenPopover, LimitPopover: LimitPopoverComponent, EditPopover: AddLimitPopover, handleDelete: () => {
                                     const newAst = { ...baseAst };
                                     newAst.limit = null;
                                     setBaseAst(deepCopy(newAst));
@@ -2128,27 +2265,29 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                     setOpenPopover(null);
                                     setBaseAst(deepCopy(newAst));
                                     fetchSqlQuery(newAst);
-                                }, TextInput: TextInput, Button: Button, SecondaryButton: SecondaryButton }) })) : (_jsx(Popover, { isOpen: openPopover === 'AddLimitPopover', setIsOpen: () => { }, trigger: _jsx(SecondaryButton, { onClick: () => {
-                                    if (!openPopover) {
-                                        setOpenPopover('AddLimitPopover');
-                                    }
-                                }, label: 'Add limit' }), title: "Limit", onClose: () => {
-                                setIsPending(false);
-                                setActiveEditItem(null);
-                                setActivePath(null);
-                                setOpenPopover(null);
-                            }, children: _jsx(TextInput, { id: "loading_input_limit", value: 0, width: 120, onChange: () => { } }) }))] }), _jsxs(Container, { children: [!hideAi && (_jsxs("form", { ref: askAILoadingContainerRef, onSubmit: (event) => {
+                                }, TextInput: TextInputComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent }) })) : (_jsxs(_Fragment, { children: [_jsx(SecondaryButtonComponent, { onClick: () => {
+                                        if (!openPopover) {
+                                            setOpenPopover('AddLimitPopover');
+                                        }
+                                    }, label: 'Add limit' }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddLimitPopover', setIsOpen: (isOpen) => {
+                                        if (!isOpen) {
+                                            setIsPending(false);
+                                            setActiveEditItem(null);
+                                            setActivePath(null);
+                                            setOpenPopover(null);
+                                        }
+                                    }, popoverTitle: "Limit", popoverChildren: _jsx(TextInputComponent, { id: "loading_input_limit", value: '0', width: 120, onChange: () => { } }) })] }))] }), _jsxs(ContainerComponent, { children: [isAIEnabled && (_jsxs("form", { ref: askAILoadingContainerRef, onSubmit: (event) => {
                                 event.preventDefault();
                             }, style: {
                                 display: 'flex',
                                 flexDirection: 'row',
                                 gap: 12,
                                 padding: 1,
-                            }, children: [_jsx(TextInput, { id: "ask_ai_loading_bar", placeholder: baseAst ? 'Ask a follow-up question...' : 'Ask a question...', width: askAILoadingContainerWidth, value: aiPrompt, onChange: () => { } }), _jsx(Button, { onClick: () => { }, label: "Ask AI" }), baseAst && (_jsx(SecondaryButton, { onClick: clearAllState, label: "New report" }))] })), _jsxs(_Fragment, { children: [_jsx(TableLoadingState, {}), _jsxs("div", { style: {
+                            }, children: [_jsx(TextInputComponent, { id: "ask_ai_loading_bar", placeholder: baseAst ? 'Ask a follow-up question...' : 'Ask a question...', width: askAILoadingContainerWidth, value: aiPrompt, onChange: () => { } }), _jsx(ButtonComponent, { onClick: () => { }, label: "Ask AI" }), baseAst && (_jsx(SecondaryButtonComponent, { onClick: clearAllState, label: "New report" }))] })), _jsxs(_Fragment, { children: [_jsx(TableComponent, { isLoading: true, rows: [], columns: [] }), _jsxs("div", { style: {
                                         display: 'flex',
                                         flexDirection: 'row',
                                         gap: '12px',
-                                    }, children: [_jsx("div", { style: { width: '100%' } }), _jsx(SecondaryButton, { onClick: () => copyToClipboard(activeQuery), label: isCopying ? '✅ Copied' : 'Copy SQL' }), _jsx(Button, { label: 'Add to dashboard', onClick: () => { } })] })] })] }), _jsx("style", { children: `body{margin:0;}` })] }));
+                                    }, children: [_jsx("div", { style: { width: '100%' } }), _jsx(SecondaryButtonComponent, { onClick: () => copyToClipboard(activeQuery), label: isCopying ? '✅ Copied' : 'Copy SQL' }), _jsx(ButtonComponent, { label: 'Add to dashboard', onClick: () => { } })] })] })] }), _jsx("style", { children: `body{margin:0;}` })] }));
     }
     return (_jsxs("div", { ref: parentRef, style: {
             display: 'flex',
@@ -2157,26 +2296,31 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
             overflowY: 'auto',
             boxSizing: 'border-box',
             ...containerStyle,
-        }, children: [_jsxs(Sidebar, { children: [_jsx(SidebarHeading, { label: "Columns" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(DraggableColumns, {}), _jsx(Popover, { isOpen: openPopover === 'AddColumnPopover', title: "Select columns", trigger: _jsx(SecondaryButton, { onClick: () => {
-                                if (!openPopover) {
-                                    setOpenPopover('AddColumnPopover');
-                                }
-                            }, label: 'Select columns' }), onClose: () => {
-                            // delay onClose callback so onClick no-ops
-                            setTimeout(() => {
-                                setIsPending(false);
-                                setActiveEditItem(null);
-                                setActivePath(null);
-                                setOpenPopover(null);
-                            }, 100);
-                        }, children: _jsx(AddColumnPopover, { onSave: () => {
+        }, children: [_jsxs(SidebarComponent, { children: [_jsx(SidebarHeadingComponent, { label: "Columns" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(DraggableColumns, {}), _jsx(SecondaryButtonComponent, { onClick: () => {
+                            if (!orderedColumnNames) {
+                                return;
+                            }
+                            if (!openPopover) {
+                                setOpenPopover('AddColumnPopover');
+                            }
+                        }, label: "Select columns" }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddColumnPopover', setIsOpen: (isOpen) => {
+                            if (!isOpen) {
+                                // delay onClose callback so onClick no-ops
+                                setTimeout(() => {
+                                    setIsPending(false);
+                                    setActiveEditItem(null);
+                                    setActivePath(null);
+                                    setOpenPopover(null);
+                                }, 100);
+                            }
+                        }, popoverTitle: "Select columns", popoverChildren: _jsx(AddColumnPopover, { onSave: () => {
                                 setActiveEditItem(null);
                                 setActivePath(null);
                                 setOpenPopover(null);
                             }, orderedColumnNames: orderedColumnNames, setOrderedColumnNames: setOrderedColumnNames, selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, isSelectedAllColumns: isSelectedAllColumns, clearAllState: clearAllState, nameToColumn: nameToColumn, baseAst: baseAst, setBaseAst: (ast) => {
                                 setBaseAst(ast);
                                 fetchSqlQuery(ast);
-                            }, pivot: pivot, initialTableName: initialTableName, defaultAST: defaultAST, defaultTable: defaultTable, setPivot: setPivot, TextInput: TextInput, SelectColumn: SelectColumn, SecondaryButton: SecondaryButton, Button: Button, HandleButton: HandleButton }) }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeading, { label: "Filters" }), _jsx("div", { style: { height: 4, width: '100%' } }), formData && (_jsx("div", { style: {
+                            }, pivot: pivot, initialTableName: initialTableName, defaultAST: defaultAST, defaultTable: defaultTable, setPivot: setPivot, TextInput: TextInputComponent, SelectColumn: SelectColumnComponent, SecondaryButton: SecondaryButtonComponent, Button: ButtonComponent }) }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Filters" }), _jsx("div", { style: { height: 4, width: '100%' } }), formData && (_jsx("div", { style: {
                             display: 'flex',
                             flexDirection: 'column',
                             gap: 8,
@@ -2186,52 +2330,42 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             flexDirection: 'column',
                             gap: 2.5,
                             alignItems: 'flex-start',
-                        }, children: [_jsx(Popover, { title: 'Add filter', isOpen: openPopover === 'AddFilterPopover', trigger: _jsx(SecondaryButton, { onClick: () => {
-                                        if (!selectedColumns ||
-                                            selectedColumns.length === 0 ||
-                                            loading) {
-                                            return;
+                        }, children: [_jsx(SecondaryButtonComponent, { onClick: () => {
+                                    if (!selectedColumns || selectedColumns.length === 0 || loading) {
+                                        return;
+                                    }
+                                    if (!openPopover) {
+                                        const value = orderedColumnNames[0];
+                                        const [_table, column] = value.split('.');
+                                        const columnType = getColumnTypeByName(column);
+                                        if (isNumericColumnType(columnType)) {
+                                            const newSubtree = deepCopy(defaultNumericComparison);
+                                            newSubtree.left.column = column;
+                                            setActiveEditItem(newSubtree);
                                         }
-                                        if (!openPopover) {
-                                            const value = orderedColumnNames[0];
-                                            const [_table, column] = value.split('.');
-                                            const columnType = getColumnTypeByName(column);
-                                            if (isNumericColumnType(columnType)) {
-                                                const newSubtree = deepCopy(defaultNumericComparison);
-                                                newSubtree.left.column = column;
-                                                setActiveEditItem(newSubtree);
-                                            }
-                                            else {
-                                                const newSubtree = deepCopy(defaultEntry);
-                                                newSubtree.left.args.value[0].column = column;
-                                                setActiveEditItem(newSubtree);
-                                            }
-                                            setOpenPopover('AddFilterPopover');
-                                            setActivePath('');
-                                            setIsPending(true);
+                                        else {
+                                            const newSubtree = deepCopy(defaultEntry);
+                                            newSubtree.left.args.value[0].column = column;
+                                            setActiveEditItem(newSubtree);
                                         }
-                                    }, label: 'Add filter' }), onClose: () => {
-                                    // delay onClose callback so onClick no-ops
-                                    setTimeout(() => {
-                                        setIsPending(false);
-                                        setActivePath(null);
-                                        setOpenPopover(null);
-                                        clearCheckboxes();
-                                        setActiveEditItem(null);
-                                    }, 200);
-                                }, children: _jsx(AddFilterPopover, { onSave: () => {
-                                        if (isNodeEmptyCollection(activeEditItem)) {
+                                        setOpenPopover('AddFilterPopover');
+                                        setActivePath('');
+                                        setIsPending(true);
+                                    }
+                                }, label: 'Add filter' }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddFilterPopover', setIsOpen: (isOpen) => {
+                                    if (!isOpen) {
+                                        // delay onClose callback so onClick no-ops
+                                        setTimeout(() => {
                                             setIsPending(false);
                                             setActivePath(null);
                                             setOpenPopover(null);
                                             clearCheckboxes();
-                                            setTimeout(() => {
-                                                setActiveEditItem(null);
-                                            }, 300);
-                                        }
-                                        else {
+                                            setActiveEditItem(null);
+                                        }, 200);
+                                    }
+                                }, popoverTitle: "Add filter", popoverChildren: _jsx(AddFilterPopover, { onSave: () => {
+                                        if (isNodeEmptyCollection(activeEditItem)) {
                                             setIsPending(false);
-                                            handleInsertion(activeEditItem, 'AND', false);
                                             setActivePath(null);
                                             setOpenPopover(null);
                                             clearCheckboxes();
@@ -2239,45 +2373,57 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                                 setActiveEditItem(null);
                                             }, 300);
                                         }
-                                    }, Button: Button, renderNode: renderNode, activeEditItem: activeEditItem }) }), baseAst?.where &&
-                                false && ( // temp removed the AddConditionPopover
-                            _jsx(Popover, { isOpen: openPopover === 'AddConditionPopover', trigger: _jsx(SecondaryButton, { onClick: () => {
-                                        if (!openPopover) {
-                                            setActiveEditItem(deepCopy(defaultEntry));
-                                            setOpenPopover('AddConditionPopover');
-                                            setActivePath('');
-                                            setIsPending(true);
-                                        }
-                                    }, label: 'Add condition' }), onClose: () => {
-                                    // delay onClose callback so onClick no-ops
-                                    setTimeout(() => {
-                                        setIsPending(false);
-                                        setActiveEditItem(null);
-                                        setActivePath(null);
-                                        setOpenPopover(null);
-                                        clearCheckboxes();
-                                    }, 200);
-                                }, children: _jsx(AddConditionPopover, { onSave: () => {
-                                        if (isNodeEmptyCollection(activeEditItem)) {
+                                        else {
                                             setIsPending(false);
-                                            setTimeout(() => {
-                                                setActiveEditItem(null);
-                                            }, 300);
+                                            handleInsertion(activeEditItem, 'AND', false);
                                             setActivePath(null);
                                             setOpenPopover(null);
                                             clearCheckboxes();
-                                        }
-                                        else {
-                                            setIsPending(false);
-                                            handleInsertion(activeEditItem, topLevelBinaryOperator, true);
                                             setTimeout(() => {
                                                 setActiveEditItem(null);
                                             }, 300);
-                                            setActivePath(null);
-                                            setOpenPopover(null);
-                                            clearCheckboxes();
                                         }
-                                    } }) }))] }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeading, { label: "Pivot" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, SelectComponent: Select, ButtonComponent: Button, SecondaryButtonComponent: SecondaryButton, PopoverComponent: PivotPopover, TextComponent: Text, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, parentRef: parentRef, data: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
+                                    }, Button: ButtonComponent, renderNode: renderNode, activeEditItem: activeEditItem }) }), baseAst?.where &&
+                                false && ( // temp removed the AddConditionPopover
+                            _jsxs(_Fragment, { children: [_jsx(SecondaryButtonComponent, { onClick: () => {
+                                            if (!openPopover) {
+                                                setActiveEditItem(deepCopy(defaultEntry));
+                                                setOpenPopover('AddConditionPopover');
+                                                setActivePath('');
+                                                setIsPending(true);
+                                            }
+                                        }, label: 'Add condition' }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddConditionPopover', setIsOpen: (isOpen) => {
+                                            if (!isOpen) {
+                                                // delay onClose callback so onClick no-ops
+                                                setTimeout(() => {
+                                                    setIsPending(false);
+                                                    setActiveEditItem(null);
+                                                    setActivePath(null);
+                                                    setOpenPopover(null);
+                                                    clearCheckboxes();
+                                                }, 200);
+                                            }
+                                        }, popoverChildren: _jsx(AddConditionPopover, { onSave: () => {
+                                                if (isNodeEmptyCollection(activeEditItem)) {
+                                                    setIsPending(false);
+                                                    setTimeout(() => {
+                                                        setActiveEditItem(null);
+                                                    }, 300);
+                                                    setActivePath(null);
+                                                    setOpenPopover(null);
+                                                    clearCheckboxes();
+                                                }
+                                                else {
+                                                    setIsPending(false);
+                                                    handleInsertion(activeEditItem, topLevelBinaryOperator, true);
+                                                    setTimeout(() => {
+                                                        setActiveEditItem(null);
+                                                    }, 300);
+                                                    setActivePath(null);
+                                                    setOpenPopover(null);
+                                                    clearCheckboxes();
+                                                }
+                                            } }) })] }))] }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Pivot" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, CardComponent: CardComponent, SecondaryButtonComponent: SecondaryButtonComponent, PopoverComponent: PopoverComponent, TextComponent: TextComponent, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, parentRef: parentRef, data: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
                             setPivot(null);
                             setPivotData(null);
                         }, selectPivot: (pivot) => {
@@ -2293,7 +2439,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             setPivot(pivot);
                             const pivotedData = generatePivotTable(pivot, rows, [null, null, null], false);
                             setPivotData(pivotedData || []);
-                        }, selectPivotOnEdit: true, showTrigger: !pivot, theme: theme, LabelComponent: Label, HeaderComponent: Header, dateRange: [null, null, null], recommendPivotCount: 3 }), pivot && (_jsx(PivotCard, { pivotTable: {
+                        }, selectPivotOnEdit: true, showTrigger: !pivot, theme: theme, LabelComponent: LabelComponent, HeaderComponent: HeaderComponent, dateRange: [null, null, null], recommendPivotCount: 3 }), pivot && (_jsx(PivotCard, { pivotTable: {
                             pivot: pivot,
                             rows: pivotData?.rows || [],
                             columns: pivotData?.columns || [],
@@ -2305,11 +2451,11 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             setPivotValueField(pivot?.valueField);
                             setPivotAggregation(pivot?.aggregationType);
                             setPivotPopUpTitle('Edit Pivot');
-                        }, selectedPivotIndex: -1, onEditPivot: () => { }, ButtonComponent: Button, HeaderComponent: Header, showEdit: false, onClose: () => {
+                        }, selectedPivotIndex: -1, onEditPivot: () => { }, ButtonComponent: ButtonComponent, HeaderComponent: HeaderComponent, CardComponent: CardComponent, showEdit: false, onClose: () => {
                             setPivot(null);
                             setPivotData(null);
                             setBaseAst(deepCopy(baseAst));
-                        }, minHeight: 180, LabelComponent: Label, TextComponent: Text })), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeading, { label: "Sort" }), _jsx("div", { style: { height: 4, width: '100%' } }), pivot && pivot.sort && (_jsx("div", { style: {
+                        }, minHeight: 180, LabelComponent: LabelComponent, TextComponent: TextComponent })), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Sort" }), _jsx("div", { style: { height: 4, width: '100%' } }), pivot && pivot.sort && (_jsx("div", { style: {
                             display: 'flex',
                             flexDirection: 'column',
                             gap: 8,
@@ -2317,7 +2463,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                         }, children: _jsx(SortSentence, { sortData: {
                                 type: pivot.sortDirection,
                                 expr: { type: 'column_ref', column: pivot.rowField },
-                            }, columns: pivot ? [`.${pivot.rowField}`] : selectedColumns, setIsPending: setIsPending, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setOpenPopover: setOpenPopover, SortPopover: SortPopover, EditPopover: AddSortPopover, handleDelete: () => {
+                            }, columns: pivot ? [`.${pivot.rowField}`] : selectedColumns, setIsPending: setIsPending, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setActivePath: setActivePath, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover, handleDelete: () => {
                                 if (pivot) {
                                     setPivot({ ...pivot, sort: false });
                                     const pivotedData = generatePivotTable({ ...pivot, sort: false }, rows, [null, null, null], false);
@@ -2336,12 +2482,12 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                 setOpenPopover(null);
                                 setBaseAst(deepCopy(baseAst));
                                 fetchSqlQuery(deepCopy(baseAst));
-                            }, Select: Select, Button: Button, SecondaryButton: SecondaryButton }, `sort-sentence-pivot`) })), baseAst && baseAst.orderby && (_jsx("div", { style: {
+                            }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent }, `sort-sentence-pivot`) })), baseAst && baseAst.orderby && (_jsx("div", { style: {
                             display: 'flex',
                             flexDirection: 'column',
                             gap: 8,
                             marginBottom: 12,
-                        }, children: baseAst.orderby.map((sortData, id) => (_jsx(SortSentence, { sortData: sortData, columns: selectedColumns, setIsPending: setIsPending, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setOpenPopover: setOpenPopover, SortPopover: SortPopover, EditPopover: AddSortPopover, handleDelete: () => {
+                        }, children: baseAst.orderby.map((sortData, id) => (_jsx(SortSentence, { sortData: sortData, columns: selectedColumns, setIsPending: setIsPending, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setActivePath: setActivePath, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover, handleDelete: () => {
                                 if (pivot) {
                                     setPivot({ ...pivot, sort: false });
                                     return;
@@ -2378,19 +2524,21 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                 setOpenPopover(null);
                                 setBaseAst(deepCopy(newAst));
                                 fetchSqlQuery(deepCopy(newAst));
-                            }, Select: Select, Button: Button, SecondaryButton: SecondaryButton }, `sort-sentence-${id}`))) })), _jsx(Popover, { isOpen: openPopover === 'AddSortPopover', trigger: _jsx(SecondaryButton, { onClick: () => {
-                                if (!selectedColumns || selectedColumns.length === 0) {
-                                    return;
-                                }
-                                if (!openPopover) {
-                                    setOpenPopover('AddSortPopover');
-                                }
-                            }, label: 'Add sort' }), title: "Sort by", onClose: () => {
-                            setIsPending(false);
-                            setActiveEditItem(null);
-                            setActivePath(null);
-                            setOpenPopover(null);
-                        }, children: _jsx(AddSortPopover, { columns: pivot ? [`.${pivot.rowField}`] : selectedColumns, Select: Select, Button: Button, SecondaryButton: SecondaryButton, onSave: (column, direction) => {
+                            }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent }, `sort-sentence-${id}`))) })), _jsx(SecondaryButtonComponent, { onClick: () => {
+                            if (!selectedColumns || selectedColumns.length === 0) {
+                                return;
+                            }
+                            if (!openPopover) {
+                                setOpenPopover('AddSortPopover');
+                            }
+                        }, label: 'Add sort' }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddSortPopover', setIsOpen: (isOpen) => {
+                            if (!isOpen) {
+                                setIsPending(false);
+                                setActiveEditItem(null);
+                                setActivePath(null);
+                                setOpenPopover(null);
+                            }
+                        }, popoverTitle: "Sort by", popoverChildren: _jsx(AddSortPopover, { columns: pivot ? [`.${pivot.rowField}`] : selectedColumns, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, onSave: (column, direction) => {
                                 if (column === '')
                                     return;
                                 if (pivot) {
@@ -2414,12 +2562,12 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                 setOpenPopover(null);
                                 setBaseAst(deepCopy(newAst));
                                 fetchSqlQuery(deepCopy(newAst));
-                            } }) }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeading, { label: "Limit" }), _jsx("div", { style: { height: 4, width: '100%' } }), baseAst && baseAst.limit ? (_jsx("div", { style: {
+                            } }) }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Limit" }), _jsx("div", { style: { height: 4, width: '100%' } }), baseAst && baseAst.limit ? (_jsx("div", { style: {
                             display: 'flex',
                             flexDirection: 'column',
                             gap: 8,
                             marginBottom: 12,
-                        }, children: _jsx(LimitSentence, { limit: baseAst.limit, setOpenPopover: setOpenPopover, LimitPopover: SortPopover, EditPopover: AddLimitPopover, handleDelete: () => {
+                        }, children: _jsx(LimitSentence, { limit: baseAst.limit, setOpenPopover: setOpenPopover, LimitPopover: LimitPopoverComponent, EditPopover: AddLimitPopover, handleDelete: () => {
                                 const newAst = { ...baseAst };
                                 newAst.limit = null;
                                 setBaseAst(deepCopy(newAst));
@@ -2438,36 +2586,38 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                 setOpenPopover(null);
                                 setBaseAst(deepCopy(newAst));
                                 fetchSqlQuery(deepCopy(newAst));
-                            }, TextInput: TextInput, Button: Button, SecondaryButton: SecondaryButton }) })) : (_jsx(Popover, { isOpen: openPopover === 'AddLimitPopover', setIsOpen: () => { }, trigger: _jsx(SecondaryButton, { onClick: () => {
-                                if (!selectedColumns || selectedColumns.length === 0) {
-                                    return;
-                                }
-                                if (!baseAst) {
-                                    return;
-                                }
-                                if (!openPopover) {
-                                    setOpenPopover('AddLimitPopover');
-                                }
-                            }, label: 'Add limit' }), title: "Limit", onClose: () => {
-                            setIsPending(false);
-                            setActiveEditItem(null);
-                            setActivePath(null);
-                            setOpenPopover(null);
-                        }, children: _jsx(AddLimitPopover, { TextInput: TextInput, Button: Button, SecondaryButton: SecondaryButton, onSave: (limit) => {
-                                const newAst = { ...baseAst };
-                                newAst.limit = {
-                                    seperator: '',
-                                    value: [
-                                        {
-                                            type: 'number',
-                                            value: Number(limit),
-                                        },
-                                    ],
-                                };
-                                setOpenPopover(null);
-                                setBaseAst(deepCopy(newAst));
-                                fetchSqlQuery(deepCopy(newAst));
-                            } }) }))] }), _jsxs(Container, { children: [!hideAi && (_jsxs("form", { ref: askAIContainerRef, onSubmit: (event) => {
+                            }, TextInput: TextInputComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent }) })) : (_jsxs(_Fragment, { children: [_jsx(SecondaryButtonComponent, { onClick: () => {
+                                    if (!selectedColumns || selectedColumns.length === 0) {
+                                        return;
+                                    }
+                                    if (!baseAst) {
+                                        return;
+                                    }
+                                    if (!openPopover) {
+                                        setOpenPopover('AddLimitPopover');
+                                    }
+                                }, label: 'Add limit' }), _jsx(PopoverComponent, { isOpen: openPopover === 'AddLimitPopover', setIsOpen: (isOpen) => {
+                                    if (!isOpen) {
+                                        setIsPending(false);
+                                        setActiveEditItem(null);
+                                        setActivePath(null);
+                                        setOpenPopover(null);
+                                    }
+                                }, popoverTitle: "Limit", popoverChildren: _jsx(AddLimitPopover, { TextInput: TextInputComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, onSave: (limit) => {
+                                        const newAst = { ...baseAst };
+                                        newAst.limit = {
+                                            seperator: '',
+                                            value: [
+                                                {
+                                                    type: 'number',
+                                                    value: Number(limit),
+                                                },
+                                            ],
+                                        };
+                                        setOpenPopover(null);
+                                        setBaseAst(deepCopy(newAst));
+                                        fetchSqlQuery(deepCopy(newAst));
+                                    } }) })] }))] }), _jsxs(ContainerComponent, { children: [isAIEnabled && (_jsxs("form", { ref: askAIContainerRef, onSubmit: (event) => {
                             event.preventDefault();
                             handleAsk();
                         }, style: {
@@ -2475,14 +2625,14 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                             flexDirection: 'row',
                             gap: 12,
                             padding: 1,
-                        }, children: [_jsx(TextInput, { id: "ask_ai_input_bar", value: aiPrompt, width: askAIInputWidth, onChange: (e) => setAiPrompt(e.target.value), placeholder: baseAst ? 'Ask a follow-up question...' : 'Ask a question...' }), _jsx(Button, { onClick: handleAsk, label: 'Ask AI' }), baseAst && (_jsx(SecondaryButton, { label: 'New report', onClick: clearAllState }))] })), baseAst && (_jsx(_Fragment, { children: loading && errorMessage.length === 0 ? (_jsx(TableLoadingState, {})) : (_jsx(Table, { rows: applyFormatting({
-                                rows: pivotData?.rows || rows,
-                                fields: pivotData?.fields || fields,
-                            }, baseAst?.columns ?? []), columns: pivot
-                                ? pivotData?.columns || emptyPivotColumns()
-                                : enforceOrderOnColumns(Object.keys(rows[0] ?? {})).map((c) => {
-                                    return { label: snakeCaseToTitleCase(c), field: c };
-                                }), rowsPerPage: 20 })) })), _jsxs("div", { style: {
+                        }, children: [_jsx(TextInputComponent, { id: "ask_ai_input_bar", value: aiPrompt, width: askAIInputWidth, onChange: (e) => setAiPrompt(e.target.value), placeholder: baseAst ? 'Ask a follow-up question...' : 'Ask a question...' }), _jsx(ButtonComponent, { onClick: handleAsk, label: 'Ask AI' }), baseAst && (_jsx(SecondaryButtonComponent, { label: 'New report', onClick: clearAllState }))] })), baseAst && (_jsx(TableComponent, { isLoading: loading && errorMessage.length === 0, rows: applyFormatting({
+                            rows: pivotData?.rows || rows,
+                            fields: pivotData?.fields || fields,
+                        }, baseAst?.columns ?? []), columns: pivot
+                            ? pivotData?.columns || emptyPivotColumns()
+                            : enforceOrderOnColumns(Object.keys(rows[0] ?? {})).map((c) => {
+                                return { label: snakeCaseToTitleCase(c), field: c };
+                            }) })), _jsxs("div", { style: {
                             display: 'flex',
                             flexDirection: 'row',
                             gap: '12px',
@@ -2491,10 +2641,7 @@ export default function ReportBuilder({ initialTableName = '', onAddToDashboardC
                                     fontSize: 14,
                                     padding: '12px',
                                     whiteSpace: 'nowrap',
-                                }, children: errorMessage })), _jsx("div", { style: { width: '100%' } }), baseAst && (_jsxs(_Fragment, { children: [_jsx(SecondaryButton, { label: isCopying ? '✅ Copied' : 'Copy SQL', onClick: () => copyToClipboard(activeQuery) }), _jsx(Button, { onClick: () => {
+                                }, children: errorMessage })), _jsx("div", { style: { width: '100%' } }), baseAst && (_jsxs(_Fragment, { children: [_jsx(SecondaryButtonComponent, { label: isCopying ? '✅ Copied' : 'Copy SQL', onClick: () => copyToClipboard(activeQuery) }), _jsx(ButtonComponent, { onClick: () => {
                                             setIsChartBuilderOpen(true);
-                                        }, label: 'Add to dashboard' })] }))] })] }), _jsx("style", { children: `body{margin:0;}` }), _jsx(ChartBuilderWithModal, { rows: applyFormatting({ rows, fields }, baseAst?.columns ?? []), columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), fields: fields, pivot: pivot, query: activeQuery, showTableFormatOptions: admin ? true : false, showDateFieldOptions: admin ? true : false, showAccessControlOptions: admin ? true : false, title: "Add to dashboard", isEditMode: true, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: onAddToDashboardComplete, destinationDashboard: destinationDashboard, organizationName: organizationName, pivotData: pivotData, Select: Select, TextInput: TextInput, Button: Button, SecondaryButton: SecondaryButton, Header: Header, Label: Label, Text: Text, 
-                // TODO: Modal={Modal}
-                // TODO: Popover={Popover}
-                DeleteButton: DeleteButton })] }));
+                                        }, label: 'Add to dashboard' })] }))] })] }), _jsx("style", { children: `body{margin:0;}` }), _jsx(ChartBuilderWithModal, { rows: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), fields: fields, pivot: pivot, query: activeQuery, showTableFormatOptions: isAdminEnabled, showDateFieldOptions: isAdminEnabled, showAccessControlOptions: isAdminEnabled, title: "Add to dashboard", isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: onSubmitChartBuilder, destinationDashboard: destinationDashboard, organizationName: organizationName, pivotData: pivotData, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, CardComponent: CardComponent, ModalComponent: ModalComponent, PopoverComponent: PopoverComponent, DeleteButtonComponent: DeleteButtonComponent })] }));
 }