@quillsql/react 2.12.53 → 2.13.0

package/dist/esm/components/UiComponents.js

@@ -379,12 +379,12 @@ export const QuillTableSQLEditorComponent = ({ rows, columns, isLoading = false,
             onPageChange && onPageChange(page);
         }, onSortChange: (sort) => {
             setSort(sort);
-            setPage(page);
             setCurrentPage && setCurrentPage(0);
+            setPage(0);
             onSortChange && onSortChange(sort);
         }, sort: sort, currentPage: currentPage ?? page, isLoading: isLoading, containerStyle: containerStyle }));
 };
-export const QuillTableComponent = ({ rows, columns, isLoading = false, rowCount, onPageChange, onSortChange, }) => {
+export const QuillTableComponent = ({ rows, columns, isLoading = false, rowCount, rowCountIsLoading, onPageChange, onSortChange, }) => {
     const [sort, setSort] = useState({ field: '', direction: '' });
     const [page, setPage] = useState(0);
     const [initialLoad, setInitialLoad] = useState(true);
@@ -402,7 +402,7 @@ export const QuillTableComponent = ({ rows, columns, isLoading = false, rowCount
                 height: '100%',
             }, children: _jsx(ChartSkeleton, {}) }));
     }
-    return (_jsx(QuillTable, { rows: rows, columns: columns, rowsPerPage: DEFAULT_PAGINATION.rowsPerPage, rowCount: rowCount, onPageChange: (page) => {
+    return (_jsx(QuillTable, { rows: rows, columns: columns, rowsPerPage: DEFAULT_PAGINATION.rowsPerPage, rowCount: rowCount, rowCountIsLoading: rowCountIsLoading, onPageChange: (page) => {
             setPage(page);
             onPageChange && onPageChange(page);
         }, onSortChange: (sort) => {

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

@@ -7,13 +7,16 @@ export declare const useDashboard: (dashboardName: string) => {
     data: import("../models/Dashboard").DashboardConfig | null | undefined;
     dashboardFilters: DashboardFilter[] | null;
     isLoading: boolean | undefined;
-    isDashboardFiltersLoading: boolean;
+    isDashboardFilterLoading: (filterName: string) => boolean | undefined;
     error: any;
     reload: (overrideDashboardName?: string, fetchFromServer?: boolean, reportAction?: {
         report: QuillReport | {
             id: string;
         };
         action: 'upsert' | 'delete';
+    }, overrideFilters?: {
+        filters: DashboardFilter[];
+        editedFilterLabel: string;
     }) => Promise<void>;
 };
 //# sourceMappingURL=useDashboard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAKpE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,eAAO,MAAM,UAAU;gDAYC,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAEF,eAAO,MAAM,YAAY,kBAAmB,MAAM;;;;;;qCAuBtB,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B;CA+IJ,CAAC"}
+{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOpE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGnD,eAAO,MAAM,UAAU;gDAYC,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAEF,eAAO,MAAM,YAAY,kBAAmB,MAAM;;;;2CAiQF,MAAM;;qCA3O1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAAE,OAAO,EAAE,eAAe,EAAE,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAA;KAAE;CAqP9E,CAAC"}

package/dist/esm/hooks/useDashboard.js

@@ -1,6 +1,8 @@
 import { useContext, useMemo, useState } from 'react';
-import { ClientContext, DashboardConfigContext, DashboardContext, } from '../Context';
-import { getDashboard, getDashboardFilters as getFilters, } from '../utils/dashboard';
+import { ClientContext, DashboardConfigContext, DashboardContext, DashboardFiltersContext, } from '../Context';
+import { getDashboard } from '../utils/dashboard';
+import { COMPARISON_RANGE, PRIMARY_RANGE, } from '../DateRangePicker/dateRangePickerUtils';
+import equal from 'fast-deep-equal';
 export const useReports = () => {
     const [dashboard, dispatch] = useContext(DashboardContext);
     const reloadReport = (id) => {
@@ -23,131 +25,191 @@ export const useReports = () => {
 };
 export const useDashboard = (dashboardName) => {
     const [dashboardConfig, dashboardConfigContext] = useContext(DashboardConfigContext);
+    const { dashboardFilters, loadFiltersForDashboard } = useContext(DashboardFiltersContext);
     const [dashboard] = useContext(DashboardContext);
     const [isLoading, setIsLoading] = useState(true);
     const [error, setError] = useState(null);
     const [client, isClientLoading] = useContext(ClientContext);
-    const [dashboardFilters, setDashboardFilters] = useState(null);
-    const [dashboardFiltersLoading, setDashboardFiltersLoading] = useState(true);
     const loading = useMemo(() => isLoading ||
         isClientLoading ||
         (dashboardConfig[dashboardName] &&
             !dashboardConfig[dashboardName]?.sections), [isLoading, isClientLoading, dashboardConfig, dashboardName]);
-    const handleReload = async (overrideDashboardName, fetchFromServer = false, reportAction) => {
-        await Promise.allSettled([
-            getDashboardFilters(overrideDashboardName ?? dashboardName, fetchFromServer),
-            getDashboards(overrideDashboardName ?? dashboardName, fetchFromServer, reportAction),
+    const handleReload = async (overrideDashboardName, fetchFromServer = false, reportAction, overrideFilters) => {
+        if (!fetchFromServer && isLoading)
+            return;
+        if (overrideFilters) {
+            // 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');
+            loadFiltersForDashboard(dashboardName, [
+                ...(dateFilter
+                    ? [
+                        {
+                            ...dateFilter,
+                            dateField: [
+                                ...new Map(Object.values(dashboardConfig[overrideDashboardName ?? dashboardName]
+                                    ?.sections ?? {})
+                                    .flat()
+                                    .map((report) => {
+                                    const key = JSON.stringify(report.dateField);
+                                    return [key, report.dateField];
+                                })).values(),
+                            ],
+                        },
+                    ]
+                    : []),
+                ...(overrideFilters.filters.filter((f) => f.filterType !== 'date_range') ?? []),
+            ], overrideFilters.editedFilterLabel);
+            return;
+        }
+        const dashboard = await getDashboards(overrideDashboardName ?? dashboardName, fetchFromServer, reportAction);
+        if (!fetchFromServer &&
+            Object.keys(dashboardFilters[dashboardName] ?? {}).length)
+            return;
+        const dateFilter = dashboard?.dateFilter
+            ? {
+                ...dashboard?.dateFilter,
+                startDate: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ?? 'LAST_30_DAYS']?.start,
+                endDate: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ?? 'LAST_30_DAYS']?.end,
+                filterType: 'date_range',
+                dateField: [
+                    ...new Map(Object.values(dashboard?.sections ?? {})
+                        .flat()
+                        .map((report) => {
+                        const key = JSON.stringify(report.dateField);
+                        return [key, report.dateField];
+                    })).values(),
+                ],
+                preset: dashboard?.dateFilter.primaryRange,
+                dashboardName: overrideDashboardName ?? dashboardName,
+                comparisonRange: dashboard?.dateFilter.comparison
+                    ? {
+                        startDate: dashboard?.dateFilter.comparsionRange?.startDate ??
+                            COMPARISON_RANGE[dashboard?.dateFilter
+                                .defaultComparisonRange ??
+                                'NO_COMPARISON']({
+                                start: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
+                                    'LAST_30_DAYS']?.start,
+                                end: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
+                                    'LAST_30_DAYS']?.end,
+                            })?.start,
+                        endDate: dashboard?.dateFilter.comparsionRange?.endDate ??
+                            COMPARISON_RANGE[dashboard?.dateFilter
+                                .defaultComparisonRange ??
+                                'NO_COMPARISON']({
+                                start: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
+                                    'LAST_30_DAYS']?.start,
+                                end: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
+                                    'LAST_30_DAYS']?.end,
+                            })?.end,
+                        value: dashboard?.dateFilter.comparsionRange?.value ??
+                            dashboard.dateFilter?.defaultComparisonRange,
+                    }
+                    : undefined,
+            }
+            : undefined;
+        // Append dateFilter to the filters unless it's undefined
+        loadFiltersForDashboard(dashboardName, [
+            ...(dateFilter ? [dateFilter] : []),
+            ...(dashboard?.filters ?? []),
         ]);
     };
-    //FIXME: report should be of type QuillReport
     async function getDashboards(dashboardName, fetchFromServer = false, reportAction) {
-        setIsLoading(true);
-        if (!fetchFromServer && dashboardConfig) {
+        const curDashboardConfig = dashboardConfig[dashboardName];
+        if (!fetchFromServer && curDashboardConfig?.sections) {
             if (reportAction?.action === 'delete') {
                 dashboardConfigContext({
                     type: 'UPDATE_DASHBOARD',
                     id: dashboardName,
                     data: {
-                        ...dashboardConfig[dashboardName],
-                        sections: {
-                            '': dashboardConfig[dashboardName]?.sections?.[''].filter((report) => (report.id ?? report._id) !==
-                                (reportAction.report.id ?? reportAction.report._id)),
-                        },
+                        ...curDashboardConfig,
+                        sections: Object.fromEntries(Object.entries(curDashboardConfig?.sections ?? {}).map(([sectionKey, reports]) => [
+                            sectionKey,
+                            reports.filter((report) => report.id !== reportAction.report.id),
+                        ])),
                     },
                 });
             }
             else if (reportAction?.action === 'upsert') {
-                const containsReport = dashboardConfig[dashboardName]?.sections?.[''].some((report) => (report.id ?? report._id) ===
-                    (reportAction?.report.id ?? reportAction?.report._id));
+                const containsReport = Object.values(curDashboardConfig?.sections ?? {})
+                    .flat()
+                    .some((report) => (report.id ?? report._id) === reportAction?.report.id);
                 dashboardConfigContext({
                     type: 'UPDATE_DASHBOARD',
                     id: dashboardName,
                     data: {
-                        ...dashboardConfig[dashboardName],
-                        sections: {
-                            '': containsReport
-                                ? dashboardConfig[dashboardName]?.sections?.[''].map((report) => {
+                        ...curDashboardConfig,
+                        sections: Object.fromEntries(Object.entries(curDashboardConfig?.sections ?? {}).map(([sectionKey, reports]) => [
+                            sectionKey,
+                            containsReport
+                                ? reports.map((report) => {
                                     return {
                                         report,
-                                        // FIXME: this is bizarre. The _id field shouldn't even exist on the report according to the type, but that's what is set.
-                                        ...((reportAction?.report.id ??
-                                            reportAction?.report._id) ===
-                                            (report.id ?? report._id)
+                                        ...(reportAction?.report.id === report.id
                                             ? reportAction?.report
-                                            : dashboard[report.id ?? report._id]),
-                                        _id: report.id ?? report._id,
+                                            : dashboard[report.id]),
+                                        _id: report.id,
+                                        id: report.id,
                                     };
                                 })
                                 : [
-                                    ...(dashboardConfig[dashboardName]?.sections?.[''] ?? []),
+                                    ...(reports ?? []),
                                     {
                                         report: reportAction?.report,
-                                        ...dashboard[reportAction?.report.id ?? reportAction?.report._id],
-                                        _id: reportAction?.report.id ?? reportAction?.report._id,
+                                        ...dashboard[reportAction?.report.id],
+                                        id: reportAction?.report.id,
+                                        _id: reportAction?.report.id,
                                     },
                                 ],
-                        },
+                        ])),
                     },
                 });
             }
             setIsLoading(false);
-            return;
+            return curDashboardConfig;
         }
-        const curDashboardConfig = dashboardConfig[dashboardName];
         if (!fetchFromServer &&
             curDashboardConfig &&
             curDashboardConfig.newQueries) {
             setIsLoading(false);
-            return;
+            return curDashboardConfig;
         }
         if (!client || !client.publicKey || !client.organizationId) {
-            return;
+            return curDashboardConfig;
         }
         if (dashboardName === null || dashboardName === undefined)
-            return;
+            return curDashboardConfig;
         try {
+            setIsLoading(true);
             const resp = await getDashboard(dashboardName, client);
-            dashboardConfigContext({
-                type: 'ADD_DASHBOARD',
-                id: dashboardName,
-                data: { ...resp },
-            });
-            setIsLoading(false);
+            // if dashboard has changed
+            if (!equal(resp, curDashboardConfig)) {
+                dashboardConfigContext({
+                    type: 'ADD_DASHBOARD',
+                    id: dashboardName,
+                    data: { ...resp },
+                });
+            }
             setError(null);
+            return resp;
         }
         catch (error) {
-            setIsLoading(false);
             setError(error);
             console.error('Error fetching data:', error);
         }
-    }
-    async function getDashboardFilters(dashboardName, fetchFromServer = false) {
-        if (!fetchFromServer && dashboardFilters) {
-            setDashboardFiltersLoading(false);
-            return;
-        }
-        setDashboardFiltersLoading(true);
-        if (!client || !client.publicKey || !client.organizationId) {
-            return;
-        }
-        if (dashboardName === null || dashboardName === undefined)
-            return;
-        try {
-            const resp = await getFilters(dashboardName, client);
-            setDashboardFilters(resp);
-        }
-        catch (error) {
-            console.error('Error fetching data:', error);
-        }
         finally {
-            setDashboardFiltersLoading(false);
+            setIsLoading(false);
         }
     }
+    function isDashboardFilterLoading(filterName) {
+        return dashboardFilters[dashboardName]?.[filterName]?.loading;
+    }
     return {
         data: loading ? null : dashboardConfig[dashboardName],
-        dashboardFilters: dashboardFilters,
+        dashboardFilters: dashboardFilters[dashboardName] !== undefined
+            ? Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter)
+            : null,
         isLoading: loading,
-        isDashboardFiltersLoading: dashboardFiltersLoading,
+        isDashboardFilterLoading,
         error,
         reload: handleReload,
     };

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

@@ -1 +1 @@
-{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AA8DA,eAAO,MAAM,SAAS,cAAe,MAAM;;;;CA6C1C,CAAC"}
+{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AA8DA,eAAO,MAAM,SAAS,cAAe,MAAM;;;;CA2D1C,CAAC"}

package/dist/esm/hooks/useExport.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { downloadCSV } from '../utils/csv';
-import { useContext, useLayoutEffect, useRef, useState } from 'react';
+import { useContext, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { getData } from '../utils/dataFetcher';
 import { ClientContext, DashboardFiltersContext, ThemeContext, } from '../Context';
 import ReactDOM from 'react-dom';
@@ -44,6 +44,12 @@ async function getExportData(client, dashboardFilters, reportId) {
 }
 export const useExport = (reportId) => {
     const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const specificDashboardFilters = useMemo(() => {
+        //FIXME: Pretty sure this won't work with multiple dashboards
+        Object.values(dashboardFilters).map((dashboardFilter) => {
+            return dashboardFilter.filter;
+        });
+    }, [dashboardFilters]);
     const [theme] = useContext(ThemeContext);
     const [client] = useContext(ClientContext);
     const [isLoading, setIsLoading] = useState(false);
@@ -56,7 +62,7 @@ export const useExport = (reportId) => {
                 return;
             }
             setIsLoading(true);
-            const resp = await getExportData(client, dashboardFilters, reportId);
+            const resp = await getExportData(client, specificDashboardFilters, reportId);
             downloadCSV({
                 rows: resp.rows,
                 fields: resp.columns,
@@ -69,7 +75,7 @@ export const useExport = (reportId) => {
                 return;
             }
             setIsLoading(true);
-            const resp = await getExportData(client, dashboardFilters, reportId);
+            const resp = await getExportData(client, specificDashboardFilters, reportId);
             const iframe = document.createElement('iframe');
             document.body.appendChild(iframe);
             if (iframe && iframe.contentDocument && theme) {

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

@@ -1 +1 @@
-{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAEjC,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,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;UAEtD,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,SAAS;sBACP,MAAM,KAAK,IAAI;qBAChB,MAAM,aAAa,MAAM,KAAK,IAAI;2BAEnC,WAAW,KAAK,MAAM,GAAG,SAAS,WACvC,SAAS;CAyLrB,CAAC;AAEF,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS;WAC7C,MAAM,GAAG,SAAS;CAoD1B,CAAC"}
+{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAGjC,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,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;UAEtD,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,SAAS;sBACP,MAAM,KAAK,IAAI;qBAChB,MAAM,aAAa,MAAM,KAAK,IAAI;2BAEnC,WAAW,KAAK,MAAM,GAAG,SAAS,WACvC,SAAS;CAmLrB,CAAC;AAEF,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS;WAC7C,MAAM,GAAG,SAAS;CAoD1B,CAAC"}

package/dist/esm/hooks/useQuill.js

@@ -1,4 +1,4 @@
-import { useContext, useEffect, useState } from 'react';
+import { useContext, useEffect, useMemo, useState } from 'react';
 import { ClientContext, DashboardContext, DashboardFiltersContext, SchemaDataContext, } from '../Context';
 import { mergeComparisonRange } from '../utils/merge';
 import { convertInternalReportToReport, fetchReport } from '../utils/report';
@@ -8,6 +8,14 @@ import { getPointToPointPercentageChange, getSimplePercentageChange, getSumOfFie
 export const useQuill = (reportId, pagination) => {
     const [dashboard, dispatch] = useContext(DashboardContext);
     const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const specificDashboardFilters = useMemo(() => {
+        if (!reportId)
+            return [];
+        const dashboardName = dashboard[reportId]?.dashboardName;
+        if (!dashboardName)
+            return [];
+        return Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter);
+    }, [dashboardFilters, reportId, dashboard]);
     const [schemaData] = useContext(SchemaDataContext);
     const [client] = useContext(ClientContext);
     const [data, setData] = useState(null);
@@ -73,13 +81,8 @@ export const useQuill = (reportId, pagination) => {
         if (!loading && reportId && data) {
             setLoading(true);
             try {
-                const specificDashboardFilter = dashboardFilters.filter((f) => f &&
-                    reportId &&
-                    dashboard[reportId] &&
-                    // @ts-ignore
-                    dashboard[reportId].dashboardName === f.dashboardName);
                 const updatedProcessing = { ...additionalProcessing, ...processing };
-                const paginatedRows = await fetchResultsByReport(reportId, client, updatedProcessing, specificDashboardFilter, schemaData.customFields);
+                const paginatedRows = await fetchResultsByReport(reportId, client, updatedProcessing, specificDashboardFilters, schemaData.customFields);
                 if (paginatedRows.error) {
                     throw new Error('Error fetching chart');
                 }
@@ -112,19 +115,14 @@ export const useQuill = (reportId, pagination) => {
             setLoading(false);
             return;
         }
-        const specificDashboardFilter = dashboardFilters.filter((f) => f &&
-            reportId &&
-            dashboard[curReportId] &&
-            // @ts-ignore
-            dashboard[curReportId].dashboardName === f.dashboardName);
         setLoading(true);
-        const { report, error } = await fetchReport(curReportId, client, useReportTask, specificDashboardFilter, additionalProcessing, undefined, schemaData.customFields);
+        const { report, error } = await fetchReport(curReportId, client, useReportTask, specificDashboardFilters, additionalProcessing, undefined, schemaData.customFields);
         dispatch({
             type: 'ADD_DASHBOARD_ITEM',
             id: reportId,
             data: {
                 ...report,
-                filtersApplied: specificDashboardFilter,
+                filtersApplied: specificDashboardFilters,
                 triggerReload: false,
             },
         });
@@ -134,7 +132,9 @@ export const useQuill = (reportId, pagination) => {
     };
     useEffect(() => {
         if (reportId) {
-            fetchReportHelper(reportId, pagination ? true : false, pagination);
+            fetchReportHelper(reportId, pagination ? true : false, {
+                page: pagination,
+            });
         }
     }, [reportId, dashboard]);
     useEffect(() => {

package/dist/esm/models/Client.d.ts

@@ -5,6 +5,9 @@ export type Client = {
     multiTenancyDisabled?: boolean;
     adminCustomerId?: string;
     recommendedPivotsDisabled?: boolean;
+    featureFlags?: {
+        [key: string]: boolean;
+    };
 };
 export type QuillProviderClient = {
     organizationId?: string;
@@ -18,5 +21,8 @@ export type QuillProviderClient = {
     multiTenancyDisabled?: boolean;
     adminCustomerId?: string;
     recommendedPivotsDisabled?: boolean;
+    featureFlags?: {
+        [key: string]: boolean;
+    };
 };
 //# sourceMappingURL=Client.d.ts.map

package/dist/esm/models/Client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../../src/models/Client.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC"}
+{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../../src/models/Client.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAC3C,CAAC"}

package/dist/esm/models/Dashboard.d.ts

@@ -7,7 +7,7 @@ export type DashboardConfig = {
     dateFilter: DashboardDateFilter;
     customFiltersEnabled?: boolean;
     sections?: {
-        '': QuillReport[];
+        [key: string]: QuillReport[];
     };
     newQueries?: QuillReport[];
 };

package/dist/esm/models/Dashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../../src/models/Dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,UAAU,EAAE,mBAAmB,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE;QACT,EAAE,EAAE,WAAW,EAAE,CAAC;KACnB,CAAC;IACF,UAAU,CAAC,EAAE,WAAW,EAAE,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../../src/models/Dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,UAAU,EAAE,mBAAmB,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,EAAE,CAAC;KAC9B,CAAC;IACF,UAAU,CAAC,EAAE,WAAW,EAAE,CAAC;CAC5B,CAAC"}

package/dist/esm/models/Filter.d.ts

@@ -156,8 +156,8 @@ export interface DashboardStringFilter extends DashboardBaseFilter {
 }
 export interface DashboardDateFilter extends DashboardBaseFilter {
     filterType: DashboardFilterType.Date;
-    comparison: boolean;
-    defaultComparisonRange: ComparisonRangeKey;
+    comparison?: boolean;
+    defaultComparisonRange?: ComparisonRangeKey;
     options: {
         label: string;
         value: string;
@@ -176,11 +176,12 @@ export interface DashboardDateFilter extends DashboardBaseFilter {
     };
     startDate: Date;
     endDate: Date;
-    comparisonRange: {
+    comparisonRange?: {
         startDate?: Date;
         endDate?: Date;
         value: ComparisonRangeKey;
     };
 }
+export declare function convertDashboardFilterToFilter(dashboardFilter: DashboardFilter): Filter;
 export {};
 //# sourceMappingURL=Filter.d.ts.map

package/dist/esm/models/Filter.d.ts.map

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

package/dist/esm/models/Filter.js

@@ -107,3 +107,39 @@ var StringFilterType;
     StringFilterType["Default"] = "default";
     StringFilterType["Multiselect"] = "multiselect";
 })(StringFilterType || (StringFilterType = {}));
+//FIXME: This is likely incorrect
+export function convertDashboardFilterToFilter(dashboardFilter) {
+    if (dashboardFilter.filterType === DashboardFilterType.String) {
+        return {
+            filterType: FilterNames.StringFilter,
+            fieldType: FieldTypes.String,
+            operator: StringOperator.Is,
+            field: dashboardFilter.field,
+            value: dashboardFilter.selectedValue,
+            table: dashboardFilter.table,
+        };
+    }
+    else {
+        if (dashboardFilter.comparison) {
+            return {
+                filterType: FilterNames.DateComparisonFilter,
+                fieldType: FieldTypes.Date,
+                operator: DateOperator.Custom,
+                field: dashboardFilter.field,
+                value: dashboardFilter.comparisonRange?.value,
+            };
+        }
+        else {
+            return {
+                filterType: FilterNames.DateCustomFilter,
+                fieldType: FieldTypes.Date,
+                operator: DateOperator.Custom,
+                field: dashboardFilter.field,
+                value: {
+                    startDate: dashboardFilter.startDate.toISOString(),
+                    endDate: dashboardFilter.endDate.toISOString(),
+                },
+            };
+        }
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AA6BnD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,mBAAmB,EAC5B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAoD9B;AAqID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,GAAG,CAAC,CA2Bd;AAED,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,eAAe,EAAE,CAAC,CA0F5B"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AA6BnD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,mBAAmB,EAC5B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAoD9B;AAsID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,GAAG,CAAC,CA2Bd;AAED,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,eAAe,EAAE,CAAC,CA0F5B"}

package/dist/esm/utils/dashboard.js

@@ -71,7 +71,7 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         xAxisFormat: item.xAxisFormat,
         order: item.order,
         filtersApplied: item.filtersApplied,
-        rowCount: parseInt(item.rowCount),
+        rowCount: item.rowCount ? parseInt(item.rowCount) : item.rows.length,
         template: item.template,
         sort: item.sort,
         itemQuery: item.itemQuery,
@@ -94,7 +94,7 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
     const pivot = report?.pivot;
     const data = report || {};
     if (pivot && client) {
-        if (report.rowCount === 0) {
+        if (report.rowCount === 0 || report.rows.length === 0) {
             const columns = [];
             if (pivot.rowField) {
                 columns.push({
@@ -138,6 +138,7 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
             throw new Error('Error generating pivot table');
         }
         catch (e) {
+            console.log('Error fetching pivot table', e);
             throw new Error('Failed to fetch chart');
         }
     }

package/dist/esm/utils/paginationProcessing.js

@@ -1,7 +1,7 @@
 export const DEFAULT_PAGINATION = {
     page: 0,
     rowsPerPage: 10,
-    rowsPerRequest: 20,
+    rowsPerRequest: 600,
 };
 export function shouldFetchMore(pagination, page, maxPage) {
     if (!pagination) {

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

@@ -23,11 +23,11 @@ export type ReportBuilderInfo = {
 };
 export declare const EMPTY_REPORT: QuillReport;
 export declare const EMPTY_INTERNAL_REPORT: QuillReportInternal;
-export declare function fetchReport(reportId: string, client: QuillProviderClient, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any, queryTask?: string): Promise<{
+export declare function fetchReport(reportId: string, client: QuillProviderClient, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any, rowsOnly?: boolean, rowCountOnly?: boolean): Promise<{
     report: QuillReportInternal;
     error?: string;
 }>;
-export declare function fetchReportRowCount(reportId: string, client: QuillProviderClient, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, customFields?: any): Promise<any>;
+export declare function fetchReportRowCount(reportId: string, client: QuillProviderClient, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, customFields?: any): Promise<number | undefined>;
 export declare function saveReport({ report, dashboardItemId, client, }: {
     report: any;
     dashboardItemId?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EACL,kBAAkB,EAClB,KAAK,EACL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAa1B,OAAO,EACL,oBAAoB,EAIrB,MAAM,mBAAmB,CAAC;AAI3B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,SAAS,EAAE;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,aAAa,EAAE,GAAG,EAAE,CAAC;IACrB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,mBAAmB,CAAC;IAClC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,WAkB1B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,mBAGnC,CAAC;AA2BF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,EAC3B,aAAa,UAAO,EACpB,OAAO,GAAE,GAAG,EAAO,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,GAAG,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiI1D;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,EAC3B,aAAa,UAAO,EACpB,OAAO,GAAE,GAAG,EAAO,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,CAAC,EAAE,GAAG,gBAmCnB;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,GACP,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,mBAAmB,CAAC;CAC7B,GAAG,OAAO,CAAC,GAAG,CAAC,CA4Cf;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAkB/C,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,WAAW,CAsDb;AAED,eAAO,MAAM,6BAA6B,YAC/B,GAAG,YACF,GAAG,UACL,KAAK,EAAE,UACP,mBAAmB,UACnB,KAAK,qBACM,GAAG,iBACP,MAAM,qBACF;IACjB,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,kBAAkB,CAAC;CAChC,WACQ,mBAAmB,iBACb,GAAG,qBACC,OAAO,iBACX,OAAO,eACT,oBAAoB,KAChC,QAAQ,iBAAiB,CAgK3B,CAAC"}
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EACL,kBAAkB,EAClB,KAAK,EACL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAa1B,OAAO,EACL,oBAAoB,EAIrB,MAAM,mBAAmB,CAAC;AAI3B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,SAAS,EAAE;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,aAAa,EAAE,GAAG,EAAE,CAAC;IACrB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,mBAAmB,CAAC;IAClC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,WAkB1B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,mBAGnC,CAAC;AA2BF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,EAC3B,aAAa,UAAO,EACpB,OAAO,GAAE,GAAG,EAAO,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,GAAG,EAClB,QAAQ,CAAC,EAAE,OAAO,EAClB,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmI1D;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,EAC3B,aAAa,UAAO,EACpB,OAAO,GAAE,GAAG,EAAO,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,CAAC,EAAE,GAAG,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkC7B;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,GACP,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,mBAAmB,CAAC;CAC7B,GAAG,OAAO,CAAC,GAAG,CAAC,CA4Cf;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAkB/C,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,WAAW,CAsDb;AAED,eAAO,MAAM,6BAA6B,YAC/B,GAAG,YACF,GAAG,UACL,KAAK,EAAE,UACP,mBAAmB,UACnB,KAAK,qBACM,GAAG,iBACP,MAAM,qBACF;IACjB,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,kBAAkB,CAAC;CAChC,WACQ,mBAAmB,iBACb,GAAG,qBACC,OAAO,iBACX,OAAO,eACT,oBAAoB,KAChC,QAAQ,iBAAiB,CAgK3B,CAAC"}