Update Consent and Triage cards on patient-session page

We no longer show the coloured heading with consent/triage status, and we now use the new
AppActionLinkComponent instaed of buttons for actions like recording a new response

Author: murugapl

app/components/app_patient_session_consent_component.html.erb

@@ -1,7 +1,5 @@
-<h3 class="nhsuk-heading-m">Consent</h3>
-
-<%= render AppCardComponent.new(feature: true) do |card| %>
-  <% card.with_heading(level: 4, colour:) { heading } %>
+<%= render AppCardComponent.new(section: true) do |card| %>
+  <% card.with_heading(level: 2) { heading } %>
 
   <% unless programme_status.vaccinated? %>
     <% if consent_status_value == :no_response %>
@@ -27,21 +25,21 @@
       <p>A consent request will be sent on <%= session.send_consent_requests_at.to_fs(:long) %>.</p>
     <% end %>
 
-    <div class="nhsuk-button-group">
-      <% if can_send_consent_request? %>
+    <%= render AppActionLinkComponent.new(
+          text: "Record a new consent response",
+          href: new_session_patient_programme_consent_path(session, patient, programme),
+        ) %>
+
+    <% if can_send_consent_request? %>
+      <div>
         <%= govuk_button_to "Send consent request",
                             send_request_session_patient_programme_consents_path(
                               session, patient, programme
                             ),
                             secondary: true %>
-      <% end %>
+      </div>
+    <% end %>
 
-      <%= govuk_button_to "Record a new consent response",
-                          session_patient_programme_consents_path(
-                            session, patient, programme
-                          ),
-                          secondary: true %>
-    </div>
   <% end %>
 
   <% if consents.any? %>

app/components/app_patient_session_consent_component.rb

@@ -18,13 +18,8 @@ def initialize(patient:, session:, programme:)
 
   def programme_type = programme.type
 
-  def colour
-    I18n.t(consent_status_value, scope: %i[status consent colour])
-  end
-
   def heading
-    status_text = I18n.t(consent_status_value, scope: %i[status consent label])
-    "#{consent_status_generator.programme.name}: #{status_text}"
+    "Consent for #{consent_status_generator.programme.name} vaccination"
   end
 
   def consent_status_value

app/components/app_patient_session_triage_component.html.erb

@@ -1,21 +1,16 @@
-<h3 class="nhsuk-heading-m">Triage</h3>
-
-<%= render AppCardComponent.new(feature: true) do |card| %>
-  <% card.with_heading(level: 4, colour:) { heading } %>
+<%= render AppCardComponent.new(section: true) do |card| %>
+  <% card.with_heading(level: 2) { heading } %>
 
   <% if triage_status_value == :not_required %>
     <p>No triage is needed for <%= patient.full_name %>.</p>
 
-    <div class="nhsuk-button-group">
-      <% if helpers.policy(Triage).new? %>
-        <%= govuk_button_link_to "Update triage outcome",
-                                 new_session_patient_programme_triages_path(session, patient, programme),
-                                 secondary: true %>
-      <% end %>
-    </div>
+    <% if helpers.policy(Triage).new? %>
+      <%= render AppActionLinkComponent.new(text: "Update triage outcome",
+                                            href: new_session_patient_programme_triages_path(session, patient, programme)) %>
+    <% end %>
   <% elsif latest_triage.nil? || latest_triage.keep_in_triage? %>
     <% if helpers.policy(Triage).new? %>
-      <p>You need to decide if <%= patient.full_name %> is safe to vaccinate.</p>
+      <p>You need to decide if <%= patient.given_name %> is safe to vaccinate.</p>
 
       <% if triage_status_generator.vaccination_history_requires_triage? %>
         <p>Incomplete vaccination history for <%= programme.name_in_sentence %>. Check if the child needs another dose.</p>
@@ -33,13 +28,10 @@
       <p><%= summary %></p>
     <% end %>
 
-    <div class="nhsuk-button-group">
-      <% if helpers.policy(Triage).new? %>
-        <%= govuk_button_link_to "Update triage outcome",
-                                 new_session_patient_programme_triages_path(session, patient, programme),
-                                 secondary: true %>
-      <% end %>
-    </div>
+    <% if helpers.policy(Triage).new? %>
+      <%= render AppActionLinkComponent.new(text: "Update triage outcome",
+                                            href: new_session_patient_programme_triages_path(session, patient, programme)) %>
+    <% end %>
   <% end %>
 
   <%= render AppTriageTableComponent.new(patient:, session:, programme:) %>

app/components/app_patient_session_triage_component.rb

@@ -44,13 +44,8 @@ def render?
 
   def programme_type = programme.type
 
-  def colour
-    I18n.t(triage_status_value, scope: %i[status triage colour])
-  end
-
   def heading
-    status_text = I18n.t(triage_status_value, scope: %i[status triage label])
-    "#{triage_status_generator.programme.name}: #{status_text}"
+    "Triage for #{triage_status_generator.programme.name} vaccination"
   end
 
   def triage_status_value

app/components/app_triage_form_component.rb

