metadata_presenter 1.0.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9c2ec1af85d765a91dbf1e4558828cfa4e04698bc1a53c27753191644e14589
-  data.tar.gz: cc258752398c51cde40f13cc94d0accc72f1fd0a2e7ef5e88a49dc54f847303b
+  metadata.gz: 8159601ef7b12c039633ef169437869d66abd193a70a72c6d3bd5bd83e8e43df
+  data.tar.gz: 117638aa22a6695d528a5c6f390526965dde81247706c9d203705ce85c0e62a4
 SHA512:
-  metadata.gz: 61cafb1d8649b71d35ee3da5a9c6e404da5bed086628f3fa9e5b3c10dda963b6eb67d113e4a6a8bd60c6086d3e3ac06dfa4ad76e7236330513a1922faf8cdb7b
-  data.tar.gz: e985eaf13f0729fa0f2a07a05d650e249435b03d1b13c1dfc2de961fbd385ecbcaafc2c8468e58748749f1a30f98c42b531d8285f99e2705cb46571a8933ae12
+  metadata.gz: f1e2a77178e1f0dba9d1e33562ce50fc1cc1e5f0ffd5c67393fcc9087dc00e703f07be00b23a9088b813fcae2a730c0690e767b1571ae5d56c45dd9ecf49591e
+  data.tar.gz: 27d472e2ad735d502477719935e6f099e6148930e6ecedd370f02211c593d4442ee20d33e481e6ecf583114a36f41289f5cd3840cefdf54bf71c6d3ef54119ab

data/app/controllers/metadata_presenter/answers_controller.rb

@@ -5,6 +5,8 @@ module MetadataPresenter
     def create
       @page_answers = PageAnswers.new(page, answers_params)
 
+      upload_files if upload?
+
       if @page_answers.validate_answers
         save_user_data # method signature
         redirect_to_next_page
@@ -51,5 +53,39 @@ module MetadataPresenter
     def check_page_exists
       not_found if page.blank?
     end
+
+    def upload_files
+      user_data = load_user_data
+      @page_answers.page.upload_components.each do |component|
+        answer = user_data[component.id]
+
+        @page_answers.uploaded_files.push(uploaded_file(answer, component))
+      end
+    end
+
+    def uploaded_file(answer, component)
+      if answer.present?
+        @page_answers.answers[component.id] = answer
+        MetadataPresenter::UploadedFile.new(
+          file: @page_answers.send(component.id),
+          component: component
+        )
+      else
+        FileUploader.new(
+          session: session,
+          page_answers: @page_answers,
+          component: component,
+          adapter: upload_adapter
+        ).upload
+      end
+    end
+
+    def upload_adapter
+      super if defined?(super)
+    end
+
+    def upload?
+      Array(page.components).any?(&:upload?)
+    end
   end
 end

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -17,6 +17,11 @@ module MetadataPresenter
     end
     helper_method :back_link
 
+    def answered?(component_id)
+      @page_answers.send(component_id).present?
+    end
+    helper_method :answered?
+
     private
 
     def not_found

data/app/controllers/metadata_presenter/file_controller.rb

@@ -0,0 +1,12 @@
+module MetadataPresenter
+  class FileController < EngineController
+    def destroy
+      remove_user_data(params[:component_id])
+      redirect_back(fallback_location: root_path)
+    end
+
+    def remove_user_data(component_id)
+      super(component_id) if defined?(super)
+    end
+  end
+end

data/app/controllers/metadata_presenter/submissions_controller.rb

@@ -17,7 +17,7 @@ module MetadataPresenter
       # So in the Runner we defined the #create_submission in the parent
       # controller and in the Editor we don't.
       #
-      if defined? super
+      if defined?(super)
         super
       end
     end

data/app/models/metadata_presenter/component.rb

@@ -16,4 +16,8 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
   def content?
     type == 'content'
   end
+
+  def upload?
+    type == 'upload'
+  end
 end

data/app/models/metadata_presenter/file_uploader.rb

