@quillsql/react 2.13.26 → 2.13.28

package/dist/esm/ReportBuilder.js

@@ -4,7 +4,7 @@ import { MemoizedButton, MemoizedDeleteButton, MemoizedHeader, MemoizedLabel, Me
 import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors, } from '@dnd-kit/core';
 import { arrayMove, SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy, useSortable, } from '@dnd-kit/sortable';
 import { CSS as DND_CSS } from '@dnd-kit/utilities';
-import { ClientContext, DashboardContext, DashboardFiltersContext, SchemaDataContext, ThemeContext, } from './Context';
+import { ClientContext, DashboardContext, DashboardFiltersContext, SchemaDataContext, TenantContext, ThemeContext, } from './Context';
 import { getTableNames, isNumericColumnType, } from './components/ReportBuilder/ast';
 import { ChartBuilderWithModal } from './ChartBuilder';
 import { QuillTextInput } from './components/UiComponents';
@@ -31,9 +31,7 @@ import { astToFilterTree, filterTreeToAst, getFieldFromExpression, } from './uti
 import useAstToFilterTree from './hooks/useAstToFilterTree';
 import { filterStackToFilterTree, uniqueValuesToStringMap, } from './utils/filterProcessing';
 import { QuillMultiSelectComponentWithCombo } from './components/QuillMultiSelectWithCombo';
-import { DEFAULT_PAGINATION, shouldFetchMore,
-// shouldSortInMemory,
- } from './utils/paginationProcessing';
+import { DEFAULT_PAGINATION, shouldFetchMore, shouldSortInMemory, } from './utils/paginationProcessing';
 import { EMPTY_INTERNAL_REPORT, fetchReportBuilderDataFromAST, formatRowsFromReport, } from './utils/report';
 import { TEMP_REPORT_ID, } from './models/Report';
 import equal from 'fast-deep-equal';
@@ -70,12 +68,13 @@ import { QUILL_SERVER } from './utils/constants';
  * ### Report Builder API
  * @see https://docs.quillsql.com/components/report-builder
  */
-export default function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void null, onSubmitCreateReport = () => void null, onDiscardChanges = undefined, onSaveChanges = undefined, onCloseChartBuilder = undefined, destinationDashboard = undefined, organizationName = '', ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, ModalComponent = MemoizedModal, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, MultiSelectComponent = QuillMultiSelectComponentWithCombo, TableComponent = QuillTableReportBuilderComponent, PopoverComponent = MemoizedPopover, TabsComponent = QuillTabs, 
+export default function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void null, onSubmitCreateReport = () => void null, onDiscardChanges = undefined, onSaveChanges = undefined, onCloseChartBuilder = undefined, destinationDashboard = undefined, chartBuilderTitle = undefined, organizationName = '', ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, ModalComponent = MemoizedModal, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, MultiSelectComponent = QuillMultiSelectComponentWithCombo, TableComponent = QuillTableReportBuilderComponent, PopoverComponent = MemoizedPopover, TabsComponent = QuillTabs, 
 // CheckboxComponent = MemoizedCheckbox,
-SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectColumnComponent = QuillSelectColumn, DraggableColumnComponent = QuillDraggableColumn, SidebarHeadingComponent = QuillSidebarHeading, FilterPopoverComponent = QuillFilterPopover, SortPopoverComponent = QuillSortPopover, LimitPopoverComponent = QuillLimitPopover, CardComponent = QuillCard, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, SubHeaderComponent = MemoizedSubHeader, TextComponent = MemoizedText, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, LoadingComponent = QuillLoadingComponent, ColumnSearchEmptyState = QuillColumnSearchEmptyState, ChartBuilderFormContainer = QuillChartBuilderFormContainer, ChartBuilderModalComponent = MemoizedModal, isAdminEnabled = false, isAIEnabled = true, containerStyle, className, pivotRecommendationsEnabled = true, reportId, hideCopySQL = true, isChartBuilderHorizontalView = true, onClickChartElement, }) {
+SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectColumnComponent = QuillSelectColumn, DraggableColumnComponent = QuillDraggableColumn, SidebarHeadingComponent = QuillSidebarHeading, FilterPopoverComponent = QuillFilterPopover, SortPopoverComponent = QuillSortPopover, LimitPopoverComponent = QuillLimitPopover, CardComponent = QuillCard, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, SubHeaderComponent = MemoizedSubHeader, TextComponent = MemoizedText, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, LoadingComponent = QuillLoadingComponent, ColumnSearchEmptyState = QuillColumnSearchEmptyState, ChartBuilderFormContainer = QuillChartBuilderFormContainer, ChartBuilderModalComponent = MemoizedModal, isAdminEnabled = false, isAIEnabled = true, containerStyle, className, pivotRecommendationsEnabled = true, reportId, hideCopySQL = true, isChartBuilderHorizontalView = true, onClickChartElement, flagsList, }) {
     const [dashboard, dashboardDispatch] = useContext(DashboardContext);
     const [schemaData] = useContext(SchemaDataContext);
     const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const { tenants } = useContext(TenantContext);
     const specificDashboardFilters = useMemo(() => {
         if (!reportId)
             return [];
@@ -84,6 +83,63 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
             return [];
         return Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter);
     }, [dashboardFilters, reportId, dashboard]);
