hyrax 2.0.3 → 2.1.0.beta1

data/app/controllers/hyrax/admin/features_controller.rb

@@ -1,7 +1,7 @@
 module Hyrax
   module Admin
     class FeaturesController < Flipflop::FeaturesController
-      layout 'dashboard'
+      with_themed_layout 'dashboard'
 
       before_action do
         authorize! :manage, Hyrax::Feature

data/app/controllers/hyrax/admin/permission_template_accesses_controller.rb

@@ -5,32 +5,74 @@ module Hyrax
 
       def destroy
         ActiveRecord::Base.transaction do
-          @permission_template_access.destroy
+          @permission_template_access.destroy if valid_delete?
           remove_access!
         end
 
         if @permission_template_access.destroyed?
-          redirect_to hyrax.edit_admin_admin_set_path(admin_set_id,
-                                                      anchor: 'participants'),
-                      notice: translate('participants', scope: 'hyrax.admin.admin_sets.form.permission_update_notices')
+          after_destroy_success
         else
-          redirect_to hyrax.edit_admin_admin_set_path(admin_set_id,
-                                                      anchor: 'participants'),
-                      alert: @permission_template_access.errors.full_messages.to_sentence
-
+          after_destroy_error
         end
       end
 
       private
 
-        # @return [String] the identifier for the AdminSet for the currently loaded resource
-        def admin_set_id
-          @admin_set_id ||= @permission_template_access.permission_template.admin_set_id
+        # This is a controller validation rather than a model validation
+        # because we don't want to prevent the ability to remove the whole
+        # PermissionTemplate and all of its associated PermissionTemplateAccesses
+        # @return [Boolean] true if it's valid
+        def valid_delete?
+          return true unless @permission_template_access.admin_group?
+          @permission_template_access.errors[:base] <<
+            t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group')
+          false
+        end
+
+        def update_access(manage_changed:)
+          permission_template_form.update_access(manage_changed: manage_changed)
+        end
+
+        def after_destroy_success
+          if source.admin_set?
+            redirect_to hyrax.edit_admin_admin_set_path(source_id,
+                                                        anchor: 'participants'),
+                        notice: translate('participants', scope: 'hyrax.admin.admin_sets.form.permission_update_notices')
+          elsif source.collection?
+            redirect_to hyrax.edit_dashboard_collection_path(source_id,
+                                                             anchor: 'sharing'),
+                        notice: translate('sharing', scope: 'hyrax.dashboard.collections.form.permission_update_notices')
+          end
+        end
+
+        def after_destroy_error
+          if source.admin_set?
+            redirect_to hyrax.edit_admin_admin_set_path(source_id,
+                                                        anchor: 'participants'),
+                        alert: @permission_template_access.errors.full_messages.to_sentence
+          elsif source.collection?
+            redirect_to hyrax.edit_dashboard_collection_path(source_id,
+                                                             anchor: 'sharing'),
+                        alert: @permission_template_access.errors.full_messages.to_sentence
+          end
+        end
+
+        delegate :source_id, to: :permission_template
+
+        def source
+          @source ||= ::SolrDocument.find(source_id)
         end
 
         def remove_access!
-          Forms::PermissionTemplateForm.new(@permission_template_access.permission_template)
-                                       .remove_access!(@permission_template_access)
+          permission_template_form.remove_access!(@permission_template_access)
+        end
+
+        def permission_template_form
+          @permission_template_form ||= Forms::PermissionTemplateForm.new(permission_template)
+        end
+
+        def permission_template
+          @permission_template ||= @permission_template_access.permission_template
         end
     end
   end

data/app/controllers/hyrax/admin/permission_templates_controller.rb

@@ -1,31 +1,62 @@
 module Hyrax
   module Admin
     class PermissionTemplatesController < ApplicationController
-      load_and_authorize_resource find_by: 'admin_set_id',
-                                  id_param: 'admin_set_id',
-                                  class: 'Hyrax::PermissionTemplate'
-
-      # Override the default prefixes so that we use the collection partals.
-      def self.local_prefixes
-        ["hyrax/admin/admin_sets"]
-      end
+      before_action :find_permission_template
+      authorize_resource class: 'Hyrax::PermissionTemplate', instance_name: :permission_template
 
       def update
         update_info = form.update(update_params)
         if update_info[:updated] == true # Ensure we redirect to currently active tab with the appropriate notice
