govuk_publishing_components 24.6.1 → 24.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8b508d510a7aa8f9311afcb0cbb99c28c02b8128e231fbddea0ceac450bda59
-  data.tar.gz: 2fc60e40d72fdb1fd6dfb635782a982e5105c4df41d8a40e71ff2985b669eaed
+  metadata.gz: ed769524a5b5079bce70c275a1cb341e287f5575bdb669b389b045f3aa79e50c
+  data.tar.gz: bf256f385c94da52726c3685d92f42239f08347d9f6506930f5773839ea81b8e
 SHA512:
-  metadata.gz: 2a43864b134f08d16145c1f39ade8bb21de88cfbe9e2f9bb92af0780e2cce92da0381495a61a9d95e40f80d66a6a739ba75ad00b18c975df2f2ccd8232749d2c
-  data.tar.gz: a379f9f22980a8dbddd8e0af9752055ad8f93fd45a144a1a339d153c5670d26e6bbbda904acd13b91c56e0e797a8e9ed5b82cd190dd9926810d2c41d12ba4691
+  metadata.gz: b95c734d8d88b6193ce60fb522787b947b6cefd2d5d35dfa13eb681786155689714b1838f7d67aa6a3fcdf222388a72216a1ec9db78bdf854429356673225026
+  data.tar.gz: f94cb6822b42112e4bc47516a27ffdc302163da8b27c01f9be865f06bdaad146e6d346609bd570f6197993af8e9044aec51deb59042e1a33aa2b1ef0732169c2

data/app/assets/javascripts/component_guide/application.js

@@ -1,2 +1,5 @@
 //= require_tree ./vendor
 //= require_tree .
+//= require ../govuk_publishing_components/dependencies
+//= require ../govuk_publishing_components/components/accordion
+//= require ../govuk_publishing_components/components/tabs

data/app/assets/javascripts/govuk_publishing_components/components/details.js

@@ -1,7 +1,8 @@
 /* eslint-env jquery */
 // = require govuk/components/details/details.js
 window.GOVUK = window.GOVUK || {}
