hyrax 2.0.3 → 2.1.0.beta1

data/app/controllers/hyrax/notifications_controller.rb

@@ -1,7 +1,7 @@
 module Hyrax
   class NotificationsController < ApplicationController
     before_action :authenticate_user!
-    layout 'dashboard'
+    with_themed_layout 'dashboard'
 
     def index
       add_breadcrumb t(:'hyrax.controls.home'), root_path

data/app/controllers/hyrax/pages_controller.rb

@@ -20,7 +20,8 @@ module Hyrax
     def update
       respond_to do |format|
         if @page.update(value: update_value_from_params)
-          format.html { redirect_to hyrax.edit_pages_path, notice: t(:'hyrax.pages.updated') }
+          redirect_path = "#{hyrax.edit_pages_path}##{params[:content_block].keys.first}"
+          format.html { redirect_to redirect_path, notice: t(:'hyrax.pages.updated') }
         else
           format.html { render :edit }
         end
@@ -45,7 +46,7 @@ module Hyrax
       end
 
       def pages_layout
-        action_name == 'show' ? 'homepage' : 'dashboard'
+        action_name == 'show' ? 'homepage' : 'hyrax/dashboard'
       end
   end
 end

data/app/controllers/hyrax/stats_controller.rb

@@ -5,6 +5,9 @@ module Hyrax
 
     before_action :build_breadcrumbs, only: [:work, :file]
 
+    # TODO: New reporting features FlipFlop pattern:
+    # Flipflop.enabled?(:analytics_redesign)
+
     def work
       @stats = Hyrax::WorkUsage.new(params[:id])
     end

data/app/controllers/hyrax/transfers_controller.rb

@@ -5,7 +5,7 @@ module Hyrax
     load_and_authorize_resource :proxy_deposit_request, parent: false, except: :index
     before_action :authorize_depositor_by_id, only: [:new, :create]
 
-    layout 'dashboard'
+    with_themed_layout 'dashboard'
 
     # Catch permission errors
     # TODO: Isn't this already handled?

data/app/forms/hyrax/forms/admin/appearance.rb

@@ -46,12 +46,12 @@ module Hyrax
 
         # The color links
         def link_color
-          block_for('link_color', '#337ab7')
+          block_for('link_color', '#2e74b2')
         end
 
         # The color for links in the footer
         def footer_link_color
-          block_for('footer_link_color', '#e27800')
+          block_for('footer_link_color', '#ffebcd')
         end
 
         # The background color for "primary" buttons

data/app/forms/hyrax/forms/admin/collection_type_form.rb

@@ -0,0 +1,24 @@
+module Hyrax
+  module Forms
+    module Admin
+      class CollectionTypeForm
+        include ActiveModel::Model
+        attr_accessor :collection_type
+        validates :title, presence: true
+
+        delegate :title, :description, :discoverable, :nestable, :sharable, :share_applies_to_new_works,
+                 :require_membership, :allow_multiple_membership, :assigns_workflow,
+                 :assigns_visibility, :id, :collection_type_participants, :persisted?,
+                 :collections?, :admin_set?, :user_collection?, to: :collection_type
+
+        def all_settings_disabled?
+          collections? || admin_set? || user_collection?
+        end
+
+        def share_options_disabled?
+          all_settings_disabled? || !sharable
+        end
+      end
+    end
+  end
+end

data/app/forms/hyrax/forms/admin/collection_type_participant_form.rb

@@ -0,0 +1,16 @@
+module Hyrax
+  module Forms
+    module Admin
+      class CollectionTypeParticipantForm
+        include ActiveModel::Model
+        attr_accessor :collection_type_participant
+        validates :agent_id, presence: true
+        validates :agent_type, presence: true
+        validates :access, presence: true
+        validates :hyrax_collection_type_id, presence: true
+
+        delegate :agent_id, :agent_type, :access, :hyrax_collection_type_id, to: :collection_type_participant
+      end
+    end
+  end
+end

data/app/forms/hyrax/forms/admin_set_form.rb

@@ -12,7 +12,7 @@ module Hyrax
 
       def permission_template
         @permission_template ||= begin
-                                   template_model = PermissionTemplate.find_or_create_by(admin_set_id: model.id)
+                                   template_model = PermissionTemplate.find_or_create_by(source_id: model.id)
                                    PermissionTemplateForm.new(template_model)
                                  end
       end

