hyrax 5.0.1 → 5.0.4

data/app/views/hyrax/content_blocks/_form.html.erb

@@ -29,7 +29,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.edit_content_blocks_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -45,7 +45,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.edit_content_blocks_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -61,7 +61,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.edit_content_blocks_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>

data/app/views/hyrax/dashboard/_sidebar.html.erb

@@ -12,7 +12,7 @@
         </div>
       </div>
     </li>
-    <li class="nav-item">
+    <li class="nav-item <%= 'active' if current_page?(hyrax.dashboard_path) %>">
       <%= link_to hyrax.dashboard_path, class: "nav-link", title: t('hyrax.admin.sidebar.dashboard') do %>
         <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
       <% end %>

data/app/views/hyrax/dashboard/_user_activity.html.erb

@@ -3,7 +3,7 @@
     <%= t('.title') %>
   </div>
   <div class="card-body d-flex justify-content-center">
-    <% if Hyrax.config.analytics? %>
+  <% if Hyrax.config.analytics_reporting? %>
       <%= render 'user_activity_graph' %>
 
       <!-- FIXME: This is like embedded a card in a card...seems odd -->
@@ -22,4 +22,4 @@
       </div>
     <% end %>
   </div>
-</div>
+</div>

data/app/views/hyrax/dashboard/collections/_form.html.erb

@@ -1,28 +1,28 @@
 <%= render "shared/nav_safety_modal" %>
 <div class="tabs mt-4" id="collection-edit-controls">
   <ul class="nav nav-tabs" id="dashboard-collection-tab" role="tablist">
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#description" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
         <%= t('.tabs.description') %>
       </a>
     </li>
     <% if @form.persisted? %>
       <% if collection_brandable?(collection: @collection) %>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#branding" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
           <%= t('.tabs.branding') %>
         </a>
       </li>
       <% end %>
       <% if collection_discoverable?(collection: @collection) %>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#discovery" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
           <%= t('.tabs.discovery') %>
         </a>
       </li>
       <% end %>
       <% if collection_sharable?(collection: @collection) %>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#sharing" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
           <%= t('.tabs.sharing') %>
         </a>

data/app/views/hyrax/dashboard/collections/_form_share.html.erb

@@ -25,10 +25,11 @@
                                         class: 'form-control search-input' %>
               </div>
               <div class="form-group">
-                <label class="mr-2">as</label>
+                <label id="add_group_as" class="mr-2">as</label>
                 <%= builder.select :access,
                                       access_options,
                                       { prompt: t('.select_a_role') },
+                                     'aria-labelledby': "add_group_as",
                                       class: 'form-control' %>
               </div>
             <% end %>
@@ -56,10 +57,11 @@
                                         placeholder: t('.search_for_a_user') %>
               </div>
               <div class="form-group">
-                <label class="mx-2">as</label>
+                <label id="add_user_as" class="mx-2">as</label>
                 <%= builder.select :access,
                                     access_options,
                                     { prompt: t('.select_a_role') },
+                                    'aria-labelledby': "add_user_as",
                                     class: 'form-control' %>
               </div>
             <% end %>
@@ -75,8 +77,8 @@
 
     <h2 class="h3"><%= t(".current_shared") %></h2>
     <section class="section-collection-sharing">
-     
-      
+
+
       <%= render 'form_share_table', access: 'managers', filter: :manage? %>
       <%= render 'form_share_table', access: 'depositors', filter: :deposit? %>
       <%= render 'form_share_table', access: 'viewers', filter: :view? %>

data/app/views/hyrax/dashboard/collections/_list_collections.html.erb

@@ -12,7 +12,7 @@
     <input type="checkbox" name="batch_document_ids[]" id="batch_document_<%= id %>" value="<%= id %>" class="batch_document_selector"
       data-hasaccess="<%= (can?(:edit, collection_presenter.solr_document)) %>" />
     <% else %>
-    <input type="checkbox" class="disabled batch_document_selector" disabled=true />
+    <input type="checkbox" id="batch_document_<%= id %>" class="disabled batch_document_selector" disabled=true />
     <% end %>
   </td>
   <td>

data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb

@@ -7,7 +7,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], "class" => "media-left mr-3", "aria-hidden" => "true" do %>
+      <%= link_to [main_app, document], "class" => "media-left mr-3" do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
           { class: "d-none d-md-block file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true }
         ) %>

data/app/views/hyrax/dashboard/show_admin.html.erb

@@ -3,34 +3,34 @@
 <% end %>
 
 <div class="spaced-rows">
-  <% if Hyrax.config.analytics? %>
-  <div class="row">
-    <div class="col">
-      <div class="card">
-        <div class="card-header">
-          <h2 class="card-title"><%= t(".graph_reports") %>:</h2>
-          <%= params[:start_date].present? ? params[:start_date].to_date : 1.month.ago.beginning_of_day.to_date %> -
-          <%= params[:end_date].present? ? params[:end_date].to_date : Time.zone.now.end_of_day.to_date %>
-        </div>
-        <div class="card-body">
-          <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.dashboard_path %>
+  <% if Hyrax.config.analytics_reporting? %>
+    <div class="row">
+      <div class="col">
+        <div class="card">
+          <div class="card-header">
+            <h2 class="card-title"><%= t(".graph_reports") %>:</h2>
+            <%= params[:start_date].present? ? params[:start_date].to_date : 1.month.ago.beginning_of_day.to_date %> -
+            <%= params[:end_date].present? ? params[:end_date].to_date : Time.zone.now.end_of_day.to_date %>
+          </div>
+          <div class="card-body">
+            <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.dashboard_path %>
+          </div>
         </div>
       </div>
     </div>
-  </div>
 
-  <div class="row">
-    <div class="col">
-      <div class="card">
-        <%= render 'user_activity' %>
+    <div class="row">
+      <div class="col">
+        <div class="card">
+          <%= render 'user_activity' %>
+        </div>
       </div>
     </div>
-  </div>
   <% end %>
 
   <div class="row">
     <div class="col">
-     <%= render 'repository_growth' %>
+      <%= render 'repository_growth' %>
     </div>
   </div>
 
@@ -50,4 +50,3 @@
 <div class="clearfix mt-5">
   <%= render 'tabs' %>
 </div>
-

data/app/views/hyrax/dashboard/sidebar/_activity.html.erb

@@ -33,7 +33,7 @@
     <% end %>
   <% end %>
 
-  <% if current_ability.can_create_any_work? && Hyrax.config.analytics? %>
+  <% if current_ability.can_create_any_work? && Hyrax.config.analytics_reporting? %>
     <li class="nav-item">
       <%= menu.collapsable_section t('hyrax.admin.sidebar.analytics'),
                                         icon_class: "fa fa-pie-chart",

data/app/views/hyrax/embargoes/_list_expired_active_embargoes.html.erb

@@ -22,7 +22,7 @@
     <table class="embargoes table">
       <thead>
         <tr>
-          <th><input type="checkbox" id="checkAllBox" class="batch_document_selector"/> <%= t('.select_all') %></th>
+          <th><input type="checkbox" id="checkAllBox" class="batch_document_selector" aria-labelledby="checkAllBox"/> <label for="checkAllBox"><%= t('.select_all') %></label></th>
           <%= render partial: 'table_headers' %>
         </tr>
       </thead>
@@ -31,19 +31,19 @@
         <tr>
           <td><%= render 'hyrax/batch_select/add_button', document: curation_concern %></td>
           <td class="human-readable-type"><%= curation_concern.human_readable_type %></td>
-          <td class="title"><%= link_to curation_concern, edit_embargo_path(curation_concern) %></td>
+          <td class="title"><label for="batch_document_<%= curation_concern.id %>"><%= link_to curation_concern, edit_embargo_path(curation_concern) %></label></td>
           <td class="current-visibility"><%= visibility_badge(curation_concern.visibility) %></td>
           <td class="embargo-release-date"><%= curation_concern.embargo_release_date %></td>
           <td class="visibility-after-embargo"><%= visibility_badge(curation_concern.visibility_after_embargo) %></td>
-          <td class="actions"><%= link_to t('.deactivate'), embargo_path(curation_concern), method: :delete, class: 'btn btn-primary' %></td>
         </tr>
         <tr data-behavior="extra" data-id="<%= curation_concern.id %>" class="extra-embargo-info">
           <td></td>