+    const [client] = useContext(ClientContext);
+    // const { dashboardConfig } = useContext(DashboardConfigContext);
+    // const flagsToAdd: { [tenantField: string]: string[] } = useMemo(() => {
+    //   if (client && asSingleDatabaseTenant(client))
+    //     return { 'QUILL_SINGLE_TENANT': flags ?? {} } as { [tenantField: string]: string[] };
+    //   const tenantKeys =
+    //     dashboardConfig[
+    //       dashboard[reportId ?? '']?.dashboardName ?? destinationDashboard ?? ''
+    //     ]?.config.tenantKeys ?? [];
+    //   if (!tenantKeys.length) return {};
+    //   if (
+    //     tenants &&
+    //     (typeof tenants[0] === 'string' || typeof tenants[0] === 'number')
+    //   ) {
+    //     const dashboardOwner = tenantKeys[0]!;
+    //     const tenantIds = (client?.allTenantTypes as QuillTenant[])?.find(
+    //       (tt) => dashboardOwner === tt.tenantField,
+    //     )?.tenantIds;
+    //     return {
+    //       [dashboardOwner]:
+    //         tenantIds
+    //           ?.filter(
+    //             (tt) =>
+    //               (tenants as (string | number)[]).includes(tt.id) && tt.flag,
+    //           )
+    //           ?.map((tt) => tt.flag!) ?? [],
+    //     };
+    //   }
+    //   const tenantKeysSet = new Set(tenantKeys);
+    //   return (
+    //     (
+    //       tenants as
+    //         | { tenantField: string; tenantIds: (string | number)[] }[]
+    //         | undefined
+    //     )
+    //       ?.filter((t) => tenantKeysSet.has(t.tenantField))
+    //       .reduce(
+    //         (acc, t) => {
+    //           const tenantIds = new Set(t.tenantIds);
+    //           acc[t.tenantField] =
+    //             (client?.allTenantTypes as QuillTenant[])
+    //               ?.find((tt) => t.tenantField === tt.tenantField)
+    //               ?.tenantIds?.filter((tt) => tenantIds.has(tt.id) && tt.flag)
+    //               ?.map((tt) => tt.flag!) ?? [];
+    //           return acc;
+    //         },
+    //         {} as { [tenantField: string]: string[] },
+    //       ) ?? {}
+    //   );
+    // }, [
+    //   tenants,
+    //   flags,
+    //   dashboardConfig,
+    //   destinationDashboard,
+    //   dashboard[reportId ?? '']?.dashboardName,
+    //   client?.allTenantTypes,
+    // ]);
     const [reportInfo, setReportInfo] = useState(null);
     const [aiPrompt, setAiPrompt] = useState('');
     const [errorMessage, setErrorMessage] = useState('');
@@ -132,12 +188,10 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
     /* eslint-disable-next-line */
     const [pivotError, setPivotError] = useState(undefined);
     const [dateRanges, setDateRanges] = useState(null);
-    const [client] = useContext(ClientContext);
-    const [currentOrganizationId, setCurrentOrganizationId] = useState(client.organizationId);
     const [fieldValuesMap, setFieldValuesMap] = useState({}); // Mapping of unique values per field, used in string filter 'in' and 'not in'
     const [globalUniqueValues, setGlobalUniqueValues] = useState({});
     const [globalUniqueValuesIsLoading, setGlobalUniqueValuesIsLoading] = useState(false);
-    const { filterTree, filterStack } = useAstToFilterTree(formData, client); // Stores the state of filters
+    const { filterTree, filterStack } = useAstToFilterTree(formData, client, columns); // Stores the state of filters
     const [removingFilter, setRemovingFilter] = useState(false);
     const [pivotRecommendationsEnabledState, setPivotRecommendationsEnabledState,] = useState(pivotRecommendationsEnabled);
     const REPORT_BUILDER_PAGINATION = {
@@ -146,6 +200,15 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
         rowsPerRequest: 1000,
     };
     const [unresolvedReportMessage, setUnresolvedReportMessage] = useState('');
+    const dashboardName = useMemo(() => {
+        if (destinationDashboard) {
+            return destinationDashboard;
+        }
+        if (!reportId) {
+            return undefined;
+        }
+        return dashboard[reportId]?.dashboardName;
+    }, [reportId, dashboard, destinationDashboard]);
     const [filtersEnabled, setFiltersEnabled] = useState(!!reportId);
     useEffect(() => {
         if (!client) {
@@ -193,9 +256,9 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
             window.removeEventListener('resize', handleResize);
         };
     }, []);
