hyrax 5.0.0.rc2 → 5.0.0.rc3

data/app/services/hyrax/listeners/object_lifecycle_listener.rb

@@ -10,7 +10,11 @@ module Hyrax
       # @param [Dry::Events::Event] event
       # @return [void]
       def on_object_deleted(event)
-        ContentDeleteEventJob.perform_later(event[:id].to_s, event[:user])
+        # Accessing a non-existent key on a Dry::Events::Event will raise a KeyError; hence
+        # we cast the event to a hash
+        event = event.to_h
+        object_id = event[:object]&.id || event[:id]
+        ContentDeleteEventJob.perform_later(object_id.to_s, event[:user])
       end
 
       ##

data/app/services/hyrax/listeners/trophy_cleanup_listener.rb

@@ -9,7 +9,8 @@ module Hyrax
       # @param [Dry::Events::Event] event
       # @return [void]
       def on_object_deleted(event)
-        Trophy.where(work_id: event[:id]).destroy_all
+        object_id = event[:object]&.id || event[:id]
+        Trophy.where(work_id: object_id).destroy_all
       rescue StandardError => err
         Hyrax.logger.warn "Failed to delete trophies for #{event[:id]}. " \
                           'These trophies might be orphaned.' \

data/app/services/hyrax/listeners/workflow_listener.rb

@@ -22,6 +22,7 @@ module Hyrax
       # @param [Dry::Events::Event] event
       # @return [void]
       def on_object_deposited(event)
+        event = event.to_h
         return Hyrax.logger.warn("Skipping workflow initialization for #{event[:object]}; no user is given\n\t#{event}") if
           event[:user].blank?
 
@@ -30,6 +31,18 @@ module Hyrax
         # don't error on known sipity error types; log instead
         Hyrax.logger.error(err)
       end
+
+      ##
+      # Called when 'object.deleted' event is published
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_object_deleted(event)
+        event = event.to_h
+        return unless event[:object]
+        gid = Hyrax::ValkyrieGlobalIdProxy.new(resource: event[:object]).to_global_id
+        return if gid.blank?
+        Sipity::Entity.where(proxy_for_global_id: gid.to_s).destroy_all
+      end
     end
   end
 end

data/app/services/hyrax/listeners.rb

@@ -17,7 +17,8 @@ module Hyrax
   module Listeners
     extend ActiveSupport::Autoload
 
-    autoload :AclIndexListener
+    autoload :ACLIndexListener
+    autoload :ActiveFedoraACLIndexListener
     autoload :BatchNotificationListener
     autoload :FileMetadataListener
     autoload :FileSetLifecycleListener

data/app/services/hyrax/location_service.rb

@@ -10,6 +10,9 @@ module Hyrax
       Rails.cache.fetch(cache_key(id), expires_in: CACHE_EXPIRATION) do
         label.call(find(id))
       end
+    rescue URI::InvalidURIError
+      # Old data may be just a string, display it.
+      uri
     end
 
     private

data/app/services/hyrax/multiple_membership_checker.rb

@@ -145,7 +145,7 @@ module Hyrax
     def collection_titles_from_list(collection_list)
       collection_list.map do |collection|
         collection.title.first
-      end.to_sentence
+      end.sort.to_sentence
     end
   end
 end

data/app/services/hyrax/simple_schema_loader.rb

@@ -15,7 +15,7 @@ module Hyrax
     #   types
     def attributes_for(schema:)
       definitions(schema).each_with_object({}) do |definition, hash|
-        hash[definition.name] = definition.type
+        hash[definition.name] = definition.type.meta(definition.config)
       end
     end
 

data/app/services/hyrax/solr_service.rb

@@ -9,6 +9,22 @@ module Hyrax
   class SolrService
     COMMIT_PARAMS = { softCommit: true }.freeze
 
