Merge pull request #280 from Crown-Commercial-Service/dependabot/bun/ccs-frontend-2.5.0

Bump ccs-frontend from 2.4.0 to 2.5.0

Author: tim-s-ccs

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Updated CCS Frontend to v2.5.0
+
 ## [3.4.0] - 2026-01-19
 
 ### Added

bun.lock

@@ -19,20 +19,21 @@ class Header < Base
 
         public
 
+        # @param use_gca_branding [Boolean] flag to use GCA branding in logo
         # @param options [Hash] options that will be used in customising the HTML
         #
         # @option options [String] :classes additional CSS classes for the header HTML
         # @option options [String] :container_classes classes for the container
         # @option options [String] :homepage_url URL of the homepage. Defaults to +/https://www.crowncommercial.gov.uk+
         # @option options [Hash] :attributes additional attributes that will added as part of the header HTML
 
-        def initialize(**)
+        def initialize(use_gca_branding: nil, **)
           super
 
           @options[:container_classes] ||= 'govuk-width-container'
-          @options[:homepage_url] ||= 'https://www.crowncommercial.gov.uk'
+          @options[:homepage_url] ||= (use_gca_branding ? 'https://www.gca.gov.uk' : 'https://www.crowncommercial.gov.uk')
 
-          @logo = Logo.new(context: @context)
+          @logo = Logo.new(context: @context, use_gca_branding: use_gca_branding)
         end
 
         # Generates the HTML for the CCS Header component

lib/ccs/components/ccs/header.rb

@@ -7,9 +7,30 @@ module CCS
       #
       # This is used for generating the logo component from the
       # {https://github.com/Crown-Commercial-Service/ccs-frontend-project/tree/main/packages/ccs-frontend/src/ccs/components/logo CCS - Components - Logo}
+      #
+      # @!attribute [r] show_only_crown
+      #   @return [Boolean] Flag to show only the crown part of the logo
+      # @!attribute [r] use_gca_branding
+      #   @return [Boolean] Flag to use GCA branding in logo
 
       class Logo < Base
-        # rubocop:disable Metrics/AbcSize
+        private
+
+        attr_reader :show_only_crown, :use_gca_branding
+
+        public
+
+        # @param show_only_crown [Boolean] flag to show only the crown part of the logo
+        # @param use_gca_branding [Boolean] flag to use GCA branding in logo
+
+        def initialize(show_only_crown: nil, use_gca_branding: nil, **)
+          super
+
+          @show_only_crown = show_only_crown
+          @use_gca_branding = use_gca_branding
+        end
+
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         # Generates the HTML for the CCS Logo.
         # Used in {CCS::Components::CCS::Header Header} and {CCS::Components::CCS::Footer Footer}
@@ -18,7 +39,7 @@ class Logo < Base
 
         def render
           tag.span(class: 'ccs-logo') do
