@quillsql/react 2.13.45 → 2.13.46

package/dist/cjs/ReportBuilder.js

@@ -37,6 +37,9 @@ const DraggableColumns_1 = __importDefault(require("./components/ReportBuilder/D
 const AddColumnModal_1 = __importDefault(require("./components/ReportBuilder/AddColumnModal"));
 const reportBuilder_1 = require("./utils/reportBuilder");
 const dataFetcher_1 = require("./utils/dataFetcher");
+const useDashboard_2 = require("./hooks/useDashboard");
+const schema_1 = require("./utils/schema");
+const filterProcessing_1 = require("./utils/filterProcessing");
 /**
  * Quill Report Builder
  *
@@ -108,7 +111,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
     // isChartBuilderHorizontalView: whether the chart builder is in horizontal view mode
     // onClickChartElement: a callback function triggered when a chart element is clicked
     // Contexts
-    const [dashboard] = (0, react_1.useContext)(Context_1.DashboardContext);
+    const { dashboardReports: dashboard } = (0, useDashboard_2.useDashboardReports)(destinationDashboard);
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
     const { dashboards } = (0, useDashboard_1.useDashboards)();
     const destinationDashboardConfig = (0, react_1.useMemo)(() => {
@@ -120,7 +123,10 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                 table.ownerTenantFields?.length === 0 ||
                 table.ownerTenantFields?.includes(destinationDashboardConfig?.tenantKeys?.[0] ?? ''));
         });
-    }, [schemaData.schemaWithCustomFields, destinationDashboardConfig?.tenantKeys]);
+    }, [
+        schemaData.schemaWithCustomFields,
+        destinationDashboardConfig?.tenantKeys,
+    ]);
     const { tenants } = (0, react_1.useContext)(Context_1.TenantContext);
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
@@ -143,6 +149,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
     const [errorMessage, setErrorMessage] = (0, react_1.useState)('');
     const [unresolvedReportMessage, setUnresolvedReportMessage] = (0, react_1.useState)('');
     // Core Report states
+    // Table order matters for joins. For now, assumed to have one 'primary' table (the first one)
     const [tables, setTables] = (0, react_1.useState)([]);
     const [columns, setColumns] = (0, react_1.useState)([]);
     const [filterStack, setFilterStack] = (0, react_1.useState)([]);
@@ -159,10 +166,12 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
             limit,
         };
     }, [columns, filterStack, limit, pivot, sort, tables]);
-    const undoButtonEnabled = false; // TODO: enable
+    // For undo/redo
     const [stateStack, setStateStack] = (0, react_1.useState)([]);
+    const [poppedStateStack, setPoppedStateStack] = (0, react_1.useState)([]);
     // Other Report states
     const [activeQuery, setActiveQuery] = (0, react_1.useState)('');
+    const [queryOutOfSync, setQueryOutOfSync] = (0, react_1.useState)(false);
     const [unfilteredUniqueValues, setUnfilteredUniqueValues] = (0, react_1.useState)({}); // unique values before filtering
     const [unfilteredUniqueValuesIsLoading, setUnfilteredUniqueValuesIsLoading] = (0, react_1.useState)(false);
     const [filteredUniqueValues, setFilteredUniqueValues] = (0, react_1.useState)(null); // unique values after filtering
@@ -225,8 +234,8 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
         if (tables.length === 1) {
             // Check if all columns are selected
             const totalColumnLength = tables.reduce((acc, table) => {
-                const tableColumns = filteredSchema.find((t) => t.name === table.name)
-                    ?.columns.length ?? 0;
+                const tableColumns = filteredSchema.find((t) => t.name === table.name)?.columns.length ??
+                    0;
                 return acc + tableColumns;
             }, 0);
             return totalColumnLength === columns.length;
@@ -245,11 +254,22 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
             return 'Please add a limit.';
         }
     }, [client, limit, pivot]);
+    const foreignKeyMap = (0, react_1.useMemo)(() => {
+        return (0, schema_1.getSchemaForeignKeyMapping)(filteredSchema);
+    }, [filteredSchema]);
     // State changing functions
-    const clearAllState = () => {
+    const clearAllState = (resetStateStack = true) => {
         setActiveQuery('');
-        handleMultiStateChange(ReportBuilder_1.EMPTY_REPORT_BUILDER_STATE);
-        setStateStack([]);
+        setQueryOutOfSync(false);
+        handleMultiStateChange({
+            state: ReportBuilder_1.EMPTY_REPORT_BUILDER_STATE,
+            fetchData: false,
+            updateStateStack: true,
+        });
+        if (resetStateStack) {
+            setStateStack([]);
+            setPoppedStateStack([]);
+        }
         setFilteredUniqueValues(null);
         setUnfilteredUniqueValues({});
         setColumnUniqueValues({});
@@ -292,54 +312,99 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                 ...prevStack,
                 { ...reportBuilderState, tables: newTables },
             ]);
+            setPoppedStateStack([]);
         }
     };
-    const handleColumnsChange = (newColumns, fetchData, updateStateStack = true) => {
-        // If pivot is using removed columns, remove pivot
-        let removePivot = false;
-        if (pivot) {
-            const referencedColumns = [];
-            if (pivot.rowField) {
-                referencedColumns.push(pivot.rowField);
-            }
-            if (pivot.columnField) {
-                referencedColumns.push(pivot.columnField);
+    const handleColumnsChange = (newColumns, fetchData, updateStateStack = true, bypassConfirmation = false) => {
+        const validReportBuilderState = bypassConfirmation
+            ? { ...reportBuilderState, columns: newColumns }
+            : (0, reportBuilder_1.validatedReportBuilderState)({
+                ...reportBuilderState,
+                columns: newColumns,
+            }, foreignKeyMap);
+        if (validReportBuilderState.tables.length === 0 && !bypassConfirmation) {
+            if (!confirm('Removing all columns will clear all state. Are you sure you want to continue?')) {
+                return;
             }
-            if (pivot.aggregations) {
-                pivot.aggregations.forEach((agg) => {
-                    if (agg.valueField) {
-                        referencedColumns.push(agg.valueField);
-                    }
-                    if (agg.valueField2) {
-                        referencedColumns.push(agg.valueField2);
-                    }
+            else {
+                handleMultiStateChange({
+                    state: ReportBuilder_1.EMPTY_REPORT_BUILDER_STATE,
+                    fetchData: false,
+                    updateStateStack: true,
                 });
+                return;
             }
-            const columnMapping = referencedColumns
-                .map((col) => {
-                const column = columns.find((c) => (c.alias || c.field) === col);
-                return column;
-            })
-                .filter((c) => c !== undefined);
-            removePivot = !columnMapping.every((col) => newColumns.some((c) => (c.alias || c.field) === (col.alias || col.field) &&
-                c.table === col.table));
-            if (removePivot) {
-                handlePivotChange(null);
+        }
+        const tablesAffected = tables.length - validReportBuilderState.tables.length >= 2;
+        const filtersAffected = validReportBuilderState.filterStack.length !== filterStack.length;
+        const deletedTables = tables
+            .filter((table) => {
+            return !validReportBuilderState.tables.some((t) => t.name === table.name);
+        })
+            .map((table) => table.name);
+        const deletedFilters = filterStack
+            .filter((filter) => filter.value)
+            .filter((filter) => {
+            return deletedTables.some((table) => table === filter.value.table);
+        })
+            .map((filter) => (0, filterProcessing_1.filterSentence)(filter.value));
+        if (tablesAffected && filtersAffected) {
+            if (!confirm(`Removing this column will remove the following table${deletedTables.length > 1 ? 's' : ''}:
+          ${deletedTables.join(', ')}.
+          It will also remove the following filter${deletedFilters.length > 1 ? 's' : ''}:
+          ${deletedFilters.join(', ')}.
+          Are you sure you want to continue?
+          `
+                .replace(/\s+/g, ' ')
+                .trim())) {
+                return;
+            }
+        }
+        else if (tablesAffected) {
+            if (!confirm(`Removing this column will remove the following table${deletedTables.length > 1 ? 's' : ''}:
+          ${deletedTables.join(', ')}.
+          Are you sure you want to continue?
+          `
+                .replace(/\s+/g, ' ')
+                .trim())) {
+                return;
+            }
+        }
+        else if (filtersAffected) {
+            if (!confirm(`Removing this column will remove the following filter${deletedFilters.length > 1 ? 's' : ''}:
+          ${deletedFilters.join(', ')}.
+          Are you sure you want to continue?
+          `
+                .replace(/\s+/g, ' ')
+                .trim())) {
+                return;
             }
         }
-        setColumns(newColumns);
+        if (validReportBuilderState.tables.length !== tables.length) {
+            handleTablesChange(validReportBuilderState.tables, false);
+            fetchData = true;
+        }
+        if (validReportBuilderState.filterStack.length !== filterStack.length) {
+            handleFilterStackChange(validReportBuilderState.filterStack, false, false);
+            fetchData = true;
+        }
+        if (validReportBuilderState.sort.length !== sort.length) {
+            handleSortChange(validReportBuilderState.sort, false, false);
+            fetchData = true;
+        }
+        if (pivot && !validReportBuilderState.pivot) {
+            handlePivotChange(validReportBuilderState.pivot, false, false);
+        }
+        setColumns(validReportBuilderState.columns);
         if (updateStateStack) {
-            setStateStack((prevStack) => [
-                ...prevStack,
-                { ...reportBuilderState, columns: newColumns },
-            ]);
+            setStateStack((prevStack) => [...prevStack, validReportBuilderState]);
+            setPoppedStateStack([]);
         }
         if (fetchData) {
-            fetchDataFromReportBuilderState({
-                ...reportBuilderState,
-                columns: newColumns,
-                pivot: removePivot ? null : pivot,
-            });
+            fetchDataFromReportBuilderState(validReportBuilderState);
+        }
+        else {
+            setQueryOutOfSync(true);
         }
     };
     const handleFilterInsertion = (newFilter) => {
@@ -373,6 +438,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                 ...prevStack,
                 { ...reportBuilderState, filterStack: newFilterStack },
             ]);
+            setPoppedStateStack([]);
         }
         if (fetchData) {
             fetchDataFromReportBuilderState({
@@ -409,6 +475,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                     limit: resetSortAndLimit ? null : limit,
                 },
             ]);
+            setPoppedStateStack([]);
         }
         if (fetchData) {
             fetchDataFromReportBuilderState({
@@ -464,6 +531,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                 ...prevStack,
                 { ...reportBuilderState, sort: newSort },
             ]);
+            setPoppedStateStack([]);
         }
         if (fetchData) {
             fetchDataFromReportBuilderState({
@@ -479,6 +547,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                 ...prevStack,
                 { ...reportBuilderState, limit: newLimit },
             ]);
+            setPoppedStateStack([]);
         }
         if (fetchData) {
             fetchDataFromReportBuilderState({
@@ -487,12 +556,12 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
             });
         }
     };
-    const handleMultiStateChange = (state, fetchData, updateStateStack = true) => {
+    const handleMultiStateChange = ({ state, fetchData, updateStateStack = true, report, }) => {
         if (state.tables !== undefined) {
             handleTablesChange(state.tables, false);
         }
         if (state.columns !== undefined) {
-            handleColumnsChange(state.columns, false, false);
+            handleColumnsChange(state.columns, false, false, true);
         }
         if (state.filterStack !== undefined) {
             handleFilterStackChange(state.filterStack, false, false);
@@ -511,9 +580,10 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                 ...prevStack,
                 { ...reportBuilderState, ...state },
             ]);
+            setPoppedStateStack([]);
         }
         if (fetchData) {
-            fetchDataFromReportBuilderState({ ...reportBuilderState, ...state }, !!state.filterStack, !!state.tables);
+            fetchDataFromReportBuilderState({ ...reportBuilderState, ...state }, !!state.filterStack, !!state.tables, report);
         }
     };
     const handleUndo = () => {
@@ -521,10 +591,33 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
             return;
         }
         const previousState = stateStack[stateStack.length - 2];
+        setPoppedStateStack((prevStack) => [
+            ...prevStack,
+            stateStack[stateStack.length - 1],
+        ]);
         setStateStack((prevStack) => prevStack.slice(0, -1));
-        handleMultiStateChange(previousState, true, false);
+        // Only fetch data if the previous state has columns
+        handleMultiStateChange({
+            state: previousState,
+            fetchData: previousState.columns.length > 0,
+            updateStateStack: false,
+        });
+    };
+    const handleRedo = () => {
+        if (poppedStateStack.length === 0) {
+            return;
+        }
+        const lastState = poppedStateStack[poppedStateStack.length - 1];
+        setStateStack((prevStack) => [...prevStack, lastState]);
+        setPoppedStateStack((prevStack) => prevStack.slice(0, -1));
+        // Only fetch data if the last state has columns
+        handleMultiStateChange({
+            state: lastState,
+            fetchData: lastState.columns.length > 0,
+            updateStateStack: false,
+        });
     };
-    const fetchDataFromReportBuilderState = (state, filtersChanged, tablesChanged) => {
+    const fetchDataFromReportBuilderState = (state, filtersChanged, tablesChanged, report) => {
         if (!client) {
             return;
         }
@@ -532,11 +625,12 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
         fetchReportFromASTHelper({
             ast,
             pivot: state.pivot,
+            previousReport: report,
             requiresNewFilteredUniqueValues: filtersChanged,
             requiresNewUnfilteredUniqueValues: tablesChanged,
         });
     };
-    const fetchReportFromASTHelper = async ({ ast, pivot, previousReport, requiresNewFilteredUniqueValues = false, requiresNewUnfilteredUniqueValues = false, }) => {
+    const fetchReportFromASTHelper = async ({ ast, pivot, previousReport = tempReport, requiresNewFilteredUniqueValues = false, requiresNewUnfilteredUniqueValues = false, }) => {
         let reportBuilderInfo = undefined;
         setErrorMessage('');
         const schema = filteredSchema;
@@ -598,6 +692,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
             pagination: REPORT_BUILDER_PAGINATION,
         });
         setActiveQuery(reportBuilderInfo.query);
+        setQueryOutOfSync(false);
         // table data
         fetchRowCountFromAST(ast, ast.where);
         setReportRows(reportBuilderInfo.rows);
@@ -740,7 +835,10 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
         }
         setAskAILoading(false);
         const newState = (0, reportBuilder_1.astToReportBuilderState)(astInfo.ast, client.databaseType || 'postgresql', filteredSchema);
-        handleMultiStateChange({ ...newState, pivot: astInfo.pivot }, true);
+        handleMultiStateChange({
+            state: { ...newState, pivot: astInfo.pivot },
+            fetchData: true,
+        });
     };
     const fetchGlobalUniqueValues = async (columns, tables) => {
         if (!client) {
@@ -759,6 +857,15 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
         setUnfilteredUniqueValues(uniqueStrings);
         setUnfilteredUniqueValuesIsLoading(false);
     };
+    const fetchQueryFromReportBuilderState = async (state) => {
+        if (!client) {
+            return '';
+        }
+        const ast = (0, reportBuilder_1.reportBuilderStateToAst)(state, client.databaseType?.toLowerCase() || 'postgresql');
+        const query = await (0, dataFetcher_1.fetchSqlQuery)(ast, client);
+        setActiveQuery(query.query);
+        return query.query;
+    };
     const resetProcessing = () => {
         setCurrentProcessing({ page: REPORT_BUILDER_PAGINATION });
         setPreviousPage(0);
@@ -949,9 +1056,13 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                 const initialState = (0, reportBuilder_1.astToReportBuilderState)(newAst, client.databaseType || 'postgresql', filteredSchema);
                 setTempReport(report);
                 handleMultiStateChange({
-                    ...initialState,
-                    pivot: newPivot ?? null,
-                }, true);
+                    state: {
+                        ...initialState,
+                        pivot: newPivot ?? null,
+                    },
+                    fetchData: true,
+                    report,
+                });
             }
             catch (err) {
                 console.error(err);
@@ -969,13 +1080,16 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
             })?.columns ?? [];
             if (tableColumns.length > 0) {
                 handleMultiStateChange({
-                    ...ReportBuilder_1.EMPTY_REPORT_BUILDER_STATE,
-                    tables: [{ name: initialTableName }],
-                    columns: tableColumns.map((col) => ({
-                        field: col.field,
-                        table: initialTableName,
-                    })),
-                }, true);
+                    state: {
+                        ...ReportBuilder_1.EMPTY_REPORT_BUILDER_STATE,
+                        tables: [{ name: initialTableName }],
+                        columns: tableColumns.map((col) => ({
+                            field: col.field,
+                            table: initialTableName,
+                        })),
+                    },
+                    fetchData: true,
+                });
             }
         }
     }, [filteredSchema, initialTableName]);
@@ -1005,14 +1119,15 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                                             }
                                         }, title: "Select columns", children: (0, jsx_runtime_1.jsx)(AddColumnModal_1.default, { onSave: (tables, columns) => {
                                                 handleMultiStateChange({
-                                                    ...ReportBuilder_1.EMPTY_REPORT_BUILDER_STATE,
-                                                    tables,
-                                                    columns,
-                                                }, true);
+                                                    state: {
+                                                        ...ReportBuilder_1.EMPTY_REPORT_BUILDER_STATE,
+                                                        tables,
+                                                        columns,
+                                                    },
+                                                    fetchData: true,
+                                                });
                                                 setOpenPopover(null);
-                                            }, 
-                                            // selectedTables={tables} // Bring back after select table join UI
-                                            selectedColumns: columns, schema: filteredSchema, schemaLoading: schemaData.isSchemaLoading, TextInputComponent: TextInputComponent, SelectColumn: SelectColumnComponent, SecondaryButton: SecondaryButtonComponent, Button: ButtonComponent, ColumnSearchEmptyState: ColumnSearchEmptyState, LoadingComponent: LoadingComponent }) })] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Filters" }), filterStack.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                            }, selectedTables: tables, selectedColumns: columns, schema: filteredSchema, foreignKeyMap: foreignKeyMap, schemaLoading: schemaData.isSchemaLoading, TextInputComponent: TextInputComponent, SelectColumn: SelectColumnComponent, SecondaryButton: SecondaryButtonComponent, Button: ButtonComponent, ColumnSearchEmptyState: ColumnSearchEmptyState, LoadingComponent: LoadingComponent }) })] }), (0, jsx_runtime_1.jsxs)("div", { style: { width: '100%' }, children: [(0, jsx_runtime_1.jsx)(SidebarHeadingComponent, { label: "Filters" }), filterStack.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'column',
                                             gap: 8,
@@ -1134,7 +1249,7 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                                                     if (tables.length <= 1) {
                                                         fetchAstFromPromptHelper();
                                                     }
-                                                }, isLoading: askAILoading && columns.length === 0, label: 'Ask AI' }) }), !reportId && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { label: 'New report', onClick: clearAllState, disabled: columns.length === 0 || loading }))] }) })), columns.length > 0 && ((0, jsx_runtime_1.jsx)(TableComponent, { isLoading: tableLoading || (loading && errorMessage.length === 0), rows: formattedRows, rowCount: pivot ? pivotData?.rowCount : numberOfRows, rowCountIsLoading: rowCountIsLoading, rowsPerPage: 20, columns: pivot
+                                                }, isLoading: askAILoading && columns.length === 0, label: 'Ask AI' }) }), !reportId && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { label: 'New report', onClick: () => clearAllState(false), disabled: columns.length === 0 || loading }))] }) })), columns.length > 0 && ((0, jsx_runtime_1.jsx)(TableComponent, { isLoading: tableLoading || (loading && errorMessage.length === 0), rows: formattedRows, rowCount: pivot ? pivotData?.rowCount : numberOfRows, rowCountIsLoading: rowCountIsLoading, rowsPerPage: 20, columns: pivot
                                     ? pivotData?.columns || []
                                     : reportColumnsToStateColumns.map((col) => {
                                         return {
@@ -1161,7 +1276,12 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                                             alignItems: 'center',
                                         }, children: [(0, jsx_runtime_1.jsx)(ErrorMessageComponent, { errorMessage: errorMessage || pivotError }), (0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => {
                                                     fetchAstFromPromptHelper();
-                                                }, label: 'Retry' }), (0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: clearAllState, label: 'Reset' })] })) : ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' } })), columns.length > 0 && activeQuery && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [undoButtonEnabled && stateStack.length > 1 && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: handleUndo, label: "Undo", disabled: stateStack.length <= 1 || loading })), 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() })), !isAdminEnabled ? null : ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: async () => {
+                                                }, label: 'Retry' }), (0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => clearAllState(false), label: 'Reset' })] })) : ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' } })), stateStack.length > 0 && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: handleUndo, label: "", icon: (0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", strokeWidth: 1.5, stroke: "currentColor", className: "size-6", children: (0, jsx_runtime_1.jsx)("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M9 15 3 9m0 0 6-6M3 9h12a6 6 0 0 1 0 12h-3" }) }), disabled: stateStack.length <= 1 || loading })), stateStack.length > 0 && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: handleRedo, label: "", icon: (0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", strokeWidth: 1.5, stroke: "currentColor", className: "size-6", children: (0, jsx_runtime_1.jsx)("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "m15 15 6-6m0 0-6-6m6 6H9a6 6 0 0 0 0 12h3" }) }), disabled: poppedStateStack.length < 1 || loading })), columns.length > 0 && activeQuery && ((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() })), !isAdminEnabled ? null : ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: async () => {
+                                                    let tempReportQuery = activeQuery;
+                                                    if (queryOutOfSync) {
+                                                        tempReportQuery =
+                                                            await fetchQueryFromReportBuilderState(reportBuilderState);
+                                                    }
                                                     const tempReportColumns = columns
                                                         .map((column) => {
                                                         return reportColumnsToStateColumns.find((col) => col.field === (column.alias || column.field));
@@ -1199,8 +1319,8 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                                                                 })
                                                             : tempReportColumns,
                                                         queryString: isSelectStar
-                                                            ? (0, convert_1.convertQueryToSelectStar)(activeQuery)
-                                                            : activeQuery,
+                                                            ? (0, convert_1.convertQueryToSelectStar)(tempReportQuery)
+                                                            : tempReportQuery,
                                                         includeCustomFields: isSelectStar,
                                                         rows: reportRows,
                                                         pivotRows: pivotData?.rows,
@@ -1216,6 +1336,11 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                                                     tableLoading ||
                                                     loading ||
                                                     !!unresolvedReportMessage, label: 'Save query', tooltipText: unresolvedReportMessage })), (0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: async () => {
+                                                    let tempReportQuery = activeQuery;
+                                                    if (queryOutOfSync) {
+                                                        tempReportQuery =
+                                                            await fetchQueryFromReportBuilderState(reportBuilderState);
+                                                    }
                                                     onSaveChanges && onSaveChanges();
                                                     const tempReportColumns = columns
                                                         .map((column) => {
@@ -1254,8 +1379,8 @@ function ReportBuilder({ initialTableName = '', onSubmitEditReport = () => void
                                                                 })
                                                             : tempReportColumns,
                                                         queryString: isSelectStar
-                                                            ? (0, convert_1.convertQueryToSelectStar)(activeQuery)
-                                                            : activeQuery,
+                                                            ? (0, convert_1.convertQueryToSelectStar)(tempReportQuery)
+                                                            : tempReportQuery,
                                                         includeCustomFields: isSelectStar,
                                                         rows: reportRows,
                                                         pivotRows: pivotData?.rows,

package/dist/cjs/Table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/Table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EACZ,WAAW,EACX,SAAS,EAIV,MAAM,OAAO,CAAC;AASf,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAuB,MAAM,EAAc,MAAM,iBAAiB,CAAC;AAK1E,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAI9C,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAyDD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;IAEhC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IAEJ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,qEAAqE;IACrE,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAErC,oDAAoD;IACpD,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAE/D,0DAA0D;IAC1D,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,GAAG,CAAC,OAAO,CAAC;IAEzE,+DAA+D;IAC/D,wBAAwB,CAAC,EAAE,CAAC,EAC1B,SAAS,EACT,KAAK,EACL,aAAa,EACb,MAAM,EACN,WAAW,EACX,iBAAiB,EACjB,cAAc,GACf,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE;YAAE,SAAS,EAAE,IAAI,CAAC;YAAC,OAAO,EAAE,IAAI,CAAA;SAAE,CAAC;QAC9C,aAAa,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAClD,iBAAiB,EAAE,CAAC,EAClB,SAAS,EACT,OAAO,GACR,EAAE;YACD,SAAS,EAAE,IAAI,CAAC;YAChB,OAAO,EAAE,IAAI,CAAC;SACf,KAAK,IAAI,CAAC;QACX,cAAc,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;KACjE,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB,cAAc,CAAC,EAAE,CAAC,EAChB,MAAM,EACN,OAAO,EACP,YAAY,EACZ,SAAS,EACT,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,YAAY,GACb,EAAE;QACD,MAAM,EAAE,WAAW,CAAC;QACpB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;QACxC,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,GAAG,CAAC,OAAO,CAAC;QACpD,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,KAAK,IAAI,CAAC;QACpE,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB,wEAAwE;IACxE,wBAAwB,CAAC,EAAE,CAAC,EAC1B,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,SAAS,CAAC;KACrB,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAErC,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,QAAA,MAAM,KAAK,iCAAsD,UAAU,mDA2F1E,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/Table.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/Table.js

@@ -57,8 +57,8 @@ const Table = ({ TableComponent = TableComponent_1.default, ...props }) => {
     reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
     const specificReportFilters = (0, react_1.useMemo)(() => {
         return Object.values(reportFilters[props.reportId ?? ''] ??
-            (dashboard[props.reportId ?? '']
-                ? dashboardFilters[dashboard[props.reportId ?? '']?.dashboardName ?? '']
+            (dashboard[report?.dashboardName ?? '']?.[report?.id ?? '']
+                ? dashboardFilters[report.dashboardName]
                 : null) ??
             {}).map((f) => f.filter);
     }, [reportFilters[props.reportId ?? '']]);
@@ -77,6 +77,6 @@ const Table = ({ TableComponent = TableComponent_1.default, ...props }) => {
     }
     return ((0, jsx_runtime_1.jsx)(DataLoader_1.default, { item: report, filters: specificReportFilters, userFilters: userFilters?.map(Filter_1.convertCustomFilter), additionalProcessing: {
             page: paginationProcessing_1.DEFAULT_PAGINATION,
-        }, reportMode: true, children: ({ isLoading, error, onPageChange, onSortChange, data, rowCount, rowCountIsLoading, }) => (0, jsx_runtime_1.jsx)(TableComponent, { report: data, isLoading: isLoading, error: error, rowCount: rowCount ?? data?.rowCount ?? data?.rows?.length ?? 0, rowCountIsLoading: rowCountIsLoading, onPageChange: (page) => onPageChange(page), onSortChange: (sort) => onSortChange(sort), hideName: true }) }));
+        }, children: ({ isLoading, error, onPageChange, onSortChange, data, rowCount, rowCountIsLoading, }) => (0, jsx_runtime_1.jsx)(TableComponent, { report: data, isLoading: isLoading, error: error, rowCount: rowCount ?? data?.rowCount ?? data?.rows?.length ?? 0, rowCountIsLoading: rowCountIsLoading, onPageChange: (page) => onPageChange(page), onSortChange: (sort) => onSortChange(sort), hideName: true }) }));
 };
 exports.default = Table;

package/dist/cjs/components/Chart/BarChart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BarChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/BarChart.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAC/B,MAAM,EACN,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,cAAc,EACd,SAAS,EACT,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAU,EACV,SAAS,EACT,iBAAwB,EACxB,SAAiB,EACjB,SAAiB,EACjB,iBAAyB,EACzB,mBAAmB,EACnB,UAAU,EACV,cAAc,GACf,EAAE;IACD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,UAAU,CAAC;IACxB,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,cAAc,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAA;KAAC,EAAE,CAAC;CACrD,2CAkNA"}
+{"version":3,"file":"BarChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/BarChart.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAC/B,MAAM,EACN,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,cAAc,EACd,SAAS,EACT,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAU,EACV,SAAS,EACT,iBAAwB,EACxB,SAAiB,EACjB,SAAiB,EACjB,iBAAyB,EACzB,mBAAmB,EACnB,UAAU,EACV,cAAc,GACf,EAAE;IACD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,UAAU,CAAC;IACxB,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,cAAc,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAA;KAAC,EAAE,CAAC;CACrD,2CAiNA"}

package/dist/cjs/components/Chart/BarChart.js

@@ -35,7 +35,6 @@ function BarChart({ colors, colorMap, yAxisFields, data, containerStyle, classNa
                 display: 'flex',
                 flex: '1 0 auto',
                 height: '100%',
-                margin: 'auto',
                 justifyContent: 'center',
                 alignItems: 'center',
                 fontSize: 13,
@@ -46,7 +45,7 @@ function BarChart({ colors, colorMap, yAxisFields, data, containerStyle, classNa
     return ((0, jsx_runtime_1.jsx)("div", { style: {
             boxSizing: 'content-box',
             ...containerStyle,
-        }, className: className, children: (0, jsx_runtime_1.jsx)(recharts_1.ResponsiveContainer, { width: "100%", height: "100%", children: (0, jsx_runtime_1.jsxs)(recharts_1.BarChart, { data: data ?? [], layout: 'horizontal', onClick: (event) => onClickChartElement
+        }, className: className, children: (0, jsx_runtime_1.jsx)(recharts_1.ResponsiveContainer, { width: "100%", height: "100%", minWidth: 0, minHeight: 0, children: (0, jsx_runtime_1.jsxs)(recharts_1.BarChart, { data: data ?? [], layout: 'horizontal', onClick: (event) => onClickChartElement
                     ? onClickChartElement(event?.activePayload
                         ? event.activePayload[0].payload
                         : undefined)

package/dist/cjs/components/Chart/GaugeChart.js

@@ -138,7 +138,7 @@ function D3Gauge({ percentage, containerStyle, xAxisFormat, colors, isAnimationA
         const gaugeHeight = Math.min(ch, cw / 1.2);
         const gaugeWidth = gaugeHeight * 1.2;
         const radius = gaugeHeight / 2;
-        const innerRadius = radius * 0.65;
+        const innerRadius = radius * 0.6;
         // const arcWidth = radius - innerRadius;
         // Vertical offset to visually center the 270° arc.
         const verticalOffset = gaugeHeight * 0.05;

package/dist/cjs/components/Chart/LineChart.js

@@ -78,7 +78,7 @@ function LineChart({ colors, colorMap = {}, yAxisFields, data, containerStyle, c
             return sum + 1;
         return sum;
     }, 0);
-    return ((0, jsx_runtime_1.jsx)("div", { style: { ...containerStyle }, className: className, children: (0, jsx_runtime_1.jsx)(recharts_1.ResponsiveContainer, { width: "100%", height: '100%', children: (0, jsx_runtime_1.jsxs)(recharts_1.ComposedChart, { data: formattedData, onClick: (event) => onClickChartElement(event?.activePayload ? event.activePayload[0].payload : undefined), children: [!hideCartesianGrid && ((0, jsx_runtime_1.jsx)(recharts_1.CartesianGrid, { horizontal: !hideHorizontalCartesianGrid, vertical: !hideVerticalCartesianGrid, stroke: cartesianGridLineColor ?? '#e5e7eb', strokeDasharray: cartesianGridLineStyle === 'dashed' ? '5 5' : undefined })), (0, jsx_runtime_1.jsx)(recharts_1.XAxis, { dataKey: xAxisField, hide: hideXAxis, tick: { transform: 'translate(0, 6)' }, style: {
+    return ((0, jsx_runtime_1.jsx)("div", { style: { ...containerStyle }, className: className, children: (0, jsx_runtime_1.jsx)(recharts_1.ResponsiveContainer, { width: "100%", height: '100%', minWidth: 0, minHeight: 0, children: (0, jsx_runtime_1.jsxs)(recharts_1.ComposedChart, { data: formattedData, onClick: (event) => onClickChartElement(event?.activePayload ? event.activePayload[0].payload : undefined), children: [!hideCartesianGrid && ((0, jsx_runtime_1.jsx)(recharts_1.CartesianGrid, { horizontal: !hideHorizontalCartesianGrid, vertical: !hideVerticalCartesianGrid, stroke: cartesianGridLineColor ?? '#e5e7eb', strokeDasharray: cartesianGridLineStyle === 'dashed' ? '5 5' : undefined })), (0, jsx_runtime_1.jsx)(recharts_1.XAxis, { dataKey: xAxisField, hide: hideXAxis, tick: { transform: 'translate(0, 6)' }, style: {
                             fontSize: '12px',
                             fontFamily: theme?.chartLabelFontFamily ||
                                 theme?.fontFamily ||

package/dist/cjs/components/Chart/MapChart.js

@@ -406,7 +406,7 @@ function USMap({ theme, data, xAxisField, xAxisFormat, yAxisFields, onClickChart
     return ((0, jsx_runtime_1.jsxs)("div", { ref: containerRef, className: className, style: {
             width: "100%",
             height: "auto",
-            marginTop: '-5%',
+            marginTop: '-6.5%',
             zIndex: 0,
             ...containerStyle,
             position: "relative",

package/dist/cjs/components/Chart/PieChart.js

@@ -204,7 +204,7 @@ const PieChartWrapper = react_1.default.forwardRef((props, ref) => {
             justifyContent: 'center',
             boxSizing: 'content-box',
             ...containerStyle,
-        }, ...other, children: (0, jsx_runtime_1.jsx)(recharts_1.ResponsiveContainer, { width: "100%", height: "100%", children: (0, jsx_runtime_1.jsxs)(recharts_1.PieChart, { children: [(0, jsx_runtime_1.jsx)(recharts_1.Pie, { data: (0, exports.parseData)(data, (colorMap[category] &&
+        }, ...other, children: (0, jsx_runtime_1.jsx)(recharts_1.ResponsiveContainer, { width: "100%", height: "100%", minWidth: 0, minHeight: 0, children: (0, jsx_runtime_1.jsxs)(recharts_1.PieChart, { children: [(0, jsx_runtime_1.jsx)(recharts_1.Pie, { data: (0, exports.parseData)(data, (colorMap[category] &&
                             colorMap[category]['primary'] &&
                             (0, color_1.generateArrayFromColor)(colorMap[category]['primary'], data.length)) ??
                             (colors.length >= data.length

package/dist/cjs/components/Dashboard/DashboardFilter.js

@@ -19,10 +19,12 @@ function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect
             const presetRange = filter.presetRanges?.find((range) => range.value === (filter.preset?.value ?? filter.primaryRange.value)) ?? dateRangePickerUtils_1.PRIMARY_RANGE[filter.preset?.value ?? filter.primaryRange.value];
             if (!presetRange)
                 return filter.preset?.value ?? filter.primaryRange.value;
-            if (presetRange.startDate !== filter.startDate ||
-                presetRange.endDate !== filter.endDate) {
-                return '';
-            }
+            // if (
+            //   presetRange.startDate !== filter.startDate ||
+            //   presetRange.endDate !== filter.endDate
+            // ) {
+            //   return '';
+            // }
             return filter.preset?.value ?? filter.primaryRange.value;
         }
         return '';

package/dist/cjs/components/Dashboard/DashboardSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DashboardSection.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DashboardSection.tsx"],"names":[],"mappings":"AAEA,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,OAAO,EACP,QAAQ,GACT,EAAE,8BAA8B,GAAG,GAAG,CAAC,OAAO,CAoC9C"}
+{"version":3,"file":"DashboardSection.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DashboardSection.tsx"],"names":[],"mappings":"AAEA,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,OAAO,EACP,QAAQ,GACT,EAAE,8BAA8B,GAAG,GAAG,CAAC,OAAO,CAmC9C"}

package/dist/cjs/components/Dashboard/DashboardSection.js

@@ -12,7 +12,6 @@ function DashboardSection({ section, children, }) {
                         fontFamily: theme?.fontFamily,
                         fontWeight: 'bold',
                         marginTop: 20,
-                        marginBottom: -20,
                         textAlign: 'left',
                     }, children: section }) })), (0, jsx_runtime_1.jsx)("div", { style: {
                     boxSizing: 'content-box',