Merge pull request #1357 from Crown-Commercial-Service/feature/NPMP-11-use-new-gca-branding

Updated content that references CCS to now reference GCA

Author: tim-s-ccs

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Update GOV.UK Frontend and CCS Frontend ([PR 1335](https://github.com/Crown-Commercial-Service/pmp-idam/pull/1335))
+- Updated content that references CCS to now reference GCA ([PR 1357](https://github.com/Crown-Commercial-Service/pmp-idam/pull/1357))
 
 ## [3.2.1] - 2026-01-05
 

app/controllers/home_controller.rb

@@ -49,7 +49,10 @@ def delete_unwanted_cookie(cookie_prefixes)
     return unless cookie_prefixes.any?
 
     cookies.each do |cookie_name, _|
-      cookies.delete(cookie_name, path: '/', domain: '.crowncommercial.gov.uk') if cookie_prefixes.any? { |cookie_prefix| cookie_name.start_with? cookie_prefix }
+      if cookie_prefixes.any? { |cookie_prefix| cookie_name.start_with? cookie_prefix }
+        cookies.delete(cookie_name, path: '/', domain: '.crowncommercial.gov.uk')
+        cookies.delete(cookie_name, path: '/', domain: '.gca.gov.uk')
+      end
     end
   end
 

app/helpers/application_helper.rb

@@ -48,4 +48,26 @@ def password_strength(password_id)
       classes: 'govuk-!-margin-left-2'
     )
   end
+
+  # Methods used for the CCS transition to GCA
+
+  def t(key, **options)
+    options[:org_name] ||= current_organisation_name
+    options[:org_name_abbr] ||= current_organisation_name_abbr
+    options[:org_domain] ||= current_organisation_domain
+
+    super
+  end
+
+  def current_organisation_name
+    PmpIdam.use_gca_branding? ? 'Government Commercial Agency' : 'Crown Commercial Service'
+  end
+
+  def current_organisation_name_abbr
+    PmpIdam.use_gca_branding? ? 'GCA' : 'CCS'
+  end
+
+  def current_organisation_domain
+    PmpIdam.use_gca_branding? ? 'gca' : 'crowncommercial'
+  end
 end

app/javascript/src/modules/cookieBanner.ts

@@ -47,6 +47,7 @@ const removeUnwantedCookies = (): void => {
   }
 
   cookiesToRemove.forEach((cookieName) => { Cookies.remove(cookieName, { path: '/', domain: '.crowncommercial.gov.uk' }) })
+  cookiesToRemove.forEach((cookieName) => { Cookies.remove(cookieName, { path: '/', domain: '.gca.gov.uk' }) })
 }
 
 const removeGACookies = (cookieBannerFormData: CookieBannerFormData, successFunction: () => void, failureFunction: () => void): void => {

app/views/layouts/application.html.erb

@@ -8,15 +8,17 @@
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
 
+  <% asset_prefix = PmpIdam.use_gca_branding? ? 'gca' : 'ccs' %>
+
   <%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>
-  <%= tag :meta, property: 'og:image', content: asset_path('images/ccs-opengraph-image.png') %>
+  <%= tag :meta, property: 'og:image', content: asset_path("images/#{asset_prefix}-opengraph-image.png") %>
   <%= tag :meta, name: 'theme-color', content: '#0b0c0c' %>
 
   <%= favicon_link_tag asset_path('images/favicon.ico') %>
   <%= favicon_link_tag asset_path('images/favicon.svg'), type: "image/svg+xml" %>
-  <%= favicon_link_tag asset_path('images/ccs-icon-mask.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
+  <%= favicon_link_tag asset_path("images/#{asset_prefix}-icon-mask.svg"), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
   <% %w[ 180 192 512 ].each do |size| %>
-  <%= favicon_link_tag asset_path("images/ccs-icon-#{size}.png"), rel: 'apple-touch-icon', type: 'image/png', size:"#{size}x#{size}" %>
+  <%= favicon_link_tag asset_path("images/#{asset_prefix}-icon-#{size}.png"), rel: 'apple-touch-icon', type: 'image/png', size:"#{size}x#{size}" %>
   <% end %>
 
   <%= stylesheet_link_tag 'application', media: 'all' %>

app/views/layouts/error.html.erb

@@ -8,15 +8,17 @@
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
 
+  <% asset_prefix = PmpIdam.use_gca_branding? ? 'gca' : 'ccs' %>
+
   <%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>
-  <%= tag :meta, property: 'og:image', content: asset_path('images/ccs-opengraph-image.png') %>
+  <%= tag :meta, property: 'og:image', content: asset_path("images/#{asset_prefix}-opengraph-image.png") %>
   <%= tag :meta, name: 'theme-color', content: '#0b0c0c' %>
 
   <%= favicon_link_tag asset_path('images/favicon.ico') %>
   <%= favicon_link_tag asset_path('images/favicon.svg'), type: "image/svg+xml" %>
-  <%= favicon_link_tag asset_path('images/ccs-icon-mask.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
+  <%= favicon_link_tag asset_path("images/#{asset_prefix}-icon-mask.svg"), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
   <% %w[ 180 192 512 ].each do |size| %>
-  <%= favicon_link_tag asset_path("images/ccs-icon-#{size}.png"), rel: 'apple-touch-icon', type: 'image/png', size:"#{size}x#{size}" %>
+  <%= favicon_link_tag asset_path("images/#{asset_prefix}-icon-#{size}.png"), rel: 'apple-touch-icon', type: 'image/png', size:"#{size}x#{size}" %>
   <% end %>
 
   <%= stylesheet_link_tag 'application', media: 'all' %>

config/initializers/canonical_rails.rb

@@ -7,6 +7,7 @@
 
   # This is the main host, not just the TLD, omit slashes and protocol. If you have more than one, pick the one you want to rank in search results.
 
+  # TODO: This will need to updated after the URL change
   config.host = 'printmarketplace.crowncommercial.gov.uk'
   config.port = '443'
 

config/locales/en.yml

@@ -144,7 +144,7 @@ en:
         lead1: If the email address you’ve entered belongs to a registered organisation, we’ll send instructions to reset the password.
         new_password: New password
         password: Your password must have
-        text_html: If you don’t receive this, email <a href="mailto:support@crowncommercial.gov.uk" class="govuk-link--no-visited-state">support@crowncommercial.gov.uk</a>
+        text_html: If you don’t receive this, email <a href="mailto:support@%{org_domain}.gov.uk" class="govuk-link--no-visited-state">support@%{org_domain}.gov.uk</a>
         verify_code: Verification code
       new:
         email: Email address
@@ -155,9 +155,9 @@ en:
       domain_not_on_allow_list:
         back_to_create: Back to create a account
         heading: You must use a public sector email address
-        lead_html: You must be employed by, or represent, a public sector organisation to create a <abbr title="Crown Commercial Service">CCS</abbr> account.
+        lead_html: You must be employed by, or represent, a public sector organisation to create a <abbr title="%{org_name}">%{org_name_abbr}</abbr> account.
         line_01: The email you used doesn't belong to a recognised public sector domain.
-        line_02_html: Create an account using a different email address or email <a href="mailto:info@crowncommercial.gov.uk" class="govuk-link">info@crowncommercial.gov.uk</a> if
+        line_02_html: Create an account using a different email address or email <a href="mailto:info@%{org_domain}.gov.uk" class="govuk-link">info@%{org_domain}.gov.uk</a> if
         list_01: you think your domain should be recognised
         list_02: you still can't create an account
       new:
@@ -173,7 +173,7 @@ en:
         lead: You must be employed by, or represent, a public sector organisation.
         organisation: Organisation name
         organisation_address_guidance: You can choose alternative delivery and invoice addresses later on.
-        organisation_hint: Enter your organisation's full name. We will verify your organisation name to confirm you can use this service. If your organisation is not listed please contact CCS.
+        organisation_hint: Enter your organisation's full name. We will verify your organisation name to confirm you can use this service. If your organisation is not listed please contact %{org_name_abbr}.
         password: Password
         password_must_have: 'Your password must have:'
     sessions:
@@ -222,7 +222,7 @@ en:
       explanation: Maybe you tried to change something you didn’t have access to.
   home:
     accessibility_statement:
-      CCS_is_committed: Crown Commercial Service is committed to making its website accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.
+      CCS_is_committed: "%{org_name} is committed to making its website accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018."
       ability_net: AbilityNet
       ability_net_link: https://mcmw.abilitynet.org.uk/
       ability_net_text_html: "%{ability_link} has advice on making your device easier to use if you have a disability."
@@ -233,7 +233,7 @@ en:
       call: call 0345 410 2222
       core_pmp: Core Print Marketplace product
       email: email
-      email_link: info@crowncommercial.gov.uk
+      email_link: info@%{org_domain}.gov.uk
       equality: The Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the ‘accessibility regulations’). If you’re not happy with how we respond to your complaint,
       equality_link: https://www.equalityadvisoryservice.com/
       equality_link_text: contact the Equality Advisory and Support Service (EASS)
@@ -253,15 +253,15 @@ en:
       list_1_navigate_keyboard: navigate most of the website using just a keyboard
       list_1_navigate_listen: listen to most of the website using a screen reader (including the most recent versions of JAWS, NVDA and VoiceOver)
       list_1_navigate_speach: navigate most of the website using speech recognition software
-      list_2_decorative: non-decorative content is used in the CCS sign-in pages, which may make it in accessible to users navigating the site with screen readers.
+      list_2_decorative: non-decorative content is used in the %{org_name_abbr} sign-in pages, which may make it in accessible to users navigating the site with screen readers.
       list_2_email: the email field on the homepage lacks an autocomplete attribute, so its purpose cannot be determined programmatically
-      market_place_link: https://printmarketplace.crowncommercial.gov.uk/
+      market_place_link: https://printmarketplace.%{org_domain}.gov.uk/
       several_aspects: Several aspects of the print marketplace user journey do not meet the WCAG 2.1 AA success criteria. The accessibility statement on the core Print Marketplace product details these.
       the_complete_journey: The complete Print Marketplace journey was tested, this included every page a buyer would progress through in-order to complete the sign up activity.
       the_content: The content listed below is non-accessible for the following reasons.
       this_statement: 'This accessibility statement applies to the sign in pages of the Print Marketplace digital service which can be found at the following URL:'
       this_statement_date: This statement was prepared on 25th November 2020. It will be reviewed and updated as required.
-      this_website: 'This website is run by Crown Commercial Service (CCS). We want as many people as possible to be able to use this website. For example, that means you should be able to:'
+      this_website: 'This website is run by %{org_name} (%{org_name_abbr}). We want as many people as possible to be able to use this website. For example, that means you should be able to:'
       this_website_partially_1: This website is partially compliant with the
       this_website_partially_2: due to the non-compliances listed below.
       we_are_always_looking_html: 'We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact: %{email}.'
@@ -360,7 +360,7 @@ en:
       we_use_glassbox: We use Glassbox software to collect information about how you use Print Marketplace. We do this to help make sure the site is meeting the needs of its users and to help us make improvements.
     index:
       authorised_customer_list: authorised customer list
-      authorised_customer_list_link: https://assets.crowncommercial.gov.uk/wp-content/uploads/RM3788-Contract-Notice-Authorised-Customer-List.docx
+      authorised_customer_list_link: https://assets.%{org_domain}.gov.uk/wp-content/uploads/RM3788-Contract-Notice-Authorised-Customer-List.docx
       authorised_customer_list_title: authrized customers list in .docx format
       before_you_start: Before you start
       heading: Print Marketplace
@@ -371,7 +371,7 @@ en:
       to_use_this_service_html: To use this service you need to be a recognised public sector body listed in the %{authorised_customer_list}.
   layouts:
     application:
-      title: Crown Commercial Services
+      title: "%{org_name}"
     cookie-banner:
       accept_cookies: Accept analytics cookies
       change_cookie_settings_html: You can %{cookie_settings_link} at any time.
@@ -389,7 +389,7 @@ en:
       accessibility_statement_link_aria_label: View our accessibility statement
       contact_us:
         contact_us: 'Contact us (opens in a new tab) '
-        contact_us_link: https://www.crowncommercial.gov.uk/contact
+        contact_us_link: https://www.%{org_domain}.gov.uk/contact
         having_problems: 'Having problems with this service? '
         support: " for support."
       cookie_policy_link: Cookie policy

spec/helpers/application_helper_spec.rb

@@ -14,15 +14,15 @@
   describe '.page_title' do
     context 'when there is no additional title' do
       it 'returns just CCS' do
-        expect(page_title).to eq 'Crown Commercial Services'
+        expect(page_title).to eq 'Crown Commercial Service'
       end
     end
 
     context 'when there is an additional title' do
       before { content_for(:page_title, 'My Magical Title') }
 
       it 'returns CCS plus the additional title' do
-        expect(page_title).to eq 'My Magical Title: Crown Commercial Services'
+        expect(page_title).to eq 'My Magical Title: Crown Commercial Service'
       end
     end
   end