govuk_publishing_components 66.4.1 → 66.5.0

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

@@ -1,4 +1,5 @@
-<% content_for :title, "#{@component_doc.name} component" %>
+<% content_for :title, "#{@component_doc.name} #{@component_doc.type}" %>
+
 <% content_for :application_stylesheet do %>
   <% if @component_doc.source == "application" %>
     <%= render "application_stylesheet" %>
@@ -7,7 +8,7 @@
 
 <%= render "govuk_publishing_components/components/heading", {
     text: @component_doc.name,
-    context: "Component",
+    context: @component_doc.type.capitalize,
     heading_level: 1,
     font_size: "xl",
     margin_bottom: 8,
@@ -30,7 +31,9 @@
           </div>
         </div>
       <% end %>
-      <p class="govuk-body"><%= link_to "Search for usage of this component on GitHub", @component_doc.github_search_url, class: "govuk-link" %>.</p>
+      <% 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 %>
     </div>
   </div>
 
@@ -52,8 +55,8 @@
           href: "#overview",
           text: "Overview",
           items: [
-            { href: "#how-it-looks", text: "How it looks" },
-            { href: "#how-to-call-this-component", text: "How to call this component" },
+            ({ 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: "#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,
@@ -72,14 +75,23 @@
   </div>
 
   <h2 class="govuk-heading-l" id="overview">Overview</h2>
-  <h3 class="govuk-heading-m" id="how-it-looks">
-    <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 %>
+  <% 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>
+    </h3>
+    <%= render "govuk_publishing_components/component_guide/component_doc/preview", component_doc: @component_doc, example: @component_doc.example %>
+  <% end %>
 
-  <h3 class="govuk-heading-m govuk-!-margin-top-4" id="how-to-call-this-component">How to call this component</h3>
+  <% 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 %>
   <%= render "govuk_publishing_components/component_guide/component_doc/call", component_doc: @component_doc, example: @component_doc.example %>
 
   <% if @component_doc.govuk_frontend_components.any? %>
@@ -127,8 +139,17 @@
     <% @component_doc.other_examples.each do |example| %>
       <div class="component-example" id="<%= example.id %>">
         <h3 class="govuk-heading-m">
-          <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>
+          <%
+            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>
         </h3>
         <% if example.html_description %>
           <div class="component-markdown component-markdown--no-margin">

data/app/views/govuk_publishing_components/components/_cookie_banner.html.erb

@@ -20,12 +20,10 @@
                                   cookie_preferences_href,
                                   class: "govuk-link",
                                 )))
-  services_cookies ||= nil
 
   component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
   component_helper.set_id(id)
   component_helper.add_class("gem-c-cookie-banner govuk-clearfix govuk-cookie-banner js-banner-wrapper")
-  component_helper.add_class("gem-c-cookie-banner--services") if services_cookies
 
   component_helper.add_data_attribute({ module: "cookie-banner", nosnippet: "" })
   component_helper.add_role("region")
@@ -54,38 +52,22 @@
       </div>
     </div>
     <div class="js-confirmation-buttons govuk-button-group">
-      <% if services_cookies %>
-        <%= render "govuk_publishing_components/components/button", {
+      <%= render "govuk_publishing_components/components/button", {
           name: "cookies",
-          text: services_cookies.dig(:yes, :text) || "Yes",
-          data_attributes: { "accept-cookies": "true" }.merge(services_cookies.dig(:yes, :data_attributes) || {}),
-        } %>
-        <%= render "govuk_publishing_components/components/button", {
+          text: t("components.cookie_banner.buttons.accept_cookies"),
+          data_attributes: {
+            "accept-cookies": "true",
+            "cookie-types": "all",
+          },
+      } %>
+      <%= render "govuk_publishing_components/components/button", {
           name: "cookies",
-          text: services_cookies.dig(:no, :text) || "No",
-          data_attributes: { "reject-cookies": "true" }.merge(services_cookies.dig(:no, :data_attributes) || {}),
-        } %>
-        <% if services_cookies[:cookie_preferences] %>
-          <%= link_to services_cookies.dig(:cookie_preferences, :text), services_cookies.dig(:cookie_preferences, :href), class: "govuk-link" %>
-        <% end %>
-      <% else %>
-        <%= render "govuk_publishing_components/components/button", {
-            name: "cookies",
-            text: t("components.cookie_banner.buttons.accept_cookies"),
-            data_attributes: {
-              "accept-cookies": "true",
-              "cookie-types": "all",
-            },
-        } %>
-        <%= render "govuk_publishing_components/components/button", {
-            name: "cookies",
-            text: t("components.cookie_banner.buttons.reject_cookies"),
-            data_attributes: {
-              "reject-cookies": "true",
-            },
-        } %>
-        <a class="govuk-link" href="<%= cookie_preferences_href %>"><%= t("components.cookie_banner.buttons.view_cookies") %></a>
-      <% end %>
+          text: t("components.cookie_banner.buttons.reject_cookies"),
+          data_attributes: {
+            "reject-cookies": "true",
+          },
+      } %>
+      <a class="govuk-link" href="<%= cookie_preferences_href %>"><%= t("components.cookie_banner.buttons.view_cookies") %></a>
     </div>
     <div hidden class="js-hide-button govuk-button-group">
       <%

data/app/views/govuk_publishing_components/components/_layout_for_public.html.erb

@@ -1,6 +1,7 @@
 <%
   emergency_banner ||= nil
   global_banner ||= nil
+  phase_banner ||= nil
   html_lang ||= "en"
   homepage ||= false
   layout_helper = GovukPublishingComponents::Presenters::PublicLayoutHelper.new(local_assigns)
@@ -90,7 +91,8 @@
         <% I18n.with_locale(:en) do %>
           <%= render "govuk_publishing_components/components/layout_super_navigation_header", {
             homepage:,
-            logo_link: logo_link,
+            logo_link:,
+            phase_banner:,
           } %>
         <% end %>
       <% end %>