hyrax 2.1.0.beta2 → 2.1.0.rc1

data/app/services/hyrax/adapters/nesting_index_adapter.rb

@@ -1,8 +1,10 @@
 module Hyrax
   module Adapters
     module NestingIndexAdapter
-      # @!group Providing interface for a Samvera::NestingIndexer::Adapter
+      FULL_REINDEX = "full".freeze
+      LIMITED_REINDEX = "limited".freeze
 
+      # @!group Providing interface for a Samvera::NestingIndexer::Adapter
       # @api public
       # @param id [String]
       # @return Samvera::NestingIndexer::Document::PreservationDocument
@@ -38,19 +40,10 @@ module Hyrax
         coerce_solr_document_to_index_document(original_solr_document: solr_document, id: id)
       end
 
-      # @api public
-      # @deprecated
-      # @yield Samvera::NestingIndexer::Document::PreservationDocument
-      # rubocop:disable Lint/UnusedMethodArgument
-      def self.each_preservation_document(&block)
-        raise NotImplementedError
-      end
-      # rubocop:enable Lint/UnusedMethodArgument
-
       # @api public
       # @yieldparam id [String]
       # @yieldparam parent_id [Array<String>]
-      # Samvera::NestingIndexer.reindex_all!
+      # Samvera::NestingIndexer.reindex_all!(extent: FULL_REINDEX)
       # rubocop:disable Lint/UnusedMethodArgument
       def self.each_perservation_document_id_and_parent_ids(&block)
         ActiveFedora::Base.descendant_uris(ActiveFedora.fedora.base_uri, exclude_uri: true).each do |uri|
@@ -70,22 +63,6 @@ module Hyrax
       end
       # rubocop:enable Lint/UnusedMethodArgument
 
-      # @api public
-      # @deprecated
-      #
-      # From the given parameters, we will need to add them to the underlying SOLR document for the object
-      #
-      # @param id [String]
-      # @param parent_ids [Array<String>]
-      # @param ancestors [Array<String>]
-      # @param pathnames [Array<String>]
-      # @return Hash - the attributes written to the indexing layer
-      # rubocop:disable Lint/UnusedMethodArgument
-      def self.write_document_attributes_to_index_layer(id:, parent_ids:, ancestors:, pathnames:, deepest_nested_depth:)
-        raise NotImplementedError, "This method is deprecated as of v1.0.0 of samvera-nesting_indexer, prefer instead .write_nesting_document_to_index_layer"
-      end
-      # rubocop:enable Lint/UnusedMethodArgument
-
       # @api public
       #
       # From the nesting_document, we will need to add the nesting attributes to the underlying SOLR document for the object
@@ -126,12 +103,14 @@ module Hyrax
 
       # @api public
       # @param document [Samvera::NestingIndexer::Documents::IndexDocument]
+      # @param extent [String] if not "full" or nil, doesn't yield children for reindexing
       # @param solr_field_name_for_ancestors [String] The SOLR field name we use to find children
       # @yield Samvera::NestingIndexer::Documents::IndexDocument
-      def self.each_child_document_of(document:, &block)
+      def self.each_child_document_of(document:, extent:, &block)
         raw_child_solr_documents_of(parent_document: document).each do |solr_document|
           child_document = coerce_solr_document_to_index_document(original_solr_document: solr_document, id: solr_document.fetch('id'))
-          block.call(child_document)
+          # during light reindexing, we want to reindex the child only if fields aren't already there
+          block.call(child_document) if full_reindex?(extent: extent) || child_document.pathnames.empty?
         end
       end
       # @!endgroup
@@ -165,14 +144,10 @@ module Hyrax
       end
 
       class << self
-        delegate :solr_field_name_for_storing_pathnames, :solr_field_name_for_storing_ancestors, :solr_field_name_for_storing_parent_ids, to: :nesting_configuration
-      end
-
-      # <dynamicField name="*_isi" type="int" stored="true" indexed="true" multiValued="false"/>
-      SOLR_FIELD_NAME_FOR_DEEPEST_NESTED_DEPTH = 'nesting_collection__deepest_nested_depth_isi'.freeze
-
-      def self.solr_field_name_for_deepest_nested_depth
-        SOLR_FIELD_NAME_FOR_DEEPEST_NESTED_DEPTH
+        delegate :solr_field_name_for_storing_pathnames,
+                 :solr_field_name_for_storing_ancestors,
+                 :solr_field_name_for_storing_parent_ids,
+                 :solr_field_name_for_deepest_nested_depth, to: :nesting_configuration
       end
 
       # @api private
