hyrax 3.4.2 → 4.0.0.beta2

data/app/models/sipity.rb

@@ -57,32 +57,32 @@ module Sipity
   # @return [Sipity::Entity]
   # rubocop:disable Naming/MethodName, Metrics/CyclomaticComplexity, Metrics/MethodLength
   def Entity(input, &block) # rubocop:disable Metrics/AbcSize
-    Rails.logger.debug("Trying to make an Entity for #{input.inspect}")
+    Hyrax.logger.debug("Trying to make an Entity for #{input.inspect}")
 
     result = case input
              when Sipity::Entity
                input
              when URI::GID, GlobalID
-               Rails.logger.debug("Entity() got a GID, searching by proxy")
+               Hyrax.logger.debug("Entity() got a GID, searching by proxy")
                Entity.find_by(proxy_for_global_id: input.to_s)
              when SolrDocument
-               Rails.logger.debug("Entity() got a SolrDocument, retrying on #{input.to_model}")
+               Hyrax.logger.debug("Entity() got a SolrDocument, retrying on #{input.to_model}")
                Entity(input.to_model)
              when Draper::Decorator
-               Rails.logger.debug("Entity() got a Decorator, retrying on #{input.model}")
+               Hyrax.logger.debug("Entity() got a Decorator, retrying on #{input.model}")
                Entity(input.model)
              when Sipity::Comment
-               Rails.logger.debug("Entity() got a Comment, retrying on #{input.entity}")
+               Hyrax.logger.debug("Entity() got a Comment, retrying on #{input.entity}")
                Entity(input.entity)
              when Valkyrie::Resource
-               Rails.logger.debug("Entity() got a Resource, retrying on #{Hyrax::GlobalID(input)}")
+               Hyrax.logger.debug("Entity() got a Resource, retrying on #{Hyrax::GlobalID(input)}")
                Entity(Hyrax::GlobalID(input))
              else
-               Rails.logger.debug("Entity() got something else, testing #to_global_id")
+               Hyrax.logger.debug("Entity() got something else, testing #to_global_id")
                Entity(input.to_global_id) if input.respond_to?(:to_global_id)
              end
 
-    Rails.logger.debug("Entity(): attempting conversion on #{result}")
+    Hyrax.logger.debug("Entity(): attempting conversion on #{result}")
     handle_conversion(input, result, :to_sipity_entity, &block)
   rescue URI::GID::MissingModelIdError
     Entity(nil)

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

@@ -2,8 +2,6 @@
 module Hyrax
   module Admin
     class RepositoryObjectPresenter
