Merge pull request #3727 from mlibrary/HELIO-4639/file_set_override_retention

HELIO-4639 - rm thumbnail derivative when using Hyrax default

Author: sethaj

app/assets/stylesheets/application/heliotrope.scss

@@ -1654,6 +1654,15 @@ footer.press {
   }
 }
 
+// Tidy the "Override Thumbnail with svgicon?" checkbox label on the FileSet edit page "thumbnail" tab
+.user_thumbnail_use_default {
+  .checkbox {
+    input {
+      margin-right: 0.5em;
+    }
+  }
+}
+
 // restrict large user-uploaded thumbnails on the asset edit page
 .restricted-width-media-display {
   .representative-media {

app/overrides/hyrax/file_sets_controller_overrides.rb

@@ -100,8 +100,9 @@ def uploaded_file_from_path
     end
 
     def change_thumbnail
+      dest = Hyrax::DerivativePath.derivative_path_for_reference(params[:id], 'thumbnail')
+
       if params[:user_thumbnail].key?(:custom_thumbnail)
-        dest = Hyrax::DerivativePath.derivative_path_for_reference(params[:id], 'thumbnail')
         FileUtils.mkdir_p(File.dirname(dest))
         FileUtils.cp(params[:user_thumbnail][:custom_thumbnail].path, dest)
         # Because the file at `params[:user_thumbnail][:custom_thumbnail].path` was created with Tempfile.new (see...
@@ -110,6 +111,7 @@ def change_thumbnail
       end
       if params[:user_thumbnail].key?(:use_default)
         if params[:user_thumbnail][:use_default] == '1'
+          FileUtils.rm(dest) if File.exist?(dest)
           ActiveFedora::SolrService.add(@file_set.to_solr.merge(thumbnail_path_ss: ActionController::Base.helpers.image_path('default.png')), softCommit: true)
         else
           ActiveFedora::SolrService.add(@file_set.to_solr.merge(thumbnail_path_ss: Hyrax::Engine.routes.url_helpers.download_path(@file_set.id, file: 'thumbnail')), softCommit: true)

app/views/hyrax/file_sets/_thumbnail.html.erb

@@ -4,6 +4,7 @@
       <%= hidden_field_tag('redirect_tab', 'thumbnail') %>
       <%= simple_fields_for :user_thumbnail do |t| %>
         <%= t.input :use_default, label: 'Override Thumbnail with svgicon?', as: :boolean,
+                    disabled: !File.exist?(Hyrax::DerivativePath.derivative_path_for_reference(params[:id], 'thumbnail')),
                     input_html: { checked: curation_concern.to_presenter.using_default_thumbnail? } %>
         <h4>Upload New Thumbnail (JPG/JPEG only!)</h4>
         <%= t.input :custom_thumbnail, as: :file, wrapper: :vertical_file_input, label: false, required: false,

spec/controllers/hyrax/file_sets_controller_spec.rb

@@ -399,9 +399,16 @@
 
     let(:file_set_doc_derivative) { file_set.to_solr.merge(thumbnail_path_ss: thumbnail_derivative_path) }
     let(:thumbnail_derivative_path) { Hyrax::Engine.routes.url_helpers.download_path(file_set.id, file: 'thumbnail') }
+    let(:thumbnail_path) { Hyrax::DerivativePath.derivative_path_for_reference(file_set.id, 'thumbnail') }
+
+    before do
+      allow(File).to receive(:exist?).and_call_original
+      allow(File).to receive(:exist?).with(thumbnail_path).and_return(true)
+    end
 
     it 'sets it to the Hyrax default thumbnail path' do
       expect(ActiveFedora::SolrService).to receive(:add).with(file_set_doc_default, softCommit: true)
+      expect(FileUtils).to receive(:rm).with(thumbnail_path)
       post :update, params: { id: file_set, user_thumbnail: { use_default: '1' } }
     end
     it 'sets it to the thumbnail derivative path' do