@@ -180,12 +155,17 @@ module Hyrax
       # @return [Hash] A raw response document from SOLR
       # @todo What is the appropriate suffix to apply to the solr_field_name?
       def self.raw_child_solr_documents_of(parent_document:)
-        # query Solr for all of the documents included as a member_of_collection parent.
+        # query Solr for all of the documents included as a member_of_collection parent. Or up to 10000 of them.
         child_query = ActiveFedora::SolrQueryBuilder.construct_query(member_of_collection_ids_ssim: parent_document.id)
-        ActiveFedora::SolrService.query(child_query)
+        ActiveFedora::SolrService.query(child_query, rows: 10_000.to_i)
       end
       private_class_method :raw_child_solr_documents_of
 
+      def self.full_reindex?(extent:)
+        return true if extent == FULL_REINDEX
+        false
+      end
+      private_class_method :full_reindex?
       # @!endgroup
     end
   end

data/app/services/hyrax/admin_set_create_service.rb

@@ -120,7 +120,7 @@ module Hyrax
 
       # Gives deposit access to registered users to default AdminSet
       def create_default_access_for(permission_template:, workflow:)
-        permission_template.access_grants.create(agent_type: 'group', agent_id: 'registered', access: Hyrax::PermissionTemplateAccess::DEPOSIT)
+        permission_template.access_grants.create(agent_type: 'group', agent_id: ::Ability.registered_group_name, access: Hyrax::PermissionTemplateAccess::DEPOSIT)
         deposit = Sipity::Role[Hyrax::RoleRegistry::DEPOSITING]
         workflow.update_responsibilities(role: deposit, agents: Hyrax::Group.new('registered'))
       end

data/app/services/hyrax/collection_types/create_service.rb

@@ -22,6 +22,7 @@ module Hyrax
         require_membership: false,
         assigns_workflow: false,
         assigns_visibility: false,
+        badge_color: "#663333",
         participants: [{ agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: ::Ability.admin_group_name, access: Hyrax::CollectionTypeParticipant::MANAGE_ACCESS },
                        { agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: ::Ability.registered_group_name, access: Hyrax::CollectionTypeParticipant::CREATE_ACCESS }]
       }.freeze
@@ -39,6 +40,7 @@ module Hyrax
         require_membership: false,
         assigns_workflow: false,
         assigns_visibility: false,
+        badge_color: "#663333",
         participants: [{ agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: ::Ability.admin_group_name, access: Hyrax::CollectionTypeParticipant::MANAGE_ACCESS },
                        { agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: ::Ability.registered_group_name, access: Hyrax::CollectionTypeParticipant::CREATE_ACCESS }]
       }.freeze
@@ -56,6 +58,7 @@ module Hyrax
         require_membership: true,
         assigns_workflow: true,
         assigns_visibility: true,
+        badge_color: "#663333",
         participants: [{ agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: ::Ability.admin_group_name, access: Hyrax::CollectionTypeParticipant::MANAGE_ACCESS },
                        { agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: ::Ability.admin_group_name, access: Hyrax::CollectionTypeParticipant::CREATE_ACCESS }]
       }.freeze
@@ -78,6 +81,7 @@ module Hyrax
       #   with allow_multiple_membership=false, works can belong to one and only one collection of this type.
       # @option options [Boolean] :assigns_workflow if true, collections of this type can be used to assign a workflow to a work
       # @option options [Boolean] :assigns_visibility if true, collections of this type can be used to assign initial visibility to a work
+      # @option options [String] :badge_color a color for the badge to show the user when selecting the collection type
       # @return [Hyrax::CollectionType] the newly created collection type instance
       def self.create_collection_type(machine_id:, title:, options: {})
         opts = DEFAULT_OPTIONS.merge(options).except(:participants)

data/app/services/hyrax/collections/migration_service.rb

@@ -13,6 +13,11 @@ module Hyrax
           migrate_collection(col)
           Rails.logger.info "  migrating collection - id: #{col.id}, title: #{col.title}"
         end
+
+        AdminSet.all.each do |adminset|
+          migrate_adminset(adminset)
+          Rails.logger.info "  migrating adminset - id: #{adminset.id}, title: #{adminset.title}"
+        end
         Rails.logger.info "--- Migration Complete"
       end
 
@@ -30,6 +35,20 @@ module Hyrax
       end
       private_class_method :migrate_collection
 