@@ -0,0 +1,18 @@
+module MetadataPresenter
+  class FileUploader
+    include ActiveModel::Model
+    attr_accessor :session, :page_answers, :component, :adapter
+
+    def upload
+      UploadedFile.new(file: upload_file, component: component)
+    end
+
+    def upload_file
+      adapter.new(
+        session: session,
+        file_details: page_answers.send(component.id),
+        allowed_file_types: component.validation['accept']
+      ).call
+    end
+  end
+end

data/app/models/metadata_presenter/metadata.rb

@@ -34,6 +34,10 @@ class MetadataPresenter::Metadata
     value.blank? && editor? ? MetadataPresenter::DefaultText[method_name] : value
   end
 
+  def ==(other)
+    id == other.id if other.respond_to? :id
+  end
+
   def editor?
     @editor.present?
   end

data/app/models/metadata_presenter/offline_upload_adapter.rb

@@ -0,0 +1,10 @@
+module MetadataPresenter
+  class OfflineUploadAdapter
+    include ActiveModel::Model
+    attr_accessor :session, :file_details, :allowed_file_types
+
+    def call
+      {}
+    end
+  end
+end

data/app/models/metadata_presenter/page.rb

@@ -14,10 +14,6 @@ module MetadataPresenter
       add_extra_component
     ].freeze
 
-    def ==(other)
-      id == other.id if other.respond_to? :id
-    end
-
     def editable_attributes
       to_h.reject { |k, _| k.in?(NOT_EDITABLE) }
     end
@@ -58,6 +54,10 @@ module MetadataPresenter
       page_components(raw_type)[:content]
     end
 
+    def upload_components
+      components.select(&:upload?)
+    end
+
     private
 
     def to_components(node_components, collection:)

data/app/models/metadata_presenter/page_answers.rb

@@ -2,10 +2,12 @@ module MetadataPresenter
   class PageAnswers
     include ActiveModel::Model
     include ActiveModel::Validations
+    attr_reader :page, :answers, :uploaded_files
 
     def initialize(page, answers)
       @page = page
       @answers = answers
+      @uploaded_files = []
     end
 
     def validate_answers
@@ -23,11 +25,29 @@ module MetadataPresenter
 
       if component && component.type == 'date'
         date_answer(component.id)
+      elsif component && component.type == 'upload'
+        upload_answer(component.id)
       else
         answers[method_name.to_s]
       end
     end
 
+    def upload_answer(component_id)
+      file_details = answers[component_id.to_s]
+
+      return {} unless file_details
+
+      if file_details.is_a?(Hash) || file_details.is_a?(ActionController::Parameters)
+        file_details
+      else
+        {
+          'original_filename' => file_details.original_filename,
+          'content_type' => file_details.content_type,
+          'tempfile' => file_details.tempfile.path.to_s
+        }
+      end
+    end
+
     def date_answer(component_id)
       date = raw_date_answer(component_id)
 
@@ -43,9 +63,5 @@ module MetadataPresenter
         answers["#{component_id}(#{segment})"]
       end
     end
-
-    private
-
-    attr_reader :page, :answers
   end
 end

data/app/models/metadata_presenter/uploaded_file.rb

@@ -0,0 +1,14 @@
+module MetadataPresenter
+  class UploadedFile
+    include ActiveModel::Model
+    attr_accessor :file, :component
+
+    def ==(other)
+      file == other.file && component == other.component
+    end
+
+    def error_name
+      file.error_name if file.respond_to? :error_name
+    end
+  end
+end

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -79,5 +79,9 @@ module MetadataPresenter
     def checkboxes(value)
       value.join('<br>').html_safe
     end
+
+    def upload(file_hash)
+      file_hash['original_filename']
+    end
   end
 end

data/app/validators/metadata_presenter/accept_validator.rb

@@ -0,0 +1,7 @@
+module MetadataPresenter
+  class AcceptValidator < UploadValidator
+    def error_name
+      'accept'
+    end
+  end
+end

