metadata_presenter 3.0.15 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748d688aee936ddbfc93a68c3ee6d658938987562b238f815ef852184751d26d
-  data.tar.gz: 509757afa039a05d98e142e8fb47930063063af1c2117e8b9cbb2a317a7b198e
+  metadata.gz: e690363ac373962c0478469b6b501d6ecc255473d6bbd04aff6cf012aa098843
+  data.tar.gz: 907eced7e4a09a2b247130deb082ef5c05766dd3d995d18483c69d5dcb8babf7
 SHA512:
-  metadata.gz: fe3620821903ecd6d4f44a9cf6535a9c8dbba7bfc03da4e92b6e19557e423058d549f1edcf8c1124aba9e72042c410e16b997e2e14203a82cc112211de1e9904
-  data.tar.gz: 34fe18437640f2cccdfebfb04c67164181b2c00bf98d549719bf62b0b02bd8478211ed12f464c9105ee587e3cc325ae44a67a98b95f7a62ed21992bf430b92d8
+  metadata.gz: a061114f4db7608516af2da01234bedd45b11708c47c9f693ebffa0b13d7f1fe2814313ce79bfc4bf555b2db3526d63743193789297e1bf2f3d8a87ec6611a40
+  data.tar.gz: 78b39e5035fe137a52b83c2b3f6a42edcc72c2d921247a67f6958608acf2a5df8ba15795986e56f5d75e602c530a1d83005c30a89d51c0ce1362f2ce9984be91

data/app/controllers/metadata_presenter/answers_controller.rb

@@ -4,30 +4,85 @@ module MetadataPresenter
 
     def create
       @previous_answers = reload_user_data.deep_dup
-      @page_answers = PageAnswers.new(page, answers_params, autocomplete_items(page.components))
+
+      @page_answers = PageAnswers.new(page, incoming_answer, autocomplete_items(page.components))
 
       if params[:save_for_later].present?
-        save_user_data
-        # NOTE: if the user is on a file upload page, files will not be uploaded before redirection
+        save_user_data unless upload? || multiupload?
+
         redirect_to save_path(page_slug: params[:page_slug]) and return
       end
 
       upload_files if upload?
+      upload_multiupload_new_files if multiupload? && answers_params.present?
 
       if @page_answers.validate_answers
         save_user_data # method signature
+
+        # if adding another file in multi upload, redirect back to referrer
+        if about_to_render_multiupload?
+          redirect_back(fallback_location: root_path) and return
+        end
+
         redirect_to_next_page
       else
+        # can't render error in the same way for the multiupload component
+        if about_to_render_multiupload?
+          @user_data = @previous_answers
+
+          render template: @page.template, status: :unprocessable_entity and return
+        end
         render_validation_error
       end
     end
 
+    def about_to_render_multiupload?
+      answers_params.present? && multiupload?
+    end
+
     def update_count_matching_filenames(original_filename, user_data)
       extname = File.extname(original_filename)
       basename = File.basename(original_filename, extname)
       filename_regex = /^#{Regexp.quote(basename)}(?>-\((\d)\))?#{Regexp.quote(extname)}/
 
-      user_data.select { |_k, v| v.instance_of?(Hash) && v['original_filename'] =~ filename_regex }.count
+      user_data.select { |_k, v|
+        if v.is_a?(Array)
+          v.any? { |e| e['original_filename'] =~ filename_regex }
+        else
+          v['original_filename'] =~ filename_regex
+        end
+      }.count
+    end
+
+    def upload_multiupload_new_files
+      user_data = load_user_data
+      @page_answers.page.multiupload_components.each do |component|
+        previous_answers = user_data[component.id]
+        incoming_filename = @page_answers.send(component.id)[component.id].last['original_filename']
+
+        if editor_preview?
+          @page_answers.uploaded_files.push(multiuploaded_file(previous_answers, component))
+        else
+
+          if incoming_filename.present?
+            # determine if duplicate filename from any other user answer
+            @page_answers.count = update_count_matching_filenames(incoming_filename, user_data)
+          end
+
+          if previous_answers.present? && previous_answers.any? { |answer| answer['original_filename'] == incoming_answer.incoming_answer.values.first.original_filename }
+            @page_answers.count = nil # ensure we don't also try to suffix this filename as we will reject it anyway
+            file = MetadataPresenter::UploadedFile.new(
+              file: @page_answers.send(component.id)[component.id].last,
+              component:
+            )
+
+            file.errors.add('invalid.multiupload')
+            @page_answers.uploaded_files.push(file)
+          else
+            @page_answers.uploaded_files.push(multiuploaded_file(previous_answers, component))
+          end
+        end
+      end
     end
 
     def show_save_and_return
