hyrax 2.0.3 → 2.1.0.beta1

data/app/presenters/hyrax/admin/workflow_role_presenter.rb

@@ -5,19 +5,19 @@ module Hyrax
       def initialize(workflow_role)
         @workflow = workflow_role.workflow
         @role = workflow_role.role
-        @admin_set_id = workflow.permission_template.admin_set_id
+        @source_id = workflow.permission_template.source_id
       end
 
       # @todo This is a hack; I don't want to include reference to the admin set;
       #       However based on the current UI, in which we list all workflows (spanning all admin sets) this is required.
       # @return [String] A meaningful label for the given WorkflowRole
       def label
-        "#{admin_set_label(admin_set_id)} - #{role.name} (#{workflow.name})"
+        "#{admin_set_label(source_id)} - #{role.name} (#{workflow.name})"
       end
 
       private
 
-        attr_accessor :workflow, :role, :admin_set_id
+        attr_accessor :workflow, :role, :source_id
 
         def admin_set_label(id)
           result = ActiveFedora::Base.search_by_id(id, fl: 'title_tesim')

data/app/presenters/hyrax/admin_set_options_presenter.rb

@@ -19,7 +19,7 @@ module Hyrax
       # later utilized by Javascript to limit new Work options based on AdminSet selected
       def data_attributes(admin_set)
         # Get permission template associated with this AdminSet (if any)
-        permission_template = PermissionTemplate.find_by(admin_set_id: admin_set.id)
+        permission_template = PermissionTemplate.find_by(source_id: admin_set.id)
 
         # Only add data attributes if permission template exists
         return {} unless permission_template

data/app/presenters/hyrax/admin_set_presenter.rb

@@ -4,6 +4,10 @@ module Hyrax
       ActiveFedora::SolrService.count("{!field f=isPartOf_ssim}#{id}")
     end
 
+    def total_viewable_items
+      ActiveFedora::Base.where("isPartOf_ssim:#{id}").accessible_by(current_ability).count
+    end
+
     # AdminSet cannot be deleted if default set or non-empty
     def disable_delete?
       AdminSet.default_set?(id) || total_items > 0
@@ -14,5 +18,17 @@ module Hyrax
       return I18n.t('hyrax.admin.admin_sets.delete.error_default_set') if AdminSet.default_set?(id)
       return I18n.t('hyrax.admin.admin_sets.delete.error_not_empty') if total_items > 0
     end
+
+    def collection_type
+      @collection_type ||= Hyrax::CollectionType.find_or_create_admin_set_type
+    end
+
+    def show_path
+      Hyrax::Engine.routes.url_helpers.admin_admin_set_path(id)
+    end
+
+    def available_parent_collections(*)
+      []
+    end
   end
 end

data/app/presenters/hyrax/collection_options_presenter.rb

@@ -4,6 +4,7 @@ module Hyrax
     # @param [Hyrax::CollectionsService] service
     def initialize(service)
       @service = service
+      Deprecation.warn(self, 'CollectionOptionsPresenter is deprecated and will be removed in Hyrax 3')
     end
 
     # Return Collection selectbox options based on access type

data/app/presenters/hyrax/collection_presenter.rb

@@ -4,6 +4,14 @@ module Hyrax
     include PresentsAttributes
     include ActionView::Helpers::NumberHelper
     attr_accessor :solr_document, :current_ability, :request
+    attr_reader :subcollection_count
+    attr_accessor :parent_collections # This is expected to be a Blacklight::Solr::Response with all of the parent collections
+    attr_writer :collection_type
+
+    NUM_PARENTS_TO_SHOW = 3
+
+    class_attribute :create_work_presenter_class
+    self.create_work_presenter_class = Hyrax::SelectTypeListPresenter
 
     # @param [SolrDocument] solr_document
     # @param [Ability] current_ability
@@ -12,24 +20,30 @@ module Hyrax
       @solr_document = solr_document
       @current_ability = current_ability
       @request = request
+      @subcollection_count = 0
     end
 
     # CurationConcern methods
     delegate :stringify_keys, :human_readable_type, :collection?, :representative_id,
              :to_s, to: :solr_document
 