data/app/validators/metadata_presenter/max_size_validator.rb

@@ -0,0 +1,17 @@
+module MetadataPresenter
+  class MaxSizeValidator < UploadValidator
+    def error_name
+      'invalid.too-large'
+    end
+
+    def error_message_hash
+      super.merge(
+        { schema_key.to_sym => human_max_size }
+      )
+    end
+
+    def human_max_size
+      (component.validation[schema_key] / (1024.0 * 1024.0)).round
+    end
+  end
+end

data/app/validators/metadata_presenter/upload_validator.rb

@@ -0,0 +1,20 @@
+module MetadataPresenter
+  class UploadValidator < BaseValidator
+    def invalid_answer?
+      user_answer.error_name == error_name
+    end
+
+    def user_answer
+      page_answers.uploaded_files.find do |uploaded_file|
+        component.id == uploaded_file.component.id
+      end
+    end
+
+    def error_message_hash
+      {
+        control: page_answers.send(component.id)['original_filename'],
+        schema_key.to_sym => component.validation[schema_key]
+      }
+    end
+  end
+end

data/app/validators/metadata_presenter/virus_scan_validator.rb

@@ -0,0 +1,7 @@
+module MetadataPresenter
+  class VirusScanValidator < UploadValidator
+    def error_name
+      'invalid.virus'
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+<% if answered?(component.id) %>
+  <h1 class="govuk-heading-xl"><%= input_title %></h1>
+  <span class="govuk-hint" id="answers-dog-picture-upload-1-hint" data-fb-default-text="<%= default_text('upload_hint') %>">
+    <%= component.hint.present? ? component.hint : default_text('upload_hint') %>
+  </span>
+
+  <p><%= @page_answers.send(component.id)['original_filename'] %></p>
+
+  <p>
+    <%= link_to 'Remove file', remove_file_path(component.id), class: 'govuk-link' %>
+  </p>
+<% else %>
+  <%= f.govuk_file_field component.id.to_sym,
+    label: { text: input_title },
+    hint: {
+        data: { "fb-default-text" => default_text('upload_hint') },
+        text: component.hint.present? ? component.hint : default_text('upload_hint')
+      },
+    accept: component.validation['accept'],
+    disabled: editable?
+  %>
+<% end %>

data/config/initializers/page_components.rb

@@ -17,7 +17,7 @@ Rails.application.config.page_components =
       content: %w(content)
     },
     singlequestion: {
-      input: %w(text textarea number date radios checkboxes),
+      input: %w(text textarea number date radios checkboxes upload),
       content: %w()
      }
   })

data/config/routes.rb

@@ -4,6 +4,10 @@ MetadataPresenter::Engine.routes.draw do
   post '/reserved/submissions', to: 'submissions#create', as: :reserved_submissions
   get '/reserved/change-answer', to: 'change_answer#create', as: :change_answer
 
+  # We are not adding rails ujs to the editor app so we need to make it
+  # as get verb.
+  get '/reserved/file/:component_id', to: 'file#destroy', as: :remove_file
+
   post '/', to: 'answers#create'
   match '*path', to: 'answers#create', via: :post
   match '*path', to: 'pages#show',

data/default_metadata/component/upload.json

@@ -0,0 +1,25 @@
+{
+  "_id": "component.upload",
+  "_type": "upload",
+  "errors": {},
+  "label": "Question",
+  "hint": "Maximum file size is 7MB",
+  "name": "component-name",
+  "validation": {
+    "required": true,
+    "max_size": "7340032",
+    "virus_scan": true,
+    "accept": [
+      "text/csv",
+      "text/plain",
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+      "application/msword",
+      "application/vnd.oasis.opendocument.text",
+      "application/pdf",
+      "application/rtf",
+      "image/jpeg",
+      "image/png",
+      "application/vnd.ms-excel"
+    ]
+  }
+}

data/default_metadata/page/singlequestion.json

@@ -2,7 +2,7 @@
   "_id": "page.singlequestion",
   "_type": "page.singlequestion",
   "section_heading": "",