-          redirect_to(edit_admin_admin_set_path(params[:admin_set_id], anchor: current_tab),
-                      notice: translate(update_info[:content_tab], scope: 'hyrax.admin.admin_sets.form.permission_update_notices'))
+          redirect_to_edit_path(update_info)
         else
-          # When we have invalid data, we are redirecting because to render, we need to set an AdminSetForm
-          # (because we are rendering admin set forms)
-          # TODO: [Jeremy Friesen says: We need to better consolidate the form logic of admin sets and permission templates
-          redirect_to(edit_admin_admin_set_path(params[:admin_set_id], anchor: current_tab),
-                      alert: translate(update_info[:error_code], scope: 'hyrax.admin.admin_sets.form.permission_update_errors'))
+          redirect_to_edit_path_with_error(update_info)
         end
       end
 
       private
 
+        # Override the default prefixes so that we use the correct partials.
+        def _prefixes
+          if admin_set?
+            @_prefixes ||= super + ['hyrax/admin/admin_sets']
+          elsif collection?
+            @_prefixes ||= super + ['hyrax/dashboard/collections']
+          end
+        end
+
+        # We need to do this manually instead of using load_and_authorize_resource
+        # because the id we are looking for is different when using an admin set vs. collection
+        def find_permission_template
+          if admin_set?
+            @permission_template = PermissionTemplate.find_by(source_id: params[:admin_set_id])
+          elsif collection?
+            @permission_template = PermissionTemplate.find_by(source_id: params[:collection_id])
+          end
+        end
+
+        def redirect_to_edit_path(update_info)
+          if admin_set?
+            redirect_to(edit_admin_admin_set_path(params[:admin_set_id], anchor: current_tab),
+                        notice: translate(update_info[:content_tab], scope: 'hyrax.admin.admin_sets.form.permission_update_notices'))
+          elsif collection?
+            redirect_to(edit_dashboard_collection_path(params[:collection_id], anchor: current_tab),
+                        notice: translate(update_info[:content_tab], scope: 'hyrax.dashboard.collections.form.permission_update_notices'))
+          end
+        end
+
+        def redirect_to_edit_path_with_error(update_info)
+          # When we have invalid data, we are redirecting because to render, we need to set an AdminSetForm
+          # (because we are rendering admin set forms)
+          # TODO: [Jeremy Friesen says: We need to better consolidate the form logic of admin sets and permission templates
+          if admin_set?
+            redirect_to(edit_admin_admin_set_path(params[:admin_set_id], anchor: current_tab),
+                        alert: translate(update_info[:error_code], scope: 'hyrax.admin.admin_sets.form.permission_update_errors'))
+          elsif collection?
+            redirect_to(edit_dashboard_collection_path(params[:collection_id], anchor: current_tab),
+                        alert: translate(update_info[:error_code], scope: 'hyrax.dashboard.collections.form.permission_update_errors'))
+          end
+        end
+
         def form
           Forms::PermissionTemplateForm.new(@permission_template)
         end
@@ -38,14 +69,26 @@ module Hyrax
 
         # @return [String] the name of the current UI tab to show
         def current_tab
-          pt = params[:permission_template]
-          @current_tab ||= if pt[:access_grants_attributes].present?
-                             'participants'
-                           elsif pt[:workflow_id].present?
-                             'workflow'
-                           else
-                             'visibility'
-                           end
+          if collection?
+            @current_tab ||= 'sharing'
+          else
+            pt = params[:permission_template]
+            @current_tab ||= if pt[:access_grants_attributes].present?
+                               'participants'
+                             elsif pt[:workflow_id].present?
+                               'workflow'
+                             else
+                               'visibility'
+                             end
+          end
+        end
+
+        def admin_set?
+          params['admin_set_id'].present?
+        end
+
+        def collection?
+          params['collection_id'].present?
         end
     end
   end

data/app/controllers/hyrax/admin/workflow_roles_controller.rb

