govuk_publishing_components 29.8.0 → 29.11.0

data/app/assets/stylesheets/govuk_publishing_components/_all_components_print.scss

@@ -10,6 +10,7 @@
 @import "components/print/govspeak-html-publication";
 @import "components/print/govspeak";
 @import "components/print/layout-super-navigation-header";
+@import "components/print/organisation-logo";
 @import "components/print/step-by-step-nav-header";
 @import "components/print/step-by-step-nav";
 @import "components/print/textarea";

data/app/assets/stylesheets/govuk_publishing_components/components/_contextual-sidebar.scss

@@ -8,6 +8,12 @@
   color: $govuk-text-colour;
 }
 
+.gem-c-contextual-sidebar__list {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
 .gem-c-contextual-sidebar__text {
   @include govuk-font(16);
   margin-bottom: govuk-spacing(1);
@@ -24,3 +30,17 @@
   padding: 0 govuk-spacing(3) govuk-spacing(3);
   text-decoration: none;
 }
+
+.gem-c-contextual-sidebar__cta--ukraine {
+  border-top: 7px solid #fed700;
+  position: relative;
+
+  &:before {
+    content: "";
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: -14px;
+    border-top: 7px solid #4b7ec1;
+  }
+}

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss

@@ -382,10 +382,8 @@ $button-pipe-colour: darken(govuk-colour("mid-grey"), 20%);
         }
 
         .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
-          border-color: $button-pipe-colour;
-
           &:before {
-            @include chevron($button-pipe-colour, true);
+            @include chevron(govuk-colour("mid-grey"), true);
           }
         }
       }
@@ -464,7 +462,7 @@ $button-pipe-colour: darken(govuk-colour("mid-grey"), 20%);
 .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
   @include govuk-media-query($from: "desktop") {
     display: inline-block;
-    padding: govuk-spacing(2) govuk-spacing(6) govuk-spacing(2) govuk-spacing(5);
+    padding: govuk-spacing(1) govuk-spacing(6) govuk-spacing(1) govuk-spacing(5);
   }
 }
 
@@ -608,10 +606,6 @@ $button-pipe-colour: darken(govuk-colour("mid-grey"), 20%);
     }
   }
 
