feat: add UI support for new summary details introduced in restic 0.17.0

garethgeorge · Aug 15, 2024 · 4859e52 · 4859e52
1 parent 505765d
commit 4859e52
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 17 deletions.
diff --git a/internal/orchestrator/tasks/taskindexsnapshots.go b/internal/orchestrator/tasks/taskindexsnapshots.go
@@ -107,7 +107,7 @@ func indexSnapshotsHelper(ctx context.Context, st ScheduledTask, taskRunner Task
 			FlowId:          flowID,
 			InstanceId:      instanceID,
 			UnixTimeStartMs: snapshotProto.UnixTimeMs,
-			UnixTimeEndMs:   snapshotProto.UnixTimeMs,
+			UnixTimeEndMs:   snapshotProto.UnixTimeMs + snapshot.SnapshotSummary.DurationMs(),
 			Status:          v1.OperationStatus_STATUS_SUCCESS,
 			SnapshotId:      snapshotProto.Id,
 			Op: &v1.Operation_OperationIndexSnapshot{

diff --git a/webui/src/components/OperationRow.tsx b/webui/src/components/OperationRow.tsx
@@ -25,7 +25,11 @@ import {
   InfoCircleOutlined,
   FileSearchOutlined,
 } from "@ant-design/icons";
-import { BackupProgressEntry, ResticSnapshot } from "../../gen/ts/v1/restic_pb";
+import {
+  BackupProgressEntry,
+  ResticSnapshot,
+  SnapshotSummary,
+} from "../../gen/ts/v1/restic_pb";
 import {
   DisplayType,
   detailsForOperation,
@@ -35,6 +39,7 @@ import {
 import { SnapshotBrowser } from "./SnapshotBrowser";
 import {
   formatBytes,
+  formatDuration,
   formatTime,
   normalizeSnapshotId,
 } from "../lib/formatting";
@@ -191,7 +196,9 @@ export const OperationRow = ({
   const expandedBodyItems: string[] = [];
 
   if (operation.op.case === "operationBackup") {
-    expandedBodyItems.push("details");
+    if (operation.status === OperationStatus.STATUS_INPROGRESS) {
+      expandedBodyItems.push("details");
+    }
     const backupOp = operation.op.value;
     bodyItems.push({
       key: "details",
@@ -312,29 +319,82 @@ export const OperationRow = ({
 };
 
 const SnapshotDetails = ({ snapshot }: { snapshot: ResticSnapshot }) => {
-  return (
-    <>
-      <Typography.Text>
-        <Typography.Text strong>Snapshot ID: </Typography.Text>
-        {normalizeSnapshotId(snapshot.id!)}
-      </Typography.Text>
-      <Row gutter={16}>
+  const summary: Partial<SnapshotSummary> = snapshot.summary || {};
+
+  const rows: React.ReactNode[] = [
+    <Row gutter={16} key={1}>
+      <Col span={8}>
+        <Typography.Text strong>Host</Typography.Text>
+        <br />
+        {snapshot.hostname}
+      </Col>
+      <Col span={8}>
+        <Typography.Text strong>Username</Typography.Text>
+        <br />
+        {snapshot.hostname}
+      </Col>
+      <Col span={8}>
+        <Typography.Text strong>Tags</Typography.Text>
+        <br />
+        {snapshot.tags?.join(", ")}
+      </Col>
+    </Row>,
+  ];
+
+  if (
+    summary.filesNew ||
+    summary.filesChanged ||
+    summary.filesUnmodified ||
+    summary.dataAdded ||
+    summary.totalFilesProcessed ||
+    summary.totalBytesProcessed
+  ) {
+    rows.push(
+      <Row gutter={16} key={2}>
         <Col span={8}>
-          <Typography.Text strong>Host</Typography.Text>
+          <Typography.Text strong>Files Added</Typography.Text>
           <br />
-          {snapshot.hostname}
+          {"" + summary.filesNew}
         </Col>
         <Col span={8}>
-          <Typography.Text strong>Username</Typography.Text>
+          <Typography.Text strong>Files Changed</Typography.Text>
           <br />
-          {snapshot.hostname}
+          {"" + summary.filesChanged}
         </Col>
         <Col span={8}>
-          <Typography.Text strong>Tags</Typography.Text>
+          <Typography.Text strong>Files Unmodified</Typography.Text>
           <br />
-          {snapshot.tags?.join(", ")}
+          {"" + summary.filesUnmodified}
         </Col>
       </Row>
+    );
+    rows.push(
+      <Row gutter={16} key={3}>
+        <Col span={8}>
+          <Typography.Text strong>Bytes Added</Typography.Text>
+          <br />
+          {formatBytes(Number(summary.dataAdded))}
+        </Col>
+        <Col span={8}>
+          <Typography.Text strong>Bytes Processed</Typography.Text>
+          <br />
+          {formatBytes(Number(summary.totalBytesProcessed))}
+        </Col>
+        <Col span={8}>
+          <Typography.Text strong>Files Processed</Typography.Text>
+          <br />
+          {"" + summary.totalFilesProcessed}
+        </Col>
+      </Row>
+    );
+  }
+
+  return (
+    <>
+      <Typography.Text>
+        <Typography.Text strong>Snapshot ID: </Typography.Text>
+        {normalizeSnapshotId(snapshot.id!)} {rows}
+      </Typography.Text>
     </>
   );
 };

diff --git a/webui/src/state/oplog.ts b/webui/src/state/oplog.ts
@@ -507,7 +507,11 @@ export const detailsForOperation = (
     if (op.status === OperationStatus.STATUS_INPROGRESS) {
       displayState += " for " + formatDuration(duration);
     } else {
-      displayState += " in " + formatDuration(duration);
+      if (op.op.case === "operationIndexSnapshot") {
+        displayState += " created in " + formatDuration(duration);
+      } else {
+        displayState += " took " + formatDuration(duration);
+      }
     }
   }