Skip to content

Modern Docker Management, Designed for Everyone

fix: apply search and order to the ignored vulnerabilities list (#4509)

José M. Requena Plenscc64070128b6
diff --git a/backend/internal/vulnerability/children/ignores/service.go b/backend/internal/vulnerability/children/ignores/service.go
index a57b9da0e..91e92ac87 100644
--- a/backend/internal/vulnerability/children/ignores/service.go
+++ b/backend/internal/vulnerability/children/ignores/service.go
@@ -223,6 +223,9 @@ func (s *Service) BulkUnignoreVulnerabilities(ctx context.Context, envID string,
// ListIgnoredVulnerabilities returns a list of ignored vulnerabilities for an environment
func (s *Service) ListIgnoredVulnerabilities(ctx context.Context, envID string, params pagination.QueryParams) ([]vulnerability.IgnoredVulnerability, pagination.Response, error) {
ignores, total, err := s.records.Page(ctx, envID, func(query *gorm.DB) *gorm.DB {
+ query = pagination.ApplyLikeSearch(query, strings.ToLower(params.Search),
+ "(LOWER(vulnerability_id) LIKE ? OR LOWER(pkg_name) LIKE ? OR LOWER(installed_version) LIKE ? OR "+
+ "LOWER(image_id) LIKE ? OR LOWER(COALESCE(reason, '')) LIKE ?)")
if params.Sort == "" {
return query.Order("created_at DESC")
}
@@ -231,8 +234,14 @@ func (s *Service) ListIgnoredVulnerabilities(ctx context.Context, envID string,
if part == "" {
continue
}
- desc := strings.HasPrefix(part, "-")
- switch kit.Ternary(desc, strings.TrimPrefix(part, "-"), strings.TrimPrefix(part, "+")) {
+ desc := strings.EqualFold(string(params.Order), "desc")
+ switch {
+ case strings.HasPrefix(part, "-"):
+ desc, part = true, strings.TrimPrefix(part, "-")
+ case strings.HasPrefix(part, "+"):
+ desc, part = false, strings.TrimPrefix(part, "+")
+ }
+ switch part {
case "createdAt":
query = query.Order("created_at " + kit.Ternary(desc, "DESC", "ASC"))
case "vulnerabilityId":