+    ##
+    # @!group Class Attributes
+    #
+    # @!attribute additional_solr_get_and_post_params
+    #
+    #   ActiveFedora::SolrService always assumed that it would pass `qt: 'standard'`.  However, as
+    #   Valkyrie arrived, we have a case where we would not pass the `qt: standard`.  We're favoring
+    #   a default value to preserve prior expectations that ActiveFedora::SolrService set and to not
+    #   suddenly break those that switch to Valkyrie and Hyrax::SolrService.
+    #
+    #   @return [Hash<Symbol, String>]
+    #   @see https://github.com/samvera/hyrax/pull/6677
+    class_attribute :additional_solr_get_and_post_params, default: { qt: 'standard' }
+    # @!endgroup Class Attributes
+    ##
+
     ##
     # @!attribute [r] use_valkyrie
     #   @private
@@ -17,7 +33,7 @@ module Hyrax
     delegate :commit, to: :connection
 
     def initialize(use_valkyrie: Hyrax.config.query_index_from_valkyrie)
-      @old_service = ActiveFedora::SolrService
+      @old_service = ActiveFedora::SolrService # What hopefully will be the lone reference to ActiveFedora::SolrService
       @use_valkyrie = use_valkyrie
     end
 
@@ -46,9 +62,8 @@ module Hyrax
     def get(query = nil, **args)
       # Make Hyrax.config.solr_select_path the default SOLR path
       solr_path = args.delete(:path) || Hyrax.config.solr_select_path
-      args = args.merge(q: query) if query.present?
+      args = args.merge(additional_solr_get_and_post_params.merge(q: query)) if query.present?
 
-      args = args.merge(qt: 'standard') unless query.blank? || use_valkyrie
       connection.get(solr_path, params: args)
     end
 
@@ -66,9 +81,8 @@ module Hyrax
     def post(query = nil, **args)
       # Make Hyrax.config.solr_select_path the default SOLR path
       solr_path = args.delete(:path) || Hyrax.config.solr_select_path
-      args = args.merge(q: query) if query.present?
+      args = args.merge(additional_solr_get_and_post_params.merge(q: query)) if query.present?
 
-      args = args.merge(qt: 'standard') unless query.blank? || use_valkyrie
       connection.post(solr_path, data: args)
     end
 

data/app/services/hyrax/statistics/collections/over_time.rb

@@ -7,7 +7,7 @@ module Hyrax
 
         def relation
           AbstractTypeRelation
-            .new(allowable_types: [Hyrax.config.collection_class])
+            .new(allowable_types: Hyrax::ModelRegistry.collection_classes)
         end
       end
     end

data/app/services/hyrax/statistics/query_service.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 module Hyrax
   module Statistics
+    ##
+    # @deprecated for removal in 6.0.0
     class QueryService
+      extend Deprecation
+      self.deprecation_horizon = 'hyrax version 6.0.0'
+      deprecation_deprecate :initialize
+
       # query to find works created during the time range
       # @param [DateTime] start_datetime starting date time for range query
       # @param [DateTime] end_datetime ending date time for range query

data/app/services/hyrax/valkyrie_persist_derivatives.rb

@@ -43,9 +43,16 @@ module Hyrax
     # @return [Hyrax::FileSet]
     def self.fileset_for_directives(directives)
       path = URI(directives.fetch(:url)).path
-      id = path.sub(Hyrax.config.derivatives_path.to_s, "")
-               .delete('/')
-               .match(/^(.*)-\w*(\.\w+)*$/) { |m| m[1] }
+      # checks if it's a file path, else assuming it is already an id
+      # Hyrax::FileSetDerivativesService#extract_full_text passes in the raw uri
+      # and not a derivative_url like the other derivative formats
+      id = if path.include?("/")
+             path.sub(Hyrax.config.derivatives_path.to_s, "")
+                 .delete('/')
+                 .match(/^(.*)-\w*(\.\w+)*$/) { |m| m[1] }
+           else
+             path
+           end
       raise "Could not extract fileset id from path #{path}" unless id
 
       Hyrax.metadata_adapter.query_service.find_by(id: id)
@@ -59,7 +66,7 @@ module Hyrax
       if directives.key?(:container)
         "Hyrax::FileMetadata::Use::#{directives[:container].upcase}".constantize
       else
