From cfdc1ec3cde113d66e81e1fed41af30db911723c Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Thu, 20 Jun 2024 17:08:33 -0700
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Add=20Child=20link?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The links under the Add Child dropdown was not working because the HTML
structure was not correct.  This commit will close the button tag and
then open the ul tag which allows the links to be clickable.

Ref:
  - https://github.com/scientist-softserv/palni_palci_knapsack/issues/78
---
 app/views/hyrax/base/_show_actions.html.erb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/hyrax/base/_show_actions.html.erb b/app/views/hyrax/base/_show_actions.html.erb
index 1b5398d98..d1bf701cb 100644
--- a/app/views/hyrax/base/_show_actions.html.erb
+++ b/app/views/hyrax/base/_show_actions.html.erb
@@ -35,13 +35,14 @@
         <div class="btn-group">
           <button type="button" class="btn btn-secondary dropdown-toggle" type="button" id="dropdown-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <%= t('.attach_child') %>
-            <ul class="dropdown-menu">
-              <% presenter.valid_child_concerns.each do |concern| %>
-                <li class="dropdown-item">
-                  <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
-                </li>
-              <% end %>
-            </ul>
+          </button>
+          <ul class="dropdown-menu">
+            <% presenter.valid_child_concerns.each do |concern| %>
+              <li class="dropdown-item">
+                <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
+              </li>
+            <% end %>
+          </ul>
         </div>
       <% end %>
       <%# OVERRIDE to validate delete permission %>

From 00214fc383be1cfd588789fb054d022843b7391e Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Fri, 21 Jun 2024 09:51:44 -0700
Subject: [PATCH 2/2] Change the structure of work show, add child link

Since the bootstrap upgrade the structure of ul > il > a doesn't seem to
work like before.  The <a> tag was only clickable when you hover over
the text.  This change will make the whole <li> clickable much like the
nav dropdown menu for the My Profile/Dashboard/Logout links on the top
right of the masthead.
---
 app/views/hyrax/base/_show_actions.html.erb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/hyrax/base/_show_actions.html.erb b/app/views/hyrax/base/_show_actions.html.erb
index d1bf701cb..170cf448a 100644
--- a/app/views/hyrax/base/_show_actions.html.erb
+++ b/app/views/hyrax/base/_show_actions.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax v5.0.0rc2 Adjust permission checks for delete and add analytics button and add ENV to control turbolinks %>
+<%# OVERRIDE Hyrax v5.0.1 Adjust permission checks for delete and add analytics button and add ENV to control turbolinks %>
 <div class="row show-actions button-row-top-two-column">
   <div class="col-sm-6">
     <% if !workflow_restriction?(presenter) %>
@@ -36,13 +36,11 @@
           <button type="button" class="btn btn-secondary dropdown-toggle" type="button" id="dropdown-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <%= t('.attach_child') %>
           </button>
-          <ul class="dropdown-menu">
+          <div class="dropdown-menu">
             <% presenter.valid_child_concerns.each do |concern| %>
-              <li class="dropdown-item">
-                <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
-              </li>
+              <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id), class: "dropdown-item" %>
             <% end %>
-          </ul>
+          </div>
         </div>
       <% end %>
       <%# OVERRIDE to validate delete permission %>