From 4c57b285a0da5adedf2746dd884158329f525cbc Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Thu, 5 Oct 2023 08:47:22 -0400
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Favor=20Hyku::Application.?=
 =?UTF-8?q?path=5Ffor=20over=20Rails.root?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Given the existence of Knapsack we need to consider how overrides in
Knapsack will take precedence over Hyku files.  This change handles
cases where we want to use the Knapsack's uploaded thumbnails.

Related to:

- #2010
---
 app/services/uploaded_collection_thumbnail_path_service.rb    | 4 ++--
 .../hyrax/dashboard/collections/_current_thumbnail.html.erb   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/services/uploaded_collection_thumbnail_path_service.rb b/app/services/uploaded_collection_thumbnail_path_service.rb
index 18a3f662e..c22ac5801 100644
--- a/app/services/uploaded_collection_thumbnail_path_service.rb
+++ b/app/services/uploaded_collection_thumbnail_path_service.rb
@@ -9,11 +9,11 @@ def call(object)
 
     # rubocop:disable Metrics/LineLength, Rails/FilePath, Lint/StringConversionInInterpolation
     def uploaded_thumbnail?(collection)
-      File.exist?("#{Rails.root.to_s}/public/uploads/uploaded_collection_thumbnails/#{collection.id}/#{collection.id}_card.jpg")
+      File.exist?(File.join(upload_dir(collection), "#{collection.id}_card.jpg"))
     end
 
     def upload_dir(collection)
-      "#{Rails.root.to_s}/public/uploads/uploaded_collection_thumbnails/#{collection.id}"
+      Hyku::Application.path_for("public/uploads/uploaded_collection_thumbnails/#{collection.id}")
     end
     # rubocop:enable Metrics/LineLength, Rails/FilePath, Lint/StringConversionInInterpolation
   end
diff --git a/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb b/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb
index 33306d375..fb64f8cc4 100644
--- a/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb
+++ b/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb
@@ -1,5 +1,5 @@
 <% thumbnail_path = SolrDocument.find(@collection.id).thumbnail_path %>
- <% if thumbnail_path.include?("uploaded_collection_thumbnails") and File.exist? Rails.root.join("public#{::SolrDocument.find(@collection.id).thumbnail_path}") %>
+ <% if thumbnail_path.include?("uploaded_collection_thumbnails") and File.exist? Hyky::Application.path_for("public#{::SolrDocument.find(@collection.id).thumbnail_path}") %>
   <%= image_tag(thumbnail_path, class: "current-thumbnail") %>
   <p>Current image: <strong><%= @thumbnail_filename %></strong></p>
 <% else %>