hyrax 2.0.3 → 2.1.0.beta1

data/app/controllers/concerns/hyrax/admin/stats_behavior.rb

@@ -3,7 +3,7 @@ module Hyrax
     module StatsBehavior
       extend ActiveSupport::Concern
       included do
-        layout 'dashboard'
+        with_themed_layout 'dashboard'
       end
 
       def show

data/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb

@@ -5,7 +5,7 @@ module Hyrax
       include Blacklight::SearchContext
       included do
         before_action :ensure_admin!
-        layout 'dashboard'
+        with_themed_layout 'dashboard'
       end
 
       # Display admin menu list of users

data/app/controllers/concerns/hyrax/collections_controller_behavior.rb

@@ -5,12 +5,6 @@ module Hyrax
     include Blacklight::Base
 
     included do
-      before_action :filter_docs_with_read_access!, except: :show
-
-      include Hyrax::Collections::AcceptsBatches
-
-      # include the render_check_all view helper method
-      helper Hyrax::BatchEditsHelper
       # include the display_trophy_link view helper method
       helper Hyrax::TrophyHelper
 
@@ -20,20 +14,14 @@ module Hyrax
       class_attribute :presenter_class,
                       :form_class,
                       :single_item_search_builder_class,
-                      :member_search_builder_class
-
-      alias_method :collection_search_builder_class, :single_item_search_builder_class
-      deprecation_deprecate collection_search_builder_class: "use single_item_search_builder_class instead"
-
-      alias_method :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
 
       # 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
     end
 
     def show
@@ -64,47 +52,56 @@ 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"
+      def collection_params
+        form_class.model_attributes(params[:collection])
+      end
 
-      # 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)
+      # Include 'catalog' and 'hyrax/base' in the search path for views, while prefering
+      # our local paths. Thus we are unable to just override `self.local_prefixes`
+      def _prefixes
+        @_prefixes ||= super + ['catalog', 'hyrax/base']
       end
 
-      alias collection_member_search_builder member_search_builder
-      deprecation_deprecate collection_member_search_builder: "use member_search_builder instead"
+      def query_collection_members
+        member_works
+        member_subcollections if collection.collection_type.nestable?
+        parent_collections if collection.collection_type.nestable? && action_name == 'show'
+      end
 
-      def collection_params
-        form_class.model_attributes(params[:collection])
+      # 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
 
-      # 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)
+      def member_works
+        @response = collection_member_service.available_member_works
         @member_docs = @response.documents
+        @members_count = @response.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
 
-      # @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 member_subcollections
+        results = collection_member_service.available_member_subcollections
+        @subcollection_solr_response = results
+        @subcollection_docs = results.documents
+        @subcollection_count = @presenter.subcollection_count = results.total
       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
+      # @return <Hash> the inputs required for the collection member query service
+      def params_for_query
         params.merge(q: params[:cq])
       end
-
-      # Include 'catalog' and 'hyrax/base' in the search path for views, while prefering
-      # our local paths. Thus we are unable to just override `self.local_prefixes`
-      def _prefixes
-        @_prefixes ||= super + ['catalog', 'hyrax/base']
-      end
   end
 end

data/app/controllers/concerns/hyrax/controller.rb

@@ -2,13 +2,10 @@ module Hyrax::Controller
   extend ActiveSupport::Concern
 
   included do
-    class_attribute :create_work_presenter_class
-    self.create_work_presenter_class = Hyrax::SelectTypeListPresenter
     self.search_state_class = Hyrax::SearchState
 
     # Adds Hydra behaviors into the application controller
     include Hydra::Controller::ControllerBehavior
-    helper_method :create_work_presenter
     before_action :set_locale
   end
 
@@ -17,12 +14,6 @@ module Hyrax::Controller
     hyrax.dashboard_path
   end
 
-  # A presenter for selecting a work type to create
-  # this is needed here because the selector is in the header on every page
-  def create_work_presenter
-    @create_work_presenter ||= create_work_presenter_class.new(current_user)
-  end
-
   # Ensure that the locale choice is persistent across requests
   def default_url_options
     super.merge(locale: I18n.locale)

data/app/controllers/concerns/hyrax/themed_layout_controller.rb

@@ -12,7 +12,10 @@ module Hyrax
 
     module ClassMethods
       def with_themed_layout(view_name = nil)
