Extended audit log to enable batch undo

Author: jzongker

src/Home.tsx

@@ -39,6 +39,7 @@ export const Home = () => {
 
   const [status, setStatus] = useState<Record<string, string>>({});
   const [undoLog, setUndoLog] = useState<UndoEntry[]>([]);
+  const [batchId, setBatchId] = useState<string | undefined>(undefined);
   const [activeTab, setActiveTab] = useState<string>("step1");
 
   const handleUndo = async (onProgress?: (done: number, total: number) => void) => {
@@ -60,6 +61,7 @@ export const Home = () => {
     setIsExporting(false);
     setStatus({});
     setUndoLog([]);
+    setBatchId(undefined);
     setShowFinalCount(false);
     setExportCategories({ ...defaultCategories });
   };
@@ -129,10 +131,11 @@ export const Home = () => {
                     exportCategories={exportCategories}
                     setExportCategories={setExportCategories}
                     setUndoLog={setUndoLog}
+                    setBatchId={setBatchId}
                   />
                 )}
                 {activeTab === "step4" && (
-                  <TabRun dataExportSource={dataExportSource} isExporting={isExporting} status={status} undoCount={undoLog.length} onUndo={handleUndo} />
+                  <TabRun dataExportSource={dataExportSource} isExporting={isExporting} status={status} undoCount={undoLog.length} onUndo={handleUndo} batchId={batchId} />
                 )}
               </ErrorBoundary>
             </CardContent>

src/components/TabDestination.tsx

@@ -36,6 +36,7 @@ interface Props {
   exportCategories: ExportCategoriesInterface;
   setExportCategories: (cats: ExportCategoriesInterface) => void;
   setUndoLog: (log: UndoEntry[]) => void;
+  setBatchId: (id?: string) => void;
 }
 
 export const TabDestination = (props: Props) => {
@@ -111,8 +112,9 @@ export const TabDestination = (props: Props) => {
       try {
         switch (e) {
           case DataSourceType.B1_DB: {
-            const log = await exportToB1Db(exportData, setProgress);
-            props.setUndoLog(log);
+            const result = await exportToB1Db(exportData, setProgress, props.dataImportSource);
+            props.setUndoLog(result.undoLog);
+            props.setBatchId(result.batchId);
             break;
           }
           case DataSourceType.B1_ZIP: {

src/components/TabRun.tsx

@@ -9,6 +9,7 @@ interface Props {
   status: Record<string, string>;
   undoCount?: number;
   onUndo?: (onProgress?: (done: number, total: number) => void) => Promise<void>;
+  batchId?: string;
 }
 
 export const TabRun = (props: Props) => {
@@ -183,6 +184,12 @@ export const TabRun = (props: Props) => {
                 </Typography>
               )}
 
+              {props.dataExportSource === DataSourceType.B1_DB && props.batchId && (
+                <Typography variant="body2" color="text.secondary" sx={{ mt: 1 }}>
+                  This import was saved as a batch and can be undone anytime from B1Admin → Settings → Batches.
+                </Typography>
+              )}
+
               {props.dataExportSource === DataSourceType.B1_DB && !!props.undoCount && undoState === "idle" && (
                 <Box sx={{ mt: 3 }}>
                   <Button variant="outlined" color="error" startIcon={<Undo />} onClick={() => setConfirmUndo(true)}>

src/helpers/ExportHelpers/ExportB1DbHelper.ts

@@ -14,9 +14,36 @@ const MAX_RETRIES = 3;
 
 export interface UndoEntry { endpoint: string; apiName: any; id: string }
 
+// Endpoints the Api's audit registry marks batch-capable. Only these accept X-Batch-Id;
+// any other route 400s when the header is present, so the batch header is scoped to just these.
+const BATCH_CAPABLE = [
+  "/campuses",
+  "/people",
+  "/groups",
+  "/groupmembers",
+  "/forms",
+  "/donations",
+  "/households",
+  "/questions",
+  "/services",
+  "/servicetimes",
+  "/groupservicetimes",
+  "/funds",
+  "/donationbatches",
+  "/funddonations"
+];
+
 // ponytail: module-level log of every row this run inserted; reversed = FK-safe delete order
 let undoLog: UndoEntry[] = [];
 
+// Set only while an import is running; the request hook stamps the header on batch-capable calls.
+let activeBatchId: string | undefined;
+const batchRequestHook = (url: string, requestOptions: any) => {
+  if (activeBatchId && BATCH_CAPABLE.some(e => url.endsWith(e))) {
+    requestOptions.headers = { ...(requestOptions.headers || {}), "X-Batch-Id": activeBatchId };
+  }
+};
+
 const postInBatches = async <T extends { id?: string }>(
   endpoint: string,
   data: T[],
@@ -57,7 +84,9 @@ const postInBatches = async <T extends { id?: string }>(
   return results;
 };
 
-const exportToB1Db = async (exportData: ImportDataInterface, updateProgress: (name: string, status: string) => void): Promise<UndoEntry[]> => {
+export interface ImportResult { undoLog: UndoEntry[]; batchId?: string }
+
+const exportToB1Db = async (exportData: ImportDataInterface, updateProgress: (name: string, status: string) => void, importSourceName?: string): Promise<ImportResult> => {
 
   undoLog = [];
   const sleep = (milliseconds: number) => new Promise(resolve => setTimeout(resolve, milliseconds));
@@ -78,13 +107,43 @@ const exportToB1Db = async (exportData: ImportDataInterface, updateProgress: (na
     }
   };
 
-  const campusResult = await exportCampuses(exportData, runImport);
-  const tmpPeople = await exportPeople(exportData, runImport, updateProgress);
-  const tmpGroups = await exportGroups(exportData, tmpPeople, campusResult.serviceTimes, runImport, updateProgress);
-  await exportAttendance(exportData, tmpPeople, tmpGroups, campusResult.services, campusResult.serviceTimes, runImport, updateProgress);
-  await exportDonations(exportData, tmpPeople, runImport, updateProgress);
-  await exportForms(exportData, tmpPeople, tmpGroups, runImport);
-  return undoLog;
+  let batchId: string | undefined;
+  try {
+    const label = `Import from ${importSourceName || "file"} ${new Date().toLocaleDateString()}`;
+    const batch = await ApiHelper.post("/batches", { label, source: "import" }, "MembershipApi");
+    batchId = batch?.id;
+  } catch (e) {
+    // Batch tracking is best-effort; a failure here must not block the import itself.
+    console.error("Could not create undo batch; import will not be undoable from B1Admin", e);
+  }
+
+  const prevOnRequest = ApiHelper.onRequest;
+  if (batchId) {
+    activeBatchId = batchId;
+    ApiHelper.onRequest = batchRequestHook;
+  }
+
+  try {
+    const campusResult = await exportCampuses(exportData, runImport);
+    const tmpPeople = await exportPeople(exportData, runImport, updateProgress);
+    const tmpGroups = await exportGroups(exportData, tmpPeople, campusResult.serviceTimes, runImport, updateProgress);
+    await exportAttendance(exportData, tmpPeople, tmpGroups, campusResult.services, campusResult.serviceTimes, runImport, updateProgress);
+    await exportDonations(exportData, tmpPeople, runImport, updateProgress);
+    await exportForms(exportData, tmpPeople, tmpGroups, runImport);
+  } finally {
+    activeBatchId = undefined;
+    ApiHelper.onRequest = prevOnRequest;
+    if (batchId) {
+      try {
+        await ApiHelper.post(`/batches/${batchId}/complete`, {}, "MembershipApi");
+        console.log(`Import recorded as batch ${batchId}. It can be undone from B1Admin Settings → Batches.`);
+      } catch (e) {
+        console.error("Could not close undo batch", batchId, e);
+      }
+    }
+  }
+
+  return { undoLog, batchId };
 };
 
 export const undoB1DbImport = async (log: UndoEntry[], onProgress?: (done: number, total: number) => void) => {