+      # @api private
+      #
+      # Migrate a single adminset to grant depositors and viewers read access to the admin set unless the grant is for
+      # registered (authenticated users) or public (anyone) groups.  The adjustment is being made to adminsets created
+      # before Hyrax 2.1.0.  Migrating twice will not adversely impact the adminset.
+      #
+      # @param adminset [AdminSet] adminset object to be migrated
+      def self.migrate_adminset(adminset)
+        Hyrax::PermissionTemplateAccess.find_or_create_by(permission_template_id: adminset.permission_template.id,
+                                                          agent_type: "group", agent_id: "admin", access: "manage")
+        adminset.reset_access_controls!
+      end
+      private_class_method :migrate_adminset
+
       # @api public
       #
       # Validate that migrated collections have both the collection type gid assigned and the permission template with
@@ -39,9 +58,13 @@ module Hyrax
         Rails.logger.info "*** Repairing migrated collections"
         Collection.all.each do |col|
           repair_migrated_collection(col)
-          Rails.logger.info "  migrating collection - id: #{col.id}, title: #{col.title}"
+          Rails.logger.info "  repairing collection - id: #{col.id}, title: #{col.title}"
         end
-        Rails.logger.info "--- Migration Complete"
+        AdminSet.all.each do |adminset|
+          migrate_adminset(adminset)
+          Rails.logger.info "  repairing adminset - id: #{adminset.id}, title: #{adminset.title}"
+        end
+        Rails.logger.info "--- Repairing Complete"
       end
 
       # @api private

data/app/services/hyrax/collections/nested_collection_persistence_service.rb

@@ -11,14 +11,19 @@ module Hyrax
       # @note There is odd permission arrangement based on the NestedCollectionQueryService:
       #       You can nest the child within a parent if you can edit the parent and read the child.
       #       See https://wiki.duraspace.org/display/samvera/Samvera+Tech+Call+2017-08-23 for tech discussion.
+      # @note Adding the member_of_collections method doesn't trigger reindexing of the child so we have to do it manually.
+      #       However it save and reindexes the parent unnecessarily!!
       def self.persist_nested_collection_for(parent:, child:)
-        child.member_of_collections << parent
-        child.save
+        parent.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
+        child.member_of_collections.push(parent)
+        child.update_nested_collection_relationship_indices
       end
 
+      # @note Removing the member_of_collections method doesn't trigger reindexing of the child so we have to do it manually.
+      #       However it doesn't save and reindex the parent, as it does when a parent is added!!
       def self.remove_nested_relationship_for(parent:, child:)
         child.member_of_collections.delete(parent)
-        child.save
+        child.update_nested_collection_relationship_indices
         true
       end
     end

data/app/services/hyrax/collections/nested_collection_query_service.rb

@@ -20,7 +20,7 @@ module Hyrax
           @parents = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_parent_ids]
           @pathnames = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames]
           @ancestors = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_ancestors]
-          @depth = collection_doc[Hyrax::Adapters::NestingIndexAdapter.solr_field_name_for_deepest_nested_depth]
+          @depth = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_deepest_nested_depth]
         end
       end
 
@@ -154,13 +154,13 @@ module Hyrax
         # note: We need to include works in this search. They are included in the depth validations in
         # the indexer, so we do NOT use collection search builder here.
         builder = Hyrax::SearchBuilder.new(scope).where("#{Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames}:/.*#{child.id}.*/")
-        builder.query[:sort] = "#{Hyrax::Adapters::NestingIndexAdapter.solr_field_name_for_deepest_nested_depth} desc"
+        builder.query[:sort] = "#{Samvera::NestingIndexer.configuration.solr_field_name_for_deepest_nested_depth} desc"
         builder.query[:rows] = 1
         query = clean_lucene_error(builder: builder)
         response = scope.repository.search(query).documents.first
 
         # Now we have the largest nesting depth for all paths containing this collection
-        descendant_depth = response[Hyrax::Adapters::NestingIndexAdapter.solr_field_name_for_deepest_nested_depth]
+        descendant_depth = response[Samvera::NestingIndexer.configuration.solr_field_name_for_deepest_nested_depth]
 
         # => 2) Then we get the stored depth of the child collection itself to eliminate the collections above this one from our count, and add 1 to add back in this collection itself
         child_depth = NestingAttributes.new(id: child.id, scope: scope).depth

data/app/services/hyrax/default_middleware_stack.rb

@@ -28,6 +28,9 @@ module Hyrax
         # Set the order of the children (works or file_sets)
         middleware.use Hyrax::Actors::ApplyOrderActor
 
