metadata_presenter 2.17.6 → 2.17.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9722d48a8eea856da064648b37d1447c22fd0e664c7f453767db8428c5c531a
-  data.tar.gz: b4876cb90afd67d5b2472891b353a78de4140a71e9f993b95d59c7a71806da20
+  metadata.gz: 7f753356995076aa70b70538d34770ce68b03aa2fe866208cac8cd5b4ad861e9
+  data.tar.gz: 7ed63dece8665708989288145f64518c5a7c925c3c8e5ec55f5bc44487728b97
 SHA512:
-  metadata.gz: 924ac3c6ed42483978084b00c6c5606ab7235dc52ba89b1cd50e5d967b8a68fd3af9be64acf99e239184fef23c64a81ff7719d676d0339c584277194bd0c8563
-  data.tar.gz: 26bd0a2c858982bea3ed755301c5bd4fba7e08d4d2ad89276b7cf37771910ab03e9d533d76c96b1651d837ed5a01d0e5ee1ff5ab83f4a46b4b039a42c5474557
+  metadata.gz: 0f8629f5c3a5cb9e4be7ac9fc7abf2868f45a7e44f10249fdcc8d47e7ee9ceb848c6e3cafa9683f02137fcddd78391e521f19a6a8e2f55dea5218f46da60d003
+  data.tar.gz: ad83b314cdaa5eb1d2f2babcbe2be7d358305fed7b474f194a73fb1c41829e4e578e4c8bdf8cd7ebcd8ca5d040372943aaa94ef76b8b673b6f3458a36216aadc

data/README.md

@@ -83,15 +83,3 @@ service.
 ## Generate documentation
 
 Run `rake doc` and open the doc/index.html
-
-## Flow diagrams
-
-You can generate flow diagrams calling a rake task:
-
-```
-  brew install graphviz
-  SERVICE_METADATA="some-form-metadata" rails metadata:flow
-```
-
-This will generate an image with the flow for that metadata. Open that image
-and profit!

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -41,15 +41,22 @@ module MetadataPresenter
     helper_method :analytics_cookie_name
 
     def allow_analytics?
-      no_analytics_cookie? || cookies[analytics_cookie_name] == 'accepted'
+      cookies[analytics_cookie_name] == 'accepted'
     end
     helper_method :allow_analytics?
 
     def show_cookie_banner?
-      no_analytics_cookie? && analytics_tags_present?
+      no_analytics_cookie?
     end
     helper_method :show_cookie_banner?
 
+    def analytics_tags_present?
+      Rails.application.config.supported_analytics.values.flatten.any? do |analytic|
+        ENV[analytic].present?
+      end
+    end
+    helper_method :analytics_tags_present?
+
     private
 
     def not_found
@@ -60,12 +67,6 @@ module MetadataPresenter
       redirect_to File.join(request.script_name, url)
     end
 
-    def analytics_tags_present?
-      Rails.application.config.supported_analytics.values.flatten.any? do |analytic|
-        ENV[analytic].present?
-      end
-    end
-
     def no_analytics_cookie?
       cookies[analytics_cookie_name].blank?
     end

data/app/views/layouts/metadata_presenter/application.html.erb

@@ -6,6 +6,7 @@
     <%= csp_meta_tag %>
 
   <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+  <meta name="robots" content="noindex">
   <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>" type="image/x-icon" />
   <link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-mask-icon.svg') %>" color="blue">
   <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-180x180.png') %>">
@@ -37,8 +38,7 @@
       </main>
     </div>
     <%= render template: 'metadata_presenter/footer/footer' %>
-
-    <%= javascript_pack_tag 'application' %>
+    <%= javascript_pack_tag 'runner_application' %>
     <%= javascript_pack_tag 'govuk' %>
   </body>
 </html>

data/app/views/metadata_presenter/analytics/_ga4.html.erb

@@ -1,16 +1,8 @@
-<!-- Google Analytics 4 -->
+<!-- Form Owner Google Analytics 4 -->
 <% if Rails.application.config.respond_to?(:global_ga4) %>