@@ -67,6 +122,16 @@ module MetadataPresenter
       render template: page.template, status: :unprocessable_entity
     end
 
+    def incoming_answer
+      if multiupload?
+        multiupload_answer = MultiUploadAnswer.new
+        multiupload_answer.key = Array(page.components).first.id
+        multiupload_answer.previous_answers = @previous_answers[Array(page.components).first.id]
+        multiupload_answer.incoming_answer = answers_params
+      end
+      multiupload_answer || answers_params
+    end
+
     def answers_params
       params.permit(:page_slug, :save_for_later)
       params[:answers] ? params[:answers].permit! : {}
@@ -84,7 +149,6 @@ module MetadataPresenter
       user_data = load_user_data
       @page_answers.page.upload_components.each do |component|
         answer = user_data[component.id]
-
         original_filename = answer.nil? ? @page_answers.send(component.id)['original_filename'] : answer['original_filename']
 
         if original_filename.present?
@@ -112,6 +176,40 @@ module MetadataPresenter
       end
     end
 
+    def multiuploaded_file(answer, component)
+      if answer.present?
+        if @page_answers.answers.is_a?(MetadataPresenter::MultiUploadAnswer)
+          if @page_answers.answers.incoming_answer.present?
+            FileUploader.new(
+              session:,
+              page_answers: @page_answers,
+              component:,
+              adapter: upload_adapter
+            ).upload
+          else
+            MetadataPresenter::UploadedFile.new(
+              file: @page_answers.answers.previous_answers.last,
+              component:
+            )
+          end
+        else
+          FileUploader.new(
+            session:,
+            page_answers: @page_answers,
+            component:,
+            adapter: upload_adapter
+          ).upload
+        end
+      else
+        FileUploader.new(
+          session:,
+          page_answers: @page_answers,
+          component:,
+          adapter: upload_adapter
+        ).upload
+      end
+    end
+
     def upload_adapter
       super if defined?(super)
     end
@@ -119,5 +217,9 @@ module MetadataPresenter
     def upload?
       Array(page.components).any?(&:upload?)
     end
+
+    def multiupload?
+      Array(page.components).any?(&:multiupload?)
+    end
   end
 end

data/app/controllers/metadata_presenter/file_controller.rb

@@ -5,8 +5,17 @@ module MetadataPresenter
       redirect_back(fallback_location: root_path)
     end
 
+    def remove_multifile
+      remove_file_from_data(params[:component_id], params[:file_uuid])
+      redirect_back(fallback_location: root_path)
+    end
+
     def remove_user_data(component_id)
       super(component_id) if defined?(super)
     end
+
+    def remove_file_from_data(component_id, file_id)
+      super(component_id, file_id) if defined?(super)
+    end
   end
 end

data/app/controllers/metadata_presenter/pages_controller.rb

@@ -4,13 +4,12 @@ module MetadataPresenter
 
     def show
       @user_data = load_user_data # method signature
-      @page ||= service.find_page_by_url(request.env['PATH_INFO'])
 
+      @page ||= service.find_page_by_url(request.env['PATH_INFO'])
       if @page
         load_autocomplete_items
 
         @page_answers = PageAnswers.new(@page, @user_data)
-
         render template: @page.template
       else
         not_found

data/app/helpers/metadata_presenter/application_helper.rb

@@ -35,5 +35,61 @@ module MetadataPresenter
     def default_page_title(type)
       MetadataPresenter::DefaultMetadata[type.to_s]&.[]('heading')
     end
