hyrax 2.0.3 → 2.1.0.beta1

data/app/services/hyrax/collections_service.rb

@@ -20,9 +20,9 @@ module Hyrax
     private
 
       def list_search_builder(access)
-        list_search_builder_class.new(context).rows(100).tap do |builder|
-          builder.discovery_permissions = [access]
-        end
+        list_search_builder_class.new(context)
+                                 .rows(100)
+                                 .with_access(access)
       end
   end
 end

data/app/services/hyrax/default_middleware_stack.rb

@@ -3,22 +3,57 @@ module Hyrax
     # rubocop:disable Metrics/MethodLength
     def self.build_stack
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
+        # Wrap everything in a database transaction, if the save of the resource
+        # fails then roll back any database AdminSetChangeSet
         middleware.use Hyrax::Actors::TransactionalRequest
+
+        # Ensure you are mutating the most recent version
         middleware.use Hyrax::Actors::OptimisticLockValidator
+
+        # Attach files from a URI (for BrowseEverything)
         middleware.use Hyrax::Actors::CreateWithRemoteFilesActor
+
+        # Attach files uploaded in the form to the UploadsController
         middleware.use Hyrax::Actors::CreateWithFilesActor
+
+        # Add/remove the resource to/from a collection
         middleware.use Hyrax::Actors::CollectionsMembershipActor
+
+        # Add/remove to parent work
         middleware.use Hyrax::Actors::AddToWorkActor
+
+        # Add/remove children (works or file_sets)
         middleware.use Hyrax::Actors::AttachMembersActor
+
+        # Set the order of the children (works or file_sets)
         middleware.use Hyrax::Actors::ApplyOrderActor
+
+        # Decode the private/public/institution on the form into permisisons on
+        # the model
         middleware.use Hyrax::Actors::InterpretVisibilityActor
+
+        # Handles transfering ownership of works from one user to another
         middleware.use Hyrax::Actors::TransferRequestActor
+
+        # Sets the default admin set if they didn't supply one
         middleware.use Hyrax::Actors::DefaultAdminSetActor
+
+        # Copies default permissions from the PermissionTemplate to the work
         middleware.use Hyrax::Actors::ApplyPermissionTemplateActor
+
+        # Remove attached FileSets when destroying a work
         middleware.use Hyrax::Actors::CleanupFileSetsActor
+
+        # Destroys the trophies in the database when the work is destroyed
         middleware.use Hyrax::Actors::CleanupTrophiesActor
+
+        # Destroys the feature tag in the database when the work is destroyed
         middleware.use Hyrax::Actors::FeaturedWorkActor
+
+        # Persist the metadata changes on the resource
         middleware.use Hyrax::Actors::ModelActor
+
+        # Start the workflow for this work
         middleware.use Hyrax::Actors::InitializeWorkflowActor
       end
     end

data/app/services/hyrax/file_set_fixity_check_service.rb

@@ -22,7 +22,7 @@ module Hyrax
   # `max_days_between_fixity_checks` arg, which defaults to config'd
   # `Hyrax.config.max_days_between_fixity_checks`
   class FileSetFixityCheckService
-    attr_reader :file_set, :id, :latest_version_only,
+    attr_reader :id, :latest_version_only,
                 :async_jobs, :max_days_between_fixity_checks
 
     # @param file_set [ActiveFedora::Base, String] file_set

data/app/services/hyrax/graph_exporter.rb

@@ -8,6 +8,7 @@ module Hyrax
       @solr_document = solr_document
       @request = request
       @additional_resources = []
+      @visited_subresources = Set.new
     end
 
     attr_reader :solr_document, :request, :additional_resources
@@ -15,9 +16,7 @@ module Hyrax
     # @return [RDF::Graph]
     def fetch
       clean_graph_repository.find(solr_document.id).tap do |g|
-        additional_resources.uniq.each do |stmt|
-          g << stmt
-        end
+        additional_resources.each { |subgraph| g << subgraph }
       end
     rescue Ldp::NotFound
       # this error is handled with a 404 page.
@@ -38,30 +37,35 @@ module Hyrax
       def replacer
         lambda do |resource_id, graph|
           url = ActiveFedora::Base.id_to_uri(resource_id)
