@quillsql/react 2.13.24 → 2.13.26

package/dist/esm/SQLEditor.js

@@ -3,12 +3,13 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 import { useState, useContext, useEffect, useRef, useMemo, useCallback, } from 'react';
 import MonacoEditor from '@monaco-editor/react';
-import { ClientContext, DashboardFiltersContext, SchemaDataContext, ThemeContext, } from './Context';
+import { ClientContext, DashboardContext, DashboardFiltersContext, SchemaDataContext, ThemeContext, } from './Context';
 import { getDataFromCloud } from './utils/dataFetcher';
 import { ChartBuilderWithModal, createInitialFormData } from './ChartBuilder';
 import { MemoizedButton, MemoizedDeleteButton, MemoizedHeader, MemoizedLabel, MemoizedModal, MemoizedPopover, MemoizedSecondaryButton, MemoizedSubHeader, MemoizedText, OverflowContainer, QuillChartBuilderFormContainer, QuillChartBuilderInputColumnContainer, QuillChartBuilderInputRowContainer, QuillErrorMessageComponent, QuillLoadingComponent, QuillPivotColumnContainer, QuillPivotRowContainer, QuillTableSQLEditorComponent, } from './components/UiComponents';
 import { QuillTextInput } from './components/UiComponents';
 import { updateFirstChildWidth } from './utils/width';
+import { TEMP_REPORT_ID, } from './models/Report';
 import { QuillCard } from './components/QuillCard';
 import { QuillSelectComponent } from './components/QuillSelect';
 import { fetchResultsByQuery, } from './utils/tableProcessing';