+
+    def multiupload_files_remaining
+      component = page_multiupload_component
+      answers = @user_data.keys.include?(component.id) ? @user_data.find(component.id).first : []
+      max_files = component.validation['max_files'].to_i
+
+      if uploads_remaining.zero?
+        I18n.t('presenter.questions.multiupload.none')
+      elsif max_files == 1
+        I18n.t('presenter.questions.multiupload.single_upload')
+      elsif uploads_remaining == 1
+        if answers.present?
+          I18n.t('presenter.questions.multiupload.answered_singular')
+        else
+          I18n.t('presenter.questions.multiupload.singular')
+        end
+      elsif answers.present?
+        I18n.t('presenter.questions.multiupload.answered_plural', num: uploads_remaining)
+      else
+        I18n.t('presenter.questions.multiupload.plural', num: uploads_remaining)
+      end
+    end
+
+    def uploads_remaining
+      component = page_multiupload_component
+      max_files = component.validation['max_files'].to_i
+      answers = @user_data.keys.include?(component.id) ? @user_data[component.id] : []
+      return 0 if answers.is_a?(ActionDispatch::Http::UploadedFile)
+
+      max_files - answers.count
+    end
+
+    def uploads_count
+      component = page_multiupload_component
+      answers = @user_data.keys.include?(component.id) ? @user_data[component.id] : []
+
+      return 0 if answers.is_a?(ActionDispatch::Http::UploadedFile)
+
+      answers.count == 1 ? I18n.t('presenter.questions.multiupload.answered_count_singular') : I18n.t('presenter.questions.multiupload.answered_count_plural', num: answers.count)
+    end
+
+    def files_to_render
+      component = page_multiupload_component
+
+      error_file = @page_answers.uploaded_files.select { |file| file.errors.any? }.first
+
+      if error_file.present?
+        @page_answers.send(component.id)[component.id].compact.reject { |file| file[error_file.file['original_filename'] == 'original_filename'] }
+      else
+        @page_answers.send(component.id)[component.id].compact
+      end
+    end
+
+    def page_multiupload_component
+      @page.components.select { |c| c.type == 'multiupload' }.first
+    end
   end
 end

data/app/models/metadata_presenter/component.rb

@@ -3,7 +3,8 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
     'date' => 'date',
     'number' => 'number',
     'text' => 'string',
-    'textarea' => 'string'
+    'textarea' => 'string',
+    'multiupload' => 'file'
   }.freeze
 
   # Used for max_length and max_word validations.
@@ -57,6 +58,10 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
     type == 'upload'
   end
 
+  def multiupload?
+    type == 'multiupload'
+  end
+
   def find_item_by_uuid(uuid)
     items.find { |item| item.uuid == uuid }
   end
@@ -73,6 +78,10 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
     VALIDATION_STRING_LENGTH_THRESHOLD
   end
 
+  def max_files
+    metadata.max_files.presence || '0'
+  end
+
   private
 
   def validation_bundle_key

data/app/models/metadata_presenter/file_uploader.rb

@@ -18,6 +18,10 @@ module MetadataPresenter
     end
 
     def file_details
+      if component.multiupload?
+        return page_answers.send(component.id)[component.id].last
+      end
+
       page_answers.send(component.id)
     end
   end

data/app/models/metadata_presenter/multi_upload_answer.rb

@@ -0,0 +1,33 @@
+module MetadataPresenter
+  class MultiUploadAnswer
+    attr_accessor :previous_answers, :incoming_answer, :key
+
+    def to_h
+      {
+        key => previous_answers_value.present? ? previous_answers_value.reject(&:blank?) : []
+      }
+    end
+
+    def previous_answers_value
+      return nil if previous_answers.nil? && incoming_answer.nil?
+      return [incoming_answer] if previous_answers.nil? && incoming_answer.present?
+
+      if previous_answers.is_a?(Array)
+        return previous_answers.reject(&:blank?) if incoming_answer.nil? || previous_answers.find { |answer|
+                                                      answer['original_filename'] == incoming_answer['original_filename']
+                                                    }.present?
+
+        previous_answers.reject(&:blank?).push(incoming_answer)
+      else
+        return [previous_answers] if incoming_answer.nil?
+
+        [previous_answers, incoming_answer]
+      end
+    end
+
+    def from_h(input)
+      self.key = input.keys[0]
+      self.previous_answers = input[key]
+    end
+  end
+end

data/app/models/metadata_presenter/page.rb

@@ -85,6 +85,10 @@ module MetadataPresenter
       components.select(&:upload?)
     end
 
+    def multiupload_components
+      components.select(&:multiupload?)
+    end
+
     def standalone?
       type == 'page.standalone'
     end

data/app/models/metadata_presenter/page_answers.rb

@@ -25,11 +25,13 @@ module MetadataPresenter
 
     def method_missing(method_name, *_args)
       component = components.find { |c| c.id == method_name.to_s }
-
       if component && component.type == 'date'
         date_answer(component.id)
       elsif component && component.type == 'upload'
         upload_answer(component.id, count)
+      elsif component && component.type == 'multiupload'
+        answer_object = multiupload_answer(component.id, count)
+        answer_object.to_h if answer_object.present?
       elsif component && component.type == 'checkboxes'
         answers[method_name.to_s].to_a
       else
@@ -53,6 +55,62 @@ module MetadataPresenter
       end
     end
 