-        Hyrax::FileMetadata::Use::THUMBNAIL
+        Hyrax::FileMetadata::Use::THUMBNAIL_IMAGE
       end
     end
   end

data/app/services/hyrax/valkyrie_upload.rb

@@ -55,12 +55,12 @@ class Hyrax::ValkyrieUpload
 
     saved_metadata = Hyrax.persister.save(resource: file_metadata)
     saved_metadata.original_filename = filename if saved_metadata.original_filename.blank?
-    Hyrax.publisher.publish("file.uploaded", metadata: saved_metadata)
 
     add_file_to_file_set(file_set: file_set,
                          file_metadata: saved_metadata,
                          user: user)
 
+    Hyrax.publisher.publish("file.uploaded", metadata: saved_metadata)
     Hyrax.publisher.publish('file.metadata.updated', metadata: saved_metadata, user: user)
 
     saved_metadata

data/app/services/hyrax/work_uploads_handler.rb

@@ -93,7 +93,10 @@ module Hyrax
         event_payloads = files.each_with_object([]) { |file, arry| arry << make_file_set_and_ingest(file) }
         @persister.save(resource: work)
         Hyrax.publisher.publish('object.metadata.updated', object: work, user: files.first.user)
-        event_payloads.each { |payload| Hyrax.publisher.publish('file.set.attached', payload) }
+        event_payloads.each do |payload|
+          payload.delete(:job).enqueue
+          Hyrax.publisher.publish('file.set.attached', payload)
+        end
       end
     end
 
@@ -114,9 +117,7 @@ module Hyrax
       file_set.permission_manager.acl.save if file_set.permission_manager.acl.pending_changes?
       append_to_work(file_set)
 
-      ValkyrieIngestJob.perform_later(file)
-
-      { file_set: file_set, user: file.user }
+      { file_set: file_set, user: file.user, job: ValkyrieIngestJob.new(file) }
     end
 
     ##

data/app/views/_user_util_links.html.erb

@@ -10,7 +10,7 @@
         <span><%= current_user.name %></span>
         <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
       </a>
-      <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
         <%= link_to "My Profile", hyrax.dashboard_profile_path(current_user), class: 'dropdown-item' %>
         <%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path, class: "dropdown-item" %>
         <div class="dropdown-divider"></div>

data/app/views/collections/edit_fields/_based_near.html.erb

@@ -1,8 +1,12 @@
 <%= f.input key,
-  as: :multi_value,
-  input_html: {
-    class: 'form-control',
-    data: { 'autocomplete-url' => "/authorities/search/geonames",
-            'autocomplete' => key }
-  },
-  required: f.object.required?(key) %>
+            as: :controlled_vocabulary,
+            placeholder: 'Search for a location',
+            input_html: {
+              class: 'form-control',
+              data: { 'autocomplete-url' => "/authorities/search/geonames",
+                      'autocomplete' => key }
+            },
+            ### Required for the ControlledVocabulary javascript:
+            wrapper_html: { data: { 'autocomplete-url' => "/authorities/search/geonames",
+                                    'field-name' => key }},
+            required: f.object.required?(key) %>

data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb

@@ -1,74 +1,74 @@
-          <div id="participants" class="tab-pane">
-            <div class="card labels edit-sharing-tab">
-              <div class="card-body">
-                <section class="section-add-sharing clearfix">
-                  <h2 class="h3"><%= t('.add_participants') %></h2>
-                  <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
-                  <div class="sharing-row-form">
-                    <%= simple_form_for collection_permission_template_form_for(form: @form),
-                        url: [hyrax, :admin, @form, :permission_template],
-                        html: { id: 'group-participants-form', class: 'form-inline' } do |f| %>
+<div id="participants" class="tab-pane">
+  <div class="card labels edit-sharing-tab">
+    <div class="card-body">
+      <section class="section-add-sharing clearfix">
+        <h2 class="h3"><%= t('.add_participants') %></h2>
+        <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
+        <div class="sharing-row-form">
+          <%= simple_form_for collection_permission_template_form_for(form: @form),
+           url: [hyrax, :admin, @form, :permission_template],
+           html: { id: 'group-participants-form', class: 'form-inline' } do |f| %>
 
