govuk_publishing_components 70.2.0 → 70.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a6d5f7de8f25961e21640cb7b451099f2c1d5cf7b885b189a6c7f1db6229dd
-  data.tar.gz: 319ae2c442a8165da752b22f7572c8efe3c14d35d9243cf6f76a4c238be8b538
+  metadata.gz: c7b177c9da6fb435cb1e67132c22ed5d934c3c4d1195ebbbad43f4bdf840db6b
+  data.tar.gz: b1e988e6f1af0ea310b5aee90fa639e7eab8f1081369224569185649d0564948
 SHA512:
-  metadata.gz: 0ca7d6d4464fc5d4e604619e44f7c4e0cb8c579e12caa9c0d1b15ecc8adf712fc72677244f6253ff43dc60e36c8ddcc0a0ff3e20630d80ccf1eac771d824133e
-  data.tar.gz: 8cabc09cbdbe57bdf87a68b141a58e9a199cfc47a6ed844c296a862214392a52444bb5a1c28aab06103250caf50d27c11d0524afdaa5a424527150d513f55f23
+  metadata.gz: 6d64abc0c3978040d42a6050dd242715afc67d72c1f23029a40a872c66949ece8dfcca0c5326f842ae9768121cc9c4203bd2694b5a0d667a866b4a16f730c9a6
+  data.tar.gz: 6e8a95eb759c7fad99b61bca15d2f889a181f0152dbb7e1c0911e4a720eaac5f38655105645f91574e856f8bb735701f98cfa4bd251bbb29a72d605f7fd82782

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/pii-remover.js

@@ -10,8 +10,8 @@
   // e.g. 1990/01/01 or 1990-01-01 or 1990-1-1 or 1990/1/1 or 1990\1\1 or 1990\01\01
   var DATE_PATTERN_NUMERIC_2 = /\d{4}([-\/\\])\d{1,2}([-\/\\])\d{1,2}/g // eslint-disable-line no-useless-escape
 