+    def multiupload_answer(component_id, _count)
+      file_details = answers[component_id.to_s] unless answers.is_a?(MetadataPresenter::MultiUploadAnswer)
+      return nil if file_details.nil? && answers.nil?
+
+      if file_details.is_a?(Hash)
+        # when referencing a single previous answer but no incoming new answer
+        presentable = MetadataPresenter::MultiUploadAnswer.new
+        presentable.key = component_id.to_s
+        presentable.previous_answers = [file_details]
+        return presentable
+      end
+
+      if file_details.is_a?(Array)
+        # when referencing multiple previous answers but no incoming new answer
+        presentable = MetadataPresenter::MultiUploadAnswer.new
+        presentable.key = component_id.to_s
+        presentable.previous_answers = file_details.reject { |f| f['original_filename'].blank? }
+        return presentable
+      end
+
+      if answers.blank?
+        return nil
+      end
+
+      if answers.is_a?(Hash) # rendering only existing answers
+        return if answers[component_id].blank?
+
+        if answers[component_id].is_a?(Array)
+          answers[component_id].each { |answer| answer['original_filename'] = sanitize(filename(update_filename(answer['original_filename']))) }
+        end
+
+        answers[component_id] = answers[component_id].reject { |a| a['original_filename'].blank? }
+        return answers
+      end
+
+      # uploading a new answer, this method will be called during multiple render operations
+      if answers.incoming_answer.present? && answers.incoming_answer.is_a?(ActionController::Parameters)
+        answers.incoming_answer[component_id].original_filename = sanitize(filename(update_filename(answers.incoming_answer[component_id].original_filename)))
+      end
+
+      if answers.incoming_answer.present? && answers.incoming_answer.is_a?(Hash)
+        answers.incoming_answer['original_filename'] = sanitize(filename(update_filename(answers.incoming_answer['original_filename'])))
+      end
+
+      if answers.incoming_answer.present? && answers.incoming_answer[component_id].is_a?(ActionDispatch::Http::UploadedFile)
+        answers.incoming_answer = {
+          'original_filename' => sanitize(filename(update_filename(answers.incoming_answer[component_id].original_filename))),
+          'content_type' => answers.incoming_answer[component_id].content_type,
+          'tempfile' => answers.incoming_answer[component_id].tempfile.path.to_s,
+          'uuid' => SecureRandom.uuid
+        }
+      end
+
+      answers
+    end
+
     def date_answer(component_id)
       date = raw_date_answer(component_id)
 
@@ -81,6 +139,7 @@ module MetadataPresenter
         basename = File.basename(filename, extname)
 
         filename = "#{basename}-(#{count})#{extname}"
+        @count = nil # this is called multiple times for multiupload components so ensure we apply suffix to filename only once
       end
 
       filename

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -84,6 +84,10 @@ module MetadataPresenter
       file_hash['original_filename']
     end
 
+    def multiupload(multifile_hash)
+      multifile_hash[component.id].map { |i| i['original_filename'] }.join('<br>').html_safe
+    end
+
     def autocomplete(value)
       JSON.parse(value)['text']
     end

data/app/validators/metadata_presenter/accept_validator.rb

@@ -3,5 +3,16 @@ module MetadataPresenter
     def error_name
       'accept'
     end
+
+    def error_message_hash
+      if component.type == 'multiupload'
+        {
+          control: page_answers.send(component.id)[component.id].last['original_filename'],
+          schema_key.to_sym => component.validation[schema_key]
+        }
+      else
+        super
+      end
+    end
   end
 end

data/app/validators/metadata_presenter/max_files_validator.rb

@@ -0,0 +1,9 @@
+module MetadataPresenter
+  class MaxFilesValidator < NumberValidator
+    def invalid_answer?
+      return if super
+
+      Float(user_answer, exception: false) > Float(component.validation[schema_key], exception: false)
+    end
+  end
+end

data/app/validators/metadata_presenter/multiupload_validator.rb

@@ -0,0 +1,24 @@
+module MetadataPresenter
+  class MultiuploadValidator < BaseValidator
+    def invalid_answer?
+      user_answer.errors.any? { |error| error.attribute.to_s == 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)[component.id].last['original_filename'],
+        schema_key.to_sym => component.validation[schema_key]
+      }
+    end
+
+    def error_name
+      'invalid.multiupload'
+    end
+  end
+end

data/app/validators/metadata_presenter/required_validator.rb

@@ -1,6 +1,10 @@
 module MetadataPresenter
   class RequiredValidator < BaseValidator
     def invalid_answer?
