@quillsql/react 2.16.99 → 2.16.101

package/dist/index.cjs

@@ -62437,14 +62437,67 @@ function createUseFormInitialLoadQueryKey(input) {
   ];
 }
 var DASHBOARD_REPORT_STALE_TIME_MS = 5 * 60 * 1e3;
+var DASHBOARD_REPORT_RESULT_FIELDS = [
+  "rows",
+  "compareRows",
+  "pivotRows",
+  "pivotColumns",
+  "pivotRowCount"
+];
+function pivotDimensionKey(pivot) {
+  const value = pivot && typeof pivot === "object" ? pivot : {};
+  return [
+    String(value.rowField ?? "").trim(),
+    String(value.rowFieldTable ?? "").trim(),
+    String(value.columnField ?? "").trim(),
+    String(value.columnFieldTable ?? "").trim()
+  ].join("\0");
+}
+function pivotDimensionsChanged(previous, next) {
+  return pivotDimensionKey(previous?.pivot) !== pivotDimensionKey(next.pivot);
+}
+function dashboardReportQueryKey(reportId) {
+  return ["quill", "dashboard-report", reportId];
+}
+function mergeSavedReportIntoDashboardQueryData(previous, saved) {
+  const previousReport = previous?.report && typeof previous.report === "object" ? previous.report : void 0;
+  const savedId = String(saved.id ?? saved._id ?? "").trim();
+  const merged = {
+    ...previousReport,
+    ...saved,
+    ...savedId ? { id: savedId } : {}
+  };
+  const dimensionsChanged = pivotDimensionsChanged(previousReport, merged);
+  for (const field of DASHBOARD_REPORT_RESULT_FIELDS) {
+    const savedValue = saved[field];
+    if (savedValue != null) continue;
+    if (dimensionsChanged) {
+      delete merged[field];
+      continue;
+    }
+    if (previousReport?.[field] != null) {
+      merged[field] = previousReport[field];
+    }
+  }
+  return { report: merged, error: void 0 };
+}
 function findCachedDashboardReportQuery(queryClient, reportId) {
   const id = String(reportId ?? "").trim();
   if (!id) return void 0;
-  return queryClient.getQueryCache().findAll({ queryKey: ["quill", "dashboard-report", id] }).find((query) => {
+  return queryClient.getQueryCache().findAll({ queryKey: dashboardReportQueryKey(id) }).find((query) => {
+    if (query.state.isInvalidated) return false;
     const data = query.state.data;
     return Boolean(data?.report) && !data?.error;
   });
 }
+function syncDashboardReportQueryCacheAfterSave(queryClient, reportId, saved) {
+  const id = String(reportId ?? "").trim();
+  if (!id) return;
+  queryClient.setQueriesData(
+    { queryKey: dashboardReportQueryKey(id) },
+    (previous) => mergeSavedReportIntoDashboardQueryData(previous, saved)
+  );
+}
 function shouldBootstrapUseFormInitialLoad(input) {
   return !input.hasInitialReportBuilderState && input.previouslyBootstrappedIdentity !== input.currentIdentity;
 }
@@ -69408,6 +69461,7 @@ function useReport(reportIdArg, options = {}) {
         ...report,
         // Keep chart axis metadata from the pivot load; detail fetch is flat
         // (`pivot: null`) and must supply wide `columns` for the detail table.
+        xAxisLabel: previousReport.xAxisLabel,
         xAxisFormat: previousReport.xAxisFormat,
         yAxisFields: previousReport.yAxisFields,
         pivot: previousReport.pivot,
@@ -71422,13 +71476,14 @@ function useReport(reportIdArg, options = {}) {
         }
       );
       const columnsSelectedForSave = table.columns.length > 0 ? table.columns : fallbackDetailColumns;
+      const persistedName = overriddenName || (String(formReportName ?? "").trim() ? formReportName : String(sourceRest.name ?? "").trim() ? sourceRest.name : effectiveReportBuilderState.tables[0]?.name ? snakeAndCamelCaseToTitleCase(
+        String(effectiveReportBuilderState.tables[0].name)
+      ) : "New report");
       const resp = await saveReport({
         report: {
           ...EMPTY_INTERNAL_REPORT,
           ...sourceRest,
-          name: overriddenName || (String(formReportName ?? "").trim() ? formReportName : String(sourceRest.name ?? "").trim() ? sourceRest.name : effectiveReportBuilderState.tables[0]?.name ? snakeAndCamelCaseToTitleCase(
-            String(effectiveReportBuilderState.tables[0].name)
-          ) : "New report"),
+          name: persistedName,
           chartType: resolvedChartType,
           dashboardName: resolvedDashboardName,
           ...isAdmin ? { adminMode: true } : {},
@@ -71466,11 +71521,32 @@ function useReport(reportIdArg, options = {}) {
       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"
+        const savedReport = {
+          id: savedReportId,
+          name: persistedName,
+          chartType: resolvedChartType,
+          xAxisField: resolvedXAxisField,
+          xAxisFormat: resolvedXAxisFormat,
+          xAxisLabel: resolvedXAxisLabel,
+          yAxisFields: yAxisMeasures,
+          pivot: effectiveReportBuilderState.pivot ?? null,
+          reportBuilderState: effectiveReportBuilderState,
+          columns: columnsSelectedForSave,
+          rows: sourceReport.rows,
+          compareRows: sourceReport.compareRows,
+          pivotRows: sourceReport.pivotRows,
+          pivotColumns: sourceReport.pivotColumns,
+          pivotRowCount: sourceReport.pivotRowCount
+        };
+        syncDashboardReportQueryCacheAfterSave(
+          queryClient,
+          savedReportId,
+          savedReport
+        );
+        await loadDashboard(resolvedDashboardName, true, {
+          report: { ...sourceRest, ...savedReport },
+          action: "upsert"
         });
-        await loadDashboard(resolvedDashboardName, true);
       }
       return resp;
     },

package/dist/index.js

@@ -62645,14 +62645,67 @@ function createUseFormInitialLoadQueryKey(input) {
   ];
 }
 var DASHBOARD_REPORT_STALE_TIME_MS = 5 * 60 * 1e3;
+var DASHBOARD_REPORT_RESULT_FIELDS = [
+  "rows",
+  "compareRows",
+  "pivotRows",
+  "pivotColumns",
+  "pivotRowCount"
+];
+function pivotDimensionKey(pivot) {
+  const value = pivot && typeof pivot === "object" ? pivot : {};
+  return [
+    String(value.rowField ?? "").trim(),
+    String(value.rowFieldTable ?? "").trim(),
+    String(value.columnField ?? "").trim(),
+    String(value.columnFieldTable ?? "").trim()
+  ].join("\0");
+}
+function pivotDimensionsChanged(previous, next) {
+  return pivotDimensionKey(previous?.pivot) !== pivotDimensionKey(next.pivot);
+}
+function dashboardReportQueryKey(reportId) {
+  return ["quill", "dashboard-report", reportId];
+}
+function mergeSavedReportIntoDashboardQueryData(previous, saved) {
+  const previousReport = previous?.report && typeof previous.report === "object" ? previous.report : void 0;
+  const savedId = String(saved.id ?? saved._id ?? "").trim();
+  const merged = {
+    ...previousReport,
+    ...saved,
+    ...savedId ? { id: savedId } : {}
+  };
+  const dimensionsChanged = pivotDimensionsChanged(previousReport, merged);
+  for (const field of DASHBOARD_REPORT_RESULT_FIELDS) {
+    const savedValue = saved[field];
+    if (savedValue != null) continue;
+    if (dimensionsChanged) {
+      delete merged[field];
+      continue;
+    }
+    if (previousReport?.[field] != null) {
+      merged[field] = previousReport[field];
+    }
+  }
+  return { report: merged, error: void 0 };
+}
 function findCachedDashboardReportQuery(queryClient, reportId) {
   const id = String(reportId ?? "").trim();
   if (!id) return void 0;
-  return queryClient.getQueryCache().findAll({ queryKey: ["quill", "dashboard-report", id] }).find((query) => {
+  return queryClient.getQueryCache().findAll({ queryKey: dashboardReportQueryKey(id) }).find((query) => {
+    if (query.state.isInvalidated) return false;
     const data = query.state.data;
     return Boolean(data?.report) && !data?.error;
   });
 }
+function syncDashboardReportQueryCacheAfterSave(queryClient, reportId, saved) {
+  const id = String(reportId ?? "").trim();
+  if (!id) return;
+  queryClient.setQueriesData(
+    { queryKey: dashboardReportQueryKey(id) },
+    (previous) => mergeSavedReportIntoDashboardQueryData(previous, saved)
+  );
+}
 function shouldBootstrapUseFormInitialLoad(input) {
   return !input.hasInitialReportBuilderState && input.previouslyBootstrappedIdentity !== input.currentIdentity;
 }
@@ -69616,6 +69669,7 @@ function useReport(reportIdArg, options = {}) {
         ...report,
         // Keep chart axis metadata from the pivot load; detail fetch is flat
         // (`pivot: null`) and must supply wide `columns` for the detail table.
+        xAxisLabel: previousReport.xAxisLabel,
         xAxisFormat: previousReport.xAxisFormat,
         yAxisFields: previousReport.yAxisFields,
         pivot: previousReport.pivot,
@@ -71630,13 +71684,14 @@ function useReport(reportIdArg, options = {}) {
         }
       );
       const columnsSelectedForSave = table.columns.length > 0 ? table.columns : fallbackDetailColumns;
+      const persistedName = overriddenName || (String(formReportName ?? "").trim() ? formReportName : String(sourceRest.name ?? "").trim() ? sourceRest.name : effectiveReportBuilderState.tables[0]?.name ? snakeAndCamelCaseToTitleCase(
+        String(effectiveReportBuilderState.tables[0].name)
+      ) : "New report");
       const resp = await saveReport({
         report: {
           ...EMPTY_INTERNAL_REPORT,
           ...sourceRest,
-          name: overriddenName || (String(formReportName ?? "").trim() ? formReportName : String(sourceRest.name ?? "").trim() ? sourceRest.name : effectiveReportBuilderState.tables[0]?.name ? snakeAndCamelCaseToTitleCase(
-            String(effectiveReportBuilderState.tables[0].name)
-          ) : "New report"),
+          name: persistedName,
           chartType: resolvedChartType,
           dashboardName: resolvedDashboardName,
           ...isAdmin ? { adminMode: true } : {},
@@ -71674,11 +71729,32 @@ function useReport(reportIdArg, options = {}) {
       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"
+        const savedReport = {
+          id: savedReportId,
+          name: persistedName,
+          chartType: resolvedChartType,
+          xAxisField: resolvedXAxisField,
+          xAxisFormat: resolvedXAxisFormat,
+          xAxisLabel: resolvedXAxisLabel,
+          yAxisFields: yAxisMeasures,
+          pivot: effectiveReportBuilderState.pivot ?? null,
+          reportBuilderState: effectiveReportBuilderState,
+          columns: columnsSelectedForSave,
+          rows: sourceReport.rows,
+          compareRows: sourceReport.compareRows,
+          pivotRows: sourceReport.pivotRows,
+          pivotColumns: sourceReport.pivotColumns,
+          pivotRowCount: sourceReport.pivotRowCount
+        };
+        syncDashboardReportQueryCacheAfterSave(
+          queryClient,
+          savedReportId,
+          savedReport
+        );
+        await loadDashboard(resolvedDashboardName, true, {
+          report: { ...sourceRest, ...savedReport },
+          action: "upsert"
         });
-        await loadDashboard(resolvedDashboardName, true);
       }
       return resp;
     },

package/package.json

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