-          <td colspan=5>
-            <%= check_box_tag "embargoes[#{i}][copy_visibility]", curation_concern.id, true %>
-            <%= t('.change_all', cc: curation_concern) %>
-            <%= visibility_badge(curation_concern.visibility_after_embargo) %>?
+          <td colspan=4>
+            <%= check_box_tag "embargoes[#{i}][copy_visibility]", curation_concern.id, true, 'aria-labelledby': "embargoes_#{i}_copy_visibility" %>
+            <label for="embargoes_<%= i %>_copy_visibility"><%= t('.change_all', cc: curation_concern) %>
+            <%= visibility_badge(curation_concern.visibility_after_embargo) %>?</label>
           </td>
+          <td class="actions"><%= link_to t('.deactivate'), embargo_path(curation_concern), method: :delete, class: 'btn btn-primary' %></td>
         </tr>
       <% end %>
       </tbody>

data/app/views/hyrax/file_sets/_actions.html.erb

@@ -45,8 +45,16 @@
                     class: "download",
                     data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids } %>
       </li>
-    <% end %>
 
+      <% file_set.extensions_and_mime_types&.each do |hash| %>
+        <% next unless hash[:name] %>
+        <li class ="dropdown-item" role="menuitem" tabindex="-1">
+          <a href="<%= download_url(id: file_set.id, locale: 'en', file: hash[:name], mime_type: hash[:mime_type]) %>" download>
+            Download <em>(as <%= hash[:name] %>)</em>
+          </a>
+        </li>
+      <% end %>
+    <% end %>
     </ul>
   </div>
   <% end %>

data/app/views/hyrax/file_sets/_permission_form.html.erb

@@ -56,8 +56,10 @@
         <%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
       </div>
       <div class="col-sm-3">
-        <span class="sr-only"><%= t('.add_new_group_skel') %></span>
-        <button class="btn btn-secondary" id="add_new_group_skel"><i class="fa fa-plus"></i></button>
+        <button class="btn btn-secondary" id="add_new_group_skel">
+          <span class="sr-only"><%= t('.add_new_group_skel') %></span>
+          <i class="fa fa-plus"></i>
+        </button>
         <br /><span id="directory_group_result"></span>
       </div>
     </div>

data/app/views/hyrax/file_sets/_show_actions.html.erb

@@ -1,5 +1,5 @@
 <div class="form-actions">
-  <% if Hyrax.config.analytics? %>
+  <% if Hyrax.config.analytics_reporting? %>
     <% # turbolinks needs to be turned off or the page will use the cache and the %>
     <% # analytics graph will not show unless the page is refreshed. %>
     <%= link_to t('.analytics'), @presenter.stats_path, id: 'stats', class: 'btn btn-secondary', data: { turbolinks: false } %>

data/app/views/hyrax/homepage/_featured.html.erb

@@ -4,5 +4,5 @@
     <div class="col-sm-10">
       <%= render 'hyrax/homepage/featured_fields', featured: presenter %>
     </div>
-</div>
+  </div>
 </li>

data/app/views/hyrax/homepage/_recent_document.html.erb

@@ -11,10 +11,10 @@
           <% end %>
         </h3>
         <p class="recent-field">
-          <span class="recent-label"><%= t('hyrax.homepage.recently_uploaded.document.depositor_label') %>:</span> <%= link_to_profile recent_document.depositor(t('hyrax.homepage.recently_uploaded.document.depositor_missing')) %>
+          <span class="recent-label text-dark"><%= t('hyrax.homepage.recently_uploaded.document.depositor_label') %>:</span> <%= link_to_profile recent_document.depositor(t('hyrax.homepage.recently_uploaded.document.depositor_missing')) %>
         </p>
         <p class="recent-field">
-          <span class="recent-label"><%= t('hyrax.homepage.recently_uploaded.document.keyword_label') %>:</span> <%= link_to_facet_list(recent_document.keyword, 'keyword', t('hyrax.homepage.recently_uploaded.document.keyword_missing')).html_safe %>
+          <span class="recent-label text-dark"><%= t('hyrax.homepage.recently_uploaded.document.keyword_label') %>:</span> <%= link_to_facet_list(recent_document.keyword, 'keyword', t('hyrax.homepage.recently_uploaded.document.keyword_missing')).html_safe %>
         </p>
       </div>
     </div>

