Pass raw autocomplete attribute

This allows us to handle the situation where the user has cleared the
field (but the autocomplete value is retained). We can check the raw
value of the field, if it's empty we know we should ignore the
autocomplete value.

app/controllers/assessor_interface/assessment_recommendation_award_controller.rb

@@ -150,8 +150,11 @@ def confirm_age_range_subjects_form_params
         :age_range_max,
         :age_range_note,
         :subject_1,
+        :subject_1_raw,
         :subject_2,
+        :subject_2_raw,
         :subject_3,
+        :subject_3_raw,
         :subjects_note,
       )
     end

app/forms/assessor_interface/check_age_range_subjects_form.rb

@@ -26,8 +26,11 @@ def permittable_parameters
         age_range_max
         age_range_note
         subject_1
+        subject_1_raw
         subject_2
+        subject_2_raw
         subject_3
+        subject_3_raw
         subjects_note
       ]
       [args, kwargs]

app/forms/concerns/assessor_interface/age_range_subjects_form.rb

@@ -24,11 +24,15 @@ module AssessorInterface::AgeRangeSubjectsForm
               }
 
     attribute :subject_1, :string
+    attribute :subject_1_raw, :string
     attribute :subject_2, :string
+    attribute :subject_2_raw, :string
     attribute :subject_3, :string
+    attribute :subject_3_raw, :string
     attribute :subjects_note, :string
 
     validates :subject_1, presence: true
+    validates :subject_1_raw, presence: true
   end
 
   def save
@@ -52,7 +56,11 @@ def update_age_range
   end
 
   def update_subjects
-    subjects = [subject_1, subject_2, subject_3].compact_blank
+    subjects = [
+      subject_1_raw.present? ? subject_1 : "",
+      subject_2_raw.present? ? subject_2 : "",
+      subject_3_raw.present? ? subject_3 : "",
+    ].compact_blank
     note = subjects_note.presence || ""
     assessment.update!(subjects:, subjects_note: note)
   end

app/javascript/application.js

@@ -54,6 +54,6 @@ var loadCountryAutoComplete = () => {
 };
 
 loadCountryAutoComplete();
-dfeAutocomplete({});
+dfeAutocomplete({ rawAttribute: true });
 
 checkboxSearchFilter("app-applications-filters-assessor", "Search assessors");

spec/support/shared_examples/age_range_subjects_form.rb

@@ -34,6 +34,7 @@
     it { is_expected.to_not validate_presence_of(:age_range_note) }
 
     it { is_expected.to validate_presence_of(:subject_1) }
+    it { is_expected.to validate_presence_of(:subject_1_raw) }
     it { is_expected.to_not validate_presence_of(:subject_2) }
     it { is_expected.to_not validate_presence_of(:subject_3) }
     it { is_expected.to_not validate_presence_of(:subjects_note) }
@@ -48,7 +49,12 @@
 
     describe "with valid attributes and no note" do
       let(:age_range_subjects_attributes) do
-        { age_range_min: "7", age_range_max: "11", subject_1: "Subject" }
+        {
+          age_range_min: "7",
+          age_range_max: "11",
+          subject_1: "Subject",
+          subject_1_raw: "Subject",
+        }
       end
 
       it { is_expected.to be true }
@@ -79,6 +85,7 @@
           age_range_max: "11",
           age_range_note: "A note.",
           subject_1: "Subject",
+          subject_1_raw: "Subject",
           subjects_note: "Another note.",
         }
       end