@@ -44,10 +44,12 @@ def fieldset_options
         end
       end
 
+    legend = { text:, size: "m", classes: "nhsuk-u-font-size-22" }
+
     if heading
-      { legend: { text:, tag: :h2 }, hint: { text: hint } }
+      { legend: legend.merge(tag: :h2), hint: { text: hint } }
     else
-      { legend: { text: }, hint: { text: hint } }
+      { legend:, hint: { text: hint } }
     end
   end
 

app/controllers/patient_sessions/consents_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PatientSessions::ConsentsController < PatientSessions::BaseController
-  before_action :set_consent, except: %i[create send_request]
+  before_action :set_consent, except: %i[new send_request]
   before_action :set_consent_follow_up_form,
                 only: %i[edit_follow_up update_follow_up]
   before_action :set_consent_confirm_refusal_form,
@@ -17,21 +17,16 @@ class PatientSessions::ConsentsController < PatientSessions::BaseController
   before_action :ensure_can_invalidate,
                 only: %i[edit_invalidate update_invalidate]
 
-  def create
+  def new
     authorize Consent
 
     @draft_consent = DraftConsent.new(request_session: session, current_user:)
 
     @draft_consent.clear_attributes
     @draft_consent.assign_attributes(create_params)
+    @draft_consent.save!
 
-    if @draft_consent.save
-      redirect_to draft_consent_path(Wicked::FIRST_STEP)
-    else
-      render "patient_sessions/programmes/show",
-             layout: "full",
-             status: :unprocessable_content
-    end
+    redirect_to draft_consent_path(Wicked::FIRST_STEP)
   end
 
   def send_request

config/routes.rb

@@ -312,7 +312,7 @@
       resources :programmes, path: "", param: :type, only: :show do
         get "record-already-vaccinated"
 
-        resources :consents, only: %i[index create show] do
+        resources :consents, only: %i[index new show] do
           post "send-request", on: :collection, action: :send_request
 
           member do

spec/components/app_patient_session_consent_component_spec.rb

@@ -16,7 +16,7 @@
     it { should_not have_css("details", text: /Consent (given|refused) by/) }
     it { should_not have_css("details", text: "Responses to health questions") }
     it { should have_css("p", text: "No consent request is scheduled") }
-    it { should have_css("button", text: "Record a new consent response") }
+    it { should have_link("Record a new consent response") }
   end
 
   context "when vaccinated" do
@@ -25,7 +25,7 @@
     end
 
     it { should_not have_css("p", text: "No requests have been sent.") }
-    it { should_not have_css("button", text: "Record a new consent response") }
+    it { should_not have_link("Record a new consent response") }
   end
 
   context "with refused consent" do
@@ -34,7 +34,7 @@
       create(:consent, :refused, patient: patient.reload, parent:, programme:)
     end
 
-    it { should have_css(".app-card__heading--red", text: "Consent refused") }
+    it { should have_content("refused to give consent") }
     it { should have_content(consent.parent.full_name) }
     it { should have_content(consent.parent_relationship.label) }
     it { should have_content("Consent refused") }
@@ -48,12 +48,7 @@
 
     let(:consent) { patient.consents.first }
 
-    it do
-      expect(rendered).to have_css(
-        ".app-card__heading--green",
-        text: "Consent given"
-      )
-    end
+    it { should have_text("is ready for the vaccinator") }
 
     it { should_not have_css("a", text: "Contact #{consent.parent.full_name}") }
 
@@ -64,7 +59,7 @@
         create(:patient, :consent_given_nasal_only_triage_not_needed, session:)
       end
 
-      it { should have_text("Consent given for nasal spray") }
+      it { should have_text("Nasal spray only") }
 
       context "and the vaccine method is overridden by triage" do
         let(:patient) do
@@ -75,7 +70,7 @@
           )
         end
 
-        it { should have_text("Consent given for injection") }
+        it { should have_text("is ready for the vaccinator") }
       end
     end
   end

spec/components/app_patient_session_triage_component_spec.rb

@@ -30,21 +30,13 @@
   context "when triaged as safe to vaccinate" do
     before { create(:triage, :safe_to_vaccinate, patient:, programme:) }
 
-    it do
-      expect(rendered).to have_css(
-        ".app-card__heading--green",
-        text: "Safe to vaccinate"
-      )
-    end
-
     it { should have_content("safe to vaccinate") }
     it { should have_link("Update triage outcome") }
   end
 
   context "when triaged as unsafe to vaccinate" do
     before { create(:triage, :do_not_vaccinate, patient:, programme:) }
 
-    it { should have_css(".app-card__heading--red", text: "Do not vaccinate") }
     it { should have_content("should not be vaccinated") }
     it { should have_link("Update triage outcome") }
   end

spec/features/community_clinic_vaccination_session_spec.rb

@@ -37,7 +37,7 @@ def when_i_record_a_non_administered_vaccination_with_reason
     visit session_record_path(@session)
     click_link @patient.full_name
 
-    within all("form")[3] do
+    within all("form")[2] do
       within all("fieldset")[2] do
         choose "No"
       end