Merge pull request #3483 from jamsman94/cp/3482

jamsman94 · web-flow · commit 2cb6c22c7984 · 2024-04-19T15:29:01.000+08:00
cherrypick #3482
diff --git a/pkg/microservice/aslan/core/workflow/service/workflow/job/job_build.go b/pkg/microservice/aslan/core/workflow/service/workflow/job/job_build.go
@@ -135,10 +135,12 @@ func (j *BuildJob) ClearSelectionField() error {
 	if err := commonmodels.IToi(j.job.Spec, j.spec); err != nil {
 		return err
 	}
-
 	chosenObject := make([]*commonmodels.ServiceAndBuild, 0)
 
-	j.spec.ServiceAndBuilds = chosenObject
+	// some weird logic says we shouldn't clear user's selection if there are only one service in the selection pool.
+	if len(j.spec.ServiceAndBuilds) != 1 {
+		j.spec.ServiceAndBuilds = chosenObject
+	}
 	j.job.Spec = j.spec
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -135,10 +135,12 @@ func (j *BuildJob) ClearSelectionField() error {`
`135`	`135`	`if err := commonmodels.IToi(j.job.Spec, j.spec); err != nil {`
`136`	`136`	`return err`
`137`	`137`	`}`
`138`		`-`
`139`	`138`	`chosenObject := make([]*commonmodels.ServiceAndBuild, 0)`
`140`	`139`
`141`		`- j.spec.ServiceAndBuilds = chosenObject`
	`140`	`+ // some weird logic says we shouldn't clear user's selection if there are only one service in the selection pool.`
	`141`	`+ if len(j.spec.ServiceAndBuilds) != 1 {`
	`142`	`+ j.spec.ServiceAndBuilds = chosenObject`
	`143`	`+ }`
`142`	`144`	`j.job.Spec = j.spec`
`143`	`145`	`return nil`
`144`	`146`	`}`