From 6e71684e66931faa873a02841f949b49f13a8eb8 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Mon, 18 Nov 2024 15:12:18 +0000
Subject: [PATCH 1/4] Add a helper method for the support_url

---
 .../app/controllers/content_block_manager/base_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/engines/content_block_manager/app/controllers/content_block_manager/base_controller.rb b/lib/engines/content_block_manager/app/controllers/content_block_manager/base_controller.rb
index e824d271620..d19046fea89 100644
--- a/lib/engines/content_block_manager/app/controllers/content_block_manager/base_controller.rb
+++ b/lib/engines/content_block_manager/app/controllers/content_block_manager/base_controller.rb
@@ -39,6 +39,11 @@ def product_name
     "Content Block Manager"
   end
 
+  def support_url
+    "#{Plek.external_url_for('support')}/general_request/new"
+  end
+  helper_method :support_url
+
   # This ensures we can override views if we need to without altering the Engine's load order, which
   # may have unintended consequences
   def prepend_views

From 25e5a74e26cd67b84c567bbadfd1d5a7b501f3b3 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Mon, 18 Nov 2024 15:12:40 +0000
Subject: [PATCH 2/4] Use helper method when linking to support

---
 .../content_block/documents/index.html.erb                      | 2 +-
 .../content_block/editions/workflow/confirmation.html.erb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/engines/content_block_manager/app/views/content_block_manager/content_block/documents/index.html.erb b/lib/engines/content_block_manager/app/views/content_block_manager/content_block/documents/index.html.erb
index 9babc853387..66341b0f102 100644
--- a/lib/engines/content_block_manager/app/views/content_block_manager/content_block/documents/index.html.erb
+++ b/lib/engines/content_block_manager/app/views/content_block_manager/content_block/documents/index.html.erb
@@ -14,7 +14,7 @@
     <span>
       <%= render "govuk_publishing_components/components/button", {
         text: "Raise a support request",
-        href: "https://govuk.zendesk.com",
+        href: support_url,
         secondary_solid: true,
       } %>
     </span>
diff --git a/lib/engines/content_block_manager/app/views/content_block_manager/content_block/editions/workflow/confirmation.html.erb b/lib/engines/content_block_manager/app/views/content_block_manager/content_block/editions/workflow/confirmation.html.erb
index 0ba6e600d86..1a023023ba2 100644
--- a/lib/engines/content_block_manager/app/views/content_block_manager/content_block/editions/workflow/confirmation.html.erb
+++ b/lib/engines/content_block_manager/app/views/content_block_manager/content_block/editions/workflow/confirmation.html.erb
@@ -15,7 +15,7 @@
     <h2 class="govuk-heading-m">What happens next</h2>
     <p><%= @paragraph_copy %><br>
     If you need any support or want to delete an instance you can
-      <a class="govuk-link--no-visited-state" href="<%= Plek.external_url_for("support") %>">raise a support request</a>
+      <%= link_to "raise a support request", support_url, class: "govuk-link--no-visited-state" %>
     </p>
     <%= render "govuk_publishing_components/components/button", {
         text: "View content block",

From ad3bc7e37aea14ecfcdeb4b7be975998226ea026 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Mon, 18 Nov 2024 15:15:35 +0000
Subject: [PATCH 3/4] Remove introductory text

This is no longer needed
---
 .../content_block_manager/content_block/documents/index.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/engines/content_block_manager/app/views/content_block_manager/content_block/documents/index.html.erb b/lib/engines/content_block_manager/app/views/content_block_manager/content_block/documents/index.html.erb
index 66341b0f102..197853cd26f 100644
--- a/lib/engines/content_block_manager/app/views/content_block_manager/content_block/documents/index.html.erb
+++ b/lib/engines/content_block_manager/app/views/content_block_manager/content_block/documents/index.html.erb
@@ -3,7 +3,6 @@
 
 <div class="govuk-grid-row govuk-!-margin-bottom-8">
   <div class="govuk-grid-column-full">
-    <p class="govuk-body govuk-!-margin-bottom-1">Create, edit and use modular content.</p>
     <p class="govuk-body">If you need any support or want to delete a content block, you can raise a support request.</p>
     <span class="govuk-!-margin-right-2">
       <%= render "govuk_publishing_components/components/button", {

From 6effc9d623dd472abeee2c7c5a01ff85401d95bd Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Mon, 18 Nov 2024 15:18:19 +0000
Subject: [PATCH 4/4] Remove hint text

---
 .../document/index/filter_options_component.html.erb             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.html.erb b/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.html.erb
index 5a1b4f756c2..2b0702a49b7 100644
--- a/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.html.erb
+++ b/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.html.erb
@@ -13,7 +13,6 @@
                 text: "Keyword",
                 bold: true,
               },
-              hint: 'For example, "driving standards"',
               name: "keyword",
               id: "keyword_filter",
               value: @filters.present? && @filters[:keyword],