+      if component.type == 'multiupload'
+        return user_answer[component.id].map(&:blank?).all?
+      end
+
       user_answer.blank?
     end
   end

data/app/validators/metadata_presenter/validate_answers.rb

@@ -21,12 +21,21 @@ module MetadataPresenter
     def validators
       components.map { |component|
         component_validations(component).map do |key|
-          "MetadataPresenter::#{key.classify}Validator".constantize.new(
-            **{
-              page_answers:,
-              component:
-            }.merge(autocomplete_param(key))
-          )
+          if key == 'max_files'
+            'MetadataPresenter::MaxFilesValidator'.constantize.new(
+              **{
+                page_answers:,
+                component:
+              }.merge(autocomplete_param(key))
+            )
+          else
+            "MetadataPresenter::#{key.classify}Validator".constantize.new(
+              **{
+                page_answers:,
+                component:
+              }.merge(autocomplete_param(key))
+            )
+          end
         end
       }.compact.flatten
     end

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

@@ -0,0 +1,51 @@
+<legend class="govuk-heading-xl"><%= input_title %></legend>
+
+<% if answered?(component.id) && @page_answers.send(component.id)[component.id].compact.count.positive? %>
+  <label id="uploaded-file-summary-list-label"><p class="govuk-heading-s"><%= uploads_count %></p></label>
+
+  <dl id="uploaded-file-summary-list" class="fb-block fb-block-answers govuk-summary-list" aria-labelled-by="uploaded-file-summary-list-label">
+    <% files_to_render.each do |previous_file| %>
+      <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__value">
+          <%= previous_file['original_filename'] %>
+        </dt>
+        <dd class="govuk-summary-list__actions">
+          <%= link_to "#{t('presenter.questions.multiupload.remove_file')}<span class=\"govuk-visually-hidden\">#{previous_file['original_filename']}</span>".html_safe, remove_multifile_path(component.id, previous_file['uuid']), class: 'govuk-link' %>
+        </dd>
+      </div>
+    <% end %>
+  </dl>
+<% end %>
+
+<% if uploads_remaining.positive? || editable? %>
+  <div data-multiupload-element="upload-another-file" <%= answered?(component.id) && @page_answers.send(component.id)[component.id].compact.count.positive? ? 'hidden' : '' %>>
+    <%= f.govuk_file_field component.id.to_sym,
+    hint: {
+      data: { "fb-default-text" => default_text('option_hint') },
+      text: component.hint.present? ? component.hint : ''
+    },
+    accept: component.validation['accept'],
+    disabled: editable?,
+    label: -> do %>
+      <% if answered?(component.id) && @page_answers.send(component.id)[component.id].compact.count.positive? && !editable? %>
+        <h3 class="govuk-heading-s govuk-!-margin-top-8"><%= t('presenter.questions.multiupload.add_another') %></h3>
+      <% else %>
+        <h3 class="govuk-visually-hidden"><%= t('presenter.questions.multiupload.add_another') %></h3>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>
+
+<% if editable? %>
+  <% if editor_preview? && answered?(component.id) %>
+      <p class="govuk-!-margin-bottom-8"><%= t('presenter.questions.multiupload.none') %></p>
+  <% else %>
+    <p class="govuk-!-margin-bottom-8"><%= component.validation['max_files'].to_i > 1 ? t('presenter.questions.multiupload.plural', num: component.validation['max_files']) : t('presenter.questions.multiupload.single_upload') %></p>
+  <% end %>
+<% else %>
+  <p class="govuk-!-margin-bottom-8"><%= multiupload_files_remaining %></p>
+<% end %>
+
+<% if answered?(component.id) && uploads_remaining.positive? && @page_answers.send(component.id)[component.id].compact.count.positive? %>
+  <button class="govuk-button govuk-!-margin-bottom-8 govuk-button--secondary" data-multiupload-element="add-another-file"><%= t('presenter.questions.multiupload.add_another') %></button>
+<% end %>

data/app/views/metadata_presenter/page/confirmation.html.erb

@@ -37,7 +37,9 @@
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
+     <% unless @page.body == default_text('body') %>
       <%= render 'metadata_presenter/attribute/body' %>
