Merge pull request #244 from Crown-Commercial-Service/update-ccs-frontend-to-v2

Updated CCS Frontend to v2.0.0

Author: tim-s-ccs

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Updated CCS Frontend to v2.0.0
+
+### Removed
+
+- The CCS Header is now just the logo as all other parts should now go in the GOV.UK Service Navigation component
+
 ## [2.5.0] - 2025-06-30
 
 ### Added

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ccs-frontend_helpers (2.5.0)
+    ccs-frontend_helpers (5.5.0)
       rails (>= 7.2)
 
 GEM

bun.lock

@@ -1,7 +1,5 @@
 require_relative '../base'
 require_relative 'logo'
-require_relative 'header/service_authentication'
-require_relative 'header/navigation'
 
 module CCS
   module Components
@@ -13,72 +11,42 @@ module CCS
       #
       # @!attribute [r] logo
       #   @return [Logo] The initialised Logo component
-      # @!attribute [r] service_authentication
-      #   @return [ServiceAuthentication] The initialised service authentication section
-      # @!attribute [r] navigation
-      #   @return [Navigation] The initialised navigation section
-      # @!attribute [r] service
-      #   @return [Hash] The options for the service section
 
       class Header < Base
         private
 
-        attr_reader :logo, :service_authentication, :navigation, :service
+        attr_reader :logo
 
         public
 
-        # @param service_authentication_items [Array<Hash>] An array of links for the service authentication section of the header.
-        #                                                   See {Components::CCS::Header::ServiceAuthentication#initialize ServiceAuthentication#initialize} for details of the items in the array.
-        # @param navigation [Hash] options for the navigation section of the header.
-        #                          See {Components::CCS::Header::Navigation#initialize Navigation#initialize} for details of the options.
-        # @param menu_button [Hash] options for the menu button in the header.
-        #                           See {Components::CCS::Header::Navigation#initialize Navigation#initialize} for details of the options.
-        # @param service [Hash] options for the service name
         # @param options [Hash] options that will be used in customising the HTML
         #
-        # @option service [String] :name the name of the service, included in the header
-        # @option service [String] :href URL for the service name anchor
-        #
         # @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(service_authentication_items: nil, navigation: nil, menu_button: nil, service: nil, **)
-          super(**)
+        def initialize(**)
+          super
 
           @options[:container_classes] ||= 'govuk-width-container'
           @options[:homepage_url] ||= 'https://www.crowncommercial.gov.uk'
 
           @logo = Logo.new(context: @context)
-          @service_authentication = ServiceAuthentication.new(service_authentication_items: service_authentication_items, container_classes: @options[:container_classes], context: @context) if service_authentication_items
-          @navigation = Navigation.new(navigation: navigation, serivce_name_present: service, menu_button: menu_button, context: @context) if navigation && (navigation[:primary_items] || navigation[:secondary_items])
-          @service = service
         end
 
-        # rubocop:disable Metrics/AbcSize
-
         # Generates the HTML for the CCS Header component
         #
         # @return [ActiveSupport::SafeBuffer]
 
         def render
           tag.header(**options[:attributes]) do
-            concat(service_authentication.render) if service_authentication
             concat(tag.div(class: "ccs-header__container #{options[:container_classes]}".rstrip) do
               concat(header_logo)
-              if service || navigation
-                concat(tag.div(class: 'ccs-header__content') do
-                  concat(header_service_name) if service
-                  concat(navigation.render) if navigation
-                end)
-              end
             end)
           end
         end
 
-        # rubocop:enable Metrics/AbcSize
-
         # The default attributes for the breadcrumbs
 
         DEFAULT_ATTRIBUTES = { class: 'ccs-header', data: { module: 'ccs-header' } }.freeze
@@ -94,18 +62,6 @@ def header_logo
             link_to(logo.render, options[:homepage_url], class: 'ccs-header__link ccs-header__link--homepage', aria: { label: 'Crown Commercial Service' })
           end
         end
-
-        # Generates the service name section
-        #
-        # @return [ActiveSupport::SafeBuffer]
-
-        def header_service_name
-          if service[:href]
-            link_to(service[:name], service[:href], class: 'ccs-header__link ccs-header__link--service-name')
-          else
-            tag.span(service[:name], class: 'ccs-header__link--service-name')
-          end
-        end
       end
     end
   end