-  &:after {
-    @include pseudo-underline;
-  }
-
   // Open button modifier
   &.gem-c-layout-super-navigation-header__open-button {
     // stylelint-disable max-nesting-depth
@@ -771,6 +765,7 @@ $button-pipe-colour: darken(govuk-colour("mid-grey"), 20%);
   background: govuk-colour("light-grey");
 
   @include govuk-media-query($from: "desktop") {
+    border-bottom: 1px govuk-colour("mid-grey") solid;
     left: 0;
     position: absolute;
     right: 0;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_attachment.scss

@@ -37,7 +37,8 @@
       margin-left: -($thumbnail-width + govuk-spacing(6) - $govuk-border-width);
       padding-bottom: govuk-spacing(3);
 
-      img {
+      img,
+      svg {
         display: block;
         width: $thumbnail-width;
         height: 140px;
@@ -56,6 +57,11 @@
 
         box-shadow: 0 2px 2px rgba(govuk-colour("black"), .4);
       }
+
+      svg {
+        fill: govuk-colour("mid-grey", $legacy: "grey-3");
+        stroke: govuk-colour("mid-grey", $legacy: "grey-3");
+      }
     }
 
     .attachment-details {

data/app/assets/stylesheets/govuk_publishing_components/components/print/_organisation-logo.scss

@@ -1,3 +1,7 @@
+.gem-c-organisation-logo {
+  width: 25%;
+}
+
 .gem-c-organisation-logo__image {
   max-width: 100%;
 }

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -24,7 +24,8 @@ module GovukPublishingComponents
         static
         travel-advice-publisher
         whitehall
-      ].sort
+      ]
+
       application_dirs = [GovukPublishingComponents::ApplicationHelper.get_application_name_from_path(Rails.root)] unless ENV["MAIN_COMPONENT_GUIDE"]
 
       gem_path = Gem.loaded_specs["govuk_publishing_components"].full_gem_path
@@ -36,7 +37,7 @@ module GovukPublishingComponents
 
       components = AuditComponents.new(gem_path, false)
       applications = analyse_applications(host_dir, application_dirs)
-      compared_data = AuditComparer.new(components.data, applications, false)
+      compared_data = AuditComparer.new(components.data, applications)
 
       @applications = compared_data.applications_data || []
       @components = compared_data.gem_data || []

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -13,7 +13,6 @@ module GovukPublishingComponents
       @components_in_use_sass = components_in_use_sass(false)
       @components_in_use_print_sass = components_in_use_sass(true)
       @components_in_use_js = components_in_use_js
-      @index_audit_summary = index_audit_summary
     end
 
     def show
@@ -162,13 +161,5 @@ module GovukPublishingComponents
         h[:url] = component_doc_path(component_doc.id) if component_example
       end
     end
-
-    def index_audit_summary
-      components_gem_path = Gem.loaded_specs["govuk_publishing_components"].full_gem_path
-      components = AuditComponents.new(components_gem_path, true)
-      application = AuditApplications.new(@application_path, GovukPublishingComponents::ApplicationHelper.get_application_name_from_path(@application_path))
-      compared_data = AuditComparer.new(components.data, [application.data], true)
-      compared_data.applications_data[0]
-    end
   end
 end

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -2,26 +2,59 @@ module GovukPublishingComponents
   class AuditComparer
     attr_reader :applications_data, :gem_data
 
-    def initialize(gem_data, results, simple)
+    def initialize(gem_data, results)
       if gem_data[:gem_found]
+        @applications_using_static = %w[
+          collections
+          email-alert-frontend
+          feedback
+          finder-frontend
+          frontend
+          government-frontend
+          info-frontend
+          licence-finder
+          manuals-frontend
+          service-manual-frontend
+          smart-answers
+          whitehall
+        ]
+
+        @static_data = find_static(results)
         @gem_data = gem_data
-        @applications_data = sort_results(results, simple)
+        @applications_data = sort_results(results)
         @gem_data[:components_by_application] = get_components_by_application || []
       end
     end
 
   private
 
+    # find static to check for global includes, reduce false warnings
+    def find_static(results)
+      results.each do |result|
+        if result[:name] == "static" && result[:application_found] == true
+          return clean_static(result)
+        end
+      end
+
+      false
+    end
+
+    # turn static data into an object so locations can be easily referenced
+    # should give object of form { "templates" => [], "stylesheets" => [] }
+    def clean_static(data)
+      Hash[data[:components_found].map { |d| [d[:location], d[:components]] }]
+    end
+
     def prettify_key(key)
       key.to_s.gsub("_", " ").capitalize
     end
 
-    def sort_results(results, simple)
-      @simple = simple
+    def sort_results(results)
       data = []
 
       results.each do |result|
         if result[:application_found]
+          application_uses_static = @applications_using_static.include?(result[:name])
           templates = result[:components_found].find { |c| c[:location] == "templates" }
           stylesheets = result[:components_found].find { |c| c[:location] == "stylesheets" }
           print_stylesheets = result[:components_found].find { |c| c[:location] == "print_stylesheets" }
@@ -39,37 +72,36 @@ module GovukPublishingComponents
           warnings << warn_about_missing_assets(result[:components_found])
           warnings << warn_about_style_overrides(result[:gem_style_references])
           warnings << warn_about_jquery_references(result[:jquery_references])
+          warnings << check_for_assets_already_in_static(result[:components_found]) if @static_data && application_uses_static
           warnings = warnings.flatten
 
-          summary = []
-          unless @simple
-            summary = [
-              {
-                name: "Components in templates",
-                value: templates[:components].flatten.uniq.sort.join(", "),
-              },
-              {
-                name: "Components in stylesheets",
-                value: stylesheets[:components].join(", "),
-              },
-              {
-                name: "Components in print stylesheets",
-                value: print_stylesheets[:components].join(", "),
-              },
-              {
-                name: "Components in javascripts",
-                value: javascripts[:components].join(", "),
-              },
-              {
-                name: "Components in ruby",
-                value: ruby[:components].join(", "),
-              },
-            ]
-          end
+          summary = [
+            {
+              name: "Components in templates",
+              value: templates[:components].flatten.uniq.sort.join(", "),
+            },
+            {
+              name: "Components in stylesheets",
+              value: stylesheets[:components].join(", "),
+            },
+            {
+              name: "Components in print stylesheets",
+              value: print_stylesheets[:components].join(", "),
+            },
+            {
+              name: "Components in javascripts",
+              value: javascripts[:components].join(", "),
+            },
+            {
+              name: "Components in ruby",
+              value: ruby[:components].join(", "),
+            },
+          ]
 
           data << {
             name: result[:name],
             application_found: result[:application_found],
+            uses_static: application_uses_static,
             summary: summary,
             warnings: warnings,
             warning_count: warnings.length,
@@ -102,6 +134,7 @@ module GovukPublishingComponents
       }
     end
 
+    # given two groups of components, check the difference
     def find_missing_items(first_group, second_group)
       warnings = []
 
@@ -111,14 +144,20 @@ module GovukPublishingComponents
         second_group.each do |second|
           second_location = second[:location]
           second_location = "code" if %w[templates ruby].include?(second_location)
+          # subtract one group from the other, leaving only those not in both
           in_current = find_missing(second[:components].clone, first[:components].clone)
 
           next if second[:components].include?("all")
 
+          # now we have a list of 'missing' component assets, check the gem to see if that asset exists
           in_current.each do |component|
-            if @gem_data.include?("component_#{second_location}".to_sym) && @gem_data["component_#{second_location}".to_sym].include?(component)
-              warnings << create_warning(component, "Included in #{first_location} but not #{second_location}")
-            end
+            asset_in_gem = @gem_data.include?("component_#{second_location}".to_sym) && @gem_data["component_#{second_location}".to_sym].include?(component)
+            check_static = @static_data && second_location != "code"
+            asset_in_static = asset_already_in_static(second_location, component) if check_static
+            raise_warning = asset_in_gem && !asset_in_static
+
+            # this raises a warning if the asset exists and isn't included either in the application or static
+            warnings << create_warning(component, "Included in #{first_location} but not #{second_location}") if raise_warning
           end
         end
       end
@@ -126,6 +165,27 @@ module GovukPublishingComponents
       warnings
     end
 
+    def asset_already_in_static(location, component)
+      return true if @static_data[location].include?(component)
+
+      false
+    end
+
+    def check_for_assets_already_in_static(locations)
+      warnings = []
+
+      locations.each do |location|
+        next if location[:location] == "templates" || location[:location] == "ruby"
+
+        location[:components].each do |component|
+          raise_warning = asset_already_in_static(location[:location], component)
+          warnings << create_warning(component, "Included in #{location[:location]} but already included in static") if raise_warning
+        end
+      end
+
+      warnings
+    end
+
     def warn_about_missing_assets(components)
       warnings = []
 
@@ -186,8 +246,6 @@ module GovukPublishingComponents
     end
 
     def get_components_by_application
-      return [] if @simple
-
       results = []
       found_something = false
 

data/app/views/govuk_publishing_components/audit/_applications.html.erb

@@ -22,22 +22,33 @@
   %>
   <% application_items = @applications.map do |application| %>
     <%
-      summary = '<strong class="govuk-tag govuk-tag--red">Application not found</strong>'
+      if @other_applications
+        summary = '<strong class="govuk-tag govuk-tag--red">Application not found</strong>'
 
-      if application[:application_found]
-        summary = "Warnings: 0"
-        summary = "Warnings: <strong class=\"govuk-tag govuk-tag--red\">#{application[:warning_count]}</strong>" if application[:warning_count] > 0
+        if application[:application_found]
+          summary = "Warnings: 0"
+          summary = "Warnings: <strong class=\"govuk-tag govuk-tag--red\">#{application[:warning_count]}</strong>" if application[:warning_count] > 0
+        end
       end
     %>
 
     <% accordion_content = capture do %>
       <% if application[:application_found] %>
         <% github_link = 'https://github.com/alphagov/' + application[:name] + '/blob/main/' %>
-        <% application[:warnings].each do |warning| %>
-          <p class="govuk-body">
-            <strong class="govuk-tag">Warn</strong>
-            <strong><%= warning[:component] %></strong> - <%= warning[:message] %>
-          </p>
+
+        <% if @other_applications %>
+          <% if application[:uses_static] %>
+            <p class="govuk-body">This application uses <a href="https://github.com/alphagov/static" class="govuk-link">static</a>, which can contain assets for components used in more than one application. Warnings for missing component assets in this application that are already included in static have been suppressed.</p>
+          <% end %>
+
+          <% application[:warnings].each do |warning| %>
+            <p class="govuk-body">
+              <strong class="govuk-tag">Warn</strong>
+              <strong><%= warning[:component] %></strong> - <%= warning[:message] %>
+            </p>
+          <% end %>
+        <% else %>
+          <p class="govuk-body">More information about this application is available by viewing the component guide from a locally running instance of govuk_publishing_components.</p>
         <% end %>
 
         <%= render "govuk_publishing_components/components/heading", {

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

@@ -1,29 +1,11 @@
 <%= render 'govuk_publishing_components/components/title', title: GovukPublishingComponents::Config.component_guide_title, margin_top: 0 %>
 
-<% unless ENV["MAIN_COMPONENT_GUIDE"] %>
-  <p class="govuk-body">
-    <% if @index_audit_summary[:application_found] %>
-      Warnings:
-      <% if @index_audit_summary[:warning_count] > 0 %>
-        <strong class="govuk-tag govuk-tag--red"><%= @index_audit_summary[:warning_count] %></strong>
-      <% else %>
-        <%= @index_audit_summary[:warning_count] %>
-      <% end %>
-      <a href="/component-guide/audit" class="govuk-link">Warning details</a>
-    <% else %>
-      <strong class="govuk-tag govuk-tag--red">Application not found</strong>
-    <% end %>
-  </p>
-<% end %>
-
 <div class="component-markdown">
   <p>Components are packages of template, style, behaviour and documentation that live in your application.</p>
   <p>See the <a href="https://github.com/alphagov/govuk_publishing_components">govuk_publishing_components gem</a> for further details, or <a href="https://docs.publishing.service.gov.uk/manual/components.html#component-guides">a list of all component guides</a>.</p>
   <ul>
     <li>Read about how to <a href="https://github.com/alphagov/govuk_publishing_components/blob/main/docs/publishing-to-rubygems.md">release a new version of the gem</a></li>
-    <% if ENV["MAIN_COMPONENT_GUIDE"] %>
-      <li><a href="/component-guide/audit">View component audits</a></li>
-    <% end %>
+    <li><a href="/component-guide/audit">View component audits</a></li>
   </ul>
 </div>
 

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

@@ -27,6 +27,9 @@
   data_attributes[:track_show_all_clicks] = track_show_all_clicks
   data_attributes[:track_sections] = track_sections
 
+  data_attributes_show_all ||= nil
+  data_attributes[:show_all_attributes] = data_attributes_show_all if data_attributes_show_all
+
   translations.each do |key, translation|
     locales[key] = shared_helper.t_locale(translation)
     data_attributes[key] = t(translation)
@@ -47,8 +50,8 @@
   <%= tag.div(class: accordion_classes, id: id, data: data_attributes) do %>
     <% items.each_with_index do |item, i| %>
       <%
-        # The GOVUK Frontend JavaScript for this component 
-        # uses a loop starting at 1 for accessing heading ID values, 
+        # The GOVUK Frontend JavaScript for this component
+        # uses a loop starting at 1 for accessing heading ID values,
         # hence the increment below
         index = i + 1
 
@@ -65,11 +68,10 @@
             content_tag(
               shared_helper.get_heading_level,
               content_tag(
-                'span', 
-                item[:heading][:text], 
+                'span',
+                item[:heading][:text],
                 class: "govuk-accordion__section-button",
                 id: "#{id}-heading-#{index}"
-                
               ),
               class: "govuk-accordion__section-heading",
               id: item[:heading][:id],

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

@@ -17,7 +17,7 @@
 
     <%= render "govuk_publishing_components/components/textarea", { id: id, character_count: true }.merge(textarea.symbolize_keys) %>
 
-    <div id="<%= id %>-info" class="govuk-hint govuk-character-count__message" aria-live="polite">
+    <div id="<%= id %>-info" class="govuk-hint govuk-character-count__message">
       <%= t("components.character_count.body", number: maxlength || maxwords, type: maxwords ? t("components.character_count.type.words") : t("components.character_count.type.characters")) %>
     </div>
   <% end %>

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

@@ -29,7 +29,6 @@
     aria_described_by << describedby if describedby
     aria_described_by = aria_described_by.join(" ")
   end
-
 %>
 
 <%= content_tag :div, class: form_group_css_classes do %>

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

@@ -62,9 +62,7 @@
   if type == "number"
     type = "text"
     inputmode = "numeric"
-    pattern = "[0-9]*"
   end
-
 %>
 
 <%= content_tag :div, class: form_group_css_classes do %>

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

@@ -78,11 +78,29 @@
             d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145"
           />
         </svg>
-        <span class="govuk-footer__licence-description">
+        <% # this is to avoid having hardcoded data attributes in locale files %>
+        <span
+          class="govuk-footer__licence-description"
+          data-module="gem-track-click"
+          data-track-action="copyrightLink"
+          data-track-category="footerClicked"
+          data-track-label="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
+          data-track-options='{"dimension29": "Open Government Licence v3.0"}'
+          data-track-links-only
+        >
           <%= t("components.layout_footer.licence_html") %>
         </span>
       </div>
-      <div class="govuk-footer__meta-item">
+      <% # this is to avoid having hardcoded data attributes in locale files %>
+      <div
+        class="govuk-footer__meta-item"
+        data-module="gem-track-click"
+        data-track-action="copyrightLink"
+        data-track-category="footerClicked"
+        data-track-label="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/"
+        data-track-options='{"dimension29": "© Crown copyright"}'
+        data-track-links-only
+      >
         <%= t("components.layout_footer.copyright_html") %>
       </div>
     </div>

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

@@ -107,20 +107,19 @@
             <% if edit_link && delete_link %>
               <%= tag.dd class: "govuk-summary-list__actions" do %>
                 <%= tag.ul class: "govuk-summary-list__actions-list" do %>
-                  <% if item.fetch(:edit, {}).any? %>
+                  <% if edit_link %>
                     <%= tag.li class: "govuk-summary-list__actions-list-item" do %>
                       <%= edit_link %>
                     <% end %>
                   <% end %>
-                  <% if item.fetch(:delete, {}).any? %>
+                  <% if delete_link %>
                     <%= tag.li class: "govuk-summary-list__actions-list-item" do %>
                       <%= delete_link %>
                     <% end %>
                   <% end %>
                 <% end %>
               <% end %>
-            <% else %>
-            <% if edit_link || delete_link %>
+            <% elsif edit_link || delete_link %>
               <%= tag.dd class: "govuk-summary-list__actions" do %>
                 <%= edit_link %>
                 <%= delete_link %>
@@ -130,7 +129,7 @@
         <% end %>
       <% end %>
     <% end %>
-  <% end %>
+
     <%= tag.div block, class: "gem-c-summary__block" if block %>
     <% end %>
 <% end %>

data/app/views/govuk_publishing_components/components/contextual_sidebar/_ukraine_cta.html.erb

@@ -1,27 +1,26 @@
 <% shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) %>
 <%
   title = t("components.related_navigation.ukraine.title")
-  link_text = t("components.related_navigation.ukraine.link_text")
-  link_path = t("components.related_navigation.ukraine.link_path")
   lang = shared_helper.t_locale("components.related_navigation.ukraine.title")
 %>
 
-<% data_attributes = {
-  "module": "gem-track-click",
-  "track-category": "relatedLinkClicked",
-  "track-action": "1.0 Invasion of Ukraine",
-  "track-label": link_path,
-  "track-dimension": link_text,
-  "track-dimension-index": "29",
-} %>
-
-<%= tag.div class: "gem-c-contextual-sidebar__cta" do %>
+<%= tag.div class: "gem-c-contextual-sidebar__cta gem-c-contextual-sidebar__cta--ukraine", data: { module: "gem-track-click" } do %>
   <%= tag.h2 title, class: "gem-c-contextual-sidebar__heading govuk-heading-s" %>
-  <%= tag.p class: "gem-c-contextual-sidebar__text govuk-body" do %>
-    <%= link_to link_text,
-      link_path,
-      class: "govuk-link",
-      data: data_attributes,
-      lang: lang %>
-  <% end %>
+  <%= tag.ul class: "gem-c-contextual-sidebar__list" do %>
+    <% t("components.related_navigation.ukraine.links").each do |link| %>
+      <%= tag.li class: "gem-c-contextual-sidebar__text govuk-body" do %>
+        <%= link_to link[:label],
+          link[:href],
+          class: "govuk-link",
+          data: {
+            "track-category": "relatedLinkClicked",
+            "track-action": "1.0 Invasion of Ukraine",
+            "track-label": link[:href],
+            "track-dimension": link[:label],
+            "track-dimension-index": "29",
+          },
+          lang: lang %>
+      <% end %>
+    <% end %>
+  <% end %>    
 <% end %>