@quillsql/react 2.13.21 → 2.13.23

package/dist/esm/Dashboard.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext, useEffect, useState, useMemo, useRef, } from 'react';
 import { ChartDisplay } from './Chart';
 import { PRIMARY_RANGE, COMPARISON_RANGE, defaultOptionsV2, getRangeFromPresetOptions, } from './DateRangePicker/dateRangePickerUtils';
-import { ClientContext, ThemeContext, SchemaDataContext } from './Context';
+import { ClientContext, ThemeContext, SchemaDataContext, DashboardFiltersContext } from './Context';
 import { useDashboard } from './hooks/useDashboard';
 import DashboardSectionContainer from './components/Dashboard/DashboardSectionContainer';
 import QuillMetricComponent from './components/Dashboard/MetricComponent';
@@ -15,11 +15,11 @@ import { QuillDateRangePicker } from './DateRangePicker/QuillDateRangePicker';
 import DataLoader, { ChartDataLoader, } from './components/Dashboard/DataLoader';
 import { QuillEmptyDashboardComponent, QuillFilterContainerComponent, QuillLoadingDashboardComponent, QuillModalComponent, MemoizedButton, MemoizedSecondaryButton, QuillTextInput, MemoizedPopover, QuillErrorMessageComponent, } from './components/UiComponents';
 import { DashboardFilter } from './components/Dashboard/DashboardFilter';
-import { BoolOperator, convertCustomFilter, FieldType, NullOperator, NumberOperator, StringOperator, } from './models/Filter';
+import { BoolOperator, convertCustomFilter, FieldType, FilterType, NullOperator, NumberOperator, StringOperator, } from './models/Filter';
 import { QuillMultiSelectComponentWithCombo } from './components/QuillMultiSelectWithCombo';
 import { QuillSelectComponentWithCombo } from './components/QuillSelectWithCombo';
 import { getUniqueStringValues } from './utils/tableProcessing';
-import { filterSentence, getType } from './utils/filterProcessing';
+import { applyCustomFilterToDashDateFilter, filterSentence, getType } from './utils/filterProcessing';
 import { QuillChartErrorWithAction } from './components/Chart/ChartError';
 import { FilterPopoverWrapper, QuillFilterPopover, } from './components/ReportBuilder/ui';
 import FilterModal from './components/ReportBuilder/FilterModal';
@@ -28,6 +28,7 @@ import QuillTemplateTableComponent from './components/Dashboard/TemplateTableCom
 import QuillDashboardTemplate from './components/Dashboard/DashboardTemplate';
 import { DashboardFilterType, } from './models/Filter';
 import { DEFAULT_PAGINATION } from './utils/paginationProcessing';