@@ -83,17 +84,17 @@ function setEditorTheme(_editor, monaco, schema, databaseType, clientName) {
  * ### SQLEditor API
  * @see https://docs.quillsql.com/components/sql-editor
  */
-export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, TableComponent = QuillTableSQLEditorComponent, isNewQueryEnabled = false, LoadingComponent = QuillLoadingComponent, ModalComponent = MemoizedModal, PopoverComponent = MemoizedPopover, CardComponent = QuillCard, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, SubHeaderComponent = MemoizedSubHeader, TextComponent = MemoizedText, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, ChartBuilderFormContainer = QuillChartBuilderFormContainer, defaultQuery, destinationDashboard, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, onDiscardChanges, onSaveChanges, onCloseChartBuilder, isChartBuilderEnabled = false, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, isAdminEnabled = false, chartBuilderTitle, runQueryOnMount = false, onAddToDashboardComplete, addToDashboardButtonLabel = 'Add to dashboard', report = undefined, organizationName = undefined, isChartBuilderHorizontalView = true, containerStyle = { height: '100vh' }, className, onClickChartElement, }) {
+export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, TableComponent = QuillTableSQLEditorComponent, isNewQueryEnabled = false, LoadingComponent = QuillLoadingComponent, ModalComponent = MemoizedModal, PopoverComponent = MemoizedPopover, CardComponent = QuillCard, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, SubHeaderComponent = MemoizedSubHeader, TextComponent = MemoizedText, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, ChartBuilderFormContainer = QuillChartBuilderFormContainer, defaultQuery, destinationDashboard, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, onDiscardChanges, onSaveChanges, onCloseChartBuilder, isChartBuilderEnabled = false, isAdminEnabled = false, chartBuilderTitle, runQueryOnMount = false, onAddToDashboardComplete, addToDashboardButtonLabel = 'Add to dashboard', report = undefined, organizationName = undefined, isChartBuilderHorizontalView = true, containerStyle = { height: '100vh' }, className, onClickChartElement, }) {
     const [sqlPrompt, setSqlPrompt] = useState('');
     const [client] = useContext(ClientContext);
     const [theme] = useContext(ThemeContext);
     const [query, setQuery] = useState(defaultQuery);
     const [rows, setRows] = useState([]);
-    const [filteredRows, setFilteredRows] = useState([]);
-    const [chartBuilderInFilteredPreview, setChartBuilderInFilteredPreview] = useState(true);
+    const [filtersEnabled, setFiltersEnabled] = useState(!!report);
     const [columns, setColumns] = useState([]);
     const [schemaData] = useContext(SchemaDataContext);
     const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const [, dashboardDispatch] = useContext(DashboardContext);
     const specificDashboardFilters = useMemo(() => {
         return Object.values(dashboardFilters[report?.dashboardName ?? destinationDashboard ?? ''] ??
             {}).map((f) => f.filter);
@@ -174,7 +175,6 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
     useEffect(() => {
         if (client) {
             setRows([]);
-            setFilteredRows([]);
             setColumns([]);
             setDisplayTable(false);
         }
@@ -211,7 +211,7 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
         }
     };
     const onSortChange = (sort) => {
-        if (tempReport && shouldSortInMemory(pagination, rowCount, false)) {
+        if (tempReport && shouldSortInMemory(pagination, rowCount)) {
             return;
         }
         const updatedProcessing = { page: pagination, sort };
@@ -219,9 +219,6 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
         setCurrentProcessing(updatedProcessing);
         setMaxPage(0);
     };
-    const onFilterPreviewChange = (preview) => {
-        setChartBuilderInFilteredPreview(preview);
-    };
     const fetchRowCount = async (processing, includeFilters) => {
         if (!client || !query) {
             return;
@@ -250,27 +247,25 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
                 setMaxPage(1);
             }
             const tableInfo = await fetchResultsByQuery(query, client, processing, schemaData.customFields, undefined, undefined, true);
-            const filteredTableInfo = await fetchResultsByQuery(query, client, processing, schemaData.customFields, specificDashboardFilters, tempReport.dateField ?? report?.dateField, true);
             if (!!tableInfo.error) {
                 throw new Error(tableInfo.error);
             }
-            else if (filteredTableInfo.error) {
-                throw new Error(filteredTableInfo.error);
+            // Search through tableInfo.columns for any two columns with the same 'field' value
+            const duplicateColumns = tableInfo.columns
+                .map((col) => col.field)
+                .filter((field, index, self) => self.indexOf(field) !== index);
+            if (duplicateColumns.length > 0) {
+                setErrorMessage(`Column named "${duplicateColumns[0]}" occurs more than once in results.`);
+                return;
             }
-            // else if (tableInfo.rows.length === 0) {
-            //   throw new Error('No data found');
-            // }
             fetchRowCount(processing, includeFilters);
             setSqlQueryLoading(false);
             setCurrentProcessing(processing);
             let tempRows = [...rows, ...tableInfo.rows];
-            let tempFilteredRows = [...filteredRows, ...filteredTableInfo.rows];
             if (resetRows) {
                 tempRows = tableInfo.rows;
-                tempFilteredRows = filteredTableInfo.rows;
             }
             setRows(tempRows);
-            setFilteredRows(tempFilteredRows);
             setFormattedRows(formatRowsFromReport({ rows: tempRows, columns: tableInfo.columns }));
             if (onChangeData) {
                 onChangeData(tempRows);
@@ -290,7 +285,6 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
                 ...formData,
                 itemQuery: tableInfo.itemQuery,
                 rowCount: tableInfo.rowCount ?? tableInfo.rows.length,
-                filtersApplied: tempReport.filtersApplied ?? [],
                 rows: tempRows,
                 columns: tableInfo.columns,
             };
@@ -422,6 +416,21 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
                                                                     }, label: "Run query" })), isNewQueryEnabled && (_jsx(SecondaryButtonComponent, { onClick: handleClearQuery, label: "Clear query" })), addToDashboardButtonLabel ===
                                                                     'Add to dashboard' && (_jsx(ButtonComponent, { onClick: async () => {
                                                                         onSaveChanges && onSaveChanges();
+                                                                        dashboardDispatch({
+                                                                            id: TEMP_REPORT_ID,
+                                                                            type: 'ADD_DASHBOARD_ITEM',
+                                                                            data: {
+                                                                                ...tempReport,
+                                                                                id: TEMP_REPORT_ID,
+                                                                                rows,
+                                                                                columns: columns,
+                                                                                columnInternal: columns,
+                                                                                rowCount: rowCount ?? 0,
+                                                                                queryString: query ?? '',
+                                                                                dashboardName: report?.dashboardName ??
+                                                                                    destinationDashboard,
+                                                                            },
+                                                                        });
                                                                         setIsChartBuilderOpen(true);
                                                                     }, label: addToDashboardButtonLabel, disabled: !!errorMessage ||
                                                                         !(lastSuccessfulQuery === query) ||
@@ -471,13 +480,27 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
                                             marginBottom: 5,
                                         }, children: [onDiscardChanges && (_jsx(SecondaryButtonComponent, { onClick: onDiscardChanges, label: "Discard changes" })), addToDashboardButtonLabel !== 'Add to dashboard' && (_jsx(ButtonComponent, { onClick: async () => {
                                                     onSaveChanges && onSaveChanges();
+                                                    dashboardDispatch({
+                                                        id: TEMP_REPORT_ID,
+                                                        type: 'ADD_DASHBOARD_ITEM',
+                                                        data: {
+                                                            ...tempReport,
+                                                            id: TEMP_REPORT_ID,
+                                                            rows,
+                                                            columns: columns,
+                                                            columnInternal: columns,
+                                                            rowCount: rowCount ?? 0,
+                                                            queryString: query ?? '',
+                                                            dashboardName: report?.dashboardName ?? destinationDashboard,
+                                                        },
+                                                    });
                                                     setIsChartBuilderOpen(true);
-                                                }, label: addToDashboardButtonLabel, disabled: !!errorMessage || !(lastSuccessfulQuery === query) }))] }))] })] }) }) })), (!isChartBuilderHorizontalView || isChartBuilderOpen) && (_jsx(ChartBuilderWithModal, { rows: chartBuilderInFilteredPreview ? filteredRows : rows, columns: columns, query: query, isHorizontalView: isChartBuilderHorizontalView, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: onAddToDashboardComplete, showTableFormatOptions: showTableFormatOptions, showDateFieldOptions: showDateFieldOptions, showAccessControlOptions: showAccessControlOptions, isAdmin: isAdminEnabled, destinationDashboard: destinationDashboard, title: chartBuilderTitle, buttonLabel: addToDashboardButtonLabel, report: tempReport, pivot: tempReport?.pivot ?? undefined, pivotData: tempReport?.pivotRows && tempReport?.pivotColumns
-                    ? {
-                        rows: tempReport.pivotRows,
-                        columns: tempReport.pivotColumns,
-                    }
-                    : undefined, organizationName: organizationName, CardComponent: CardComponent, TableComponent: TableComponent, ModalComponent: ModalComponent, ButtonComponent: ButtonComponent, TextInputComponent: TextInputComponent, SelectComponent: SelectComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, PopoverComponent: PopoverComponent, DeleteButtonComponent: DeleteButtonComponent, LoadingComponent: LoadingComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, ErrorMessageComponent: ErrorMessageComponent, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, FormContainer: ChartBuilderFormContainer, hideDateRangeFilter: true, onClickChartElement: onClickChartElement, rowCount: rowCount, onPageChange: onPageChange, onSortChange: onSortChange, onFilterPreviewChange: onFilterPreviewChange, isLoading: sqlQueryLoading, isEditingMode: true }))] }));
+                                                }, label: addToDashboardButtonLabel, disabled: !!errorMessage || !(lastSuccessfulQuery === query) }))] }))] })] }) }) })), (!isChartBuilderHorizontalView || isChartBuilderOpen) && (_jsx(ChartBuilderWithModal, { isHorizontalView: isChartBuilderHorizontalView, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: onAddToDashboardComplete, isAdmin: isAdminEnabled, title: chartBuilderTitle, buttonLabel: addToDashboardButtonLabel, reportId: report?.id, organizationName: organizationName, CardComponent: CardComponent, TableComponent: TableComponent, ModalComponent: ModalComponent, ButtonComponent: ButtonComponent, TextInputComponent: TextInputComponent, SelectComponent: SelectComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, PopoverComponent: PopoverComponent, DeleteButtonComponent: DeleteButtonComponent, LoadingComponent: LoadingComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, ErrorMessageComponent: ErrorMessageComponent, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, FormContainer: ChartBuilderFormContainer, hideDateRangeFilter: true, onClickChartElement: onClickChartElement, 
+                // onPageChange={onPageChange}
+                // onSortChange={onSortChange}
+                filtersEnabled: filtersEnabled, onFiltersEnabledChanged: (enabled) => setFiltersEnabled(enabled), 
+                // isLoading={sqlQueryLoading}
+                isEditingMode: true }))] }));
 }
 const SQLEditorComponent = ({ query, schema, databaseType, clientName, setQuery, setEditorMounted, handleRunQuery, defineEditorTheme, setEditorTheme, runQueryOnMount = false, theme, loading, LoadingComponent = QuillLoadingComponent, }) => {
     const [editorKey, setEditorKey] = useState(0);

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

@@ -39,7 +39,7 @@ export default function BarChart({ colors, colorMap, yAxisFields, data, containe
     return (_jsx("div", { style: {
             boxSizing: 'content-box',
             ...containerStyle,
-        }, className: className, children: _jsx(ResponsiveContainer, { width: "100%", height: '100%', children: _jsxs(ReChartsBarChart, { data: data ?? [], layout: 'horizontal', onClick: (event) => onClickChartElement
+        }, className: className, children: _jsx(ResponsiveContainer, { width: "100%", height: "100%", children: _jsxs(ReChartsBarChart, { data: data ?? [], layout: 'horizontal', onClick: (event) => onClickChartElement
                     ? onClickChartElement(event?.activePayload
                         ? event.activePayload[0].payload
                         : undefined)

package/dist/esm/components/Chart/InternalChart.d.ts

@@ -0,0 +1,25 @@
+import { ChartProps } from '../../Chart';
+import { QuillReport } from '../../models/Report';
+export declare function isEquivalent(filters1: any[], filters2: any[]): boolean;
+export declare function didFiltersChange(dashboardItem: any, filters: any[]): boolean;
+export type ColorMapType = {
+    [key: string]: {
+        primary: string;
+        comparison?: string;
+        primaryGradientStart?: string;
+        primaryGradientStop?: string;
+        comparisonGradientStart?: string;
+        comparisonGradientStop?: string;
+    };
+};
+export default function InternalChart({ report, colors, className, containerStyle, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, hideHorizontalCartesianGrid, hideVerticalCartesianGrid, hideSubsequentXAxisTicks, cartesianGridLineStyle, cartesianGridLineColor, comparisonLineStyle, hideDateRangeFilter, filtersEnabled, setFiltersEnabled, mapColorsToFields, LoadingComponent, SelectComponent, MultiSelectComponent, DateRangePickerComponent, MetricComponent, filters, onDashboardFilterChange, onClickChartElement, loading, error, isAdmin, filterToggleDisabled, }: Omit<ChartProps, 'reportId'> & {
+    report: QuillReport;
+    loading: boolean;
+    error?: string;
+    filtersEnabled: boolean;
+    setFiltersEnabled: (hide: boolean) => void;
+    isAdmin?: boolean;
+    onDashboardFilterChange: (label: string, value: any) => void;
+    filterToggleDisabled?: boolean;
+}): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=InternalChart.d.ts.map

package/dist/esm/components/Chart/InternalChart.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"InternalChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/InternalChart.tsx"],"names":[],"mappings":"AA6BA,OAAO,EAAgB,UAAU,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,WAAW,EAAkB,MAAM,qBAAqB,CAAC;AAMlE,wBAAgB,YAAY,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAiH5D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,WAKlE;AAkFD,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,MAAM,EACN,MAAM,EACN,SAAS,EACT,cAAc,EACd,iBAAiB,EACjB,SAAS,EACT,SAAS,EACT,iBAAiB,EACjB,2BAAmC,EACnC,yBAAgC,EAChC,wBAAgC,EAChC,sBAAgC,EAChC,sBAAsB,EACtB,mBAAmB,EACnB,mBAA2B,EAC3B,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,gBAAuC,EACvC,eAAsC,EACtC,oBAAgD,EAChD,wBAA+C,EAC/C,eAAsC,EACtC,OAAO,EACP,uBAAuB,EACvB,mBAAmB,EACnB,OAAO,EACP,KAAK,EACL,OAAO,EACP,oBAAoB,GACrB,EAAE,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG;IAChC,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uBAAuB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC7D,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,2CA8VA"}

package/dist/esm/components/Chart/InternalChart.js

@@ -0,0 +1,379 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState, useEffect, useContext, useMemo } from 'react';
+import { differenceInHours } from 'date-fns';
+import { DashboardConfigContext, ReportFiltersContext, ThemeContext, } from '../../Context';
+import { QuillLoadingSkeleton } from '../../components/Chart/ChartSkeleton';
+import ChartError from '../../components/Chart/ChartError';
+import { 
+// convertCustomFilter,
+DashboardFilterType as DashboardFilterVariant, FilterType, } from '../../models/Filter';
+import { applyCustomFilterToDashDateFilter } from '../../utils/filterProcessing';
+import { DashboardFilter } from '../../components/Dashboard/DashboardFilter';
+import { QuillSelectComponent } from '../../components/QuillSelect';
+import { QuillMultiSelectComponent } from '../../components/QuillMultiSelect';
+import { QuillDateRangePicker } from '../../DateRangePicker/QuillDateRangePicker';
+import QuillMetricComponent from '../../components/Dashboard/MetricComponent';
+import { COMPARISON_RANGE, defaultOptionsV2, getRangeFromPresetOptions, PRIMARY_RANGE, } from '../../DateRangePicker/dateRangePickerUtils';
+import { ChartDisplay } from '../../Chart';
+import { TEMP_REPORT_ID } from '../../models/Report';
+function areDatesNearby(date1, date2) {
+    return Math.abs(differenceInHours(date1, date2)) < 24;
+}
+export function isEquivalent(filters1, filters2) {
+    if (filters2.length !== filters1.length) {
+        return false;
+    }
+    // const filterKeys = Object.keys(filters2);
+    for (let i = 0; i < filters1.length; i++) {
+        const filter1 = filters1[i];
+        if (!filter1) {
+            return false;
+        }
+        const filter2 = filters2[i];
+        if (filter1.isUserFilter !== filter2.isUserFilter) {
+            return false;
+        }
+        else if (filter1.isUserFilter) {
+            if (filter1.operator !== filter2.operator ||
+                filter1.value !== filter2.value) {
+                return false;
+            }
+        }
+        const filterType = filter2.filterType;
+        if (filterType === 'string') {
+            if (filter1.stringFilterType === 'multiselect') {
+                if (filter1.values &&
+                    filter2.values &&
+                    filter1.values.length !== filter2.values.length) {
+                    return false;
+                }
+                if ((filter1.values && !filter2.values) ||
+                    (filter2.values && !filter1.values)) {
+                    return false;
+                }
+                // make sure that filter1.values is equivalent to filter2.values ignoring order
+                const sortedValues1 = filter1.values?.slice().sort() || [];
+                const sortedValues2 = filter2.values?.slice().sort() || [];
+                if (!sortedValues1.every((value, index) => value === sortedValues2[index])) {
+                    return false;
+                }
+            }
+            if (filter1.selectedValue !== filter2.selectedValue) {
+                return false;
+            }
+        }
+        else if (filter1?.operator === 'BETWEEN' &&
+            filter2?.operator === 'BETWEEN') {
+            if (!filter1?.values && !filter2?.values) {
+                continue;
+            }
+            else if (!filter1?.values || !filter2?.values) {
+                return false;
+            }
+            if (filter1?.values && filter2?.values) {
+                if (!areDatesNearby(filter1.values[0], filter2.values[0]) ||
+                    !areDatesNearby(filter1.values[1], filter2.values[1])) {
+                    return false;
+                }
+            }
+        }
+        else if (filterType === 'date_range') {
+            if (!filter1.startDate && !filter2.startDate) {
+                continue;
+            }
+            if (!areDatesNearby(filter1.startDate, filter2.startDate) ||
+                !areDatesNearby(filter1.endDate, filter2.endDate)) {
+                return false;
+            }
+            if (filter1.comparison !== filter2.comparison) {
+                return false;
+            }
+            if (filter1.comparisonRange && !filter2.comparisonRange) {
+                return false;
+            }
+            if (!filter1.comparisonRange && filter2.comparisonRange) {
+                return false;
+            }
+            if (filter1.comparisonRange && filter2.comparisonRange) {
+                if (!filter1.comparisonRange.startDate &&
+                    !filter2.comparisonRange.endDate) {
+                    continue;
+                }
+                if (!areDatesNearby(filter1.comparisonRange.startDate, filter2.comparisonRange.startDate) ||
+                    !areDatesNearby(filter1.comparisonRange.endDate, filter2.comparisonRange.endDate)) {
+                    return false;
+                }
+            }
+        }
+    }
+    return true;
+}
+export function didFiltersChange(dashboardItem, filters) {
+    if (!dashboardItem?.filtersApplied || !filters) {
+        return true;
+    }
+    return !isEquivalent(dashboardItem.filtersApplied, filters);
+}
+const TogglePrimitive = ({ value, onClick, style, disabled, }) => {
+    const toggleStyle = {
+        container: {
+            display: 'inline-block',
+            position: 'relative',
+            width: '30px',
+            height: '18px',
+            borderRadius: '24px',
+            backgroundColor: value ? '#212121' : '#ccc',
+            cursor: 'pointer',
+            transition: 'background-color 0.4s',
+            // Fade out the toggle when disabled
+            opacity: disabled ? 0.5 : 1,
+            ...style,
+        },
+        circle: {
+            position: 'absolute',
+            top: '3px',
+            left: value ? '15px' : '3px',
+            width: '12px',
+            height: '12px',
+            borderRadius: '50%',
+            backgroundColor: '#FFF',
+            transition: 'left 0.4s',
+        },
+        icon: {
+            position: 'absolute',
+            top: '3px',
+            left: '3px',
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            width: '20px',
+            height: '20px',
+            color: '#FFF',
+        },
+    };
+    return (_jsxs("div", { style: toggleStyle.container, onClick: disabled ? () => { } : onClick, "aria-checked": value, role: "switch", "aria-label": "Toggle", children: [_jsx("div", { style: toggleStyle.circle }), value ? (_jsx("div", { style: {
+                    ...toggleStyle.icon,
+                    left: '35px',
+                    color: '#FFC107',
+                } })) : (_jsx("div", { style: {
+                    ...toggleStyle.icon,
+                    color: '#607D8B',
+                } }))] }));
+};
+export default function InternalChart({ report, colors, className, containerStyle, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, hideHorizontalCartesianGrid = false, hideVerticalCartesianGrid = true, hideSubsequentXAxisTicks = false, cartesianGridLineStyle = 'solid', cartesianGridLineColor, comparisonLineStyle, hideDateRangeFilter = false, filtersEnabled, setFiltersEnabled, mapColorsToFields, LoadingComponent = QuillLoadingSkeleton, SelectComponent = QuillSelectComponent, MultiSelectComponent = QuillMultiSelectComponent, DateRangePickerComponent = QuillDateRangePicker, MetricComponent = QuillMetricComponent, filters, onDashboardFilterChange, onClickChartElement, loading, error, isAdmin, filterToggleDisabled, }) {
+    const { reportFilters } = useContext(ReportFiltersContext);
+    const { dashboardConfig } = useContext(DashboardConfigContext);
+    const currentReportFilters = useMemo(() => {
+        const dashFilters = dashboardConfig[report?.dashboardName ?? '']?.config.filters;
+        if (!dashFilters)
+            return Object.values(reportFilters[report?.id ?? ''] ?? {});
+        // Sort the filters with "date_range" type first, followed by the rest in the same order as the dashFilters, by label.
+        return Object.values(reportFilters[report?.id ?? ''] ?? {}).sort((a, b) => {
+            if (a.filter.filterType === 'date_range' &&
+                b.filter.filterType !== 'date_range') {
+                return -1;
+            }
+            else if (a.filter.filterType !== 'date_range' &&
+                b.filter.filterType === 'date_range') {
+                return 1;
+            }
+            else {
+                return (dashFilters.findIndex((f) => f.label === a.filter.label) -
+                    dashFilters.findIndex((f) => f.label === b.filter.label));
+            }
+        });
+    }, [reportFilters, report?.id]);
+    const reportDateFilter = useMemo(() => {
+        return Object.values(reportFilters[report?.id ?? ''] ?? {}).find((f) => f.filter.filterType === 'date_range')?.filter;
+    }, [reportFilters, report?.id]);
+    const presetOptions = useMemo(() => {
+        return reportDateFilter
+            ? (reportDateFilter.presetRanges?.map((elem) => {
+                if (!elem.isStatic) {
+                    return {
+                        label: elem.label,
+                        value: elem.value,
+                        startDate: PRIMARY_RANGE[elem.value]?.startDate ??
+                            PRIMARY_RANGE['LAST_30_DAYS'].startDate,
+                        endDate: PRIMARY_RANGE[elem.value]?.endDate ??
+                            PRIMARY_RANGE['LAST_30_DAYS'].endDate,
+                    };
+                }
+                return {
+                    label: elem.label,
+                    value: elem.value,
+                    startDate: new Date(elem.startDate),
+                    endDate: new Date(elem.endDate),
+                };
+            }) ?? defaultOptionsV2)
+            : defaultOptionsV2;
+    }, [reportDateFilter]);
+    // const userFilters = useMemo(() => {
+    //   return filters?.filter(
+    //     (f) =>
+    //       f.filterType !== FilterType.DateCustomFilter &&
+    //       f.filterType !== FilterType.DateFilter &&
+    //       f.filterType !== FilterType.DateComparisonFilter,
+    //   );
+    // }, [filters]);
+    // A filter value can either be a string, an array of strings for a multiselect, or a date range (that could have a comparison range)
+    const [filterValues, setFilterValues] = useState({});
+    useEffect(() => {
+        if (reportDateFilter) {
+            // Filter for custom date filter that applies to the report's dateField
+            const customDateFilter = filters?.find((f) => f.filterType === FilterType.DateCustomFilter ||
+                f.filterType === FilterType.DateFilter ||
+                f.filterType === FilterType.DateComparisonFilter);
+            if (!customDateFilter) {
+                return;
+            }
+            const newFilter = applyCustomFilterToDashDateFilter(customDateFilter, reportDateFilter);
+            setFilterValues((filterValues) => ({
+                ...filterValues,
+                [reportDateFilter.label]: {
+                    startDate: newFilter.startDate,
+                    endDate: newFilter.endDate,
+                    preset: newFilter.preset,
+                    comparisonRange: newFilter.comparisonRange,
+                },
+            }));
+        }
+    }, [filters]);
+    const [theme] = useContext(ThemeContext);
+    const colorMap = useMemo(() => {
+        if (mapColorsToFields && report && theme) {
+            return mapColorsToFields(report, theme);
+        }
+    }, [report, theme]);
+    const updateFilter = (filter, value, comparison) => {
+        let filterValue = {};
+        if (filter.filterType === DashboardFilterVariant.String) {
+            if (filter.stringFilterType === 'multiselect') {
+                if ((value?.length ?? 0) === 0) {
+                    filterValue = { values: undefined, operator: undefined };
+                }
+                else {
+                    filterValue = { values: value, operator: 'IN' };
+                }
+            }
+            else {
+                filterValue = { selectedValue: value };
+            }
+        }
+        else if (filter.filterType === DashboardFilterVariant.Date) {
+            if (comparison ||
+                (filter.comparison &&
+                    (filter.comparisonRange?.value ?? 'NO_COMPARISON') !==
+                        'NO_COMPARISON')) {
+                let preset = '';
+                if (comparison) {
+                    preset = filter.preset.value;
+                }
+                const key = comparison?.value ||
+                    (filter.comparisonRange?.value ?? 'NO_COMPARISON');
+                let primaryRange = {
+                    startDate: value ? value.startDate : filter.startDate,
+                    endDate: value ? value.endDate : filter.endDate,
+                };
+                if (value && value.preset) {
+                    preset = value.preset;
+                    primaryRange = getRangeFromPresetOptions(value.preset, presetOptions);
+                }
+                filterValue = {
+                    startDate: primaryRange.startDate,
+                    endDate: primaryRange.endDate,
+                    preset: {
+                        label: presetOptions.find((o) => o.value === preset)?.label ?? preset,
+                        value: preset,
+                    },
+                    comparisonRange: {
+                        startDate: COMPARISON_RANGE[key](primaryRange)
+                            ?.startDate,
+                        endDate: COMPARISON_RANGE[key](primaryRange)
+                            ?.endDate,
+                        value: key,
+                    },
+                };
+            }
+            else {
+                const primaryRange = value && value.preset
+                    ? getRangeFromPresetOptions(value.preset, presetOptions)
+                    : {
+                        startDate: value?.startDate || filter.startDate,
+                        endDate: value?.endDate || filter.endDate,
+                    };
+                const preset = value?.preset ? value.preset : '';
+                filterValue = {
+                    startDate: primaryRange.startDate,
+                    endDate: primaryRange.endDate,
+                    preset: {
+                        label: presetOptions.find((o) => o.value === preset)?.label ?? preset,
+                        value: preset,
+                    },
+                };
+            }
+        }
+        setFilterValues((filterValues) => ({
+            ...filterValues,
+            [filter.label]: filterValue,
+        }));
+        onDashboardFilterChange(filter.label, filterValue);
+    };
+    if (error) {
+        return (_jsx("div", { style: containerStyle, className: className, children: _jsx(ChartError, { errorMessage: error }) }));
+    }
+    return (_jsxs("div", { style: {
+            display: 'flex',
+            flexDirection: 'column',
+            ...containerStyle,
+        }, id: `quill-internal-chart-${report.id}`, className: className, children: [isAdmin && !!currentReportFilters?.length && (_jsxs("div", { style: {
+                    maxWidth: 'fit-content',
+                    marginBottom: 25,
+                    display: 'flex',
+                    flexDirection: 'column',
+                    gap: 4,
+                    alignItems: 'flex-start',
+                    flexWrap: 'wrap',
+                    border: filtersEnabled
+                        ? `1px solid ${theme?.borderColor ?? 'black'}`
+                        : 'none',
+                    padding: filtersEnabled ? 12 : 0,
+                    borderRadius: 6,
+                    opacity: filterToggleDisabled ? 0.5 : 1,
+                }, children: [_jsxs("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'row',
+                            gap: 8,
+                            border: `1px solid ${theme?.borderColor ?? 'black'}`,
+                            padding: 8,
+                            borderRadius: 6,
+                        }, children: [_jsx(TogglePrimitive, { value: filtersEnabled, onClick: () => setFiltersEnabled(!filtersEnabled), style: {
+                                    marginTop: 2,
+                                    cursor: filterToggleDisabled ? 'not-allowed' : 'pointer',
+                                }, disabled: filterToggleDisabled }), _jsx("h1", { style: {
+                                    fontSize: 14,
+                                    fontWeight: 600,
+                                    fontFamily: theme?.fontFamily,
+                                    color: theme?.primaryTextColor || '#575E6A',
+                                    userSelect: 'none',
+                                    margin: 0,
+                                }, children: filtersEnabled
+                                    ? 'Previewing with dashboard filters'
+                                    : 'Previewing without dashboard filters' })] }), _jsx("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'row',
+                            alignItems: 'flex-end',
+                            flexWrap: 'wrap',
+                            gap: 12,
+                        }, children: filtersEnabled &&
+                            currentReportFilters.map((filter, index) => (_jsx(DashboardFilter, { filter: {
+                                    ...filter.filter,
+                                    ...(filter.filter.filterType === 'date_range' && {
+                                        options: presetOptions,
+                                    }),
+                                    ...filterValues[filter.filter.label],
+                                }, isLoading: filter.loading, onChangeFilter: updateFilter, theme: theme, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, DateRangePickerComponent: DateRangePickerComponent, disabled: !filtersEnabled }, index))) })] })), loading || !report ? (_jsx(LoadingComponent, {})) : (_jsxs(_Fragment, { children: ['metric' === report.chartType && (_jsx(MetricComponent, { error: error, isLoading: loading, report: report })), report.chartType !== 'table' && report.chartType !== 'metric' && (_jsx(ChartDisplay, { config: report, containerStyle: {
+                            width: '100%',
+                            height: '100%',
+                        }, reportId: TEMP_REPORT_ID, colors: colors, className: className, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, hideHorizontalCartesianGrid: hideHorizontalCartesianGrid, hideVerticalCartesianGrid: hideVerticalCartesianGrid, hideSubsequentXAxisTicks: hideSubsequentXAxisTicks, cartesianGridLineStyle: cartesianGridLineStyle, cartesianGridLineColor: cartesianGridLineColor, hideDateRangeFilter: hideDateRangeFilter, comparisonLineStyle: comparisonLineStyle, isAnimationActive: isAnimationActive, loading: loading, scrollable: true, colorMap: colorMap, LoadingComponent: LoadingComponent, onClickChartElement: onClickChartElement }))] }))] }));
+}

package/dist/esm/components/Chart/LineChart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LineChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/LineChart.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAyB7C,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,MAAM,EACN,QAAa,EACb,WAAW,EACX,IAAI,EACJ,cAAc,EACd,SAAS,EACT,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAU,EACV,iBAAwB,EACxB,SAAiB,EACjB,SAAiB,EACjB,iBAAyB,EACzB,2BAAmC,EACnC,yBAAgC,EAChC,wBAAgC,EAChC,sBAAgC,EAChC,mBAA6B,EAC7B,sBAAsB,EACtB,mBAA8B,EAC9B,UAAU,GACX,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,GAAG,CAAC;IAChB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,2BAA2B,EAAE,OAAO,CAAC;IACrC,yBAAyB,EAAE,OAAO,CAAC;IACnC,wBAAwB,EAAE,OAAO,CAAC;IAClC,sBAAsB,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC3C,mBAAmB,EAAE,OAAO,GAAG,QAAQ,CAAC;IACxC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,mBAAmB,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,2CAsRA"}
+{"version":3,"file":"LineChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/LineChart.tsx"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AA2B7C,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,MAAM,EACN,QAAa,EACb,WAAW,EACX,IAAI,EACJ,cAAc,EACd,SAAS,EACT,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAU,EACV,iBAAwB,EACxB,SAAiB,EACjB,SAAiB,EACjB,iBAAyB,EACzB,2BAAmC,EACnC,yBAAgC,EAChC,wBAAgC,EAChC,sBAAgC,EAChC,mBAA6B,EAC7B,sBAAsB,EACtB,mBAA8B,EAC9B,UAAU,GACX,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,GAAG,CAAC;IAChB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,2BAA2B,EAAE,OAAO,CAAC;IACrC,yBAAyB,EAAE,OAAO,CAAC;IACnC,wBAAwB,EAAE,OAAO,CAAC;IAClC,sBAAsB,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC3C,mBAAmB,EAAE,OAAO,GAAG,QAAQ,CAAC;IACxC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,mBAAmB,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,2CAsRA"}

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Area, CartesianGrid, ComposedChart, ResponsiveContainer, Tooltip, XAxis, YAxis, } from 'recharts';
-import { DATE_FORMAT_TYPES, valueFormatter, } from '../../utils/valueFormatter';
+import { DATE_FORMAT_TYPES, valueFormatter } from '../../utils/valueFormatter';
 import { axisFormatter } from '../../utils/axisFormatter';
 import { selectColor } from '../../utils/color';
 import ChartTooltip from '../../components/Chart/ChartTooltip';
@@ -9,7 +9,9 @@ import { hashCode } from '../../utils/crypto';
 import { useMemo } from 'react';
 function createLineForEmptyChart(yAxisFields, dateFilter, xAxisField, xAxisFormat) {
     let lineChartData = [];
-    if (dateFilter && dateFilter.startDate && dateFilter.endDate &&
+    if (dateFilter &&
+        dateFilter.startDate &&
+        dateFilter.endDate &&
         DATE_FORMAT_TYPES.includes(xAxisFormat || '') &&
         (!lineChartData || lineChartData.length === 0)) {
         const xAxis = xAxisField || '';