+        # Sets the default admin set if they didn't supply one
+        middleware.use Hyrax::Actors::DefaultAdminSetActor
+
         # Decode the private/public/institution on the form into permisisons on
         # the model
         middleware.use Hyrax::Actors::InterpretVisibilityActor
@@ -35,9 +38,6 @@ module Hyrax
         # Handles transfering ownership of works from one user to another
         middleware.use Hyrax::Actors::TransferRequestActor
 
-        # Sets the default admin set if they didn't supply one
-        middleware.use Hyrax::Actors::DefaultAdminSetActor
-
         # Copies default permissions from the PermissionTemplate to the work
         middleware.use Hyrax::Actors::ApplyPermissionTemplateActor
 

data/app/services/hyrax/multiple_membership_checker.rb

@@ -60,9 +60,11 @@ module Hyrax
 
       def build_error_message(problematic_collections)
         error_message_clauses = problematic_collections.map do |gid, list|
-          "#{collection_type_title_from_gid(gid)} (#{collection_titles_from_list(list)})"
+          I18n.t('hyrax.admin.collection_types.multiple_membership_checker.error_type_and_collections',
+                 type: collection_type_title_from_gid(gid),
+                 collections: collection_titles_from_list(list))
         end
-        "#{I18n.t('hyrax.admin.collection_types.multiple_membership_checker.error_preamble')}: #{error_message_clauses.join('; ')}"
+        "#{I18n.t('hyrax.admin.collection_types.multiple_membership_checker.error_preamble')}#{error_message_clauses.join('; ')}"
       end
 
       def collection_type_title_from_gid(gid)

data/app/views/catalog/_index_header_list_collection.html.erb

@@ -1,4 +1,4 @@
 <div class="search-results-title-row">
   <h4 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h4>
-  <span class="label label-success"><%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %></span>
+  <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
 </div>

data/app/views/catalog/_search_form.html.erb

@@ -29,10 +29,6 @@
             <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
                 data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
           </li>
-          <li>
-            <%= link_to t("hyrax.search.form.option.my_shares.label_long"), "#",
-                data: { "search-option" => hyrax.dashboard_shares_path, "search-label" => t("hyrax.search.form.option.my_shares.label_short") } %>
-          </li>
         <% end %>
 
       </ul>

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

@@ -0,0 +1,27 @@
+    <% if can? :edit, presenter.solr_document %>
+      <div class="panel-heading">
+        <div class="row">
+          <div class="col-sm-8">
+            <h2 class="panel-title display-page"><%= presenter.to_s %></h2>
+          </div>
+          <div class="col-sm-4">
+            <div class="pull-right">
+              <%= link_to edit_admin_admin_set_path(presenter), class: 'btn btn-primary' do %>
+                <span class="fa fa-edit"></span> <%= t(:'helpers.action.edit') %>
+              <% end %>
+              <% if presenter.disable_delete? %>
+                <span title="<%= presenter.disabled_message %>">
+                  <%= link_to admin_admin_set_path(presenter), class: 'btn btn-danger disabled' do %>
+                    <span class="fa fa-remove"></span> <%= t(:'helpers.action.delete') %>
+                  <% end %>
+                </span>
+              <% else %>
+                <%= link_to admin_admin_set_path(presenter), class: 'btn btn-danger', data: { confirm: t('.confirm_delete'), method: :delete } do %>
+                  <span class="fa fa-remove"></span> <%= t(:'helpers.action.delete') %>
+                <% end %>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>

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

@@ -5,31 +5,7 @@
 <div class="row">
   <div class="col-md-12">
     <div class="panel panel-default">
-      <div class="panel-heading">
-        <div class="row">
-          <div class="col-sm-8">
-            <h2 class="panel-title display-page"><%= @presenter.to_s %></h2>
-          </div>
-          <div class="col-sm-4">
-            <div class="pull-right">
-              <%= link_to edit_admin_admin_set_path(@presenter), class: 'btn btn-primary' do %>
-                <span class="fa fa-edit"></span> <%= t(:'helpers.action.edit') %>
-              <% end %>
-              <% if @presenter.disable_delete? %>
-                <span title="<%= @presenter.disabled_message %>">
-                  <%= link_to admin_admin_set_path(@presenter), class: 'btn btn-danger disabled' do %>
-                    <span class="fa fa-remove"></span> <%= t(:'helpers.action.delete') %>
-                  <% end %>
-                </span>
-              <% else %>
-                <%= link_to admin_admin_set_path(@presenter), class: 'btn btn-danger', data: { confirm: t('.confirm_delete'), method: :delete } do %>
-                  <span class="fa fa-remove"></span> <%= t(:'helpers.action.delete') %>
-                <% end %>
-              <% end %>
-            </div>
-          </div>
-        </div>
-      </div>
+      <%= render 'show_actions', presenter: @presenter %>
 
       <div class="panel-body admin-set row">
         <div class="col-md-2">

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