data/app/forms/hyrax/forms/batch_edit_form.rb

@@ -24,15 +24,36 @@ module Hyrax
 
       attr_reader :batch_document_ids
 
-      # Which parameters can we accept from the form
+      # Returns a list of parameters we accept from the form
+      # rubocop:disable Metrics/MethodLength
       def self.build_permitted_params
-        (super + [:visibility_during_embargo, :embargo_release_date,
-                  :visibility_after_embargo, :visibility_during_lease,
-                  :lease_expiration_date, :visibility_after_lease, :visibility,
-                  based_near_attributes: [:id, :_destroy]]) -
-          [{ work_members_attributes: [:id, :_destroy],
-             based_near_attributes: [:id, :_destroy] }]
+        [{ creator: [] },
+         { contributor: [] },
+         { description: [] },
+         { keyword: [] },
+         { resource_type: [] },
+         { license: [] },
+         { publisher: [] },
+         { date_created: [] },
+         { subject: [] },
+         { language: [] },
+         { identifier: [] },
+         { based_near: [] },
+         { related_url: [] },
+         { permissions_attributes: [:type, :name, :access, :id, :_destroy] },
+         :on_behalf_of,
+         :version,
+         :add_works_to_collection,
+         :visibility_during_embargo,
+         :embargo_release_date,
+         :visibility_after_embargo,
+         :visibility_during_lease,
+         :lease_expiration_date,
+         :visibility_after_lease,
+         :visibility,
+         { based_near_attributes: [:id, :_destroy] }]
       end
+      # rubocop:enable Metrics/MethodLength
 
       private
 

data/app/forms/hyrax/forms/collection_form.rb

@@ -1,37 +1,51 @@
 module Hyrax
   module Forms
+    # rubocop:disable Metrics/ClassLength
     class CollectionForm
       include HydraEditor::Form
       include HydraEditor::Form::Permissions
       # Used by the search builder
-      attr_accessor :current_ability, :repository
+      attr_reader :scope
 
-      delegate :id, :depositor, :permissions, to: :model
+      delegate :id, :depositor, :permissions, :human_readable_type, :member_ids, :nestable?, to: :model
+
+      class_attribute :membership_service_class
 
       # Required for search builder (FIXME)
       alias collection model
 
       self.model_class = ::Collection
-      class_attribute :member_search_builder_class
-      self.member_search_builder_class = Hyrax::CollectionMemberSearchBuilder
 
-      delegate :human_readable_type, :member_ids, to: :model
+      self.membership_service_class = Collections::CollectionMemberService
+
       delegate :blacklight_config, to: Hyrax::CollectionsController
 
       self.terms = [:resource_type, :title, :creator, :contributor, :description,
                     :keyword, :license, :publisher, :date_created, :subject, :language,
                     :representative_id, :thumbnail_id, :identifier, :based_near,
-                    :related_url, :visibility]
+                    :related_url, :visibility, :collection_type_gid]
 
       self.required_fields = [:title]
 
+      ProxyScope = Struct.new(:current_ability, :repository, :blacklight_config) do
+        def can?(*args)
+          current_ability.can?(*args)
+        end
+      end
+
       # @param model [Collection] the collection model that backs this form
       # @param current_ability [Ability] the capabilities of the current user
       # @param repository [Blacklight::Solr::Repository] the solr repository
       def initialize(model, current_ability, repository)
         super(model)
-        @current_ability = current_ability
-        @repository = repository
+        @scope = ProxyScope.new(current_ability, repository, blacklight_config)
+      end
+
+      def permission_template
+        @permission_template ||= begin
+                                   template_model = PermissionTemplate.find_or_create_by(source_id: model.id)
+                                   PermissionTemplateForm.new(template_model)
+                                 end
       end
 
       # @return [Hash] All FileSets in the collection, file.to_s is the key, file.id is the value
@@ -41,14 +55,13 @@ module Hyrax
 
       # Terms that appear above the accordion
       def primary_terms
-        [:title]
+        [:title, :description]
       end
 
       # Terms that appear within the accordion
       def secondary_terms
         [:creator,
          :contributor,
-         :description,
          :keyword,
          :license,
          :publisher,
@@ -61,6 +74,31 @@ module Hyrax
          :resource_type]
       end
 