+import equal from 'fast-deep-equal';
 const defaultChartContainerStyles = {
     display: 'flex',
     width: '100%',
@@ -129,6 +130,7 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
     const [client, isClientLoading] = useContext(ClientContext);
     const [theme] = useContext(ThemeContext);
     const [schemaData] = useContext(SchemaDataContext);
+    const { dispatch: dashboardFiltersDispatch } = useContext(DashboardFiltersContext);
     const [fieldValuesMap, setFieldValuesMap] = useState({}); // Mapping of unique values per field, used in string filter 'in' and 'not in'
     const [referencedTables, setReferencedTables] = useState([]); // Intersection of tables referenced in the dashboard
     const [fieldValuesIsLoaded, setFieldValuesIsLoaded] = useState(false);
@@ -162,12 +164,63 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
     const prevClientIdRef = useRef(undefined);
     const addFilterPopoverButtonRef = useRef(null);
     const viewFiltersPopoverButtonRef = useRef(null);
+    const previousFilters = useRef(undefined);
+    if (!equal(previousFilters.current, filters)) {
+        previousFilters.current = filters;
+    }
     useEffect(() => {
-        setFilterValues({});
+        setFilterValues(Object.values(populatedDashboardFilters ?? {}).reduce((acc, f) => {
+            acc[f.label] =
+                f.filterType === 'string'
+                    ? f.stringFilterType === 'multiselect'
+                        ? { values: f.values, operator: 'IN' }
+                        : { selectedValue: f.selectedValue }
+                    : {
+                        startDate: f.startDate,
+                        endDate: f.endDate,
+                        preset: f.preset,
+                        comparisonRange: f.comparisonRange,
+                    };
+            return acc;
+        }, {}));
         const clientIdChanged = prevClientIdRef.current !== client?.organizationId;
         reload(name, clientIdChanged);
         prevClientIdRef.current = client?.organizationId;
     }, [name, client?.organizationId]);
+    useEffect(() => {
+        const dashboardDateFilter = populatedDashboardFilters?.find((f) => f.filterType === 'date_range');
+        if (dashboardDateFilter) {
+            // Filter for custom date filter that applies to the report's dateField
+            const customDateFilter = previousFilters.current?.find((f) => f.filterType === FilterType.DateCustomFilter
+                || f.filterType === FilterType.DateFilter
+                || f.filterType === FilterType.DateComparisonFilter
+            // FIXME: this is the correct way to do it but the demo has a hardcoded filter field
+            // && f.field === report?.dateField?.field && f.table === report?.dateField?.table,
+            );
+            if (!customDateFilter) {
+                return;
+            }
+            const newFilter = applyCustomFilterToDashDateFilter(customDateFilter, dashboardDateFilter);
+            setFilterValues((filterValues) => ({
+                ...filterValues,
+                [dashboardDateFilter.label]: {
+                    startDate: newFilter.startDate,
+                    endDate: newFilter.endDate,
+                    preset: newFilter.preset,
+                    comparisonRange: newFilter.comparisonRange,
+                },
+            }));
+            dashboardFiltersDispatch({
+                type: 'UPDATE_DASHBOARD_FILTER',
+                dashboardName: name,
+                filterName: dashboardDateFilter.label,
+                data: {
+                    filter: newFilter,
+                    loading: false,
+                },
+            });
+        }
+    }, [previousFilters.current]);
     // Go through all columns in the referenced tables and get the unique values to use in fieldValuesMap
     useEffect(() => {
         const fetchData = async () => {
@@ -245,10 +298,6 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
             else {
                 filterValue = { selectedValue: value };
             }
-            setFilterValues((filterValues) => ({
-                ...filterValues,
-                [filter.label]: filterValue,
-            }));
         }
         else if (filter.filterType === DashboardFilterType.Date) {
             if (comparison ||
@@ -284,10 +333,6 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
                         value: key,
                     },
                 };
-                setFilterValues((filterValues) => ({
-                    ...filterValues,
-                    [filter.label]: filterValue,
-                }));
             }
             else {
                 const primaryRange = value && value.preset
@@ -305,12 +350,12 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
                         value: preset,
                     },
                 };
-                setFilterValues((filterValues) => ({
-                    ...filterValues,
-                    [filter.label]: filterValue,
-                }));
             }
         }