+      <% end %>
 
       <%= render partial: 'metadata_presenter/component/components',
                  locals: {

data/app/views/metadata_presenter/page/content.html.erb

@@ -12,7 +12,10 @@
       </h1>
 
       <%= render 'metadata_presenter/attribute/lede' %>
-      <%= render 'metadata_presenter/attribute/body' %>
+
+      <% unless @page.body == default_text('body') %>
+        <%= render 'metadata_presenter/attribute/body' %>
+      <% end %>
 
       <%= form_for @page_answers, as: :answers, url: @page.url, method: :post do |f| %>
 

data/config/initializers/supported_components.rb

@@ -21,7 +21,7 @@ Rails.application.config.supported_components =
       content: %w(content)
     },
     singlequestion: {
-      input: %w(text textarea number date radios checkboxes email upload autocomplete),
+      input: %w(text textarea number date radios checkboxes email upload multiupload autocomplete),
       content: %w()
      }
   })

data/config/locales/en.yml

@@ -41,6 +41,18 @@ en:
       payment_enabled: You still need to pay
       continue_to_pay_button: Continue to pay
       application_complete: 'Application complete'
+    questions:
+      multiupload:
+        remove_file: 'Delete'
+        add_another: 'Add another file'
+        single_upload: 'Maximum file size 7MB'
+        answered_singular: 'You can add 1 more file (maximum 7MB per file)'
+        answered_plural: 'You can add %{num} more files (maximum 7MB per file)'
+        answered_count_singular: 'You have added 1 file'
+        answered_count_plural: 'You have added %{num} files'
+        singular: 'You can add 1 more file (maximum 7MB)'
+        plural: 'You can add up to %{num} files (maximum 7MB per file)'
+        none: "You can't add any more files. Remove a file if you need to add a different one."
     save_and_return:
       save: 'Save for later'
       show:

data/config/routes.rb

@@ -7,6 +7,7 @@ MetadataPresenter::Engine.routes.draw do
   # 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
+  get '/reserved/file/:component_id/:file_uuid', to: 'file#remove_multifile', as: :remove_multifile
 
   get 'session/expired', to: 'session#expired'
   get 'session/complete', to: 'session#complete'

data/default_metadata/component/multiupload.json

@@ -0,0 +1,30 @@
+{
+  "_id": "component.multiupload",
+  "_type": "multiupload",
+  "errors": {},
+  "legend": "Question",
+  "hint": "",
+  "name": "component-name",
+  "validation": {
+    "required": true,
+    "max_size": "7340032",
+    "virus_scan": true,
+    "max_files": "1",
+    "multiupload": true,
+    "accept": [
+      "text/csv",
+      "text/plain",
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+      "application/msword",
+      "application/vnd.oasis.opendocument.spreadsheet",
+      "application/vnd.oasis.opendocument.text",
+      "application/pdf",
+      "application/rtf",
+      "application/csv",
+      "image/jpeg",
+      "image/png",
+      "application/vnd.ms-excel",
+      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+    ]
+  }
+}

data/default_metadata/page/content.json

@@ -4,7 +4,6 @@
   "section_heading": "",
   "heading": "Title",
   "lede": "",
-  "body": "[Optional content]",
   "components": [],
   "url": ""
 }

data/default_metadata/string/error.max_files.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.max_files",
+  "_type": "string.error",
+  "description": "Input (number) is larger than the maximum allowed",
+  "value": "Your answer for \"%{control}\" must be %{maximum} or lower"
+}

data/default_metadata/string/error.multiupload.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.multiupload",
+  "_type": "string.error",
+  "description": "Cannot upload files with duplicate filenames",
+  "value": "The selected file cannot have the same name as a file you have already selected. Please check you aren't uploading the same file again."
+}

data/default_metadata/validations/max_files.json

@@ -0,0 +1 @@
+{ "max_files": "10" }

data/fixtures/version.json

@@ -69,6 +69,12 @@
       }
     },
     "2ef7d11e-0307-49e9-9fe2-345dc528dd66": {
+      "_type": "flow.page",
+      "next": {
+        "default": "2ef7d11e-0307-49e9-9fe2-345dc528dd67"
+      }
+    },
+    "2ef7d11e-0307-49e9-9fe2-345dc528dd67": {
       "_type": "flow.page",
       "next": {
         "default": "c7755991-436b-4495-afa6-803db58cefbc"
@@ -574,6 +580,73 @@
         }
       ]
     },