+    delegate(*Hyrax::CollectionType.collection_type_settings_methods, to: :collection_type, prefix: :collection_type_is)
+
+    def collection_type
+      @collection_type ||= Hyrax::CollectionType.find_by_gid!(collection_type_gid)
+    end
+
     # Metadata Methods
-    delegate :title, :description, :creator, :contributor, :subject, :publisher, :keyword, :language,
-             :embargo_release_date, :lease_expiration_date, :license, :date_created,
-             :resource_type, :based_near, :related_url, :identifier, :thumbnail_path,
+    delegate :title, :description, :creator, :contributor, :subject, :publisher, :keyword, :language, :embargo_release_date,
+             :lease_expiration_date, :license, :date_created, :resource_type, :based_near, :related_url, :identifier, :thumbnail_path,
+             :title_or_label, :collection_type_gid, :create_date, :modified_date, :visibility, :edit_groups, :edit_people,
              to: :solr_document
 
     # Terms is the list of fields displayed by
     # app/views/collections/_show_descriptions.html.erb
     def self.terms
-      [:total_items, :size, :resource_type, :creator, :contributor, :keyword,
-       :license, :publisher, :date_created, :subject, :language, :identifier,
-       :based_near, :related_url]
+      [:total_items, :size, :resource_type, :creator, :contributor, :keyword, :license, :publisher, :date_created, :subject,
+       :language, :identifier, :based_near, :related_url]
     end
 
     def terms_with_values
@@ -54,5 +68,119 @@ module Hyrax
     def total_items
       ActiveFedora::Base.where("member_of_collection_ids_ssim:#{id}").count
     end
+
+    def total_viewable_items
+      ActiveFedora::Base.where("member_of_collection_ids_ssim:#{id}").accessible_by(current_ability).count
+    end
+
+    def total_viewable_works
+      ActiveFedora::Base.where("member_of_collection_ids_ssim:#{id} AND generic_type_sim:Work").accessible_by(current_ability).count
+    end
+
+    def total_viewable_collections
+      ActiveFedora::Base.where("member_of_collection_ids_ssim:#{id} AND generic_type_sim:Collection").accessible_by(current_ability).count
+    end
+
+    def collection_type_badge
+      collection_type.title
+    end
+
+    # The total number of parents that this collection belongs to, visible or not.
+    def total_parent_collections
+      parent_collections.nil? ? 0 : parent_collections.response['numFound']
+    end
+
+    # The number of parent collections shown on the current page. This will differ from total_parent_collections
+    # due to pagination.
+    def parent_collection_count
+      parent_collections.nil? ? 0 : parent_collections.documents.size
+    end
+
+    # Of the number of parent collections shown on the current page, are there more to show?
+    def more_parent_collections?
+      parent_collection_count > NUM_PARENTS_TO_SHOW
+    end
+
+    # Are there few enough parent collections to use the more/less behavior?
+    def use_parent_more_less?
+      parent_collections.total_pages <= 1
+    end
+
+    # Returns a subset of parent collections that should be shown by default
+    def visible_parent_collections
+      return parent_collections.documents[0..NUM_PARENTS_TO_SHOW - 1] if more_parent_collections?
+      parent_collections && parent_collections.documents || []
+    end
+
+    # Returns the remaining subset of parent collections that should not be shown by default
+    def more_parent_collections
+      return parent_collections.documents[NUM_PARENTS_TO_SHOW..parent_collection_count - 1] if more_parent_collections?
+      []
+    end
+
+    def user_can_nest_collection?
+      current_ability.can?(:deposit, solr_document)
+    end
+
+    def user_can_create_new_nest_collection?
+      current_ability.can?(:create_collection_of_type, collection_type)
+    end
+
+    def show_path
+      Hyrax::Engine.routes.url_helpers.dashboard_collection_path(id)
+    end
+
+    def banner_file
+      # Find Banner filename
+      ci = CollectionBrandingInfo.where(collection_id: id, role: "banner")
+      "/" + ci[0].local_path.split("/")[-4..-1].join("/") unless ci.empty?
+    end
+
+    def logo_record
+      logo_info = []
+      # Find Logo filename, alttext, linktext
+      cis = CollectionBrandingInfo.where(collection_id: id, role: "logo")
+      return if cis.empty?
+      cis.each do |coll_info|
+        logo_file = File.split(coll_info.local_path).last
+        file_location = "/" + coll_info.local_path.split("/")[-4..-1].join("/") unless logo_file.empty?
+        alttext = coll_info.alt_text
+        linkurl = coll_info.target_url
+        logo_info << { file: logo_file, file_location: file_location, alttext: alttext, linkurl: linkurl }
+      end
+      logo_info
+    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_ability.current_user)
+    end
+
+    def create_many_work_types?
+      create_work_presenter.many?
+    end
+
+    def draw_select_work_modal?
+      create_many_work_types?
+    end
+
+    def first_work_type
+      create_work_presenter.first_model
+    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
+
+    def subcollection_count=(total)
+      @subcollection_count = total unless total.nil?
+    end
   end
 end