-        if view_name
+        case view_name
+        when Symbol
+          layout proc { |controller| controller.send(view_name) }
+        when String
           layout("#{theme}/#{view_name}")
         else
           layout(theme)

data/app/controllers/concerns/hyrax/works_controller_behavior.rb

@@ -1,3 +1,5 @@
+require 'iiif_manifest'
+
 module Hyrax
   module WorksControllerBehavior
     extend ActiveSupport::Concern
@@ -5,14 +7,13 @@ module Hyrax
     include Blacklight::AccessControls::Catalog
 
     included do
-      layout :decide_layout
+      with_themed_layout :decide_layout
       copy_blacklight_config_from(::CatalogController)
 
       class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class
       self.show_presenter = Hyrax::WorkShowPresenter
       self.work_form_service = Hyrax::WorkFormService
       self.search_builder_class = WorkSearchBuilder
-      self.theme = 'hyrax/1_column'
       attr_accessor :curation_concern
       helper_method :curation_concern, :contextual_path
 
@@ -21,7 +22,7 @@ module Hyrax
 
     class_methods do
       def curation_concern_type=(curation_concern_type)
-        load_and_authorize_resource class: curation_concern_type, instance_name: :curation_concern, except: [:show, :file_manager, :inspect_work]
+        load_and_authorize_resource class: curation_concern_type, instance_name: :curation_concern, except: [:show, :file_manager, :inspect_work, :manifest]
 
         # Load the fedora resource to get the etag.
         # No need to authorize for the file manager, because it does authorization via the presenter.
@@ -60,6 +61,7 @@ module Hyrax
       else
         respond_to do |wants|
           wants.html do
+            flash[:error] = curation_concern.errors.messages[:collections].to_sentence
             build_form
             render 'new', status: :unprocessable_entity
           end
@@ -102,6 +104,7 @@ module Hyrax
       else
         respond_to do |wants|
           wants.html do
+            flash[:error] = curation_concern.errors.messages[:collections].to_sentence
             build_form
             render 'edit', status: :unprocessable_entity
           end
@@ -127,7 +130,10 @@ module Hyrax
       presenter
     end
 
-    #    attr_writer :actor
+    def manifest
+      headers['Access-Control-Allow-Origin'] = '*'
+      render json: manifest_builder.to_h
+    end
 
     private
 
@@ -135,6 +141,10 @@ module Hyrax
         @form = work_form_service.build(curation_concern, current_ability, self)
       end
 
+      def manifest_builder
+        ::IIIFManifest::ManifestFactory.new(presenter)
+      end
+
       def actor
         @actor ||= Hyrax::CurationConcern.actor
       end
@@ -216,12 +226,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
 
       # Add uploaded_files to the parameters received by the actor.
@@ -270,7 +281,7 @@ module Hyrax
           return redirect_to main_app.confirm_hyrax_permission_path(curation_concern) if curation_concern.visibility_changed?
         end
         respond_to do |wants|
-          wants.html { redirect_to [main_app, curation_concern] }
+          wants.html { redirect_to [main_app, curation_concern], notice: "Work \"#{curation_concern}\" successfully updated." }
           wants.json { render :show, status: :ok, location: polymorphic_path([main_app, curation_concern]) }
         end
       end

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

@@ -2,30 +2,27 @@ module Hyrax
   class Admin::AdminSetsController < ApplicationController
     include Hyrax::CollectionsControllerBehavior
 
-    # added skip to allow flash notices. see https://github.com/samvera/hyrax/issues/202
-    skip_before_action :filter_docs_with_read_access!
     before_action :ensure_manager!
     load_and_authorize_resource
 
-    layout 'dashboard'
+    with_themed_layout 'dashboard'
     self.presenter_class = Hyrax::AdminSetPresenter
     self.form_class = Hyrax::Forms::AdminSetForm
 
     # Used for the show action
     self.single_item_search_builder_class = Hyrax::SingleAdminSetSearchBuilder
 
-    # Used to get the members for the show action
-    self.member_search_builder_class = Hyrax::AdminAdminSetMemberSearchBuilder
+    # The search builder to find the admin set's members
+    self.membership_service_class = Hyrax::AdminSetMemberService
 
     # Used to create the admin set
     class_attribute :admin_set_create_service
     self.admin_set_create_service = AdminSetCreateService
 
     def show
