Merge branch 'main' into i350-derivatives

app/assets/javascripts/hyrax/fileupload.js

@@ -0,0 +1,9 @@
+//= require hyrax/uploader
+// This file is the default initialization of the fileupload.  If you want to call
+// hyraxUploader with other options (like afterSubmit), then override this file.
+Blacklight.onLoad(function() {
+  var options = {};
+  $('#fileupload').hyraxUploader(options);
+  $('#fileuploadlogo').hyraxUploader({downloadTemplateId: 'logo-template-download'});
+  $('#fileuploadthumbnail').hyraxUploader({downloadTemplateId: 'thumbnail-template-download'});
+});

app/assets/stylesheets/hyku.scss

@@ -645,3 +645,27 @@ span.constraint-value p, .facet-values p {
 tr[data-feature="use-iiif-print"] {
   display: none;
 }
+
+// collection branding thumbnail
+.branding-thumbnail-row {
+  border-top: solid 1px #dddddd;
+  padding-top: 10px;
+}
+
+.branding-thumbnail-input {
+  text-align: right;
+  width: 250px;
+
+  input {
+    text-align: left;
+  }
+}
+
+.branding-thumbnail-remove,
+.branding-thumbnail-remove:hover {
+  background-color: #ffffff;
+  border-color: #ffffff;
+  color: $brand-danger;
+  font-weight: normal;
+  text-decoration: underline;
+}

app/controllers/concerns/hyku/collection_branding_behavior.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Hyku
+  module CollectionBrandingBehavior
+    # This is used for saving the CollectionBrandingInfo files to 'public/uploads' directory.
+    #
+    # Originally, when `f.file_url` is called, there's a string sub that happens in
+    # CarrierWave that puts it into the 'uploads' dir instead.  We want it in the 'public/uploads' dir instead
+    # @see https://github.com/carrierwaveuploader/carrierwave/blob/master/lib/carrierwave/uploader/url.rb#L24
+    def process_file_location(f)
+      if /^http/.match?(f.file_url)
+        f.file.download!(f.file_url)
+        f.file_url
+      elsif %r{^\/}.match?(f.file_url)
+        f.file.path
+      else
+        f.file_url
+      end
+    end
+  end
+end

app/controllers/hyrax/dashboard/collections_controller_decorator.rb

@@ -3,27 +3,52 @@
 # OVERRIDE Hyrax v5.0.0rc2
 # - Fix file upload in logo and banner
 # - Use work titles for collection thumbnail select & to add an option to reset to the default thumbnail
+
+# OVERRIDE Hyrax v5.0.0 to add the ability to upload a collection thumbnail
+
 module Hyrax
   module Dashboard
     ## Shows a list of all collections to the admins
     # rubocop:disable Metrics/ModuleLength
     module CollectionsControllerDecorator
+      include Hyku::CollectionBrandingBehavior
+
       def show
         configure_show_sort_fields
 
         super
       end
 
-      private
-
-      def configure_show_sort_fields
-        # In the CollectionsControllerDecorator, we clear the sort fields and add our own to have
-        # the ability to sort the index with custom fields. However, this also affects the show page.
-        # Here we set the sort fields back to the defaults for the show page.
-        blacklight_config.sort_fields = CatalogController.blacklight_config.sort_fields
+      # OVERRIDE Hyrax v5.0.0 to add the ability to upload a collection thumbnail - START
+      def process_branding
+        process_banner_input
+        process_logo_input
+        process_thumbnail_input
       end
 
-      public
+      # rubocop:disable Metrics/AbcSize
+      def update_valkyrie_collection
+        return after_update_errors(form_err_msg(form)) unless form.validate(collection_params)
+
+        result = transactions['change_set.update_collection']
+                 .with_step_args(
+                          'collection_resource.save_collection_banner' => { update_banner_file_ids: params["banner_files"],
+                                                                            banner_unchanged_indicator: params["banner_unchanged"] },
+                          'collection_resource.save_collection_logo' => { update_logo_file_ids: params["logo_files"],
+                                                                          alttext_values: params["alttext"],
+                                                                          linkurl_values: params["linkurl"] },
+                          'collection_resource.save_collection_thumbnail' => { update_thumbnail_file_ids: params["thumbnail_files"],
+                                                                               thumbnail_unchanged_indicator: params["thumbnail_unchanged"],
+                                                                               alttext_values: params["thumbnail_text"] }
+                        )
+                 .call(form)
+        @collection = result.value_or { return after_update_errors(result.failure.first) }
+
+        process_member_changes
+        after_update_response
+      end
+      # rubocop:enable Metrics/AbcSize
+      # OVERRIDE Hyrax v5.0.0 to add the ability to upload a collection thumbnail - END
 
       def edit
         form
@@ -47,13 +72,6 @@ def update
         super
       end
 
-      def process_branding
-        super
-
-        # TODO: does this still work?
-        process_uploaded_thumbnail(params[:collection][:thumbnail_upload]) if params[:collection][:thumbnail_upload]
-      end
-
       # Deletes any previous thumbnails. The thumbnail indexer (see services/hyrax/indexes_thumbnails)
       # checks if an uploaded thumbnail exists in the public folder before indexing the thumbnail path.
       def delete_uploaded_thumbnail
@@ -99,6 +117,13 @@ def files
 
       private
 
+      def configure_show_sort_fields
+        # In the CollectionsControllerDecorator, we clear the sort fields and add our own to have
+        # the ability to sort the index with custom fields. However, this also affects the show page.
+        # Here we set the sort fields back to the defaults for the show page.
+        blacklight_config.sort_fields = CatalogController.blacklight_config.sort_fields
+      end
+
       # branding specific methods
       def process_banner_input
         return update_existing_banner if params["banner_unchanged"] == "true"
@@ -166,19 +191,6 @@ def process_uploaded_thumbnail(uploaded_file)
         File.chmod(0o664, "#{dir_name}/#{@collection.id}_card.jpg")
       end
       # rubocop:enable Metrics/MethodLength
-
-      ## OVERRIDE Hyrax v5.0.0rc2 handle file locations
-      def process_file_location(f)
-        if /^http/.match?(f.file_url)
-          f.file.download!(f.file_url)
-          f.file_url
-        elsif %r{^\/}.match?(f.file_url)
-          f.file.path
-        else
-          f.file_url
-        end
-      end
-      ## END OVERRIDE
     end
   end
 end

app/forms/hyrax/forms/admin/appearance_decorator.rb

@@ -206,6 +206,11 @@ def directory_image_text
           block_for('directory_image_text')
         end
 
+        # The alt text for the directory image
+        def directory_image_alt_text
+          block_for('directory_image_alt_text')
+        end
+
         # The alt text for the default_collection image
         def default_collection_image_text
           block_for('default_collection_image_text')

app/forms/hyrax/forms/pcdm_collection_form_decorator.rb

@@ -1,7 +1,25 @@
 # frozen_string_literal: true
+# OVERRIDE Hyraxv5.0.0 to add the ability to upload a collection thumbnail
 
 Hyrax::Forms::PcdmCollectionForm.class_eval do
   include Hyrax::FormFields(:basic_metadata)
   include Hyrax::FormFields(:bulkrax_metadata)
   include CollectionAccessFiltering
+
+  ThumbnailInfoPrepopulator = lambda do |_options = nil|
+    self.thumbnail_info ||= begin
+      thumbnail_info = CollectionBrandingInfo.where(collection_id: id.to_s, role: "thumbnail").first
+      if thumbnail_info
+        thumbnail_file = File.split(thumbnail_info.local_path).last
+        alttext = thumbnail_info.alt_text
+        file_location = thumbnail_info.local_path
+        relative_path = "/" + thumbnail_info.local_path.split("/")[-4..-1].join("/")
+        { file: thumbnail_file, full_path: file_location, relative_path:, alttext: }
+      else
+        {} # Always return at least an empty hash
+      end
+    end
+  end
+
+  property :thumbnail_info, virtual: true, prepopulator: ThumbnailInfoPrepopulator
 end

app/helpers/application_helper.rb

@@ -12,7 +12,8 @@ def group_navigation_presenter
     @group_navigation_presenter ||= Hyku::Admin::Group::NavigationPresenter.new(params:)
   end
 
-  def collection_thumbnail(_document, _image_options = {}, _url_options = {})
+  def collection_thumbnail(document, _image_options = {}, _url_options = {})
+    return image_tag(document['thumbnail_path_ss']) if document['thumbnail_path_ss'].present?
     return super if Site.instance.default_collection_image.blank?
 
     image_tag(Site.instance.default_collection_image&.url)

app/presenters/hyrax/collection_presenter_decorator.rb

@@ -81,6 +81,16 @@ def banner_file
                        end
     end
 
+    def thumbnail_file
+      @thumbnail_file ||= CollectionBrandingInfo.where(collection_id: id, role: "thumbnail")
+                                                .select(:local_path, :alt_text, :target_url).map do |thumbnail|
+        { alttext: thumbnail.alt_text,
+          file: File.split(thumbnail.local_path).last,
+          file_location: "/#{thumbnail.local_path.split('/')[-4..-1].join('/')}",
+          linkurl: thumbnail.target_url }
+      end
+    end
+
     # Begin Featured Collections Methods
     def collection_featurable?
       user_can_feature_collection? && solr_document.public?

app/services/hyrax/thumbnail_path_service_decorator.rb

@@ -4,6 +4,15 @@
 
 module Hyrax
   module ThumbnailPathServiceDecorator
+    def call(object)
+      return super unless object.try(:collection?)
+
+      collection_thumbnail = CollectionBrandingInfo.where(collection_id: object.id.to_s, role: "thumbnail").first
+      return collection_thumbnail.local_path.gsub(Rails.public_path.to_s, '') if collection_thumbnail
+
+      default_image
+    end
+
     def default_image
       Site.instance.default_work_image&.url || super
     end

app/views/catalog/_search_results.html.erb

@@ -0,0 +1,37 @@
+<%#
+  OVERRIDE Blacklight 7.35.0 to remove content_for(:container_header)
+  The 'search_results_header' and 'constraints' partials were not being rendered.
+  TODO: Figure out why this is happening and apply a proper fix.
+%>
+
+<% @page_title = t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name) %>
+
+<% content_for(:head) do -%>
+  <%= render 'catalog/opensearch_response_metadata', response: @response %>
+  <%= rss_feed_link_tag %>
+  <%= atom_feed_link_tag %>
+  <%= json_api_link_tag %>
+<% end %>
+
+<% content_for(:skip_links) do -%>
+    <%= link_to t('blacklight.skip_links.first_result'), '#documents', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+<% end %>
+
+<%# OVERRIDE begin %>
+<%= render 'search_results_header' %>
+<%= render 'constraints' %>
+<%# OVERRIDE end %>
+
+<%= render 'search_header' %>
+
+<h2 class="sr-only visually-hidden"><%= t('blacklight.search.search_results') %></h2>
+
+<%- if @response.empty? %>
+  <%= render "zero_results" %>
+<%- elsif render_grouped_response? %>
+  <%= Deprecation.silence(Blacklight::RenderPartialsHelperBehavior) { render_grouped_document_index } %>
+<%- else %>
+  <%= render_document_index @response.documents %>
+<%- end %>
+
+<%= render 'results_pagination' %>