data/app/views/hyrax/leases/_list_expired_active_leases.html.erb

@@ -32,19 +32,19 @@
         <tr>
           <td><%= render 'hyrax/batch_select/add_button', document: curation_concern %></td>
           <td class="human-readable-type"><%= curation_concern.human_readable_type %></td>
-          <td class="title"><%= link_to curation_concern, edit_lease_path(curation_concern) %></td>
+          <td class="title"><label for="batch_document_<%= curation_concern.id %>"><%= link_to curation_concern, edit_lease_path(curation_concern) %></label></td>
           <td class="current-visibility"><%= visibility_badge(curation_concern.visibility) %></td>
           <td class="lease-release-date"><%= curation_concern.lease_expiration_date %></td>
           <td class="visibility-after-lease"><%= visibility_badge(curation_concern.visibility_after_lease) %></td>
-          <td class="actions"><%= link_to t('.deactivate'), lease_path(curation_concern), method: :delete, class: 'btn btn-primary' %></td>
         </tr>
         <tr data-behavior="extra" data-id="<%= curation_concern.id %>" class="extra-lease-info">
           <td></td>
-          <td colspan=5>
-            <%= check_box_tag "leases[#{i}][copy_visibility]", curation_concern.id, true %>
-            <%= t('.change_all', cc: curation_concern) %>
-            <%= visibility_badge(curation_concern.visibility_after_lease) %>?
+          <td colspan=4>
+            <%= check_box_tag "leases[#{i}][copy_visibility]", curation_concern.id, true, 'aria-labelledby': "leases_#{i}_copy_visibility" %>
+            <label for="leases_<%= i %>_copy_visibility"><%= t('.change_all', cc: curation_concern) %>
+            <%= visibility_badge(curation_concern.visibility_after_lease) %>?</label>
           </td>
+          <td class="actions"><%= link_to t('.deactivate'), lease_path(curation_concern), method: :delete, class: 'btn btn-primary' %></td>
         </tr>
       <% end %>
       </tbody>

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

@@ -14,7 +14,7 @@
         <input type="checkbox" name="batch_document_ids[]" id="batch_document_<%= id %>" value="<%= id %>" class="batch_document_selector"
                data-hasaccess="<%= (can?(:edit, collection_presenter.solr_document)) %>" />
     <% else %>
-        <input type="checkbox" class="disabled" disabled=true />
+        <input type="checkbox" id="batch_document_<%= id %>" class="disabled batch_document_selector" disabled=true />
     <% end %>
   </td>
   <td>

data/app/views/hyrax/my/collections/_tabs.html.erb

@@ -1,5 +1,5 @@
 <% current_page_dashboard = current_page?(hyrax.dashboard_collections_path(locale: nil)) %>
