@quillsql/react 2.16.84 → 2.16.86

package/dist/index.cjs

@@ -20020,6 +20020,7 @@ function cloneResult(result) {
 }
 async function getOrFetchSharedRequest({
   key,
+  reportId,
   signal,
   fetcher
 }) {
@@ -20028,6 +20029,7 @@ async function getOrFetchSharedRequest({
   if (!entry) {
     const controller = new AbortController();
     entry = {
+      reportId,
       controller,
       subscribers: 0,
       settled: false,
@@ -20086,6 +20088,15 @@ async function getOrFetchSharedRequest({
     );
   });
 }
+function evictSharedReportRequests(reportId) {
+  for (const [key, entry] of entries) {
+    if (entry.reportId !== reportId) continue;
+    clearTimeout(entry.abortTimer);
+    clearTimeout(entry.expiryTimer);
+    if (!entry.settled) entry.controller.abort();
+    entries.delete(key);
+  }
+}
 var ORPHAN_GRACE_MS, COMPLETED_TTL_MS, entries;
 var init_reportRequestPool = __esm({
   "src/utils/reportRequestPool.ts"() {
@@ -20718,6 +20729,7 @@ var init_dataFetcher = __esm({
       const token = await getToken();
       return getOrFetchSharedRequest({
         key: createSharedRequestKey({ client, task, metadata, token }),
+        reportId: metadata?.reportId === void 0 ? void 0 : String(metadata.reportId),
         signal: abortSignal,
         fetcher: (signal) => execute(signal, token)
       });
@@ -27892,21 +27904,11 @@ var ContextProvider = ({
           Object.values(
             resp.sections ?? {}
           ).flat().forEach((report) => {
-            const existing = reports[report.id];
-            if (existing) {
-              const merged = report;
-              reportsDispatch({
-                type: "UPDATE_REPORT",
-                id: report.id,
-                data: merged
-              });
-            } else {
-              reportsDispatch({
-                type: "ADD_REPORT",
-                id: report.id,
-                data: report
-              });
-            }
+            reportsDispatch({
+              type: "UPDATE_REPORT",
+              id: report.id,
+              data: report
+            });
           });
           dashboardConfigDispatch({
             type: "UPDATE_DASHBOARD",
@@ -62180,6 +62182,9 @@ function resolveReportFromCacheCab({
   };
 }
 
+// src/hooks/useForm.tsx
+init_reportRequestPool();
+
 // src/hooks/useForm.queries.ts
 var QUERY_KEY_UNDEFINED = "__undefined__";
 var QUERY_KEY_FUNCTION = "__function__";
@@ -67705,7 +67710,13 @@ function useReport(reportIdArg, options = {}) {
           tables: tableScopeForDisplayColumns,
           schemaTables: schemaForReportBuilderState
         });
-        const sourceDisplayColumns = sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
+        const savedDisplayColumns = normalizeReportBuilderColumns(
+          (sourceReport.columns ?? []).map((column) => ({
+            ...column,
+            table: String(column.table ?? "").trim() || resolveColumnTableFromReportMetadata(sourceReport, column.field)
+          }))
+        );
+        const sourceDisplayColumns = savedDisplayColumns.length > 0 ? savedDisplayColumns : sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
         const shouldKeepLocalRowGroup = groupRowsBySetViaSetReportRef.current || groupColumnsBySetViaSetReportRef.current && prev.groupRowsBy !== void 0;
         const shouldKeepLocalColumnGroup = groupColumnsBySetViaSetReportRef.current || groupRowsBySetViaSetReportRef.current && prev.groupColumnsBy !== void 0;
         const nextGroupRowsBy = shouldTakePivotGroupsFromSource ? shouldKeepLocalRowGroup ? prev.groupRowsBy : sourceRowGroupOption : prev.groupRowsBy !== void 0 ? prev.groupRowsBy : groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption;
@@ -71168,6 +71179,7 @@ function useReport(reportIdArg, options = {}) {
       ).trim();
       if (savedReportId && resp && resp.name !== "error" && !resp.error) {
         await cacheCab.evictReport(savedReportId, tenants);
+        evictSharedReportRequests(savedReportId);
         await queryClient.invalidateQueries({
           queryKey: ["quill", "dashboard-report", savedReportId],
           refetchType: "none"

package/dist/index.js

@@ -20066,6 +20066,7 @@ function cloneResult(result) {
 }
 async function getOrFetchSharedRequest({
   key,
+  reportId,
   signal,
   fetcher
 }) {
@@ -20074,6 +20075,7 @@ async function getOrFetchSharedRequest({
   if (!entry) {
     const controller = new AbortController();
     entry = {
+      reportId,
       controller,
       subscribers: 0,
       settled: false,
@@ -20132,6 +20134,15 @@ async function getOrFetchSharedRequest({
     );
   });
 }
+function evictSharedReportRequests(reportId) {
+  for (const [key, entry] of entries) {
+    if (entry.reportId !== reportId) continue;
+    clearTimeout(entry.abortTimer);
+    clearTimeout(entry.expiryTimer);
+    if (!entry.settled) entry.controller.abort();
+    entries.delete(key);
+  }
+}
 var ORPHAN_GRACE_MS, COMPLETED_TTL_MS, entries;
 var init_reportRequestPool = __esm({
   "src/utils/reportRequestPool.ts"() {
@@ -20764,6 +20775,7 @@ var init_dataFetcher = __esm({
       const token = await getToken();
       return getOrFetchSharedRequest({
         key: createSharedRequestKey({ client, task, metadata, token }),
+        reportId: metadata?.reportId === void 0 ? void 0 : String(metadata.reportId),
         signal: abortSignal,
         fetcher: (signal) => execute(signal, token)
       });
@@ -27898,21 +27910,11 @@ var ContextProvider = ({
           Object.values(
             resp.sections ?? {}
           ).flat().forEach((report) => {
-            const existing = reports[report.id];
-            if (existing) {
-              const merged = report;
-              reportsDispatch({
-                type: "UPDATE_REPORT",
-                id: report.id,
-                data: merged
-              });
-            } else {
-              reportsDispatch({
-                type: "ADD_REPORT",
-                id: report.id,
-                data: report
-              });
-            }
+            reportsDispatch({
+              type: "UPDATE_REPORT",
+              id: report.id,
+              data: report
+            });
           });
           dashboardConfigDispatch({
             type: "UPDATE_DASHBOARD",
@@ -62388,6 +62390,9 @@ function resolveReportFromCacheCab({
   };
 }
 
+// src/hooks/useForm.tsx
+init_reportRequestPool();
+
 // src/hooks/useForm.queries.ts
 var QUERY_KEY_UNDEFINED = "__undefined__";
 var QUERY_KEY_FUNCTION = "__function__";
@@ -67913,7 +67918,13 @@ function useReport(reportIdArg, options = {}) {
           tables: tableScopeForDisplayColumns,
           schemaTables: schemaForReportBuilderState
         });
-        const sourceDisplayColumns = sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
+        const savedDisplayColumns = normalizeReportBuilderColumns(
+          (sourceReport.columns ?? []).map((column) => ({
+            ...column,
+            table: String(column.table ?? "").trim() || resolveColumnTableFromReportMetadata(sourceReport, column.field)
+          }))
+        );
+        const sourceDisplayColumns = savedDisplayColumns.length > 0 ? savedDisplayColumns : sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
         const shouldKeepLocalRowGroup = groupRowsBySetViaSetReportRef.current || groupColumnsBySetViaSetReportRef.current && prev.groupRowsBy !== void 0;
         const shouldKeepLocalColumnGroup = groupColumnsBySetViaSetReportRef.current || groupRowsBySetViaSetReportRef.current && prev.groupColumnsBy !== void 0;
         const nextGroupRowsBy = shouldTakePivotGroupsFromSource ? shouldKeepLocalRowGroup ? prev.groupRowsBy : sourceRowGroupOption : prev.groupRowsBy !== void 0 ? prev.groupRowsBy : groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption;
@@ -71376,6 +71387,7 @@ function useReport(reportIdArg, options = {}) {
       ).trim();
       if (savedReportId && resp && resp.name !== "error" && !resp.error) {
         await cacheCab.evictReport(savedReportId, tenants);
+        evictSharedReportRequests(savedReportId);
         await queryClient.invalidateQueries({
           queryKey: ["quill", "dashboard-report", savedReportId],
           refetchType: "none"

package/package.json

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