fix: misc bugs in restore operation view and activity bar view

garethgeorge · Sep 4, 2024 · 656ac9e · 656ac9e
1 parent 546482f
commit 656ac9e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/internal/orchestrator/tasks/taskrestore.go b/internal/orchestrator/tasks/taskrestore.go
@@ -74,8 +74,6 @@ func restoreHelper(ctx context.Context, st ScheduledTask, taskRunner TaskRunner,
 		}
 		lastSent = time.Now()
 
-		zap.S().Infof("restore progress: %v", entry)
-
 		restoreOp.LastStatus = entry
 
 		sendWg.Add(1)

diff --git a/webui/src/components/ActivityBar.tsx b/webui/src/components/ActivityBar.tsx
@@ -67,7 +67,7 @@ export const ActivityBar = () => {
         return (
           <span key={idx}>
             {displayName} in progress for plan {op.planId} to {op.repoId} for{" "}
-            {formatDuration(Number(op.unixTimeEndMs - op.unixTimeStartMs))}
+            {formatDuration(Date.now() - Number(op.unixTimeStartMs))}
           </span>
         );
       })}

diff --git a/webui/src/components/OperationRow.tsx b/webui/src/components/OperationRow.tsx
@@ -380,10 +380,7 @@ const RestoreOperationStatus = ({ operation }: { operation: Operation }) => {
     <>
       Restore {restoreOp.path} to {restoreOp.target}
       {!isDone ? (
-        <Progress
-          percent={Math.round(progress * 1000) / 1000}
-          status="active"
-        />
+        <Progress percent={Math.round(progress * 1000) / 10} status="active" />
       ) : null}
       {operation.status == OperationStatus.STATUS_SUCCESS ? (
         <>