@quillsql/react 2.13.20 → 2.13.21

package/dist/esm/hooks/useExport.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { downloadCSV } from '../utils/csv';
 import { useContext, useMemo, useState } from 'react';
 import { getData } from '../utils/dataFetcher';
-import { ClientContext, DashboardContext, DashboardFiltersContext, } from '../Context';
+import { ClientContext, DashboardContext, DashboardFiltersContext, ReportFiltersContext, } from '../Context';
 import { cleanDashboardItem } from '../utils/dashboard';
 import { defaultQuillTheme } from '../QuillProvider';
 import { createRoot } from 'react-dom/client';
@@ -51,6 +51,7 @@ export const useExport = (reportId, { CustomDocumentComponent = QuillCustomDocum
 sectionField, } = {}) => {
     const { dashboardFilters } = useContext(DashboardFiltersContext);
     const [dashboard] = useContext(DashboardContext);
+    const { reportFilters } = useContext(ReportFiltersContext);
     const specificDashboardFilters = useMemo(() => {
         if (!reportId) {
             return [];
@@ -64,6 +65,11 @@ sectionField, } = {}) => {
             return dashboardFilter.filter;
         });
     }, [dashboardFilters, dashboard, reportId]);
+    const specificReportFilters = useMemo(() => {
+        if (!reportId)
+            return [];
+        return Object.values(reportFilters[reportId] ?? []).map((f) => f.filter);
+    }, [reportFilters, reportId]);
     // const [theme] = useContext(ThemeContext);
     const [client] = useContext(ClientContext);
     const [isCSVLoading, setIsCSVLoading] = useState(false);
@@ -77,7 +83,9 @@ sectionField, } = {}) => {
                 return;
             }
             setIsCSVLoading(true);
