@quillsql/react 2.13.22 → 2.13.24

package/dist/cjs/ReportBuilder.js

@@ -97,7 +97,6 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
     const [selectedOrderedColumns, setSelectedOrderedColumns] = (0, react_1.useState)([]);
     const [activeQuery, setActiveQuery] = (0, react_1.useState)('');
     const [, setActiveEditItem] = (0, react_1.useState)(null);
-    const [activePath, setActivePath] = (0, react_1.useState)(null);
     const [openPopover, setOpenPopover] = (0, react_1.useState)(null);
     const [loading, setLoading] = (0, react_1.useState)(!!initialTableName);
     const [isChartBuilderOpen, setIsChartBuilderOpen] = (0, react_1.useState)(false);
@@ -105,6 +104,8 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
     const [dataDisplayed, setDataDisplayed] = (0, react_1.useState)(false);
     const [rows, setRows] = (0, react_1.useState)([]);
     const [filteredRows, setFilteredRows] = (0, react_1.useState)([]);
+    const [filteredRowCount, setFilteredRowCount] = (0, react_1.useState)(0);
+    const [filteredTableIsLoading, setFilteredTableIsLoading] = (0, react_1.useState)(false);
     const [chartBuilderInFilteredPreview, setChartBuilderInFilteredPreview] = (0, react_1.useState)(true);
     const [formattedRows, setFormattedRows] = (0, react_1.useState)([]);
     const [columns, setColumns] = (0, react_1.useState)([]);
@@ -280,7 +281,6 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
             setSelectedColumns([]);
             setActiveQuery('');
             setActiveEditItem(null);
-            setActivePath(null);
             setOpenPopover(null);
             setLoading(false);
             setDataDisplayed(false);
@@ -401,7 +401,6 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
             });
             const data = await response.json();
             setActiveQuery(data.query);
-            fetchFilteredRows(data.query);
             if (fetchData) {
                 fetchReportFromASTHelper(ast, formData);
             }
@@ -541,166 +540,35 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
     (0, react_1.useEffect)(() => {
         onSchemaChange();
     }, [schemaData.schema, initialTableName, reportId]);
