govuk_publishing_components 61.1.0 → 61.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34fc86f0b6984bcd2bb2d4669470ff8268cdc8fedb85addeef526236c3f5abcf
-  data.tar.gz: db1347382632d01113fe792d9b2b4b42758417ea2b2a6aeb8fec94dc73d9c8ef
+  metadata.gz: 869c49b5907a5d053b4e0322c0655b49f3bea3b8e256edec51480aedddbec809
+  data.tar.gz: db4734d7a920ab7f778ab6aac9318f01bbac14ddd6bc7af13be4d00c3ed2b861
 SHA512:
-  metadata.gz: fe96b53f6e688e0b36555eaeda6ac50b7c9760d4db8db8519920b5d3e07fc59046ec8bdb9a4477f671182ac9820ec4ed16006e4edb9552dd5b3f68b09a2cff9c
-  data.tar.gz: 735c8823a24e2d7de30b3874886bb0a21b39cce18c9bb02daa197834ae4e8912ce9671b64b03c1e3d5d94420ea79037ce35df4768e8deb15fb4343110b898027
+  metadata.gz: 45a11f4dee2a31598a64669e23d5c93c1bfd5f061e7db809ae21b52c3cb2a5a4ee1285fb1545950fc1ca923911c9c02f21cd8e35bf7507d3e0d53f0d668324e7
+  data.tar.gz: 2227822f9fbd3d105765f0bd04c8d64d0971de7fda6f6230ebf8f3024dbfd328ddfa6f5ac93694d684b11262a13bdb12bbd7100e87fda079e454a8728738c12d

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-form-tracker.js

@@ -110,16 +110,10 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
       var isTextField = inputTypes.indexOf(inputType) !== -1 || inputNodename === 'TEXTAREA'
       var conditionalField = elem.closest('.govuk-checkboxes__conditional')
-      var conditionalCheckbox = conditionalField && conditionalField.querySelector('[aria-controls="' + conditionalField.id + '"]')
+      var conditionalCheckbox = conditionalField && this.module.querySelector('[aria-controls="' + conditionalField.id + '"]')
       var conditionalCheckboxChecked = conditionalCheckbox && conditionalCheckbox.checked
 
-      if (conditionalField && conditionalCheckboxChecked) {
-        var conditionalCheckboxLabel = conditionalField.querySelector('[for="' + conditionalCheckbox.id + '"]')
-
-        if (conditionalCheckboxLabel) {
-          input.parentSection = conditionalCheckboxLabel.innerText
-        }
-      }
+      var isDateField = elem.closest('.govuk-date-input')
 
       if (conditionalCheckbox && !conditionalCheckboxChecked) {
         // don't include conditional field if condition not checked
@@ -141,10 +135,16 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         }
       } else if (inputNodename === 'SELECT' && elem.querySelectorAll('option:checked')) {
         var selectedOptions = Array.from(elem.querySelectorAll('option:checked')).map(function (element) { return element.text })
-        input.answer = this.useSelectCount ? selectedOptions.length : selectedOptions.join(',')
+
+        if (selectedOptions.length === 1 && !elem.value.length) {
+          // if placeholder value in select, do not include as not filled in
+          inputs.splice(i, 1)
+        } else {
+          input.answer = this.useSelectCount && selectedOptions.length > 1 ? selectedOptions.length : selectedOptions.join(',')
+        }
       } else if (isTextField && elem.value) {
         if (this.includeTextInputValues || elem.hasAttribute('data-ga4-form-include-input')) {
-          if (this.useTextCount) {
+          if (this.useTextCount && !isDateField) {
             input.answer = elem.value.length
           } else {
             var PIIRemover = new window.GOVUK.analyticsGa4.PIIRemover()
@@ -163,6 +163,32 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         // remove the input from those gathered as it has no value
         inputs.splice(i, 1)
       }
+
+      var parentFieldset
+      var parentLegend
+
+      if (conditionalField && conditionalCheckboxChecked) {
+        parentFieldset = conditionalField.closest('fieldset')
+        parentLegend = parentFieldset && parentFieldset.querySelector('legend')
+
+        if (parentLegend) {
+          input.section = parentLegend.innerText + ' - ' + input.section
+        }
+      } else if (isDateField) {
+        var dateFieldset = elem.closest('.govuk-date-input').closest('fieldset')
+        var dateLegend = dateFieldset && dateFieldset.querySelector('legend')
+
+        parentFieldset = dateFieldset.parentNode.closest('fieldset')
+
+        if (dateLegend) {
+          input.section = dateLegend.innerText + ' - ' + input.section
+        }
+
+        if (parentFieldset) {
+          parentLegend = parentFieldset.querySelector('legend')
+          input.section = parentLegend.innerText + ' - ' + input.section
+        }
+      }
     }
     return inputs
   }
@@ -176,17 +202,10 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       if (answer) {
         if (this.recordJson) {
           var fieldSection = data[i].section
-          var parentFieldSection = data[i].parentSection
 
           if (fieldSection) {
-            if (parentFieldSection) {
-              answers[parentFieldSection] = answers[parentFieldSection] || {}
-              answers[parentFieldSection][fieldSection] = answers[parentFieldSection][fieldSection] || ''
-              answers[parentFieldSection][fieldSection] += ((answers[parentFieldSection][fieldSection] ? ',' : '') + answer)
-            } else {
-              answers[fieldSection] = answers[fieldSection] || ''
-              answers[fieldSection] += ((answers[fieldSection] ? ',' : '') + answer)
-            }
+            answers[fieldSection] = answers[fieldSection] ? (answers[fieldSection] + ',') : ''
+            answers[fieldSection] += answer
           }
         } else {
           answers.push(answer)

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

@@ -4,6 +4,13 @@
   font-family: $govuk-font-family;
 }
 
+.gem-c-layout-for-public--draft {
+  background-image: url("govuk_publishing_components/draft-watermark.png");
+  background-repeat: repeat-y;
+  background-position: 50% 0;
+  background-size: contain;
+}
+
 .gem-c-layout-for-public-account-menu {
   margin: 0 0 govuk-spacing(6) 0;
   padding: 0;

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

@@ -27,7 +27,7 @@
   omit_account_phase_banner ||= false
 
   body_css_classes = %w(gem-c-layout-for-public govuk-template__body)
-  body_css_classes << "draft" if draft_watermark
+  body_css_classes << "gem-c-layout-for-public--draft" if draft_watermark
   body_css_classes << "global-banner-present" if global_banner.present?
 -%>
 <!DOCTYPE html>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "61.1.0".freeze
+  VERSION = "61.1.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 61.1.0
+  version: 61.1.2
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -427,6 +427,7 @@ files:
 - app/assets/images/govuk_publishing_components/crests/ukaea_crest_18px_x2.png
 - app/assets/images/govuk_publishing_components/crests/ukho_18px_x2.png
 - app/assets/images/govuk_publishing_components/crests/wales_crest_18px_x2.png
+- app/assets/images/govuk_publishing_components/draft-watermark.png
 - app/assets/images/govuk_publishing_components/favicon-development.png
 - app/assets/images/govuk_publishing_components/favicon-example.png
 - app/assets/images/govuk_publishing_components/favicon-integration.png