@quillsql/react 2.13.20 → 2.13.22

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

@@ -11,44 +11,34 @@ const axisFormatter_1 = require("../../utils/axisFormatter");
 const color_1 = require("../../utils/color");
 const ChartTooltip_1 = __importDefault(require("../../components/Chart/ChartTooltip"));
 const getDomain_1 = __importDefault(require("../../utils/getDomain"));
-const react_1 = require("react");
 const crypto_1 = require("../../utils/crypto");
+const react_1 = require("react");
 function createLineForEmptyChart(yAxisFields, dateFilter, xAxisField, xAxisFormat) {
     let lineChartData = [];
-    if (dateFilter &&
+    if (dateFilter && dateFilter.startDate && dateFilter.endDate &&
         valueFormatter_1.DATE_FORMAT_TYPES.includes(xAxisFormat || '') &&
         (!lineChartData || lineChartData.length === 0)) {
         const xAxis = xAxisField || '';
         const yAxis = yAxisFields[0]?.field;
-        const startDate = (0, valueFormatter_1.quillFormat)({
-            value: dateFilter?.startDate,
-            format: xAxisFormat,
-        });
-        const endDate = (0, valueFormatter_1.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;
 }
 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] = (0, react_1.useState)(data);
-    (0, react_1.useEffect)(() => {
+    const formattedData = (0, react_1.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 ((0, jsx_runtime_1.jsx)("div", { style: {
                 display: 'flex',

package/dist/cjs/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/cjs/components/Dashboard/DashboardFilter.js

@@ -2,11 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DashboardFilter = DashboardFilter;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
 const dateRangePickerUtils_1 = require("../../DateRangePicker/dateRangePickerUtils");
 const QuillDateRangePicker_1 = require("../../DateRangePicker/QuillDateRangePicker");
 const QuillMultiSelect_1 = require("../QuillMultiSelect");
 const QuillSelect_1 = require("../QuillSelect");
 function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect_1.QuillSelectComponent, MultiSelectComponent = QuillMultiSelect_1.QuillMultiSelectComponent, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, theme, isLoading, }) {
+    const preset = (0, react_1.useMemo)(() => {
+        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 ?? filter.primaryRange.value;
+            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 '';
+            }
+            return filter.preset?.value ?? filter.primaryRange.value;
+        }
+        return '';
+    }, [filter]);
     if (!filter.options && !isLoading && !(filter.filterType === 'date_range')) {
         return null;
     }
@@ -48,7 +66,7 @@ function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect
                 display: 'flex',
                 flexDirection: 'row',
                 alignItems: 'flex-end',
-            }, children: [(0, jsx_runtime_1.jsx)(DateRangePickerComponent, { label: filter.label, dateRange: { startDate: filter.startDate, endDate: filter.endDate }, preset: filter.preset?.value, onChangeDateRange: (value) => {
+            }, children: [(0, jsx_runtime_1.jsx)(DateRangePickerComponent, { label: filter.label, dateRange: { startDate: filter.startDate, endDate: filter.endDate }, preset: preset, onChangeDateRange: (value) => {
                         onChangeFilter(filter, {
                             startDate: value.startDate,
                             endDate: value.endDate,

package/dist/cjs/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;AA2BtE,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/cjs/components/Dashboard/DataLoader.js

@@ -14,7 +14,6 @@ const tableProcessing_1 = require("../../utils/tableProcessing");
 const Chart_1 = require("../../Chart");
 const merge_1 = require("../../utils/merge");
 const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
-const filterProcessing_1 = require("../../utils/filterProcessing");
 const constructReportFromItem = (item) => {
     return {
         ...report_1.EMPTY_INTERNAL_REPORT,
@@ -143,7 +142,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
         rowCountAbortController.current?.abort();
         rowCountAbortController.current = new AbortController();
         try {
-            const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, true, (0, filterProcessing_1.mergeCustomFilters)(filters, userFilters ?? []), processing, schemaData.customFields, rowCountAbortController.current.signal);
+            const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, true, filters.concat(userFilters ?? []), processing, schemaData.customFields, rowCountAbortController.current.signal);
             rowCountAbortController.current = null;
             if (rowCount) {
                 if (reportMode) {
@@ -211,7 +210,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
                 updateTableRowsAbortController.current?.abort();
                 updateTableRowsAbortController.current = new AbortController();
                 const updatedProcessing = { ...additionalProcessing, ...processing };
-                const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(item.id, client, updatedProcessing, (0, filterProcessing_1.mergeCustomFilters)(filters, userFilters ?? []), schemaData.customFields, true, undefined, updateTableRowsAbortController.current.signal);
+                const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(item.id, client, updatedProcessing, filters.concat(userFilters ?? []), schemaData.customFields, true, undefined, updateTableRowsAbortController.current.signal);
                 updateTableRowsAbortController.current = null;
                 if (paginatedRows.error) {
                     throw new Error('Error fetching chart');
@@ -227,14 +226,22 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
                     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);
@@ -253,24 +260,24 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
         if (!client || !filters) {
             return;
         }
-        const fetchRowsRequestId = rowsRequestId.current + 1;
-        rowsRequestId.current = fetchRowsRequestId;
         const tempReport = (reportMode ? reports : dashboard)[item.id];
         if (tempReport &&
             !(0, Chart_1.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) {
@@ -279,14 +286,14 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
                 rowsAbortController.current = null;
             }
             else {
-                const { report: fetchedReport, error } = await (0, report_1.fetchReport)(item.id, client, true, (0, filterProcessing_1.mergeCustomFilters)(filters, userFilters ?? []), processing, undefined, schemaData.customFields, true, false, rowsAbortController.current.signal);
+                const { report: fetchedReport, error } = await (0, report_1.fetchReport)(item.id, client, true, filters.concat(userFilters ?? []), processing, undefined, schemaData.customFields, true, false, rowsAbortController.current.signal);
                 rowsAbortController.current = null;
                 dispatch({
                     type: 'ADD_DASHBOARD_ITEM',
                     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);
             }
@@ -355,6 +362,7 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
     const previousUserFilters = (0, react_1.useRef)(null);
     const previousDateBucket = (0, react_1.useRef)(undefined);
     const fetchReportAbortController = (0, react_1.useRef)(null);
+    const rowsRequestId = (0, react_1.useRef)(0);
     const chartReport = (0, react_1.useMemo)(() => {
         const report = reportMode ? reports[item.id] : dashboard[item.id];
         if (!report) {
@@ -376,9 +384,10 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
             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);
@@ -399,7 +408,7 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
                 fetchReportAbortController.current = null;
             }
             else {
-                const { report, error } = await (0, report_1.fetchReport)(item.id, client, useReportTask, (0, filterProcessing_1.mergeCustomFilters)(filters, userFilters ?? []), {
+                const { report, error } = await (0, report_1.fetchReport)(item.id, client, useReportTask, filters.concat(userFilters ?? []), {
                     ...additionalProcessing,
                     ...(item.pivot ? {} : { page: paginationProcessing_1.DEFAULT_PAGINATION }),
                 }, dateBucket, schemaData.customFields, undefined, undefined, fetchReportAbortController.current.signal);
@@ -409,7 +418,7 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
                     id: item.id,
                     data: { ...report, triggerReload: false },
                     appliedFilters: userFilters,
-                    loading: false,
+                    loadingRows: false,
                 });
                 setError(error);
             }
@@ -421,7 +430,9 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
             throw e;
         }
         finally {
-            setLoading(false);
+            if (fetchRowsRequestId === rowsRequestId.current) {
+                setLoading(false);
+            }
         }
     };
     (0, react_1.useEffect)(() => {

package/dist/cjs/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/cjs/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/cjs/hooks/useDashboard.js

@@ -1,32 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useDashboards = exports.useDashboard = exports.useReports = void 0;
+exports.useDashboards = exports.useDashboard = void 0;
 const react_1 = require("react");
 const Context_1 = require("../Context");
 const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
 const Filter_1 = require("../models/Filter");
 const filterProcessing_1 = require("../utils/filterProcessing");
-const useReports = () => {
-    const [dashboard, dispatch] = (0, react_1.useContext)(Context_1.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,
-    };
-};
-exports.useReports = useReports;
 const useDashboard = (dashboardName, customFilters) => {
     const { dashboardConfig, isLoading: isDashboardsLoading, loadDashboard, } = (0, react_1.useContext)(Context_1.DashboardConfigContext);
     const { dashboardFilters, loadFiltersForDashboard } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);

package/dist/cjs/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/cjs/hooks/useExport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAyD/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;;;;;;;;;;;;CAoMF,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/cjs/hooks/useExport.js

@@ -46,7 +46,7 @@ async function getExportData(client, dashboardFilters, reportId) {
         useNewNodeSql: true,
     };
     const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'same-origin', hostedBody, cloudBody);
-    const cleanedReport = await (0, dashboard_1.cleanDashboardItem)(resp, dashboardFilters);
+    const cleanedReport = await (0, dashboard_1.cleanDashboardItem)(resp, dashboardFilters, client);
     if (cleanedReport.chartType === 'table' && cleanedReport.pivot) {
         cleanedReport.columns = cleanedReport.yAxisFields;
     }
@@ -57,6 +57,7 @@ const useExport = (reportId, { CustomDocumentComponent = QuillCustomDocumentComp
 sectionField, } = {}) => {
     const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
     const [dashboard] = (0, react_1.useContext)(Context_1.DashboardContext);
+    const { reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
     const specificDashboardFilters = (0, react_1.useMemo)(() => {
         if (!reportId) {
             return [];
@@ -65,17 +66,21 @@ 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;
         });
     }, [dashboardFilters, dashboard, reportId]);
+    const specificReportFilters = (0, react_1.useMemo)(() => {
+        if (!reportId)
+            return [];
+        return Object.values(reportFilters[reportId] ?? []).map((f) => f.filter);
+    }, [reportFilters, reportId]);
     // const [theme] = useContext(ThemeContext);
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
     const [isCSVLoading, setIsCSVLoading] = (0, react_1.useState)(false);
     const [isPDFLoading, setIsPDFLoading] = (0, react_1.useState)(false);
     if (!reportId || !client) {
-        return { downloadCSV: () => { }, downloadPDF: () => { }, isLoading: false };
+        return { downloadCSV: () => { }, downloadPDF: () => { }, isPDFLoading: false, isCSVLoading: false };
     }
     return {
         downloadCSV: async () => {
@@ -83,7 +88,9 @@ sectionField, } = {}) => {
                 return;
             }
             setIsCSVLoading(true);
-            const resp = await getExportData(client, specificDashboardFilters, reportId);
+            const resp = await getExportData(client, specificReportFilters.length > 0
+                ? specificReportFilters
+                : specificDashboardFilters, reportId);
             (0, csv_1.downloadCSV)({
                 rows: resp.pivot && resp.pivotRows ? resp.pivotRows : resp.rows,
                 fields: resp.pivot && resp.pivotColumns ? resp.pivotColumns : resp.columns,
@@ -93,21 +100,14 @@ sectionField, } = {}) => {
         },
         downloadPDF: async () => {
             setIsPDFLoading(true);
-            // @ts-ignore
-            let report;
-            if (reportId &&
-                dashboard[reportId] &&
-                dashboardFilters &&
-                // @ts-ignore
-                dashboardFilters[dashboard[reportId].dashboardName]) {
-                const { report: fetchedReport } = await (0, report_1.fetchReport)(reportId, client, true, Object.values(
-                // @ts-ignore
-                dashboardFilters[dashboard[reportId].dashboardName]).map((elem) => elem.filter));
-                report = fetchedReport;
-            }
-            else {
-                const { report: fetchedReport } = await (0, report_1.fetchReport)(reportId, client, true, []);
-                report = fetchedReport;
+            const filters = specificReportFilters.length > 0
+                ? specificReportFilters
+                : specificDashboardFilters;
+            const { report: fetchedReport } = await (0, report_1.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) {
@@ -128,65 +128,98 @@ sectionField, } = {}) => {
             let currentPage = {};
             let currentCount = 0;
             let pageNumber = 1;
-            // Iterate over each group of rows
-            for (const groupKey in groupedRows) {
-                // @ts-ignore
-                const rows = groupedRows[groupKey];
-                let groupIndex = 0;
-                while (groupIndex < rows.length) {
-                    const remainingRows = rows.length - groupIndex;
+            if (sectionField) {
+                // Iterate over each group of rows
+                for (const groupKey in groupedRows) {
+                    // @ts-ignore
+                    const rows = groupedRows[groupKey];
+                    let groupIndex = 0;
+                    while (groupIndex < rows.length) {
+                        const remainingRows = rows.length - groupIndex;
+                        const availableSpace = maximumRowsPerPage - currentCount;
+                        const rowsToAdd = Math.min(remainingRows, availableSpace);
+                        // @ts-ignore
+                        currentPage[groupKey] = (currentPage[groupKey] || []).concat(rows.slice(groupIndex, groupIndex + rowsToAdd));
+                        currentCount += rowsToAdd;
+                        groupIndex += rowsToAdd;
+                        if (currentCount === maximumRowsPerPage) {
+                            if (Object.keys(currentPage).length > 0) {
+                                pageNumber++;
+                                const div = document.createElement('div');
+                                const root = (0, client_1.createRoot)(div);
+                                (0, react_dom_1.flushSync)(() => {
+                                    root.render((0, jsx_runtime_1.jsx)(CustomDocumentComponent, { report: {
+                                            // @ts-ignore
+                                            ...report,
+                                            // @ts-ignore
+                                            sections: currentPage,
+                                            filters,
+                                        }, pageNumber: pageNumber, numberOfPages: numberOfPages, maximumRowsPerPage: maximumRowsPerPage }));
+                                });
+                                // const divContentBuffer = Buffer.from(div.innerHTML, 'utf-8');
+                                // htmlBuffer = Buffer.concat([htmlBuffer, divContentBuffer]);
+                                html += div.innerHTML;
+                                currentPage = {};
+                                currentCount = 0;
+                            }
+                        }
+                    }
+                }
+                // Add the last page if it has remaining rows
+                if (Object.keys(currentPage).length > 0) {
+                    pageNumber++;
+                    const div = document.createElement('div');
+                    const root = (0, client_1.createRoot)(div);
+                    (0, react_dom_1.flushSync)(() => {
+                        root.render((0, jsx_runtime_1.jsx)(CustomDocumentComponent, { report: {
+                                // @ts-ignore
+                                ...report,
+                                // @ts-ignore
+                                sections: currentPage,
+                                filters,
+                            }, pageNumber: pageNumber, numberOfPages: numberOfPages, maximumRowsPerPage: maximumRowsPerPage }));
+                    });
+                    // const divContentBuffer = Buffer.from(div.innerHTML, 'utf-8');
+                    // htmlBuffer = Buffer.concat([htmlBuffer, divContentBuffer]);
+                    html += div.innerHTML;
+                    currentPage = {};
+                    currentCount = 0;
+                }
+            }
+            else {
+                const rows = report.rows;
+                for (let i = 0; i < rows.length; i += maximumRowsPerPage) {
+                    const remainingRows = rows.length - i * maximumRowsPerPage;
                     const availableSpace = maximumRowsPerPage - currentCount;
                     const rowsToAdd = Math.min(remainingRows, availableSpace);
-                    // @ts-ignore
-                    currentPage[groupKey] = (currentPage[groupKey] || []).concat(rows.slice(groupIndex, groupIndex + rowsToAdd));
                     currentCount += rowsToAdd;
-                    groupIndex += rowsToAdd;
                     if (currentCount === maximumRowsPerPage) {
-                        if (Object.keys(currentPage).length > 0) {
-                            pageNumber++;
-                            const div = document.createElement('div');
-                            const root = (0, client_1.createRoot)(div);
-                            (0, react_dom_1.flushSync)(() => {
-                                root.render((0, jsx_runtime_1.jsx)(CustomDocumentComponent, { report: {
-                                        // @ts-ignore
-                                        ...report,
-                                        // @ts-ignore
-                                        sections: currentPage,
-                                        filters: Object.values(
-                                        // @ts-ignore
-                                        dashboardFilters[report.dashboardName]).map((elem) => elem.filter),
-                                    }, pageNumber: pageNumber, numberOfPages: numberOfPages, maximumRowsPerPage: maximumRowsPerPage }));
-                            });
-                            // const divContentBuffer = Buffer.from(div.innerHTML, 'utf-8');
-                            // htmlBuffer = Buffer.concat([htmlBuffer, divContentBuffer]);
-                            html += div.innerHTML;
-                            currentPage = {};
-                            currentCount = 0;
-                        }
+                        pageNumber++;
+                        const div = document.createElement('div');
+                        const root = (0, client_1.createRoot)(div);
+                        (0, react_dom_1.flushSync)(() => {
+                            root.render((0, jsx_runtime_1.jsx)(CustomDocumentComponent, { report: report, pageNumber: pageNumber, numberOfPages: numberOfPages, maximumRowsPerPage: maximumRowsPerPage }));
+                        });
+                        // const divContentBuffer = Buffer.from(div.innerHTML, 'utf-8');
+                        // htmlBuffer = Buffer.concat([htmlBuffer, divContentBuffer]);
+                        html += div.innerHTML;
+                        currentCount = 0;
                     }
                 }
-            }
-            // Add the last page if it has remaining rows
-            if (Object.keys(currentPage).length > 0) {
-                pageNumber++;
-                const div = document.createElement('div');
-                const root = (0, client_1.createRoot)(div);
-                (0, react_dom_1.flushSync)(() => {
-                    root.render((0, jsx_runtime_1.jsx)(CustomDocumentComponent, { report: {
-                            // @ts-ignore
-                            ...report,
-                            // @ts-ignore
-                            sections: currentPage,
-                            filters: Object.values(
-                            // @ts-ignore
-                            dashboardFilters[report.dashboardName]).map((elem) => elem.filter),
-                        }, pageNumber: pageNumber, numberOfPages: numberOfPages, maximumRowsPerPage: maximumRowsPerPage }));
-                });
-                // const divContentBuffer = Buffer.from(div.innerHTML, 'utf-8');
-                // htmlBuffer = Buffer.concat([htmlBuffer, divContentBuffer]);
-                html += div.innerHTML;
-                currentPage = {};
-                currentCount = 0;
+                // Add the last page if it has remaining rows
+                if (currentCount < maximumRowsPerPage) {
+                    pageNumber++;
+                    const div = document.createElement('div');
+                    const root = (0, client_1.createRoot)(div);
+                    (0, react_dom_1.flushSync)(() => {
+                        root.render((0, jsx_runtime_1.jsx)(CustomDocumentComponent, { report: report, pageNumber: pageNumber, numberOfPages: numberOfPages, maximumRowsPerPage: maximumRowsPerPage }));
+                    });
+                    // const divContentBuffer = Buffer.from(div.innerHTML, 'utf-8');
+                    // htmlBuffer = Buffer.concat([htmlBuffer, divContentBuffer]);
+                    html += div.innerHTML;
+                    currentPage = {};
+                    currentCount = 0;
+                }
             }
             const doc = new jspdf_1.default('landscape', 'pt', 'a4');
             // const htmlStringFromBuffer = htmlBuffer.toString('utf-8');

package/dist/cjs/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;CA4MvB,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"}