-  "heading": "Question",
+  "heading": "",
   "lede": "",
   "body": "Body section",
   "components": [],

data/default_metadata/string/error.accept.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.accept",
+  "_type": "string.error",
+  "description": "File uploaded is wrong type",
+  "value": "%{control} was not uploaded successfully as it is the wrong type"
+}

data/default_metadata/string/error.max_size.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.max_size",
+  "_type": "string.error",
+  "description": "File is too large",
+  "value": "The selected file must be smaller than %{max_size}MB."
+}

data/default_metadata/string/error.virus_scan.json

@@ -0,0 +1,7 @@
+{
+  "_id": "error.virus_scan",
+  "_type": "string.error",
+  "description": "File uploaded contains virus",
+  "value": "%{control} was not uploaded successfully because it contains a virus"
+}
+

data/default_text/content.json

@@ -5,5 +5,6 @@
   "content": "[Optional content]",
   "hint": "[Optional hint text]",
   "option": "Option",
-  "option_hint": "[Optional hint text]"
+  "option_hint": "[Optional hint text]",
+  "upload_hint": "Maximum file size is 7MB"
 }

data/fixtures/version.json

@@ -20,6 +20,7 @@
         "page.burgers",
         "page.star-wars-knowledge",
         "page.how-many-lights",
+        "page.dog-picture",
         "page.check-answers",
         "page.confirmation"
       ],
@@ -432,6 +433,71 @@
       "add_component": "content",
       "section_heading": "Chain of Command"
     },
