diff --git a/webui/src/components/OperationList.tsx b/webui/src/components/OperationList.tsx index df1b9417..4fecd48a 100644 --- a/webui/src/components/OperationList.tsx +++ b/webui/src/components/OperationList.tsx @@ -253,19 +253,21 @@ export const OperationRow = ({ items={[ { key: 1, - label: - "Removed " + - forgetOp.forget?.length + - " Snapshots (Policy Details)", - children: ( -
- -
- ), + label: "Removed " + forgetOp.forget?.length + " Snapshots", + children: <> + Removed snapshots: +
{forgetOp.forget?.map((f) => (
+                  <>
+                    {"removed snapshot " + normalizeSnapshotId(f.id!) + " taken at " + formatTime(f.unixTimeMs!)} 
+ + ))}
+ Policy: + + , }, ]} /> diff --git a/webui/src/components/OperationTree.tsx b/webui/src/components/OperationTree.tsx index 6d856c93..b2f8f8e4 100644 --- a/webui/src/components/OperationTree.tsx +++ b/webui/src/components/OperationTree.tsx @@ -40,6 +40,7 @@ export const OperationTree = ({ // track backups for this operation tree view. useEffect(() => { + console.log("using effect"); setSelectedBackupId(null); const backupCollector = new BackupInfoCollector(); const lis = (opEvent: OperationEvent) => { @@ -119,6 +120,7 @@ export const OperationTree = ({ setSelectedBackupId(null); return; } + console.log("SELECTED ID: " + backup.id); setSelectedBackupId(backup.id!); }} titleRender={(node: OpTreeNode): React.ReactNode => { diff --git a/webui/src/state/oplog.ts b/webui/src/state/oplog.ts index 38e11631..a985cb40 100644 --- a/webui/src/state/oplog.ts +++ b/webui/src/state/oplog.ts @@ -113,6 +113,9 @@ export class BackupInfoCollector { private backupBySnapshotId: { [key: string]: BackupInfo } = {}; private mergeBackups(existing: BackupInfo, newInfo: BackupInfo) { + if (existing.id > newInfo.id) { + existing.id = newInfo.id; + } existing.startTimeMs = Math.min(existing.startTimeMs, newInfo.startTimeMs); existing.endTimeMs = Math.max(existing.endTimeMs, newInfo.endTimeMs); existing.displayTime = new Date(existing.startTimeMs);