+        setFilterValues((filterValues) => ({
+            ...filterValues,
+            [filter.label]: filterValue,
+        }));
         reload(name, false, undefined, {
             filters: populatedDashboardFilters.map((f) => filter.label === f.label ? { ...f, ...filterValue } : f),
             editedFilterLabel: filter.label,

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":"AAmBA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAgC7C,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,2CA0RA"}
+{"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"}

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

@@ -1,48 +1,38 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Area, CartesianGrid, ComposedChart as ReChartsAreaChart, ResponsiveContainer, Tooltip, XAxis, YAxis, } from 'recharts';
-import { DATE_FORMAT_TYPES, quillFormat, valueFormatter, } from '../../utils/valueFormatter';
+import { Area, CartesianGrid, ComposedChart, ResponsiveContainer, Tooltip, XAxis, YAxis, } from 'recharts';
+import { DATE_FORMAT_TYPES, valueFormatter, } from '../../utils/valueFormatter';
 import { axisFormatter } from '../../utils/axisFormatter';
 import { selectColor } from '../../utils/color';
 import ChartTooltip from '../../components/Chart/ChartTooltip';
 import getDomain from '../../utils/getDomain';
-import { useEffect, useState } from 'react';
 import { hashCode } from '../../utils/crypto';
+import { useMemo } from 'react';
 function createLineForEmptyChart(yAxisFields, dateFilter, xAxisField, xAxisFormat) {
     let lineChartData = [];
-    if (dateFilter &&
+    if (dateFilter && dateFilter.startDate && dateFilter.endDate &&
         DATE_FORMAT_TYPES.includes(xAxisFormat || '') &&
         (!lineChartData || lineChartData.length === 0)) {
         const xAxis = xAxisField || '';
         const yAxis = yAxisFields[0]?.field;
-        const startDate = quillFormat({
-            value: dateFilter?.startDate,
-            format: xAxisFormat,
-        });
-        const endDate = quillFormat({
-            value: dateFilter?.endDate,
-            format: xAxisFormat,
-        });
         lineChartData = [
-            { [xAxis]: startDate, [yAxis]: '0' },
-            { [xAxis]: endDate, [yAxis]: '0' },
+            { [xAxis]: dateFilter.startDate, [yAxis]: '0' },
+            { [xAxis]: dateFilter.endDate, [yAxis]: '0' },
         ];
     }
     return lineChartData;
 }
 export default function LineChart({ colors, colorMap = {}, yAxisFields, data, containerStyle, className, xAxisField, xAxisFormat, theme, comparison, isAnimationActive = true, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, hideHorizontalCartesianGrid = false, hideVerticalCartesianGrid = true, hideSubsequentXAxisTicks = false, cartesianGridLineStyle = 'solid', comparisonLineStyle = 'solid', cartesianGridLineColor, onClickChartElement = () => { }, dateFilter, }) {
-    const [formattedData, setFormattedData] = useState(data);
-    useEffect(() => {
+    const formattedData = useMemo(() => {
         if (!data || data.length === 0) {
-            setFormattedData(createLineForEmptyChart(yAxisFields, dateFilter, xAxisField, xAxisFormat));
-            return;
+            return createLineForEmptyChart(yAxisFields, dateFilter, xAxisField, xAxisFormat);
         }
         const newData = [...data];
-        if (newData.length === 1) {
-            const point = { ...newData[0] };
-            newData.push(point);
-        }
-        setFormattedData(newData);
-    }, [data]);
+        // if (newData.length === 1) {
+        //   const point = { ...newData[0] };
+        //   newData.push(point);
+        // }
+        return newData;
+    }, [data, yAxisFields, dateFilter, xAxisField, xAxisFormat]);
     if (!formattedData || formattedData.length === 0) {
         return (_jsx("div", { style: {
                 display: 'flex',
@@ -79,7 +69,7 @@ export default function LineChart({ colors, colorMap = {}, yAxisFields, data, co
             return sum + 1;
         return sum;
     }, 0);
-    return (_jsx("div", { style: { ...containerStyle }, className: className, children: _jsx(ResponsiveContainer, { width: "100%", height: '100%', children: _jsxs(ReChartsAreaChart, { data: formattedData, onClick: (event) => onClickChartElement(event?.activePayload ? event.activePayload[0].payload : undefined), children: [!hideCartesianGrid && (_jsx(CartesianGrid, { horizontal: !hideHorizontalCartesianGrid, vertical: !hideVerticalCartesianGrid, stroke: cartesianGridLineColor ?? '#e5e7eb', strokeDasharray: cartesianGridLineStyle === 'dashed' ? '5 5' : undefined })), _jsx(XAxis, { dataKey: xAxisField, hide: hideXAxis, tick: { transform: 'translate(0, 6)' }, style: {
+    return (_jsx("div", { style: { ...containerStyle }, className: className, children: _jsx(ResponsiveContainer, { width: "100%", height: '100%', children: _jsxs(ComposedChart, { data: formattedData, onClick: (event) => onClickChartElement(event?.activePayload ? event.activePayload[0].payload : undefined), children: [!hideCartesianGrid && (_jsx(CartesianGrid, { horizontal: !hideHorizontalCartesianGrid, vertical: !hideVerticalCartesianGrid, stroke: cartesianGridLineColor ?? '#e5e7eb', strokeDasharray: cartesianGridLineStyle === 'dashed' ? '5 5' : undefined })), _jsx(XAxis, { dataKey: xAxisField, hide: hideXAxis, tick: { transform: 'translate(0, 6)' }, style: {
                             fontSize: '12px',
                             fontFamily: theme?.chartLabelFontFamily ||
                                 theme?.fontFamily ||

package/dist/esm/components/Dashboard/DashboardFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DashboardFilter.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DashboardFilter.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"DashboardFilter.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DashboardFilter.tsx"],"names":[],"mappings":"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"}

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

@@ -1,24 +1,24 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMemo } from 'react';
-import { COMPARISON_OPTIONS, PRIMARY_RANGE } from '../../DateRangePicker/dateRangePickerUtils';
+import { COMPARISON_OPTIONS, PRIMARY_RANGE, } from '../../DateRangePicker/dateRangePickerUtils';
 import { QuillDateRangePicker, } from '../../DateRangePicker/QuillDateRangePicker';
 import { QuillMultiSelectComponent } from '../QuillMultiSelect';
 import { QuillSelectComponent } from '../QuillSelect';
 export function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelectComponent, MultiSelectComponent = QuillMultiSelectComponent, DateRangePickerComponent = QuillDateRangePicker, theme, isLoading, }) {
     const preset = useMemo(() => {
-        if ('preset' in filter && 'startDate' in filter && 'endDate' in filter) {
-            if (!filter.preset)
+        if (('preset' in filter || 'primaryRange' in filter) && 'startDate' in filter && 'endDate' in filter) {
+            if (!filter.preset && !filter.primaryRange)
                 return '';
             if (!filter.startDate || !filter.endDate)
-                return filter.preset.value;
-            const presetRange = filter.presetRanges?.find((range) => range.value === filter.preset.value) ?? PRIMARY_RANGE[filter.preset.value];
+                return filter.preset?.value ?? filter.primaryRange.value;
+            const presetRange = filter.presetRanges?.find((range) => range.value === (filter.preset?.value ?? filter.primaryRange.value)) ?? PRIMARY_RANGE[filter.preset?.value ?? filter.primaryRange.value];
             if (!presetRange)
-                return filter.preset.value;
+                return filter.preset?.value ?? filter.primaryRange.value;
             if (presetRange.startDate !== filter.startDate ||
                 presetRange.endDate !== filter.endDate) {
                 return '';
             }
-            return filter.preset.value;
+            return filter.preset?.value ?? filter.primaryRange.value;
         }
         return '';
     }, [filter]);

package/dist/esm/components/Dashboard/DataLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAuB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAajD,OAAO,EACL,oBAAoB,EAErB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA0BtE,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAuFF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,WAAW,EACX,oBAAoB,EAAE,2BAA2B,EACjD,UAAkB,GACnB,EAAE;IACD,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,IAAI,GACL,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CAuTd;AAED,KAAK,YAAY,GAAG;IAClB,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,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,eAAe,4FAQzB;IACD,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,CAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,KACf,YAAY,CAAC;IAClB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,iBAAiB,GAClB,EAAE,yBAAyB,KAAK,GAAG,CAAC,OAAO,CAAC;CAC9C,KAAG,GAAG,CAAC,OA2JP,CAAC"}
+{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAuB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAajD,OAAO,EACL,oBAAoB,EAErB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA0BtE,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAuFF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,WAAW,EACX,oBAAoB,EAAE,2BAA2B,EACjD,UAAkB,GACnB,EAAE;IACD,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,IAAI,GACL,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CA+Td;AAED,KAAK,YAAY,GAAG;IAClB,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,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,eAAe,4FAQzB;IACD,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,CAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,KACf,YAAY,CAAC;IAClB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,iBAAiB,GAClB,EAAE,yBAAyB,KAAK,GAAG,CAAC,OAAO,CAAC;CAC9C,KAAG,GAAG,CAAC,OA+JP,CAAC"}

package/dist/esm/components/Dashboard/DataLoader.js

@@ -219,14 +219,22 @@ export default function DataLoader({ item, children, filters, userFilters, addit
                     reportsDispatch({
                         type: 'UPDATE_REPORT',
                         id: item.id,
-                        data: { rows: tempRows, filtersApplied: userFilters },
+                        data: {
+                            rows: tempRows,
+                            loadingRows: false,
+                            filtersApplied: userFilters,
+                        },
                     });
                 }
                 else {
                     dispatch({
                         type: 'UPDATE_DASHBOARD_ITEM',
                         id: item.id,
-                        data: { rows: tempRows },
+                        data: {
+                            rows: tempRows,
+                            loadingRows: false,
+                            filtersApplied: userFilters,
+                        },
                     });
                 }
                 setAdditionalProcessing(updatedProcessing);
@@ -245,24 +253,24 @@ export default function DataLoader({ item, children, filters, userFilters, addit
         if (!client || !filters) {
             return;
         }
-        const fetchRowsRequestId = rowsRequestId.current + 1;
-        rowsRequestId.current = fetchRowsRequestId;
         const tempReport = (reportMode ? reports : dashboard)[item.id];
         if (tempReport &&
             !didFiltersChange(tempReport, filters) &&
             userFilterValuesEquivalent(userFilters ?? [], previousUserFilters.current ?? []) &&
             !tempReport.triggerReload) {
-            setLoading(false);
             return;
         }
         setLoading(true);
+        const fetchRowsRequestId = rowsRequestId.current + 1;
+        rowsRequestId.current = fetchRowsRequestId;
         previousUserFilters.current = userFilters ?? null;
         rowsAbortController.current?.abort();
         rowsAbortController.current = new AbortController();
         try {
             if (reportMode) {
                 try {
-                    await fetchIndividualReport(item.id, 'Chart', true, filters, userFilters, processing, undefined, rowsAbortController.current || undefined);
+                    await fetchIndividualReport(item.id, 'Chart', true, filters, userFilters, processing, undefined, rowsAbortController.current);
+                    rowsAbortController.current = null;
                     setError(undefined);
                 }
                 catch (e) {
@@ -278,7 +286,7 @@ export default function DataLoader({ item, children, filters, userFilters, addit
                     id: item.id,
                     data: { ...fetchedReport, triggerReload: false, rowCount: 0 }, // rowCount 0 indicates it's still loading if row length is nonzero
                     appliedFilters: userFilters,
-                    loading: false,
+                    loadingRows: false,
                 });
                 setError(error);
             }
@@ -347,6 +355,7 @@ export const ChartDataLoader = ({ item, children, dateBucket, additionalProcessi
     const previousUserFilters = useRef(null);
     const previousDateBucket = useRef(undefined);
     const fetchReportAbortController = useRef(null);
+    const rowsRequestId = useRef(0);
     const chartReport = useMemo(() => {
         const report = reportMode ? reports[item.id] : dashboard[item.id];
         if (!report) {
@@ -368,9 +377,10 @@ export const ChartDataLoader = ({ item, children, dateBucket, additionalProcessi
             userFilterValuesEquivalent(userFilters ?? [], previousUserFilters.current ?? []) &&
             dateBucket === previousDateBucket.current &&
             !tempReport.triggerReload) {
-            setLoading(false);
             return;
         }
+        const fetchRowsRequestId = rowsRequestId.current + 1;
+        rowsRequestId.current = fetchRowsRequestId;
         previousUserFilters.current = userFilters ?? null;
         previousDateBucket.current = dateBucket;
         setLoading(true);
@@ -401,7 +411,7 @@ export const ChartDataLoader = ({ item, children, dateBucket, additionalProcessi
                     id: item.id,
                     data: { ...report, triggerReload: false },
                     appliedFilters: userFilters,
-                    loading: false,
+                    loadingRows: false,
                 });
                 setError(error);
             }
@@ -413,7 +423,9 @@ export const ChartDataLoader = ({ item, children, dateBucket, additionalProcessi
             throw e;
         }
         finally {
-            setLoading(false);
+            if (fetchRowsRequestId === rowsRequestId.current) {
+                setLoading(false);
+            }
         }
     };
     useEffect(() => {

package/dist/esm/hooks/useDashboard.d.ts

@@ -1,9 +1,6 @@
-import { QuillReport, QuillReportInternal } from '../models/Report';
+import { QuillReport } from '../models/Report';
 import { DashboardFilter, InternalFilter } from '../models/Filter';
 import { DashboardConfig } from '../models/Dashboard';
-export declare const useReports: () => {
-    reloadFilteredReports: (predicate: (report: QuillReportInternal) => boolean) => void;
-};
 export declare const useDashboard: (dashboardName: string | null, customFilters?: InternalFilter[]) => {
     data: DashboardConfig | null;
     dashboardFilters: DashboardFilter[] | null;

package/dist/esm/hooks/useDashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACL,eAAe,EAEf,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,eAAO,MAAM,UAAU;uCAYR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAEF,eAAO,MAAM,YAAY,kBACR,MAAM,GAAG,IAAI,kBACZ,cAAc,EAAE;;;;2CA8Gc,MAAM;qCApF1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B;CA8FJ,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;sDAuBrB;QACD,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;KAC9B;4BA+CO,MAAM,oDAMT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;KAClC;4BA2FkC,MAAM;CA8B5C,CAAC"}
+{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,eAAe,EAEf,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,eAAO,MAAM,YAAY,kBACR,MAAM,GAAG,IAAI,kBACZ,cAAc,EAAE;;;;2CA8Gc,MAAM;qCApF1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B;CA8FJ,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;sDAuBrB;QACD,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;KAC9B;4BA+CO,MAAM,oDAMT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;KAClC;4BA2FkC,MAAM;CA8B5C,CAAC"}

package/dist/esm/hooks/useDashboard.js

@@ -1,28 +1,8 @@
 import { useContext, useMemo } from 'react';
-import { ClientContext, DashboardConfigContext, DashboardContext, DashboardFiltersContext, } from '../Context';
+import { ClientContext, DashboardConfigContext, DashboardFiltersContext, } from '../Context';
 import { PRIMARY_RANGE } from '../DateRangePicker/dateRangePickerUtils';
 import { DashboardFilterType, } from '../models/Filter';
 import { createDefaultDateFilter } from '../utils/filterProcessing';
-export const useReports = () => {
-    const [dashboard, dispatch] = useContext(DashboardContext);
-    const reloadReport = (id) => {
-        dispatch({
-            type: 'UPDATE_DASHBOARD_ITEM',
-            id: id,
-            data: { triggerReload: true },
-        });
-    };
-    const reloadFilteredReports = (predicate) => {
-        for (const id in dashboard) {
-            if (predicate(dashboard[id])) {
-                reloadReport(id);
-            }
-        }
-    };
-    return {
-        reloadFilteredReports,
-    };
-};
 export const useDashboard = (dashboardName, customFilters) => {
     const { dashboardConfig, isLoading: isDashboardsLoading, loadDashboard, } = useContext(DashboardConfigContext);
     const { dashboardFilters, loadFiltersForDashboard } = useContext(DashboardFiltersContext);

package/dist/esm/hooks/useExport.d.ts

@@ -6,15 +6,8 @@ export declare const useExport: (reportId?: string, { CustomDocumentComponent, m
 }) => {
     downloadCSV: () => void;
     downloadPDF: () => void;
-    isLoading: boolean;
-    isCSVLoading?: undefined;
-    isPDFLoading?: undefined;
-} | {
-    downloadCSV: () => Promise<void>;
-    downloadPDF: () => Promise<void>;
-    isCSVLoading: boolean;
     isPDFLoading: boolean;
-    isLoading?: undefined;
+    isCSVLoading: boolean;
 };
 interface QuillPDFProps {
     report: QuillReport;

package/dist/esm/hooks/useExport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AA0D/C,eAAO,MAAM,SAAS,cACT,MAAM,mEAMd;IACD,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,GAAG,CAAC,OAAO,CAAC;IAChE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;;;;;;;;;;;;CAyOF,CAAC;AAEF,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}
+{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AA8D/C,eAAO,MAAM,SAAS,cACT,MAAM,mEAMd;IACD,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,GAAG,CAAC,OAAO,CAAC;IAChE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;;;;;CA2OF,CAAC;AAEF,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}

package/dist/esm/hooks/useExport.js

@@ -40,7 +40,7 @@ async function getExportData(client, dashboardFilters, reportId) {
         useNewNodeSql: true,
     };
     const resp = await getData(client, 'itempost', 'same-origin', hostedBody, cloudBody);
-    const cleanedReport = await cleanDashboardItem(resp, dashboardFilters);
+    const cleanedReport = await cleanDashboardItem(resp, dashboardFilters, client);
     if (cleanedReport.chartType === 'table' && cleanedReport.pivot) {
         cleanedReport.columns = cleanedReport.yAxisFields;
     }
@@ -60,7 +60,6 @@ sectionField, } = {}) => {
         if (!dashboardName || !dashboardFilters[dashboardName]) {
             return [];
         }
-        //FIXME: Pretty sure this won't work with multiple dashboards
         return Object.values(dashboardFilters[dashboardName]).map((dashboardFilter) => {
             return dashboardFilter.filter;
         });
@@ -75,7 +74,7 @@ sectionField, } = {}) => {
     const [isCSVLoading, setIsCSVLoading] = useState(false);
     const [isPDFLoading, setIsPDFLoading] = useState(false);
     if (!reportId || !client) {
-        return { downloadCSV: () => { }, downloadPDF: () => { }, isLoading: false };
+        return { downloadCSV: () => { }, downloadPDF: () => { }, isPDFLoading: false, isCSVLoading: false };
     }
     return {
         downloadCSV: async () => {
@@ -100,6 +99,10 @@ sectionField, } = {}) => {
                 : specificDashboardFilters;
             const { report: fetchedReport } = await fetchReport(reportId, client, true, filters);
             const report = fetchedReport;
+            if (report.pivot && report.pivotRows && report.pivotColumns) {
+                report.rows = report.pivotRows;
+                report.columns = report.pivotColumns;
+            }
             let groupedRows = {};
             if (sectionField) {
                 groupedRows = (report?.rows || []).reduce((acc, row) => {
@@ -194,7 +197,6 @@ sectionField, } = {}) => {
                         // const divContentBuffer = Buffer.from(div.innerHTML, 'utf-8');
                         // htmlBuffer = Buffer.concat([htmlBuffer, divContentBuffer]);
                         html += div.innerHTML;
-                        console.log('html', html);
                         currentCount = 0;
                     }
                 }

package/dist/esm/hooks/useQuill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAIjC,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,QAAQ,cACR,MAAM,eACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,KAC3D;IACD,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,SAAS,EACL,CAAC,CAAC,QAAQ,EAAE,WAAW,KAAK,MAAM,GAAG,SAAS,CAAC,GAC/C,CAAC,MAAM,SAAS,CAAC,CAAC;CA+MvB,CAAC"}
+{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAIjC,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,QAAQ,cACR,MAAM,eACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,KAC3D;IACD,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,SAAS,EACL,CAAC,CAAC,QAAQ,EAAE,WAAW,KAAK,MAAM,GAAG,SAAS,CAAC,GAC/C,CAAC,MAAM,SAAS,CAAC,CAAC;CAiNvB,CAAC"}

package/dist/esm/hooks/useQuill.js

@@ -163,8 +163,10 @@ export const useQuill = (reportId, pagination) => {
     }, [reportId, specificReportFilters]);
     return {
         data: processedReport ?? null,
-        // rows is undefined sometimes when loading is false ??? @sam
-        loading: !processedReport || !processedReport.rows || loading,
+        loading: !reportId
+            || (reports[reportId] || dashboard[reportId])?.loadingRows
+            || !processedReport?.rows
+            || loading,
         error,
         fetchMore,
         setSort,

package/dist/esm/hooks/useReport.d.ts

@@ -0,0 +1,12 @@
+import { QuillReportInternal } from '../models/Report';
+import { DashboardFilter, Filter } from '../models/Filter';
+export declare const useReports: () => {
+    reloadFilteredReports: (predicate: (report: QuillReportInternal) => boolean) => void;
+};
+export declare const useReport: (reportId: string) => {
+    reload: (overrideFilters: {
+        filters: DashboardFilter[];
+        editedFilterLabel?: string;
+    }, customFilters?: Filter[], initiator?: "Chart" | "useQuill" | "useExport") => Promise<void>;
+};
+//# sourceMappingURL=useReport.d.ts.map

package/dist/esm/hooks/useReport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useReport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useReport.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAuB,eAAe,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEhF,eAAO,MAAM,UAAU;uCAYR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAIF,eAAO,MAAM,SAAS,aAAc,MAAM;8BAIrB;QACf,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,kBACc,MAAM,EAAE,cACZ,OAAO,GAAG,UAAU,GAAG,WAAW;CAmChD,CAAC"}

package/dist/esm/hooks/useReport.js

@@ -0,0 +1,51 @@
+import { useContext } from 'react';
+import { DashboardContext, ReportFiltersContext, ReportsContext, } from '../Context';
+import { convertCustomFilter } from '../models/Filter';
+export const useReports = () => {
+    const [dashboard, dispatch] = useContext(DashboardContext);
+    const reloadReport = (id) => {
+        dispatch({
+            type: 'UPDATE_DASHBOARD_ITEM',
+            id: id,
+            data: { triggerReload: true },
+        });
+    };
+    const reloadFilteredReports = (predicate) => {
+        for (const id in dashboard) {
+            if (predicate(dashboard[id])) {
+                reloadReport(id);
+            }
+        }
+    };
+    return {
+        reloadFilteredReports,
+    };
+};
+// Exposes context operations with the "Report" scope
+// Not meant to be customer facing
+export const useReport = (reportId) => {
+    const { loadFiltersForReport } = useContext(ReportFiltersContext);
+    const { reports, reportsDispatch } = useContext(ReportsContext);
+    const reload = async (overrideFilters, customFilters = [], initiator = 'Chart') => {
+        // Set loading member on the report to true
+        reportsDispatch({
+            type: 'UPDATE_REPORT',
+            id: reportId,
+            data: { loadingRows: true },
+        });
+        // Pull the date filter out of the override filters, process it, and append it to the filters
+        const dateFilter = overrideFilters.filters.find((f) => f.filterType === 'date_range');
+        loadFiltersForReport(reportId, initiator, [
+            ...(dateFilter
+                ? [
+                    {
+                        ...dateFilter,
+                        dateField: [reports[reportId]?.dateField],
+                    },
+                ]
+                : []),
+            ...(overrideFilters.filters.filter((f) => f.filterType !== 'date_range') ?? []),
+        ], overrideFilters.editedFilterLabel, customFilters.map(convertCustomFilter));
+    };
+    return { reload };
+};

package/dist/esm/index.d.ts

@@ -14,7 +14,8 @@ export type { ReportBuilderProps } from './ReportBuilder';
 export { default as ChartEditor } from './ChartEditor';
 export type { ChartEditorProps } from './ChartEditor';
 export { quillFormat as format } from './utils/valueFormatter';
-export { useDashboard, useReports, useDashboards } from './hooks/useDashboard';
+export { useDashboard, useDashboards } from './hooks/useDashboard';
+export { useReports } from './hooks/useReport';
 export { useQuill } from './hooks/useQuill';
 export { useExport } from './hooks/useExport';
 export { useMemoizedRows } from './hooks/useFormat';

package/dist/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChF,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,mBAAmB,EACnB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,0BAA0B,EAC1B,6BAA6B,EAC7B,4BAA4B,EAC5B,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EACV,6BAA6B,EAC7B,qBAAqB,EACrB,SAAS,GACV,MAAM,wCAAwC,CAAC;AAChD,YAAY,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,UAAU,GACX,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChF,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,mBAAmB,EACnB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,0BAA0B,EAC1B,6BAA6B,EAC7B,4BAA4B,EAC5B,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EACV,6BAA6B,EAC7B,qBAAqB,EACrB,SAAS,GACV,MAAM,wCAAwC,CAAC;AAChD,YAAY,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,UAAU,GACX,MAAM,iBAAiB,CAAC"}

package/dist/esm/index.js

@@ -7,7 +7,8 @@ export { default as SQLEditor, SchemaListComponent } from './SQLEditor';
 export { default as ReportBuilder } from './ReportBuilder';
 export { default as ChartEditor } from './ChartEditor';
 export { quillFormat as format } from './utils/valueFormatter';
-export { useDashboard, useReports, useDashboards } from './hooks/useDashboard';
+export { useDashboard, useDashboards } from './hooks/useDashboard';
+export { useReports } from './hooks/useReport';
 export { useQuill } from './hooks/useQuill';
 export { useExport } from './hooks/useExport';
 export { useMemoizedRows } from './hooks/useFormat';