-            const resp = await getExportData(client, specificDashboardFilters, reportId);
+            const resp = await getExportData(client, specificReportFilters.length > 0
+                ? specificReportFilters
+                : specificDashboardFilters, reportId);
             downloadCSV({
                 rows: resp.pivot && resp.pivotRows ? resp.pivotRows : resp.rows,
                 fields: resp.pivot && resp.pivotColumns ? resp.pivotColumns : resp.columns,
@@ -87,22 +95,11 @@ sectionField, } = {}) => {
         },
         downloadPDF: async () => {
             setIsPDFLoading(true);
-            // @ts-ignore
-            let report;
-            if (reportId &&
-                dashboard[reportId] &&
-                dashboardFilters &&
-                // @ts-ignore
-                dashboardFilters[dashboard[reportId].dashboardName]) {
-                const { report: fetchedReport } = await fetchReport(reportId, client, true, Object.values(
-                // @ts-ignore
-                dashboardFilters[dashboard[reportId].dashboardName]).map((elem) => elem.filter));
-                report = fetchedReport;
-            }
-            else {
-                const { report: fetchedReport } = await fetchReport(reportId, client, true, []);
-                report = fetchedReport;
-            }
+            const filters = specificReportFilters.length > 0
+                ? specificReportFilters
+                : specificDashboardFilters;
+            const { report: fetchedReport } = await fetchReport(reportId, client, true, filters);
+            const report = fetchedReport;
             let groupedRows = {};
             if (sectionField) {
                 groupedRows = (report?.rows || []).reduce((acc, row) => {
@@ -122,65 +119,99 @@ 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 = createRoot(div);
+                                flushSync(() => {
+                                    root.render(_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 = createRoot(div);
+                    flushSync(() => {
+                        root.render(_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 = createRoot(div);
-                            flushSync(() => {
-                                root.render(_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 = createRoot(div);
+                        flushSync(() => {
+                            root.render(_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;
+                        console.log('html', html);
+                        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 = createRoot(div);
-                flushSync(() => {
-                    root.render(_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 = createRoot(div);
+                    flushSync(() => {
+                        root.render(_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('landscape', 'pt', 'a4');
             // const htmlStringFromBuffer = htmlBuffer.toString('utf-8');

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;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;CA+MvB,CAAC"}

package/dist/esm/hooks/useQuill.js

@@ -10,17 +10,9 @@ export const useQuill = (reportId, pagination) => {
     const [dashboard] = useContext(DashboardContext);
     const { dashboardFilters } = useContext(DashboardFiltersContext);
     const { reportFilters, reportFiltersDispatch } = useContext(ReportFiltersContext);
-    const specificDashboardFilters = useMemo(() => {
-        if (!reportId)
-            return [];
-        const dashboardName = reports[reportId]?.dashboardName;
-        if (!dashboardName)
-            return [];
-        return Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter);
-    }, [dashboardFilters, reportId, dashboard]);
     const specificReportFilters = useMemo(() => {
         if (!reportId)
-            return [];
+            return null;
         return Object.values(reportFilters[reportId] ?? []).map((f) => f.filter);
     }, [reportFilters, reportId]);
     const [schemaData] = useContext(SchemaDataContext);
@@ -30,7 +22,7 @@ export const useQuill = (reportId, pagination) => {
     const [previousPage, setPreviousPage] = useState(0);
     const processedReport = useMemo(() => {
         return reportId && (reports[reportId] || dashboard[reportId])
-            ? convertInternalReportToReport(mergeComparisonRange(reports[reportId] || dashboard[reportId]), specificReportFilters)
+            ? convertInternalReportToReport(mergeComparisonRange(reports[reportId] || dashboard[reportId]), specificReportFilters ?? [], 'useQuill')
             : undefined;
     }, [
         reportId,
@@ -137,16 +129,9 @@ export const useQuill = (reportId, pagination) => {
             setLoading(false);
             return;
         }
-        if (specificDashboardFilters.length && !specificReportFilters.length) {
-            reportFiltersDispatch({
-                type: 'ADD_REPORT_FILTERS',
-                id: curReportId,
-                data: Object.values(dashboardFilters[curReportId] ?? []),
-            });
-        }
         setLoading(true);
         try {
-            await fetchIndividualReport(curReportId, 'useQuill', true, specificReportFilters, [], additionalProcessing);
+            await fetchIndividualReport(curReportId, 'useQuill', true, specificReportFilters || [], [], additionalProcessing);
         }
         catch (error) {
             setError(error.message ?? 'Error fetching report');
@@ -156,15 +141,30 @@ export const useQuill = (reportId, pagination) => {
         }
     };
     useEffect(() => {
-        if (reportId) {
+        if (reportId && specificReportFilters) {
             fetchReportHelper(reportId, {
                 page: pagination,
             });
         }
-    }, [reportId]);
+        // if we don't have report filters, we need set those
+        if (reportId && !specificReportFilters) {
+            // should always resolve to some dashboard name given that spacificDashboardFilters is not empty
+            const dashboardName = reportId && reports[reportId]
+                ? reports[reportId].dashboardName
+                : '';
+            reportFiltersDispatch({
+                type: 'ADD_REPORT_FILTERS',
+                id: reportId,
+                data: dashboardName
+                    ? Object.values(dashboardFilters[dashboardName] ?? {})
+                    : [],
+            });
+        }
+    }, [reportId, specificReportFilters]);
     return {
         data: processedReport ?? null,
-        loading,
+        // rows is undefined sometimes when loading is false ??? @sam
+        loading: !processedReport || !processedReport.rows || loading,
         error,
         fetchMore,
         setSort,

package/dist/esm/utils/filterProcessing.d.ts

@@ -1,4 +1,4 @@
-import { FieldType, InternalFilter, DashboardFilter, DashboardDateFilter } from '../models/Filter';
+import { FieldType, InternalFilter, DashboardFilter, DashboardDateFilter, Filter } from '../models/Filter';
 import { QuillReport } from '../models/Report';
 import { UniqueValuesByColumn } from '../models/Tables';
 import { FilterTreeNode } from './astFilterProcessing';
@@ -28,6 +28,7 @@ export declare function buildQueryFromFilters(baseAst: any, filters: FilterTreeN
     error?: string;
 }>;
 export declare function mergeCustomFilters(filters: DashboardFilter[], customFilters: InternalFilter[]): any[];
+export declare function applyCustomFilterToDashDateFilter(customDateFilter: Filter, dashboardDateFilter: DashboardDateFilter): DashboardDateFilter;
 export declare function filtersAreEquivalent(filters1?: InternalFilter[], filters2?: InternalFilter[]): boolean;
 /**
  * Helper function that converts a UniqueValuesByColumn interface to a string map

package/dist/esm/utils/filterProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,eAAe,EAEf,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAU,EACjB,UAAU,EAAE,GAAU,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,6EAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2B/D;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CAsCP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,GAAG;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,eAAe,EAEf,mBAAmB,EACnB,MAAM,EACP,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAU,EACjB,UAAU,EAAE,GAAU,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,6EAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2B/D;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CAsCP;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAiBrB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,GAAG;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}

package/dist/esm/utils/filterProcessing.js

@@ -364,6 +364,21 @@ export function mergeCustomFilters(filters, customFilters) {
     ])
         .concat(customWithoutDate);
 }
+export function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDateFilter) {
+    if (customDateFilter.value &&
+        typeof customDateFilter.value === 'object' &&
+        'startDate' in customDateFilter.value &&
+        'endDate' in customDateFilter.value) {
+        const startDate = customDateFilter.value.startDate;
+        const endDate = customDateFilter.value.endDate;
+        return {
+            ...dashboardDateFilter,
+            startDate: new Date(startDate),
+            endDate: new Date(endDate),
+        };
+    }
+    return dashboardDateFilter;
+}
 export function filtersAreEquivalent(filters1, filters2) {
     if (!filters1 && !filters2) {
         return true;

package/dist/esm/utils/queryConstructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,uBAAuB,CAAC,EAAE,OAAO,EACjC,sBAAsB,CAAC,EAAE,OAAO,UAqEjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAYrB;AAiDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAarB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAgCpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,uBAAuB,CAAC,EAAE,OAAO,EACjC,sBAAsB,CAAC,EAAE,OAAO,UAqEjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAYrB;AAiDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAgCpB"}

package/dist/esm/utils/queryConstructor.js

@@ -183,11 +183,12 @@ function generateDistinctQuerySnowflake(stringFields, query) {
 }
 export function generateMinMaxRangeQueries(columnFields, query, databaseType) {
     const max = databaseType.toLowerCase() === 'snowflake' ? 'GREATEST' : 'MAX';
+    const min = databaseType.toLowerCase() === 'snowflake' ? 'LEAST' : 'MIN';
     const distinctQueries = columnFields.map((field) => {
         const wrappedField = ['postgresql'].includes(databaseType.toLowerCase())
             ? `"${field}"`
             : field;
-        return `SELECT '${field}' AS field, MIN(${wrappedField}) AS min_range, ${max}(${wrappedField}) AS max_range FROM querytable`;
+        return `SELECT '${field}' AS field, ${min}(${wrappedField}) AS min_range, ${max}(${wrappedField}) AS max_range FROM querytable`;
     });
     const distinctQuery = distinctQueries.join(' UNION ALL ');
     return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;

package/dist/esm/utils/report.d.ts

@@ -46,7 +46,7 @@ export declare function saveReport({ report, dashboardItemId, client, }: {
     client: QuillProviderClient;
 }): Promise<any>;
 export declare const formatRowsFromReport: (report: any) => any;
-export declare function convertInternalReportToReport(report: QuillReportInternal, dashboardFilters: DashboardFilter[]): QuillReport;
+export declare function convertInternalReportToReport(report: QuillReportInternal, dashboardFilters: DashboardFilter[], initiator?: string): QuillReport;
 export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: Table[], client: QuillProviderClient, pivot?: Pivot, previousFormData?: any, currentTable?: string, previousRelevant?: {
     uniqueStrings: UniqueValuesByTable;
     dateRanges: DateRangesByColumn;

package/dist/esm/utils/report.d.ts.map

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

package/dist/esm/utils/report.js

@@ -272,7 +272,7 @@ export const formatRowsFromReport = (report) => {
         }, {});
     });
 };
-export function convertInternalReportToReport(report, dashboardFilters) {
+export function convertInternalReportToReport(report, dashboardFilters, initiator) {
     try {
         if (!report) {
             return EMPTY_REPORT;
@@ -280,7 +280,9 @@ export function convertInternalReportToReport(report, dashboardFilters) {
         const formattedReport = {
             ...report,
         };
-        if (formattedReport.pivot && isValidPivot(formattedReport.pivot)) {
+        if (formattedReport.pivot &&
+            isValidPivot(formattedReport.pivot) &&
+            initiator !== 'useQuill') {
             let columns = report.pivotColumns ?? report.columns;
             let rows = report.pivotRows ?? report.rows;
             if (report.chartType === 'table') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.13.20",
+  "version": "2.13.21",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
@@ -15,9 +15,9 @@
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.json && tsc -p tsconfig.esm.json",
     "dev": "concurrently \"npm run dev:types\" \"npm run dev:esm\" \"npm run dev:cjs\"",
-    "dev:types": "tsc --emitDeclarationOnly -w",
-    "dev:esm": "babel src --out-dir dist/esm --extensions \".ts,.tsx\" --copy-files --watch --env-name esm",
     "dev:cjs": "babel src --out-dir dist/cjs --extensions \".ts,.tsx\" --copy-files --watch --env-name cjs",
+    "dev:esm": "babel src --out-dir dist/esm --extensions \".ts,.tsx\" --copy-files --watch --env-name esm",
+    "dev:types": "tsc --emitDeclarationOnly -w",
     "lint": "eslint . --max-warnings 0",
     "pub": "rm -rf dist && tsc -p tsconfig.json && tsc -p tsconfig.esm.json && npm publish --access public"
   },
@@ -56,4 +56,4 @@
     "react-dom": "^18"
   },
   "access": "public"
-}
+}