-<script>
-  gtag('config', '<%= measurement_id %>');
-</script>
-<% else %>
-<script async src="https://www.googletagmanager.com/gtag/js?id=<%= measurement_id %>"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', '<%= measurement_id %>');
-</script>
+  <%# Global Google Analytics (GA4) should be included before this point so we only need a config setting %>
+  <script>
+    gtag('config', '<%= measurement_id %>');
+  </script>
 <% end %>
-<!-- End Google Analytics 4 -->
+<!-- End Form Owner Google Analytics 4 -->

data/app/views/metadata_presenter/analytics/_global_analytics.html.erb

@@ -1,10 +1,9 @@
 <!-- Global MoJ Forms site tag (gtag.js) - Google Analytics 4 -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=<%= measurement_id %>"></script>
+<script async src="https://www.googletagmanager.com/gtag/js?id=#{global_measurement_id}"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
-
-  gtag('config', '<%= measurement_id %>');
+  gtag('config', '<%= global_measurement_id %>');
 </script>
 <!-- End Global MoJ Forms site tag (gtag.js) - Google Analytics 4 -->

data/app/views/metadata_presenter/analytics/_gtm.html.erb

@@ -1,7 +1,7 @@
-<!-- Google Tag Manager -->
+<!-- Google Tag Manager for Form Owner -->
 <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
 })(window,document,'script','dataLayer','<%= measurement_id %>');</script>
-<!-- End Google Tag Manager -->
+<!-- End Google Tag Manager for Form Owner -->

data/app/views/metadata_presenter/analytics/_ua.html.erb

@@ -1,4 +1,4 @@
-<!-- Google Universal Analytics -->
+<!-- Google Universal Analytics for Form Owner -->
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -8,4 +8,4 @@
   ga('create', '<%= measurement_id %>', 'auto');
   ga('send', 'pageview');
 </script>
-<!-- End Google Universal Analytics -->
+<!-- End Google Universal Analytics for Form Owner -->

data/app/views/metadata_presenter/analytics/analytics.html.erb

@@ -1,7 +1,11 @@
+<%# MoJ Forms Google Analytic Reporting %>
 <% if Rails.application.config.respond_to?(:global_ga4) %>
-  <%= render partial: 'metadata_presenter/analytics/global_analytics', locals: { measurement_id: Rails.application.config.global_ga4 } %>
+  <%= render partial: 'metadata_presenter/analytics/global_analytics', locals: { global_measurement_id: Rails.application.config.global_ga4 } %>
 <% end %>
 
-<% Rails.application.config.supported_analytics.each do |provider, analytics| %>
-  <%= render partial: "metadata_presenter/analytics/#{provider}", locals: { analytics: analytics } %>
+<%# Analytic reporting set by form owners %>
+<% if analytics_tags_present? %>
+  <% Rails.application.config.supported_analytics.each do |provider, analytics| %>
+    <%= render partial: "metadata_presenter/analytics/#{provider}", locals: { analytics: analytics } %>
+  <% end %>
 <% end %>

data/app/views/metadata_presenter/component/_autocomplete.html.erb

@@ -11,4 +11,6 @@
   class: "govuk-!-width-two-thirds"
 %>
 
-<button type="button" class="fb-govuk-button fb-govuk-button-inverted"><%=t('actions.upload_options')%></button>
+<% if editable? %>
+  <%= render partial: '/partials/editable_autocomplete', locals: { component: component } %>
+<% end %>

data/default_metadata/component/upload.json

@@ -18,9 +18,11 @@
       "application/vnd.oasis.opendocument.text",
       "application/pdf",
       "application/rtf",
+      "application/csv",
       "image/jpeg",
       "image/png",
-      "application/vnd.ms-excel"
+      "application/vnd.ms-excel",
+      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
     ]
   }
 }

data/fixtures/version.json