+    {
+      "_id": "page.dog-picture",
+      "url": "dog-picture",
+      "_type": "page.singlequestion",
+      "_uuid": "2ef7d11e-0307-49e9-9fe2-345dc528dd66",
+      "heading": "Question",
+      "components": [
+        {
+          "_id":  "dog-picture_upload_1",
+          "name": "dog-picture_upload_1",
+          "_type": "upload",
+          "_uuid": "f056a76e-ec3f-47ae-b625-1bba92220ad1",
+          "hint": "",
+          "legend": "Upload your best dog photo",
+          "max_files": 1,
+          "validation": {
+            "required": true,
+            "accept": [
+              "audio/*",
+              "image/bmp",
+              "text/csv",
+              "application/vnd.ms-excel",
+              "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+              "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
+              "application/vnd.ms-excel.sheet.macroEnabled.12",
+              "application/vnd.ms-excel.template.macroEnabled.12",
+              "application/vnd.ms-excel.addin.macroEnabled.12",
+              "application/vnd.ms-excel.sheet.binary.macroEnabled.12",
+              "image/gif",
+              "image/*",
+              "application/x-iwork-pages-sffpages",
+              "image/jpeg",
+              "application/pdf",
+              "text/plain",
+              "image/png",
+              "application/vnd.ms-powerpoint",
+              "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+              "application/vnd.openxmlformats-officedocument.presentationml.template",
+              "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
+              "application/vnd.ms-powerpoint.addin.macroEnabled.12",
+              "application/vnd.ms-powerpoint.presentation.macroEnabled.12",
+              "application/vnd.ms-powerpoint.template.macroEnabled.12",
+              "application/vnd.ms-powerpoint.slideshow.macroEnabled.12",
+              "text/rtf",
+              "excel",
+              "csv",
+              "image/svg+xml",
+              "pdf",
+              "word",
+              "rtf",
+              "plaintext",
+              "image/tiff",
+              "video/*",
+              "application/msword",
+              "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"
+            ],
+            "max_size": 7340032,
+            "virus_scan": true
+          }
+        }
+      ]
+    },
     {
       "_id": "page.check-answers",
       "url": "check-answers",
@@ -532,7 +598,7 @@
     {
       "_id": "page.accessibility",
       "url": "accessibility",
-      "body": "This accessibility statement applies to [describe your form here - for example, the general enquiries form for the CICA]. There is a separate [accessibility statement for the main GOV.UK website](https://www.gov.uk/help/accessibility-statement).\r\n\r\n###Using this online form\r\n\r\nThis form was built using MoJ Forms, a tool developed by the Ministry of Justice, and uses components from the [GOV.UK Design System](https://design-system.service.gov.uk/).\r\n\r\n[insert your organisation here] is responsible for the content of this online form. The Ministry of Justice is responsible for its technical aspects.\r\n\r\nWe want as many people as possible to be able to use this online form. For example, that means you should be able to:\r\n\r\n- change colours, contrast levels and fonts\r\n- zoom in up to 300% without the text spilling off the screen\r\n- navigate the form using just a keyboard\r\n- navigate the form using speech recognition software\r\n- listen to the form using a screen reader (including recent versions of JAWS, NVDA and VoiceOver)\r\n\r\nWe’ve also made the text as simple as possible to understand.\r\n\r\n[AbilityNet](https://mcmw.abilitynet.org.uk/) has advice on making your device easier to use if you have a disability.\r\n\r\n###How accessible this form is\r\n\r\nWe know some parts of this form are not fully accessible:\r\n\r\n- pages have no skip links\r\n- the language attribute of the page has not been set in the HTML\r\n- some pages may contain empty headings\r\n- some content may be cut off or appear truncated when zooming in\r\n\r\n###Feedback and contact information\r\n\r\nIf you need information on this website in a different format:\r\n\r\n[insert your contact details for user requests here - add other channels, such as text phones or Relay UK, as required]\r\n\r\n- email: [your email address]\r\n- call: [your telephone number]\r\n- [Hours - e.g. Monday to Friday, 9am to 5pm]\r\n\r\n###Enforcement procedure\r\n\r\nThe Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the ‘accessibility regulations’). If you’re not happy with how we respond to your complaint, contact the [Equality Advisory and Support Service (EASS)](https://www.equalityadvisoryservice.com/).\r\n\r\n###Technical information about this online form’s accessibility\r\n\r\nWe are committed to making our online forms and services accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.\r\n\r\n####Compliance status\r\n\r\nThis online form is partially compliant with the [Web Content Accessibility Guidelines version 2.1 AA standard](https://www.w3.org/TR/WCAG21/), due to the non-compliances listed below.\r\n\r\n###Non-accessible content\r\n\r\nThe content listed below is non-accessible for the following reasons.\r\n\r\n####Non compliance with the accessibility regulations\r\n\r\n1. Pages have no skip links. This issue may affect screen reader and keyboard users who use skip links to bypass repeated content such as headers and navigation menus to skip directly to the main page content.\r\n2. The language attribute of the page has not been set in the HTML. This may cause confusion to screen reader users who may not be able to identify the primary language of the page in their journey.\r\n3. Some pages may contain empty headings, including on the check answers page. As a result, screen reader users may have difficulty navigating these pages.\n4. Some content may be cut off or appear truncated when zooming in. This issue may affect low-vision users navigating the form who use reflow settings to view web pages.\r\n\r\nWe plan to fix these issues by July 2021.\r\n\r\n###Preparation of this accessibility statement\r\n\r\nThis statement was prepared on [date when it was first published]. It was last reviewed on [date when it was last reviewed].\r\n\r\nThis form was last tested on [date when you performed your basic accessibility check].\r\n\r\nIn order to test the compliance of all forms built using the MoJ Forms tool, the Ministry of Justice commissioned The Digital Accessibility Centre (DAC) to carry out a WCAG 2.1 AA level audit of a sample form. This included extensive testing by users with a wide range of disabilities. The audit was performed on 8 April 2021.\r\n\r\nIn addition, this form was tested by [insert team or organisation here]. It was tested using the [WAVE Web Accessibility Evaluation Tool](https://wave.webaim.org/) following guidance from the Ministry of Justice and Government Digital Service (GDS).\r\n\r\n###What we’re doing to improve accessibility\r\n\r\nWe will monitor the accessibility of this website on an ongoing basis and fix any accessibility issues reported to us.",
+      "body": "This accessibility statement applies to [describe your form here - for example, the general enquiries form for the CICA]. There is a separate [accessibility statement for the main GOV.UK website](https://www.gov.uk/help/accessibility-statement).\r\n\r\n###Using this online form\r\n\r\nThis form was built using MoJ Forms, a tool developed by the Ministry of Justice, and uses components from the [GOV.UK Design System](https://design-system.service.gov.uk/).\r\n\r\n[insert your organisation here] is responsible for the content of this online form. The Ministry of Justice is responsible for its technical aspects.\r\n\r\nWe want as many people as possible to be able to use this online form. For example, that means you should be able to:\r\n\r\n- change colours, contrast levels and fonts\r\n- zoom in up to 300% without the text spilling off the screen\r\n- navigate the form using just a keyboard\r\n- navigate the form using speech recognition software\r\n- listen to the form using a screen reader (including recent versions of JAWS, NVDA and VoiceOver)\r\n\r\nWe’ve also made the text as simple as possible to understand.\r\n\r\n[AbilityNet](https://mcmw.abilitynet.org.uk/) has advice on making your device easier to use if you have a disability.\r\n\r\n###Feedback and contact information\r\n\r\nIf you need information on this website in a different format:\r\n\r\n[insert your contact details for user requests here - add other channels, such as text phones or Relay UK, as required]\r\n\r\n- email: [your email address]\r\n- call: [your telephone number]\r\n- [Hours - e.g. Monday to Friday, 9am to 5pm]\r\n\r\nWe'll consider your request and get back to you in [add your SLA - e.g. a week or 5 working days].\r\n\r\n###Reporting accessibility problems with this form\r\n\r\nWe’re always looking to improve the accessibility of this form. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact:\r\n\r\n[insert your contact details for user feedback here - add other channels, such as text phones or Relay UK, as required]\r\n\r\n- email: [your email address]\r\n- call: [your telephone number]\r\n- [Hours - e.g. Monday to Friday, 9am to 5pm]\r\n\r\n###Enforcement procedure\r\n\r\nThe Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the ‘accessibility regulations’). If you’re not happy with how we respond to your complaint, contact the [Equality Advisory and Support Service (EASS)](https://www.equalityadvisoryservice.com/).\r\n\r\n###Technical information about this online form’s accessibility\r\n\r\nWe are committed to making our online forms and services accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.\r\n\r\n####Compliance status\r\n\r\nThis online form is fully compliant with the [Web Content Accessibility Guidelines version 2.1 AA standard](https://www.w3.org/TR/WCAG21/)\r\n\r\n###Preparation of this accessibility statement\r\n\r\nThis statement was prepared on [date when it was first published]. It was last reviewed on [date when it was last reviewed].\r\n\r\nThis form was last tested on [date when you performed your basic accessibility check].\r\n\r\nIn order to test the compliance of all forms built using the MoJ Forms tool, the Ministry of Justice commissioned The Digital Accessibility Centre (DAC) to carry out a WCAG 2.1 AA level audit of a sample form. This included extensive testing by users with a wide range of disabilities. The audit was performed on 8 April 2021. The audit highlighted a number of non-compliance issues which were fixed on 11 May 2021.\r\n\r\nIn addition, this form was tested by [insert team or organisation here]. It was tested using the [WAVE Web Accessibility Evaluation Tool](https://wave.webaim.org/) following guidance from the Ministry of Justice and the Government Digital Service (GDS).\r\n\r\n###What we’re doing to improve accessibility\r\n\r\nWe will monitor the accessibility of this website on an ongoing basis and fix any accessibility issues reported to us.",
       "_type": "page.standalone",
       "_uuid": "c439c7fd-f411-4e11-8598-4023934bac93",
       "heading": "Accessibility statement",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '1.0.8'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/schemas/component/upload.json

@@ -0,0 +1,40 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/upload",
+  "_name": "component.upload",
+  "title": "Upload",
+  "description": "Let users select and upload one or more files",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "upload"
+    },
+    "max_files": {
+      "title": "Maximum number of files",
+      "description": "Maximum number of files a user can upload",
+      "type": "number",
+      "default": 1
+    },
+    "min_files": {
+      "title": "Minimum number of files",
+      "description": "Minimum number of files a user can upload - 1 if required, 0 if not required",
+      "type": "number"
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "definition.field"
+    },
+    {
+      "$ref": "definition.width_class.input"
+    },
+    {
+      "$ref": "validations#/definitions/errors_accept"
+    },
+    {
+      "$ref": "validations#/definitions/errors_max_size"
+    },
+    {
+      "$ref": "validations#/definitions/errors_virus_scan"
+    }
+  ]
+}