@@ -2,7 +2,7 @@ module Hyrax
   module Admin
     class WorkflowRolesController < ApplicationController
       before_action :require_permissions
-      layout 'dashboard'
+      with_themed_layout 'dashboard'
 
       def index
         add_breadcrumb t(:'hyrax.controls.home'), root_path

data/app/controllers/hyrax/admin/workflows_controller.rb

@@ -2,7 +2,7 @@ module Hyrax
   # Presents a list of works in workflow
   class Admin::WorkflowsController < ApplicationController
     before_action :ensure_authorized!
-    layout 'dashboard'
+    with_themed_layout 'dashboard'
     class_attribute :deposited_workflow_state_name
 
     # Works that are in this workflow state (see workflow json template) are excluded from the

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -25,7 +25,7 @@ module Hyrax
     end
 
     def after_destroy_collection
-      redirect_to_return_controller unless request.xhr?
+      redirect_back fallback_location: hyrax.batch_edits_path
     end
 
     def check_for_empty!

data/app/controllers/hyrax/batch_uploads_controller.rb

@@ -15,7 +15,7 @@ module Hyrax
     # We use BatchUploadItem as a null stand-in curation_concern_type.
     # The actual permission is checked dynamically during #create.
 
-    layout 'dashboard'
+    with_themed_layout 'dashboard'
 
     # The permissions to create a batch are not as important as the permissions for the concern being batched.
     # @note we don't call `authorize!` directly, since `authorized_models` already checks `user.can? :create, ...`

data/app/controllers/hyrax/citations_controller.rb

@@ -4,7 +4,9 @@ module Hyrax
     include Breadcrumbs
     include SingularSubresourceController
 
-    layout :decide_layout
+    # Overrides decide_layout from WorksControllerBehavior
+    with_themed_layout '1_column'
+
     before_action :build_breadcrumbs, only: [:work, :file]
 
     def work
@@ -25,16 +27,5 @@ module Hyrax
       def show_presenter
         WorkShowPresenter
       end
-
-      def decide_layout
-        case action_name
-        when 'work', 'file'
-          theme
-        else
-          # Not currently used in this controller, but left here to
-          # support dashboard-based work views which are ticketed
-          'dashboard'
-        end
-      end
   end
 end

data/app/controllers/hyrax/collections_controller.rb

@@ -2,11 +2,9 @@ module Hyrax
   class CollectionsController < ApplicationController
     include CollectionsControllerBehavior
     include BreadcrumbsForCollections
-    layout :decide_layout
+    with_themed_layout :decide_layout
     load_and_authorize_resource except: [:index, :show, :create], instance_name: :collection
 
-    self.theme = 'hyrax/1_column'
-
     # Renders a JSON response with a list of files in this collection
     # This is used by the edit form to populate the thumbnail_id dropdown
     def files
@@ -23,12 +21,13 @@ module Hyrax
       end
 
       def decide_layout
-        case action_name
-        when 'show'
-          theme
-        else
-          'dashboard'
-        end
+        layout = case action_name
+                 when 'show'
+                   '1_column'
+                 else
+                   'dashboard'
+                 end
+        File.join(theme, layout)
       end
   end
 end

data/app/controllers/hyrax/content_blocks_controller.rb

@@ -1,7 +1,7 @@
 module Hyrax
   class ContentBlocksController < ApplicationController
     load_and_authorize_resource
-    layout 'dashboard'
+    with_themed_layout 'dashboard'
 
     def edit
       add_breadcrumb t(:'hyrax.controls.home'), root_path

data/app/controllers/hyrax/dashboard/collection_members_controller.rb

