govuk_publishing_components 64.0.0 → 64.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16c3c262e09722b90a73a068ab44323e447d40e7c833b0ef9e060bf113f776f2
-  data.tar.gz: 38303d6dd5e90633a3b7a75126f0b1fcfc51c522417f9efc4f365992cc878171
+  metadata.gz: 5a36e502c34c34ff4f3d4f3c68b2bdc3c73d2e0063e0681113d6fa86419256a1
+  data.tar.gz: e7687186a40332b5fd8466c08bc37eaf061383053d571873b32efb1b19fe2140
 SHA512:
-  metadata.gz: b590dce6cb9e0f0d0b53a0921579325699c0f6911c0bc3aa619293fedaa455bce9b41769c1fb95a662c7210ecb059faff660f50a0f0ac3620124f6151e4fcc7b
-  data.tar.gz: 0b1fbb803c88a2147aa091c46453d44c51ed35612a76f1d7815544a8858fd3f15bf432240ed7766d8831e2111e85597635b51d0157961aaba79eaedefd15ddbb
+  metadata.gz: 4e0e05ae52393e75403160be9fe4243b498d47f9241ef4245d75aad760093c614a9a6c636fa7b256deb1fb785a020f020142df49a06eb79710955689a71ec981
+  data.tar.gz: 0146075f678ac78ee120d4bc495dc7a2251f93b93fd8c0a04478654f29d185151a97fe906db961ee0e46629cd43186031a4474ab95387fe211beca4432c9d2f4

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

@@ -110,13 +110,19 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     let text
 
     if (checkableValue) {
+      const fieldset = checkableValue.closest('fieldset') || null
+      const redactedFieldset = fieldset && fieldset.dataset.ga4Redact
+
       // radio, check, option can have `:checked` pseudo-class
       if (!checkableValue.matches(':checked')) {
         action = 'remove'
       }
 
-      text = checkableValue.innerText ||
-        this.module.querySelector(`label[for='${window.CSS.escape(id)}']`).innerText
+      if (redactedFieldset && !checkableValue.dataset.ga4RedactPermit) {
+        text = '[REDACTED]'
+      } else {
+        text = checkableValue.innerText || this.module.querySelector(`label[for='${window.CSS.escape(id)}']`).innerText
+      }
 
       if (text) {
         text = text.replace(/\r?\n|\r/g, ' ')

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

@@ -83,12 +83,17 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     for (var i = 0; i < labels.length; i++) {
       var label = labels[i]
       var labelFor = label.getAttribute('for')
+      var hiddenInput = label.getAttribute('data-ga4-hidden-input')
       var input = false
-      if (labelFor) {
+
+      if (hiddenInput) {
+        input = this.module.querySelector('[id="' + hiddenInput + '"]')
+      } else if (labelFor) {
         input = this.module.querySelector('[id="' + labelFor + '"]')
       } else {
         input = label.querySelector('input')
       }
+
       inputs.push({
         input: input,
         label: label
@@ -122,9 +127,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         // don't include conditional field control in text
         inputs.splice(i, 1)
       } else if (elem.checked) {
-        input.answer = labelText
+        var fieldset = elem.closest('fieldset') || null
 
-        var fieldset = elem.closest('fieldset')
+        if (fieldset.dataset.ga4Redact && !elem.dataset.ga4RedactPermit) {
+          input.answer = '[REDACTED]'
+        } else {
+          input.answer = labelText
+        }
 
         if (fieldset) {
           var legend = fieldset.querySelector('legend')

data/app/controllers/govuk_publishing_components/applications_page_controller.rb

@@ -40,6 +40,7 @@ module GovukPublishingComponents
             gem_version: app.gem_version,
             gem_version_status: app.gem_version == GovukPublishingComponents::VERSION ? "green" : "red",
             sass_version: app.sass_version,
+            ruby_version: app.ruby_version,
           }
         end
       end

data/app/models/govuk_publishing_components/applications_page.rb

@@ -5,7 +5,8 @@ module GovukPublishingComponents
     def initialize(application)
       @application = application
       @dir = get_directory
-      @gemfilelock = get_gemfile
+      @gemfilelock = get_file("Gemfile.lock")
+      @rubyfile = get_file(".ruby-version")
     end
 
     def readable_name
@@ -20,6 +21,10 @@ module GovukPublishingComponents
       parse_file(@gemfilelock, /sass-embedded \(([^)>=~ ]+)\)/)
     end
 
+    def ruby_version
+      @rubyfile.strip if @rubyfile
+    end
+
   private
 
     def get_directory
@@ -27,20 +32,20 @@ module GovukPublishingComponents
       Dir.exist?(app_dir) ? app_dir : false
     end
 
-    def get_gemfile
-      @dir ? get_gemfile_local : get_gemfile_remote
+    def get_file(name)
+      @dir ? get_local_file(name) : get_remote_file(name)
     end
 
-    def get_gemfile_local
-      lockfile = "#{@dir}/Gemfile.lock"
+    def get_local_file(name)
+      lockfile = "#{@dir}/#{name}"
       return unless File.file?(lockfile)
 
       @source = "local"
       File.read(lockfile)
     end
 
-    def get_gemfile_remote
-      uri = URI("https://raw.githubusercontent.com/alphagov/#{@application}/main/Gemfile.lock")
+    def get_remote_file(name)
+      uri = URI("https://raw.githubusercontent.com/alphagov/#{@application}/main/#{name}")
       result = Net::HTTP.get_response(uri)
       if result.is_a?(Net::HTTPSuccess)
         @source = "remote"

data/app/views/govuk_publishing_components/applications_page/_table-content.html.erb

@@ -28,5 +28,12 @@
         } %>
       <% end %>
     </td>
+    <td class="govuk-table__cell">
+      <% if app[:ruby_version] %>
+        <%= render "govuk_publishing_components/components/tag", {
+          text: app[:ruby_version],
+        } %>
+      <% end %>
+    </td>
   </tr>
 <% end %>

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

@@ -24,6 +24,7 @@
         <th scope="col" class="govuk-table__header sticky-table-header">Source</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Gem version</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Sass version</th>
+        <th scope="col" class="govuk-table__header sticky-table-header">Ruby version</th>
       </tr>
     </thead>
     <tbody class="govuk-table__body">

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

@@ -18,6 +18,10 @@
   heading_level ||= nil
   javascript ||= false
 
+  if javascript
+    label[:data_attributes] = { ga4_hidden_input: "#{id}-input" }
+  end
+
   css_classes = %w(gem-c-file-upload govuk-file-upload)
   css_classes << "govuk-file-upload--error" if has_error
   form_group_css_classes = %w(govuk-form-group)

data/lib/govuk_publishing_components/presenters/machine_readable/faq_page_schema.rb

@@ -24,8 +24,7 @@ module GovukPublishingComponents
       end
 
       def questions_and_answers_markup
-        question_and_answers.select { |_, value| value[:answer].present? }
-                            .map do |question, value|
+        question_and_answers.select { |_, value| value[:answer].present? }.map do |question, value|
           q_and_a_url = section_url(value[:anchor])
 
           {

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "64.0.0".freeze
+  VERSION = "64.1.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 64.0.0
+  version: 64.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -2115,7 +2115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A gem to document components in GOV.UK frontend applications
 test_files: []