data/schemas/validations/validations.json

@@ -58,6 +58,14 @@
         }
       ]
     },
+    "errors_virus_scan": {
+      "title": "Error messages for 'Virus Scan'",
+      "allOf": [
+        {
+          "$ref": "#/definitions/error_strings"
+        }
+      ]
+    },
     "min_length": {
       "title": "Minimum length",
       "description": "The minimum characters users must enter",
@@ -270,6 +278,66 @@
         }
       ]
     },
+    "accept": {
+      "title": "Accepted types",
+      "description": "Which file types to accept",
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": [
+          "audio/*",
+          "image/bmp",
+          "text/csv",
+          "application/vnd.ms-excel",
+          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+          "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
+          "application/vnd.ms-excel.sheet.macroEnabled.12",
+          "application/vnd.ms-excel.template.macroEnabled.12",
+          "application/vnd.ms-excel.addin.macroEnabled.12",
+          "application/vnd.ms-excel.sheet.binary.macroEnabled.12",
+          "image/gif",
+          "image/*",
+          "application/x-iwork-pages-sffpages",
+          "image/jpeg",
+          "applicattion/pdf",
+          "text/plain",
+          "image/png",
+          "application/vnd.ms-powerpoint",
+          "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+          "application/vnd.openxmlformats-officedocument.presentationml.template",
+          "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
+          "application/vnd.ms-powerpoint.addin.macroEnabled.12",
+          "application/vnd.ms-powerpoint.presentation.macroEnabled.12",
+          "application/vnd.ms-powerpoint.template.macroEnabled.12",
+          "application/vnd.ms-powerpoint.slideshow.macroEnabled.12",
+          "text/rtf",
+          "excel",
+          "csv",
+          "image/svg+xml",
+          "pdf",
+          "word",
+          "rtf",
+          "plaintext",
+          "image/tiff",
+          "video/*",
+          "application/msword",
+          "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"
+        ]
+      }
+    },
+    "max_size": {
+      "title": "Maximum size",
+      "description": "Maximum file size as human readable string or bytes",
+      "type": "string"
+    },
+    "virus_scan": {
+      "title": "Virus scan",
+      "description": "Scanning of files for viruses",
+      "type": "boolean"
+    },
     "required_bundle": {
       "properties": {
         "validation": {
@@ -294,43 +362,6 @@
         }
       }
     },