-                        <%= f.fields_for 'access_grants_attributes',
-                            f.object.access_grants.build(agent_type: 'group'),
-                            index: 0 do |builder| %>
-                          <div class="form-group">
-                            <label><%= t('.add_group') %></label>
-                            <%= builder.hidden_field :agent_type %>
-                            <%= builder.text_field :agent_id,
-                                placeholder: "Search for a group...",
-                                class: 'form-control' %>
-                          </div>
-                          <div class="form-group">
-                            <label>as</label>
-                            <%= builder.select :access,
-                                access_options,
-                                { prompt: "Select a role..." },
-                                class: 'form-control' %>
-                          </div>
-                        <% end %>
-                        <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
+            <%= f.fields_for 'access_grants_attributes',
+             f.object.access_grants.build(agent_type: 'group'),
+             index: 0 do |builder| %>
+              <div class="form-group">
+                <label><%= t('.add_group') %></label>
+                <%= builder.hidden_field :agent_type %>
+                <%= builder.text_field :agent_id,
+                 placeholder: "Search for a group...",
+                 class: 'form-control' %>
+              </div>
+              <div class="form-group">
+                <label>as</label>
+                <%= builder.select :access,
+                    access_options,
+                    { prompt: "Select a role..." },
+                 class: 'form-control' %>
+              </div>
+            <% end %>
+            <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
 
-                    <% end %>
-                  </div>
+          <% end %>
+        </div>
 
-                  <div class="sharing-row-form">
-                    <%= simple_form_for collection_permission_template_form_for(form: @form),
-                        url: [hyrax, :admin, @form, :permission_template],
-                        html: { id: 'user-participants-form', class: 'form-inline add-users' } do |f| %>
+        <div class="sharing-row-form">
+          <%= simple_form_for collection_permission_template_form_for(form: @form),
+           url: [hyrax, :admin, @form, :permission_template],
+           html: { id: 'user-participants-form', class: 'form-inline add-users' } do |f| %>
 
-                      <%= f.fields_for 'access_grants_attributes',
-                                      f.object.access_grants.build(agent_type: 'user'),
-                                      index: 0 do |builder| %>
-                        <div class="form-group">
-                          <label><%= t('.add_user') %></label>
-                          <%= builder.hidden_field :agent_type %>
-                          <%= builder.text_field :agent_id,
-                                            placeholder: "Search for a user..." %>
-                        </div>
-                        <div class="form-group">
-                          <label>as</label>
-                          <%= builder.select :access,
-                                      access_options,
-                                      { prompt: "Select a role..." },
-                                      class: 'form-control' %>
-                        </div>
-                      <% end %>
-                      <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
-                    <% end %>
-                  </div>
+            <%= f.fields_for 'access_grants_attributes',
+             f.object.access_grants.build(agent_type: 'user'),
+             index: 0 do |builder| %>
+              <div class="form-group">
+                <label><%= t('.add_user') %></label>
+                <%= builder.hidden_field :agent_type %>
+                <%= builder.text_field :agent_id,
+                 placeholder: "Search for a user..." %>
+              </div>
+              <div class="form-group">
+                <label>as</label>
+                <%= builder.select :access,
+                    access_options,
+                    { prompt: "Select a role..." },
+                 class: 'form-control' %>
+              </div>
+            <% end %>
+            <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
+          <% end %>
+        </div>
 
-                  <p class="form-text"><%= t('hyrax.admin.admin_sets.form.note') %></p>
-                </section>
+        <p class="form-text"><%= t('hyrax.admin.admin_sets.form.note') %></p>
+      </section>
 
-                <h2 class="h3"><%= t(".current_participants") %></h2>
-                <fieldset class="admin-set-participants section-collection-sharing">
-                  
-                  <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
-                  <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
-                  <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
-                </fieldset>
+      <h2 class="h3"><%= t(".current_participants") %></h2>
+      <fieldset class="admin-set-participants section-collection-sharing">
 
