metadata_presenter 1.1.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc023308d746e84b91be5cf75e92586f18ea5858f34810ca6c4596111eed2b01
-  data.tar.gz: 2e1d5ee7a5557c4d39eec4761e30411aa14faa7729153e349f6db873e509c5a0
+  metadata.gz: e53919bd4f689dd61ae84044e6cba77034053ddae502a61b7672310a917ea085
+  data.tar.gz: e6620c311a81a98f0a6fc6a40c5d1119449c54d56d79ff5b49f73a5855c8a4de
 SHA512:
-  metadata.gz: d97d943042cc2104ee36db60e26e0d66891adc2b96be28e4b25ab5dd7998b97cea48335fbcfecd7a6c28fd8ef3ec6e256ea11cc4b0b8d6198db9ff9ff1dc1449
-  data.tar.gz: a37ba1e314b78031f3d3c2e18651a932d139d812bbf2f47b82e78281e24f2612dd056fab4645b2943304b46db6b5410baf933b177d4365f3869e4c6c04627275
+  metadata.gz: 7a49928da6f79c16e42e25af5a95330f1a9069ca1b37846b3a412e1bf33f2fe44da3971869bc583b4965e655836a8af684d2c88794547c0da66b6aa8ba0837b2
+  data.tar.gz: a28440a4e40e61a9caf08f2e3b7ac7f744b628d295a83d2ef9ca51465fc502f7b590839a06fd5af8ef823dc4a07f8ff191561767fa90d49c51a9720c8ff6a45a

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/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/models/metadata_presenter/file_uploader.rb

@@ -0,0 +1,24 @@
+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
+      return {} if file_details.blank?
+
+      adapter.new(
+        session: session,
+        file_details: file_details,
+        allowed_file_types: component.validation['accept']
+      ).call
+    end
+
+    def file_details
+      page_answers.send(component.id)
+    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

@@ -1,9 +1,22 @@
-<%= 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?
-%>
+<% 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/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

@@ -14,6 +14,7 @@
       "text/plain",
       "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
       "application/msword",
+      "application/vnd.oasis.opendocument.spreadsheet",
       "application/vnd.oasis.opendocument.text",
       "application/pdf",
       "application/rtf",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.3.2'.freeze
 end

metadata

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