Merge pull request #124 from epimorphics/issue/118-input-error-identi…

…fication updates step 3/7 to return user input
epimorphics · Aug 14, 2024 · 3847d68 · 3847d68
2 parents 5f906b6 + ac1dd27
commit 3847d68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 1.5.3 - 2024-08
 
+- (Dan) Updates step 3/7 to return user input rather than false when user inputs invalid value [118](https://github.com/epimorphics/standard-reports-ui/issues/118)
 - (Dan) Adds underline text to laning page of standard reports and to help link[114](https://github.com/epimorphics/standard-reports-ui/issues/114)
 - (Dan) Styled the help button to match PPD [117](https://github.com/epimorphics/standard-reports-ui/issues/117)
 - (Dan) Adds more descriptive text to action buttons on the report page [115](https://github.com/epimorphics/standard-reports-ui/issues/115)

diff --git a/app/models/step_select_county_or_district.rb b/app/models/step_select_county_or_district.rb
@@ -18,16 +18,17 @@ def traverse(workflow)
   end
 
   def validate_value(workflow)
+    input_text = value(workflow)
     normalized_value = validate(value(workflow))
     unless normalized_value && (value(workflow) == normalized_value)
-      workflow.set_state(param_name, normalized_value)
+      workflow.set_state(param_name, input_text)
     end
 
-    normalized_value || validation_failure(workflow)
+    normalized_value || validation_failure(input_text)
   end
 
-  def validation_failure(workflow)
-    set_flash("Sorry, #{subtype_label} '#{value(workflow)}' was not recognised")
+  def validation_failure(input_text)
+    set_flash("Sorry, #{subtype_label} '#{input_text}' was not recognised")
     false
   end