data/app/presenters/hyrax/displays_image.rb

@@ -0,0 +1,39 @@
+require 'iiif_manifest'
+
+module Hyrax
+  # This gets mixed into FileSetPresenter in order to create
+  # a canvas on a IIIF manifest
+  module DisplaysImage
+    extend ActiveSupport::Concern
+
+    # Creates a display image only where FileSet is an image.
+    #
+    # @return [IIIFManifest::DisplayImage] the display image required by the manifest builder.
+    def display_image
+      return nil unless ::FileSet.exists?(id) && solr_document.image?
+      # @todo this is slow, find a better way (perhaps index iiif url):
+      original_file = ::FileSet.find(id).original_file
+
+      url = Hyrax.config.iiif_image_url_builder.call(
+        original_file.id,
+        request.base_url,
+        Hyrax.config.iiif_image_size_default
+      )
+      # @see https://github.com/samvera-labs/iiif_manifest
+      IIIFManifest::DisplayImage.new(url,
+                                     width: 640,
+                                     height: 480,
+                                     iiif_endpoint: iiif_endpoint(original_file.id))
+    end
+
+    private
+
+      def iiif_endpoint(file_id)
+        return unless Hyrax.config.iiif_image_server?
+        IIIFManifest::IIIFEndpoint.new(
+          Hyrax.config.iiif_info_url_builder.call(file_id, request.base_url),
+          profile: Hyrax.config.iiif_image_compliance_level_uri
+        )
+      end
+  end
+end

data/app/presenters/hyrax/file_set_presenter.rb

@@ -4,6 +4,7 @@ module Hyrax
     include PresentsAttributes
     include CharacterizationBehavior
     include WithEvents
+    include DisplaysImage
 
     attr_accessor :solr_document, :current_ability, :request
 
@@ -89,10 +90,6 @@ module Hyrax
                                                               presenter_args: current_ability).first
     end
 
-    def fixity_check_service
-      @fixity_check_service ||= Hyrax::FileSetFixityCheckService.new(id)
-    end
-
     private
 
       def link_presenter_class

data/app/presenters/hyrax/fixity_status_presenter.rb

@@ -10,7 +10,7 @@ module Hyrax
     include ActionView::Helpers::TextHelper
     include ActionView::Helpers::OutputSafetyHelper
 
-    attr_reader :file_set_id, :relevant_log_records
+    attr_reader :file_set_id
     # Note this takes a file_set_id NOT a FileSet, easy use from either solr
     # or AF object.
     def initialize(file_set_id)
@@ -75,7 +75,7 @@ module Hyrax
       # Should be all _latest_ ChecksumAuditLog about different files/versions
       # currently existing in specified FileSet.
       def relevant_log_records
-        @relevant_log_records = ChecksumAuditLog.latest_for_file_set_id(file_set_id)
+        @relevant_log_records ||= ChecksumAuditLog.latest_for_file_set_id(file_set_id)
       end
 
       def num_checked_files

data/app/presenters/hyrax/homepage_presenter.rb

@@ -1,5 +1,7 @@
 module Hyrax
   class HomepagePresenter
+    class_attribute :create_work_presenter_class
+    self.create_work_presenter_class = Hyrax::SelectTypeListPresenter
     attr_reader :current_ability, :collections
 
     def initialize(current_ability, collections)
@@ -15,6 +17,24 @@ module Hyrax
         current_ability.can_create_any_work?
     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_ability.current_user)
+    end
+
+    def create_many_work_types?
+      create_work_presenter.many?
+    end
+
+    def draw_select_work_modal?
+      display_share_button? && create_many_work_types?
+    end
+
+    def first_work_type
+      create_work_presenter.first_model
+    end
+
     private
 
       def user_unregistered?