+    {
+      "_id": "page.dog-picture-2",
+      "url": "dog-picture-2",
+      "_type": "page.singlequestion",
+      "_uuid": "2ef7d11e-0307-49e9-9fe2-345dc528dd67",
+      "heading": "Multiupload",
+      "components": [
+        {
+          "_id":  "dog-picture_upload_2",
+          "name": "dog-picture_upload_2",
+          "_type": "multiupload",
+          "_uuid": "f056a76e-ec3f-47ae-b625-1bba92220ad2",
+          "hint": "",
+          "legend": "Upload your best dog photos",
+          "validation": {
+            "required": true,
+            "max_files": "3",
+            "multiupload": 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",
+              "application/csv"
+            ],
+            "max_size": 7340032,
+            "virus_scan": true
+          }
+        }
+      ]
+    },
     {
       "_id": "page.countries",
       "url": "countries",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.0.15'.freeze
+  VERSION = '3.2.0'.freeze
 end

data/schemas/component/content.json

@@ -17,6 +17,35 @@
       "type": "string",
       "content": true,
       "multiline": true
+    },
+    "conditionals": {
+      "$ref": "#/definitions/conditionals"
+    }
+  },
+  "definitions": {
+    "conditionals": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "_uuid": {
+            "type": "string",
+            "title": "Unique identifier of the conditional",
+            "description": "Used internally in the editor and the runner"
+          },
+          "_type": {
+            "type": "string",
+            "enum": [
+              "if",
+              "and",
+              "or"
+            ]
+          },
+          "expressions": {
+            "$ref": "definition.expressions"
+          }
+        }
+      }
     }
   },
   "allOf": [

data/schemas/component/multiupload.json

@@ -0,0 +1,42 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/multiupload",
+  "_name": "component.multiupload",
+  "title": "Multiupload",
+  "description": "Let users select and upload one or more files",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "multiupload"
+    },
+    "max_files": {
+      "title": "Maximum number of files",
+      "description": "Maximum number of files a user can upload",
+      "type": "number"
+    },
+    "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"
+    },
+    {
+      "$ref": "validations#/definitions/file_bundle"
+    }
+  ]
+}

data/schemas/definition/expression_item.json

@@ -0,0 +1,36 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/definition/expression_item",
+  "_name": "definition.expression_item",
+  "title": "Expression item",
+  "description": "Component that provides an expression item",
+  "type": "object",
+  "properties": {
+    "operator": {
+      "type": "string",
+      "enum": [
+        "is",
+        "is_not",
+        "is_answered",
+        "is_not_answered"
+      ],
+      "page": {
+        "type": "string"
+      },
+      "component": {
+        "type": "string"
+      },
+      "field": {
+        "type": "string"
+      }
+    }
+  },
+  "required": [
+    "operator",
+    "page",
+    "component",
+    "field"
+  ],
+  "category": [
+    "expression_item"
+  ]
+}

data/schemas/definition/expressions.json

@@ -0,0 +1,15 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/definition/expressions",
+  "_name": "definition.expressions",
+  "title": "Expressions",
+  "type": "array",
+  "items": {
+    "$ref": "definition.expression_item"
+  },
+  "required": [
+    "items"
+  ],
+  "category": [
+    "expression"
+  ]
+}

data/schemas/flow/branch.json

@@ -48,33 +48,7 @@
             "type": "string"
           },
           "expressions": {
-            "$ref": "#/definitions/expressions"
-          }
-        }
-      }
-    },
-    "expressions": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "operator": {
-            "type": "string",
-            "enum": [
-              "is",
-              "is_not",
-              "is_answered",
-              "is_not_answered"
-            ],
-            "page": {
-              "type": "string"
-            },
-            "component": {
-              "type": "string"
-            },
-            "field": {
-              "type": "string"
-            }
+            "$ref": "definition.expressions"
           }
         }
       }

data/schemas/page/confirmation.json

@@ -14,9 +14,6 @@
     "heading": {
       "multiline": true
     },
-    "body": {
-      "multiline": true
-    },
     "lede": {
       "multiline": true
     },

data/schemas/validations/validations.json

@@ -118,6 +118,20 @@
         }
       ]
     },
+    "max_files": {
+      "title": "Maximum files",
+      "description": "The maximum number of fiels a user can upload",
+      "type": "number",
+      "minimum": 0
+    },
+    "errors_max_files": {
+      "title": "Error messages for 'Maximum files'",
+      "allOf": [
+        {
+          "$ref": "#/definitions/error_strings"
+        }
+      ]
+    },
     "pattern": {
       "title": "Pattern to match string against",
       "description": "A regular expression for validating users’ answers",
@@ -450,6 +464,9 @@
             },
             "exclusive_minimum": {
               "$ref": "#/definitions/exclusive_minimum"
+            },
+            "max_files": {
+              "$ref": "#/definitions/max_files"
             }
           }
         },