-    const updatePivot = async (changeField, fieldKey) => {
+    const updatePivot = async (changeField, fieldKey, prevValue) => {
         const newPivot = deepCopy(pivot);
-        setTableLoading(true);
+        setPivotError(undefined);
         // @ts-ignore
         newPivot[fieldKey] = changeField;
         if (fieldKey === 'rowField') {
@@ -213,12 +276,20 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                 newPivot.sort = undefined;
             }
         }
+        const { valid, reason } = isValidPivot(newPivot);
+        if (!valid) {
+            setPivotError(reason);
+            return;
+        }
+        setTableLoading(true);
         let dateBucket = undefined;
         const tempDateRange = dateRanges && dateRanges[newPivot.rowField || ''];
         if (tempDateRange) {
             dateBucket = getDateBucketFromRange(tempDateRange.dateRange);
         }
         let distinctValuesForQuery = {};
+        const prevPivot = pivot;
+        const prevPivotData = pivotData;
         setPivot(newPivot);
         setPivotHint('');
         if (newPivot.columnField) {
@@ -228,7 +299,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                     label: newPivot.columnField,
                     format: 'string',
                 },
-            ], activeQuery, [], client, schemaData.customFields ?? []);
+            ], activeQuery, [], client, tenants, schemaData.customFields ?? [], undefined, dashboardName);
         }
         try {
             const pivotedData = await generatePivotTable({
@@ -237,12 +308,33 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                 report: tempReport,
                 client,
                 uniqueValues: distinctValuesForQuery,
+                dashboardName,
+                tenants,
             });
             setPivotData(pivotedData || []);
             const formattedRows = formatRows(pivotedData.rows, columns, true, newPivot.aggregationType);
             setFormattedRows(formattedRows);
         }
         catch (e) {
+            switch (fieldKey) {
+                case 'rowField':
+                    setPivotRowField(prevValue);
+                    break;
+                case 'columnField':
+                    setPivotColumnField(prevValue);
+                    break;
+                case 'valueField':
+                    setPivotValueField(prevValue);
+                    break;
+                case 'valueField2':
+                    setPivotValueField2(prevValue);
+                    break;
+                case 'aggregationType':
+                    setPivotAggregation(prevValue);
+                    break;
+            }
+            setPivot(prevPivot);
+            setPivotData(prevPivotData);
             if (e instanceof Error)
                 setPivotError(e.message);
         }
@@ -280,9 +372,12 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
             setDataDisplayed(false);
             setRows([]);
             setColumns([]);
+            setSelectedOrderedColumns([]);
             setErrorMessage('');
+            setPivotError(undefined);
             setFormattedRows([]);
-            // setUniqueValues({});
+            setCurrentTable('');
+            setUniqueValues({});
             setPivot(null);
             setPivotHint('');
             setPivotData(null);
@@ -291,7 +386,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
     };
     const fetchGlobalUniqueValues = async (columns, currentTable, client) => {
         setGlobalUniqueValuesIsLoading(true);
-        const global = await getUniqueStringValues(columns, currentTable, client, schemaData.customFields, undefined, true);
+        const global = await getUniqueStringValues(columns, currentTable, client, tenants, schemaData.customFields, undefined, true, undefined, dashboardName);
         setGlobalUniqueValues(uniqueValuesToStringMap(global));
         setGlobalUniqueValuesIsLoading(false);
     };
@@ -414,7 +509,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
         const dateColumnNames = dateColumns.map((column) => {
             return column.field;
         });
-        const dateRanges = await getQueryDateRangeByColumns(dateColumns, `Select ${dateColumnNames.join(', ')} from ${tableName}`, client, schemaData.customFields ?? []);
+        const dateRanges = await getQueryDateRangeByColumns(dateColumns, `Select ${dateColumnNames.join(', ')} from ${tableName}`, client, tenants, schemaData.customFields ?? [], dashboardName);
         return dateRanges;
     };
     // It's just like getColumnsInPivot but we expand the columnField