-<ul class="nav nav-tabs" id="my_nav" role="navigation">
+<ul class="nav nav-tabs" id="my_nav">
   <li<%= ' class="nav-item"'.html_safe if current_page_dashboard %>>
     <%= link_to(
       t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.collections"), 

data/app/views/hyrax/pages/_form.html.erb

@@ -2,22 +2,22 @@
 <div class="card tabs">
 
   <ul class="nav nav-tabs" role="tablist">
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#about" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
         <%= t(:'hyrax.pages.tabs.about_page') %>
       </a>
     </li>
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#help" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
         <%= t(:'hyrax.pages.tabs.help_page') %>
       </a>
     </li>
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#agreement" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
         <%= t(:'hyrax.pages.tabs.agreement_page') %>
       </a>
     </li>
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#terms" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
         <%= t(:'hyrax.pages.tabs.terms_page') %>
       </a>
@@ -36,7 +36,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -52,7 +52,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -68,7 +68,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -84,7 +84,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.edit_pages_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>

data/app/views/hyrax/transfers/_received.html.erb

@@ -23,7 +23,7 @@
         <% if req.pending? %>
             <div class="btn-group">
               <button class="btn btn-sm btn-primary" href="#"><%= t(".accept") %></button>
-              <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"></button>
+              <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"><span class="sr-only">accept options</span></button>
               <ul class="dropdown-menu">
                 <li class="dropdown-item">
                   <%= link_to t(".allow_depositor_to_retain_edit_access"), hyrax.accept_transfer_path(req), method: :put, class: 'accept-retain', title: t(".accept_the_file_and_allow_the_original_depositor_to_retain_access_to_edit_the_file_and_metadata") %>

data/app/views/hyrax/uploads/create.json.jbuilder

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 json.files [@upload] do |uploaded_file|
   json.id uploaded_file.id
-  json.name uploaded_file.file.file.filename
-  json.size uploaded_file.file.file.size
+  json.name uploaded_file.file&.file&.filename
+  json.size uploaded_file.file&.file&.size
   # TODO: implement these
   # json.url  "/uploads/#{uploaded_file.id}"
   # json.thumbnail_url uploaded_file.id

data/app/views/hyrax/users/_activity_log.html.erb

@@ -7,17 +7,23 @@
       </tr>
     </thead>
     <tbody>
-    <% events.each do |event| %>
-      <% next if event[:action].blank? or event[:timestamp].blank? %>
+    <% valid_events = events.reject { |event| event[:action].blank? || event[:timestamp].blank? } %>
+    <% if valid_events.empty? %>
       <tr>
-        <td class="ensure-wrapped"><%= sanitize event[:action] %></td>
-        <% time = Time.zone.at(event[:timestamp].to_i) %>
-        <td data-sort="<%= time.getutc.iso8601(5) %>">
-          <relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">
-            <%= time.to_formatted_s(:long_ordinal) %>
-          </relative-time>
-        </td>
+        <td colspan="2">No user activity</td>
       </tr>
+    <% else %>
+      <% valid_events.each do |event| %>
+        <tr>
+          <td class="ensure-wrapped"><%= sanitize event[:action] %></td>
+          <% time = Time.zone.at(event[:timestamp].to_i) %>
+          <td data-sort="<%= time.getutc.iso8601(5) %>">
+            <relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">
+              <%= time.to_formatted_s(:long_ordinal) %>
+            </relative-time>
+          </td>
+        </tr>
+      <% end %>
     <% end %>
     </tbody>
   </table>

data/app/views/hyrax/users/_user_row.html.erb

@@ -1,8 +1,11 @@
 <tr>
-  <td><%= link_to hyrax.user_path(user) do %>
-        <%= image_tag(user.avatar.url(:thumb), width: 30) if user.avatar.file %>
+   <td>
+     <% if user.avatar.file %>
+      <%= link_to hyrax.user_path(user) do %>
+        <%= image_tag(user.avatar.url(:thumb), width: 30, alt: user.name) %>
       <% end %>
-  </td>
+     <% end %>
+   </td>
    <td><%= link_to user.name, hyrax.user_path(user) %></td>
    <td><%= link_to user.user_key, hyrax.user_path(user) %></td>
    <td><%= user.department %></td>

data/app/views/hyrax/users/_vitals.html.erb

@@ -12,7 +12,8 @@
   <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_works(user) %>
 
   <ul class="views-downloads-dashboard list-unstyled">
-      <li><span class="badge badge-optional dark-text"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
-      <li><span class="badge badge-optional dark-text"><%= user.total_file_downloads %></span> <%= t("hyrax.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
+    <li><span class="badge badge-optional dark-text"><%= user.total_work_views %></span> <%= t("hyrax.dashboard.stats.work_views").pluralize(user.total_work_views) %></li>
+    <li><span class="badge badge-optional dark-text"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
+    <li><span class="badge badge-optional dark-text"><%= user.total_file_downloads %></span> <%= t("hyrax.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
   </ul>
 </div>

data/app/views/layouts/_head_tag_content.html.erb

@@ -29,6 +29,8 @@ signed in %>
 <% if Hyrax.config.analytics? %>
   <% if Hyrax.config.analytics_provider == 'google' %>
     <%= render partial: 'shared/ga', formats: [:html]  %>
+  <% elsif Hyrax.config.analytics_provider == 'ga4' %>
+    <%= render partial: 'shared/ga4', formats: [:html] %>
   <% elsif Hyrax.config.analytics_provider == 'matomo' %>
     <%= render partial: 'shared/matomo', formats: [:html] %>
   <% end %>

data/app/views/shared/_appearance_styles.html.erb

@@ -14,11 +14,15 @@ a { color: <%= appearance.link_color %>; }
 .navbar-dark.bg-dark .navbar-text,
 .navbar-dark.bg-dark .navbar-brand { color: <%= appearance.header_text_color %>; }
 
-.btn-primary {
+.btn-primary, .page-item.active .page-link {
   background-color: <%= appearance.primary_button_background_color %>;
   border-color: <%= appearance.primary_button_border_color %>;
 }
 
+.page-link {
+  color: <%= appearance.primary_button_background_color %>;
+}
+
 .btn-primary:focus,
 .btn-primary.focus {
   background-color: <%= appearance.primary_button_focus_background_color %>;

data/app/views/shared/_ga4.html.erb

@@ -0,0 +1,11 @@
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%= Hyrax::Analytics.config.analytics_id %>"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '<%= Hyrax::Analytics.config.analytics_id %>');
+  window.analytics = gtag;
+</script>
+<meta name="analytics-provider" content="ga4">

data/app/views/shared/_select_work_type_modal.html.erb

@@ -7,12 +7,21 @@
         <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
       </div>
       <div class="modal-body">
+        <% if Flipflop.assign_admin_set? %>
+          <div class="select-work-admin-set">
+            <div class="admin-set-title">
+              <%= t('hyrax.dashboard.heading_actions.select_admin_set') %>
+            </div>
+            <%= select_tag(:admin_set_id, options_for_select(@admin_sets_for_select), class: 'form-control') if @admin_sets_for_select %>
+          </div>
+        <% end %>
         <% create_work_presenter.each do |row_presenter| %>
           <div class="select-worktype">
             <label>
               <input type="radio" name="payload_concern" value="<%= row_presenter.concern %>"
                                                            data-single="<%= row_presenter.switch_to_new_work_path(route_set: main_app, params: params) %>"
-                                                           data-batch="<%= row_presenter.switch_to_batch_upload_path(route_set: hyrax, params: params) %>" />
+                                                           data-batch="<%= row_presenter.switch_to_batch_upload_path(route_set: hyrax, params: params) %>"
+                                                           required />
               <div class="select-work-icon">
                 <span class="<%= row_presenter.icon_class %>"></span>
               </div>

data/bin/db-migrate-seed.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 set -e
 
-db-wait.sh "$DB_HOST:$DB_PORT"
+service-wait.sh "$DB_HOST:$DB_PORT"
 bundle exec rails db:create
 bundle exec rails db:migrate
 
 if [ "$FCREPO_HOST" ]; then
-  db-wait.sh "$FCREPO_HOST:$FCREPO_PORT"
+  service-wait.sh "$FCREPO_HOST:$FCREPO_PORT"
 fi
-db-wait.sh "$SOLR_HOST:$SOLR_PORT"
+service-wait.sh "$SOLR_HOST:$SOLR_PORT"
 
 bundle exec rails db:seed

data/bin/dev-entrypoint.sh

@@ -1,13 +1,18 @@
 #!/bin/sh
 set -e
 
-mkdir -p /app/samvera/hyrax-webapp/tmp/pids
-rm -f /app/samvera/hyrax-webapp/tmp/pids/*
+mkdir -p $RAILS_ROOT/tmp/pids
+rm -f $RAILS_ROOT/tmp/pids/*
+
+RUBY_MAJOR=$(ruby -e "puts /^(?'major'\d+)\.(?'minor'\d+)\.(?'patch'\d+)/.match(RUBY_VERSION)[:major]")
 
 # Copy gems installed in the image to the dev bundle
 mkdir -p /app/bundle/ruby/$RUBY_MAJOR.0
 cp -Rn /usr/local/bundle/* /app/bundle/ruby/$RUBY_MAJOR.0
 bundle install
+yarn install
+
+db-migrate-seed.sh
 
 # Run the command
 exec "$@"

data/bin/{db-wait.sh → service-wait.sh}

@@ -5,9 +5,9 @@ port=$(printf "%s\n" "$1"| cut -d : -f 2)
 
 shift 1
 
+echo "silently waiting for $host:$port"
 while ! nc -z "$host" "$port"
 do
-  echo "waiting for $host:$port"
   sleep 1
 done