@@ -0,0 +1,73 @@
+module Hyrax
+  module Dashboard
+    ## Shows a list of all collections to the admins
+    class CollectionMembersController < Hyrax::My::CollectionsController
+      before_action :filter_docs_with_read_access!
+
+      include Hyrax::Collections::AcceptsBatches
+
+      def after_update
+        respond_to do |format|
+          format.html { redirect_to success_return_path, notice: t('hyrax.dashboard.my.action.collection_update_success') }
+          format.json { render json: @collection, status: :updated, location: dashboard_collection_path(@collection) }
+        end
+      end
+
+      def after_update_error(err_msg)
+        respond_to do |format|
+          format.html { redirect_to err_return_path, alert: err_msg }
+          format.json { render json: @collection.errors, status: :unprocessable_entity }
+        end
+      end
+
+      def update_members
+        err_msg = validate
+        after_update_error(err_msg) if err_msg.present?
+        return if err_msg.present?
+
+        members = collection.add_member_objects batch_ids
+        messages = members.collect { |member| member.errors.full_messages }.flatten
+        if messages.size == members.size
+          after_update_error(messages.uniq.join(', '))
+        elsif messages.present?
+          flash[:error] = messages.uniq.join(', ')
+          after_update
+        else
+          after_update
+        end
+      end
+
+      private
+
+        def validate
+          return t('hyrax.dashboard.my.action.members_no_access') if batch_ids.blank?
+          return t('hyrax.dashboard.my.action.collection_deny_add_members') unless current_ability.can?(:deposit, collection)
+          return t('hyrax.dashboard.my.action.add_to_collection_only') unless member_action == "add" # should never happen
+        end
+
+        def success_return_path
+          dashboard_collection_path(collection_id)
+        end
+
+        def err_return_path
+          dashboard_collections_path
+        end
+
+        def collection_id
+          params[:id]
+        end
+
+        def collection
+          @collection ||= Collection.find(collection_id)
+        end
+
+        def batch_ids
+          params[:batch_document_ids]
+        end
+
+        def member_action
+          params[:collection][:members]
+        end
+    end
+  end
+end

data/app/controllers/hyrax/dashboard/collections_controller.rb

@@ -5,9 +5,9 @@ module Hyrax
       include Blacklight::AccessControls::Catalog
       include Blacklight::Base
       include BreadcrumbsForCollections
-      layout 'dashboard'
+      with_themed_layout 'dashboard'
 
-      before_action :filter_docs_with_read_access!, except: :show
+      before_action :filter_docs_with_read_access!, except: [:show, :edit]
       before_action :remove_select_something_first_flash, except: :show
 
       include Hyrax::Collections::AcceptsBatches
@@ -17,9 +17,6 @@ module Hyrax
       # include the display_trophy_link view helper method
       helper Hyrax::TrophyHelper
 
-      # This is needed as of BL 3.7
-      copy_blacklight_config_from(::CatalogController)
-
       # Catch permission errors
       rescue_from Hydra::AccessDenied, CanCan::AccessDenied, with: :deny_collection_access
 
@@ -29,13 +26,7 @@ module Hyrax
       class_attribute :presenter_class,
                       :form_class,
                       :single_item_search_builder_class,
-                      :member_search_builder_class
-
-      alias collection_search_builder_class single_item_search_builder_class
-      deprecation_deprecate collection_search_builder_class: "use single_item_search_builder_class instead"
-
-      alias collection_member_search_builder_class member_search_builder_class
-      deprecation_deprecate collection_member_search_builder_class: "use member_search_builder_class instead"
+                      :membership_service_class
 
       self.presenter_class = Hyrax::CollectionPresenter
 
@@ -44,12 +35,10 @@ module Hyrax
       # The search builder to find the collection
       self.single_item_search_builder_class = SingleCollectionSearchBuilder
       # The search builder to find the collections' members
-      self.member_search_builder_class = Hyrax::CollectionMemberSearchBuilder
+      self.membership_service_class = Collections::CollectionMemberService
 
       load_and_authorize_resource except: [:index, :create], instance_name: :collection
 
-      before_action :ensure_admin!, only: :index # index for All Collections; see also Hyrax::My::CollectionsController #index for My Collections
-
       def deny_collection_access(exception)
         if exception.action == :edit
           redirect_to(url_for(action: 'show'), alert: 'You do not have sufficient privileges to edit this document')
@@ -62,20 +51,27 @@ module Hyrax
       end
 
       def new