@@ -559,7 +559,8 @@
               "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
               "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
               "application/vnd.ms-word.document.macroEnabled.12",
-              "application/vnd.ms-word.template.macroEnabled.12"
+              "application/vnd.ms-word.template.macroEnabled.12",
+              "application/csv"
             ],
             "max_size": 7340032,
             "virus_scan": true

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.17.6'.freeze
+  VERSION = '2.17.9'.freeze
 end

data/schemas/validations/validations.json

@@ -345,7 +345,8 @@
           "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
           "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
           "application/vnd.ms-word.document.macroEnabled.12",
-          "application/vnd.ms-word.template.macroEnabled.12"
+          "application/vnd.ms-word.template.macroEnabled.12",
+          "application/csv"
         ]
       }
     },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.17.6
+  version: 2.17.9
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -128,20 +128,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-graphviz
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -458,7 +444,6 @@ files:
 - lib/metadata_presenter/engine.rb
 - lib/metadata_presenter/test_helpers.rb
 - lib/metadata_presenter/version.rb
-- lib/tasks/metadata_presenter_tasks.rake
 - schemas/component/autocomplete.json
 - schemas/component/checkboxes.json
 - schemas/component/content.json

data/lib/tasks/metadata_presenter_tasks.rake

@@ -1,89 +0,0 @@
-require 'metadata_presenter/test_helpers'
-
-namespace :metadata do
-  include MetadataPresenter::TestHelpers
-
-  desc 'Represent the flow objects in human readable form'
-  task flow: :environment do
-    require 'ruby-graphviz'
-    metadata = ENV['SERVICE_METADATA'] || metadata_fixture('branching')
-    service = MetadataPresenter::Service.new(metadata)
-
-    graph = MetadataPresenter::Graph.new(service)
-
-    graph.draw.generate_image
-    puts "Generated file #{graph.filename}"
-    system("open #{graph.filename}")
-  end
-end
-
-module MetadataPresenter
-  class Graph
-    attr_reader :service, :filename, :nodes
-
-    delegate :metadata, :start_page, :find_page_by_uuid, :service_slug, to: :service
-
-    def initialize(service)
-      @service = service
-      @graphviz = GraphViz.new(:G, type: :digraph)
-      @filename = Rails.root.join('tmp', "#{service_slug}.png")
-      @nodes = {}
-    end
-
-    def draw
-      draw_nodes
-      draw_edges
-
-      self
-    end
-
-    def generate_image
-      @graphviz.output(png: filename)
-    end
-
-    private
-
-    def draw_nodes
-      flow.each do |id, _value|
-        flow_object = service.flow_object(id)
-
-        if flow_object.branch?
-          full_description = flow_object.conditionals.map.each_with_index do |conditional, _index|
-            conditional.expressions.map { |expression|
-              expression.service = service
-
-              "#{expression.expression_component.humanised_title} #{expression.operator} #{expression.field_label}"
-            }.join(" #{conditional.type} ")
-          end
-          nodes[id] = @graphviz.add_nodes(full_description.flatten.join(' / '))
-        else
-          current_page = find_page_by_uuid(id)
-          nodes[id] = @graphviz.add_nodes(current_page.url)
-        end
-      end
-    end
-
-    def draw_edges
-      flow.each do |id, _value|
-        flow_object = service.flow_object(id)
-        current_node = nodes[id]
-        node_next = nodes[flow_object.default_next]
-
-        if flow_object.branch?
-          @graphviz.add_edges(current_node, node_next, label: 'Conditions are not met', labelfontsize: 8) if node_next
-
-          flow_object.group_by_page.each do |page_uuid, _conditionals|
-            conditionals_node = nodes[page_uuid]
-            @graphviz.add_edges(current_node, conditionals_node, label: 'Conditions are met', labelfontsize: 8) if conditionals_node
-          end
-        elsif node_next
-          @graphviz.add_edges(current_node, node_next)
-        end
-      end
-    end
-
-    def flow
-      service.flow
-    end
-  end
-end