Add more field for display (#2233)

Signed-off-by: Min Min <[email protected]> Signed-off-by: Min Min <[email protected]>
koderover · Dec 30, 2022 · bfa3d96 · bfa3d96
1 parent 1cb74ea
commit bfa3d96
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/pkg/microservice/aslan/core/system/service/dashboard.go b/pkg/microservice/aslan/core/system/service/dashboard.go
@@ -98,7 +98,7 @@ func GetRunningWorkflow(log *zap.SugaredLogger) ([]*WorkflowResponse, error) {
 	runningCustomQueue := workflowcontroller.RunningTasks()
 	pendingCustomQueue := workflowcontroller.PendingTasks()
 	for _, runningtask := range runningQueue {
-		resp = append(resp, &WorkflowResponse{
+		arg := &WorkflowResponse{
 			TaskID:      runningtask.TaskID,
 			Name:        runningtask.PipelineName,
 			Project:     runningtask.ProductName,
@@ -107,7 +107,15 @@ func GetRunningWorkflow(log *zap.SugaredLogger) ([]*WorkflowResponse, error) {
 			Status:      string(runningtask.Status),
 			DisplayName: runningtask.PipelineDisplayName,
 			Type:        string(runningtask.Type),
-		})
+		}
+		if runningtask.TestArgs != nil {
+			arg.TestName = runningtask.TestArgs.TestName
+		}
+		if runningtask.ScanningArgs != nil {
+			arg.ScanName = runningtask.ScanningArgs.ScanningName
+			arg.ScanID = runningtask.ScanningArgs.ScanningID
+		}
+		resp = append(resp, arg)
 	}
 	for _, runningtask := range runningCustomQueue {
 		resp = append(resp, &WorkflowResponse{
@@ -122,7 +130,7 @@ func GetRunningWorkflow(log *zap.SugaredLogger) ([]*WorkflowResponse, error) {
 		})
 	}
 	for _, pendingTask := range pendingQueue {
-		resp = append(resp, &WorkflowResponse{
+		arg := &WorkflowResponse{
 			TaskID:      pendingTask.TaskID,
 			Name:        pendingTask.PipelineName,
 			Project:     pendingTask.ProductName,
@@ -131,7 +139,15 @@ func GetRunningWorkflow(log *zap.SugaredLogger) ([]*WorkflowResponse, error) {
 			Status:      string(pendingTask.Status),
 			DisplayName: pendingTask.PipelineDisplayName,
 			Type:        string(pendingTask.Type),
-		})
+		}
+		if pendingTask.TestArgs != nil {
+			arg.TestName = pendingTask.TestArgs.TestName
+		}
+		if pendingTask.ScanningArgs != nil {
+			arg.ScanName = pendingTask.ScanningArgs.ScanningName
+			arg.ScanID = pendingTask.ScanningArgs.ScanningID
+		}
+		resp = append(resp, arg)
 	}
 	for _, pendingTask := range pendingCustomQueue {
 		resp = append(resp, &WorkflowResponse{

diff --git a/pkg/microservice/aslan/core/system/service/types.go b/pkg/microservice/aslan/core/system/service/types.go
@@ -121,6 +121,9 @@ type WorkflowResponse struct {
 	Status      string `json:"status"`
 	DisplayName string `json:"display_name"`
 	Type        string `json:"workflow_type"`
+	TestName    string `json:"test_name,omitempty"`
+	ScanName    string `json:"scan_name,omitempty"`
+	ScanID      string `json:"scan_id,omitempty"`
 }
 
 type EnvResponse struct {