@@ -1,19 +1,23 @@
+<%= render "shared/nav_safety_modal" %>
 <div class="panel panel-default tabs" id="collection-types-controls">
   <ul class="nav nav-tabs" role="tablist">
     <li class="active">
-      <a href="#metadata" role="tab" data-toggle="tab"><%= t('hyrax.admin.collection_types.form.tab.metadata') %></a>
+      <a href="#metadata" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.metadata') %></a>
     </li>
     <% if @form.persisted? %>
       <li>
-        <a href="#settings" role="tab" data-toggle="tab"><%= t('hyrax.admin.collection_types.form.tab.settings') %></a>
+        <a href="#settings" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.settings') %></a>
       </li>
       <li>
-        <a href="#participants" role="tab" data-toggle="tab"><%= t('hyrax.admin.collection_types.form.tab.participants') %></a>
-        </li>
+        <a href="#participants" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.participants') %></a>
+      </li>
+      <li>
+        <a href="#appearance" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.appearance') %></a>
+      </li>
     <% end %>
   </ul>
   <% form_url = @form.id.nil? ? hyrax.admin_collection_types_path : hyrax.admin_collection_type_path(@form.id) %>
-  <%= simple_form_for @form, url: form_url, as: :collection_type do |f| %>
+  <%= simple_form_for @form, url: form_url, as: :collection_type, html: {class: 'nav-safety'} do |f| %>
     <div class="tab-content">
       <% if @collection_type.admin_set? %>
         <div id="metadata" class="tab-pane active">
@@ -42,12 +46,19 @@
       <% # end of form %>
       <% # TODO: The participants partial can't sit inside the other form, moved down here temporarily %>
       <div id="participants" class="tab-pane">
-        <div class="panel panel-default labels">
+        <div class="panel panel-default labels collection-types-edit-participants-tab">
           <div class="panel-body">
             <%= render 'form_participants' %>
           </div>
         </div>
       </div>
