From f33c6955223db6b3497e8d89bfd5c970bf212f5d Mon Sep 17 00:00:00 2001 From: Jack Weeden Date: Tue, 24 Dec 2024 11:26:44 +0000 Subject: [PATCH] Remove GOV.UK Chat promo banner Removes the banner and all the supporting code / markup changes that were added to render it. --- app/assets/stylesheets/views/_browse.scss | 11 ------ app/helpers/govuk_chat_promo_helper.rb | 29 ---------------- app/views/browse/show.html.erb | 11 +++--- .../show_a_to_z.html.erb | 1 - .../show_curated.html.erb | 6 +--- app/views/shared/_browse_header.html.erb | 34 +++---------------- app/views/step_nav/show.html.erb | 18 +++------- spec/features/mainstream_browsing_spec.rb | 15 -------- spec/features/step_nav_page_spec.rb | 13 ------- spec/helpers/govuk_chat_promo_helper_spec.rb | 21 ------------ 10 files changed, 15 insertions(+), 144 deletions(-) delete mode 100644 app/helpers/govuk_chat_promo_helper.rb delete mode 100644 spec/helpers/govuk_chat_promo_helper_spec.rb diff --git a/app/assets/stylesheets/views/_browse.scss b/app/assets/stylesheets/views/_browse.scss index bdb39b022..128deada6 100644 --- a/app/assets/stylesheets/views/_browse.scss +++ b/app/assets/stylesheets/views/_browse.scss @@ -93,14 +93,3 @@ $browse-header-background-colour: #263135; margin-bottom: govuk-spacing(6); } } - -.browse__govuk-chat-promo { - background-color: govuk-tint(govuk-colour("blue"), 90%); - padding: govuk-spacing(4) 0; - - // we're using this component in an unconventional way so need to undo - // basic styling - .gem-c-chat-entry { - padding: 0; - } -} diff --git a/app/helpers/govuk_chat_promo_helper.rb b/app/helpers/govuk_chat_promo_helper.rb deleted file mode 100644 index ec9a82d35..000000000 --- a/app/helpers/govuk_chat_promo_helper.rb +++ /dev/null @@ -1,29 +0,0 @@ -module GovukChatPromoHelper - GOVUK_CHAT_PROMO_BASE_PATHS = %w[ - /browse/benefits/looking-for-work - /browse/business - /browse/business/business-tax - /browse/business/limited-company - /browse/business/setting-up - /browse/employing-people - /browse/employing-people/payroll - /browse/employing-people/recruiting-hiring - /browse/tax - /browse/tax/capital-gains - /browse/tax/dealing-with-hmrc - /browse/tax/self-assessment - /browse/tax/vat - /browse/working - /browse/working/finding-job - /browse/working/state-pension - /browse/working/time-off - /browse/working/workplace-personal-pensions - /import-goods-into-uk - /set-up-as-sole-trader - /set-up-limited-company - ].freeze - - def show_govuk_chat_promo?(base_path) - ENV["GOVUK_CHAT_PROMO_ENABLED"] == "true" && GOVUK_CHAT_PROMO_BASE_PATHS.include?(base_path) - end -end diff --git a/app/views/browse/show.html.erb b/app/views/browse/show.html.erb index d80bafd6a..7460b6d89 100644 --- a/app/views/browse/show.html.erb +++ b/app/views/browse/show.html.erb @@ -20,10 +20,7 @@ } %> <% end %> -<%= render "shared/browse_header", { - margin_bottom: page.slug == "benefits" ? 7 : 9, - govuk_chat_promo: show_govuk_chat_promo?(page.base_path), -} do %> +<%= render "shared/browse_header", { margin_bottom: page.slug == "benefits" ? 7 : 9 } do %> <%= render "govuk_publishing_components/components/heading", { text: page.title, inverse: true, @@ -40,9 +37,9 @@ <%= render "govuk_web_banners/recruitment_banner" %> <% if page.popular_list %>
-
-
-
+
+
+
<%= render "govuk_publishing_components/components/heading", { text: t("browse.popular_tasks"), margin_bottom: 6, diff --git a/app/views/second_level_browse_page/show_a_to_z.html.erb b/app/views/second_level_browse_page/show_a_to_z.html.erb index 195c86418..b7c9968ef 100644 --- a/app/views/second_level_browse_page/show_a_to_z.html.erb +++ b/app/views/second_level_browse_page/show_a_to_z.html.erb @@ -20,7 +20,6 @@ <%= render "shared/browse_header", { margin_bottom: 8, two_thirds: true, - govuk_chat_promo: show_govuk_chat_promo?(page.base_path), } do %> <%= render "govuk_publishing_components/components/heading", { font_size: "xl", diff --git a/app/views/second_level_browse_page/show_curated.html.erb b/app/views/second_level_browse_page/show_curated.html.erb index 9aa562ad1..2f70eba6e 100644 --- a/app/views/second_level_browse_page/show_curated.html.erb +++ b/app/views/second_level_browse_page/show_curated.html.erb @@ -17,11 +17,7 @@ <%= render "shared/browse_breadcrumbs" %> <% end %> -<%= render "shared/browse_header", { - two_thirds: true, - margin_bottom: 8, - govuk_chat_promo: show_govuk_chat_promo?(page.base_path), -} do %> +<%= render "shared/browse_header", { two_thirds: true, margin_bottom: 8 } do %> <%= render "govuk_publishing_components/components/heading", { font_size: "xl", heading_level: 1, diff --git a/app/views/shared/_browse_header.html.erb b/app/views/shared/_browse_header.html.erb index 237bcd255..8092631e9 100644 --- a/app/views/shared/_browse_header.html.erb +++ b/app/views/shared/_browse_header.html.erb @@ -2,9 +2,8 @@ two_thirds ||= false margin_bottom ||= 0 padding_top ||= false - govuk_chat_promo ||= false - header_wrapper_classes = [] + header_wrapper_classes = %w(browse__header-wrapper) header_wrapper_classes << "govuk-!-margin-bottom-#{margin_bottom}" if !margin_bottom.zero? header_wrapper_classes << "govuk-!-padding-top-#{padding_top}" if padding_top.is_a? Numeric @@ -14,34 +13,11 @@ %>
- <%# - .browse__header-wrapper is a separate element to enable the govuk-chat - promo, once this is disabled we can remove this element and add the - ".browse__header-wrapper" class back to the array of header_wrapper_classes - %> -
-
-
-
- <%= yield %> -
+
+
+
+ <%= yield %>
- - <% if govuk_chat_promo %> -
-
-
-
- <%= render "govuk_publishing_components/components/chat_entry", { - margin_bottom: 0, - heading_text: "Ask GOV.UK Chat about business and tax", - description_text: "Get quick, tailored answers with GOV.UK’s experimental AI chat", - } %> -
-
-
-
- <% end %>
diff --git a/app/views/step_nav/show.html.erb b/app/views/step_nav/show.html.erb index c38dfd93b..58f96a2f9 100644 --- a/app/views/step_nav/show.html.erb +++ b/app/views/step_nav/show.html.erb @@ -3,27 +3,19 @@ <% end %>
-
+
<%= render 'govuk_publishing_components/components/title', title: step_by_step.title, average_title_length: 'long', margin_bottom: 6 %> -
-
- -
-
<%= render "govuk_publishing_components/components/govspeak", { } do %> <%= step_by_step.introduction %> <% end %> - +
+
+
+
<%= render "govuk_publishing_components/components/step_by_step_nav", step_by_step.payload_for_component %>
- - <% if show_govuk_chat_promo?(step_by_step.base_path) %> -
- <%= render "govuk_publishing_components/components/chat_entry", { margin_top_until_tablet: true } %> -
- <% end %>
diff --git a/spec/features/mainstream_browsing_spec.rb b/spec/features/mainstream_browsing_spec.rb index 071c80857..cf9ef28f0 100644 --- a/spec/features/mainstream_browsing_spec.rb +++ b/spec/features/mainstream_browsing_spec.rb @@ -66,19 +66,4 @@ expect(page).not_to have_css(".browse__action-links") expect(page).not_to have_content("Most viewed") end - - it "renders the GOV.UK Chat promo" do - content_item = GovukSchemas::Example.find("mainstream_browse_page", example_name: "top_level_page").tap do |item| - item["base_path"] = "/browse/business" - end - - stub_content_store_has_item(content_item["base_path"], content_item) - content_ids = content_item["links"]["second_level_browse_pages"].map { |link| link["content_id"] } - search_api_has_popular_documents_for_level_one_browse(content_ids) - - ClimateControl.modify GOVUK_CHAT_PROMO_ENABLED: "true" do - visit content_item["base_path"] - expect(page).to have_selector(".gem-c-chat-entry") - end - end end diff --git a/spec/features/step_nav_page_spec.rb b/spec/features/step_nav_page_spec.rb index 3c4f8336a..a8926ebd2 100644 --- a/spec/features/step_nav_page_spec.rb +++ b/spec/features/step_nav_page_spec.rb @@ -36,19 +36,6 @@ expect(page).to have_title("#{content_item['title']} - GOV.UK") end - it "renders the GOV.UK Chat promo" do - content_item = GovukSchemas::RandomExample.for_schema(frontend_schema: "step_by_step_nav") - ["/set-up-limited-company", "/set-up-as-sole-trader"].each do |path| - content_item["base_path"] = path - stub_content_store_has_item(content_item["base_path"], content_item) - - ClimateControl.modify GOVUK_CHAT_PROMO_ENABLED: "true" do - visit content_item["base_path"] - expect(page).to have_selector(".gem-c-chat-entry") - end - end - end - def step_nav_example schema = GovukSchemas::Schema.find(frontend_schema: "step_by_step_nav") diff --git a/spec/helpers/govuk_chat_promo_helper_spec.rb b/spec/helpers/govuk_chat_promo_helper_spec.rb deleted file mode 100644 index 3b695055f..000000000 --- a/spec/helpers/govuk_chat_promo_helper_spec.rb +++ /dev/null @@ -1,21 +0,0 @@ -RSpec.describe GovukChatPromoHelper do - describe "#show_govuk_chat_promo?" do - it "should return false if the environment variable is not set" do - ClimateControl.modify GOVUK_CHAT_PROMO_ENABLED: "false" do - expect(helper.show_govuk_chat_promo?(described_class::GOVUK_CHAT_PROMO_BASE_PATHS.first)).to be false - end - end - - it "should return false if the base path is not in the configured list" do - ClimateControl.modify GOVUK_CHAT_PROMO_ENABLED: "true" do - expect(helper.show_govuk_chat_promo?("/does-not-match")).to be false - end - end - - it "should return true if the base path is in the configured list" do - ClimateControl.modify GOVUK_CHAT_PROMO_ENABLED: "true" do - expect(helper.show_govuk_chat_promo?(described_class::GOVUK_CHAT_PROMO_BASE_PATHS.first)).to be true - end - end - end -end