-    "upload_bundle": {
-      "properties": {
-        "validation": {
-          "title": "Validation",
-          "description": "Values for default validation",
-          "role": "validation",
-          "properties": {
-            "accept": {
-              "title": "Accepted types",
-              "description": "Which file types to accept",
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "max_size": {
-              "title": "Maximum size",
-              "description": "Maximum file size as human readable string or bytes",
-              "type": "string"
-            }
-          }
-        },
-        "errors": {
-          "title": "Errors",
-          "description": "Strings to override for default error messages",
-          "role": "error_strings",
-          "properties": {
-            "accept": {
-              "$ref": "#/definitions/errors_accept"
-            },
-            "maxSize": {
-              "$ref": "#/definitions/errors_max_size"
-            }
-          }
-        }
-      }
-    },
     "string_bundle": {
       "properties": {
         "validation": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.3.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
@@ -255,6 +255,7 @@ files:
 - app/controllers/metadata_presenter/answers_controller.rb
 - app/controllers/metadata_presenter/change_answer_controller.rb
 - app/controllers/metadata_presenter/engine_controller.rb
+- app/controllers/metadata_presenter/file_controller.rb
 - app/controllers/metadata_presenter/pages_controller.rb
 - app/controllers/metadata_presenter/service_controller.rb
 - app/controllers/metadata_presenter/submissions_controller.rb
@@ -263,23 +264,30 @@ files:
 - app/jobs/metadata_presenter/application_job.rb
 - app/models/metadata_presenter/component.rb
 - app/models/metadata_presenter/date_field.rb
+- app/models/metadata_presenter/file_uploader.rb
 - app/models/metadata_presenter/item.rb
 - app/models/metadata_presenter/meta.rb
 - app/models/metadata_presenter/meta_item.rb
 - app/models/metadata_presenter/metadata.rb
 - app/models/metadata_presenter/next_page.rb
+- app/models/metadata_presenter/offline_upload_adapter.rb
 - app/models/metadata_presenter/page.rb
 - app/models/metadata_presenter/page_answers.rb
 - app/models/metadata_presenter/service.rb
+- app/models/metadata_presenter/uploaded_file.rb
 - app/presenters/metadata_presenter/page_answers_presenter.rb
+- app/validators/metadata_presenter/accept_validator.rb
 - app/validators/metadata_presenter/base_validator.rb
 - app/validators/metadata_presenter/date_validator.rb
 - app/validators/metadata_presenter/max_length_validator.rb
+- app/validators/metadata_presenter/max_size_validator.rb
 - app/validators/metadata_presenter/min_length_validator.rb
 - app/validators/metadata_presenter/number_validator.rb
 - app/validators/metadata_presenter/required_validator.rb
+- app/validators/metadata_presenter/upload_validator.rb
 - app/validators/metadata_presenter/validate_answers.rb
 - app/validators/metadata_presenter/validate_schema.rb
+- app/validators/metadata_presenter/virus_scan_validator.rb
 - app/views/errors/404.html
 - app/views/layouts/metadata_presenter/application.html.erb
 - app/views/metadata_presenter/attribute/_body.html.erb
@@ -294,6 +302,7 @@ files:
 - app/views/metadata_presenter/component/_radios.html.erb
 - app/views/metadata_presenter/component/_text.html.erb
 - app/views/metadata_presenter/component/_textarea.html.erb
+- app/views/metadata_presenter/component/_upload.html.erb
 - app/views/metadata_presenter/footer/_meta.html.erb
 - app/views/metadata_presenter/footer/footer.html.erb
 - app/views/metadata_presenter/header/show.html.erb
@@ -317,6 +326,7 @@ files:
 - default_metadata/component/radios.json
 - default_metadata/component/text.json
 - default_metadata/component/textarea.json
+- default_metadata/component/upload.json
 - default_metadata/config/meta.json
 - default_metadata/config/service.json
 - default_metadata/definition/checkbox.json
@@ -329,11 +339,14 @@ files:
 - default_metadata/page/standalone.json
 - default_metadata/page/start.json
 - default_metadata/service/base.json
+- default_metadata/string/error.accept.json
 - default_metadata/string/error.date.json
 - default_metadata/string/error.max_length.json
+- default_metadata/string/error.max_size.json
 - default_metadata/string/error.min_length.json
 - default_metadata/string/error.number.json
 - default_metadata/string/error.required.json
+- default_metadata/string/error.virus_scan.json
 - default_text/content.json
 - fixtures/invalid_content_page.json
 - fixtures/no_component_page.json
@@ -352,6 +365,7 @@ files:
 - schemas/component/radios.json
 - schemas/component/text.json
 - schemas/component/textarea.json
+- schemas/component/upload.json
 - schemas/condition/condition.json
 - schemas/config/meta.json
 - schemas/config/service.json