From a1dae6b3c005c5bf247190c00e8a786f2711f412 Mon Sep 17 00:00:00 2001 From: Catalina Ilie Date: Wed, 18 Oct 2023 16:23:36 +0100 Subject: [PATCH 1/2] Move survey pages and urls in a yml file --- .../content_item/recruitment_banner.rb | 42 +------------------ app/views/layouts/application.html.erb | 11 +---- config/recruitment_banner_pages.yml | 28 +++++++++++++ 3 files changed, 31 insertions(+), 50 deletions(-) create mode 100644 config/recruitment_banner_pages.yml diff --git a/app/presenters/content_item/recruitment_banner.rb b/app/presenters/content_item/recruitment_banner.rb index 25a4e6d35..adcfdfa55 100644 --- a/app/presenters/content_item/recruitment_banner.rb +++ b/app/presenters/content_item/recruitment_banner.rb @@ -1,48 +1,10 @@ module ContentItem module RecruitmentBanner - SURVEY_URL = "https://surveys.publishing.service.gov.uk/s/SNFVW1/".freeze - SURVEY_URL_MAPPINGS = { - "/log-in-register-hmrc-online-services" => SURVEY_URL, - "/log-in-file-self-assessment-tax-return" => SURVEY_URL, - "/self-assessment-tax-returns" => SURVEY_URL, - "/pay-self-assessment-tax-bill" => SURVEY_URL, - "/contact-hmrc" => SURVEY_URL, - "/log-in-register-hmrc-online-services/register" => SURVEY_URL, - "/dbs-update-service" => SURVEY_URL, - "/government/organisations/hm-revenue-customs/contact/self-assessment" => SURVEY_URL, - }.freeze - - BENEFITS_SURVEY_URL = "https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16".freeze - BENEFITS_SURVEY_URL_MAPPINGS = { - "/disability-living-allowance-children" => BENEFITS_SURVEY_URL, - "/help-with-childcare-costs" => BENEFITS_SURVEY_URL, - "/financial-help-disabled" => BENEFITS_SURVEY_URL, - "/pip" => BENEFITS_SURVEY_URL, - "/blind-persons-allowance" => BENEFITS_SURVEY_URL, - "/dla-disability-living-allowance-benefit" => BENEFITS_SURVEY_URL, - "/carers-allowance" => BENEFITS_SURVEY_URL, - "/carers-credit" => BENEFITS_SURVEY_URL, - "/maternity-pay-leave" => BENEFITS_SURVEY_URL, - "/paternity-pay-leave" => BENEFITS_SURVEY_URL, - "/child-benefit" => BENEFITS_SURVEY_URL, - "/jobseekers-allowance" => BENEFITS_SURVEY_URL, - "/universal-credit" => BENEFITS_SURVEY_URL, - "/employment-support-allowance" => BENEFITS_SURVEY_URL, - "/benefits-calculators" => BENEFITS_SURVEY_URL, - }.freeze - def recruitment_survey_url - user_research_test_url - end - - def benefits_recruitment_survey_url + pages = YAML.load_file(Rails.root.join("config/recruitment_banner_pages.yml")) key = content_item["base_path"] - BENEFITS_SURVEY_URL_MAPPINGS[key] - end - def user_research_test_url - key = content_item["base_path"] - SURVEY_URL_MAPPINGS[key] + pages[key] if pages end end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ad263732f..12ce5edbd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -30,20 +30,11 @@ <% end %> <% if @content_item.recruitment_survey_url %> -
- <%= render "govuk_publishing_components/components/intervention", { - suggestion_text: "Help improve a new GOV.UK tool", - suggestion_link_text: "Sign up to take part in user research", - suggestion_link_url: @content_item.recruitment_survey_url, - new_tab: true, - } %> -
- <% elsif @content_item.benefits_recruitment_survey_url %>
<%= render "govuk_publishing_components/components/intervention", { suggestion_text: "Help improve GOV.UK", suggestion_link_text: "Take part in user research", - suggestion_link_url: @content_item.benefits_recruitment_survey_url, + suggestion_link_url: @content_item.recruitment_survey_url, new_tab: true, } %>
diff --git a/config/recruitment_banner_pages.yml b/config/recruitment_banner_pages.yml new file mode 100644 index 000000000..e196b8e0f --- /dev/null +++ b/config/recruitment_banner_pages.yml @@ -0,0 +1,28 @@ +# Add bellow the pages we want to show a user research banner on and the survey link for each page +# eg. "/log-in-register-hmrc-online-services": "survey url" + +"/log-in-register-hmrc-online-services": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" +"/log-in-file-self-assessment-tax-return": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" +"/self-assessment-tax-returns": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" +"/pay-self-assessment-tax-bill": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" +"/contact-hmrc": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" +"/log-in-register-hmrc-online-services/register": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" +"/dbs-update-service": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" +"/government/organisations/hm-revenue-customs/contact/self-assessment": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" + +# Benefits pages +"/disability-living-allowance-children": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/help-with-childcare-costs": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/financial-help-disabled": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/pip": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/blind-persons-allowance": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/dla-disability-living-allowance-benefit": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/carers-allowance": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/carers-credit": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/maternity-pay-leave": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/paternity-pay-leave": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/child-benefit": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/jobseekers-allowance": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/universal-credit": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/employment-support-allowance": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +"/benefits-calculators": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 From ce73931ddbe65ba944d14ddbc95bdd2c52ca5138 Mon Sep 17 00:00:00 2001 From: Catalina Ilie Date: Fri, 20 Oct 2023 15:42:09 +0100 Subject: [PATCH 2/2] Add UR banner details in the yml file --- .../content_item/recruitment_banner.rb | 8 ++- app/views/layouts/application.html.erb | 8 +-- config/recruitment_banner_pages.yml | 60 +++++++++++-------- 3 files changed, 44 insertions(+), 32 deletions(-) diff --git a/app/presenters/content_item/recruitment_banner.rb b/app/presenters/content_item/recruitment_banner.rb index adcfdfa55..a2d7c5e95 100644 --- a/app/presenters/content_item/recruitment_banner.rb +++ b/app/presenters/content_item/recruitment_banner.rb @@ -1,10 +1,12 @@ module ContentItem module RecruitmentBanner - def recruitment_survey_url - pages = YAML.load_file(Rails.root.join("config/recruitment_banner_pages.yml")) + def recruitment_survey_details + survey_pages = YAML.load_file(Rails.root.join("config/recruitment_banner_pages.yml")) key = content_item["base_path"] - pages[key] if pages + # TODO: check if all the values are in place + # TODO: if the text is not specified in the yml, we should use the standard one + survey_pages.find{ |banner| banner["pages"].include?(key) } if survey_pages end end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 12ce5edbd..2d045ff08 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -29,12 +29,12 @@ <% end %> <% end %> - <% if @content_item.recruitment_survey_url %> + <% if @content_item.recruitment_survey_details %>
<%= render "govuk_publishing_components/components/intervention", { - suggestion_text: "Help improve GOV.UK", - suggestion_link_text: "Take part in user research", - suggestion_link_url: @content_item.recruitment_survey_url, + suggestion_text: @content_item.recruitment_survey_details["suggestion_text"], + suggestion_link_text: @content_item.recruitment_survey_details["suggestion_link_text"], + suggestion_link_url: @content_item.recruitment_survey_details["suggestion_link_url"], new_tab: true, } %>
diff --git a/config/recruitment_banner_pages.yml b/config/recruitment_banner_pages.yml index e196b8e0f..e45caa17a 100644 --- a/config/recruitment_banner_pages.yml +++ b/config/recruitment_banner_pages.yml @@ -1,28 +1,38 @@ # Add bellow the pages we want to show a user research banner on and the survey link for each page -# eg. "/log-in-register-hmrc-online-services": "survey url" -"/log-in-register-hmrc-online-services": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" -"/log-in-file-self-assessment-tax-return": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" -"/self-assessment-tax-returns": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" -"/pay-self-assessment-tax-bill": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" -"/contact-hmrc": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" -"/log-in-register-hmrc-online-services/register": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" -"/dbs-update-service": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" -"/government/organisations/hm-revenue-customs/contact/self-assessment": "https://surveys.publishing.service.gov.uk/s/SNFVW1/" +- + name: Benefits banner + suggestion_text: "Help improve GOV.UK" + suggestion_link_text: "Take part in user research" + suggestion_link_url: "https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16" + pages: + - "/disability-living-allowance-children" + - "/help-with-childcare-costs" + - "/financial-help-disabled" + - "/pip" + - "/blind-persons-allowance" + - "/dla-disability-living-allowance-benefit" + - "/carers-allowance" + - "/carers-credit" + - "/maternity-pay-leave" + - "/paternity-pay-leave" + - "/child-benefit" + - "/jobseekers-allowance" + - "/universal-credit" + - "/employment-support-allowance" + - "/benefits-calculators" -# Benefits pages -"/disability-living-allowance-children": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/help-with-childcare-costs": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/financial-help-disabled": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/pip": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/blind-persons-allowance": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/dla-disability-living-allowance-benefit": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/carers-allowance": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/carers-credit": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/maternity-pay-leave": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/paternity-pay-leave": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/child-benefit": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/jobseekers-allowance": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/universal-credit": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/employment-support-allowance": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 -"/benefits-calculators": https://signup.take-part-in-research.service.gov.uk/home?utm_campaign=Content_History&utm_source=Hold_gov_to_account&utm_medium=gov.uk&t=GDS&id=16 +- + name: Research banner + suggestion_text: "Help improve a new GOV.UK tool" + suggestion_link_text: "Sign up to take part in user research" + suggestion_link_url: "https://surveys.publishing.service.gov.uk/s/SNFVW1/" + pages: + - "/log-in-register-hmrc-online-services" + - "/log-in-file-self-assessment-tax-return" + - "/self-assessment-tax-returns" + - "/pay-self-assessment-tax-bill" + - "/contact-hmrc" + - "/log-in-register-hmrc-online-services/register" + - "/dbs-update-service" + - "/government/organisations/hm-revenue-customs/contact/self-assessment"