+      <div id="appearance" class="tab-pane">
+        <div class="panel panel-default labels">
+          <div class="panel-body">
+            <%= render 'form_appearance', f: f %>
+          </div>
+        </div>
+      </div>
       <div class="panel-footer">
         <% if params[:action] == "new" %>
           <%= f.submit t(:'hyrax.admin.collection_types.new.submit'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection_type" %>

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

@@ -0,0 +1,5 @@
+<div class="panel panel-default">
+  <div class="panel-body">
+      <%= f.input :badge_color, required: false, input_html: { type: 'color' } %>
+  </div>
+</div>

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

@@ -15,7 +15,7 @@
         <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
         <td><%= g.agent_type.titleize %></td>
         <td>
-          <%= button_to "Remove", hyrax.admin_collection_type_participant_path(g), method: :delete, class: 'btn btn-danger' %>
+          <%= link_to t("helpers.action.remove"), hyrax.admin_collection_type_participant_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
         </td>
       </tr>
     <% end %>

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

@@ -1,62 +1,66 @@
-<h2><%= t('.add_participants') %></h2>
+<h3><%= t('.add_participants') %></h3>
 <p><%= t('.instructions') %></p>
 <% access_options = options_for_select([['Manager', Hyrax::CollectionTypeParticipant::MANAGE_ACCESS], ['Creator', Hyrax::CollectionTypeParticipant::CREATE_ACCESS]]) %>
 <% unless @collection_type_participant.nil? %>
-  <%= simple_form_for @collection_type_participant,
-                      url: hyrax.admin_collection_type_participants_path,
-                      html: { id: 'group-participants-form' },
-                      as: :collection_type_participant do |f| %>
-      <div class="clearfix spacer">
-        <div class="form-inline">
-          <label class="col-md-2 col-xs-4 control-label">Add Group</label>
 
-          <div class="col-md-10 col-xs-8 form-group">
-            <%= f.hidden_field :hyrax_collection_type_id, value: @collection_type_participant.hyrax_collection_type_id %>
-            <%= f.hidden_field :agent_type, value: Hyrax::CollectionTypeParticipant::GROUP_TYPE %>
-            <%= f.text_field :agent_id,
-                             placeholder: "Search for a group...",
-                             class: 'form-control' %>
-            as
-            <%= f.select :access,
-                         access_options,
-                         { prompt: "Select a role..." },
-                         class: 'form-control' %>
+  <section class="section-participants">
+    <!-- Add group form -->
+    <div class="form-add-participants-wrapper row spacer" data-id="<%= @form.id %>">
+      <%= simple_form_for @collection_type_participant,
+                          url: hyrax.admin_collection_type_participants_path,
+                          html: { id: 'group-participants-form' },
+                          as: :collection_type_participant do |f| %>
+            <div class="form-inline add-participants-form">
+            <label class="col-md-2 col-xs-4 control-label"><%= t('.add_group') %>:</label>
+
+            <div class="col-md-10 col-xs-8 form-group">
+              <%= f.hidden_field :hyrax_collection_type_id, value: @collection_type_participant.hyrax_collection_type_id %>
+              <%= f.hidden_field :agent_type, value: Hyrax::CollectionTypeParticipant::GROUP_TYPE %>
+              <%= f.text_field :agent_id,
+                               placeholder: "Search for a group...",
+                               class: 'form-control' %>
+              as
+              <%= f.select :access,
+                           access_options,
+                           { prompt: "Select a role..." },
+                           class: 'form-control' %>
 
-                       <%= f.submit t('.submit'), class: 'btn btn-info' %>
+                         <%= f.submit t('.submit'), class: 'btn btn-info', :disabled => true %>
+            </div>
           </div>
-        </div>
-      </div>
-  <% end %>
-  <%= simple_form_for @collection_type_participant,
-                      url: hyrax.admin_collection_type_participants_path,
-                      html: { id: 'user-participants-form' },
-                      as: :collection_type_participant do |f| %>
-      <div class="clearfix spacer">
-        <div class="form-inline">
-          <label class="col-md-2 col-xs-4 control-label">Add User</label>
+      <% end %>
+    </div>
+
+    <!-- Add user form -->
+    <div class="form-add-participants-wrapper row" data-id="<%= @form.id %>">
+      <%= simple_form_for @collection_type_participant,
+                          url: hyrax.admin_collection_type_participants_path,
+                          html: { id: 'user-participants-form' },
+                          as: :collection_type_participant do |f| %>
+            <div class="form-inline add-participants-form">
+              <label class="col-md-2 col-xs-4 control-label"><%= t('.add_user') %>:</label>
 
-          <div class="col-md-10 col-xs-8 form-group">
-            <%= f.hidden_field :hyrax_collection_type_id, value: @collection_type_participant.hyrax_collection_type_id %>
-            <%= f.hidden_field :agent_type, value: Hyrax::CollectionTypeParticipant::USER_TYPE %>
-            <%= f.text_field :agent_id,
-                             placeholder: "Search for a user...",
+              <div class="col-md-10 col-xs-8 form-group">
+                <%= f.hidden_field :hyrax_collection_type_id, value: @collection_type_participant.hyrax_collection_type_id %>
+                <%= f.hidden_field :agent_type, value: Hyrax::CollectionTypeParticipant::USER_TYPE %>
+                <%= f.text_field :agent_id,
+                                 placeholder: "Search for a user..." %>
+                as
+                <%= f.select :access,
+                             access_options,
+                             { prompt: "Select a role..." },
                              class: 'form-control' %>
-            as
-            <%= f.select :access,
-                         access_options,
-                         { prompt: "Select a role..." },
-                         class: 'form-control' %>
 
-                       <%= f.submit t('.submit'), class: 'btn btn-info' %>
-          </div>
-        </div>
-      </div>
-  <% end %>
+                           <%= f.submit t('.submit'), class: 'btn btn-info', :disabled => true %>
+              </div>
+            </div>
+      <% end %>
+    </div>
+  </section>
+
 <% end %>
-<div>
-  <fieldset>
-    <legend><%= t('.current_participants') %></legend>
-    <%= render 'form_participant_table', access: 'managers', filter: :manager? %>
-    <%= render 'form_participant_table', access: 'creators', filter: :creator? %>
-  </fieldset>
-</div>
+<section class="section-current-participants">
+  <legend><%= t('.current_participants') %></legend>
+  <%= render 'form_participant_table', access: 'managers', filter: :manager? %>
+  <%= render 'form_participant_table', access: 'creators', filter: :creator? %>
+</section>