app/views/hyrax/dashboard/collections/_form_branding.html.erb

@@ -163,4 +163,81 @@
       </div> <!-- end col-12 -->
     </div> <!-- end row branding-logo-list -->
   </div> <!-- end fileuploadlogo -->
+
+  <label><strong><%= t('.thumbnail.label') %></strong></label>
+  <p><%= t('.thumbnail.description') %></p>
+
+  <div id="fileuploadthumbnail">
+    <!-- Redirect browsers with JavaScript disabled to the origin page -->
+    <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>
+    <!-- The table listing the files available for upload/download -->
+
+    <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+    <div class="row fileupload-buttonbar">
+      <div class="col-4">
+        <!-- The fileinput-button span is used to style the file input field as button -->
+        <span class="btn btn-success fileinput-button">
+          <span class="fa fa-plus"></span>
+          <span><%= t('.choose_file') %></span>
+          <input type="file" name="files[]" single />
+        </span>
+      </div> <!-- end col-4 -->
+
+      <!-- The global progress state -->
+      <div class="col-8 fileupload-progress branding-thumbnail-progress fade">
+        <!-- The global progress bar -->
+        <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+          <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
+        </div>
+        <!-- The extended global progress state -->
+        <div class="progress-extended">&nbsp;</div>
+      </div> <!-- end col-8 fileupload-progress fade -->
+    </div> <!-- end row fileupload-buttonbar -->
+
+    <div class="row branding-thumbnail-list">
+      <div class="col-12">
+        <div class="container">
+        <%# Where the request to display the branding comes from. %>
+        <% if f.object.thumbnail_info[:file] %>
+          <div id="thumbnail">
+            <div class="row branding-thumbnail-row">
+              <div class="col-sm-3">
+                <span class="name">
+                  <i><%= image_tag(f.object.thumbnail_info[:relative_path],
+                       height: "36",
+                       alt: f.object.thumbnail_info[:alttext].presence || f.object.thumbnail_info[:file]) %></i>
+                  <span><%= f.object.thumbnail_info[:file] %></span>
+                  <input type="hidden" name="thumbnail_unchanged" value="true" />
+                </span>
+              </div>
+              <div class="col-sm-4 branding-thumbnail-input">
+                <label for="thumbnail_text"><%= t('.alt_text') %>
+                   <input id="thumbnail_text" class="branding-thumbnail-input" type="text" name="thumbnail_text[]" value="<%= f.object.thumbnail_info[:alttext] %>" />
+                </label>
+              </div>
+
+              <div class="col-sm-2">
+                <button class="btn btn-danger delete branding-thumbnail-remove" data-type="DELETE" data-url="/" onclick=$("#thumbnail").remove();>
+                  <span class="fa fa-times"></span>
+                  <span class="controls-remove-text"><%= t('.remove') %></span>
+                  <span class="sr-only">
+                    <%= t('.previous') %>
+                    <span class="controls-field-name-text"><%= t('.remove_current_thumbnail') %></span>
+                  </span>
+                </button>
+              </div> <!-- end col-sm-2 -->
+            </div> <!-- row branding-thumbnail-row -->
+          </div> <!-- end thumbnail -->
+          <div role="presentation" class="table table-striped"><span class="files"></span></div>
+        <% else %>
+          <div role="presentation" class="table table-striped"><span class="files"></span></div>
+        <% end %>
+
+          <!-- The global file processing state -->
+          <span class="fileupload-process"></span>
+        </div> <!-- end container -->
+      </div> <!-- end row branding-thumbnail-list -->
+    </div> <!-- end row branding-thumbnail-list -->
+  </div> <!-- fileuploadthumbnail -->
+
 </div> <!-- end set-access-controls -->

app/views/hyrax/my/collections/_list_collections.html.erb

@@ -28,7 +28,7 @@
           <span class="<%= Hyrax::ModelIcon.css_class_for(::Collection) %> collection-icon-small"></span>
         <% else %>
           <%# OVERRIDE begin %>
-          <%= image_tag(collection_presenter.thumbnail_path, alt: block_for(name: 'default_collection_image_text') || "#{collection_presenter.title_or_label} #{t('hyrax.dashboard.my.sr.thumbnail')}") %>
+          <%= image_tag(collection_presenter.thumbnail_path, alt: collection_presenter.thumbnail_file.first&.[](:alttext) || block_for(name: 'default_collection_image_text') || "#{collection_presenter.title_or_label} #{t('hyrax.dashboard.my.sr.thumbnail')}") %>
           <%# OVERRIDE end %>
         <% end %>
       </div>