-      include Blacklight::SearchHelper
-
       def as_json(*)
         counts.map do |k, v|
           { label: I18n.translate(k, scope: 'hyrax.admin.stats.repository_objects.series'),

data/app/presenters/hyrax/admin_set_presenter.rb

@@ -34,6 +34,11 @@ module Hyrax
       @collection_type ||= Hyrax::CollectionType.find_or_create_admin_set_type
     end
 
+    # Overrides delegate because admin sets do not index collection type gid
+    def collection_type_gid
+      collection_type.to_global_id
+    end
+
     def show_path
       Hyrax::Engine.routes.url_helpers.admin_admin_set_path(id, locale: I18n.locale)
     end

data/app/presenters/hyrax/collapsable_section_presenter.rb

@@ -21,7 +21,7 @@ module Hyrax
 
     def button_tag
       tag.a(role: 'button',
-            class: "#{button_class}collapse-toggle",
+            class: "#{button_class}collapse-toggle nav-link",
             data: { toggle: 'collapse' },
             href: "##{id}",
             onclick: "toggleCollapse(this)",
@@ -44,7 +44,7 @@ module Hyrax
     end
 
     def workflows_class
-      'in ' if open
+      'show ' if open
     end
   end
 end

data/app/presenters/hyrax/collection_presenter.rb

@@ -111,7 +111,7 @@ module Hyrax
     end
 
     def collection_type_badge
-      tag.span(collection_type.title, class: "label", style: "background-color: " + collection_type.badge_color + ";")
+      tag.span(collection_type.title, class: "badge", style: "background-color: " + collection_type.badge_color + ";")
     end
 
     # The total number of parents that this collection belongs to, visible or not.

data/app/presenters/hyrax/displays_image.rb

@@ -69,7 +69,7 @@ module Hyrax
           result = original_file_id
 
           if result.blank?
-            Rails.logger.warn "original_file_id for #{id} not found, falling back to Fedora."
+            Hyrax.logger.warn "original_file_id for #{id} not found, falling back to Fedora."
             result = Hyrax::VersioningService.versioned_file_id ::FileSet.find(id).original_file
           end
 

data/app/presenters/hyrax/fixity_status_presenter.rb

@@ -25,9 +25,9 @@ module Hyrax
         if relevant_log_records.empty?
           "Fixity checks have not yet been run on this object"
         elsif failing_checks.empty?
-          tag.span("passed", class: "label label-success") + ' ' + render_existing_check_summary
+          tag.span("passed", class: "badge badge-success") + ' ' + render_existing_check_summary
         else
-          tag.span("FAIL", class: "label label-danger") + ' ' + render_existing_check_summary + render_failed_compact
+          tag.span("FAIL", class: "badge badge-danger") + ' ' + render_existing_check_summary + render_failed_compact
         end
     end
 

data/app/presenters/hyrax/menu_presenter.rb

@@ -22,7 +22,7 @@ module Hyrax
     # @param also_active_for [Hash, String] a hash or string with alternative paths that should be 'active'
     def nav_link(options, also_active_for: nil, **link_html_options)
       active_urls = [options, also_active_for].compact
-      list_options = active_urls.any? { |url| current_page?(url) } ? { class: 'active' } : {}
+      list_options = active_urls.any? { |url| current_page?(url) } ? { class: 'active nav-item' } : { class: 'nav-item' }
       tag.li(list_options) do
         link_to(options, link_html_options) do
           yield

data/app/presenters/hyrax/pcdm_member_presenter_factory.rb

@@ -61,7 +61,7 @@ module Hyrax
       ids.each do |id|
         id = id.to_s
         indx = results.index { |doc| id == doc['id'] }
-        raise(ArgumentError, "Could not find an indexed document for id: #{id}") if
+        raise(Hyrax::ObjectNotFoundError, "Could not find an indexed document for id: #{id}") if
           indx.nil?
         hash = results.delete_at(indx)
         yield presenter_for(document: ::SolrDocument.new(hash), ability: ability)

data/app/presenters/hyrax/permission_badge.rb

@@ -4,11 +4,11 @@ module Hyrax
     include ActionView::Helpers::TagHelper
 
     VISIBILITY_LABEL_CLASS = {
-      authenticated: "label-info",
-      embargo: "label-warning",
-      lease: "label-warning",
-      open: "label-success",
-      restricted: "label-danger"
+      authenticated: "badge-info",
+      embargo: "badge-warning",
+      lease: "badge-warning",
+      open: "badge-success",
+      restricted: "badge-danger"
     }.freeze
 
     # @param visibility [String] the current visibility
@@ -18,20 +18,21 @@ module Hyrax
 
     # Draws a span tag with styles for a bootstrap label
     def render
-      tag.span(text, class: "label #{dom_label_class}")
+      tag.span(text, class: "badge #{dom_label_class}")
     end
 
     private
 
     def dom_label_class
-      VISIBILITY_LABEL_CLASS.fetch(@visibility.to_sym, 'label-info')
+      VISIBILITY_LABEL_CLASS.fetch(@visibility&.to_sym, 'badge-info')
     end
 
     def text
       if registered?
         Institution.name
       else
-        I18n.t("hyrax.visibility.#{@visibility}.text")
+        visibility_key = @visibility || 'unknown'
+        I18n.t("hyrax.visibility.#{visibility_key}.text")
       end
     end
 

data/app/presenters/hyrax/presenter_renderer.rb

@@ -39,7 +39,7 @@ module Hyrax
     def find_field_partial(field_name)
       ["#{collection_path}/show_fields/_#{field_name}", "records/show_fields/_#{field_name}",
        "#{collection_path}/show_fields/_default", "records/show_fields/_default"].find do |partial|
-        Rails.logger.debug "Looking for show field partial #{partial}"
+        Hyrax.logger.debug "Looking for show field partial #{partial}"
         return partial.sub(/\/_/, '/') if partial_exists?(partial)
       end
     end

data/app/presenters/hyrax/presents_attributes.rb

@@ -15,7 +15,7 @@ module Hyrax
     # @option options [String] :work_type name of work type class (e.g., "GenericWork")
     def attribute_to_html(field, options = {})
       unless respond_to?(field)
-        Rails.logger.warn("#{self.class} attempted to render #{field}, but no method exists with that name.")
+        Hyrax.logger.warn("#{self.class} attempted to render #{field}, but no method exists with that name.")
         return
       end
 

data/app/presenters/hyrax/version_list_presenter.rb

@@ -19,7 +19,12 @@ module Hyrax
     #
     # @raise [ArgumentError] if we can't build an enu
     def self.for(file_set:)
-      new(file_set.original_file&.versions&.all.to_a)
+      original_file = if file_set.respond_to?(:original_file)
+                        file_set.original_file
+                      else
+                        Hyrax::FileSetFileService.new(file_set: file_set).original_file
+                      end
+      new(Hyrax::VersioningService.new(resource: original_file).versions)
     rescue NoMethodError
       raise ArgumentError
     end

data/app/presenters/hyrax/work_show_presenter.rb

@@ -98,6 +98,9 @@ module Hyrax
           result = member_presenters([representative_id]).first
           return nil if result.try(:id) == id
           result.try(:representative_presenter) || result
+        rescue Hyrax::ObjectNotFoundError
+          Hyrax.logger.warn "Unable to find representative_id #{representative_id} for work #{id}"
+          return nil
         end
     end
 

data/app/presenters/hyrax/workflow_presenter.rb

@@ -33,7 +33,7 @@ module Hyrax
 
     def badge
       return unless state
-      tag.span(state_label, class: "state state-#{state} label label-primary")
+      tag.span(state_label, class: "state state-#{state} badge badge-primary")
     end
 
     private

data/app/renderers/hyrax/renderers/external_link_attribute_renderer.rb

@@ -6,7 +6,7 @@ module Hyrax
 
       def li_value(value)
         auto_link(value) do |link|
-          "<span class='glyphicon glyphicon-new-window'></span>&nbsp;#{link}"
+          "<span class='fa fa-external-link'></span>&nbsp;#{link}"
         end
       end
     end

data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb

@@ -6,13 +6,11 @@ module Hyrax
       # @param access [Symbol] :edit, :read, :discover - With the given :access what all can
       # @param collection [::Collection]
       # @param scope [Object] Typically a controller that responds to #current_ability, #blackligh_config
-      # @param nesting_attributes [NestingAttributes] an object encapsulating nesting attributes of the collection
       # @param nest_direction [Symbol] (:as_parent or :as_child) the direction we are adding nesting to this collection
-      def initialize(access:, collection:, scope:, nesting_attributes:, nest_direction:)
+      def initialize(access:, collection:, scope:, nest_direction:)
         super(scope)
         @collection = collection
         @discovery_permissions = extract_discovery_permissions(access)
-        @nesting_attributes = nesting_attributes
         @nest_direction = nest_direction
       end
 
@@ -24,74 +22,16 @@ module Hyrax
         solr_parameters[:rows] = 1000
       end
 
+      # Solr can do graph traversal without the need of special indexing with the Graph query parser so
+      # use this to compute both the parents and children of the current collection then exclude them
+      # See https://solr.apache.org/guide/solr/latest/query-guide/other-parsers.html#graph-query-parser
       def show_only_other_collections_of_the_same_collection_type(solr_parameters)
         solr_parameters[:fq] ||= []
         solr_parameters[:fq] += [
-          "-" + Hyrax::SolrQueryBuilderService.construct_query_for_ids([limit_ids]),
-          Hyrax::SolrQueryBuilderService.construct_query(Hyrax.config.collection_type_index_field => @collection.collection_type_gid)
+          Hyrax::SolrQueryBuilderService.construct_query(Hyrax.config.collection_type_index_field => @collection.collection_type_gid),
+          "-{!graph from=id to=member_of_collection_ids_ssim#{' maxDepth=1' if @nest_direction == :as_parent}}id:#{@collection.id}",
+          "-{!graph to=id from=member_of_collection_ids_ssim#{' maxDepth=1' if @nest_direction == :as_child}}id:#{@collection.id}"
         ]
-        solr_parameters[:fq] += limit_clause if limit_clause # add limits to prevent illegal nesting arrangements
-      end
-
-      private
-
-      def limit_ids
-        # exclude current collection from returned list
-        limit_ids = [@collection.id.to_s]
-        # cannot add a parent that is already a parent
-        limit_ids += @nesting_attributes.parents if @nesting_attributes.parents && @nest_direction == :as_parent
-        limit_ids
-      end
-
-      # remove collections from list in order to to prevent illegal nesting arrangements
-      def limit_clause
-        case @nest_direction
-        when :as_parent
-          eligible_to_be_a_parent
-        when :as_child
-          eligible_to_be_a_child
-        end
-      end
-
-      # To be eligible to be a parent collection of child "Collection G":
-      # 1) cannot have any pathnames containing Collection G's ID
-      # 2) cannot already be Collection G's direct parent
-      # => this is handled through limit_ids method
-      def eligible_to_be_a_parent
-        # Using a !lucene query allows us to get items using a wildcard query, a feature not supported via AF query builder.
-        ["-_query_:\"{!lucene df=#{Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames}}*#{@collection.id}*\""]
-      end
-
-      # To be eligible to be a child collection of parent "Collection F":
-      # 1) Cannot have any pathnames containing any of Collection F's pathname or ancestors
-      # 2) cannot already be Collection F's direct child
-      def eligible_to_be_a_child
-        exclude_path = []
-        exclude_path << exclude_if_paths_contain_collection
-        exclude_path << exclude_if_already_parent
-      end
-
-      def exclude_if_paths_contain_collection
-        # 1) Exclude any pathnames containing any of Collection F's pathname or ancestors
-        array_to_exclude = [] + @nesting_attributes.pathnames unless @nesting_attributes.pathnames.nil?
-        array_to_exclude += @nesting_attributes.ancestors unless @nesting_attributes.ancestors.nil?
-        # build a unique string containing all of Collection F's pathnames and ancestors
-        exclude_list = ""
-        array_to_exclude&.uniq&.each do |element|
-          exclude_list += ' ' unless exclude_list.empty?
-          exclude_list += element.to_s
-        end
-        # Using a !lucene query allows us to get items which match any individual element
-        # from the list. Building the query via the AF builder created a !field query which
-        # only searches the field for an exact string and doesn't allow an "OR" connection
-        # between the elements.
-        return "-_query_:\"{!lucene q.op=OR df=#{Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames}}#{exclude_list}\"" unless exclude_list.empty?
-        ""
-      end
-
-      def exclude_if_already_parent
-        # 2) Exclude any of Collection F's direct children
-        "-" + ActiveFedora::SolrQueryBuilder.construct_query(Samvera::NestingIndexer.configuration.solr_field_name_for_storing_parent_ids => @collection.id.to_s)
       end
     end
   end

data/app/search_builders/hyrax/deposit_search_builder.rb

@@ -6,7 +6,7 @@ module Hyrax
     # zero to just get the facet information
     # @param solr_parameters the current solr parameters
     def include_depositor_facet(solr_parameters)
-      solr_parameters[:"facet.field"].concat([DepositSearchBuilder.depositor_field])
+      solr_parameters.append_facet_fields(DepositSearchBuilder.depositor_field)
 
       # default facet limit is 10, which will only show the top 10 users.
       # As we want to show all user deposits, so set the facet.limit to the

data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb

@@ -22,7 +22,7 @@ module Hyrax
     # @return [void]
     def parent_collections_only(solr_parameters)
       solr_parameters[:fq] ||= []
-      solr_parameters[:fq] += [Hyrax::SolrQueryBuilderService.construct_query_for_ids(child.member_of_collection_ids)]
+      solr_parameters[:fq] += [process_fq]
     end
     self.default_processor_chain += [:parent_collections_only]
 
@@ -34,5 +34,14 @@ module Hyrax
       solr_parameters[:page] = page
     end
     self.default_processor_chain += [:with_pagination]
+
+    private
+
+    def process_fq
+      ids = child.member_of_collection_ids.reject(&:blank?)
+
+      return "id:NEVER_USE_THIS_ID" if ids.empty?
+      Hyrax::SolrQueryService.new.with_ids(ids: child.member_of_collection_ids).build
+    end
   end
 end

data/app/search_builders/hyrax/single_result.rb

@@ -8,7 +8,7 @@ module Hyrax
     end
 
     def find_one(solr_parameters)
-      solr_parameters[:fq] << "{!raw f=id}#{blacklight_params.fetch(:id)}"
+      solr_parameters.append_filter_query("{!raw f=id}#{blacklight_params.fetch(:id)}")
     end
   end
 end

data/app/search_builders/hyrax/stats/work_status_search_builder.rb

@@ -9,7 +9,7 @@ module Hyrax
       # zero to just get the facet information
       # @param solr_parameters the current solr parameters
       def include_suppressed_facet(solr_parameters)
-        solr_parameters[:"facet.field"].concat([IndexesWorkflow.suppressed_field])
+        solr_parameters.append_facet_fields(IndexesWorkflow.suppressed_field)
         solr_parameters[:'facet.missing'] = true
 
         # we only want the facet counts not the actual data

data/app/services/hyrax/admin_set_create_service.rb

@@ -242,10 +242,10 @@ module Hyrax
 
     def workflow_agents
       [
-        Hyrax::Group.new(admin_group_name)
+        Sipity::Agent(Hyrax::Group.new(admin_group_name))
       ].tap do |agent_list|
         # The default admin set does not have a creating user
-        agent_list << creating_user if creating_user
+        agent_list << Sipity::Agent(creating_user) if creating_user
       end
     end
 

data/app/services/hyrax/analytics/google.rb

@@ -27,7 +27,7 @@ module Hyrax
             filename = Rails.root.join('config', 'analytics.yml')
             yaml = YAML.safe_load(ERB.new(File.read(filename)).result)
             unless yaml
-              Rails.logger.error("Unable to fetch any keys from #{filename}.")
+              Hyrax.logger.error("Unable to fetch any keys from #{filename}.")
               return new({})
             end
             config = yaml.fetch('analytics')&.fetch('google', nil)

data/app/services/hyrax/analytics/matomo.rb

@@ -24,7 +24,7 @@ module Hyrax
             filename = Rails.root.join('config', 'analytics.yml')
             yaml = YAML.safe_load(ERB.new(File.read(filename)).result)
             unless yaml
-              Rails.logger.error("Unable to fetch any keys from #{filename}.")
+              Hyrax.logger.error("Unable to fetch any keys from #{filename}.")
               return new({})
             end
             new yaml.fetch('analytics')&.fetch('matomo')

data/app/services/hyrax/collection_member_service.rb

@@ -5,7 +5,6 @@ module Hyrax
   # Returns a list of solr documents for collections the item is a part of
   class CollectionMemberService
     include Blacklight::Configurable
-    include Blacklight::SearchHelper
 
     attr_reader :item, :current_ability
 
@@ -25,12 +24,14 @@ module Hyrax
 
     def list_collections
       query = collection_search_builder.rows(1000)
-      resp = repository.search(query)
+      resp = blacklight_config.repository.search(query)
       resp.documents
     end
 
     def collection_search_builder
       @collection_search_builder ||= ParentCollectionSearchBuilder.new([:include_item_ids, :add_paging_to_solr, :add_access_controls_to_solr_params], self)
     end
+
+    def search_state_class; end
   end
 end

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

@@ -147,7 +147,7 @@ module Hyrax
           Hyrax::CollectionTypeParticipant.create!(hyrax_collection_type_id: collection_type_id, agent_type: p.fetch(:agent_type), agent_id: p.fetch(:agent_id), access: p.fetch(:access))
         end
       rescue InvalidParticipantError => error
-        Rails.logger.error "Participants not created for collection type " \
+        Hyrax.logger.error "Participants not created for collection type " \
                            " #{collection_type_id}: #{error.message}"
         raise error
       end

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

@@ -13,17 +13,17 @@ module Hyrax
       def self.migrate_all_collections
         Deprecation.warn('This migration tool will be removed in Hyrax 4.0.0.')
 
-        Rails.logger.info "*** Migrating #{::Collection.count} collections"
+        Hyrax.logger.info "*** Migrating #{::Collection.count} collections"
         ::Collection.all.each do |col|
           migrate_collection(col)
-          Rails.logger.info "  migrating collection - id: #{col.id}, title: #{col.title}"
+          Hyrax.logger.info "  migrating collection - id: #{col.id}, title: #{col.title}"
         end
 
         AdminSet.all.each do |adminset|
           migrate_adminset(adminset)
-          Rails.logger.info "  migrating adminset - id: #{adminset.id}, title: #{adminset.title}"
+          Hyrax.logger.info "  migrating adminset - id: #{adminset.id}, title: #{adminset.title}"
         end
-        Rails.logger.info "--- Migration Complete"
+        Hyrax.logger.info "--- Migration Complete"
       end
 
       # @api private
@@ -64,16 +64,16 @@ module Hyrax
       def self.repair_migrated_collections
         Deprecation.warn('This migration tool will be removed in Hyrax 4.0.0.')
 
-        Rails.logger.info "*** Repairing migrated collections"
+        Hyrax.logger.info "*** Repairing migrated collections"
         ::Collection.all.each do |col|
           repair_migrated_collection(col)
-          Rails.logger.info "  repairing collection - id: #{col.id}, title: #{col.title}"
+          Hyrax.logger.info "  repairing collection - id: #{col.id}, title: #{col.title}"
         end
         AdminSet.all.each do |adminset|
           migrate_adminset(adminset)
-          Rails.logger.info "  repairing adminset - id: #{adminset.id}, title: #{adminset.title}"
+          Hyrax.logger.info "  repairing adminset - id: #{adminset.id}, title: #{adminset.title}"
         end
-        Rails.logger.info "--- Repairing Complete"
+        Hyrax.logger.info "--- Repairing Complete"
       end
 
       # @api private