+        # Coming from the UI, a collection type id should always be present.  Coming from the API, if a collection type id is not specified,
+        # use the default collection type (provides backward compatibility with versions < Hyrax 2.1.0)
+        collection_type_id = params[:collection_type_id].presence || default_collection_type.id
+        @collection.collection_type_gid = CollectionType.find(collection_type_id).gid
         add_breadcrumb t(:'hyrax.controls.home'), root_path
         add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-        add_breadcrumb t(:'hyrax.collections.new.header'), hyrax.new_dashboard_collection_path
+        add_breadcrumb t('.header', type_title: @collection.collection_type.title), request.path
         @collection.apply_depositor_metadata(current_user.user_key)
         form
       end
 
       def show
+        banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
+        @banner_file = "/" + banner_info.first.local_path.split("/")[-4..-1].join("/") unless banner_info.empty?
+
         presenter
         query_collection_members
       end
 
       def edit
-        query_collection_members
+        member_works
         # this is used to populate the "add to a collection" action for the members
         @user_collections = find_collections_for_form
         form
@@ -83,9 +79,13 @@ module Hyrax
 
       def after_create
         form
+        set_default_permissions
+        # if we are creating the new collection as a subcollection (via the nested collections controller),
+        # we pass the parent_id through a hidden field in the form and link the two after the create.
+        link_parent_collection(params[:parent_id]) unless params[:parent_id].nil?
         respond_to do |format|
           ActiveFedora::SolrService.instance.conn.commit
-          format.html { redirect_to dashboard_collection_path(@collection), notice: 'Collection was successfully created.' }
+          format.html { redirect_to edit_dashboard_collection_path(@collection), notice: t('hyrax.dashboard.my.action.collection_create_success') }
           format.json { render json: @collection, status: :created, location: dashboard_collection_path(@collection) }
         end
       end
@@ -104,10 +104,13 @@ module Hyrax
         # collection is saved without a value for `has_model.`
         @collection = ::Collection.new
         authorize! :create, @collection
-
-        @collection.attributes = collection_params.except(:members)
+        # Coming from the UI, a collection type gid should always be present.  Coming from the API, if a collection type gid is not specified,
+        # use the default collection type (provides backward compatibility with versions < Hyrax 2.1.0)
+        @collection.collection_type_gid = params[:collection_type_gid].presence || default_collection_type.gid
+        @collection.attributes = collection_params.except(:members, :parent_id, :collection_type_gid)
         @collection.apply_depositor_metadata(current_user.user_key)
         add_members_to_collection unless batch.empty?
+        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
         if @collection.save
           after_create
         else
@@ -116,11 +119,8 @@ module Hyrax
       end
 
       def after_update
-        if flash[:notice].nil?
-          flash[:notice] = 'Collection was successfully updated.'
-        end
         respond_to do |format|
-          format.html { redirect_to dashboard_collection_path(@collection) }
+          format.html { redirect_to update_referer, notice: t('hyrax.dashboard.my.action.collection_update_success') }
           format.json { render json: @collection, status: :updated, location: dashboard_collection_path(@collection) }
         end
       end
@@ -135,8 +135,19 @@ module Hyrax
       end
 
       def update
+        unless params[:update_collection].nil?
+          process_banner_input
+          process_logo_input
+        end
+
         process_member_changes
+        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
+        visiblity_updated = (@collection.visibility != collection_params[:visibility])
         if @collection.update(collection_params.except(:members))
+          # added because the collection indexing happens before Hydra::AccessControls::Permission is
+          # saved, and the after_update_index callback in the nested_relationship_reindexer removes the
+          # permissions from the collection's Solr document.
+          @collection.update_index if visiblity_updated
           after_update
         else
           after_update_error
@@ -147,7 +158,7 @@ module Hyrax
         respond_to do |format|
           format.html do
             redirect_to my_collections_path,
-                        notice: "Collection #{id} was successfully deleted"
+                        notice: t('hyrax.dashboard.my.action.collection_delete_success', id: id)
           end
           format.json { head :no_content, location: my_collections_path }
         end
@@ -156,7 +167,7 @@ module Hyrax
       def after_destroy_error(id)
         respond_to do |format|
           format.html do
-            flash[:notice] = "Collection #{id} could not be deleted"
+            flash[:notice] = t('hyrax.dashboard.my.action.collection_delete_fail', id: id)
             render :edit, status: :unprocessable_entity
           end
           format.json { render json: { id: id }, status: :unprocessable_entity, location: dashboard_collection_path(@collection) }
