crown_marketplace_utils 0.1.0.beta.2 → 0.1.0.beta.3

data/lib/crown_marketplace_utils/gov_uk_helper/field/select.rb

@@ -0,0 +1,166 @@
+# frozen_string_literal: true
+
+require 'action_view'
+require_relative '../field'
+
+module CrownMarketplaceUtils
+  module GovUkHelper
+    module Field
+      # = GOV.UK Select
+      #
+      # This helper is used for generating the select component from the
+      # {https://design-system.service.gov.uk/components/select GDS - Components - Select}
+      #
+      # This is considered a Field module and so makes use of the methods in {CrownMarketplaceUtils::GovUkHelper::Field}
+
+      module Select
+        include ActionView::Helpers::FormOptionsHelper
+        include Field
+
+        # Generates the HTML for the GOV.UK Select component
+        #
+        # @param attribute [String, Symbol] the attribute of the select field
+        # @param items [Array] array of option items for the select, see {govuk_map_select_items}
+        # @param error_message [String] the error message to be displayed
+        # @param govuk_select_options [Hash] options that will be used for the parts of the form group, label, hint and select
+        #
+        # @option govuk_select_options [Hash] :form_group_options see {govuk_field}
+        # @option govuk_select_options [Hash] :label see {govuk_field}
+        # @option govuk_select_options [Hash] :hint see {govuk_field}
+        # @option govuk_select_options [Hash] :select_options ({}) the options that will be used when rendering the select field.
+        #                                                          See {govuk_select_field} for more details.
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Select
+        #                                     which can then be rendered on the page
+
+        def govuk_select(attribute, items, error_message = nil, **govuk_select_options)
+          govuk_field(:select, attribute, error_message, **govuk_select_options) do |govuk_field_options|
+            concat(govuk_select_field(attribute, items, error_message, **govuk_field_options))
+          end
+        end
+
+        # Generates the HTML for the GOV.UK Select component using an ActionView::Helpers::FormBuilder.
+        # Unlike {govuk_select}, the method will be able to automatically determine if the error message needs to be shown.
+        #
+        # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the select field
+        # @param attribute [String, Symbol] the attribute of the select field
+        # @param items [Array] array of option items for the select, see {govuk_map_select_items}
+        # @param govuk_select_options [Hash] options that will be used for the parts of the form group, label, hint and select
+        #
+        # @option govuk_select_options [Hash] :form_group_options see {govuk_field_with_form}
+        # @option govuk_select_options [Hash] :label see {govuk_field_with_form}
+        # @option govuk_select_options [Hash] :hint see {govuk_field_with_form}
+        # @option govuk_select_options [Hash] :select_options ({}) the options that will be used when rendering the select field.
+        #                                                          See {govuk_select_field_with_form} for more details.
+        #
+        # @return (see govuk_select)
+
+        def govuk_select_with_form(form, attribute, items, **govuk_select_options)
+          govuk_field_with_form(:select, form, attribute, **govuk_select_options) do |govuk_field_options, error_message|
+            concat(govuk_select_field_with_form(form, attribute, items, error_message, **govuk_field_options))
+          end
+        end
+
+        private
+
+        # Generates the select HTML for {govuk_select}
+        #
+        # @param attribute [String, Symbol] the attribute of the select field
+        # @param items [Array] array of option items for the select, see {govuk_map_select_items}
+        # @param error_message [String] used to indicate if there is an error which will add extra classes
+        # @param govuk_select_options [Hash] options that will be used in customising the HTML
+        #
+        # @option (see _govuk_select_field)
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the select field which is used in {govuk_select}
+
+        def govuk_select_field(attribute, items, error_message, **govuk_select_options)
+          _govuk_select_field(error_message, **govuk_select_options) do |govuk_select_classes, govuk_select_attributes|
+            select_tag(
+              attribute,
+              options_for_select(
+                govuk_map_select_items(items),
+                govuk_select_options[:selected]
+              ),
+              class: govuk_select_classes,
+              **govuk_select_attributes
+            )
+          end
+        end
+
+        # Generates the select HTML for {govuk_select_with_form}
+        #
+        # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the select field
+        # @param attribute [String, Symbol] the attribute of the select field
+        # @param items [Array] array of option items for the select, see {govuk_map_select_items}
+        # @param error_message [String] used to indicate if there is an error which will add extra classes
+        # @param govuk_select_options [Hash] options that will be used in customising the HTML
+        #
+        # @option (see _govuk_select_field)
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the select field which is used in {govuk_select_with_form}
+
+        def govuk_select_field_with_form(form, attribute, items, error_message, **govuk_select_options)
+          _govuk_select_field(error_message, **govuk_select_options) do |govuk_select_classes, govuk_select_attributes|
+            form.select(
+              attribute,
+              govuk_map_select_items(items),
+              govuk_select_options[:select_options] || {},
+              class: govuk_select_classes,
+              **govuk_select_attributes
+            )
+          end
+        end
+
+        # Wrapper method used by {govuk_select_field} and {govuk_select_field_with_form} to generate the select HTML
+        #
+        # @param error_message [String] used to indicate if there is an error which will add extra classes
+        # @param govuk_select_options [Hash] options that will be used in customising the HTML
+        #
+        # @option govuk_select_options [String] :classes additional CSS classes for the select HTML
+        # @option govuk_select_options [String] :selected (nil) the selected option
+        # @option govuk_select_options [Hash] :attributes ({}) any additional attributes that will added as part of the HTML
+        #
+        # @yield the select HTML generated by {govuk_select_field} or {govuk_select_field_with_form}
+        #
+        # @yieldparam govuk_select_classes [Array] the classes for the select HTML
+        # @yieldparam govuk_select_attributes [Hash] additional attributes that will added as part of the HTML
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the select field which is used in {govuk_select_field} or {govuk_select_field_with_form}
+
+        def _govuk_select_field(error_message, **govuk_select_options)
+          govuk_select_classes = ['govuk-select']
+          govuk_select_classes += ['govuk-select--error'] if error_message
+          govuk_select_classes << govuk_select_options[:classes]
+          govuk_select_options[:attributes] ||= {}
+
+          yield(govuk_select_classes, govuk_select_options[:attributes])
+        end
+
+        # Maps the items into an array that can be used to generate the options for
+        # {govuk_select_field} and {govuk_select_field_with_form}
+        #
+        # @param items [Array] array of option items for the select
+        #
+        # @option items [String] :text the text of the option item.
+        #                              If this is blank the value is used
+        # @option items [String] :value the value of the option item
+        # @option items [Hash] :attributes ({}) any additional attributes that will added as part of the option HTML
+        #
+        # @return [Array] array of option params that are used in {govuk_select_field} and {govuk_select_field_with_form}
+
+        def govuk_map_select_items(items)
+          items.map do |item|
+            [
+              item[:text] || item[:value],
+              item[:value],
+              (item[:attributes] || {})
+            ]
+          end
+        end
+      end
+    end
+  end
+end
+
+ActionView::Base.field_error_proc = proc { |html_tag, _instance| html_tag }