-window.GOVUK.Modules = window.GOVUK.Modules || {};
+window.GOVUK.Modules = window.GOVUK.Modules || {}
+window.GOVUK.Modules.Details = window.GOVUKFrontend;
 
 (function (Modules) {
   function GovukDetails () { }

data/app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js

@@ -25,6 +25,7 @@
     govuk_browser_upgrade_dismisssed: 'settings',
     govuk_not_first_visit: 'settings',
     analytics_next_page_call: 'usage',
+    user_nation: 'settings',
     _ga: 'usage',
     _gid: 'usage',
     _gat: 'usage',

data/app/assets/javascripts/govuk_publishing_components/modules.js

@@ -40,7 +40,9 @@
           module = new GOVUK.Modules[moduleName]()
           module.start(element)
           element.data('module-started', true)
-        } else if ( // GOV.UK Frontend Modules
+        }
+
+        if ( // GOV.UK Frontend Modules
           typeof GOVUK.Modules[frontendModuleName] === 'function' &&
           GOVUK.Modules[frontendModuleName].prototype.init &&
           !started

data/app/assets/stylesheets/component_guide/application.scss

@@ -148,7 +148,7 @@ $gem-guide-border-width: 1px;
 
 .component-guide-preview--simple {
   border: 0;
-  padding: 0;
+  padding: govuk-spacing(2);
 
   &:before {
     display: none;

data/app/assets/stylesheets/govuk_publishing_components/components/_image-card.scss

@@ -59,12 +59,10 @@
 }
 
 .gem-c-image-card__title {
-  @include govuk-font(19, $weight: bold);
   margin: 0;
 }
 
 .gem-c-image-card__title-link {
-  @extend %govuk-link;
   text-decoration: none;
 
   &:hover {
@@ -136,7 +134,6 @@
   }
 
   .gem-c-image-card__list-item-link {
-    @extend %govuk-link;
     line-height: 1.35em;
   }
 
@@ -193,7 +190,6 @@
   }
 
   .gem-c-image-card__title {
-    @include govuk-font(24, $weight: bold);
     padding-bottom: govuk-spacing(2);
   }
 

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-public.scss

@@ -1,4 +1,13 @@
 .gem-c-layout-for-public {
-  margin: 0;
   font-family: $govuk-font-family;
 }
+
+.gem-c-layout-for-public__blue-bar {
+  background: $govuk-brand-colour;
+  height: govuk-spacing(2);
+}
+
+.js-enabled .gem-c-layout-for-public__global-banner-wrapper {
+  margin-top: - govuk-spacing(2);
+  position: relative;
+}

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

@@ -78,12 +78,14 @@
   }
 }
 
-.gem-c-layout-header__search.govuk-grid-column-one-third-from-desktop,
-.gem-c-layout-header__logo.govuk-grid-column-one-third-from-desktop,
-.gem-c-layout-header__search.govuk-grid-column-one-third,
-.gem-c-layout-header__logo.govuk-grid-column-two-thirds {
-  padding-right: 0;
-  padding-left: 0;
+@include govuk-compatibility(govuk_template) {
+  .gem-c-layout-header__search.govuk-grid-column-one-third-from-desktop,
+  .gem-c-layout-header__logo.govuk-grid-column-one-third-from-desktop,
+  .gem-c-layout-header__search.govuk-grid-column-one-third,
+  .gem-c-layout-header__logo.govuk-grid-column-two-thirds {
+    padding-right: 0;
+    padding-left: 0;
+  }
 }
 
 .gem-c-layout-header__logo,
@@ -104,7 +106,6 @@
 
 .gem-c-header__content.govuk-header__content {
   width: auto;
-  padding-left: 0;
 
   @include govuk-media-query($from: desktop) {
     float: right;

data/app/assets/stylesheets/govuk_publishing_components/components/_search.scss

@@ -9,7 +9,6 @@ $large-input-size: 50px;
 .gem-c-search__label {
   @include govuk-font($size: 19, $line-height: $input-size);
   display: block;
-  background: govuk-colour("white");
   color: $govuk-text-colour;
 
   h1 {
@@ -25,6 +24,7 @@ $large-input-size: 50px;
     padding-left: govuk-spacing(3);
     z-index: 1;
     color: $govuk-secondary-text-colour;
+    background: govuk-colour("white");
   }
 
   // match label colour with the label component colour
@@ -144,6 +144,10 @@ $large-input-size: 50px;
 }
 
 .gem-c-search--on-govuk-blue {
+  .gem-c-search__label {
+    color: govuk-colour("white");
+  }
+
   .gem-c-search__input {
     border-width: 0;
 
@@ -191,9 +195,19 @@ $large-input-size: 50px;
 }
 
 .gem-c-search--no-border {
+  .gem-c-search__label {
+    color: govuk-colour("white");
+  }
+
   .gem-c-search__input[type="search"] {
     border: 0;
   }
+
+  .js-enabled & {
+    .gem-c-search__label {
+      color: $govuk-secondary-text-colour;
+    }
+  }
 }
 
 .gem-c-search--large {

data/app/assets/stylesheets/govuk_publishing_components/components/_success-alert.scss

@@ -1,36 +1,5 @@
-.gem-c-success-alert {
-  color: $govuk-text-colour;
-  padding: govuk-spacing(3);
-  border: $govuk-border-width-narrow solid $govuk-success-colour;
-  @include govuk-responsive-margin(8, "bottom");
-
-  @include govuk-media-query($from: tablet) {
-    padding: govuk-spacing(4);
-    border-width: $govuk-border-width;
-  }
-}
+@import "govuk/components/notification-banner/notification-banner";
 
 .gem-c-success-alert__message {
   @include govuk-font(19, $weight: bold);
-  margin: 0;
-}
-
-.gem-c-success-summary__title {
-  margin-top: 0;
-  margin-bottom: govuk-spacing(3);
-
-  @include govuk-media-query($from: tablet) {
-    margin-bottom: govuk-spacing(4);
-  }
-
-  @include govuk-font(24, $weight: bold);
-}
-
-.gem-c-success-summary__body {
-  @include govuk-font(19);
-  margin: 0;
-}
-
-.gem-c-success-alert:focus {
-  outline: $govuk-focus-width solid $govuk-focus-colour;
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_title.scss

@@ -26,10 +26,5 @@
 }
 
 .gem-c-title__text {
-  @extend %govuk-heading-xl;
   margin: 0;
 }
-
-.gem-c-title__text--long {
-  @extend %govuk-heading-l;
-}

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -1,22 +1,7 @@
 module GovukPublishingComponents
   class AuditController < GovukPublishingComponents::ApplicationController
     def show
-      path = Dir.pwd
-
-      components = AuditComponents.new(path)
-      applications = analyse_applications(File.expand_path("..", path))
-      compared_data = AuditComparer.new(components.data, applications)
-
-      @applications = compared_data.applications_data || []
-      @components = compared_data.gem_data || []
-    end
-
-  private
-
-    def analyse_applications(path)
-      results = []
-      applications = %w[
-        calculators
+      application_dirs = %w[
         collections
         collections-publisher
         content-data-admin
@@ -42,10 +27,29 @@ module GovukPublishingComponents
         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
+      gem_path = Dir.pwd if ENV["MAIN_COMPONENT_GUIDE"]
+
+      components = AuditComponents.new(gem_path, false)
+      applications = analyse_applications(File.expand_path("..", gem_path), application_dirs)
+      compared_data = AuditComparer.new(components.data, applications, false)
+
+      @applications = compared_data.applications_data || []
+      @components = compared_data.gem_data || []
+    end
+
+  private
+
+    def analyse_applications(path, application_dirs)
+      results = []
+      @applications_found = false
 
-      applications.each do |application|
+      application_dirs.each do |application|
         application_path = [path, application].join("/")
         app = AuditApplications.new(application_path, application)
+        @applications_found = true if app.data[:application_found]
         results << app.data
       end
 

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -13,6 +13,7 @@ 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
@@ -161,5 +162,13 @@ 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/helpers/govuk_publishing_components/application_helper.rb

@@ -1,4 +1,7 @@
 module GovukPublishingComponents
   module ApplicationHelper
+    def self.get_application_name_from_path(path)
+      path.to_s.split("/")[-1]
+    end
   end
 end

data/app/models/govuk_publishing_components/audit_applications.rb

@@ -86,8 +86,8 @@ module GovukPublishingComponents
           gem_style_references = find_code_references(file, src, /gem-c-[-_a-zA-Z]+/)
           @gem_style_references << gem_style_references if gem_style_references
         end
-      rescue StandardError
-        puts "File #{file} not found"
+      rescue StandardError => e
+        puts e.message
       end
 
       components_found.flatten.uniq.sort
@@ -108,7 +108,7 @@ module GovukPublishingComponents
     end
 
     def find_code_references(file, src, regex)
-      clean_file_path = /(?<=#{Regexp.escape(@path)}\/)[\/a-zA-Z_-]+.[a-zA-Z.]+/
+      clean_file_path = /(?<=#{Regexp.escape(@path.to_s)}\/)[\/a-zA-Z_-]+.[a-zA-Z.]+/
 
       return file[clean_file_path] if regex.match?(src)
     end

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -2,10 +2,10 @@ module GovukPublishingComponents
   class AuditComparer
     attr_reader :applications_data, :gem_data
 
-    def initialize(gem_data, results)
+    def initialize(gem_data, results, simple)
       if gem_data[:gem_found]
         @gem_data = gem_data
-        @applications_data = sort_results(results)
+        @applications_data = sort_results(results, simple)
         @gem_data[:components_by_application] = get_components_by_application || []
       end
     end
@@ -16,7 +16,8 @@ module GovukPublishingComponents
       key.to_s.gsub("_", " ").capitalize
     end
 
-    def sort_results(results)
+    def sort_results(results, simple)
+      @simple = simple
       data = []
 
       results.each do |result|
@@ -40,10 +41,9 @@ module GovukPublishingComponents
           warnings << warn_about_jquery_references(result[:jquery_references])
           warnings = warnings.flatten
 
-          data << {
-            name: result[:name],
-            application_found: result[:application_found],
-            summary: [
+          summary = []
+          unless @simple
+            summary = [
               {
                 name: "Components in templates",
                 value: templates[:components].flatten.uniq.sort.join(", "),
@@ -64,7 +64,13 @@ module GovukPublishingComponents
                 name: "Components in ruby",
                 value: ruby[:components].join(", "),
               },
-            ],
+            ]
+          end
+
+          data << {
+            name: result[:name],
+            application_found: result[:application_found],
+            summary: summary,
             warnings: warnings,
             warning_count: warnings.length,
             gem_style_references: result[:gem_style_references],
@@ -180,6 +186,8 @@ module GovukPublishingComponents
     end
 
     def get_components_by_application
+      return [] if @simple
+
       results = []
       found_something = false
 

data/app/models/govuk_publishing_components/audit_components.rb

@@ -2,16 +2,17 @@ module GovukPublishingComponents
   class AuditComponents
     attr_reader :data
 
-    def initialize(path)
+    def initialize(path, simple)
       @data = {
         gem_found: false,
       }
-      @data = compile_data(path) if Dir.exist?(path)
+      @data = compile_data(path, simple) if Dir.exist?(path)
     end
 
   private
 
-    def compile_data(path)
+    def compile_data(path, simple)
+      @simple = simple
       templates_path = "app/views/govuk_publishing_components/components"
       stylesheets_path = "app/assets/stylesheets/govuk_publishing_components/components"
       print_stylesheets_path = "app/assets/stylesheets/govuk_publishing_components/components/print"
@@ -128,6 +129,8 @@ module GovukPublishingComponents
     end
 
     def list_all_component_details
+      return [] if @simple
+
       all_component_information = []
 
       @components.each do |component|

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

@@ -0,0 +1,126 @@
+<%
+  title = "Applications"
+  title = "This application" unless ENV["MAIN_COMPONENT_GUIDE"]
+%>
+<%= render "govuk_publishing_components/components/heading", {
+  text: title,
+  font_size: "l",
+  margin_bottom: 6
+} %>
+
+<% if @applications.any? %>
+  <%= render "govuk_publishing_components/components/details", {
+    title: "How to use this information"
+  } do %>
+    <p class="govuk-body">This page shows information about component use on GOV.UK. This information has been cross referenced with the components in the gem to produce warnings where e.g. a print stylesheet for a component exists but has not been included in an application.</p>
+    <p class="govuk-body">Warnings should be investigated, although there may be a reason why the application has been configured as it is. Note that 'code' can refer to templates or ruby code.</p>
+  <% end %>
+
+  <%
+    accordion_content = nil
+    summary = nil
+  %>
+  <% application_items = @applications.map do |application| %>
+    <%
+      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
+      end
+    %>
+
+    <% accordion_content = capture do %>
+      <% if application[:application_found] %>
+        <% application[:warnings].each do |warning| %>
+          <p class="govuk-body">
+            <strong class="govuk-tag">Warn</strong>
+            <strong><%= warning[:component] %></strong> - <%= warning[:message] %>
+          </p>
+        <% end %>
+
+        <%= render "govuk_publishing_components/components/heading", {
+          text: "Components used",
+          font_size: "m",
+          margin_bottom: 4,
+          heading_level: 3,
+        } %>
+
+        <dl class="govuk-summary-list">
+          <% application[:summary].each do |item| %>
+            <div class="govuk-summary-list__row">
+              <dt class="govuk-summary-list__key">
+                <%= item[:name] %>
+              </dt>
+              <dd class="govuk-summary-list__value">
+                <% if item[:value].length > 0 %>
+                  <%= item[:value] %>
+                <% else %>
+                  None
+                <% end %>
+              </dd>
+            </div>
+          <% end %>
+        </dl>
+
+        <% if application[:gem_style_references].any? %>
+          <%= render "govuk_publishing_components/components/heading", {
+            text: "Component references",
+            font_size: "m",
+            margin_bottom: 4,
+            heading_level: 3,
+          } %>
+
+          <p class="govuk-body">This shows instances of `gem-c-` classes found in the application. If a reference is found in a stylesheet or in code a warning is created, as this could be a style override or hard coded component markup.</p>
+          <ul class="govuk-list govuk-list--bullet">
+            <% application[:gem_style_references].each do |ref| %>
+              <li><%= ref %></li>
+            <% end %>
+          </ul>
+        <% end %>
+
+        <% if application[:jquery_references].any? %>
+          <%= render "govuk_publishing_components/components/heading", {
+            text: "jQuery references",
+            font_size: "m",
+            margin_bottom: 4,
+            heading_level: 3,
+          } %>
+          <p class="govuk-body">This shows JavaScript files that might contain jQuery, which we are trying to remove our dependency on.</p>
+          <ul class="govuk-list govuk-list--bullet">
+            <% application[:jquery_references].each do |ref| %>
+              <li><%= ref %></li>
+            <% end %>
+          </ul>
+        <% end %>
+      <% else %>
+        <p class="govuk-body">This application was not found. This could be because you do not have this repository checked out locally.</p>
+      <% end %>
+    <% end %>
+
+    <%
+      {
+        heading: {
+          text: application[:name]
+        },
+        summary: {
+          text: sanitize(summary)
+        },
+        content: {
+          html: sanitize(accordion_content)
+        },
+      }
+    %>
+  <% end %>
+
+  <% if ENV["MAIN_COMPONENT_GUIDE"] %>
+    <%= render "govuk_publishing_components/components/accordion", {
+      items: application_items
+    } %>
+  <% else %>
+    <p class="govuk-body"><%= sanitize(summary) %></p>
+    <%= accordion_content %>
+  <% end %>
+<% else %>
+  <p class="govuk-body">No applications found.</p>
+<% end %>