+      def banner_info
+        @banner_info ||= begin
+          # Find Banner filename
+          banner_info = CollectionBrandingInfo.where(collection_id: id).where(role: "banner")
+          banner_file = File.split(banner_info.first.local_path).last unless banner_info.empty?
+          file_location = banner_info.first.local_path unless banner_info.empty?
+          relative_path = "/" + banner_info.first.local_path.split("/")[-4..-1].join("/") unless banner_info.empty?
+          { file: banner_file, full_path: file_location, relative_path: relative_path }
+        end
+      end
+
+      def logo_info
+        @logo_info ||= begin
+          # Find Logo filename, alttext, linktext
+          logos_info = CollectionBrandingInfo.where(collection_id: id).where(role: "logo")
+          logos_info.map do |logo_info|
+            logo_file = File.split(logo_info.local_path).last
+            relative_path = "/" + logo_info.local_path.split("/")[-4..-1].join("/")
+            alttext = logo_info.alt_text
+            linkurl = logo_info.target_url
+            { file: logo_file, full_path: logo_info.local_path, relative_path: relative_path, alttext: alttext, linkurl: linkurl }
+          end
+        end
+      end
+
       # Do not display additional fields if there are no secondary terms
       # @return [Boolean] display additional fields on the form?
       def display_additional_fields?
@@ -72,6 +110,25 @@ module Hyrax
         model.thumbnail.title.first
       end
 
+      def list_parent_collections
+        collection.member_of_collections
+      end
+
+      def list_child_collections
+        collection_member_service.available_member_subcollections.documents
+      end
+
+      def available_parent_collections(scope:)
+        return @available_parents if @available_parents.present?
+
+        collection = Collection.find(id)
+        colls = Hyrax::Collections::NestedCollectionQueryService.available_parent_collections(child: collection, scope: scope, limit_to_id: nil)
+        @available_parents = colls.map do |col|
+          { "id" => col.id, "title_first" => col.title.first }
+        end
+        @available_parents.to_json
+      end
+
       private
 
         def all_files_with_access
@@ -80,12 +137,12 @@ module Hyrax
 
         # Override this method if you have a different way of getting the member's ids
         def member_work_ids
-          response = repository.search(member_search_builder.merge(fl: 'id').query).response
+          response = collection_member_service.available_member_work_ids.response
           response.fetch('docs').map { |doc| doc['id'] }
         end
 
-        def member_search_builder
-          @member_search_builder ||= member_search_builder_class.new(self)
+        def collection_member_service
+          @collection_member_service ||= membership_service_class.new(scope: scope, collection: collection, params: blacklight_config.default_solr_params)
         end
 
         def member_presenters(member_ids)
@@ -94,5 +151,6 @@ module Hyrax
                                      presenter_args: [nil])
         end
     end
+    # rubocop:enable ClassLength
   end
 end

data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb

@@ -0,0 +1,98 @@
+module Hyrax
+  module Forms
+    module Dashboard
+      # Responsible for validating that both the parent and child are valid for nesting; If so, then
+      # also responsible for persisting those changes.
+      class NestCollectionForm
+        include ActiveModel::Model
+        class_attribute :default_query_service, :default_persistence_service, instance_writer: false
+        self.default_query_service = Hyrax::Collections::NestedCollectionQueryService
+        self.default_persistence_service = Hyrax::Collections::NestedCollectionPersistenceService
+
+        # @param parent [Collection, NilClass]
+        # @param child [Collection, NilClass]
+        # @param context [#can?,#repository,#blacklight_config]
+        # @param query_service [Hyrax::Collections::NestedCollectionQueryService]
+        # @param persistence_service [Hyrax::Collections::NestedCollectionPersistenceService] responsible for persisting the parent/child relationship
+        def initialize(parent: nil, child: nil, context:, query_service: default_query_service, persistence_service: default_persistence_service)
+          self.parent = parent
+          self.child = child
+          self.context = context
+          self.query_service = query_service
+          self.persistence_service = persistence_service
+        end
+
+        attr_accessor :parent, :child
+
+        validates :parent, presence: true
+        validates :child, presence: true
+        validate :parent_and_child_can_be_nested
+        validate :nesting_within_maximum_depth
+
+        def save
+          return false unless valid?
+          persistence_service.persist_nested_collection_for(parent: parent, child: child)
+        end
+
+        # For the given parent, what are all of the available collections that
+        # can be added as sub-collection of the parent.
+        def available_child_collections
+          query_service.available_child_collections(parent: parent, scope: context)
+        end
+
+        # For the given child, what are all of the available collections to
+        # which the child can be added as a sub-collection.
+        def available_parent_collections
+          query_service.available_parent_collections(child: child, scope: context)
+        end
+
+        # when creating a NEW collection, we need to do some basic validation before
+        # rerouting to new_dashboard_collection_path to add the new collection as
+        # a child. Since we don't yet have a child collection, the valid? option can't be used here.
+        def validate_add
+          if parent.try(:nestable?)
+            nesting_within_maximum_depth
+          else
+            errors.add(:parent, :cannot_have_child_nested)
+            false
+          end
+        end
+
+        def remove
+          if context.can? :edit, parent
+            persistence_service.remove_nested_relationship_for(parent: parent, child: child)
+          else
+            errors.add(:parent, :cannot_remove_relationship)
+            false
+          end
+        end
+
+        private
+
+          attr_accessor :query_service, :persistence_service, :context, :collection
+
+          # ideally we would love to be able to eliminate collections which exceed the
+          # maximum nesting depth from the lists of available collections, but the queries
+          # needed to make the determination are too expensive to do for every possible
+          # collection, so we only test for this situation prior to saving the new
+          # relationship.
+          def nesting_within_maximum_depth
+            return true if query_service.valid_combined_nesting_depth?(parent: parent, child: child, scope: context)
+            errors.add(:collection, :exceeds_maximum_nesting_depth)
+            false
+          end
+
+          def parent_and_child_can_be_nested
+            if parent.try(:nestable?) && child.try(:nestable?)
+              return true if query_service.parent_and_child_can_nest?(parent: parent, child: child, scope: context)
+              errors.add(:parent, :cannot_have_child_nested)
+              errors.add(:child, :cannot_nest_in_parent)
+            else
+              errors.add(:parent, :is_not_nestable) unless parent.try(:nestable?)
+              errors.add(:child, :is_not_nestable) unless child.try(:nestable?)
+            end
+          end
+      end
+    end
+  end
+end

data/app/forms/hyrax/forms/permission_template_form.rb

@@ -6,11 +6,12 @@ module Hyrax
       self.model_class = PermissionTemplate
       self.terms = []
       delegate :access_grants, :access_grants_attributes=, :release_date, :release_period, :visibility, to: :model
-      delegate :available_workflows, :active_workflow, :admin_set, to: :model
+      delegate :available_workflows, :active_workflow, :source_model, to: :model
 
-      # @return [#to_s] the primary key of the associated admin_set
-      # def admin_set_id (because you might come looking for this method)
-      delegate :id, to: :admin_set, prefix: :admin_set
+      # @return [#to_s] the primary key of the associated admin_set or collection
+      # def source_id (because you might come looking for this method)
+      delegate :id, to: :source_model, prefix: :source
+      delegate :reset_access_controls!, to: :source_model
 
       # Stores which radio button under release "Varies" option is selected
       attr_accessor :release_varies
@@ -63,18 +64,19 @@ module Hyrax
       end
       # rubocop:enable Metrics/MethodLength
 
-      def update_management
-        admin_set.update_access_controls!
-        update_workflow_responsibilities
+      # Copy this access to the permissions of the Admin Set or Collection and to
+      # the WorkflowResponsibilities of the active workflow if this is an Admin Set
+      def update_access(remove_agent: false)
+        reset_access_controls!
+        update_workflow_responsibilities(remove_agent: remove_agent) if source_model.is_a?(AdminSet)
       end
 
-      # This method is used to revoke access to an Admin Set and its workflows
+      # This method is used to revoke access to a Collection or Admin Set and its workflows
       #
       # @return [Void]
       def remove_access!(permission_template_access)
         construct_attributes_from_template_access!(permission_template_access)
-        admin_set.update_access_controls!
-        update_workflow_responsibilities(remove_agent: true)
+        update_access(remove_agent: true)
       end
 
       private
@@ -109,9 +111,7 @@ module Hyrax
         # @return [Void]
         def update_participants_options
           update_permission_template
-          update_workflow_responsibilities
-          # if managers were added or removed, recalculate update the access controls on the AdminSet
-          admin_set.update_access_controls! if managers_updated?
+          update_access(remove_agent: false)
         end
 
         # Grant appropriate workflow roles based on access specified