-    const updateFormData = (updates, { isDeletion = false, isInsertion = false, isReplaceSubtree = false, isAddVariant = false, isDeleteVariant = false, topLevelBinOp = 'OR', isCondition = undefined, }) => {
-        // Function to immutably update or delete nodes based on their path
-        // TODO: fix the following horible code
-        updates.forEach(({ path, value }) => {
-            const globalPath = [
-                (activePath ?? isDeletion) ? path : '',
-                isDeletion || isReplaceSubtree ? '' : path,
-            ]
-                .filter(Boolean)
-                .join('.');
-            const paths = globalPath.split('.').filter((p) => p);
-            if (paths.length === 0 && !isInsertion && !isReplaceSubtree) {
-                setFormData(null);
-                const newAst = (0, util_1.deepCopy)({
-                    ...constants_1.defaultAST,
-                    ...baseAst,
-                    ...(!baseAst?.columns && {
-                        columns: (0, astProcessing_1.getAllPossibleColumns)(baseAst, schemaData.schema).map((c) => {
-                            const newColumn = (0, util_1.deepCopy)(constants_1.defaultColumn);
-                            newColumn.expr.column = c.field;
-                            return newColumn;
-                        }),
-                    }),
-                    ...(!baseAst?.from && {
-                        from: [{ ...constants_1.defaultTable, table: initialTableName }],
-                    }),
-                    where: null,
-                });
-                setBaseAst(newAst);
-                fetchSqlQuery(newAst, null);
-                return;
-            }
-            if (!formData && isInsertion) {
-                const newAst = (0, util_1.deepCopy)({
-                    ...constants_1.defaultAST,
-                    ...baseAst,
-                    ...(!baseAst?.columns && {
-                        columns: (0, astProcessing_1.getAllPossibleColumns)(baseAst, schemaData.schema).map((c) => {
-                            const newColumn = (0, util_1.deepCopy)(constants_1.defaultColumn);
-                            newColumn.expr.column = c.field;
-                            return newColumn;
-                        }),
-                    }),
-                    ...(!baseAst?.from && {
-                        from: [{ ...constants_1.defaultTable, table: initialTableName }],
-                    }),
-                    where: value,
-                });
-                setFormData(value);
-                setBaseAst(newAst);
-                fetchSqlQuery(newAst, value);
-                return;
-            }
-            let newState = (0, util_1.deepCopy)(formData);
-            let current = newState;
-            let parent = null;
-            let parentKey = null;
-            for (let i = 0; i < paths.length - 1; i++) {
-                if (current[paths[i]]) {
-                    parent = current;
-                    parentKey = paths[i];
-                    current = current[paths[i]];
-                }
-            }
-            const lastKey = paths[paths.length - 1];
-            if (isDeletion) {
-                if (lastKey === 'left' || lastKey === 'right') {
-                    if (parent) {
-                        if (lastKey === 'right') {
-                            parent[parentKey] = parent[parentKey].left;
-                        }
-                        else {
-                            parent[parentKey] = parent[parentKey].right;
-                        }
-                    }
-                    else {
-                        delete current[lastKey];
-                        if (newState?.left && !newState?.right) {
-                            newState = newState.left;
-                        }
-                        else if (newState?.right && !newState?.left) {
-                            newState = newState.right;
-                        }
-                    }
-                }
-            }
-            else if (isInsertion) {
-                newState = {
-                    type: 'binary_expr',
-                    operator: topLevelBinOp,
-                    isCondition: isCondition,
-                    left: newState,
-                    right: value,
-                };
-            }
-            else if (isAddVariant) {
-                const newVariant = (0, util_1.deepCopy)(constants_1.defaultVariant);
-                if (value) {
-                    newVariant.args.value[0].value = value;
-                    // if there is already a single default value there,
-                    // let's remove it so when we push we replace.
-                    if (current[lastKey].length === 1 &&
-                        current[lastKey][0].args.value[0].value === '') {
-                        current[lastKey].pop();
-                    }
-                }
-                current[lastKey].push(newVariant);
-            }
-            else if (isDeleteVariant) {
-                if (value) {
-                    const argList = current[lastKey];
-                    argList.splice(argList.findIndex((arg) => arg.args.value[0].value === name), 1);
-                }
-                else {
-                    current[lastKey].pop();
-                }
-            }
-            else if (isReplaceSubtree) {
-                if (lastKey) {
-                    current[lastKey] = value;
-                }
-                else {
-                    newState = value;
-                }
-            }
-            else {
-                if (typeof current[lastKey] === 'object' && current[lastKey] !== null) {
-                    current[lastKey].value = value;
-                }
-                else {
-                    current[lastKey] = value;
-                }
-            }
-            setFormData(newState);
-            const newAst = {
-                ...constants_1.defaultAST,
-                ...baseAst,
-                ...(!baseAst?.columns && {
-                    columns: (0, astProcessing_1.getAllPossibleColumns)(baseAst, schemaData.schema).map((c) => {
-                        const newColumn = (0, util_1.deepCopy)(constants_1.defaultColumn);
-                        newColumn.expr.column = c.field;
-                        return newColumn;
-                    }),
-                }),
-                ...(!baseAst?.from && {
-                    from: [{ ...constants_1.defaultTable, table: initialTableName }],
-                }),
-                where: { ...newState },
+    // Function to handle the insertion of expressions
+    const handleInsertion = (value) => {
+        const newFilterStack = [...filterStack];
+        if (newFilterStack.length > 0) {
+            const tabNode = {
+                leaf: false,
+                operator: 'and',
+                leftNode: null,
+                rightNode: null,
             };
+            newFilterStack.push(tabNode);
+        }
+        const newItem = {
+            leaf: true,
+            operator: null,
+            leftNode: null,
+            rightNode: null,
+            value: value,
+        };
+        newFilterStack.push(newItem);
+        const tree = (0, filterProcessing_1.filterStackToFilterTree)(newFilterStack);
+        if (tree) {
+            const newFormData = (0, astFilterProcessing_1.filterTreeToAst)(tree, client.databaseType.toLowerCase());
+            setFormData(newFormData);
+            const newAst = { ...baseAst };
+            newAst.where = newFormData;
             setBaseAst(newAst);
-            fetchSqlQuery(newAst, newState);
-        });
-    };
-    // Function to handle the insertion of expressions
-    const handleInsertion = (value, op = 'OR', isCondition = undefined) => {
-        updateFormData([{ path: '', value }], {
-            isInsertion: true,
-            topLevelBinOp: op,
-            isCondition,
-        });
+            fetchSqlQuery(newAst, newFormData);
+        }
     };
     /**
      * Searches for the column by name and returns the field type.
@@ -740,36 +608,93 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         }
     };
     const [previousPage, setPreviousPage] = (0, react_1.useState)(0);
+    const [filteredPreviousPage, setFilteredPreviousPage] = (0, react_1.useState)(0);
     const [currentProcessing, setCurrentProcessing] = (0, react_1.useState)({
         page: REPORT_BUILDER_PAGINATION,
     });
+    const [filteredProcessing, setFilteredProcessing] = (0, react_1.useState)({
+        page: paginationProcessing_1.DEFAULT_PAGINATION,
+    });
     const [numberOfRows, setNumberOfRows] = (0, react_1.useState)(0);
     const [rowCountIsLoading, setRowCountIsLoading] = (0, react_1.useState)(false);
     const [tableLoading, setTableLoading] = (0, react_1.useState)(false);
-    const onPageChange = (page) => {
-        if (currentProcessing.page &&
-            (0, paginationProcessing_1.shouldFetchMore)(REPORT_BUILDER_PAGINATION, page, previousPage)) {
-            const newPagination = { ...currentProcessing.page, page };
-            const updatedProcessing = { ...currentProcessing, page: newPagination };
-            setCurrentProcessing(updatedProcessing);
-            handleRunQuery(updatedProcessing);
+    const onPageChange = (page, isFilteredRows, initiator = 'ReportBuilder') => {
+        const pagination = initiator === 'ReportBuilder'
+            ? REPORT_BUILDER_PAGINATION
+            : paginationProcessing_1.DEFAULT_PAGINATION;
+        if (isFilteredRows) {
+            if (filteredProcessing.page &&
+                (0, paginationProcessing_1.shouldFetchMore)(pagination, page, filteredPreviousPage)) {
+                const newPagination = { ...filteredProcessing.page, page };
+                const updatedProcessing = {
+                    ...filteredProcessing,
+                    page: newPagination,
+                };
+                setFilteredProcessing(updatedProcessing);
+                fetchFilteredRows(activeQuery, updatedProcessing, false);
+            }
+            if (page > filteredPreviousPage) {
+                setFilteredPreviousPage(page);
+            }
         }
-        if (page > previousPage) {
-            setPreviousPage(page);
+        else {
+            if (currentProcessing.page &&
+                (0, paginationProcessing_1.shouldFetchMore)(pagination, page, previousPage)) {
+                const newPagination = { ...currentProcessing.page, page };
+                const updatedProcessing = { ...currentProcessing, page: newPagination };
+                setCurrentProcessing(updatedProcessing);
+                handleRunQuery(updatedProcessing);
+            }
+            if (page > previousPage) {
+                setPreviousPage(page);
+            }
         }
     };
-    const onSortChange = (sort) => {
-        if ((0, paginationProcessing_1.shouldSortInMemory)(REPORT_BUILDER_PAGINATION, numberOfRows, !!pivot)) {
-            return;
+    const onSortChange = (sort, isFilteredRows, persistSort = false) => {
+        // if (shouldSortInMemory(REPORT_BUILDER_PAGINATION, numberOfRows, !!pivot)) {
+        //   return;
+        // }
+        if (isFilteredRows) {
+            const updatedProcessing = { page: paginationProcessing_1.DEFAULT_PAGINATION, sort };
+            fetchFilteredRows(activeQuery, updatedProcessing, true);
+            setFilteredProcessing(updatedProcessing);
+            setFilteredPreviousPage(0);
+        }
+        else {
+            const updatedProcessing = { page: REPORT_BUILDER_PAGINATION, sort };
+            if (persistSort) {
+                const newAst = { ...baseAst };
+                if (!newAst.orderby) {
+                    newAst.orderby = [];
+                }
+                const existingSortIndex = newAst.orderby.findIndex((item) => (0, astFilterProcessing_1.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((0, util_1.deepCopy)(newAst));
+                fetchReportFromASTHelper(newAst, newAst.where);
+            }
+            else {
+                handleRunQuery(updatedProcessing, true);
+            }
+            setCurrentProcessing(updatedProcessing);
+            setPreviousPage(0);
         }
-        const updatedProcessing = { page: REPORT_BUILDER_PAGINATION, sort };
-        handleRunQuery(updatedProcessing, true);
-        setCurrentProcessing(updatedProcessing);
-        setPreviousPage(0);
     };
     const onFilterPreviewChange = (preview) => {
         setChartBuilderInFilteredPreview(preview);
-        // handleRunQuery(currentProcessing, true, preview);
+        if (preview) {
+            fetchFilteredRows(activeQuery);
+        }
     };
     const fetchRowCount = async (processing, includeFilters) => {
         if (!client || !activeQuery) {
@@ -802,38 +727,45 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         }
         setRowCountIsLoading(false);
     };
-    const fetchFilteredRows = async (query) => {
-        const filteredTableInfo = await (0, tableProcessing_1.fetchResultsByQuery)(query, client, currentProcessing, schemaData.customFields, specificDashboardFilters, tempReport.dateField, true);
+    const fetchFilteredRows = async (query, processing, resetRows = true) => {
+        setFilteredTableIsLoading(true);
+        const filteredTableInfo = await (0, tableProcessing_1.fetchResultsByQuery)(query, client, processing ?? filteredProcessing, schemaData.customFields, specificDashboardFilters, tempReport.dateField, resetRows ? false : true);
         if (filteredTableInfo.error) {
             throw new Error(filteredTableInfo.error);
         }
-        setFilteredRows([...filteredRows, ...filteredTableInfo.rows]);
+        if (resetRows) {
+            setFilteredRows(filteredTableInfo.rows);
+        }
+        else {
+            setFilteredRows((filteredRows) => [
+                ...filteredRows,
+                ...filteredTableInfo.rows,
+            ]);
+        }
+        if (resetRows) {
+            setFilteredRowCount(filteredTableInfo.rowCount ?? 0);
+        }
+        setFilteredTableIsLoading(false);
     };
     const handleRunQuery = async (processing, resetRows = false, includeFilters = false) => {
         try {
             setErrorMessage('');
             setTableLoading(true);
             const tableInfo = await (0, tableProcessing_1.fetchResultsByQuery)(activeQuery, client, processing, schemaData.customFields, undefined, undefined, true);
-            const filteredTableInfo = await (0, tableProcessing_1.fetchResultsByQuery)(activeQuery, client, processing, schemaData.customFields, specificDashboardFilters, tempReport.dateField, true);
             if (tableInfo.error) {
                 throw new Error(tableInfo.error);
             }
-            else if (filteredTableInfo.error) {
-                throw new Error(filteredTableInfo.error);
-            }
             else if (tableInfo.rows.length === 0) {
                 throw new Error('No data found');
             }
             fetchRowCount(processing, includeFilters);
             setCurrentProcessing(processing);
             let tempRows = [...rows, ...tableInfo.rows];
-            let tempFilteredRows = [...filteredRows, ...filteredTableInfo.rows];
             if (resetRows) {
                 tempRows = tableInfo.rows;
-                tempFilteredRows = filteredTableInfo.rows;
+                setPreviousPage(0);
             }
             setRows(tempRows);
-            setFilteredRows(tempFilteredRows);
             setFormattedRows((0, report_1.formatRowsFromReport)({ rows: tempRows, columns: tableInfo.columns }));
             setTempReport((tempReport) => ({
                 ...tempReport,
@@ -916,7 +848,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         const prevTable = currentTable;
         const prevOrganization = currentOrganizationId;
         setRows(reportBuilderInfo.rows);
-        setFilteredRows(reportBuilderInfo.rows);
+        setPreviousPage(0);
         if (!(client.databaseType.toLowerCase() === 'bigquery') ||
             (reportBuilderInfo.rows && reportBuilderInfo.rows.length > 0)) {
             setColumns(reportBuilderInfo.columns);
@@ -945,6 +877,27 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
             setLoading(false);
         }
         setReportInfo(reportBuilderInfo.report);
+        const schema = curSchema ?? schemaData.schema;
+        const tableInfo = schema.find((tableInfo) => tableInfo.name === reportBuilderInfo?.table);
+        let query = reportBuilderInfo.query;
+        if (!query && tableInfo) {
+            const ast = baseAst ??
+                (0, astProcessing_1.createBasicSelectASTFromColumns)(tableInfo.columns, reportBuilderInfo.table);
+            const queryResult = await fetchSqlQuery({
+                ...ast,
+                where: curFormData,
+            }, curFormData, false);
+            if (queryResult.error) {
+                console.error(queryResult.error);
+            }
+            else {
+                query = queryResult;
+                setActiveQuery(queryResult);
+            }
+        }
+        else if (query) {
+            setActiveQuery(query);
+        }
         // fetch unique values after everything else since it is the most expensive
         if (prevTable !== reportBuilderInfo.table ||
             !(0, fast_deep_equal_1.default)(prevFormData, curFormData) ||
@@ -954,42 +907,27 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                 if (reportBuilderInfo.pivot) {
                     setUnresolvedReportMessage('Processing pivot selection options...');
                 }
-                const schema = curSchema ?? schemaData.schema;
-                const tableInfo = schema.find((tableInfo) => tableInfo.name === reportBuilderInfo?.table);
-                if (!reportBuilderInfo.table || !tableInfo) {
-                    throw new Error('No table found;');
-                }
-                let query = reportBuilderInfo.query;
-                if (!query) {
-                    const queryResult = await fetchSqlQuery({
-                        ...(0, astProcessing_1.createBasicSelectASTFromColumns)(tableInfo.columns, reportBuilderInfo.table),
-                        where: curFormData,
-                    }, curFormData, false);
-                    if (queryResult.error) {
-                        console.error(queryResult.error);
-                    }
-                    else {
-                        query = queryResult.query;
-                    }
+                if (!tableInfo) {
+                    throw new Error('Table info not found');
                 }
                 const uniqueStrings = await (0, tableProcessing_1.getUniqueStringValues)(tableInfo.columns, reportBuilderInfo.table, client, schemaData.customFields, undefined, true, query);
                 const newUnique = updateUniqueValue(uniqueStrings, reportBuilderInfo.table);
                 let pivotChanged = false;
                 let newPivot;
                 if (reportBuilderInfo.pivot &&
-                    !isValidPivotForReport(reportBuilderInfo.pivot, newUnique)) {
+                    !isValidPivotForReport(reportBuilderInfo.pivot, newUnique, reportBuilderInfo.table, reportBuilderInfo.columns)) {
                     // try flipping row and column field
                     newPivot = {
                         ...reportBuilderInfo.pivot,
                         rowField: reportBuilderInfo.pivot.columnField,
                         columnField: reportBuilderInfo.pivot.rowField,
                     };
-                    if (isValidPivotForReport(newPivot, newUnique)) {
+                    if (isValidPivotForReport(newPivot, newUnique, reportBuilderInfo.table, reportBuilderInfo.columns)) {
                         setPivot(newPivot);
                         pivotChanged = true;
                         setPivotHint('Flipped pivot row and column fields to maintain validity');
                     }
-                    else if (isValidPivotForReport({ ...reportBuilderInfo.pivot, columnField: undefined }, newUnique)) {
+                    else if (isValidPivotForReport({ ...reportBuilderInfo.pivot, columnField: undefined }, newUnique, reportBuilderInfo.table, reportBuilderInfo.columns)) {
                         // try removing column field
                         newPivot = {
                             ...reportBuilderInfo.pivot,
@@ -1025,6 +963,9 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                 return { error: true, message: 'Failed to fetch', rows: [] };
             }
         }
+        else {
+            setLoading(false);
+        }
     };
     const fetchAstFromPromptHelper = async (overridePrompt) => {
         let astInfo = {};
@@ -1036,7 +977,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         try {
             setLoading(true);
             setAskAILoading(true);
-            astInfo = await (0, astProcessing_1.fetchAndProcessASTFromPrompt)(prompt, schemaData.schema, client, pivot, activeQuery);
+            astInfo = await (0, astProcessing_1.fetchAndProcessASTFromPrompt)(prompt, schemaData.schema, client, pivot, activeQuery, currentTable);
             if (astInfo.error) {
                 throw new Error(astInfo.error);
             }
@@ -1066,13 +1007,15 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
         setAskAILoading(false);
         await fetchReportFromASTHelper(astInfo.ast, cleanAst, astInfo.pivot);
     };
-    const isValidPivotForReport = (pivot, uniqueValuesForPivot) => {
-        if (!pivotProcessing_1.isValidPivot) {
+    const isValidPivotForReport = (pivot, uniqueValuesForPivot, reportTable, reportColumns) => {
+        if (!(0, pivotProcessing_1.isValidPivot)(pivot)) {
             return false;
         }
         const uniqueValuesToCheck = uniqueValuesForPivot ?? uniqueValues;
         // check that pivot rows and columns
-        const possibleOptions = (0, pivotProcessing_1.getPossiblePivotFieldOptions)(columns, uniqueValuesToCheck[currentTable] ?? {});
+        const pivotTable = reportTable ?? currentTable;
+        const pivotColumns = reportColumns ?? columns;
+        const possibleOptions = (0, pivotProcessing_1.getPossiblePivotFieldOptions)(pivotColumns, uniqueValuesToCheck[pivotTable] ?? {});
         if (pivot.rowField &&
             pivot.columnField &&
             pivot.rowField === pivot.columnField) {
@@ -1220,13 +1163,11 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                 // delay onClose callback so onClick no-ops
                                                 setTimeout(() => {
                                                     setActiveEditItem(null);
-                                                    setActivePath(null);
                                                     setOpenPopover(null);
                                                 }, 100);
                                             }
                                         }, title: "Select columns", children: (0, jsx_runtime_1.jsx)(AddColumnModal_1.default, { onSave: () => {
                                                 setActiveEditItem(null);
-                                                setActivePath(null);
                                                 setOpenPopover(null);
                                             }, orderedColumnNames: orderedColumnNames, setOrderedColumnNames: setOrderedColumnNames, selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, isSelectedAllColumns: isSelectedAllColumns, clearAllState: clearAllState, nameToColumn: nameToColumn, baseAst: baseAst, setBaseAst: (ast) => {
                                                 if (baseAst &&
@@ -1275,7 +1216,6 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                             setActiveEditItem(newSubtree);
                                                         }
                                                         setOpenPopover('AddFilterPopover');
-                                                        setActivePath('');
                                                     }
                                                 }, label: 'Add filter' }), (0, jsx_runtime_1.jsx)("div", { style: {
                                                     position: 'relative',
@@ -1285,7 +1225,6 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                             // delay onClose callback so onClick no-ops
                                                             setOpenPopover(null);
                                                             setTimeout(() => {
-                                                                setActivePath(null);
                                                                 clearCheckboxes();
                                                                 setActiveEditItem(null);
                                                             }, 300);
@@ -1293,8 +1232,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                     }, popoverTitle: "Add filter", popoverChildren: (0, jsx_runtime_1.jsx)(FilterModal_1.default, { schema: schemaData.schema.find((s) => s.name === currentTable ||
                                                             s.displayName === currentTable) ?? schemaData.schema[0], fieldValuesMap: fieldValuesMap, fieldValuesMapIsLoading: uniqueValuesIsLoading, onSubmitFilter: (filter) => {
                                                             setOpenPopover(null);
-                                                            const item = (0, astFilterProcessing_1.filterToAst)(filter, client.databaseType.toLowerCase());
-                                                            handleInsertion(item, 'AND', false);
+                                                            handleInsertion(filter);
                                                         }, onDeleteFilter: () => { }, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent }) }) })] })] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Pivot" }), (0, jsx_runtime_1.jsx)(PivotModal_1.PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, pivotValueField2: pivotValueField2, setPivotValueField: setPivotValueField, setPivotValueField2: setPivotValueField2, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, CardComponent: CardComponent, SecondaryButtonComponent: SecondaryButtonComponent, PopoverComponent: PopoverComponent, TextComponent: TextComponent, ErrorMessageComponent: ErrorMessageComponent, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, LoadingComponent: LoadingComponent, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEditingPivot, setShowUpdatePivot: setIsEditingPivot, parentRef: parentRef, data: rows, columns: columns, triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
                                             setPivot(null);
                                             setPivotHint('');
@@ -1377,7 +1315,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                         `.${pivot.rowField}`,
                                                         `.${pivot.valueField || 'count'}`,
                                                     ]
-                                                : selectedColumns, setIsPending: () => { }, setEditPopoverKey: () => { }, setActiveEditItem: setActiveEditItem, setActivePath: setActivePath, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover_1.AddSortPopover, handleDelete: async () => {
+                                                : selectedColumns, setIsPending: () => { }, setEditPopoverKey: () => { }, setActiveEditItem: setActiveEditItem, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover_1.AddSortPopover, handleDelete: async () => {
                                                 if (!pivot) {
                                                     setBaseAst((0, util_1.deepCopy)(baseAst));
                                                     fetchSqlQuery((0, util_1.deepCopy)(baseAst));
@@ -1458,12 +1396,12 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                     if (e instanceof Error)
                                                         setPivotError(e.message);
                                                 }
-                                            }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, disabled: tableLoading || loading }, `sort-sentence-pivot`) })), baseAst && baseAst.orderby && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                            }, Select: SelectComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, disabled: tableLoading || loading }, `sort-sentence-pivot`) })), baseAst && baseAst.orderby && baseAst.orderby.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'column',
                                             gap: 8,
                                             marginBottom: 12,
-                                        }, children: baseAst.orderby.map((sortData, id) => ((0, jsx_runtime_1.jsx)(AddSortPopover_1.SortSentence, { sortData: sortData, columns: selectedColumns, setIsPending: () => { }, setEditPopoverKey: () => { }, setActiveEditItem: setActiveEditItem, setActivePath: setActivePath, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover_1.AddSortPopover, handleDelete: () => {
+                                        }, children: baseAst.orderby.map((sortData, id) => ((0, jsx_runtime_1.jsx)(AddSortPopover_1.SortSentence, { sortData: sortData, columns: selectedColumns, setIsPending: () => { }, setEditPopoverKey: () => { }, setActiveEditItem: setActiveEditItem, setOpenPopover: setOpenPopover, SortPopover: SortPopoverComponent, EditPopover: AddSortPopover_1.AddSortPopover, handleDelete: () => {
                                                 if (pivot) {
                                                     setPivot({ ...pivot, sort: false });
                                                     setPivotHint('');
@@ -1471,6 +1409,9 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                 }
                                                 const newAst = { ...baseAst };
                                                 newAst.orderby.splice(id, 1);
+                                                if (newAst.orderby.length === 0) {
+                                                    newAst.orderby = null;
+                                                }
                                                 setBaseAst((0, util_1.deepCopy)(newAst));
                                                 fetchSqlQuery((0, util_1.deepCopy)(newAst));
                                             }, onSave: (column, direction) => {
@@ -1502,7 +1443,6 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                     type: direction,
                                                 };
                                                 // look through the columns
-                                                setActivePath(null);
                                                 setOpenPopover(null);
                                                 setBaseAst((0, util_1.deepCopy)(newAst));
                                                 fetchSqlQuery((0, util_1.deepCopy)(newAst));
@@ -1519,7 +1459,6 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                         }, children: (0, jsx_runtime_1.jsx)(PopoverComponent, { isOpen: openPopover === 'AddSortPopover', setIsOpen: (isOpen) => {
                                                 if (!isOpen) {
                                                     setActiveEditItem(null);
-                                                    setActivePath(null);
                                                     setOpenPopover(null);
                                                 }
                                             }, popoverTitle: "Sort by", popoverChildren: (0, jsx_runtime_1.jsx)(AddSortPopover_1.AddSortPopover, { columns: pivot
@@ -1569,7 +1508,6 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                             if (e instanceof Error)
                                                                 setPivotError(e.message);
                                                         }
-                                                        setActivePath(null);
                                                         setOpenPopover(null);
                                                         setBaseAst((0, util_1.deepCopy)(baseAst));
                                                         return;
@@ -1577,12 +1515,20 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                     const newAst = { ...baseAst };
                                                     if (!newAst.orderby)
                                                         newAst.orderby = [];
-                                                    newAst.orderby.push({
-                                                        expr: { type: 'column_ref', column },
-                                                        type: direction,
-                                                    });
+                                                    const existingSortIndex = newAst.orderby.findIndex((item) => (0, astFilterProcessing_1.getFieldFromExpression)(item.expr) === column);
+                                                    if (existingSortIndex !== -1) {
+                                                        newAst.orderby[existingSortIndex] = {
+                                                            expr: { type: 'column_ref', column },
+                                                            type: direction,
+                                                        };
+                                                    }
+                                                    else {
+                                                        newAst.orderby.push({
+                                                            expr: { type: 'column_ref', column },
+                                                            type: direction,
+                                                        });
+                                                    }
                                                     // look through the columns
-                                                    setActivePath(null);
                                                     setOpenPopover(null);
                                                     setBaseAst((0, util_1.deepCopy)(newAst));
                                                     fetchSqlQuery((0, util_1.deepCopy)(newAst));
@@ -1626,7 +1572,6 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                 }, children: (0, jsx_runtime_1.jsx)(PopoverComponent, { isOpen: openPopover === 'AddLimitPopover', setIsOpen: (isOpen) => {
                                                         if (!isOpen) {
                                                             setActiveEditItem(null);
-                                                            setActivePath(null);
                                                             setOpenPopover(null);
                                                         }
                                                     }, popoverTitle: "Add limit", popoverChildren: (0, jsx_runtime_1.jsx)(AddLimitPopover_1.AddLimitPopover, { TextInputComponent: TextInputComponent, Button: ButtonComponent, SecondaryButton: SecondaryButtonComponent, onSave: (limit) => {
@@ -1665,7 +1610,9 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                             label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(c),
                                             field: c,
                                         };
-                                    }), onPageChange: onPageChange, onSortChange: onSortChange, containerStyle: {
+                                    }), onPageChange: onPageChange, onSortChange: (sort) => {
+                                    onSortChange(sort, false, true);
+                                }, containerStyle: {
                                     maxHeight: Math.max(window.innerHeight - 290, 75 + Math.min(Math.max(10, rows.length), 20) * 37),
                                 } })), (0, jsx_runtime_1.jsxs)("div", { style: {
                                     display: 'flex',
@@ -1684,6 +1631,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                                                     fetchAstFromPromptHelper();
                                                 }, label: 'Retry' })] })) : ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' } })), baseAst && dataDisplayed && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [onDiscardChanges && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: onDiscardChanges, label: "Discard changes" })), !hideCopySQL && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { label: isCopying ? 'Copied' : 'Copy SQL', onClick: () => copySQLToClipboard() })), (0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: async () => {
                                                     onSaveChanges && onSaveChanges();
+                                                    fetchFilteredRows(activeQuery);
                                                     setIsChartBuilderOpen(true);
                                                 }, disabled: !!errorMessage ||
                                                     tableLoading ||
@@ -1704,5 +1652,7 @@ SidebarComponent = ui_1.QuillSidebar, ContainerComponent = ui_1.CustomContainer,
                     }
                     : {
                         ...tempReport,
-                    }, rows: chartBuilderInFilteredPreview ? filteredRows : rows, columns: columns, pivot: pivot, query: activeQuery, showTableFormatOptions: showChartBuilderTableFormatOptions, showDateFieldOptions: isAdminEnabled, showAccessControlOptions: isAdminEnabled, isAdmin: isAdminEnabled, title: reportId ? 'Save changes' : 'Add to dashboard', isHorizontalView: true, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: reportId ? onSubmitEditReport : onSubmitCreateReport, destinationDashboard: destinationDashboard, organizationName: organizationName, pivotData: pivotData, initialUniqueValues: uniqueValues[currentTable], initialUniqueValuesIsLoading: uniqueValuesIsLoading, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, CardComponent: CardComponent, ModalComponent: ChartBuilderModalComponent, PopoverComponent: PopoverComponent, TableComponent: TableComponent, DeleteButtonComponent: DeleteButtonComponent, LoadingComponent: LoadingComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, FormContainer: ChartBuilderFormContainer, hideDateRangeFilter: true, buttonLabel: !!reportId ? 'Save changes' : 'Add to dashboard', onClickChartElement: onClickChartElement, rowCount: numberOfRows, onPageChange: onPageChange, onSortChange: onSortChange, onFilterPreviewChange: onFilterPreviewChange, isLoading: tableLoading, isEditingMode: true }))] }));
+                    }, rows: chartBuilderInFilteredPreview ? filteredRows : rows, columns: columns, pivot: pivot, query: activeQuery, showTableFormatOptions: showChartBuilderTableFormatOptions, showDateFieldOptions: isAdminEnabled, showAccessControlOptions: isAdminEnabled, isAdmin: isAdminEnabled, title: reportId ? 'Save changes' : 'Add to dashboard', isHorizontalView: true, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: reportId ? onSubmitEditReport : onSubmitCreateReport, destinationDashboard: destinationDashboard, organizationName: organizationName, pivotData: pivotData, initialUniqueValues: uniqueValues[currentTable], initialUniqueValuesIsLoading: uniqueValuesIsLoading, pivotRecommendationsEnabled: pivotRecommendationsEnabledState, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, CardComponent: CardComponent, ModalComponent: ChartBuilderModalComponent, PopoverComponent: PopoverComponent, TableComponent: TableComponent, DeleteButtonComponent: DeleteButtonComponent, LoadingComponent: LoadingComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, FormContainer: ChartBuilderFormContainer, hideDateRangeFilter: true, buttonLabel: !!reportId ? 'Save changes' : 'Add to dashboard', onClickChartElement: onClickChartElement, rowCount: chartBuilderInFilteredPreview ? filteredRowCount : numberOfRows, onPageChange: onPageChange, onSortChange: onSortChange, onFilterPreviewChange: reportId ? onFilterPreviewChange : undefined, isLoading: chartBuilderInFilteredPreview
+                    ? filteredTableIsLoading
+                    : tableLoading, isEditingMode: true }))] }));
 }