metadata_presenter 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc023308d746e84b91be5cf75e92586f18ea5858f34810ca6c4596111eed2b01
-  data.tar.gz: 2e1d5ee7a5557c4d39eec4761e30411aa14faa7729153e349f6db873e509c5a0
+  metadata.gz: 877e1a1778b9677ac1450cd72ac16764c7369935b1ab85ad935588bd5950b0d3
+  data.tar.gz: 8c43204bbdf438db42bec26699c5cf77064c6074ca0113d7bee7004e17fb89ac
 SHA512:
-  metadata.gz: d97d943042cc2104ee36db60e26e0d66891adc2b96be28e4b25ab5dd7998b97cea48335fbcfecd7a6c28fd8ef3ec6e256ea11cc4b0b8d6198db9ff9ff1dc1449
-  data.tar.gz: a37ba1e314b78031f3d3c2e18651a932d139d812bbf2f47b82e78281e24f2612dd056fab4645b2943304b46db6b5410baf933b177d4365f3869e4c6c04627275
+  metadata.gz: ba06fa6d3c64cdb35142ba1d97e9bbf071e16de62c8eeed9071ec0e1370d0afc5dcb1549be23814371b2aca8543eff67f1d6788aca042ef0114b788ef767db5d
+  data.tar.gz: c88eedfa3b8de2b21cc8e2fa83cdc0780c43b5fb89deacc6f42680a892062e3da91e79b0f6fdfbd4df556cd6f81bb956aed7f928ce2dc15edbe458d65a076aec

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
+      super if defined?(super)
+    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), method: :delete, 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

@@ -3,6 +3,7 @@ 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
 
   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.1.1'.freeze
+  VERSION = '1.2.0'.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.2.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-03 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