-          result = graph.query([RDF::URI(url), ActiveFedora::RDF::Fcrepo::Model.hasModel, nil]).first
-          if result
-            subject_replacer(result, resource_id)
+          klass = graph.query([:s, ActiveFedora::RDF::Fcrepo::Model.hasModel, :o]).first.object.to_s.constantize
+
+          # if the subject URL matches
+          if graph.query([RDF::URI(url), ActiveFedora::RDF::Fcrepo::Model.hasModel, nil]).first
+            subject_replacer(klass, resource_id)
           elsif resource_id.start_with? solr_document.id
-            subresource_replacer(resource_id, graph)
+            subresource_replacer(resource_id, klass)
           else
             object_replacer(resource_id, graph)
           end
         end
       end
 
-      def subresource_replacer(resource_id, graph)
+      def subresource_replacer(resource_id, parent_klass)
         parent_id, local = resource_id.split('/', 2)
-        parent_url = ActiveFedora::Base.id_to_uri(parent_id)
-        result = graph.query([RDF::URI(parent_url), ActiveFedora::RDF::Fcrepo::Model.hasModel, nil]).first
 
-        # OPTIMIZE: we only need to fetch each subresource once.
-        additional_resources << ListSourceExporter.new(resource_id, request, subject_replacer(result, parent_id)).fetch
-        parent = subject_replacer(result, parent_id)
+        if @visited_subresources.add?(resource_id)
+          additional_resources << ListSourceExporter.new(
+            resource_id,
+            request,
+            subject_replacer(parent_klass, parent_id)
+          ).fetch
+        end
+
+        parent = subject_replacer(parent_klass, parent_id)
         "#{parent}/#{local}"
       end
 
-      def subject_replacer(result, resource_id, anchor = nil)
-        klass = result.object.to_s.constantize
+      def subject_replacer(klass, resource_id, anchor = nil)
         route_key = if Hyrax.config.curation_concerns.include?(klass)
                       klass.model_name.singular_route_key
                     else

data/app/services/hyrax/iiif_authorization_service.rb

@@ -0,0 +1,19 @@
+module Hyrax
+  class IIIFAuthorizationService
+    attr_reader :controller
+    def initialize(controller)
+      @controller = controller
+    end
+
+    # @note we ignore the `action` param here in favor of the `:show` action for all permissions
+    def can?(_action, object)
+      controller.current_ability.can?(:show, file_set_id_for(object))
+    end
+
+    private
+
+      def file_set_id_for(object)
+        object.id.split('/').first
+      end
+  end
+end

data/app/services/hyrax/multiple_membership_checker.rb

@@ -0,0 +1,78 @@
+module Hyrax
+  # Service class for checking an item's collection memberships, to
+  # make sure that the item is not added to multiple single-membership
+  # collections
+  class MultipleMembershipChecker
+    attr_reader :item
+
+    # @param [#member_of_collection_ids] item an object that belongs to
+    #   collections
+    def initialize(item:)
+      @item = item
+    end
+
+    # @api public
+    #
+    # Scan a list of collection_ids for multiple single-membership collections.
+    #
+    # Collections that have a collection type declaring
+    # `allow_multiple_membership` as `false` require that its members do not
+    # also belong to other collections of the same type.
+    #
+    # There are two contexts in which memberships are checked: when doing a
+    # wholesale replacement and when making an incremental change, such as
+    # adding a single collection membership to an object. In the former case,
+    # `#check` only scans the passed-in collection identifiers. In the latter,
+    # `#check` must also scan the collections to which an object currently
+    # belongs for potential conflicts.
+    #
+    # @param collection_ids [Array<String>] a list of collection identifiers
+    # @param include_current_members [Boolean] a flag to also scan an object's
+    #   current collection memberships
+    #
+    # @return [nil, String] nil if no conflicts; an error message string if so
+    def check(collection_ids:, include_current_members: false)
+      # short-circuit if no single membership types have been created
+      return if single_membership_types.blank?
+      # short-circuit if no new single_membership_collections passed in
+      new_single_membership_collections = single_membership_collections(collection_ids)
+      return if new_single_membership_collections.blank?
+      collections_to_check = new_single_membership_collections
+      # No need to check current members when coming in from the ActorStack, which does a wholesale collection membership replacement
+      collections_to_check |= single_membership_collections(item.member_of_collection_ids) if include_current_members
+      problematic_collections = collections_to_check.uniq(&:id)
+                                                    .group_by(&:collection_type_gid)
+                                                    .select { |_gid, list| list.count > 1 }
+      return if problematic_collections.blank?
+      build_error_message(problematic_collections)
+    end
+
+    private
+
+      def single_membership_collections(collection_ids)
+        return [] if collection_ids.blank?
+        Collection.where(id: collection_ids, collection_type_gid_ssim: single_membership_types)
+      end
+
+      def single_membership_types
+        Hyrax::CollectionType.where(allow_multiple_membership: false).map(&:gid)
+      end
+
+      def build_error_message(problematic_collections)
+        error_message_clauses = problematic_collections.map do |gid, list|
+          "#{collection_type_title_from_gid(gid)} (#{collection_titles_from_list(list)})"
+        end
+        "#{I18n.t('hyrax.admin.collection_types.multiple_membership_checker.error_preamble')}: #{error_message_clauses.join('; ')}"
+      end
+
+      def collection_type_title_from_gid(gid)
+        Hyrax::CollectionType.find_by_gid(gid).title
+      end
+
+      def collection_titles_from_list(collection_list)
+        collection_list.each do |collection|
+          collection.title.first
+        end.to_sentence
+      end
+  end
+end