-  // e.g. 12345678 (This originated from the UA PII Remover)
-  var DATE_PATTERN_NUMERIC_3 = /[0-9]{8}/g
+  // e.g. Matches 8 digit date strings in either DDMMYYYY or YYYYMMDD format, constrained to years between 1900 and 2099.
+  const DATE_PATTERN_NUMERIC_3 = /\b(?:(?:0[1-9]|[12]\d|3[01])(?:0[1-9]|1[0-2])(?:19|20)\d{2}|(?:19|20)\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01]))\b/g
 
   // e.g. 1(st) (of) Jan(uary) 1990 (or 90 or '90) - where the bracketed characters are optional parts that can be matched
   var DATE_PATTERN_STRING_1 = /\d{1,2}(?:st|nd|rd|th)?\s(?:of\s)?(Jan(?:uary)?|Feb(?:ruary)?|Mar(?:ch)?|Apr(?:il)?|May|Jun(?:e)?|Jul(?:y)?|Aug(?:ust)?|Sep(?:t)?(?:ember)?|Oct(?:ober)?|Nov(?:ember)?|Dec(?:ember)?)\s(?:')?(\d{4}|\d{2})/gi
@@ -33,7 +33,7 @@
 
   // 2 valid letters - optional +/space - 6 digits with optional +/spaces every 2 digits (to account for '12 34 56') - optional +/space - 1 valid letter. Case insensitive.
   // e.g. 'AB123456A', 'AB 12 34 56 A', 'ab 123456 a', 'ab 12 34 56 a', 'AB+12+34+56+A'
-  var NATIONAL_INSURANCE_NUMBER = /[A-CEGHJ-OPR-TW-Z]{2}(\s+|\++)?(\d{2}(\s+|\++)?){3}[A-D]/gi
+  var NATIONAL_INSURANCE_NUMBER = /\b[A-CEGHJ-OPR-TW-Z]{2}(\s+|\++)?(\d{2}(\s+|\++)?){3}[A-D]\b/gi
 
   function shouldStripDates () {
     var metas = document.querySelectorAll('meta[name="govuk:ga4-strip-dates"]')

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -1,7 +1,6 @@
 module GovukPublishingComponents
   class ComponentGuideController < GovukPublishingComponents::ApplicationController
     append_view_path Rails.root.join("app", "views", GovukPublishingComponents::Config.component_directory_name).to_s
-    append_view_path Rails.root.join("app", "views", GovukPublishingComponents::Config.flexible_sections_directory_name).to_s
 
     MATCH_COMPONENTS = /(?<=govuk_publishing_components\/components\/)[\/a-zA-Z_-]+(?=['"])/
 
@@ -14,45 +13,29 @@ module GovukPublishingComponents
       @unused_components = unused_components_names.get_component_docs
       @components_in_use_sass = components_in_use_sass
       @components_in_use_js = components_in_use_js
-      @flexible_section_docs = flexible_section_docs.all
     end
 
     def show
-      if params[:flexible_section]
-        @component_doc = flexible_section_docs.get(params[:flexible_section])
-        @example_path = flexible_section_example_path(@component_doc.id, "default")
-        @preview_path = flexible_section_preview_path(@component_doc.id, "default")
-        @preview_all_path = flexible_section_preview_all_path(@component_doc.id)
-
-        @guide_breadcrumbs = [index_breadcrumb, flexible_section_breadcrumb(@component_doc)]
-      else
-        @component_doc = component_docs.get(params[:component])
-        @example_path = component_example_path(@component_doc.id, "default")
-        @preview_path = component_preview_path(@component_doc.id, "default")
-        @preview_all_path = component_preview_all_path(@component_doc.id)
-
-        @guide_breadcrumbs = [index_breadcrumb, component_breadcrumb(@component_doc)]
-      end
+      @component_doc = component_docs.get(params[:component])
+      @guide_breadcrumbs = [index_breadcrumb, component_breadcrumb(@component_doc)]
     end
 
     def example
-      @component_doc = params[:flexible_section] ? flexible_section_docs.get(params[:flexible_section]) : component_docs.get(params[:component])
+      @component_doc = component_docs.get(params[:component])
       @component_example = @component_doc.examples.find { |f| f.id == params[:example] }
 
-      @guide_breadcrumbs = [index_breadcrumb]
-      if params[:flexible_section]
-        @preview_path = flexible_section_preview_path(@component_doc.id, @component_example.id)
-        @guide_breadcrumbs << flexible_section_breadcrumb(@component_doc, @component_example)
-      else
-        @preview_path = component_preview_path(@component_doc.id, @component_example.id)
-        @guide_breadcrumbs << component_breadcrumb(@component_doc, @component_example)
-      end
-      @guide_breadcrumbs << { title: @component_example.name }
+      @guide_breadcrumbs = [
+        index_breadcrumb,
+        component_breadcrumb(@component_doc, @component_example),
+        {
+          title: @component_example.name,
+        },
+      ]
     end
 
     def preview
       @component_examples = []
-      @component_doc = params[:flexible_section] ? flexible_section_docs.get(params[:flexible_section]) : component_docs.get(params[:component])
+      @component_doc = component_docs.get(params[:component])
       @preview = true
 
       if params[:example].present?
@@ -91,10 +74,6 @@ module GovukPublishingComponents
       @gem_component_docs ||= ComponentDocs.new(gem_components: true)
     end
 
-    def flexible_section_docs
-      @flexible_section_docs ||= ComponentDocs.new(flexible_sections: true)
-    end
-
     def used_components_names
       @used_components_names ||= ComponentDocs.new(gem_components: true, limit_to: get_used_component_names)
     end
@@ -188,12 +167,5 @@ module GovukPublishingComponents
         h[:url] = component_doc_path(component_doc.id) if component_example
       end
     end
-
-    def flexible_section_breadcrumb(component_doc, component_example = nil)
-      {}.tap do |h|
-        h[:title] = "#{component_doc.name} (flexible section)"
-        h[:url] = flexible_section_doc_path(component_doc.id) if component_example
-      end
-    end
   end
 end

data/app/models/govuk_publishing_components/component_doc.rb

@@ -7,10 +7,9 @@ module GovukPublishingComponents
                 :component,
                 :accessibility_excluded_rules,
                 :source,
-                :embed,
-                :type
+                :embed
 
-    def initialize(component, type)
+    def initialize(component)
       @component = component
       @id = component[:id]
       @name = component[:name]
@@ -19,7 +18,6 @@ module GovukPublishingComponents
       @accessibility_excluded_rules = component[:accessibility_excluded_rules]
       @source = component[:source]
       @embed = component[:embed]
-      @type = type
     end
 
     def accessibility_criteria
@@ -90,8 +88,6 @@ module GovukPublishingComponents
     def partial_path
       if source == "gem"
         "govuk_publishing_components/components/#{id}"
-      elsif type == "flexible section"
-        "#{GovukPublishingComponents::Config.flexible_sections_directory_name}/#{id}"
       else
         "#{GovukPublishingComponents::Config.component_directory_name}/#{id}"
       end

data/app/models/govuk_publishing_components/component_docs.rb

@@ -1,11 +1,9 @@
 module GovukPublishingComponents
   # @private
   class ComponentDocs
-    def initialize(gem_components: false, limit_to: false, flexible_sections: false)
+    def initialize(gem_components: false, limit_to: false)
       @limit_to = limit_to
       @documentation_directory = gem_components ? gem_documentation_directory : app_documentation_directory
-      @documentation_directory = flexible_sections_documentation_directory if flexible_sections
-      @type = flexible_sections ? "flexible section" : "component"
     end
 
     def get(id)
@@ -24,7 +22,7 @@ module GovukPublishingComponents
   private
 
     def build(component)
-      ComponentDoc.new(component, @type)
+      ComponentDoc.new(component)
     end
 
     def fetch_component_doc_files
@@ -58,9 +56,5 @@ module GovukPublishingComponents
     def gem_documentation_directory
       Pathname.new(GovukPublishingComponents::Config.gem_directory).join("app", "views", "govuk_publishing_components", "components", "docs")
     end
-
-    def flexible_sections_documentation_directory
-      Rails.root.join("app", "views", GovukPublishingComponents::Config.flexible_sections_directory_name, "docs")
-    end
   end
 end

data/app/views/govuk_publishing_components/component_guide/_component_list.html.erb

@@ -5,11 +5,7 @@
 <ul class="govuk-list govuk-list--bullet govuk-list--spaced">
   <% local_assigns[:components].each do |component_doc| %>
     <li data-filter-item data-filter-item-search-terms="<%= component_doc.id %>">
-      <% if local_assigns[:type] == "flexible_section" %>
-        <%= link_to component_doc.name, flexible_section_doc_path(component_doc.id), class: "govuk-link" %>
-      <% else %>
-        <%= link_to component_doc.name, component_doc_path(component_doc.id), class: "govuk-link" %>
-      <% end %>
+      <%= link_to component_doc.name, component_doc_path(component_doc.id), class: "govuk-link" %>
       <p class="govuk-body">
         <%= component_doc.description %>
       </p>

data/app/views/govuk_publishing_components/component_guide/component_doc/_component_output.html.erb

@@ -1,19 +1,11 @@
 <% content_for :body_classes, "gem-full-width__container", flush: true %>
-<%
-  if @component_doc.type == "component"
-    data = example.html_safe_data
-  else
-    flexible_section_class = "FlexiblePage::FlexibleSection::#{@component_doc.id.titleize.gsub(" ", "")}".constantize
-    data = { flexible_section: flexible_section_class.new(**example.html_safe_data.deep_symbolize_keys)}
-  end
-%>
 <% component = capture do %>
   <% if example.has_block? %>
-    <%= render component_doc.partial_path, data do %>
+    <%= render component_doc.partial_path, example.html_safe_data do %>
       <%= render inline: example.block %>
     <% end %>
   <% else %>
-    <%= render component_doc.partial_path, data %>
+    <%= render component_doc.partial_path, example.html_safe_data %>
   <% end %>
 <% end %>
 

data/app/views/govuk_publishing_components/component_guide/example.html.erb

@@ -24,7 +24,7 @@
     </div>
     <h2 class="govuk-heading-m">
       How it looks
-      <small class="govuk-!-font-size-16">(<a href="<%= @preview_path %>" class="govuk-link">preview</a>)</small>
+      <small class="govuk-!-font-size-16">(<a href="<%= component_preview_path(@component_doc.id, @component_example.id) %>" class="govuk-link">preview</a>)</small>
     </h2>
     <%= render partial: "govuk_publishing_components/component_guide/component_doc/preview", locals: { component_doc: @component_doc, example: @component_example } %>
 

data/app/views/govuk_publishing_components/component_guide/index.html.erb

@@ -18,13 +18,6 @@
 
 <div data-module="filter-list" data-filter-label="Search components">
   <% if !ENV["MAIN_COMPONENT_GUIDE"] %>
-    <%= render partial: "component_list", locals: {
-      heading: "Flexible sections in this application",
-      size: @flexible_section_docs.length,
-      components: @flexible_section_docs,
-      type: "flexible_section",
-    } %>
-
     <%= render partial: "component_list", locals: {
       heading: "Components in this application",
       size: @component_docs.length,

data/app/views/govuk_publishing_components/component_guide/preview.html.erb

@@ -5,17 +5,9 @@
 <% end %>
 
 <% @component_examples.each do |example| %>
-  <%
-    if @component_doc.type == "component"
-      example_path = component_example_path(@component_doc.id, example.id)
-    else
-      example_path = flexible_section_example_path(@component_doc.id, example.id)
-    end
-  %>
-
   <div class="component-guide-preview-page">
     <% if @component_examples.length > 1 %>
-      <h2 class="preview-title"><a href="<%= example_path %>"><%= example.name %></a></h2>
+      <h2 class="preview-title"><a href="<%= component_example_path(@component_doc.id, example.id) %>"><%= example.name %></a></h2>
     <% end %>
     <div data-module="test-a11y" data-excluded-rules="<%= @component_doc.accessibility_excluded_rules %>">
       <%= render "govuk_publishing_components/component_guide/component_doc/component", component_doc: @component_doc, example: example, preview_page: true %>

data/app/views/govuk_publishing_components/component_guide/show.html.erb

@@ -1,4 +1,4 @@
-<% content_for :title, "#{@component_doc.name} #{@component_doc.type}" %>
+<% content_for :title, "#{@component_doc.name} component" %>
 
 <% content_for :application_stylesheet do %>
   <% if @component_doc.source == "application" %>
@@ -8,7 +8,7 @@
 
 <%= render "govuk_publishing_components/components/heading", {
     text: @component_doc.name,
-    context: @component_doc.type.capitalize,
+    context: "Component",
     heading_level: 1,
     font_size: "xl",
     margin_bottom: 8,
@@ -31,9 +31,7 @@
           </div>
         </div>
       <% end %>
-      <% if @component_doc.type == "component" %>
-        <p class="govuk-body"><%= link_to "Search for usage of this component on GitHub", @component_doc.github_search_url, class: "govuk-link" %>.</p>
-      <% end %>
+      <p class="govuk-body"><%= link_to "Search for usage of this component on GitHub", @component_doc.github_search_url, class: "govuk-link" %>.</p>
     </div>
   </div>
 
@@ -56,7 +54,7 @@
           text: "Overview",
           items: [
             ({ href: "#how-it-looks", text: "How it looks" } if @component_doc.display_preview? || @component_doc.display_html?),
-            { href: "#how-to-call-this-component", text: @component_doc.type == "component" ? "How to call this component" : "Passing data to this flexible section" },
+            { href: "#how-to-call-this-component", text: "How to call this component" },
             ({ href: "#govuk-design-system", text: "GOV.UK Design System" } if @component_doc.govuk_frontend_components.any?),
             ({ href: "#accessibility-acceptance-criteria", text: "Accessibility acceptance criteria" } if @component_doc.accessibility_criteria.present?),
           ].compact,
@@ -77,21 +75,14 @@
   <h2 class="govuk-heading-l" id="overview">Overview</h2>
   <% if @component_doc.display_preview? || @component_doc.display_html? %>
     <h3 class="govuk-heading-m" id="how-it-looks">
-      <a href="<%= @example_path %>" class="govuk-link">How it looks</a>
-      <small class="govuk-!-font-size-16">(<a href="<%= @preview_path %>" class="govuk-link">preview</a>)</small>
-      <small class="govuk-!-font-size-16">(<a href="<%= @preview_all_path %>" class="govuk-link">preview all</a>)</small>
+      <a href="<%= component_example_path(@component_doc.id, "default") %>" class="govuk-link">How it looks</a>
+      <small class="govuk-!-font-size-16">(<a href="<%= component_preview_path(@component_doc.id, "default") %>" class="govuk-link">preview</a>)</small>
+      <small class="govuk-!-font-size-16">(<a href="<%= component_preview_all_path(@component_doc.id) %>" class="govuk-link">preview all</a>)</small>
     </h3>
     <%= render "govuk_publishing_components/component_guide/component_doc/preview", component_doc: @component_doc, example: @component_doc.example %>
   <% end %>
 
-  <% if @component_doc.type == "component" %>
-    <h3 class="govuk-heading-m govuk-!-margin-top-4" id="how-to-call-this-component">How to call this component</h3>
-  <% else %>
-    <h3 class="govuk-heading-m govuk-!-margin-top-4" id="how-to-call-this-component">Passing data to this flexible section</h3>
-    <div class="component-markdown component-markdown--no-margin">
-      <p>Flexible sections are not called in the way shown below, however this information serves as a reference for the data required by this flexible section.</p>
-    </div>
-  <% end %>
+  <h3 class="govuk-heading-m govuk-!-margin-top-4" id="how-to-call-this-component">How to call this component</h3>
   <%= render "govuk_publishing_components/component_guide/component_doc/call", component_doc: @component_doc, example: @component_doc.example %>
 
   <% if @component_doc.govuk_frontend_components.any? %>
@@ -139,17 +130,8 @@
     <% @component_doc.other_examples.each do |example| %>
       <div class="component-example" id="<%= example.id %>">
         <h3 class="govuk-heading-m">
-          <%
-            if @component_doc.type == "component"
-              example_path = component_example_path(@component_doc.id, example.id)
-              preview_path = component_preview_path(@component_doc.id, example.id)
-            else
-              example_path = flexible_section_example_path(@component_doc.id, example.id)
-              preview_path = flexible_section_preview_path(@component_doc.id, example.id)
-            end
-          %>
-          <a href="<%= example_path %>" class="govuk-link"><%= example.name %></a>
-          <small>(<a href="<%= preview_path %>" class="govuk-link">preview</a>)</small>
+          <a href="<%= component_example_path(@component_doc.id, example.id) %>" class="govuk-link"><%= example.name %></a>
+          <small>(<a href="<%= component_preview_path(@component_doc.id, example.id) %>" class="govuk-link">preview</a>)</small>
         </h3>
         <% if example.html_description %>
           <div class="component-markdown component-markdown--no-margin">

data/app/views/govuk_publishing_components/components/docs/service_navigation.yml

@@ -1,9 +1,8 @@
 name: Service Navigation
-description: Renders a box with a link to sign up for email notifications
+description: Helps users understand that they're using your service and lets them navigate around your service.
 accessibility_criteria: |
   - the component must use the correct heading level for the page
   - text should have a text contrast ratio higher than 4.5:1 against the background colour to meet WCAG AA
-  - the icon must not be focusable or shown to screenreaders
 accessibility_excluded_rules:
   - landmark-unique
 uses_component_wrapper_helper: true

data/config/routes.rb

@@ -2,13 +2,6 @@ GovukPublishingComponents::Engine.routes.draw do
   get "/audit" => "audit#show", as: :audit
   get "/applications" => "applications_page#show", as: :apps
 
-  scope "/flexible-sections/" do
-    get ":flexible_section" => "component_guide#show", as: :flexible_section_doc
-    get ":flexible_section/preview" => "component_guide#preview", as: :flexible_section_preview_all
-    get ":flexible_section/:example" => "component_guide#example", as: :flexible_section_example
-    get ":flexible_section/:example/preview" => "component_guide#preview", as: :flexible_section_preview
-  end
-
   root to: "component_guide#index", as: :component_guide
   get ":component" => "component_guide#show", as: :component_doc
   get ":component/preview" => "component_guide#preview", as: :component_preview_all

data/lib/govuk_publishing_components/config.rb

@@ -25,10 +25,6 @@ module GovukPublishingComponents
       APP_COMPONENT_DIRECTORY
     end
 
-    def self.flexible_sections_directory_name
-      "flexible_page/flexible_sections"
-    end
-
     def self.gem_directory
       Gem::Specification.find_by_name("govuk_publishing_components").gem_dir
     end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "70.2.0".freeze
+  VERSION = "70.2.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 70.2.0
+  version: 70.2.1
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -2117,7 +2117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.21
+rubygems_version: 4.0.22
 specification_version: 4
 summary: A gem to document components in GOV.UK frontend applications
 test_files: []