metadata_presenter 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e84ebcbd114c023a8f36b861a90e1b37b99b3818a5b246b3c260420da1d0df72
-  data.tar.gz: 13ae0d0919a37e7b3ce290f1a75426363c619a6f8beaf474000392d263b2e368
+  metadata.gz: 8159601ef7b12c039633ef169437869d66abd193a70a72c6d3bd5bd83e8e43df
+  data.tar.gz: 117638aa22a6695d528a5c6f390526965dde81247706c9d203705ce85c0e62a4
 SHA512:
-  metadata.gz: 912734998fbf62a2c0e638574c47eb113e7009ff1d6954a7e6bd3a9a27e764a1988039dc5c9dead180a2bf158ced817270e04fc085cfad32a9bc5c212e3613eb
-  data.tar.gz: cb8fe7a25bf7b77c944e73e123e76a59d7412dae017a5dec3722ccbfe9f4fa96cf6a7755792df1eacb989758064df78d5ceeec2ddb7f0ff74bc80f98bce2d65b
+  metadata.gz: f1e2a77178e1f0dba9d1e33562ce50fc1cc1e5f0ffd5c67393fcc9087dc00e703f07be00b23a9088b813fcae2a730c0690e767b1571ae5d56c45dd9ecf49591e
+  data.tar.gz: 27d472e2ad735d502477719935e6f099e6148930e6ecedd370f02211c593d4442ee20d33e481e6ecf583114a36f41289f5cd3840cefdf54bf71c6d3ef54119ab

data/app/controllers/metadata_presenter/answers_controller.rb

@@ -5,7 +5,7 @@ module MetadataPresenter
     def create
       @page_answers = PageAnswers.new(page, answers_params)
 
-      upload_file if upload?
+      upload_files if upload?
 
       if @page_answers.validate_answers
         save_user_data # method signature
@@ -54,7 +54,33 @@ module MetadataPresenter
       not_found if page.blank?
     end
 
-    def upload_file
+    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
 

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/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/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/views/metadata_presenter/component/_upload.html.erb

@@ -7,7 +7,7 @@
   <p><%= @page_answers.send(component.id)['original_filename'] %></p>
 
   <p>
-    <%= link_to 'Remove file', remove_file_path(component.id), method: :delete, class: 'govuk-link' %>
+    <%= link_to 'Remove file', remove_file_path(component.id), class: 'govuk-link' %>
   </p>
 <% else %>
   <%= f.govuk_file_field component.id.to_sym,

data/config/routes.rb

@@ -3,7 +3,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
-  delete '/reserved/file/:component_id', to: 'file#destroy', as: :remove_file
+
+  # 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

data/lib/metadata_presenter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -264,14 +264,17 @@ 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