Merge pull request #6615 from NHSDigital/alistair/imports-sort-vaccines

alistair-white-horne-tng · web-flow · commit 60374ad2f017 · 2026-04-17T17:17:25.000+01:00
Sort `Vaccine`s alphabetically in upload help test
diff --git a/app/components/app_import_format_details_component.rb b/app/components/app_import_format_details_component.rb
@@ -288,7 +288,13 @@ def programme
   end
 
   def vaccine_and_batch
-    vaccines = team.vaccines.pluck(:upload_name).map { tag.i(it) }
+    vaccines =
+      team
+        .vaccines
+        .where.not(upload_name: [nil, ""])
+        .order(:upload_name)
+        .pluck(:upload_name)
+        .map { tag.i(it) }
 
     [
       {

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,13 @@ def programme`
`288`	`288`	`end`
`289`	`289`
`290`	`290`	`def vaccine_and_batch`
`291`		`- vaccines = team.vaccines.pluck(:upload_name).map { tag.i(it) }`
	`291`	`+ vaccines =`
	`292`	`+ team`
	`293`	`+ .vaccines`
	`294`	`+ .where.not(upload_name: [nil, ""])`
	`295`	`+ .order(:upload_name)`
	`296`	`+ .pluck(:upload_name)`
	`297`	`+ .map { tag.i(it) }`
`292`	`298`
`293`	`299`	`[`
`294`	`300`	`{`