@@ -444,7 +539,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
         const tableInfo = tables.find((tableInfo) => tableInfo.name === initialTableName);
         if (tableInfo) {
             setUniqueValuesIsLoading(true);
-            const newUniqueValues = await getUniqueStringValues(tableInfo.columns, initialTableName, client, schemaData.customFields, uniqueValues, true);
+            const newUniqueValues = await getUniqueStringValues(tableInfo.columns, initialTableName, client, tenants, schemaData.customFields, uniqueValues, true, undefined, dashboardName);
             if (hashCode(uniqueValues) !== hashCode(newUniqueValues)) {
                 setUniqueValues(newUniqueValues);
                 updateFieldValuesMap(newUniqueValues, initialTableName);
@@ -607,16 +702,6 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
     const [numberOfRows, setNumberOfRows] = useState(0);
     const [rowCountIsLoading, setRowCountIsLoading] = useState(false);
     const [tableLoading, setTableLoading] = useState(false);
-    // const initialData = useMemo(() => ({
-    //   rows,
-    //   columns,
-    //   itemQuery: tempReport.itemQuery ?? [],
-    //   rowCount: numberOfRows ?? 0,
-    //   dashboardName: destinationDashboard ?? reportInfo?.dashboardName,
-    //   query: activeQuery,
-    //   pivot: pivot,
-    //   pivotData: pivotData,
-    // }), [rows, columns, tempReport, activeQuery, pivot, pivotData, numberOfRows, destinationDashboard, reportInfo]);
     const onPageChange = (page, initiator = 'ReportBuilder') => {
         const pagination = initiator === 'ReportBuilder'
             ? REPORT_BUILDER_PAGINATION
@@ -632,36 +717,30 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
             setPreviousPage(page);
         }
     };
-    const onSortChange = (sort, persistSort = false) => {
-        // if (shouldSortInMemory(REPORT_BUILDER_PAGINATION, numberOfRows, !!pivot)) {
-        //   return;
-        // }
-        const updatedProcessing = { page: REPORT_BUILDER_PAGINATION, sort };
-        if (persistSort) {
-            const newAst = { ...baseAst };
-            if (!newAst.orderby) {
-                newAst.orderby = [];
-            }
-            const existingSortIndex = newAst.orderby.findIndex((item) => getFieldFromExpression(item.expr) === sort.field);
-            if (existingSortIndex !== -1) {
-                newAst.orderby[existingSortIndex] = {
-                    expr: { type: 'column_ref', column: sort.field },
-                    type: sort.direction.toUpperCase(),
-                };
-            }
-            else {
-                newAst.orderby.push({
-                    expr: { type: 'column_ref', column: sort.field },
-                    type: sort.direction.toUpperCase(),
-                });
-            }
-            setBaseAst(deepCopy(newAst));
-            fetchReportFromASTHelper(newAst, newAst.where);
+    const onSortChange = (sort) => {
+        if (shouldSortInMemory(REPORT_BUILDER_PAGINATION, numberOfRows) ||
+            (pivot && pivot.rowField !== sort.field)) {
+            return;
+        }
+        const newAst = { ...baseAst };
+        if (!newAst.orderby) {
+            newAst.orderby = [];
+        }
+        const existingSortIndex = newAst.orderby.findIndex((item) => getFieldFromExpression(item.expr) === sort.field);
+        if (existingSortIndex !== -1) {
+            newAst.orderby[existingSortIndex] = {
+                expr: { type: 'column_ref', column: sort.field },
+                type: sort.direction.toUpperCase(),
+            };
         }
         else {
-            handleRunQuery(updatedProcessing, true);
+            newAst.orderby.push({
+                expr: { type: 'column_ref', column: sort.field },
+                type: sort.direction.toUpperCase(),
+            });
         }
-        setCurrentProcessing(updatedProcessing);
+        setBaseAst(deepCopy(newAst));
+        fetchReportFromASTHelper(newAst, newAst.where);
         setPreviousPage(0);
     };
     const fetchRowCount = async (processing, includeFilters) => {
@@ -669,9 +748,9 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
             return;
         }
         setRowCountIsLoading(true);
-        const tableInfo = await fetchResultsByQuery(activeQuery, client, processing, schemaData.customFields, includeFilters ? specificDashboardFilters : undefined, includeFilters
+        const tableInfo = await fetchResultsByQuery(activeQuery, client, tenants, processing, schemaData.customFields, includeFilters ? specificDashboardFilters : undefined, includeFilters
             ? (tempReport.dateField ?? reportInfo?.dateField)
-            : undefined, false, true);
+            : undefined, false, true, undefined, dashboardName);
         if (tableInfo.rowCount) {
             setNumberOfRows(tableInfo.rowCount);
             // @ts-ignore
@@ -684,7 +763,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
     };
     const fetchRowCountFromAST = async (ast, where) => {
         setRowCountIsLoading(true);
-        const tableData = await fetchTableByAST({ ...ast, where }, client, { page: REPORT_BUILDER_PAGINATION }, undefined, false, true);
+        const tableData = await fetchTableByAST({ ...ast, where }, client, tenants, { page: REPORT_BUILDER_PAGINATION }, undefined, false, true, dashboardName);
         if (tableData.rowCount) {
             setNumberOfRows(tableData.rowCount);
             // @ts-ignore
@@ -699,7 +778,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
         try {
             setErrorMessage('');
             setTableLoading(true);
-            const tableInfo = await fetchResultsByQuery(activeQuery, client, processing, schemaData.customFields, undefined, undefined, true);
+            const tableInfo = await fetchResultsByQuery(activeQuery, client, tenants, processing, schemaData.customFields, undefined, undefined, true, undefined, undefined, dashboardName);
             if (tableInfo.error) {
                 throw new Error(tableInfo.error);
             }
@@ -707,7 +786,6 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                 throw new Error('No data found');
             }
             fetchRowCount(processing, includeFilters);
-            setCurrentProcessing(processing);
             let tempRows = [...rows, ...tableInfo.rows];
             if (resetRows) {
                 tempRows = tableInfo.rows;
@@ -766,7 +844,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
         let reportBuilderInfo = undefined;
         try {
             setLoading(true);
-            reportBuilderInfo = await fetchReportBuilderDataFromAST(baseAst, curFormData, curSchema ?? schemaData.schema, client, curPivot ?? pivot, formData, currentTable, { uniqueStrings: uniqueValues, dateRanges: dateRanges ?? {} }, previousReport ?? reportInfo ?? undefined, schemaData.customFields, true, true, { page: REPORT_BUILDER_PAGINATION });
+            reportBuilderInfo = await fetchReportBuilderDataFromAST(baseAst, curFormData, curSchema ?? schemaData.schema, client, tenants, curPivot ?? pivot, formData, currentTable, { uniqueStrings: uniqueValues, dateRanges: dateRanges ?? {} }, previousReport ?? reportInfo ?? undefined, schemaData.customFields, true, true, { page: REPORT_BUILDER_PAGINATION }, dashboardName);
             if (reportBuilderInfo.error) {
                 throw new Error(reportBuilderInfo.error);
             }
@@ -782,6 +860,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
             return { error: true, message: 'Failed to fetch', rows: [] };
         }
         if (!reportBuilderInfo) {
+            setLoading(false);
             setErrorMessage('Failed to fetch');
             return;
         }
@@ -793,7 +872,6 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
         });
         const prevFormData = formData;
         const prevTable = currentTable;
-        const prevOrganization = currentOrganizationId;
         setRows(reportBuilderInfo.rows);
         setPreviousPage(0);
         if (!(client.databaseType.toLowerCase() === 'bigquery') ||
@@ -801,6 +879,9 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
             setColumns(reportBuilderInfo.columns);
             setSelectedColumns(reportBuilderInfoColumns);
         }
+        if (prevTable !== reportBuilderInfo.table) {
+            setSelectedOrderedColumns([]); // reset selected ordered columns
+        }
         setNumberOfRows(reportBuilderInfo.rowCount);
         setPivot(reportBuilderInfo.pivot);
         if (!keepPivotHint) {
@@ -811,7 +892,6 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
         setFormattedRows(reportBuilderInfo.formattedRows);
         setDataDisplayed(true);
         setCurrentTable(reportBuilderInfo.table);
-        setCurrentOrganizationId(client.organizationId);
         setFormData(curFormData);
         if (reportBuilderInfo.pivot) {
             setPivotRowField(reportBuilderInfo.pivot.rowField);
@@ -847,8 +927,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
         }
         // fetch unique values after everything else since it is the most expensive
         if (prevTable !== reportBuilderInfo.table ||
-            !equal(prevFormData, curFormData) ||
-            prevOrganization !== client.organizationId) {
+            !equal(prevFormData, curFormData)) {
             try {
                 setUniqueValuesIsLoading(true);
                 if (reportBuilderInfo.pivot) {
@@ -857,7 +936,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                 if (!tableInfo) {
                     throw new Error('Table info not found');
                 }
-                const uniqueStrings = await getUniqueStringValues(tableInfo.columns, reportBuilderInfo.table, client, schemaData.customFields, undefined, true, query);
+                const uniqueStrings = await getUniqueStringValues(tableInfo.columns, reportBuilderInfo.table, client, tenants, schemaData.customFields, undefined, true, query, dashboardName);
                 const newUnique = updateUniqueValue(uniqueStrings, reportBuilderInfo.table);
                 let pivotChanged = false;
                 let newPivot;
@@ -911,7 +990,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
             setLoading(true);
             setAskAILoading(true);
             setErrorMessage('');
-            astInfo = await fetchAndProcessASTFromPrompt(prompt, schemaData.schema, client, pivot, activeQuery, currentTable);
+            astInfo = await fetchAndProcessASTFromPrompt(prompt, schemaData.schema, client, pivot, activeQuery, currentTable, dashboardName);
             if (astInfo.error) {
                 throw new Error(astInfo.error);
             }
@@ -931,8 +1010,13 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
             astInfo.pivot = null;
             astInfo.ast.groupby = null;
         }
+        const _tables = getTableNames(astInfo.ast);
+        const _table = _tables[0] ? _tables[0] : '';
+        const _columns = schemaData.schema.find((table) => {
+            return table.name === _table;
+        })?.columns;
         // parse the whereAst first
-        const filterTree = astToFilterTree(astInfo.whereAST, client.databaseType?.toLowerCase());
+        const filterTree = astToFilterTree(astInfo.whereAST, client.databaseType?.toLowerCase(), _columns);
         const cleanAst = filterTree
             ? filterTreeToAst(filterTree, client.databaseType?.toLowerCase())
             : null;
@@ -974,7 +1058,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
         return { pivot: null, hint: '' };
     };
     const isValidPivotForReport = (pivot, uniqueValuesForPivot, reportTable, reportColumns) => {
-        if (!isValidPivot(pivot)) {
+        if (!isValidPivot(pivot).valid) {
             return false;
         }
         const uniqueValuesToCheck = uniqueValuesForPivot ?? uniqueValues;
@@ -1157,7 +1241,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                                             flexDirection: 'column',
                                             gap: 8,
                                             marginBottom: 12,
-                                        }, children: _jsx(FilterStack, { client: client, filterStack: filterStack, filterTree: filterTree, defaultAST: defaultAST, baseAst: baseAst, setBaseAst: setBaseAst, setFormData: setFormData, fetchSqlQuery: fetchSqlQuery, schemaData: schemaData, defaultColumn: defaultColumn, defaultTable: defaultTable, currentTable: currentTable, initialTableName: initialTableName, globalUniqueValues: globalUniqueValues, globalUniqueValuesIsLoading: globalUniqueValuesIsLoading, columns: columns, removingFilter: removingFilter, setRemovingFilter: setRemovingFilter, TabsComponent: TabsComponent, FilterPopoverComponent: FilterPopoverComponent, FilterModal: FilterModal, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent, actionsEnabled: !tableLoading && !loading }) })), _jsxs("div", { style: {
+                                        }, children: _jsx(FilterStack, { client: client, filterStack: filterStack, filterTree: filterTree, defaultAST: defaultAST, baseAst: baseAst, setBaseAst: setBaseAst, setFormData: setFormData, fetchSqlQuery: fetchSqlQuery, schemaData: schemaData, defaultColumn: defaultColumn, defaultTable: defaultTable, currentTable: currentTable, initialTableName: initialTableName, globalUniqueValues: globalUniqueValues, globalUniqueValuesIsLoading: globalUniqueValuesIsLoading, columns: columns, removingFilter: removingFilter, setRemovingFilter: setRemovingFilter, TabsComponent: TabsComponent, FilterPopoverComponent: FilterPopoverComponent, FilterModal: FilterModal, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent, actionsEnabled: !tableLoading && !loading, dashboardName: dashboardName }) })), _jsxs("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'column',
                                             alignItems: 'flex-start',
@@ -1230,6 +1314,8 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                                                         report: tempReport,
                                                         client,
                                                         uniqueValues,
+                                                        dashboardName,
+                                                        tenants,
                                                     });
                                                 }
                                                 setPivotData(pivotTable || []);
@@ -1245,23 +1331,29 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                                             finally {
                                                 setTableLoading(false);
                                             }
-                                        }, selectPivotOnEdit: true, showTrigger: !pivot, theme: theme, LabelComponent: LabelComponent, HeaderComponent: HeaderComponent, dateRange: undefined, pivotCountRequest: 4, query: activeQuery, initialUniqueValues: uniqueValues[currentTable], uniqueValuesIsLoading: uniqueValuesIsLoading, disabled: !baseAst || !dataDisplayed || tableLoading || loading, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, report: tempReport }), pivot && (_jsx(PivotForm, { columns: columns, uniqueValues: uniqueValues[currentTable], uniqueValuesIsLoading: uniqueValuesIsLoading, setPivotRowField: (value) => {
+                                        }, selectPivotOnEdit: true, showTrigger: !pivot, theme: theme, LabelComponent: LabelComponent, HeaderComponent: HeaderComponent, dateRange: undefined, pivotCountRequest: 4, query: activeQuery, initialUniqueValues: uniqueValues[currentTable], uniqueValuesIsLoading: uniqueValuesIsLoading, disabled: !baseAst || !dataDisplayed || tableLoading || loading, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, report: tempReport, dashboardName: dashboardName }), pivot && (_jsx(PivotForm, { columns: columns, uniqueValues: uniqueValues[currentTable], uniqueValuesIsLoading: uniqueValuesIsLoading, setPivotRowField: (value) => {
+                                            const prev = pivotRowField;
                                             setPivotRowField(value);
-                                            updatePivot(value, 'rowField');
+                                            updatePivot(value, 'rowField', prev);
                                         }, setPivotColumnField: (value) => {
+                                            const prev = pivotColumnField;
                                             setPivotColumnField(value);
-                                            updatePivot(value, 'columnField');
+                                            updatePivot(value, 'columnField', prev);
                                         }, setPivotValueField: (value) => {
+                                            const prev = pivotValueField;
                                             setPivotValueField(value);
-                                            updatePivot(value, 'valueField');
+                                            updatePivot(value, 'valueField', prev);
                                         }, setPivotValueField2: (value) => {
+                                            const prev = pivotValueField2;
                                             setPivotValueField2(value);
-                                            updatePivot(value, 'valueField2');
+                                            updatePivot(value, 'valueField2', prev);
                                         }, setPivotAggregation: (value) => {
+                                            const prev = pivotAggregation;
                                             setPivotAggregation(value);
-                                            updatePivot(value, 'aggregationType');
+                                            updatePivot(value, 'aggregationType', prev);
                                         }, onDelete: () => {
                                             setPivot(null);
+                                            setPivotError(undefined);
                                             setPivotHint('');
                                             setPivotData([]);
                                             const formattedRows = formatRows(rows, columns, false);
@@ -1305,6 +1397,8 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                                                         report: tempReport,
                                                         client,
                                                         uniqueValues: uniqueValues[currentTable],
+                                                        dashboardName,
+                                                        tenants,
                                                     });
                                                     setPivotData(pivotedData || []);
                                                     const formattedRows = formatRows(pivotedData.rows, columns, true, pivot.aggregationType, dateBucket);
@@ -1352,6 +1446,8 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                                                         report: tempReport,
                                                         client,
                                                         uniqueValues: uniqueValues[currentTable],
+                                                        dashboardName,
+                                                        tenants,
                                                     });
                                                     setPivotData(pivotedData || []);
                                                     const formattedRows = formatRows(pivotedData.rows, columns, true, pivot.aggregationType, dateBucket);
@@ -1464,6 +1560,8 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                                                                 report: tempReport,
                                                                 client,
                                                                 uniqueValues: uniqueValues[currentTable],
+                                                                dashboardName,
+                                                                tenants,
                                                             });
                                                             setErrorMessage('');
                                                             setPivotData(pivotedData || []);
