From fc9ac9e721bea5d6177cb37ed274dcb1b256f258 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 14 Aug 2024 13:07:45 +0100
Subject: [PATCH] Add cancel link text to helpdesk ticket

---
 app/helpers/merge_requests_helper.rb              | 12 +++++++++++-
 app/views/merge_requests/helpdesk_ticket.html.erb |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index a56bd2cc2..ccc058b30 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -6,7 +6,7 @@ module MergeRequestsHelper
   def request_details(merge_request)
     [
       { label: "Requester", value: display_value_or_placeholder(merge_request.requester&.name) },
-      { label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://dluhcdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil), action: merge_request.status == "request_merged" ? nil : { text: "Change", href: helpdesk_ticket_merge_request_path(merge_request), visually_hidden_text: "helpdesk ticket" } },
+      { label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://dluhcdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil), action: merge_request.status == "request_merged" ? nil : { text: "Change", href: helpdesk_ticket_merge_request_path(merge_request, referrer: "check_answers"), visually_hidden_text: "helpdesk ticket" } },
       { label: "Status", value: status_tag(merge_request.status) },
     ]
   end
@@ -40,6 +40,16 @@ module MergeRequestsHelper
     end
   end
 
+  def secondary_merge_request_link_text(referrer, skip_for_now=false)
+    if accessed_from_check_answers?(referrer)
+      "Cancel"
+    elsif skip_for_now
+      "Skip for now"
+    else
+      ""
+    end
+  end
+
   def accessed_from_check_answers?(referrer)
     %w[check_answers].include?(referrer)
   end
diff --git a/app/views/merge_requests/helpdesk_ticket.html.erb b/app/views/merge_requests/helpdesk_ticket.html.erb
index 3d3ab5af7..9129bd41b 100644
--- a/app/views/merge_requests/helpdesk_ticket.html.erb
+++ b/app/views/merge_requests/helpdesk_ticket.html.erb
@@ -18,7 +18,7 @@
           <%= f.hidden_field :page, value: "helpdesk_ticket" %>
           <div class="govuk-button-group">
             <%= f.govuk_submit submit_merge_request_button_text(request.query_parameters["referrer"]) %>
-            <%= govuk_link_to("Skip for now", merge_request_path(@merge_request)) %>
+            <%= govuk_link_to(secondary_merge_request_link_text(request.query_parameters["referrer"], skip_for_now=true), merge_request_path(@merge_request)) %>
           </div>
         </div>
       </div>