data/app/services/hyrax/noid.rb

@@ -1,5 +1,3 @@
-require 'active_fedora/noid'
-
 module Hyrax
   module Noid
     extend ActiveSupport::Concern
@@ -13,7 +11,7 @@ module Hyrax
     private
 
       def service
-        @service ||= ActiveFedora::Noid::Service.new
+        @service ||= ::Noid::Rails::Service.new
       end
   end
 end

data/app/services/hyrax/qa_select_service.rb

@@ -22,8 +22,17 @@ module Hyrax
       authority.find(id).fetch('active')
     end
 
-    def label(id)
-      authority.find(id).fetch('term')
+    ##
+    # @param id [String]
+    #
+    # @return [String] the label for the authority
+    #
+    # @yield when no 'term' value is present for the id
+    # @yieldreturn [String] an alternate label to return
+    #
+    # @raise [KeyError] when no 'term' value is present for the id
+    def label(id, &block)
+      authority.find(id).fetch('term', &block)
     end
 
     def active_elements

data/app/services/hyrax/workflow/status_list_service.rb

@@ -50,7 +50,7 @@ module Hyrax
         def roles_for_user
           Sipity::Workflow.all.flat_map do |wf|
             workflow_roles_for_user_and_workflow(wf).map do |wf_role|
-              "#{wf.permission_template.admin_set_id}-#{wf.name}-#{wf_role.role.name}"
+              "#{wf.permission_template.source_id}-#{wf.name}-#{wf_role.role.name}"
             end
           end
         end

data/app/services/hyrax/working_directory.rb

@@ -19,14 +19,6 @@ module Hyrax
         copy_repository_resource_to_working_directory(repository_file, id)
       end
 
-      # @param [File, ActionDispatch::Http::UploadedFile] file
-      # @param [String] id the identifier of the FileSet
-      # @return [String] path of the working file
-      def copy_file_to_working_directory(file, id)
-        file_name = file.respond_to?(:original_filename) ? file.original_filename : ::File.basename(file)
-        copy_stream_to_working_directory(id, file_name, file)
-      end
-
       # @param [ActiveFedora::File] file the resource in the repo
       # @param [String] id the identifier of the FileSet
       # @return [String] path of the working file

data/app/services/hyrax/works/managed_works_service.rb

@@ -0,0 +1,16 @@
+module Hyrax
+  module Works
+    module ManagedWorksService
+      # @api public
+      #
+      # Count of works the current user can manage.
+      #
+      # @param scope [Object] Typically a controller object that responds to `repository`, `can?`, `blacklight_config`, `current_ability`
+      # @return [Array<SolrDocument>]
+      def self.managed_works_count(scope:)
+        query_builder = Hyrax::Dashboard::WorksSearchBuilder.new(scope).rows(0)
+        scope.repository.search(query_builder.query).response["numFound"]
+      end
+    end
+  end
+end

data/app/views/_flash_msg.html.erb

@@ -2,7 +2,7 @@
   <% if flash[type].present? %>
     <div class="alert <%= flash_dom_class %> alert-dismissable" role="alert">
       <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-      <%= sanitize Array.wrap(flash[type]).join(tag(:br)) %>
