Refactor AppTriageFormComponent

This refactors the component to simplify its use and make it work
in a similar way to the `AppVaccinateFormComponent`.

Author: thomasleese

app/components/app_patient_page_component.html.erb

@@ -25,12 +25,6 @@
     <%= render AppTriageFormComponent.new(
           patient_session:,
           programme:,
-          url: session_patient_programme_triages_path(
-            session,
-            patient,
-            programme,
-            @triage
-          ),
           triage: @triage,
           legend: :bold,
         ) %>

app/components/app_triage_form_component.html.erb

@@ -1,37 +1,31 @@
 <%= form_with(
      model: @triage,
-     url: @url,
-     method: @method,
+     url:,
+     method: :post,
      builder: GOVUKDesignSystemFormBuilder::FormBuilder,
    ) do |f| %>
   <% content_for(:before_content) { f.govuk_error_summary } %>
 
-  <%= f.govuk_radio_buttons_fieldset(:status, **fieldset_options) do %>
-    <%= f.govuk_radio_button(
-          :status, :ready_to_vaccinate,
-          label: { text: "Yes, it’s safe to vaccinate" },
-          link_errors: true,
-        ) %>
+  <%= f.govuk_radio_buttons_fieldset :status, **fieldset_options do %>
+    <%= f.govuk_radio_button :status, :ready_to_vaccinate,
+                             label: { text: "Yes, it’s safe to vaccinate" },
+                             link_errors: true %>
+
     <%= f.govuk_radio_divider %>
-    <%= f.govuk_radio_button(
-          :status, :do_not_vaccinate,
-          label: { text: "No, do not vaccinate" },
-        ) %>
-    <%= f.govuk_radio_button(
-          :status, :delay_vaccination,
-          label: { text: "No, delay vaccination (and invite to clinic)" },
-        ) %>
-    <%= f.govuk_radio_button(
-          :status, :needs_follow_up,
-          label: { text: "No, keep in triage" },
-        ) %>
+
+    <%= f.govuk_radio_button :status, :do_not_vaccinate,
+                             label: { text: "No, do not vaccinate" } %>
+
+    <%= f.govuk_radio_button :status, :delay_vaccination,
+                             label: { text: "No, delay vaccination (and invite to clinic)" } %>
+
+    <%= f.govuk_radio_button :status, :needs_follow_up,
+                             label: { text: "No, keep in triage" } %>
   <% end %>
 
-  <%= f.govuk_text_area(
-        :notes,
-        label: { text: "Triage notes (optional)" },
-        rows: 5,
-      ) %>
+  <%= f.govuk_text_area :notes,
+                        label: { text: "Triage notes (optional)" },
+                        rows: 5 %>
 
-  <%= f.govuk_submit @method == :put ? "Continue" : "Save triage" %>
+  <%= f.govuk_submit @triage.new_record? ? "Save triage" : "Continue" %>
 <% end %>

app/components/app_triage_form_component.rb

@@ -1,41 +1,29 @@
 # frozen_string_literal: true
 
 class AppTriageFormComponent < ViewComponent::Base
-  def initialize(
-    patient_session:,
-    programme:,
-    url:,
-    method: :post,
-    triage: nil,
-    legend: nil
-  )
+  def initialize(patient_session:, programme:, triage: nil, legend: nil)
     super
 
     @patient_session = patient_session
     @programme = programme
-    @triage =
-      triage ||
-        Triage.new.tap do |t|
-          if (
-               latest_triage =
-                 patient_session.patient.triage_outcome.latest[programme]
-             )
-            t.status = latest_triage.status
-          end
-        end
-    @url = url
-    @method = method
+    @triage = triage || default_triage
     @legend = legend
   end
 
   private
 
-  attr_reader :programme
+  attr_reader :patient_session, :programme, :triage, :legend
+
+  delegate :patient, :session, to: :patient_session
+
+  def url
+    session_patient_programme_triages_path(session, patient, programme, triage)
+  end
 
   def fieldset_options
-    text = "Is it safe to vaccinate #{@patient_session.patient.given_name}?"
+    text = "Is it safe to vaccinate #{patient.given_name}?"
 
-    case @legend
+    case legend
     when :bold
       { legend: { text:, tag: :h2 } }
     when :hidden
@@ -44,4 +32,12 @@ def fieldset_options
       { legend: { text:, size: "s", class: "app-fieldset__legend--reset" } }
     end
   end
+
+  def default_triage
+    if (latest_triage = patient.triage_outcome.latest[programme])
+      Triage.new(status: latest_triage.status)
+    else
+      Triage.new
+    end
+  end
 end

app/views/triages/new.html.erb

@@ -10,11 +10,5 @@
 <%= render AppTriageFormComponent.new(
       patient_session: @patient_session,
       programme: @programme,
-      url: session_patient_programme_triages_path(
-        @session,
-        @patient,
-        @programme,
-        @triage,
-      ),
       triage: @triage,
     ) %>

spec/components/app_triage_form_component_spec.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
 describe AppTriageFormComponent do
-  subject(:rendered) { render_inline(component) }
+  subject { render_inline(component) }
 
-  let(:component) do
-    described_class.new(patient_session:, programme:, url: "#")
-  end
+  let(:component) { described_class.new(patient_session:, programme:) }
 
   let(:programme) { create(:programme) }
   let(:patient_session) { create(:patient_session, programmes: [programme]) }
@@ -14,8 +12,8 @@
   it { should have_text("Is it safe to vaccinate") }
   it { should have_css(".app-fieldset__legend--reset") }
 
-  describe "triage instance variable" do
-    subject(:triage) { component.instance_variable_get(:@triage) }
+  describe "triage private method" do
+    subject { component.send(:triage) }
 
     context "patient_session has no existing triage" do
       it { should be_a(Triage) }
@@ -31,7 +29,7 @@
 
   describe "with a bold legend" do
     let(:component) do
-      described_class.new(patient_session:, programme:, url: "#", legend: :bold)
+      described_class.new(patient_session:, programme:, legend: :bold)
     end
 
     it { should have_css("h2") }
@@ -40,22 +38,19 @@
 
   describe "with a hidden legend" do
     let(:component) do
-      described_class.new(
-        patient_session:,
-        programme:,
-        url: "#",
-        legend: :hidden
-      )
+      described_class.new(patient_session:, programme:, legend: :hidden)
     end
 
     it { should have_css("legend.nhsuk-visually-hidden") }
   end
 
-  describe "with the put method" do
+  describe "with an existing triage" do
     let(:component) do
-      described_class.new(patient_session:, programme:, url: "#", method: :put)
+      described_class.new(patient_session:, programme:, triage:)
     end
 
+    let(:triage) { create(:triage) }
+
     it { should have_text("Continue") }
   end
 end