@quillsql/react 2.16.9 → 2.16.11

package/dist/index.cjs

@@ -16224,6 +16224,128 @@ async function generatePivotTable({
   }
   throw Error("Failed to generate pivot table: invalid report");
 }
+function processPivotData({
+  rows: responseRows,
+  fields: responseFields,
+  pivot,
+  dateBucket,
+  dateFilter,
+  client,
+  rowCount
+}) {
+  const databaseType = client.databaseType || "postgresql";
+  const rows = pivot.rowField ? responseRows.map(
+    (row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: "-" } : row
+  ) : responseRows;
+  if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
+    rows.forEach((row) => {
+      Object.keys(row).forEach((key) => {
+        const processedKey = processColumnName(key);
+        if (processedKey !== key) {
+          row[processedKey] = row[key];
+          delete row[key];
+        }
+      });
+    });
+  }
+  const columns = responseFields?.map((field) => ({
+    field: processColumnName(field.field || field.name),
+    label: snakeCaseToTitleCase(
+      processColumnName(
+        (field.field || field.name).replace("comparison_", "comparison ")
+      )
+    ),
+    format: (field.field || field.name) === pivot.rowField ? "string" : pivot.aggregations?.find(
+      (agg) => agg.valueField === (field.field || field.name) || `${agg.valueField}_percentage` === (field.field || field.name) || !agg.valueField && agg.aggregationType === "percentage" && (field.field || field.name)?.endsWith("percentage")
+    )?.aggregationType === "percentage" ? "percent" : "whole_number",
+    fieldType: field.fieldType,
+    jsType: field.jsType,
+    dataTypeID: field.dataTypeID
+  })).filter(
+    (field, index) => field.field !== "comparison_" + pivot.rowField || index === 0
+  ).sort((a, b) => {
+    if (a.field === pivot.rowField) {
+      return -1;
+    }
+    if (b.field === pivot.rowField) {
+      return 1;
+    }
+    return 0;
+  });
+  if (pivot.rowField && !isStringType(pivot.rowFieldType || "")) {
+    rows.forEach((row) => {
+      row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
+        const rowDate = new Date(value);
+        if (rowDate < dateFilter.startDate) {
+          value = dateFilter.startDate.toISOString();
+        } else if (rowDate > dateFilter.endDate) {
+          value = dateFilter.endDate.toISOString();
+        }
+      }
+      const dateString = getDateString(
+        value,
+        dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0,
+        dateBucket,
+        databaseType
+      );
+      row[pivot.rowField || ""] = dateString;
+    });
+    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
+      const dateSet = new Set(
+        rows.map((row) => row[pivot.rowField || ""])
+      );
+      for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
+        const formattedDate = getDateString(
+          date.toISOString(),
+          { start: dateFilter.startDate, end: dateFilter.endDate },
+          dateBucket,
+          databaseType
+        );
+        if (!dateSet.has(formattedDate)) {
+          const newRow = {};
+          newRow[pivot.rowField] = formattedDate;
+          newRow.__quillRawDate = date.toISOString();
+          rows.push(newRow);
+          dateSet.add(formattedDate);
+        }
+      }
+    }
+    if (!pivot.sort || pivot.sortField === pivot.rowField) {
+      rows.sort((a, b) => {
+        const direction = pivot.sort && pivot.sortDirection === "DESC" ? -1 : 1;
+        if (a.__quillRawDate < b.__quillRawDate) {
+          return -1 * direction;
+        }
+        if (a.__quillRawDate > b.__quillRawDate) {
+          return 1 * direction;
+        }
+        return 0;
+      });
+    }
+  }
+  columns?.forEach((column, index) => {
+    if (column.label && ["null", "undefined"].includes(column.label.toLowerCase()) && !pivot.columnField && !pivot.aggregations?.[index]?.valueField && pivot.aggregations?.[index]?.aggregationType === "count") {
+      column.label = "Count";
+    }
+  });
+  const numericColumns = columns?.filter(
+    (column) => column.format === "whole_number" || column.format === "percentage"
+  );
+  rows.forEach((row) => {
+    numericColumns?.forEach((column) => {
+      row[column.field] = row[column.field] ?? 0;
+    });
+  });
+  return {
+    rows,
+    columns: columns ?? [],
+    rowCount: rowCount || rows.length,
+    pivotQuery: "",
+    comparisonPivotQuery: ""
+  };
+}
 var init_pivotConstructor = __esm({
   "src/utils/pivotConstructor.ts"() {
     "use strict";
@@ -19745,10 +19867,14 @@ async function cleanDashboardItem({
     const pivotChartProcessing = {
       page: DEFAULT_PAGINATION
     };
-    pivotTable = await getPivotTable(
-      {
-        ...item,
-        pivot: item.pivot && !skipPivotFetch ? {
+    if (item.pivot && skipPivotFetch && item.rows && item.fields) {
+      const dateFilter = dashboardFilters?.find(
+        (filter) => filter.filterType === "date_range"
+      );
+      pivotTable = processPivotData({
+        rows: item.rows,
+        fields: item.fields,
+        pivot: {
           ...item.pivot,
           aggregations: item.pivot.aggregations ?? [
             {
@@ -19759,18 +19885,40 @@ async function cleanDashboardItem({
               aggregationType: item.pivot.aggregationType
             }
           ]
-        } : void 0
-      },
-      dashboardFilters,
-      item.dashboardName,
-      getToken,
-      client,
-      eventTracking,
-      dateBucket,
-      shouldPaginatePivotAsTable ? additionalProcessing : pivotChartProcessing,
-      tenants,
-      customFields
-    );
+        },
+        dateBucket,
+        dateFilter,
+        client,
+        rowCount: item.rowCount ? parseInt(item.rowCount) : item.rows.length
+      });
+    } else {
+      pivotTable = await getPivotTable(
+        {
+          ...item,
+          pivot: item.pivot && !skipPivotFetch ? {
+            ...item.pivot,
+            aggregations: item.pivot.aggregations ?? [
+              {
+                valueField: item.pivot.valueField,
+                valueFieldType: item.pivot.valueFieldType,
+                valueField2: item.pivot.valueField2,
+                valueField2Type: item.pivot.valueField2Type,
+                aggregationType: item.pivot.aggregationType
+              }
+            ]
+          } : void 0
+        },
+        dashboardFilters,
+        item.dashboardName,
+        getToken,
+        client,
+        eventTracking,
+        dateBucket,
+        shouldPaginatePivotAsTable ? additionalProcessing : pivotChartProcessing,
+        tenants,
+        customFields
+      );
+    }
   } catch (e) {
     pivotTable = void 0;
     eventTracking?.logError?.({
@@ -20178,6 +20326,33 @@ function extractAllReportValuesFromQuillInternalReport(reportInternal) {
     pivotRowCount: reportInternal.pivotRowCount
   };
 }
+async function fetchReportRows({
+  reportId,
+  client,
+  tenants,
+  filters = [],
+  getToken,
+  abortSignal,
+  additionalProcessing
+}) {
+  const fetchResp = await quillFetch({
+    client,
+    task: "report",
+    metadata: {
+      reportId,
+      clientId: client.publicKey,
+      databaseType: client.databaseType,
+      filters: filters.map((filter) => ({ ...filter, options: void 0 })),
+      useNewNodeSql: true,
+      tenants,
+      additionalProcessing
+    },
+    abortSignal,
+    getToken
+  });
+  const resp = await parseFetchResponse(client, "report", fetchResp, getToken);
+  return { rows: resp.rows || [], rowCount: resp.rowCount || 0 };
+}
 async function fetchReport({
   reportId,
   client,
@@ -20192,14 +20367,15 @@ async function fetchReport({
   rowCountOnly,
   abortSignal,
   getToken,
-  eventTracking
+  eventTracking,
+  usePivotTask = false
 }) {
   let reportInfo = void 0;
   let errorMessage = void 0;
   try {
     const fetchResp = await quillFetch({
       client,
-      task: useReportTask ? "report" : "item",
+      task: usePivotTask ? "pivot-template" : useReportTask ? "report" : "item",
       metadata: {
         reportId,
         dashboardItemId: reportId,
@@ -20219,7 +20395,7 @@ async function fetchReport({
     });
     const resp = await parseFetchResponse(
       client,
-      useReportTask ? "report" : "item",
+      usePivotTask ? "pivot-template" : useReportTask ? "report" : "item",
       fetchResp,
       getToken
     );
@@ -20227,12 +20403,13 @@ async function fetchReport({
       resp,
       client,
       filters,
-      dateBucket,
+      dateBucket: resp.dateBucket ?? dateBucket,
       additionalProcessing,
       customFields,
       getToken,
       eventTracking,
-      tenants
+      tenants,
+      skipPivotFetch: usePivotTask
     });
   } catch (error) {
     if (error instanceof Error && error.name === "AbortError") {
@@ -20281,7 +20458,8 @@ async function processReportResponse({
   customFields,
   getToken,
   eventTracking,
-  tenants
+  tenants,
+  skipPivotFetch = false
 }) {
   const dashboardItem = {
     ...resp,
@@ -20312,7 +20490,8 @@ async function processReportResponse({
     customFields,
     getToken,
     tenants,
-    eventTracking
+    eventTracking,
+    skipPivotFetch
   });
   if (additionalProcessing) {
     reportInfo.pagination = additionalProcessing.page;
@@ -32253,6 +32432,7 @@ function DataLoader({
     previousUserFilters.current = userFilters;
     rowsAbortController.current?.abort();
     rowsAbortController.current = new AbortController();
+    const usePivotTask = !!item.pivot;
     try {
       if (dashboardName) {
         const { report: fetchedReport, error: error2 } = await fetchReport({
@@ -32268,7 +32448,8 @@ function DataLoader({
           rowCountOnly: false,
           abortSignal: rowsAbortController.current.signal,
           getToken,
-          eventTracking
+          eventTracking,
+          usePivotTask
         });
         addReport({
           ...fetchedReport,
@@ -32400,7 +32581,11 @@ var ChartDataLoader = ({
   dashboardName,
   propagateChanges
 }) => {
-  const { dashboardReports: dashboard, addReport } = useDashboardReports(dashboardName);
+  const {
+    dashboardReports: dashboard,
+    addReport,
+    updateReport
+  } = useDashboardReports(dashboardName);
   const { dashboardFilters } = (0, import_react25.useContext)(DashboardFiltersContext);
   const { reports, fetchIndividualReport } = (0, import_react25.useContext)(ReportsContext);
   const { getToken } = (0, import_react25.useContext)(FetchContext);
@@ -32450,6 +32635,8 @@ var ChartDataLoader = ({
     setLoading(true);
     fetchReportAbortController.current?.abort();
     fetchReportAbortController.current = new AbortController();
+    const usePivotTask = !!item.pivot;
+    let backgroundFetch = null;
     try {
       if (dashboardName) {
         const { report, error: error2 } = await fetchReport({
@@ -32467,7 +32654,8 @@ var ChartDataLoader = ({
           customFields: schemaData.customFields,
           abortSignal: fetchReportAbortController.current.signal,
           getToken,
-          eventTracking
+          eventTracking,
+          usePivotTask
         });
         addReport({
           ...report,
@@ -32477,6 +32665,32 @@ var ChartDataLoader = ({
           loadingRows: false
         });
         setError(error2);
+        if (usePivotTask) {
+          const backgroundAbortController = new AbortController();
+          backgroundFetch = () => {
+            fetchReportRows({
+              reportId: item.id,
+              client,
+              tenants,
+              filters: filters.concat(userFilters ?? []),
+              getToken,
+              abortSignal: backgroundAbortController.signal,
+              additionalProcessing: {
+                ...additionalProcessing,
+                ...{ page: DEFAULT_PAGINATION }
+              }
+            }).then(({ rows, rowCount }) => {
+              updateReport({
+                id: item.id,
+                rows,
+                rowCount
+              });
+            }).catch((e) => {
+              if (e instanceof Error && e.name === "AbortError") return;
+              console.error("Failed to fetch background rows", e);
+            });
+          };
+        }
       } else {
         try {
           await fetchIndividualReport({
@@ -32532,6 +32746,9 @@ var ChartDataLoader = ({
       if (fetchRowsRequestId === rowsRequestId.current) {
         fetchReportAbortController.current = null;
         setLoading(false);
+        if (backgroundFetch) {
+          backgroundFetch();
+        }
       }
     }
   };
@@ -35014,7 +35231,7 @@ function QuillTableDashboardComponent({
   const [theme] = (0, import_react29.useContext)(ThemeContext);
   const [initialLoad, setInitialLoad] = (0, import_react29.useState)(true);
   const { downloadCSV: downloadCSV2 } = useExport(report?.id);
-  const [page, setPage] = (0, import_react29.useState)(0);
+  const [page, setPage] = (0, import_react29.useState)(report?.pagination?.page ?? 0);
   (0, import_react29.useEffect)(() => {
     if (!isLoading) {
       setInitialLoad(false);
@@ -35025,6 +35242,11 @@ function QuillTableDashboardComponent({
       setPage(0);
     }
   }, [rowCountIsLoading]);
+  (0, import_react29.useEffect)(() => {
+    if (typeof report?.pagination?.page === "number") {
+      setPage(report.pagination.page);
+    }
+  }, [report?.pagination?.page]);
   return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
     "div",
     {
@@ -35107,7 +35329,7 @@ function QuillTableDashboardComponent({
             onSortChange: (sort) => {
               onSortChange && onSortChange(sort);
             },
-            currentPage: report?.pagination?.page ?? page,
+            currentPage: page,
             sort: report?.sort
           }
         )
@@ -38692,7 +38914,7 @@ function Dashboard({
                   filters: populatedDashboardFilters ?? [],
                   userFilters: dataLoaderUserFilters,
                   additionalProcessing: {
-                    page: DEFAULT_PAGINATION,
+                    page: pagination,
                     last: additionalProcessing?.last
                   },
                   dashboardName: name2,

package/dist/index.js

@@ -16261,6 +16261,128 @@ async function generatePivotTable({
   }
   throw Error("Failed to generate pivot table: invalid report");
 }
+function processPivotData({
+  rows: responseRows,
+  fields: responseFields,
+  pivot,
+  dateBucket,
+  dateFilter,
+  client,
+  rowCount
+}) {
+  const databaseType = client.databaseType || "postgresql";
+  const rows = pivot.rowField ? responseRows.map(
+    (row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: "-" } : row
+  ) : responseRows;
+  if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
+    rows.forEach((row) => {
+      Object.keys(row).forEach((key) => {
+        const processedKey = processColumnName(key);
+        if (processedKey !== key) {
+          row[processedKey] = row[key];
+          delete row[key];
+        }
+      });
+    });
+  }
+  const columns = responseFields?.map((field) => ({
+    field: processColumnName(field.field || field.name),
+    label: snakeCaseToTitleCase(
+      processColumnName(
+        (field.field || field.name).replace("comparison_", "comparison ")
+      )
+    ),
+    format: (field.field || field.name) === pivot.rowField ? "string" : pivot.aggregations?.find(
+      (agg) => agg.valueField === (field.field || field.name) || `${agg.valueField}_percentage` === (field.field || field.name) || !agg.valueField && agg.aggregationType === "percentage" && (field.field || field.name)?.endsWith("percentage")
+    )?.aggregationType === "percentage" ? "percent" : "whole_number",
+    fieldType: field.fieldType,
+    jsType: field.jsType,
+    dataTypeID: field.dataTypeID
+  })).filter(
+    (field, index) => field.field !== "comparison_" + pivot.rowField || index === 0
+  ).sort((a, b) => {
+    if (a.field === pivot.rowField) {
+      return -1;
+    }
+    if (b.field === pivot.rowField) {
+      return 1;
+    }
+    return 0;
+  });
+  if (pivot.rowField && !isStringType(pivot.rowFieldType || "")) {
+    rows.forEach((row) => {
+      row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
+        const rowDate = new Date(value);
+        if (rowDate < dateFilter.startDate) {
+          value = dateFilter.startDate.toISOString();
+        } else if (rowDate > dateFilter.endDate) {
+          value = dateFilter.endDate.toISOString();
+        }
+      }
+      const dateString = getDateString(
+        value,
+        dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0,
+        dateBucket,
+        databaseType
+      );
+      row[pivot.rowField || ""] = dateString;
+    });
+    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
+      const dateSet = new Set(
+        rows.map((row) => row[pivot.rowField || ""])
+      );
+      for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
+        const formattedDate = getDateString(
+          date.toISOString(),
+          { start: dateFilter.startDate, end: dateFilter.endDate },
+          dateBucket,
+          databaseType
+        );
+        if (!dateSet.has(formattedDate)) {
+          const newRow = {};
+          newRow[pivot.rowField] = formattedDate;
+          newRow.__quillRawDate = date.toISOString();
+          rows.push(newRow);
+          dateSet.add(formattedDate);
+        }
+      }
+    }
+    if (!pivot.sort || pivot.sortField === pivot.rowField) {
+      rows.sort((a, b) => {
+        const direction = pivot.sort && pivot.sortDirection === "DESC" ? -1 : 1;
+        if (a.__quillRawDate < b.__quillRawDate) {
+          return -1 * direction;
+        }
+        if (a.__quillRawDate > b.__quillRawDate) {
+          return 1 * direction;
+        }
+        return 0;
+      });
+    }
+  }
+  columns?.forEach((column, index) => {
+    if (column.label && ["null", "undefined"].includes(column.label.toLowerCase()) && !pivot.columnField && !pivot.aggregations?.[index]?.valueField && pivot.aggregations?.[index]?.aggregationType === "count") {
+      column.label = "Count";
+    }
+  });
+  const numericColumns = columns?.filter(
+    (column) => column.format === "whole_number" || column.format === "percentage"
+  );
+  rows.forEach((row) => {
+    numericColumns?.forEach((column) => {
+      row[column.field] = row[column.field] ?? 0;
+    });
+  });
+  return {
+    rows,
+    columns: columns ?? [],
+    rowCount: rowCount || rows.length,
+    pivotQuery: "",
+    comparisonPivotQuery: ""
+  };
+}
 var init_pivotConstructor = __esm({
   "src/utils/pivotConstructor.ts"() {
     "use strict";
@@ -19753,10 +19875,14 @@ async function cleanDashboardItem({
     const pivotChartProcessing = {
       page: DEFAULT_PAGINATION
     };
-    pivotTable = await getPivotTable(
-      {
-        ...item,
-        pivot: item.pivot && !skipPivotFetch ? {
+    if (item.pivot && skipPivotFetch && item.rows && item.fields) {
+      const dateFilter = dashboardFilters?.find(
+        (filter) => filter.filterType === "date_range"
+      );
+      pivotTable = processPivotData({
+        rows: item.rows,
+        fields: item.fields,
+        pivot: {
           ...item.pivot,
           aggregations: item.pivot.aggregations ?? [
             {
@@ -19767,18 +19893,40 @@ async function cleanDashboardItem({
               aggregationType: item.pivot.aggregationType
             }
           ]
-        } : void 0
-      },
-      dashboardFilters,
-      item.dashboardName,
-      getToken,
-      client,
-      eventTracking,
-      dateBucket,
-      shouldPaginatePivotAsTable ? additionalProcessing : pivotChartProcessing,
-      tenants,
-      customFields
-    );
+        },
+        dateBucket,
+        dateFilter,
+        client,
+        rowCount: item.rowCount ? parseInt(item.rowCount) : item.rows.length
+      });
+    } else {
+      pivotTable = await getPivotTable(
+        {
+          ...item,
+          pivot: item.pivot && !skipPivotFetch ? {
+            ...item.pivot,
+            aggregations: item.pivot.aggregations ?? [
+              {
+                valueField: item.pivot.valueField,
+                valueFieldType: item.pivot.valueFieldType,
+                valueField2: item.pivot.valueField2,
+                valueField2Type: item.pivot.valueField2Type,
+                aggregationType: item.pivot.aggregationType
+              }
+            ]
+          } : void 0
+        },
+        dashboardFilters,
+        item.dashboardName,
+        getToken,
+        client,
+        eventTracking,
+        dateBucket,
+        shouldPaginatePivotAsTable ? additionalProcessing : pivotChartProcessing,
+        tenants,
+        customFields
+      );
+    }
   } catch (e) {
     pivotTable = void 0;
     eventTracking?.logError?.({
@@ -20186,6 +20334,33 @@ function extractAllReportValuesFromQuillInternalReport(reportInternal) {
     pivotRowCount: reportInternal.pivotRowCount
   };
 }
+async function fetchReportRows({
+  reportId,
+  client,
+  tenants,
+  filters = [],
+  getToken,
+  abortSignal,
+  additionalProcessing
+}) {
+  const fetchResp = await quillFetch({
+    client,
+    task: "report",
+    metadata: {
+      reportId,
+      clientId: client.publicKey,
+      databaseType: client.databaseType,
+      filters: filters.map((filter) => ({ ...filter, options: void 0 })),
+      useNewNodeSql: true,
+      tenants,
+      additionalProcessing
+    },
+    abortSignal,
+    getToken
+  });
+  const resp = await parseFetchResponse(client, "report", fetchResp, getToken);
+  return { rows: resp.rows || [], rowCount: resp.rowCount || 0 };
+}
 async function fetchReport({
   reportId,
   client,
@@ -20200,14 +20375,15 @@ async function fetchReport({
   rowCountOnly,
   abortSignal,
   getToken,
-  eventTracking
+  eventTracking,
+  usePivotTask = false
 }) {
   let reportInfo = void 0;
   let errorMessage = void 0;
   try {
     const fetchResp = await quillFetch({
       client,
-      task: useReportTask ? "report" : "item",
+      task: usePivotTask ? "pivot-template" : useReportTask ? "report" : "item",
       metadata: {
         reportId,
         dashboardItemId: reportId,
@@ -20227,7 +20403,7 @@ async function fetchReport({
     });
     const resp = await parseFetchResponse(
       client,
-      useReportTask ? "report" : "item",
+      usePivotTask ? "pivot-template" : useReportTask ? "report" : "item",
       fetchResp,
       getToken
     );
@@ -20235,12 +20411,13 @@ async function fetchReport({
       resp,
       client,
       filters,
-      dateBucket,
+      dateBucket: resp.dateBucket ?? dateBucket,
       additionalProcessing,
       customFields,
       getToken,
       eventTracking,
-      tenants
+      tenants,
+      skipPivotFetch: usePivotTask
     });
   } catch (error) {
     if (error instanceof Error && error.name === "AbortError") {
@@ -20289,7 +20466,8 @@ async function processReportResponse({
   customFields,
   getToken,
   eventTracking,
-  tenants
+  tenants,
+  skipPivotFetch = false
 }) {
   const dashboardItem = {
     ...resp,
@@ -20320,7 +20498,8 @@ async function processReportResponse({
     customFields,
     getToken,
     tenants,
-    eventTracking
+    eventTracking,
+    skipPivotFetch
   });
   if (additionalProcessing) {
     reportInfo.pagination = additionalProcessing.page;
@@ -32333,6 +32512,7 @@ function DataLoader({
     previousUserFilters.current = userFilters;
     rowsAbortController.current?.abort();
     rowsAbortController.current = new AbortController();
+    const usePivotTask = !!item.pivot;
     try {
       if (dashboardName) {
         const { report: fetchedReport, error: error2 } = await fetchReport({
@@ -32348,7 +32528,8 @@ function DataLoader({
           rowCountOnly: false,
           abortSignal: rowsAbortController.current.signal,
           getToken,
-          eventTracking
+          eventTracking,
+          usePivotTask
         });
         addReport({
           ...fetchedReport,
@@ -32480,7 +32661,11 @@ var ChartDataLoader = ({
   dashboardName,
   propagateChanges
 }) => {
-  const { dashboardReports: dashboard, addReport } = useDashboardReports(dashboardName);
+  const {
+    dashboardReports: dashboard,
+    addReport,
+    updateReport
+  } = useDashboardReports(dashboardName);
   const { dashboardFilters } = useContext13(DashboardFiltersContext);
   const { reports, fetchIndividualReport } = useContext13(ReportsContext);
   const { getToken } = useContext13(FetchContext);
@@ -32530,6 +32715,8 @@ var ChartDataLoader = ({
     setLoading(true);
     fetchReportAbortController.current?.abort();
     fetchReportAbortController.current = new AbortController();
+    const usePivotTask = !!item.pivot;
+    let backgroundFetch = null;
     try {
       if (dashboardName) {
         const { report, error: error2 } = await fetchReport({
@@ -32547,7 +32734,8 @@ var ChartDataLoader = ({
           customFields: schemaData.customFields,
           abortSignal: fetchReportAbortController.current.signal,
           getToken,
-          eventTracking
+          eventTracking,
+          usePivotTask
         });
         addReport({
           ...report,
@@ -32557,6 +32745,32 @@ var ChartDataLoader = ({
           loadingRows: false
         });
         setError(error2);
+        if (usePivotTask) {
+          const backgroundAbortController = new AbortController();
+          backgroundFetch = () => {
+            fetchReportRows({
+              reportId: item.id,
+              client,
+              tenants,
+              filters: filters.concat(userFilters ?? []),
+              getToken,
+              abortSignal: backgroundAbortController.signal,
+              additionalProcessing: {
+                ...additionalProcessing,
+                ...{ page: DEFAULT_PAGINATION }
+              }
+            }).then(({ rows, rowCount }) => {
+              updateReport({
+                id: item.id,
+                rows,
+                rowCount
+              });
+            }).catch((e) => {
+              if (e instanceof Error && e.name === "AbortError") return;
+              console.error("Failed to fetch background rows", e);
+            });
+          };
+        }
       } else {
         try {
           await fetchIndividualReport({
@@ -32612,6 +32826,9 @@ var ChartDataLoader = ({
       if (fetchRowsRequestId === rowsRequestId.current) {
         fetchReportAbortController.current = null;
         setLoading(false);
+        if (backgroundFetch) {
+          backgroundFetch();
+        }
       }
     }
   };
@@ -35099,7 +35316,7 @@ function QuillTableDashboardComponent({
   const [theme] = useContext15(ThemeContext);
   const [initialLoad, setInitialLoad] = useState17(true);
   const { downloadCSV: downloadCSV2 } = useExport(report?.id);
-  const [page, setPage] = useState17(0);
+  const [page, setPage] = useState17(report?.pagination?.page ?? 0);
   useEffect15(() => {
     if (!isLoading) {
       setInitialLoad(false);
@@ -35110,6 +35327,11 @@ function QuillTableDashboardComponent({
       setPage(0);
     }
   }, [rowCountIsLoading]);
+  useEffect15(() => {
+    if (typeof report?.pagination?.page === "number") {
+      setPage(report.pagination.page);
+    }
+  }, [report?.pagination?.page]);
   return /* @__PURE__ */ jsxs35(
     "div",
     {
@@ -35192,7 +35414,7 @@ function QuillTableDashboardComponent({
             onSortChange: (sort) => {
               onSortChange && onSortChange(sort);
             },
-            currentPage: report?.pagination?.page ?? page,
+            currentPage: page,
             sort: report?.sort
           }
         )
@@ -38784,7 +39006,7 @@ function Dashboard({
                   filters: populatedDashboardFilters ?? [],
                   userFilters: dataLoaderUserFilters,
                   additionalProcessing: {
-                    page: DEFAULT_PAGINATION,
+                    page: pagination,
                     last: additionalProcessing?.last
                   },
                   dashboardName: name2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.16.9",
+  "version": "2.16.11",
   "type": "module",
   "exports": {
     ".": {