-              </div><!-- /.card-body -->
-            </div>
-          </div>
+        <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
+        <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
+        <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
+      </fieldset>
+
+    </div><!-- /.card-body -->
+  </div>
+</div>

data/app/views/hyrax/admin/admin_sets/edit.html.erb

@@ -1,5 +1,5 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-edit" aria-hidden="true"></span> <%= t('.header', title: @form.title) %></h1>
+  <h1><span class="fa fa-edit" aria-hidden="true"></span> <%= t('.header', title: Array(@form.title).first) %></h1>
 <% end %>
 
 <div class="row">

data/app/views/hyrax/admin/collection_types/_form_participants.html.erb

@@ -1,6 +1,8 @@
 <h3><%= t('.add_participants') %></h3>
 <p><%= t('.instructions') %></p>
-<% access_options = options_for_select([['Manager', Hyrax::CollectionTypeParticipant::MANAGE_ACCESS], ['Creator', Hyrax::CollectionTypeParticipant::CREATE_ACCESS]]) %>
+<% access_options = options_for_select([
+    [t('hyrax.dashboard.collections.form_share.access_options.manager'), Hyrax::CollectionTypeParticipant::MANAGE_ACCESS],
+    [t('hyrax.dashboard.collections.form_share.access_options.creator'), Hyrax::CollectionTypeParticipant::CREATE_ACCESS]]) %>
 <% unless @collection_type_participant.nil? %>
 
   <section class="section-participants">

data/app/views/hyrax/base/_attribute_rows.html.erb

@@ -14,6 +14,7 @@
 <%= presenter.attribute_to_html(:related_url, render_as: :external_link, html_dl: true) %>
 <%= presenter.attribute_to_html(:resource_type, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:source, html_dl: true) %>
+<%= presenter.attribute_to_html(:extent, html_dl: true) %>
 <%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement, html_dl: true) %>
 <%= presenter.attribute_to_html(:rights_notes, html_dl: true) %>
 <%= presenter.attribute_to_html(:access_right, html_dl: true) %>

data/app/views/hyrax/base/_base_form_files_prepend.html.erb

@@ -0,0 +1,4 @@
+<%# This file is deliberately left blank for downstream implementors
+This should accept one locals:
+
+`f`: The form object %>

data/app/views/hyrax/base/_form_files.html.erb

