diff --git a/cmd/bb_scheduler/build_queue_state_service.go b/cmd/bb_scheduler/build_queue_state_service.go
index bc998588..60ddd98e 100644
--- a/cmd/bb_scheduler/build_queue_state_service.go
+++ b/cmd/bb_scheduler/build_queue_state_service.go
@@ -276,8 +276,26 @@ func (s *buildQueueStateService) handleGetOperation(w http.ResponseWriter, req *
}
func (s *buildQueueStateService) handleListOperations(w http.ResponseWriter, req *http.Request) {
+ query := req.URL.Query()
+ var filterInvocationID *anypb.Any
+ if filterInvocationIDString := query.Get("filter_invocation_id"); filterInvocationIDString != "" {
+ var invocationID anypb.Any
+ if err := protojson.Unmarshal([]byte(filterInvocationIDString), &invocationID); err != nil {
+ renderError(w, status.Error(codes.InvalidArgument, "Invalid filter invocation ID"))
+ return
+ }
+ filterInvocationID = &invocationID
+ }
+
+ filterStageString := query.Get("filter_stage")
+ filterStageValue, ok := remoteexecution.ExecutionStage_Value_value[filterStageString]
+ if !ok {
+ renderError(w, status.Error(codes.InvalidArgument, "Invalid filter stage"))
+ return
+ }
+
var startAfter *buildqueuestate.ListOperationsRequest_StartAfter
- if startAfterParameter := req.URL.Query().Get("start_after"); startAfterParameter != "" {
+ if startAfterParameter := query.Get("start_after"); startAfterParameter != "" {
var startAfterMessage buildqueuestate.ListOperationsRequest_StartAfter
if err := protojson.Unmarshal([]byte(startAfterParameter), &startAfterMessage); err != nil {
renderError(w, util.StatusWrapWithCode(err, codes.InvalidArgument, "Failed to parse start after message"))
@@ -288,8 +306,10 @@ func (s *buildQueueStateService) handleListOperations(w http.ResponseWriter, req
ctx := req.Context()
response, err := s.buildQueue.ListOperations(ctx, &buildqueuestate.ListOperationsRequest{
- PageSize: pageSize,
- StartAfter: startAfter,
+ FilterInvocationId: filterInvocationID,
+ FilterStage: remoteexecution.ExecutionStage_Value(filterStageValue),
+ PageSize: pageSize,
+ StartAfter: startAfter,
})
if err != nil {
renderError(w, util.StatusWrap(err, "Failed to list operations"))
@@ -305,19 +325,23 @@ func (s *buildQueueStateService) handleListOperations(w http.ResponseWriter, req
}
if err := templates.ExecuteTemplate(w, "list_operation_state.html", struct {
- BrowserURL *url.URL
- Now time.Time
- PaginationInfo *buildqueuestate.PaginationInfo
- EndIndex int
- StartAfter *buildqueuestate.ListOperationsRequest_StartAfter
- Operations []*buildqueuestate.OperationState
+ BrowserURL *url.URL
+ Now time.Time
+ PaginationInfo *buildqueuestate.PaginationInfo
+ EndIndex int
+ FilterInvocationID *anypb.Any
+ FilterStage string
+ StartAfter *buildqueuestate.ListOperationsRequest_StartAfter
+ Operations []*buildqueuestate.OperationState
}{
- BrowserURL: s.browserURL,
- Now: s.clock.Now(),
- PaginationInfo: response.PaginationInfo,
- EndIndex: int(response.PaginationInfo.StartIndex) + len(response.Operations),
- StartAfter: nextStartAfter,
- Operations: response.Operations,
+ BrowserURL: s.browserURL,
+ Now: s.clock.Now(),
+ PaginationInfo: response.PaginationInfo,
+ EndIndex: int(response.PaginationInfo.StartIndex) + len(response.Operations),
+ FilterInvocationID: filterInvocationID,
+ FilterStage: filterStageString,
+ StartAfter: nextStartAfter,
+ Operations: response.Operations,
}); err != nil {
log.Print(err)
}
diff --git a/cmd/bb_scheduler/templates/get_build_queue_state.html b/cmd/bb_scheduler/templates/get_build_queue_state.html
index 5b66bcb8..bc16394a 100644
--- a/cmd/bb_scheduler/templates/get_build_queue_state.html
+++ b/cmd/bb_scheduler/templates/get_build_queue_state.html
@@ -5,7 +5,7 @@ Build queue
diff --git a/cmd/bb_scheduler/templates/get_operation_state.html b/cmd/bb_scheduler/templates/get_operation_state.html
index 787308fc..b405e50d 100644
--- a/cmd/bb_scheduler/templates/get_operation_state.html
+++ b/cmd/bb_scheduler/templates/get_operation_state.html
@@ -56,7 +56,7 @@ Operation {{.OperationName}}
|
diff --git a/cmd/bb_scheduler/templates/list_operation_state.html b/cmd/bb_scheduler/templates/list_operation_state.html
index 2ef8429f..977e9282 100644
--- a/cmd/bb_scheduler/templates/list_operation_state.html
+++ b/cmd/bb_scheduler/templates/list_operation_state.html
@@ -1,34 +1,85 @@
{{template "header.html" "success"}}
-All operations
+Operations
-