-      add_breadcrumb t(:'hyrax.controls.home'), root_path
-      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb t(:'hyrax.admin.sidebar.admin_sets'), hyrax.admin_admin_sets_path
-      add_breadcrumb t(:'hyrax.admin.admin_sets.show.breadcrumb'), request.path
+      add_breadcrumb t(:'hyrax.dashboard.title'), hyrax.dashboard_path
+      add_breadcrumb t(:'hyrax.dashboard.my.collections'), hyrax.admin_admin_sets_path
+      add_breadcrumb @admin_set.title.first
       super
     end
 
@@ -47,15 +44,13 @@ module Hyrax
     # Renders a JSON response with a list of files in this admin set.
     # This is used by the edit form to populate the thumbnail_id dropdown
     def files
-      result = form.select_files.map do |label, id|
-        { id: id, text: label }
-      end
+      result = form.select_files.map { |label, id| { id: id, text: label } }
       render json: result
     end
 
     def update
       if @admin_set.update(admin_set_params)
-        redirect_to hyrax.edit_admin_admin_set_path(@admin_set), notice: I18n.t('updated_admin_set', scope: 'hyrax.admin.admin_sets.form.permission_update_notices', name: @admin_set.title.first)
+        redirect_to update_referer, notice: I18n.t('updated_admin_set', scope: 'hyrax.admin.admin_sets.form.permission_update_notices', name: @admin_set.title.first)
       else
         setup_form
         render :edit
@@ -73,7 +68,7 @@ module Hyrax
 
     def destroy
       if @admin_set.destroy
-        redirect_to hyrax.admin_admin_sets_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
+        after_delete_success
       else
         redirect_to hyrax.admin_admin_set_path(@admin_set), alert: @admin_set.errors.full_messages.to_sentence
       end
@@ -91,6 +86,10 @@ module Hyrax
 
     private
 
+      def update_referer
+        hyrax.edit_admin_admin_set_path(@admin_set) + (params[:referer_anchor] || '')
+      end
+
       def ensure_manager!
         # Even though the user can view this admin set, they may not be able to view
         # it on the admin page.
@@ -104,7 +103,7 @@ module Hyrax
       def setup_form
         add_breadcrumb t(:'hyrax.controls.home'), root_path
         add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-        add_breadcrumb t(:'hyrax.admin.sidebar.admin_sets'), hyrax.admin_admin_sets_path
+        add_breadcrumb t(:'hyrax.dashboard.my.collections'), hyrax.my_collections_path
         add_breadcrumb action_breadcrumb, request.path
         form
       end
@@ -138,5 +137,15 @@ module Hyrax
       def repository_class
         blacklight_config.repository_class
       end
+
+      def after_delete_success
+        if request.referer.include? "my/collections"
+          redirect_to hyrax.my_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
+        elsif request.referer.include? "collections"
+          redirect_to hyrax.dashboard_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
+        else
+          redirect_to hyrax.my_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
+        end
+      end
   end
 end

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

@@ -2,7 +2,7 @@ module Hyrax
   module Admin
     class AppearancesController < ApplicationController
       before_action :require_permissions
-      layout 'dashboard'
+      with_themed_layout 'dashboard'
       class_attribute :form_class
       self.form_class = Hyrax::Forms::Admin::Appearance
 

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

@@ -0,0 +1,44 @@
+module Hyrax
+  class Admin::CollectionTypeParticipantsController < ApplicationController
+    before_action do
+      authorize! :manage, :collection_types
+    end
+
+    class_attribute :form_class
+    self.form_class = Hyrax::Forms::Admin::CollectionTypeParticipantForm
+
+    def create
+      @collection_type_participant = Hyrax::CollectionTypeParticipant.new(collection_type_participant_params)
+      if @collection_type_participant.save
+        redirect_to(
+          edit_admin_collection_type_path(@collection_type_participant.hyrax_collection_type_id, anchor: 'participants'),
+          notice: I18n.t('update_notice', scope: 'hyrax.admin.collection_types.form_participants')
+        )
+      else
+        redirect_to(
+          edit_admin_collection_type_path(@collection_type_participant.hyrax_collection_type_id, anchor: 'participants'),
+          alert: @collection_type_participant.errors.full_messages.to_sentence
+        )
+      end
+    end
+
+    def destroy
+      @collection_type_participant = Hyrax::CollectionTypeParticipant.find(params[:id])
+      if @collection_type_participant.destroy
+        redirect_to(
+          edit_admin_collection_type_path(@collection_type_participant.hyrax_collection_type_id, anchor: 'participants'),
+          notice: I18n.t('remove_success', scope: 'hyrax.admin.collection_types.form_participants')
+        )
+      else
+        redirect_to(
+          edit_admin_collection_type_path(@collection_type_participant.hyrax_collection_type_id, anchor: 'participants'),
+          alert: @collection_type_participant.errors.full_messages.to_sentence
+        )
+      end
+    end
+
+    def collection_type_participant_params
+      params.require(:collection_type_participant).permit(:access, :agent_id, :agent_type, :hyrax_collection_type_id)
+    end
+  end
+end

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