@@ -469,6 +486,9 @@
             },
             "exclusive_minimum": {
               "$ref": "#/definitions/errors_exclusive_minimum"
+            },
+            "max_files": {
+              "$ref": "#/definitions/max_files"
             }
           }
         }
@@ -509,6 +529,24 @@
           }
         }
       }
+    },
+    "file_bundle": {
+      "properties": {
+        "validation": {
+          "properties": {
+            "max_files": {
+              "$ref": "#/definitions/max_files"
+            }
+          }
+        },
+        "errors": {
+          "properties": {
+            "max_files": {
+              "$ref": "#/definitions/max_files"
+            }
+          }
+        }
+      }
     }
   },
   "category": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.2.0
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  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
@@ -332,6 +346,7 @@ files:
 - app/models/metadata_presenter/meta.rb
 - app/models/metadata_presenter/meta_item.rb
 - app/models/metadata_presenter/metadata.rb
+- app/models/metadata_presenter/multi_upload_answer.rb
 - app/models/metadata_presenter/next_page.rb
 - app/models/metadata_presenter/offline_upload_adapter.rb
 - app/models/metadata_presenter/page.rb
@@ -362,6 +377,7 @@ files:
 - app/validators/metadata_presenter/date_before_validator.rb
 - app/validators/metadata_presenter/date_validator.rb
 - app/validators/metadata_presenter/email_validator.rb
+- app/validators/metadata_presenter/max_files_validator.rb
 - app/validators/metadata_presenter/max_length_validator.rb
 - app/validators/metadata_presenter/max_size_validator.rb
 - app/validators/metadata_presenter/max_word_validator.rb
@@ -369,6 +385,7 @@ files:
 - app/validators/metadata_presenter/min_length_validator.rb
 - app/validators/metadata_presenter/min_word_validator.rb
 - app/validators/metadata_presenter/minimum_validator.rb
+- app/validators/metadata_presenter/multiupload_validator.rb
 - app/validators/metadata_presenter/number_validator.rb
 - app/validators/metadata_presenter/required_validator.rb
 - app/validators/metadata_presenter/upload_validator.rb
@@ -400,6 +417,7 @@ files:
 - app/views/metadata_presenter/component/_content.html.erb
 - app/views/metadata_presenter/component/_date.html.erb
 - app/views/metadata_presenter/component/_email.html.erb
+- app/views/metadata_presenter/component/_multiupload.html.erb
 - app/views/metadata_presenter/component/_number.html.erb
 - app/views/metadata_presenter/component/_radios.html.erb
 - app/views/metadata_presenter/component/_text.html.erb
@@ -445,6 +463,7 @@ files:
 - default_metadata/component/content.json
 - default_metadata/component/date.json
 - default_metadata/component/email.json
+- default_metadata/component/multiupload.json
 - default_metadata/component/number.json
 - default_metadata/component/radios.json
 - default_metadata/component/text.json
@@ -473,6 +492,7 @@ files:
 - default_metadata/string/error.date_after.json
 - default_metadata/string/error.date_before.json
 - default_metadata/string/error.email.json
+- default_metadata/string/error.max_files.json
 - default_metadata/string/error.max_length.json
 - default_metadata/string/error.max_size.json
 - default_metadata/string/error.max_word.json
@@ -480,11 +500,13 @@ files:
 - default_metadata/string/error.min_length.json
 - default_metadata/string/error.min_word.json
 - default_metadata/string/error.minimum.json
+- default_metadata/string/error.multiupload.json
 - default_metadata/string/error.number.json
 - default_metadata/string/error.required.json
 - default_metadata/string/error.virus_scan.json
 - default_metadata/validations/date_after.json
 - default_metadata/validations/date_before.json
+- default_metadata/validations/max_files.json
 - default_metadata/validations/max_length.json
 - default_metadata/validations/max_word.json
 - default_metadata/validations/maximum.json
@@ -531,6 +553,7 @@ files:
 - schemas/component/content.json
 - schemas/component/date.json
 - schemas/component/email.json
+- schemas/component/multiupload.json
 - schemas/component/number.json
 - schemas/component/radios.json
 - schemas/component/text.json
@@ -557,6 +580,8 @@ files:
 - schemas/definition/conditions.exactly.json
 - schemas/definition/control.json
 - schemas/definition/data.json
+- schemas/definition/expression_item.json
+- schemas/definition/expressions.json
 - schemas/definition/field.json
 - schemas/definition/fieldset.json
 - schemas/definition/grouping.json