govuk_publishing_components 37.10.0 → 38.0.1

data/lib/govuk_publishing_components/presenters/intervention_helper.rb

@@ -27,10 +27,12 @@ module GovukPublishingComponents
       end
 
       def security_attr
-        rel = "noopener noreferrer"
-        rel << " external" unless @suggestion_link_url.start_with?("/", "https://gov.uk", "https://www.gov.uk")
-
-        rel
+        # Link is external unless it begins with "/" (but not "//") or it's on gov.uk.
+        if %r{\A(/[^/]|https://(www\.)?gov\.uk(/|\z))}.match?(@suggestion_link_url)
+          "noopener noreferrer"
+        else
+          "noopener noreferrer external"
+        end
       end
 
       def show?

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -32,7 +32,7 @@ module GovukPublishingComponents
           }
         when :footer
           {
-            "topics" => related_topics_or_taxons,
+            "topics" => related_browse_topics_or_taxons,
             "topical_events" => related_topical_events,
             "world_locations" => related_world_locations,
             "statistical_data_sets" => related_statistical_data_sets,
@@ -44,7 +44,7 @@ module GovukPublishingComponents
             "related_items" => related_items,
             "related_guides" => related_guides,
             "collections" => related_document_collections,
-            "topics" => related_topics_or_taxons,
+            "topics" => related_browse_topics_or_taxons,
             "topical_events" => related_topical_events,
             "world_locations" => related_world_locations,
             "statistical_data_sets" => related_statistical_data_sets,
@@ -142,26 +142,12 @@ module GovukPublishingComponents
         @related_taxons ||= content_item_links_for("taxons", only: "taxon")
       end
 
-      def related_topics_or_taxons
-        return related_topics if related_topics.any?
-        return related_taxons if related_taxons.any?
-
-        []
+      def related_browse_topics_or_taxons
+        related_browse_topics.presence || related_taxons.presence || []
       end
 
-      def related_topics
-        @related_topics ||= begin
-          mainstream_browse_page_links = content_item_links_for("mainstream_browse_pages", only: "mainstream_browse_page")
-          topic_links = content_item_links_for("topics", only: "topic")
-
-          return topic_links if topic_links.present? && mainstream_browse_page_links.empty?
-
-          mainstream_browse_page_links + topic_links.find_all do |topic_link|
-            mainstream_browse_page_links.none? do |mainstream_browse_page_link|
-              mainstream_browse_page_link[:text] == topic_link[:text]
-            end
-          end
-        end
+      def related_browse_topics
+        @related_browse_topics ||= content_item_links_for("mainstream_browse_pages", only: "mainstream_browse_page")
       end
 
       def related_topical_events

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "37.10.0".freeze
+  VERSION = "38.0.1".freeze
 end

data/lib/govuk_publishing_components.rb

@@ -2,6 +2,7 @@ require "active_support"
 require "action_controller"
 require "action_view"
 require "govuk_personalisation"
+require "ostruct"
 require "govuk_publishing_components/config"
 require "govuk_publishing_components/engine"
 require "govuk_publishing_components/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 37.10.0
+  version: 38.0.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -511,7 +511,6 @@ files:
 - app/assets/javascripts/govuk_publishing_components/components/print-link.js
 - app/assets/javascripts/govuk_publishing_components/components/radio.js
 - app/assets/javascripts/govuk_publishing_components/components/reorderable-list.js
-- app/assets/javascripts/govuk_publishing_components/components/show-password.js
 - app/assets/javascripts/govuk_publishing_components/components/single-page-notification-button.js
 - app/assets/javascripts/govuk_publishing_components/components/skip-link.js
 - app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js
@@ -608,7 +607,6 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/_search.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_select.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_share-links.scss
-- app/assets/stylesheets/govuk_publishing_components/components/_show-password.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_signup-link.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_single-page-notification-button.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_skip-link.scss
@@ -748,7 +746,6 @@ files:
 - app/views/govuk_publishing_components/components/_search.html.erb
 - app/views/govuk_publishing_components/components/_select.html.erb
 - app/views/govuk_publishing_components/components/_share_links.html.erb
-- app/views/govuk_publishing_components/components/_show_password.html.erb
 - app/views/govuk_publishing_components/components/_signup_link.html.erb
 - app/views/govuk_publishing_components/components/_single_page_notification_button.html.erb
 - app/views/govuk_publishing_components/components/_skip_link.html.erb
@@ -836,7 +833,6 @@ files:
 - app/views/govuk_publishing_components/components/docs/search.yml
 - app/views/govuk_publishing_components/components/docs/select.yml
 - app/views/govuk_publishing_components/components/docs/share_links.yml
-- app/views/govuk_publishing_components/components/docs/show_password.yml
 - app/views/govuk_publishing_components/components/docs/signup_link.yml
 - app/views/govuk_publishing_components/components/docs/single_page_notification_button.yml
 - app/views/govuk_publishing_components/components/docs/skip_link.yml

data/app/assets/javascripts/govuk_publishing_components/components/show-password.js

@@ -1,82 +0,0 @@
-window.GOVUK = window.GOVUK || {}
-window.GOVUK.Modules = window.GOVUK.Modules || {};
-
-(function (Modules) {
-  function ShowPassword ($module) {
-    this.$module = $module
-    this.input = this.$module.querySelector('.gem-c-input')
-  }
-
-  ShowPassword.prototype.init = function () {
-    this.$module.togglePassword = this.togglePassword.bind(this)
-    this.$module.revertToPasswordOnFormSubmit = this.revertToPasswordOnFormSubmit.bind(this)
-    this.input.classList.add('gem-c-input--with-password')
-
-    this.showPasswordText = this.$module.getAttribute('data-show-text')
-    this.hidePasswordText = this.$module.getAttribute('data-hide-text')
-    this.showPasswordFullText = this.$module.getAttribute('data-show-full-text')
-    this.hidePasswordFullText = this.$module.getAttribute('data-hide-full-text')
-    this.shownPassword = this.$module.getAttribute('data-announce-show')
-    this.hiddenPassword = this.$module.getAttribute('data-announce-hide')
-
-    // wrap the input in a new div
-    this.wrapper = document.createElement('div')
-    this.wrapper.classList.add('gem-c-show-password__input-wrapper')
-    this.input.parentNode.insertBefore(this.wrapper, this.input)
-    this.wrapper.appendChild(this.input)
-
-    // create and append the button
-    this.showHide = document.createElement('button')
-    this.showHide.className = 'gem-c-show-password__toggle'
-    this.showHide.setAttribute('aria-controls', this.input.getAttribute('id'))
-    this.showHide.setAttribute('type', 'button')
-    this.showHide.setAttribute('aria-label', this.showPasswordFullText)
-    this.showHide.innerHTML = this.showPasswordText
-    this.wrapper.insertBefore(this.showHide, this.input.nextSibling)
-
-    // create and append the status text for screen readers
-    this.statusText = document.createElement('span')
-    this.statusText.classList.add('govuk-visually-hidden')
-    this.statusText.innerHTML = this.hiddenPassword
-    this.statusText.setAttribute('aria-live', 'polite')
-    this.wrapper.insertBefore(this.statusText, this.showHide.nextSibling)
-
-    this.showHide.addEventListener('click', this.$module.togglePassword)
-    this.moveDataAttributesToButton()
-
-    this.parentForm = this.input.form
-    var disableFormSubmitCheck = this.$module.getAttribute('data-disable-form-submit-check')
-
-    if (this.parentForm && !disableFormSubmitCheck) {
-      this.parentForm.addEventListener('submit', this.$module.revertToPasswordOnFormSubmit)
-    }
-  }
-
-  ShowPassword.prototype.togglePassword = function (event) {
-    event.preventDefault()
-    this.showHide.innerHTML = this.showHide.innerHTML === this.showPasswordText ? this.hidePasswordText : this.showPasswordText
-    this.showHide.setAttribute('aria-label', this.showHide.getAttribute('aria-label') === this.showPasswordFullText ? this.hidePasswordFullText : this.showPasswordFullText)
-    this.statusText.innerHTML = this.statusText.innerHTML === this.shownPassword ? this.hiddenPassword : this.shownPassword
-    this.input.setAttribute('type', this.input.getAttribute('type') === 'text' ? 'password' : 'text')
-  }
-
-  ShowPassword.prototype.revertToPasswordOnFormSubmit = function (event) {
-    this.showHide.innerHTML = this.showPasswordText
-    this.showHide.setAttribute('aria-label', this.showPasswordFullText)
-    this.statusText.innerHTML = this.hiddenPassword
-    this.input.setAttribute('type', 'password')
-  }
-
-  ShowPassword.prototype.moveDataAttributesToButton = function () {
-    var attrs = this.input.attributes
-    for (var i = attrs.length; i >= 0; i--) {
-      var attr = attrs[i]
-      if (attr && /^data-button/.test(attr.name)) {
-        this.showHide.setAttribute(attr.name.replace('-button', ''), attr.value)
-        this.input.removeAttribute(attr.name)
-      }
-    }
-  }
-
-  Modules.ShowPassword = ShowPassword
-})(window.GOVUK.Modules)

data/app/assets/stylesheets/govuk_publishing_components/components/_show-password.scss

@@ -1,70 +0,0 @@
-@import "govuk_publishing_components/individual_component_support";
-
-.gem-c-show-password__input-wrapper {
-  display: table; // IE fallback
-  display: flex;
-  width: 100%;
-  flex-direction: column;
-
-  @include govuk-media-query($from: mobile) {
-    flex-direction: row;
-  }
-
-  .gem-c-input--with-password {
-    display: table-cell;
-
-    &:focus {
-      z-index: 1;
-    }
-
-    &::-ms-reveal {
-      display: none;
-    }
-  }
-}
-
-.gem-c-show-password__toggle {
-  @include govuk-font(19);
-  z-index: 0;
-  display: table-cell; // IE fallback
-  padding: govuk-spacing(1) govuk-spacing(3);
-  min-width: 5em; // stops the button width jumping when the text changes
-  color: $govuk-link-colour;
-  text-decoration: underline;
-  background: govuk-colour("white");
-  border: solid 2px $govuk-input-border-colour;
-  white-space: nowrap;
-  cursor: pointer;
-
-  @include govuk-media-query($until: mobile) {
-    padding: govuk-spacing(1);
-    width: 100%;
-    margin-top: -2px;
-    white-space: normal;
-  }
-
-  @include govuk-media-query($from: mobile) {
-    margin-left: -2px;
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-
-  &:hover {
-    color: $govuk-link-hover-colour;
-    @include govuk-link-hover-decoration;
-  }
-
-  &:focus {
-    z-index: 1;
-    background: $govuk-focus-colour;
-    color: $govuk-focus-text-colour;
-    outline: 0;
-  }
-
-  &:active {
-    z-index: 1;
-    background: govuk-colour("white");
-    border-color: $govuk-focus-colour;
-    color: $govuk-link-active-colour;
-  }
-}

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

@@ -1,46 +0,0 @@
-<%
-  add_gem_component_stylesheet("show-password")
-
-  disable_form_submit_check ||= false
-  label ||= nil
-  value ||= nil
-  id ||= nil
-  name ||= nil
-  autocomplete = "off" unless ['new-password', 'current-password'].include?(autocomplete)
-  describedby ||= nil
-  hint ||= nil
-  error_message ||= nil
-  error_items ||= nil
-  data ||= nil
-
-  if !label
-    raise ArgumentError, "This component requires a label"
-  end
-%>
-<% if label %>
-  <%= tag.div class: "gem-c-show-password",
-    data: {
-      module: "show-password",
-      disable_form_submit_check: disable_form_submit_check,
-      show_text: t('components.show_password.show'),
-      hide_text: t('components.show_password.hide'),
-      show_full_text: t('components.show_password.show_password'),
-      hide_full_text: t('components.show_password.hide_password'),
-      announce_show: t('components.show_password.announce_show'),
-      announce_hide: t('components.show_password.announce_hide')
-    } do %>
-      <%= render "govuk_publishing_components/components/input", {
-        label: label,
-        value: value,
-        id: id,
-        name: name,
-        describedby: describedby,
-        hint: hint,
-        error_message: error_message,
-        error_items: error_items,
-        type: "password",
-        autocomplete: autocomplete,
-        data: data,
-      } %>
-  <% end %>
-<% end %>

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

@@ -1,91 +0,0 @@
-name: Show password input (experimental)
-description: A password input field that allows the password to be shown.
-body: |
-  Adds a password reveal button to an input that toggles its type from password to text, revealing the password. Does not appear if JavaScript is disabled.
-
-  Uses a visually hidden bit of text to inform screen reader users of the state of the input rather than announcing the content of the password input when toggled.
-
-  This component is currently experimental. If you are using it, please feed back any research findings to the Accounts team.
-accessibility_criteria: |
-  The component must:
-
-  * indicate to the user that the password has been shown or hidden
-
-  Inputs in the component must:
-
-  * accept focus
-  * be focusable with a keyboard
-  * be usable with a keyboard
-  * be usable with touch
-  * indicate when they have focus
-  * be recognisable as form input elements
-  * have correctly associated labels
-  * be of the appropriate type for their use, e.g. password inputs should be of type 'password'
-
-  Buttons in the component must:
-
-  - accept focus
-  - be focusable with a keyboard
-  - indicate when it has focus
-  - activate when focused and space is pressed
-  - activate when focused and enter is pressed
-govuk_frontend_components:
-  - text-input
-examples:
-  default:
-    data:
-      label:
-        text: Please enter your password
-      value: this is my password
-  disable_form_submit_check:
-    description: The component sets the `autocomplete` attribute on the input to `off` so that browsers don't remember the password. This isn't reliable, so the component reverts the input type back to a password when its parent form is submitted. If this is causing conflicts with other JavaScript on your form, you can set `disable-form-submit-check` to `true` to disable this functionality and implement it yourself.
-    data:
-      label:
-        text: Please enter your password
-      value: this is my password
-      disable_form_submit_check: true
-  set_autocomplete_attribute:
-    description: By default, `autocomplete` is set to `off`. This can be set to `new-password` or `current-password` to help browsers differentiate between new and current passwords.
-    data:
-      label:
-        text: Please enter your password
-      autocomplete: "current-password"
-      value: this is my password
-  with_attributes:
-    description: The component accepts many but not all of the options that can be passed to a regular input, including `id`, `name` and `describedby` (not shown).
-    data:
-      label:
-        text: Please enter your password
-      value: this is my password
-      id: custom_id
-      name: custom_name
-  with_hint:
-    data:
-      label:
-        text: Please enter your password
-      value: this is my password
-      hint: Your password must be at least twelve thousand characters
-  with_error:
-    data:
-      label:
-        text: Please enter your password
-      value: this is my password
-      error_message: No it isn't
-  with_error_items:
-    data:
-      label:
-        text: Please enter your password
-      value: this is my password
-      error_items:
-      - text: Look I keep telling you
-      - text: This isn't your password
-  with_data_attributes:
-    description: Data attributes can be passed to add to the input element. If the data attribute starts with `data-button-` this attribute will be applied to the show/hide button, instead of the input. Note that if JavaScript disabled, all attributes are added to the input.
-    data:
-      label:
-        text: Your password
-      data:
-        example_1: value
-        example_2: thing
-        button_example_1: wotsit
-        button_example_2: doodad