fix(master): review fixes for newer-tag suggestions (#11)

internal/master/web/server.go

@@ -393,7 +393,7 @@ func (s *Server) serviceDetail(r *http.Request, id int64) (pageData, error) {
 		return data, err
 	}
 	data.NewerTag = newerTag(svc)
-	if data.NewerTag != "" && !slices.ContainsFunc(versions, func(v model.ImageVersion) bool { return v.Tag == data.NewerTag }) {
+	if data.NewerTag != "" && !slices.ContainsFunc(versions, func(v model.ImageVersion) bool { return v.Tag == data.NewerTag && v.Digest == "" }) {
 		// The suggested tag can be older than the listed versions; it must
 		// still be pickable.
 		v, err := s.store.GetTagVersion(r.Context(), svc.ImageRepo, data.NewerTag)

internal/master/web/static/app.css

@@ -106,10 +106,9 @@ summary.btn::-webkit-details-marker{display:none}
 .tag em{font:500 11.5px var(--mono);font-style:normal;margin-left:6px}
 .tag em:empty{display:none}
 .f-up{color:var(--orange);background:var(--orangebg)}
-.f-newer{color:var(--mut);box-shadow:inset 0 0 0 1px var(--line2)}
 .f-newer em{color:var(--orange)}
 .f-err{color:var(--red);background:var(--redbg)}
-.f-notag{color:var(--mut);box-shadow:inset 0 0 0 1px var(--line2)}
+.f-newer,.f-notag{color:var(--mut);box-shadow:inset 0 0 0 1px var(--line2)}
 .f-out{color:var(--dim);box-shadow:inset 0 0 0 1px var(--line)}
 .mode{display:flex;flex-direction:column;align-items:flex-start;gap:2px}
 .mode form{margin:0;display:flex;flex-direction:column;align-items:flex-start;gap:2px}

internal/master/web/versions_test.go

@@ -247,6 +247,21 @@ func TestServicePage_NewerTagAlreadyListedIsNotAppendedTwice(t *testing.T) {
 	assert.Equal(t, 1, strings.Count(body, `name="version"`))
 }
 
+func TestServicePage_PinnedRowOfTheNewerTagDoesNotHideThePlainRow(t *testing.T) {
+	srv, store, _, _, _ := newTestEnv(t)
+	store.services[0].ImageRepo = sluskRepo
+	store.services[0].NewerRef = sluskRepo + ":1.5.0"
+	store.versions = []model.ImageVersion{
+		{ID: 31, Repo: sluskRepo, Tag: "1.5.0", Digest: "sha256:d", Source: "poll"},
+		{ID: 32, Repo: sluskRepo, Tag: "1.5.0", Source: "tags"},
+	}
+
+	_, body := get(t, srv, "/services/1")
+
+	assert.Equal(t, 2, strings.Count(body, `name="version"`))
+	assert.Contains(t, body, `<input type="hidden" name="version" value="32">`)
+}
+
 func TestServicePage_NoNewerTagRowWithoutSuggestion(t *testing.T) {
 	srv, _, _, _, _ := newTestEnv(t)
 

internal/master/web/views.go

@@ -249,17 +249,21 @@ func followsNoTag(svc model.Service) bool {
 // newerTag returns the tag of the service's newer-tag suggestion, or "" when
 // there is none or it no longer holds. The poller writes the suggestion once
 // per cycle, so after the service moved to another tag the stored value can
-// be stale until the next cycle; checking again here hides it meanwhile.
+// be stale until the next cycle; checking again here hides it meanwhile. A
+// suggestion from another repo than the service follows now is hidden too.
 func newerTag(s model.Service) string {
 	if s.RemovedAt != nil || s.NewerRef == "" {
 		return ""
 	}
-	tag := imageref.Parse(s.NewerRef).Tag
-	followed := imageref.Parse(jobs.FollowedRef(s.ActualRef)).Tag
-	if _, ok := tagver.Newer(followed, []string{tag}); !ok {
+	newer := imageref.Parse(s.NewerRef)
+	repo, followed := poller.Followed(s)
+	if newer.Repo != repo {
 		return ""
 	}
-	return tag
+	if _, ok := tagver.Newer(followed, []string{newer.Tag}); !ok {
+		return ""
+	}
+	return newer.Tag
 }
 
 // versionRow is an image version as shown on the service page.

internal/master/web/views_test.go

@@ -223,6 +223,7 @@ func TestNewerTag(t *testing.T) {
 		{"bare image follows latest", model.Service{ActualRef: "gitea/gitea", NewerRef: "gitea/gitea:1.28.0"}, ""},
 		{"stale after the tag changed", model.Service{ActualRef: "gitea/gitea:1.28.0", NewerRef: "gitea/gitea:1.28.0"}, ""},
 		{"stale after the tag moved past it", model.Service{ActualRef: "gitea/gitea:1.29.0", NewerRef: "gitea/gitea:1.28.0"}, ""},
+		{"other repo", model.Service{ActualRef: "redis:7.2.4", NewerRef: "bitnami/redis:7.2.5"}, ""},
 		{"removed", model.Service{ActualRef: "gitea/gitea:1.27.3", NewerRef: "gitea/gitea:1.28.0", RemovedAt: &removed}, ""},
 		{"empty", model.Service{ActualRef: "gitea/gitea:1.27.3"}, ""},
 	}