-            if @options[:show_only_crown]
+            if show_only_crown
               concat(tag.svg(class: 'ccs-logo__svg', xmlns: 'http://www.w3.org/2000/svg', width: '132.22', height: '121', aria: { hidden: 'true' }, focusable: 'false', viewBox: '0 0 371.06668 339.57333') do
                 concat(tag.g(transform: 'matrix(1.3333333,0,0,-1.3333333,0,339.57333)') do
                   tag.g(transform: 'scale(0.34)') do
@@ -31,24 +52,36 @@ def render
                 concat(tag.g(transform: 'matrix(1.3333333,0,0,-1.3333333,0,339.57333)') do
                   tag.g(transform: 'scale(0.1)') do
                     CCS_STACKED_LOGO_PATHS.each { |ccs_logo_path_attributes| concat(tag.path(**ccs_logo_path_attributes)) }
-                    concat(logo_stacked_text_graphic)
+                    concat(use_gca_branding ? logo_stacked_text_graphic_gca : logo_stacked_text_graphic_ccs)
                   end
                 end)
               end)
-              concat(tag.svg(class: 'ccs-logo__svg ccs-logo__svg--linear', xmlns: 'http://www.w3.org/2000/svg', width: '320', height: '48.5', aria: { hidden: 'true' }, focusable: 'false', viewBox: '0 0 899 137') do
-                concat(tag.g(transform: 'matrix(1.3333333,0,0,-1.3333333,0,137)') do
-                  tag.g(transform: 'scale(0.1)') do
-                    CCS_LINEAR_LOGO_PATHS.each { |ccs_logo_path_attributes| concat(tag.path(**ccs_logo_path_attributes)) }
-                    concat(logo_linear_text_graphic)
-                  end
+              if use_gca_branding
+                concat(tag.svg(class: 'ccs-logo__svg ccs-logo__svg--linear', xmlns: 'http://www.w3.org/2000/svg', width: '378', height: '48.5', aria: { hidden: 'true' }, focusable: 'false', viewBox: '0 0 1061 137') do
+                  concat(tag.g(transform: 'matrix(1.3333333,0,0,-1.3333333,0,137)') do
+                    tag.g(transform: 'scale(0.1)') do
+                      CCS_LINEAR_LOGO_PATHS.each { |ccs_logo_path_attributes| concat(tag.path(**ccs_logo_path_attributes)) }
+                      concat(logo_linear_text_graphic_gca)
+                    end
+                  end)
                 end)
-              end)
-              concat(tag.span('Crown Commercial Service', class: 'ccs-logo__text', hidden: true))
+                concat(tag.span('Government Commercial Agency', class: 'ccs-logo__text', hidden: true))
+              else
+                concat(tag.svg(class: 'ccs-logo__svg ccs-logo__svg--linear', xmlns: 'http://www.w3.org/2000/svg', width: '320', height: '48.5', aria: { hidden: 'true' }, focusable: 'false', viewBox: '0 0 899 137') do
+                  concat(tag.g(transform: 'matrix(1.3333333,0,0,-1.3333333,0,137)') do
+                    tag.g(transform: 'scale(0.1)') do
+                      CCS_LINEAR_LOGO_PATHS.each { |ccs_logo_path_attributes| concat(tag.path(**ccs_logo_path_attributes)) }
+                      concat(logo_linear_text_graphic_ccs)
+                    end
+                  end)
+                end)
+                concat(tag.span('Crown Commercial Service', class: 'ccs-logo__text', hidden: true))
+              end
             end
           end
         end
 
-        # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         # Array of the SVG paths for the CCS Logo
 
@@ -526,7 +559,7 @@ def render
 
         private
 
-        def logo_stacked_text_graphic
+        def logo_stacked_text_graphic_ccs
           tag.g(transform: 'scale(10)') do
             tag.text(
               'xml:space': 'preserve',
@@ -540,7 +573,21 @@ def logo_stacked_text_graphic
           end
         end
 
-        def logo_linear_text_graphic
+        def logo_stacked_text_graphic_gca
+          tag.g(transform: 'scale(10)') do
+            tag.text(
+              'xml:space': 'preserve',
+              transform: 'matrix(1,0,0,-1,20.3102,129.569)',
+              class: 'ccs-logo__text-graphic'
+            ) do
+              concat(tag.tspan('Government ', x: '0 35 62 85 110 125 149 188 212 237 250', y: '0', 'sodipodi:role': 'line'))
+              concat(tag.tspan('Commercial ', x: '0 33.314499 59.416096 99.105995 138.7959 163.4126 177.5981 201.77882 210.5835 234.9653 244.37253', y: '53', 'sodipodi:role': 'line'))
+              concat(tag.tspan('Agency ', x: '0 31.5 58 82.5 108 133.5', y: '106', 'sodipodi:role': 'line'))
+            end
+          end
+        end
+
+        def logo_linear_text_graphic_ccs
           tag.g(transform: 'scale(10)') do
             tag.text(
               'xml:space': 'preserve',
@@ -551,6 +598,18 @@ def logo_linear_text_graphic
             end
           end
         end
+
+        def logo_linear_text_graphic_gca
+          tag.g(transform: 'scale(10)') do
+            tag.text(
+              'xml:space': 'preserve',
+              transform: 'matrix(1,0,0,-1,120,30)',
+              class: 'ccs-logo__text-graphic'
+            ) do
+              concat(tag.tspan('Government Commercial Agency', x: '0 35 62 85 110 125 149 188 212 237 250 260 293.314499 319.416096 359.105995 398.7959 423.4126 437.5981 461.77882 470.5835 494.9653 504.37253 515 546.5 573 597.5 623 648.5', y: '0', 'sodipodi:role': 'line'))
+            end
+          end
+        end
       end
     end
   end

lib/ccs/components/ccs/logo.rb

@@ -6,6 +6,6 @@
   "license": "MIT",
   "devDependencies": {
     "govuk-frontend": "5.14.0",
-    "ccs-frontend": "2.4.0"
+    "ccs-frontend": "2.5.0"
   }
 }

package.json

@@ -78,5 +78,23 @@
         expect(header_container_element[:class]).to eq('ccs-header__container ccs-header__container--full-width')
       end
     end
+
+    context 'when using the GCA branding' do
+      let(:ccs_header) { described_class.new(context: view_context, use_gca_branding: true) }
+
+      it 'correctly formats the HTML for the logo' do
+        expect(header_element.to_html).to eq("
+          <header class=\"ccs-header\" data-module=\"ccs-header\">
+            <div class=\"ccs-header__container govuk-width-container\">
+              <div class=\"ccs-header__logo\">
+                <a class=\"ccs-header__link ccs-header__link--homepage\" aria-label=\"Crown Commercial Service\" href=\"https://www.gca.gov.uk\">
+                  #{gca_logo_html}
+                </a>
+              </div>
+            </div>
+          </header>
+        ".to_one_line)
+      end
+    end
   end
 end

spec/ccs/components/ccs/header_spec.rb

@@ -26,5 +26,13 @@
         expect(logo_element.to_html).to eq(ccs_logo_crown_html)
       end
     end
+
+    context 'when using the GCA branding' do
+      let(:ccs_logo) { described_class.new(context: view_context, use_gca_branding: true) }
+
+      it 'correctly formats the HTML for the logo' do
+        expect(logo_element.to_html).to eq(gca_logo_html)
+      end
+    end
   end
 end

spec/ccs/components/ccs/logo_spec.rb

@@ -55,5 +55,14 @@
         expect(result.to_one_line).to eq_html(fixture_html)
       end
     end
+
+    context "when the fixture is 'with GCA branding'" do
+      let(:fixture_name) { 'with GCA branding' }
+      let(:result) { ccs_header(use_gca_branding: fixture_options[:useGcaBranding]) }
+
+      it 'has HTML matching the fixture' do
+        expect(result.to_one_line).to eq_html(fixture_html)
+      end
+    end
   end
 end

spec/ccs/frontend_helpers/ccs_frontend/header/fixtures_spec.rb

@@ -51,5 +51,23 @@
         ".to_one_line)
       end
     end
+
+    context 'when using the GCA branding' do
+      let(:result) { ccs_header(use_gca_branding: true) }
+
+      it 'correctly formats the HTML for the logo' do
+        expect(header_element.to_html).to eq("
+          <header class=\"ccs-header\" data-module=\"ccs-header\">
+            <div class=\"ccs-header__container govuk-width-container\">
+              <div class=\"ccs-header__logo\">
+                <a class=\"ccs-header__link ccs-header__link--homepage\" aria-label=\"Crown Commercial Service\" href=\"https://www.gca.gov.uk\">
+                  #{gca_logo_html}
+                </a>
+              </div>
+            </div>
+          </header>
+        ".to_one_line)
+      end
+    end
   end
 end

spec/ccs/frontend_helpers/ccs_frontend/header/helpers_spec.rb

@@ -8,6 +8,7 @@
     'attributes' => true,
     'classes' => true,
     'custom homepage url' => true,
+    'with GCA branding' => true,
   }
 
   tested_fixtures = FixturesLoader.get_tested_fixtures(:ccs_frontend, component_name)