@@ -185,11 +196,116 @@ module Hyrax
       end
 
       def search_builder_class
-        Hyrax::CollectionSearchBuilder
+        Hyrax::Dashboard::CollectionsSearchBuilder
       end
 
       private
 
+        def default_collection_type
+          Hyrax::CollectionType.find_or_create_default_collection_type
+        end
+
+        def link_parent_collection(parent_id)
+          parent = ActiveFedora::Base.find(parent_id)
+          Hyrax::Collections::NestedCollectionPersistenceService.persist_nested_collection_for(parent: parent, child: @collection)
+        end
+
+        def uploaded_files(uploaded_file_ids)
+          return [] if uploaded_file_ids.empty?
+          UploadedFile.find(uploaded_file_ids)
+        end
+
+        def update_referer
+          return edit_dashboard_collection_path(@collection) + (params[:referer_anchor] || '') if params[:stay_on_edit]
+          dashboard_collection_path(@collection)
+        end
+
+        def process_banner_input
+          return update_existing_banner if params["banner_unchanged"] == "true"
+          remove_banner
+          uploaded_file_ids = params["banner_files"]
+          add_new_banner(uploaded_file_ids) if uploaded_file_ids
+        end
+
+        def update_existing_banner
+          banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
+          banner_info.first.save(banner_info.first.local_path, false)
+        end
+
+        def add_new_banner(uploaded_file_ids)
+          f = uploaded_files(uploaded_file_ids).first
+          banner_info = CollectionBrandingInfo.new(
+            collection_id: @collection.id,
+            filename: File.split(f.file_url).last,
+            role: "banner",
+            alt_txt: "",
+            target_url: ""
+          )
+          banner_info.save f.file_url
+        end
+
+        def remove_banner
+          banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
+          banner_info.delete_all unless banner_info.nil?
+        end
+
+        def update_logo_info(uploaded_file_id, alttext, linkurl)
+          logo_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "logo").where(local_path: uploaded_file_id.to_s)
+          logo_info.first.alt_text = alttext
+          logo_info.first.target_url = linkurl
+          logo_info.first.local_path = uploaded_file_id
+          logo_info.first.save(uploaded_file_id, false)
+        end
+
+        def create_logo_info(uploaded_file_id, alttext, linkurl)
+          file = uploaded_files(uploaded_file_id)
+          logo_info = CollectionBrandingInfo.new(
+            collection_id: @collection.id,
+            filename: File.split(file.file_url).last,
+            role: "logo",
+            alt_txt: alttext,
+            target_url: linkurl
+          )
+          logo_info.save file.file_url
+          logo_info
+        end
+
+        def remove_redundant_files(public_files)
+          # remove any public ones that were not included in the selection.
+          logos_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "logo")
+          logos_info.each do |logo_info|
+            logo_info.delete(logo_info.local_path) unless public_files.include? logo_info.local_path
+            logo_info.destroy unless public_files.include? logo_info.local_path
+          end
+        end
+
+        def process_logo_records(uploaded_file_ids)
+          public_files = []
+          uploaded_file_ids.each_with_index do |ufi, i|
+            if ufi.include?('public')
+              update_logo_info(ufi, params["alttext"][i], params["linkurl"][i])
+              public_files << ufi
+            else # brand new one, insert in the database
+              logo_info = create_logo_info(ufi, params["alttext"][i], params["linkurl"][i])
+              public_files << logo_info.local_path
+            end
+          end
+          public_files
+        end
+
+        def process_logo_input
+          uploaded_file_ids = params["logo_files"]
+          public_files = []
+
+          if uploaded_file_ids.nil?
+            remove_redundant_files public_files
+            return
+          end
+
+          public_files = process_logo_records uploaded_file_ids
+          remove_redundant_files public_files
+        end
+
         # run a solr query to get the collections the user has access to edit
         # @return [Array] a list of the user's collections
         def find_collections_for_form
@@ -217,41 +333,34 @@ module Hyrax
           single_item_search_builder_class.new(self).with(params.except(:q, :page))
         end
 