@@ -1,69 +1,70 @@
-     <div id="fileupload">
-        <!-- 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 -->
-        <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
-        <% if Hyrax.config.browse_everything? %>
-          <%= t('hyrax.base.form_files.local_upload_browse_everything_html',
-                contact_href: link_to(t("hyrax.upload.alert.contact_href_text"), hyrax.contact_form_index_path),
-                upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
-                upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
-        <% else %>
-          <%= t('hyrax.base.form_files.local_upload_html',
-                upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
-                upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
-        <% end %>
-        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
-        <div class="fileupload-buttonbar">
-          <div class="row">
-            <div class="col-12">
-                <div class="fileinput-button" id="add-files">
-                  <input id="addfiles" type="file" style="display:none;"  name="files[]" multiple />
-                  <button type="button" class="btn btn-success" onclick="document.getElementById('addfiles').click();">
-                    <span class="fa fa-plus"></span>
-                    <span><%=  t(".add_files") %></span>
-                  </button>
-                </div>
-                <div class="fileinput-button">
-                  <input id="addfolder" type="file" style="display:none;"  name="files[]" multiple directory webkitdirectory />
-                  <button type="button" class="btn btn-success" onclick="document.getElementById('addfolder').click();">
-                    <span class="fa fa-plus"></span>
-                    <span><%=  t(".add_folder") %></span>
-                  </button>
-                </div>
-                <% if Hyrax.config.browse_everything? %>
-                  <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
-                    'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
-                    'data-target' => "#{f.object.persisted? ? "#edit_#{f.object.model.model_name.param_key}_#{f.object.model.id}" : "#new_#{f.object.model.model_name.param_key}"}" ) do %>
-                    <span class="fa fa-plus"></span>
-                    <%= t('hyrax.upload.browse_everything.browse_files_button') %>
-                  <% end %>
-                <% end %>
-                <button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel">
-                    <span class="fa fa-ban"></span>
-                    <span><%= t('.cancel_upload') %></span>
-                </button>
-                <!-- The global file processing state -->
-                <span class="fileupload-process"></span>
-            </div>
+<%= render "base_form_files_prepend", locals: { f: f } %>
+<div id="fileupload">
+  <!-- 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 -->
+  <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
+  <% if Hyrax.config.browse_everything? %>
+    <%= t('hyrax.base.form_files.local_upload_browse_everything_html',
+          contact_href: link_to(t("hyrax.upload.alert.contact_href_text"), hyrax.contact_form_index_path),
+          upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
+          upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
+  <% else %>
+    <%= t('hyrax.base.form_files.local_upload_html',
+          upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
+          upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
+  <% end %>
+  <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+  <div class="fileupload-buttonbar">
+    <div class="row">
+      <div class="col-12">
+          <div class="fileinput-button" id="add-files">
+            <input id="addfiles" type="file" style="display:none;"  name="files[]" multiple />
+            <button type="button" class="btn btn-success" onclick="document.getElementById('addfiles').click();">
+              <span class="fa fa-plus"></span>
+              <span><%=  t(".add_files") %></span>
+            </button>
           </div>
-          <div class="row">
-            <div class="col-12">
-              <!-- The global progress state -->
-              <div class="fileupload-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>
-            </div>
+          <div class="fileinput-button">
+            <input id="addfolder" type="file" style="display:none;"  name="files[]" multiple directory webkitdirectory />
+            <button type="button" class="btn btn-success" onclick="document.getElementById('addfolder').click();">
+              <span class="fa fa-plus"></span>
+              <span><%=  t(".add_folder") %></span>
+            </button>
           </div>
+          <% if Hyrax.config.browse_everything? %>
+            <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
+              'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
+              'data-target' => "#{f.object.persisted? ? "#edit_#{f.object.model.model_name.param_key}_#{f.object.model.id}" : "#new_#{f.object.model.model_name.param_key}"}" ) do %>
+              <span class="fa fa-plus"></span>
+              <%= t('hyrax.upload.browse_everything.browse_files_button') %>
+            <% end %>
+          <% end %>
+          <button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel">
+              <span class="fa fa-ban"></span>
+              <span><%= t('.cancel_upload') %></span>
+          </button>
+          <!-- The global file processing state -->
+          <span class="fileupload-process"></span>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-12">
+        <!-- The global progress state -->
+        <div class="fileupload-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>
-        <div class="dropzone">
-          <%= t('hyrax.base.form_files.dropzone') %>
-        </div>
-     </div>
+      </div>
+    </div>
+  </div>
+  <div class="dropzone">
+    <%= t('hyrax.base.form_files.dropzone') %>
+  </div>
+</div>
 
 <%= render 'hyrax/uploads/js_templates' %>

data/app/views/hyrax/base/show.html.erb

@@ -53,11 +53,10 @@
     <%# = render 'sharing_with', presenter: @presenter %>
     <%# = render 'user_activity', presenter: @presenter %>
 
-<span class='hide analytics-event' data-category="work" data-action="work-view" data-name="<%= @presenter.id %>" >
+<span class='hide analytics-event' data-category="work" data-action="work-view" data-name="<%= @presenter.id %>" ></span>
 <% @presenter.member_of_collection_ids.each do |collection_id| %>
-  <span class='hide analytics-event' data-category="work-in-collection" data-action="work-in-collection-view" data-name="<%= collection_id %>" >
+  <span class='hide analytics-event' data-category="work-in-collection" data-action="work-in-collection-view" data-name="<%= collection_id %>" ></span>
 <% end %>
 
   </div>
 </div>
-