@@ -1577,7 +1675,7 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                                             field: c,
                                         };
                                     }), onPageChange: onPageChange, onSortChange: (sort) => {
-                                    onSortChange(sort, true);
+                                    onSortChange(sort);
                                 }, containerStyle: {
                                     maxHeight: Math.max(window.innerHeight - 290, 75 + Math.min(Math.max(10, rows.length), 20) * 37),
                                 } })), _jsxs("div", { style: {
@@ -1586,14 +1684,15 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                                     gap: '12px',
                                     width: '100%',
                                     marginTop: 'auto',
-                                }, children: [errorMessage ? (_jsxs("div", { style: {
+                                    alignItems: 'center',
+                                }, children: [errorMessage || pivotError ? (_jsxs("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'row',
                                             overflow: 'hidden',
                                             width: '100%',
                                             gap: 12,
                                             alignItems: 'center',
-                                        }, children: [_jsx(ErrorMessageComponent, { errorMessage: errorMessage }), _jsx(SecondaryButtonComponent, { onClick: () => {
+                                        }, children: [_jsx(ErrorMessageComponent, { errorMessage: errorMessage || pivotError || '' }), _jsx(SecondaryButtonComponent, { onClick: () => {
                                                     fetchAstFromPromptHelper();
                                                 }, label: 'Retry' }), _jsx(SecondaryButtonComponent, { onClick: clearAllState, label: 'Reset' })] })) : (_jsx("div", { style: { width: '100%' } })), baseAst && dataDisplayed && (_jsxs(_Fragment, { children: [onDiscardChanges && (_jsx(SecondaryButtonComponent, { onClick: onDiscardChanges, label: "Discard changes" })), !hideCopySQL && (_jsx(SecondaryButtonComponent, { label: isCopying ? 'Copied' : 'Copy SQL', onClick: () => copySQLToClipboard() })), _jsx(ButtonComponent, { onClick: async () => {
                                                     onSaveChanges && onSaveChanges();
@@ -1611,27 +1710,44 @@ SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectCol
                                                                     yAxisFields: reportInfo?.pivot && !pivot
                                                                         ? []
                                                                         : reportInfo?.yAxisFields,
-                                                                    columns: reportInfo?.columns.filter((col) => {
-                                                                        return columns.find((c) => {
-                                                                            return col.field === c.field;
-                                                                        });
-                                                                    }),
+                                                                    columns: selectedOrderedColumns.length > 0
+                                                                        ? selectedOrderedColumns
+                                                                            .map((columnName) => {
+                                                                            return columns.find((col) => col.field === columnName);
+                                                                        })
+                                                                            .filter((col) => col !== undefined)
+                                                                            .map((c) => reportInfo?.columns.find((col) => col.field === c.field))
+                                                                            .filter((col) => col !== undefined)
+                                                                        : reportInfo?.columns.filter((col) => {
+                                                                            return columns.find((c) => {
+                                                                                return col.field === c.field;
+                                                                            });
+                                                                        }),
                                                                     queryString: activeQuery,
                                                                     rows: rows,
                                                                     pivotRows: pivotData?.rows,
                                                                     pivotColumns: pivotData?.columns,
+                                                                    flags: reportInfo?.flags ??
+                                                                        tempReport?.flags
+                                                                    // flagsToAdd,
                                                                 }
                                                                 : {
                                                                     ...tempReport,
                                                                     id: TEMP_REPORT_ID,
+                                                                    flags: tempReport?.flags,
                                                                 }),
                                                         },
                                                     });
                                                     setIsChartBuilderOpen(true);
                                                 }, disabled: !!errorMessage ||
+                                                    !!pivotError ||
                                                     tableLoading ||
                                                     loading ||
-                                                    unresolvedReportMessage, label: reportId ? 'Save changes' : 'Add to dashboard', tooltipText: unresolvedReportMessage })] }))] })] }), _jsx("style", { children: `body{margin:0;}` })] })), (!isChartBuilderHorizontalView || isChartBuilderOpen) && (_jsx(ChartBuilderWithModal, { reportId: reportId, isAdmin: isAdminEnabled, title: reportId ? 'Save changes' : 'Add to dashboard', isHorizontalView: true, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: reportId ? onSubmitEditReport : onSubmitCreateReport, organizationName: organizationName, initialUniqueValues: uniqueValues[currentTable], initialUniqueValuesIsLoading: uniqueValuesIsLoading, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, CardComponent: CardComponent, ModalComponent: ChartBuilderModalComponent, PopoverComponent: PopoverComponent, TableComponent: TableComponent, DeleteButtonComponent: DeleteButtonComponent, LoadingComponent: LoadingComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, FormContainer: ChartBuilderFormContainer, hideDateRangeFilter: true, buttonLabel: !!reportId ? 'Save changes' : 'Add to dashboard', onClickChartElement: onClickChartElement, filtersEnabled: filtersEnabled, onFiltersEnabledChanged: (enabled) => {
+                                                    unresolvedReportMessage, label: reportId ? 'Save changes' : 'Add to dashboard', tooltipText: unresolvedReportMessage })] }))] })] }), _jsx("style", { children: `body{margin:0;}` })] })), (!isChartBuilderHorizontalView || isChartBuilderOpen) && (_jsx(ChartBuilderWithModal, { reportId: reportId, isAdmin: isAdminEnabled, title: chartBuilderTitle
+                    ? chartBuilderTitle
+                    : reportId
+                        ? 'Save changes'
+                        : 'Add to dashboard', isHorizontalView: true, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: reportId ? onSubmitEditReport : onSubmitCreateReport, organizationName: organizationName, initialUniqueValues: uniqueValues[currentTable], initialUniqueValuesIsLoading: uniqueValuesIsLoading, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, CardComponent: CardComponent, ModalComponent: ChartBuilderModalComponent, PopoverComponent: PopoverComponent, TableComponent: TableComponent, DeleteButtonComponent: DeleteButtonComponent, LoadingComponent: LoadingComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, FormContainer: ChartBuilderFormContainer, hideDateRangeFilter: true, buttonLabel: !!reportId ? 'Save changes' : 'Add to dashboard', onClickChartElement: onClickChartElement, filtersEnabled: filtersEnabled, onFiltersEnabledChanged: (enabled) => {
                     setFiltersEnabled(enabled);
-                }, isEditingMode: true }))] }));
+                }, isEditingMode: true, flagsList: flagsList }))] }));
 }

