optree UI refinements and backend prep for operation list view by sna…

…pshot id
garethgeorge · Nov 25, 2023 · 79256fc · 79256fc
1 parent 10348a3
commit 79256fc
Show file tree

Hide file tree

Showing 18 changed files with 438 additions and 180 deletions.
diff --git a/gen/go/v1/operations.pb.go b/gen/go/v1/operations.pb.go
diff --git a/gen/go/v1/service.pb.go b/gen/go/v1/service.pb.go
diff --git a/internal/api/server.go b/internal/api/server.go
@@ -96,7 +96,7 @@ func (s *Server) AddRepo(ctx context.Context, repo *v1.Repo) (*v1.Config, error)
 	return c, nil
 }
 
-// ListSnapshots implements GET /v1/snapshots/{repo.id}/{plan.id?}
+// ListSnapshots implements POST /v1/snapshots
 func (s *Server) ListSnapshots(ctx context.Context, query *v1.ListSnapshotsRequest) (*v1.ResticSnapshotList, error) {
 	repo, err := s.orchestrator.GetRepo(query.RepoId)
 	if err != nil {
@@ -200,6 +200,8 @@ func (s *Server) GetOperations(ctx context.Context, req *v1.GetOperationsRequest
 		ops, err = s.oplog.GetByPlan(req.PlanId, collector)
 	} else if req.RepoId != "" {
 		ops, err = s.oplog.GetByRepo(req.RepoId, collector)
+	} else if req.SnapshotId != "" {
+		ops, err = s.oplog.GetBySnapshotId(req.SnapshotId, collector)
 	} else {
 		ops, err = s.oplog.GetAll()
 	}

diff --git a/internal/orchestrator/tasks.go b/internal/orchestrator/tasks.go
@@ -109,7 +109,7 @@ func backupHelper(ctx context.Context, orchestrator *Orchestrator, plan *v1.Plan
 
 		lastSent := time.Now() // debounce progress updates, these can endup being very frequent.
 		summary, err := repo.Backup(ctx, plan, func(entry *restic.BackupProgressEntry) {
-			if time.Since(lastSent) < 200*time.Millisecond {
+			if time.Since(lastSent) < 250*time.Millisecond {
 				return
 			}
 			lastSent = time.Now()

diff --git a/proto/v1/operations.proto b/proto/v1/operations.proto
@@ -52,6 +52,7 @@ enum OperationStatus {
   STATUS_INPROGRESS = 2;
   STATUS_SUCCESS = 3;
   STATUS_ERROR = 4;
+  STATUS_CANCELLED = 5;
 }
 
 message OperationBackup {

diff --git a/proto/v1/service.proto b/proto/v1/service.proto
@@ -84,6 +84,7 @@ message ListSnapshotsRequest {
 message GetOperationsRequest {
   string repo_id = 1;
   string plan_id = 2;
+  string snapshot_id = 4;
   int64 last_n = 3; // limit to the last n operations
 }
 

diff --git a/webui/gen/ts/v1/operations.pb.ts b/webui/gen/ts/v1/operations.pb.ts
@@ -27,6 +27,7 @@ export enum OperationStatus {
   STATUS_INPROGRESS = "STATUS_INPROGRESS",
   STATUS_SUCCESS = "STATUS_SUCCESS",
   STATUS_ERROR = "STATUS_ERROR",
+  STATUS_CANCELLED = "STATUS_CANCELLED",
 }
 
 export type OperationList = {

diff --git a/webui/gen/ts/v1/service.pb.ts b/webui/gen/ts/v1/service.pb.ts
@@ -18,6 +18,7 @@ export type ListSnapshotsRequest = {
 export type GetOperationsRequest = {
   repoId?: string
   planId?: string
+  snapshotId?: string
   lastN?: string
 }
 

diff --git a/webui/package-lock.json b/webui/package-lock.json
diff --git a/webui/package.json b/webui/package.json
@@ -27,6 +27,7 @@
     "typescript": "^5.2.2"
   },
   "devDependencies": {
+    "@parcel/transformer-sass": "^2.10.3",
     "events": "^3.3.0",
     "stream-browserify": "^3.0.0"
   }