metadata_presenter 2.17.5 → 2.17.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 155219213a31ec8767775b4f491cc306452ed2d773e128a105e92f85b2128e52
-  data.tar.gz: e9ec98867eaf689f2766687dba0e69ebb5f4a2adbccbcfee67df85c8c3992eee
+  metadata.gz: fd76b81cc2912dc02d76759ad2ea32cf276786d08a54a3c8b2eab163bc039139
+  data.tar.gz: 283d0486ab6d17e3258ddf7da5603a70adc3591aac3c43c3d646c259b20800a0
 SHA512:
-  metadata.gz: 9b7914d013cdac0ffadaf6a05e1f1f3c446779773d775f66d924754e54d406685a0eccab2e4015bf6ab3594ce39fd0266f11e077a8384ea30ea3d9732e682db0
-  data.tar.gz: 567831ee776a38a1fa5804ae287422334ea39d45e4f2cdf9da66ea0e6b112673673dc8ed935fe5ee0e1b75f7dfd0656f06eb6dab0db1ba771fa089b8d5c15a50
+  metadata.gz: eb930c0728e2c01a503f66074258365110dceb236770dd17598b974fdedb803596937003da48f7079d486e91e67788a0cafd24b522948f6c69dfeaface16a0db
+  data.tar.gz: 0670fa58f9d8076f49c89c6f4e8df5d33b8075fd72a2b0be1f0fd84df0024cc0257566ea7fccfea914d4dee175e2a56a77f96abd90a216d91507b4f90af2ab9f

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/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') %>">

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

@@ -0,0 +1,16 @@
+<%=
+  f.govuk_collection_select component.id.to_sym,
+  component.items,
+  :id,
+  :name,
+  label: { text: input_title },
+  hint:  {
+      data: { "fb-default-text" => default_text('hint') },
+      text: component.hint
+    },
+  class: "govuk-!-width-two-thirds"
+%>
+
+<% if editable? %>
+  <%= render partial: '/partials/editable_autocomplete', locals: { component: component } %>
+<% end %>

data/config/locales/en.yml

@@ -1,8 +1,9 @@
 en:
   actions:
-    start: Start Now
+    start: Start now
     continue: Continue
     submit: Submit
+    upload_options: Upload options
   analytics:
     heading: Cookies on %{service_name}
     body_1: We use some essential cookies to make this service work.

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.5'.freeze
+  VERSION = '2.17.8'.freeze
 end

data/schemas/component/autocomplete.json

@@ -1,18 +1,12 @@
 {
   "$id": "http://gov.uk/schema/v1.0.0/autocomplete",
-  "_name": "autocomplete",
+  "_name": "component.autocomplete",
   "title": "Autocomplete",
   "description": "Let users select one option from an auto-completing list",
   "type": "object",
   "allOf": [
     {
       "$ref": "definition.select"
-    },
-    {
-      "$ref": "definition.field"
-    },
-    {
-      "$ref": "definition.width_class.input"
     }
   ],
   "properties": {

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.5
+  version: 2.17.8
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-07-13 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
@@ -344,6 +330,7 @@ files:
 - app/views/metadata_presenter/attribute/_heading.html.erb
 - app/views/metadata_presenter/attribute/_lede.html.erb
 - app/views/metadata_presenter/attribute/_section_heading.html.erb
+- app/views/metadata_presenter/component/_autocomplete.html.erb
 - app/views/metadata_presenter/component/_checkboxes.html.erb
 - app/views/metadata_presenter/component/_components.html.erb
 - app/views/metadata_presenter/component/_content.html.erb
@@ -457,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