+      <%= safe_join(Array.wrap(flash[type]).map(&:html_safe), tag(:br)) %>
     </div>
     <% flash.delete(type) %>
   <% end %>

data/app/views/_masthead.html.erb

@@ -1,4 +1,3 @@
-<%= render '/shared/select_work_type_modal' if create_work_presenter.many? %>
 <nav id="masthead" class="navbar navbar-inverse navbar-static-top" role="navigation">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->

data/app/views/catalog/_document.html.erb

@@ -1,3 +1,5 @@
 <li id="document_<%= document.to_param %>" class="document <%= render_document_class document %>" itemscope itemtype="<%= document.itemtype %>">
-  <%= render_document_partials document, blacklight_config.view_config(document_index_view_type).partials, document_counter: document_counter %>
+  <div class="row search-result-wrapper">
+    <%= render_document_partials document, blacklight_config.view_config(document_index_view_type).partials, document_counter: document_counter %>
+  </div>
 </li>

data/app/views/catalog/_document_list.html.erb

@@ -1,6 +1,6 @@
 <%# container for all documents in index view -%>
 <div id="search-results">
-  <ol class="catalog" start="<%= document_counter_with_offset(0) %>">
+  <ul class="list-unstyled catalog" start="<%= document_counter_with_offset(0) %>">
     <%= render documents, as: :document %>
-  </ol>
+  </ul>
 </div>

data/app/views/catalog/_index_header_list_collection.html.erb

@@ -1,3 +1,4 @@
-  <h2>
-    <%= link_to document.title_or_label, [hyrax, document] %>
-  </h2>
+<div class="search-results-title-row">
+  <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
+  <span class="label label-success"><%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %></span>
+</div>

data/app/views/catalog/_index_header_list_default.html.erb

@@ -1,3 +1,3 @@
-  <h2>
-    <%= link_to document.title_or_label, document %>
-  </h2>
+<div class="search-results-title-row">
+  <h3 class="search-result-title"><%= link_to document.title_or_label, document %></h3>
+</div>

data/app/views/catalog/_index_list_default.html.erb

@@ -1,15 +1,30 @@
-    <div class="metadata">
-      <table class="table">
-        <% doc_presenter = index_presenter(document) %>
-        <% index_fields(document).each do |field_name, field| -%>
-          <% if should_render_index_field? document, field %>
-            <tr>
-              <th><span class="attribute-label h4"><%= render_index_field_label document, field: field_name %></span></th>
-              <td><%= doc_presenter.field_value field_name %></td>
-            </tr>
-          <% end %>
-        <% end %>
-      </table>
+<div class="col-sm-5">
+  <div class="metadata">
+    <% doc_presenter = index_presenter(document) %>
+    <% index_fields(document).each do |field_name, field| -%>
+      <% if should_render_index_field? document, field %>
+        <div class="row metadata-row">
+          <div class="col-sm-4">
+            <%= render_index_field_label document, field: field_name %>
+          </div>
+          <div class="col-sm-8">
+            <%= doc_presenter.field_value field_name %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+</div>
+<% if(doc_presenter.field_value('has_model_ssim') == 'Collection') %>
+    <% collection_presenter = Hyrax::CollectionPresenter.new(document, current_ability) %>
+<div class="col-sm-4">
+  <div class="collection-counts-wrapper">
+    <div class="collection-counts-item">
+      <span><%= collection_presenter.total_viewable_collections %></span>Collections
     </div>
-
-    <div class="clearfix"></div>
+    <div class="collection-counts-item">
+      <span><%= collection_presenter.total_viewable_works %></span>Works
+    </div>
+  </div>
+</div>
+<% end %>

data/app/views/catalog/_thumbnail_list_collection.html.erb

@@ -1,4 +1,3 @@
-    <div class="col-sm-3">
-      <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-search"></span>
-    </div>
-
+<div class="col-sm-3">
+  <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-search"></span>
+</div>

data/app/views/catalog/_thumbnail_list_default.html.erb

@@ -1,3 +1,5 @@
-    <div class="list-thumbnail">
-      <%= render_thumbnail_tag document %>
-    </div>
+<div class="col-sm-3">
+  <div class="list-thumbnail">
+    <%= render_thumbnail_tag document %>
+  </div>
+</div>