data/lib/crown_marketplace_utils/gov_uk_helper/field/textarea.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require_relative '../field'
+
+module CrownMarketplaceUtils
+  module GovUkHelper
+    module Field
+      # = GOV.UK Textarea
+      #
+      # This helper is used for generating the textarea component from the
+      # {https://design-system.service.gov.uk/components/textarea GDS - Components - Textarea}
+      #
+      # This is considered a Field module and so makes use of the methods in {CrownMarketplaceUtils::GovUkHelper::Field}
+
+      module Textarea
+        include Field
+
+        # Generates the HTML for the GOV.UK textarea component
+        #
+        # @param attribute [String, Symbol] the attribute of the textarea
+        # @param error_message [String] the error message to be displayed
+        # @param govuk_textarea_options [Hash] options that will be used for the parts of the form group, label, hint and textarea
+        #
+        # @option govuk_textarea_options [Hash] :form_group_options see {govuk_field}
+        # @option govuk_textarea_options [Hash] :label see {govuk_field}
+        # @option govuk_textarea_options [Hash] :hint see {govuk_field}
+        # @option govuk_textarea_options [Hash] :textarea_options ({}) the options that will be used when rendering the textarea.
+        #                                                              See {govuk_textarea_field} for more details.
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK textarea
+        #                                     which can then be rendered on the page
+
+        def govuk_textarea(attribute, error_message = nil, **govuk_textarea_options)
+          govuk_field(:textarea, attribute, error_message, **govuk_textarea_options) do |govuk_field_options|
+            concat(govuk_textarea_field(attribute, error_message, **govuk_field_options))
+          end
+        end
+
+        # Generates the HTML for the GOV.UK textarea component using an ActionView::Helpers::FormBuilder.
+        # Unlike {#govuk_textarea}, the method will be able to automatically determine if the error message needs to be shown.
+        #
+        # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the textarea
+        # @param attribute [String, Symbol] the attribute of the textarea
+        # @param govuk_textarea_options [Hash] options that will be used for the parts of the form group, label, hint and textarea
+        #
+        # @option govuk_textarea_options [Hash] :form_group_options see {govuk_field_with_form}
+        # @option govuk_textarea_options [Hash] :label see {govuk_field_with_form}
+        # @option govuk_textarea_options [Hash] :hint see {govuk_field_with_form}
+        # @option govuk_textarea_options [Hash] :textarea_options ({}) the options that will be used when rendering the textarea.
+        #                                                              See {govuk_textarea_field_with_form} for more details.
+        #
+        # @return (see govuk_textarea)
+
+        def govuk_textarea_with_form(form, attribute, **govuk_textarea_options)
+          govuk_field_with_form(:textarea, form, attribute, **govuk_textarea_options) do |govuk_field_options, error_message|
+            concat(govuk_textarea_field_with_form(form, attribute, error_message, **govuk_field_options))
+          end
+        end
+
+        private
+
+        # Generates the textarea HTML for {govuk_textarea}
+        #
+        # @param attribute [String, Symbol] the attribute of the textarea
+        # @param error_message [String] used to indicate if there is an error which will add extra classes
+        # @param govuk_text_textarea_options [Hash] options that will be used in customising the HTML
+        #
+        # @option (see _govuk_textarea_field)
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the textarea field which is used in {govuk_textarea}
+
+        def govuk_textarea_field(attribute, error_message, **govuk_text_textarea_options)
+          _govuk_textarea_field(error_message, **govuk_text_textarea_options) do |govuk_text_textarea_classes, govuk_text_textarea_rows, govuk_text_textarea_attributes|
+            text_area_tag(attribute, govuk_text_textarea_options[:content], class: govuk_text_textarea_classes, rows: govuk_text_textarea_rows, **govuk_text_textarea_attributes)
+          end
+        end
+
+        # Generates the textarea HTML for {govuk_textarea_with_form}
+        #
+        # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the textarea
+        # @param attribute [String, Symbol] the attribute of the textarea
+        # @param error_message [String] used to indicate if there is an error which will add extra classes
+        # @param govuk_text_textarea_options [Hash] options that will be used in customising the HTML
+        #
+        # @option (see _govuk_textarea_field)
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the textarea field which is used in {govuk_textarea_with_form}
+
+        def govuk_textarea_field_with_form(form, attribute, error_message, **govuk_text_textarea_options)
+          _govuk_textarea_field(error_message, **govuk_text_textarea_options) do |govuk_text_textarea_classes, govuk_text_textarea_rows, govuk_text_textarea_attributes|
+            form.text_area(attribute, class: govuk_text_textarea_classes, rows: govuk_text_textarea_rows, **govuk_text_textarea_attributes)
+          end
+        end
+
+        # Wrapper method used by {govuk_textarea_field} and {govuk_textarea_field_with_form} to generate the textarea HTML
+        #
+        # @param error_message [String] used to indicate if there is an error which will add extra classes
+        # @param govuk_text_textarea_options [Hash] options that will be used in customising the HTML
+        #
+        # @option govuk_text_textarea_options [String] :classes additional CSS classes for the textarea HTML
+        # @option govuk_text_textarea_options [String] :content (nil) the content of the textarea
+        # @option govuk_text_textarea_options [String] :rows (5) the number of rows for the text area
+        # @option govuk_text_textarea_options [Hash] :attributes ({}) any additional attributes that will added as part of the HTML
+        #
+        # @yield the textarea HTML generated by {govuk_textarea_field} or {govuk_textarea_field_with_form}
+        #
+        # @yieldparam govuk_text_textarea_classes [Array] the classes for the label HTML
+        # @yieldparam govuk_text_textarea_rows [Integer, String] (5) the number of rows for the text area
+        # @yieldparam govuk_text_textarea_attributes [Hash] additional attributes that will added as part of the HTML
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the textarea field which is used in {govuk_textarea_field} or {govuk_textarea_field_with_form}
+
+        def _govuk_textarea_field(error_message, **govuk_text_textarea_options)
+          govuk_text_textarea_classes = ['govuk-textarea']
+          govuk_text_textarea_classes += ['govuk-textarea--error'] if error_message
+          govuk_text_textarea_classes << govuk_text_textarea_options[:classes]
+          govuk_text_textarea_options[:attributes] ||= {}
+          govuk_text_textarea_options[:rows] ||= 5
+
+          yield(govuk_text_textarea_classes, govuk_text_textarea_options[:rows], govuk_text_textarea_options[:attributes])
+        end
+      end
+    end
+  end
+end
+
+ActionView::Base.field_error_proc = proc { |html_tag, _instance| html_tag }

