diff --git a/changelog.d/fixed-adopt-now-hold-caption.md b/changelog.d/fixed-adopt-now-hold-caption.md new file mode 100644 index 0000000000..36aee29e17 --- /dev/null +++ b/changelog.d/fixed-adopt-now-hold-caption.md @@ -0,0 +1 @@ +- A hold added after Adopt now no longer leaves the row captioned as queued; it reads 'release the hold first' (#15665) diff --git a/src/pkg/dashboard/api_repo_item_takeover_test.go b/src/pkg/dashboard/api_repo_item_takeover_test.go index 2c5f97692c..495f26d1c5 100644 --- a/src/pkg/dashboard/api_repo_item_takeover_test.go +++ b/src/pkg/dashboard/api_repo_item_takeover_test.go @@ -370,6 +370,26 @@ func TestStageTrackerTakeoverQueuedAfterAdoptNow(t *testing.T) { } } +// A hold added after Adopt now: the engine stops at the hold without +// consuming the request, so the row must not keep saying "queued". +func TestStageTrackerTakeoverHoldAfterAdoptNowNotQueued(t *testing.T) { + now := time.Date(2026, 10, 28, 16, 0, 0, 0, time.UTC) + s, store, status := adoptionFixture(t, now, config.AdoptionMaintainerPolicyNever, offlinePresence(now.Add(-26*time.Hour))) + s.rerouteCandidates = func(string) []RerouteCandidate { return []RerouteCandidate{{Login: "bee2", Capable: true}} } + store.NoteAdoptionForced(stagelabels.Key("hivecommons/hive", 14524), "andan02", now.Add(-time.Minute)) + pr := status.Repos[0].OpenPrs[0].(FrontendPR) + pr.Labels = append(pr.Labels, "hold") + status.Repos[0].OpenPrs[0] = pr + s.UpdateStatus(status) + it := trackerItem(t, s.buildStageTracker(status, store, now), "pr", 14524) + if tk := it.Takeover; tk == nil || tk.AdoptNow || tk.AdoptNowReason != takeoverAdoptNowDisabledHold { + t.Fatalf("takeover = %+v", it.Takeover) + } + if a := it.Adoption; a != nil && (a.QueuedBy != "" || strings.HasPrefix(a.Text, "Adopting…")) { + t.Fatalf("adoption still queued under a hold: %+v", a) + } +} + func TestStageTrackerTakeoverDisabledReasons(t *testing.T) { now := time.Date(2026, 10, 28, 16, 0, 0, 0, time.UTC) s, store, status := adoptionFixture(t, now, config.AdoptionMaintainerPolicyNever, offlinePresence(now.Add(-26*time.Hour))) diff --git a/src/pkg/dashboard/stage_tracker_adoption.go b/src/pkg/dashboard/stage_tracker_adoption.go index 44430b8925..17f2136dfd 100644 --- a/src/pkg/dashboard/stage_tracker_adoption.go +++ b/src/pkg/dashboard/stage_tracker_adoption.go @@ -3,6 +3,7 @@ package dashboard import ( "context" "fmt" + "slices" "strconv" "strings" "time" @@ -128,7 +129,7 @@ func stageTrackerAdoption(it StageTrackerItem, rec stagelabels.Record, hasRec bo if rec.AdoptedHead != "" && (it.Head == "" || rec.Adopted(it.Head) || rec.AdoptedInPlace()) { return nil } - if by, ok := rec.AdoptionForced(); ok { + if by, ok := rec.AdoptionForced(); ok && !slices.Contains(it.Modifiers, modHold) { // An operator pressed Adopt now and the sweep has not landed yet: // the row reads as acted on, whatever held adoption before. out := &StageTrackerAdoption{Author: it.Author, Policy: policy, Due: true, QueuedBy: by, Nudges: rec.NudgeCount} diff --git a/src/pkg/dashboard/stage_tracker_presence.go b/src/pkg/dashboard/stage_tracker_presence.go index 232d41fd49..bd4b145bba 100644 --- a/src/pkg/dashboard/stage_tracker_presence.go +++ b/src/pkg/dashboard/stage_tracker_presence.go @@ -230,8 +230,5 @@ func stageTrackerPresenceFor(it StageTrackerItem, login string, stage stagelabel } func orDefault(d, def time.Duration) time.Duration { - if d <= 0 { - return def - } - return d + return automerge.DurationOr(d, def) } diff --git a/src/pkg/dashboard/stage_tracker_takeover.go b/src/pkg/dashboard/stage_tracker_takeover.go index 0f93f37d8a..f6a8250bcf 100644 --- a/src/pkg/dashboard/stage_tracker_takeover.go +++ b/src/pkg/dashboard/stage_tracker_takeover.go @@ -113,12 +113,13 @@ func stageTrackerTakeover(it StageTrackerItem, rec stagelabels.Record, hasRec bo _, forcedPending := rec.AdoptionForced() forcedPending = forcedPending && hasRec switch { + case held: + // The engine stops at a hold without consuming a queued Adopt now. + out.AdoptNowReason = takeoverAdoptNowDisabledHold case forcedPending: out.AdoptNowReason = takeoverAdoptNowQueued case !adoptionEnabled: out.AdoptNowReason = takeoverAdoptNowDisabledOff - case held: - out.AdoptNowReason = takeoverAdoptNowDisabledHold default: out.AdoptNow = true } diff --git a/src/pkg/github/automerge/automerge_adoption_clock.go b/src/pkg/github/automerge/automerge_adoption_clock.go index b40aa98686..ca85c15562 100644 --- a/src/pkg/github/automerge/automerge_adoption_clock.go +++ b/src/pkg/github/automerge/automerge_adoption_clock.go @@ -68,7 +68,10 @@ func (c AdoptionClock) offlineGrace() time.Duration { return durationOr(c.AdoptOfflineGrace, defaultAdoptOfflineGrace) } -func durationOr(d, def time.Duration) time.Duration { +func durationOr(d, def time.Duration) time.Duration { return DurationOr(d, def) } + +// DurationOr returns d, or def when d is not positive. +func DurationOr(d, def time.Duration) time.Duration { if d > 0 { return d } diff --git a/src/pkg/github/automerge/automerge_duration_or_test.go b/src/pkg/github/automerge/automerge_duration_or_test.go new file mode 100644 index 0000000000..ea89bd86ea --- /dev/null +++ b/src/pkg/github/automerge/automerge_duration_or_test.go @@ -0,0 +1,18 @@ +package automerge + +import ( + "testing" + "time" +) + +func TestDurationOr(t *testing.T) { + for _, tc := range []struct{ d, def, want time.Duration }{ + {0, time.Hour, time.Hour}, + {-time.Minute, time.Hour, time.Hour}, + {time.Minute, time.Hour, time.Minute}, + } { + if got := DurationOr(tc.d, tc.def); got != tc.want { + t.Errorf("DurationOr(%v, %v) = %v, want %v", tc.d, tc.def, got, tc.want) + } + } +}