data/app/presenters/hyrax/menu_presenter.rb

@@ -13,7 +13,7 @@ module Hyrax
     # Returns true if the current controller happens to be one of the controllers that deals
     # with settings.  This is used to keep the parent section on the sidebar open.
     def settings_section?
-      %w[appearances content_blocks features pages].include?(controller_name)
+      %w[appearances content_blocks features pages collection_types].include?(controller_name)
     end
 
     # @param options [Hash, String] a hash or string representing the path. Hash is prefered as it
@@ -54,6 +54,7 @@ module Hyrax
     # @return [Boolean] will the configuration section be displayed to the user
     def show_configuration?
       can?(:update, :appearance) ||
+        can?(:manage, :collection_types) ||
         can?(:manage, Sipity::WorkflowResponsibility) ||
         can?(:manage, Hyrax::Feature)
     end

data/app/presenters/hyrax/select_collection_type_list_presenter.rb

@@ -0,0 +1,42 @@
+module Hyrax
+  # Presents the list of collection type options that a user may choose from when deciding to create a new work
+  class SelectCollectionTypeListPresenter
+    # @param current_user [User]
+    def initialize(current_user)
+      @current_user = current_user
+    end
+
+    class_attribute :row_presenter
+    self.row_presenter = SelectCollectionTypePresenter
+
+    # @return [Boolean] are there many different types to choose?
+    def many?
+      authorized_collection_types.size > 1
+    end
+
+    # @return [Boolean] are there any authorized types?
+    def any?
+      return true if authorized_collection_types.present?
+      false
+    end
+
+    # Return an array of authorized collection types.
+    def authorized_collection_types
+      @authorized_collection_types ||= Hyrax::CollectionTypes::PermissionsService.can_create_collection_types(user: @current_user)
+    end
+
+    # Return or yield the first type in the list. This is used when the list
+    # only has a single element.
+    # @yieldparam [CollectionType] a Hyrax::CollectionType
+    # @return [CollectionType] a Hyrax::CollectionType
+    def first_collection_type
+      yield(authorized_collection_types.first) if block_given?
+      authorized_collection_types.first
+    end
+
+    # @yieldparam [SelectCollectionTypePresenter] a presenter for the collection
+    def each
+      authorized_collection_types.each { |type| yield row_presenter.new(type) }
+    end
+  end
+end

data/app/presenters/hyrax/select_collection_type_presenter.rb

@@ -0,0 +1,11 @@
+module Hyrax
+  class SelectCollectionTypePresenter
+    # @param [CollectionType] a Hyrax::CollectionType
+    def initialize(collection_type)
+      @collection_type = collection_type
+    end
+
+    attr_reader :collection_type
+    delegate :title, :description, :admin_set?, :id, to: :collection_type
+  end
+end

data/app/presenters/hyrax/select_type_presenter.rb

@@ -19,16 +19,18 @@ module Hyrax
     end
 
     def switch_to_new_work_path(route_set:, params:)
-      if params.key?(:add_works_to_collection)
-        route_set.new_polymorphic_path(concern, add_works_to_collection: params[:add_works_to_collection])
+      col_id = collection_id(params)
+      if col_id
+        route_set.new_polymorphic_path(concern, add_works_to_collection: col_id)
       else
         route_set.new_polymorphic_path(concern)
       end
     end
 
     def switch_to_batch_upload_path(route_set:, params:)
-      if params.key?(:add_works_to_collection)
-        route_set.new_batch_upload_path(payload_concern: concern, add_works_to_collection: params[:add_works_to_collection])
+      col_id = collection_id(params)
+      if col_id
+        route_set.new_batch_upload_path(payload_concern: concern, add_works_to_collection: col_id)
       else
         route_set.new_batch_upload_path(payload_concern: concern)
       end
@@ -47,5 +49,12 @@ module Hyrax
         defaults << ''
         I18n.t(defaults.shift, default: defaults)
       end
+
+      def collection_id(params)
+        return nil unless params
+        collection_id = params[:add_works_to_collection]
+        collection_id ||= params[:id] if params[:id] && params[:controller] == 'hyrax/dashboard/collections'
+        collection_id
+      end
   end
 end