data/lib/crown_marketplace_utils/gov_uk_helper/field.rb

@@ -0,0 +1,263 @@
+# frozen_string_literal: true
+
+require_relative 'fieldset'
+require_relative 'form_group'
+require_relative 'hint'
+require_relative 'label'
+
+module CrownMarketplaceUtils
+  module GovUkHelper
+    # = GOV.UK Field
+    #
+    # This module contains methods to wrap the:
+    # - fieldset
+    # - form group
+    # - label
+    # - hint
+    # - error message
+    # around some kind of input.
+    #
+    # The wrapper functions in this module are used
+    # to create the fields using the structure of a GDS input field component.
+
+    module Field
+      include Fieldset
+      include FormGroup
+      include Hint
+      include Label
+
+      # Generates the HTML to wrap arround a GDS input field component.
+      #
+      # @param type [Symbol] the type of the field
+      # @param attribute [String, Symbol] the attribute of the field
+      # @param error_message [String] the error message to be displayed
+      # @param govuk_field_options [Hash] options that will be used for the parts of the form group, label, hint and field
+      #
+      # @option govuk_field_options [Hash] :form_group_options ({}) the options for govuk_form_group {govuk_form_group}
+      # @option govuk_field_options [Hash] :label the parameters that will be used to create the label for the field:
+      #                                           - +:text+ (required) - the label text
+      #                                           - +:options+ - default: { } - the options for govuk_label {govuk_label}
+      # @option govuk_field_options [Hash] :hint (nil) the parameters that will be used to create the hint for the field
+      #                                                - +:text+ (required) - the hint text
+      #                                                - +:options+ - default: { } - the options for govuk_hint {govuk_hint}
+      #                                                If no hint is given then no hint will be rendered
+      # @option govuk_field_options [Hash] :field_options ({}) the options that will be used when rendering the field.
+      #                                                        For more details look at a module that uses +Field+.
+      #
+      # @yield the field HTML
+      #
+      # @yieldparam govuk_field_options [Hash] the HTML options used when rendering the field
+      #
+      # @return [ActiveSupport::SafeBuffer] the HTML that wraps arround the field
+
+      def govuk_field(type, attribute, error_message = nil, **govuk_field_options)
+        field_key = :"#{type}_options"
+
+        set_label_for_if_custom_id(field_key, govuk_field_options)
+        set_hint_id(attribute, govuk_field_options)
+
+        govuk_form_group(attribute, error_message, **(govuk_field_options[:form_group_options] || {})) do |display_error_message|
+          set_field_described_by(field_key, attribute, error_message, govuk_field_options)
+
+          capture do
+            concat(govuk_label(attribute, govuk_field_options[:label][:text], **govuk_field_options[:label][:options]))
+            concat(govuk_hint(govuk_field_options[:hint][:text], **govuk_field_options[:hint][:options])) if govuk_field_options[:hint]
+            concat(display_error_message)
+            yield(govuk_field_options[field_key])
+          end
+        end
+      end
+
+      # Generates the HTML to wrap arround a GDS input field component using an ActionView::Helpers::FormBuilder.
+      # Unlike {govuk_field}, the method will be able to automatically determine if the error message needs to be shown.
+      #
+      # @param type [Symbol] the type of the field
+      # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the label
+      # @param attribute [String, Symbol] the attribute of the field
+      # @param govuk_field_options [Hash] options that will be used for the parts of the form group, label, hint and field
+      #
+      # @option govuk_field_options [Hash] :form_group_options ({}) the options for govuk_form_group {govuk_form_group}
+      # @option govuk_field_options [Hash] :label the parameters that will be used to create the label for the field:
+      #                                           - +:text+ (required) - the label text
+      #                                           - +:options+ - default: { } - the options for govuk_label {govuk_label}
+      # @option govuk_field_options [Hash] :hint (nil) the parameters that will be used to create the hint for the field
+      #                                                - +:text+ (required) - the hint text
+      #                                                - +:options+ - default: { } - the options for govuk_hint {govuk_hint}
+      #                                                If no hint is given then no hint will be rendered
+      # @option govuk_field_options [Hash] :field_options ({}) the options that will be used when rendering the field.
+      #                                                        For more details look at a module that uses +Field+.
+      #
+      # @yield the field HTML
+      #
+      # @yieldparam govuk_field_options [Hash] the HTML options used when rendering the field
+      # @yieldparam error_message [ActiveSupport::SafeBuffer] used by the field to indicate if there is an error
+      #
+      # @return (see govuk_field)
+
+      def govuk_field_with_form(type, form, attribute, **govuk_field_options)
+        field_key = :"#{type}_options"
+
+        set_label_for_if_custom_id(field_key, govuk_field_options)
+        set_hint_id(attribute, govuk_field_options)
+
+        govuk_form_group_with_model(form.object, attribute, **(govuk_field_options[:form_group_options] || {})) do |display_error_message|
+          set_field_described_by(field_key, attribute, display_error_message, govuk_field_options)
+
+          capture do
+            concat(govuk_label_with_form(form, attribute, govuk_field_options[:label][:text], **(govuk_field_options[:label][:options] || {})))
+            concat(govuk_hint(govuk_field_options[:hint][:text], **govuk_field_options[:hint][:options])) if govuk_field_options[:hint]
+            concat(display_error_message)
+            yield(govuk_field_options[field_key], display_error_message)
+          end
+        end
+      end
+
+      # Generates the HTML to wrap arround a GDS input fields component.
+      # These are inputs that require being wrapped in a fieldset, for example radio buttons.
+      #
+      # @param type [Symbol] the type of the fields
+      # @param attribute [String, Symbol] the attribute of the fields
+      # @param error_message [String] the error message to be displayed
+      # @param govuk_fields_options [Hash] options that will be used for the parts of the fieldset, form group, hint and fields
+      #
+      # @option govuk_fields_options [Hash] :form_group_options ({}) the options for govuk_form_group {govuk_form_group}
+      # @option govuk_fields_options [Hash] :fieldset_options ({}) the options for govuk_fieldset {govuk_fieldset}
+      # @option govuk_fields_options [Hash] :hint (nil) the parameters that will be used to create the hint for the fields
+      #                                                 - +:text+ (required) - the hint text
+      #                                                 - +:options+ - default: { } - the options for govuk_hint {govuk_hint}
+      #                                                 If no hint is given then no hint will be rendered
+      # @option govuk_fields_options [Hash] :field_options ({}) the options that will be used when rendering the fields.
+      #                                                         For more details look at a module that uses +Field+.
+      #
+      # @yield the fields HTML
+      #
+      # @yieldparam govuk_fields_options [Hash] the HTML options used when rendering the fields
+      #
+      # @return [ActiveSupport::SafeBuffer] the HTML that wraps arround the fields
+
+      def govuk_fields(type, attribute, error_message = nil, **govuk_fields_options)
+        field_key = :"#{type}_options"
+
+        set_hint_id(attribute, govuk_fields_options)
+
+        govuk_form_group(attribute, error_message, **(govuk_fields_options[:form_group_options] || {})) do |display_error_message|
+          set_field_described_by(:fieldset_options, attribute, error_message, govuk_fields_options)
+          (govuk_fields_options[field_key] ||= {})[:attributes] ||= {}
+
+          govuk_fieldset(**govuk_fields_options[:fieldset_options]) do
+            capture do
+              concat(govuk_hint(govuk_fields_options[:hint][:text], **govuk_fields_options[:hint][:options])) if govuk_fields_options[:hint]
+              concat(display_error_message)
+              yield(govuk_fields_options[field_key])
+            end
+          end
+        end
+      end
+
+      # Generates the HTML to wrap arround a GDS input fields component using an ActionView::Helpers::FormBuilder.
+      # These are inputs that require being wrapped in a fieldset, for example radio buttons.
+      #
+      # Unlike {govuk_fields}, the method will be able to automatically determine if the error message needs to be shown.
+      #
+      # @param type [Symbol] the type of the fields
+      # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the label
+      # @param attribute [String, Symbol] the attribute of the fields
+      # @param govuk_fields_options [Hash] options that will be used for the parts of the fieldset, form group, hint and fields
+      #
+      # @option govuk_fields_options [Hash] :form_group_options ({}) the options for govuk_form_group {govuk_form_group}
+      # @option govuk_fields_options [Hash] :fieldset_options ({}) the options for govuk_fieldset {govuk_fieldset}
+      # @option govuk_fields_options [Hash] :hint (nil) the parameters that will be used to create the hint for the fields
+      #                                                 - +:text+ (required) - the hint text
+      #                                                 - +:options+ - default: { } - the options for govuk_hint {govuk_hint}
+      #                                                 If no hint is given then no hint will be rendered
+      # @option govuk_fields_options [Hash] :field_options ({}) the options that will be used when rendering the fields.
+      #                                                         For more details look at a module that uses +Field+.
+      #
+      # @yield the fields HTML
+      #
+      # @yieldparam govuk_fields_options [Hash] the HTML options used when rendering the fields
+      #
+      # @return (see govuk_fields)
+
+      def govuk_fields_with_form(type, form, attribute, **govuk_fields_options)
+        field_key = :"#{type}_options"
+
+        set_hint_id(attribute, govuk_fields_options)
+
+        govuk_form_group_with_model(form.object, attribute, **(govuk_fields_options[:form_group_options] || {})) do |display_error_message|
+          set_field_described_by(:fieldset_options, attribute, display_error_message, govuk_fields_options)
+          (govuk_fields_options[field_key] ||= {})[:attributes] ||= {}
+
+          govuk_fieldset(**govuk_fields_options[:fieldset_options]) do
+            capture do
+              concat(govuk_hint(govuk_fields_options[:hint][:text], **govuk_fields_options[:hint][:options])) if govuk_fields_options[:hint]
+              concat(display_error_message)
+              yield(govuk_fields_options[field_key])
+            end
+          end
+        end
+      end
+
+      private
+
+      # Sets the label +for+ if a custom ID has been given for the field.
+      #
+      # @param govuk_field_options [Hash] see {govuk_field} for details
+
+      def set_label_for_if_custom_id(field_key, govuk_field_options)
+        field_id = govuk_field_options.dig(field_key, :attributes, :id)
+
+        govuk_field_options[:label][:options] ||= {}
+        (govuk_field_options[:label][:options][:attributes] ||= {}).merge!({ for: field_id }) if field_id
+      end
+
+      # Sets the hint ID if there is a hint, and the ID for the hint has not been sent
+      #
+      # @param attribute [String, Symbol] the attribute of the field
+      # @param govuk_field_options [Hash] see {govuk_field} for details
+
+      def set_hint_id(attribute, govuk_field_options)
+        return if !govuk_field_options[:hint] || govuk_field_options.dig(:hint, :options, :attributes, :id)
+
+        govuk_field_options[:hint][:options] ||= {}
+        (govuk_field_options[:hint][:options][:attributes] ||= {}).merge!({ id: "#{attribute}-hint" })
+      end
+
+      # Adds the aira-describedby attribute for the field
+      # if there is a hint or an error message
+      #
+      # @param attribute [String, Symbol] the attribute of the input
+      # @param error_message [String] used to indicate if there is an error
+      # @param govuk_field_options [Hash] see {#govuk_field} for details
+
+      def set_field_described_by(field_key, attribute, error_message, govuk_field_options)
+        aria_described_by = []
+        aria_described_by << govuk_field_options.dig(field_key, :attributes, :aria, :describedby)
+        aria_described_by << govuk_field_options[:hint][:options][:attributes][:id] if govuk_field_options[:hint]
+        aria_described_by << "#{attribute}-error" if error_message
+        aria_described_by.compact!
+
+        govuk_field_options[field_key] ||= {}
+        govuk_field_options[field_key][:attributes] ||= {}
+
+        return unless aria_described_by.any?
+
+        (govuk_field_options[field_key][:attributes][:aria] ||= {}).merge!({ describedby: aria_described_by.join(' ') })
+      end
+
+      # Sets the hint classes and adds the aira-describedby attribute for a fields item
+      #
+      # @param type [String] the type of the item
+      # @param attribute [String, Symbol] the attribute of the item
+      # @param item [Hash] the options for that item
+
+      def set_item_options_for_hint(type, attribute, item)
+        (item[:hint][:options] ||= {})[:attributes] ||= {}
+        item[:hint][:options][:classes] = "govuk-#{type}__hint #{item[:hint][:options][:classes]}".rstrip
+        item[:hint][:options][:attributes][:id] ||= "#{attribute}_#{item[:value]}-item-hint"
+
+        (item[:attributes][:aria] ||= {})[:describedby] = item[:hint][:options][:attributes][:id]
+      end
+    end
+  end
+end