-        alias collection_search_builder single_item_search_builder
-        deprecation_deprecate collection_search_builder: "use single_item_search_builder instead"
-
-        # Instantiates the search builder that builds a query for items that are
-        # members of the current collection. This is used in the show view.
-        def member_search_builder
-          @member_search_builder ||= member_search_builder_class.new(self)
-        end
-
-        alias collection_member_search_builder member_search_builder
-        deprecation_deprecate collection_member_search_builder: "use member_search_builder instead"
-
         def collection_params
+          @participants = extract_old_style_permission_attributes(params[:collection])
           form_class.model_attributes(params[:collection])
         end
 
-        # Queries Solr for members of the collection.
-        # Populates @response and @member_docs similar to Blacklight Catalog#index populating @response and @documents
-        def query_collection_members
-          params[:q] = params[:cq]
-          @response = repository.search(query_for_collection_members)
-          @member_docs = @response.documents
+        def extract_old_style_permission_attributes(attributes)
+          # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
+          Deprecation.warn(self, "passing in permissions with a new collection is deprecated and will be removed from Hyrax 3.0 ()") # TODO: elr - add alternative in ()
+          permissions = attributes.delete("permissions_attributes")
+          return [] unless permissions
+          participants = []
+          permissions.each do |p|
+            access = access(p)
+            participants << { agent_type: agent_type(p), agent_id: p["name"], access: access } if access
+          end
+          participants
         end
 
-        # @return <Hash> a representation of the solr query that find the collection members
-        def query_for_collection_members
-          member_search_builder.with(params_for_members_query).query
+        def agent_type(permission)
+          # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
+          return 'group' if permission["type"] == 'group'
+          'user'
         end
 
-        # You can override this method if you need to provide additional inputs to the search
-        # builder. For example:
-        #   search_field: 'all_fields'
-        # @return <Hash> the inputs required for the collection member search builder
-        def params_for_members_query
-          params.merge(q: params[:cq])
+        def access(permission)
+          # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
+          return Hyrax::PermissionTemplateAccess::MANAGE if permission["access"] == 'edit'
+          return Hyrax::PermissionTemplateAccess::VIEW if permission["access"] == 'read'
         end
 
         def process_member_changes
@@ -305,6 +414,53 @@ module Hyrax
         def form
           @form ||= form_class.new(@collection, current_ability, repository)
         end
+
+        def set_default_permissions
+          additional_grants = @participants # Grants converted from older versions (< Hyrax 2.1.0) where share was edit or read access instead of managers, depositors, and viewers
+          Collections::PermissionsCreateService.create_default(collection: @collection, creating_user: current_user, grants: additional_grants)
+        end
+
+        def query_collection_members
+          member_works
+          member_subcollections if collection.collection_type.nestable?
+          parent_collections if collection.collection_type.nestable? && action_name == 'show'
+        end
+
+        # Instantiate the membership query service
+        def collection_member_service
+          @collection_member_service ||= membership_service_class.new(scope: self, collection: collection, params: params_for_query)
+        end
+
+        def member_works
+          @response = collection_member_service.available_member_works
+          @member_docs = @response.documents
+          @members_count = @response.total
+        end
+
+        def member_subcollections
+          results = collection_member_service.available_member_subcollections
+          @subcollection_solr_response = results
+          @subcollection_docs = results.documents
+          @subcollection_count = @presenter.nil? ? 0 : @subcollection_count = @presenter.subcollection_count = results.total
+        end
+
+        def parent_collections
+          page = params[:parent_collection_page].to_i
+          query = Hyrax::Collections::NestedCollectionQueryService
+          collection.parent_collections = query.parent_collections(child: collection_object, scope: self, page: page)
+        end
+
+        def collection_object
+          action_name == 'show' ? Collection.find(collection.id) : collection
+        end
+
+        # You can override this method if you need to provide additional
+        # inputs to the search builder. For example:
+        #   search_field: 'all_fields'
+        # @return <Hash> the inputs required for the collection member search builder
+        def params_for_query
+          params.merge(q: params[:cq])
+        end
     end
   end
 end