@@ -0,0 +1,97 @@
+module Hyrax
+  class Admin::CollectionTypesController < ApplicationController
+    before_action do
+      authorize! :manage, :collection_types
+    end
+    before_action :set_collection_type, only: [:edit, :update, :destroy]
+
+    with_themed_layout 'dashboard'
+    class_attribute :form_class
+    self.form_class = Hyrax::Forms::Admin::CollectionTypeForm
+    load_resource class: Hyrax::CollectionType, except: [:index, :show, :create], instance_name: :collection_type
+
+    def index
+      # TODO: How do we know if a collection_type has existing collections?
+      # Will that be a property on @collection_types here?
+      @collection_types = Hyrax::CollectionType.all
+      add_common_breadcrumbs
+    end
+
+    def new
+      setup_form
+      add_common_breadcrumbs
+      add_breadcrumb t(:'hyrax.admin.collection_types.new.header'), hyrax.new_admin_collection_type_path
+    end
+
+    def create
+      @collection_type = Hyrax::CollectionType.new(collection_type_params)
+      if @collection_type.save
+        Hyrax::CollectionTypes::CreateService.add_default_participants(@collection_type.id)
+        redirect_to hyrax.edit_admin_collection_type_path(@collection_type), notice: t(:'hyrax.admin.collection_types.create.notification', name: @collection_type.title)
+      else
+        setup_form
+        add_common_breadcrumbs
+        add_breadcrumb t(:'hyrax.admin.collection_types.new.header'), hyrax.new_admin_collection_type_path
+        render :new
+      end
+    end
+
+    def edit
+      setup_form
+      setup_participants_form
+      add_common_breadcrumbs
+      add_breadcrumb t(:'hyrax.admin.collection_types.edit.header'), hyrax.edit_admin_collection_type_path
+    end
+
+    def update
+      if @collection_type.update(collection_type_params)
+        redirect_to update_referer, notice: t(:'hyrax.admin.collection_types.update.notification', name: @collection_type.title)
+      else
+        setup_form
+        add_common_breadcrumbs
+        add_breadcrumb t(:'hyrax.admin.collection_types.edit.header'), hyrax.edit_admin_collection_type_path
+        render :edit
+      end
+    end
+
+    def destroy
+      if @collection_type.destroy
+        redirect_to hyrax.admin_collection_types_path, notice: t(:'hyrax.admin.collection_types.delete.notification', name: @collection_type.title)
+      else
+        redirect_to hyrax.admin_collection_types_path, alert: @collection_type.errors.full_messages.to_sentence
+      end
+    end
+
+    private
+
+      def update_referer
+        hyrax.edit_admin_collection_type_path(@collection_type) + (params[:referer_anchor] || '')
+      end
+
+      def add_common_breadcrumbs
+        add_breadcrumb t(:'hyrax.controls.home'), root_path
+        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+        add_breadcrumb t(:'hyrax.admin.sidebar.configuration'), '#'
+        add_breadcrumb t(:'hyrax.admin.collection_types.index.breadcrumb'), hyrax.admin_collection_types_path
+      end
+
+      # initialize the form object
+      def form
+        @form ||= form_class.new(collection_type: @collection_type)
+      end
+      alias setup_form form
+
+      def setup_participants_form
+        @collection_type_participant = Hyrax::Forms::Admin::CollectionTypeParticipantForm.new(collection_type_participant: @collection_type.collection_type_participants.build)
+      end
+
+      def set_collection_type
+        @collection_type = Hyrax::CollectionType.find(params[:id])
+      end
+
+      def collection_type_params
+        params.require(:collection_type).permit(:title, :description, :nestable, :discoverable, :sharable, :share_applies_to_new_works,
+                                                :allow_multiple_membership, :require_membership, :assigns_workflow, :assigns_visibility)
+      end
+  end
+end