package/dist/esm/SQLEditor.d.ts

@@ -249,6 +249,10 @@ export interface SQLEditorProps {
      * Styles the top-level container of the SQLEditor.
      */
     containerStyle?: React.CSSProperties;
+    /**
+     * A list of flags that can be applied to the resulting report (for single tenant per database setups)
+     */
+    flagsList?: string[];
 }
 /**
  * ### Quill SQLEditor
@@ -275,7 +279,7 @@ export interface SQLEditorProps {
  * ### SQLEditor API
  * @see https://docs.quillsql.com/components/sql-editor
  */
-export default function SQLEditor({ ButtonComponent, SecondaryButtonComponent, DeleteButtonComponent, TextInputComponent, SelectComponent, TableComponent, isNewQueryEnabled, LoadingComponent, ModalComponent, PopoverComponent, CardComponent, LabelComponent, HeaderComponent, SubHeaderComponent, TextComponent, ErrorMessageComponent, ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer, PivotRowContainer, PivotColumnContainer, ChartBuilderFormContainer, defaultQuery, destinationDashboard, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, onDiscardChanges, onSaveChanges, onCloseChartBuilder, isChartBuilderEnabled, isAdminEnabled, chartBuilderTitle, runQueryOnMount, onAddToDashboardComplete, addToDashboardButtonLabel, report, organizationName, isChartBuilderHorizontalView, containerStyle, className, onClickChartElement, }: SQLEditorProps): import("react/jsx-runtime").JSX.Element;
+export default function SQLEditor({ ButtonComponent, SecondaryButtonComponent, DeleteButtonComponent, TextInputComponent, SelectComponent, TableComponent, isNewQueryEnabled, LoadingComponent, ModalComponent, PopoverComponent, CardComponent, LabelComponent, HeaderComponent, SubHeaderComponent, TextComponent, ErrorMessageComponent, ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer, PivotRowContainer, PivotColumnContainer, ChartBuilderFormContainer, defaultQuery, destinationDashboard, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, onDiscardChanges, onSaveChanges, onCloseChartBuilder, isChartBuilderEnabled, isAdminEnabled, chartBuilderTitle, runQueryOnMount, onAddToDashboardComplete, addToDashboardButtonLabel, report, organizationName, isChartBuilderHorizontalView, containerStyle, className, onClickChartElement, flagsList, }: SQLEditorProps): import("react/jsx-runtime").JSX.Element;
 export declare const SchemaListComponent: ({ schema, theme, loading, LoadingComponent, width, onClick, style, }: {
     schema: any;
     theme: any;