Add more tie-breakers

Author: christeredvartsen

internal/status/sortfilter.go

@@ -3,21 +3,41 @@ package status
 import (
 	"context"
 
+	"github.com/nais/api/internal/graph/model"
 	"github.com/nais/api/internal/workload"
 	"github.com/nais/api/internal/workload/application"
 	"github.com/nais/api/internal/workload/job"
+	"k8s.io/utils/ptr"
 )
 
 func init() {
 	application.SortFilter.RegisterConcurrentSort("STATUS", func(ctx context.Context, a *application.Application) int {
 		return int(ForWorkload(ctx, a).State)
+	}, application.SortFilterTieBreaker{
+		Field:     "NAME",
+		Direction: ptr.To(model.OrderDirectionAsc),
+	}, application.SortFilterTieBreaker{
+		Field:     "ENVIRONMENT",
+		Direction: ptr.To(model.OrderDirectionAsc),
 	})
 
 	job.SortFilter.RegisterConcurrentSort("STATUS", func(ctx context.Context, a *job.Job) int {
 		return int(ForWorkload(ctx, a).State)
+	}, job.SortFilterTieBreaker{
+		Field:     "NAME",
+		Direction: ptr.To(model.OrderDirectionAsc),
+	}, job.SortFilterTieBreaker{
+		Field:     "ENVIRONMENT",
+		Direction: ptr.To(model.OrderDirectionAsc),
 	})
 
 	workload.SortFilter.RegisterConcurrentSort("STATUS", func(ctx context.Context, a workload.Workload) int {
 		return int(ForWorkload(ctx, a).State)
+	}, workload.SortFilterTieBreaker{
+		Field:     "NAME",
+		Direction: ptr.To(model.OrderDirectionAsc),
+	}, workload.SortFilterTieBreaker{
+		Field:     "ENVIRONMENT",
+		Direction: ptr.To(model.OrderDirectionAsc),
 	})
 }

internal/vulnerability/sortfilter.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"strings"
 
+	"github.com/nais/api/internal/graph/model"
 	"github.com/nais/api/internal/graph/sortfilter"
 	"github.com/nais/api/internal/workload"
+	"k8s.io/utils/ptr"
 )
 
 var SortFilterImageVulnerabilities = sortfilter.New[*ImageVulnerability, ImageVulnerabilityOrderField, struct{}]()
@@ -63,22 +65,33 @@ func workloadInit() {
 		}
 	}
 
+	tieBreakers := []workload.SortFilterTieBreaker{
+		{
+			Field:     "NAME",
+			Direction: ptr.To(model.OrderDirectionAsc),
+		},
+		{
+			Field:     "ENVIRONMENT",
+			Direction: ptr.To(model.OrderDirectionAsc),
+		},
+	}
+
 	workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_RISK_SCORE", summarySorter(func(sum *ImageVulnerabilitySummary) int {
 		return sum.RiskScore
-	}))
+	}), tieBreakers...)
 	workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_SEVERITY_CRITICAL", summarySorter(func(sum *ImageVulnerabilitySummary) int {
 		return sum.Critical
-	}))
+	}), tieBreakers...)
 	workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_SEVERITY_HIGH", summarySorter(func(sum *ImageVulnerabilitySummary) int {
 		return sum.High
-	}))
+	}), tieBreakers...)
 	workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_SEVERITY_MEDIUM", summarySorter(func(sum *ImageVulnerabilitySummary) int {
 		return sum.Medium
-	}))
+	}), tieBreakers...)
 	workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_SEVERITY_LOW", summarySorter(func(sum *ImageVulnerabilitySummary) int {
 		return sum.Low
-	}))
+	}), tieBreakers...)
 	workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_SEVERITY_UNASSIGNED", summarySorter(func(sum *ImageVulnerabilitySummary) int {
 		return sum.Unassigned
-	}))
+	}), tieBreakers...)
 }