data/lib/crown_marketplace_utils/gov_uk_helper/fieldset.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'action_view'
+
+module CrownMarketplaceUtils
+  module GovUkHelper
+    # = GOV.UK Fieldset
+    #
+    # This helper is used for generating the fieldset component from the
+    # {https://design-system.service.gov.uk/components/fieldset GDS - Components - Fieldset}
+
+    module Fieldset
+      include ActionView::Context
+      include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::TextHelper
+
+      # Generates the HTML for the GOV.UK Fieldset component
+      #
+      # @param govuk_fieldset_options [Hash] options that will be used in customising the HTML
+      #
+      # @option govuk_fieldset_options [String] :classes additional CSS classes for the fieldset HTML
+      # @option govuk_fieldset_options [Hash] :legend options for the legend which are used in {#govuk_legend}
+      # @option govuk_fieldset_options [Hash] :attributes ({}) any additional attributes that will added as part of the HTML
+      #
+      # @yield HTML that will be contained within the 'govuk-fieldset' div and under the legend
+      #
+      # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Fieldset
+      #                                     which can then be rendered on the page
+
+      def govuk_fieldset(**govuk_fieldset_options)
+        govuk_fieldset_classes = ['govuk-fieldset']
+        govuk_fieldset_classes << govuk_fieldset_options[:classes]
+        govuk_fieldset_options[:attributes] ||= {}
+
+        tag.fieldset(class: govuk_fieldset_classes, **govuk_fieldset_options[:attributes]) do
+          capture do
+            concat(govuk_legend(govuk_fieldset_options[:legend])) if govuk_fieldset_options[:legend]
+            concat(yield)
+          end
+        end
+      end
+
+      private
+
+      # Generates the HTML for the Legend as part of {#govuk_fieldset}
+      #
+      # @param govuk_legend_options [Hash] options that will be used in the legend
+      #
+      # @option govuk_legend_options [String] :classes additional CSS classes for the legend HTML
+      # @option govuk_legend_options [String] :text the text for the legend
+      # @option govuk_legend_options [boolean] :is_page_heading (false) if the legend is also the heading it will rendered in a h1
+      # @option govuk_legend_options [Hash] :caption an optional hash with the +text+ and +classes+ that will be used
+      #                                              to render a caption before the h1 if the legend is a page heading
+      #
+      # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Fieldset
+      #                                     which can then be rendered on the page
+
+      def govuk_legend(govuk_legend_options)
+        govuk_legend_classes = ['govuk-fieldset__legend']
+        govuk_legend_classes << govuk_legend_options[:classes]
+
+        tag.legend(class: govuk_legend_classes) do
+          if govuk_legend_options[:is_page_heading]
+            capture do
+              concat(tag.span(govuk_legend_options[:caption][:text], class: govuk_legend_options[:caption][:classes])) if govuk_legend_options[:caption]
+              concat(tag.h1(govuk_legend_options[:text], class: 'govuk-fieldset__heading'))
+            end
+          else
+            govuk_legend_options[:text]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crown_marketplace_utils/gov_uk_helper/form_group.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'action_view'
 require_relative 'error_message'
 
 module CrownMarketplaceUtils
@@ -10,8 +9,6 @@ module CrownMarketplaceUtils
     # This helper is used for generating the form group component from the Government Design Systems
 
     module FormGroup
-      include ActionView::Context
-      include ActionView::Helpers::TagHelper
       include ErrorMessage
 
       # Generates the HTML for the GOV.UK Form Group component