hyrax 3.0.0.pre.beta1 → 3.0.0.pre.beta2

data/app/actors/hyrax/actors/environment.rb

@@ -8,6 +8,7 @@ module Hyrax
         @curation_concern = curation_concern
         @current_ability = current_ability
         @attributes = attributes.to_h.with_indifferent_access
+        @actor_storage = {}
       end
 
       attr_reader :curation_concern, :current_ability, :attributes
@@ -16,6 +17,20 @@ module Hyrax
       def user
         current_ability.current_user
       end
+
+      def store(actor, key, value)
+        store_for(actor)[key] = value
+      end
+
+      def retrieve(actor, key)
+        store_for(actor)[key]
+      end
+
+      private
+
+        def store_for(actor)
+          @actor_storage[actor] ||= {}
+        end
     end
   end
 end

data/app/actors/hyrax/actors/interpret_visibility_actor.rb

@@ -1,9 +1,11 @@
 module Hyrax
   module Actors
     class InterpretVisibilityActor < AbstractActor
-      class Intention
+      class Intention < VisibilityIntention
         def initialize(attributes)
           @attributes = attributes
+
+          instance_vars_from_attributes
         end
 
         # returns a copy of attributes with the necessary params removed
@@ -21,36 +23,27 @@ module Hyrax
           end
         end
 
-        def wants_lease?
-          visibility == Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE
-        end
-
-        def wants_embargo?
-          visibility == Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO
-        end
-
-        def valid_lease?
-          wants_lease? && @attributes[:lease_expiration_date].present?
-        end
-
-        def valid_embargo?
-          wants_embargo? && @attributes[:embargo_release_date].present?
-        end
-
-        def lease_params
-          [:lease_expiration_date,
-           :visibility_during_lease,
-           :visibility_after_lease].map { |key| @attributes[key] }
-        end
-
-        def embargo_params
-          [:embargo_release_date,
-           :visibility_during_embargo,
-           :visibility_after_embargo].map { |key| @attributes[key] }
-        end
-
         private
 
+          ##
+          # This method provides compatibility between form attributes passed in
+          # by the Actor, and the interface of `VisibilityIntention`. This
+          # behavior might benefit from being extracted elsewhere (the Actor?
+          # the form object?). Or it might be better to just expect clients to
+          # only pass in one set of end_date/during/after values.
+          #
+          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          def instance_vars_from_attributes
+            self.visibility   = @attributes[:visibility]
+            self.release_date = (wants_embargo? && @attributes[:embargo_release_date].presence) ||
+                                (wants_lease?   && @attributes[:lease_expiration_date].presence)
+            self.after        = (wants_embargo? && @attributes[:visibility_after_embargo].presence) ||
+                                (wants_lease?   && @attributes[:visibility_after_lease].presence)
+            self.during       = (wants_embargo? && @attributes[:visibility_during_embargo].presence) ||
+                                (wants_lease?   && @attributes[:visibility_during_lease].presence)
+          end
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
           def sanitize_unrestricted_params
             @attributes.except(:lease_expiration_date,
                                :visibility_during_lease,
@@ -73,10 +66,6 @@ module Hyrax
                                :visibility_during_embargo,
                                :visibility_after_embargo)
           end
-
-          def visibility
-            @attributes[:visibility]
-          end
       end
 
       # @param [Hyrax::Actors::Environment] env
@@ -216,16 +205,12 @@ module Hyrax
         def apply_lease(env, intention)
           return true unless intention.wants_lease?
           env.curation_concern.apply_lease(*intention.lease_params)
-          return unless env.curation_concern.lease
-          env.curation_concern.lease.save # see https://github.com/samvera/hydra-head/issues/226
         end
 
         # If they want an embargo, we can assume it's valid
         def apply_embargo(env, intention)
           return true unless intention.wants_embargo?
           env.curation_concern.apply_embargo(*intention.embargo_params)
-          return unless env.curation_concern.embargo
-          env.curation_concern.embargo.save # see https://github.com/samvera/hydra-head/issues/226
         end
     end
   end

data/app/assets/javascripts/hyrax/editor/controlled_vocabulary.es6

@@ -27,7 +27,7 @@ export default class ControlledVocabulary extends FieldManager {
 
         labelControls:      true,
       }
-      super(element, options)
+      super(element, $.extend({}, options, $(element).data()))
       this.paramKey = paramKey
       this.fieldName = this.element.data('fieldName')
       this.searchUrl = this.element.data('autocompleteUrl')

data/app/assets/stylesheets/hyrax/_collections.scss

@@ -209,11 +209,13 @@ button.branding-banner-remove:hover {
     display: flex;
 
     .thumbnail-wrapper {
-      width: 50px;
+      flex: 0 0 64px;
+      margin-right: 10px;
+      overflow-x: hidden;
 
       > img {
-        height: 30px;
-        width: auto;
+        height: auto;
+        max-width: 64px;
       }
     }
 

data/app/assets/stylesheets/hyrax/dashboard.scss

@@ -29,10 +29,10 @@ $admin-panel-border-color: #dedede !default;
   .media-body {
     width: 18vw;
   }
+}
 
-  .works-list-batch-checkbox-label-text {
-    margin: 0 5px;
-  }
+.batch-checkbox-label-text {
+  margin: 0 5px;
 }
 
 body.dashboard {

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

@@ -127,9 +127,12 @@ module Hyrax
 
     def manifest
       headers['Access-Control-Allow-Origin'] = '*'
+
+      json = sanitize_manifest(JSON.parse(manifest_builder.to_h.to_json))
+
       respond_to do |wants|
-        wants.json { render json: manifest_builder.to_h }
-        wants.html { render json: manifest_builder.to_h }
+        wants.json { render json: json }
+        wants.html { render json: json }
       end
     end
 
@@ -324,5 +327,21 @@ module Hyrax
       def permissions_changed?
         @saved_permissions != curation_concern.permissions.map(&:to_hash)
       end
+
+      def sanitize_manifest(hash)
+        hash['label'] = sanitize_value(hash['label']) if hash.key?('label')
+        hash['description'] = hash['description']&.collect { |elem| sanitize_value(elem) } if hash.key?('description')
+
+        hash['sequences']&.each do |sequence|
+          sequence['canvases']&.each do |canvas|
+            canvas['label'] = sanitize_value(canvas['label'])
+          end
+        end
+        hash
+      end
+
+      def sanitize_value(text)
+        Loofah.fragment(text.to_s).scrub!(:prune).to_s
+      end
   end
 end

data/app/controllers/hyrax/homepage_controller.rb

@@ -44,6 +44,6 @@ class Hyrax::HomepageController < ApplicationController
     end
 
     def sort_field
-      "#{Solrizer.solr_name('date_uploaded', :stored_sortable, type: :date)} desc"
+      "#{ActiveFedora.index_field_mapper.solr_name('date_uploaded', :stored_sortable, type: :date)} desc"
     end
 end

data/app/forms/hyrax/forms/work_form.rb

@@ -22,7 +22,7 @@ module Hyrax
       attr_reader :agreement_accepted
 
       self.terms = [:title, :creator, :contributor, :description,
-                    :keyword, :license, :rights_statement, :publisher, :date_created,
+                    :keyword, :license, :rights_statement, :rights_notes, :publisher, :date_created,
                     :subject, :language, :identifier, :based_near, :related_url,
                     :representative_id, :thumbnail_id, :rendering_ids, :files,
                     :visibility_during_embargo, :embargo_release_date, :visibility_after_embargo,

data/app/helpers/hyrax/collections_helper.rb

@@ -20,6 +20,19 @@ module Hyrax
       content_tag :span, safe_join([t('hyrax.collection.is_part_of'), ': '] + collection_links)
     end
 
+    def render_other_collection_links(solr_doc, collection_id)
+      collection_list = Hyrax::CollectionMemberService.run(solr_doc, controller.current_ability)
+      return if collection_list.empty?
+      links = collection_list.select { |collection| collection.id != collection_id }.map { |collection| link_to collection.title_or_label, hyrax.collection_path(collection.id) }
+      return if links.empty?
+      collection_links = []
+      links.each_with_index do |link, n|
+        collection_links << link
+        collection_links << ', ' unless links[n + 1].nil?
+      end
+      content_tag :span, safe_join([t('hyrax.collection.also_belongs_to'), ': '] + collection_links)
+    end
+
     ##
     # Append a collection_type_id to the existing querystring (whether or not it has pre-existing params)
     # @return [String] the original url with and added collection_type_id param

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -89,7 +89,7 @@ module Hyrax
     # @return [ActiveSupport::SafeBuffer] the html_safe link
     def link_to_facet_list(values, solr_field, empty_message = "No value entered", separator = ", ")
       return empty_message if values.blank?
-      facet_field = Solrizer.solr_name(solr_field, :facetable)
+      facet_field = ActiveFedora.index_field_mapper.solr_name(solr_field, :facetable)
       safe_join(values.map { |item| link_to_facet(item, facet_field) }, separator)
     end
 
@@ -261,7 +261,7 @@ module Hyrax
     def collection_title_by_id(id)
       solr_docs = controller.repository.find(id).docs
       return nil if solr_docs.empty?
-      solr_field = solr_docs.first[Solrizer.solr_name("title", :stored_searchable)]
+      solr_field = solr_docs.first[ActiveFedora.index_field_mapper.solr_name("title", :stored_searchable)]
       return nil if solr_field.nil?
       solr_field.first
     end
@@ -307,7 +307,7 @@ module Hyrax
       def search_state_with_facets(params, facet = {})
         state = Blacklight::SearchState.new(params, CatalogController.blacklight_config)
         return state.params if facet.none?
-        state.add_facet_params(Solrizer.solr_name(facet.keys.first, :facetable),
+        state.add_facet_params(ActiveFedora.index_field_mapper.solr_name(facet.keys.first, :facetable),
                                facet.values.first)
       end
 

data/app/indexers/hyrax/admin_set_indexer.rb

@@ -7,7 +7,7 @@ module Hyrax
     def generate_solr_document
       super.tap do |solr_doc|
         # Makes Admin Sets show under the "Admin Sets" tab
-        Solrizer.set_field(solr_doc, 'generic_type', 'Admin Set', :facetable)
+        ActiveFedora.index_field_mapper.set_field(solr_doc, 'generic_type', 'Admin Set', :facetable)
       end
     end
   end

data/app/indexers/hyrax/basic_metadata_indexer.rb

@@ -3,7 +3,7 @@ module Hyrax
   class BasicMetadataIndexer < ActiveFedora::RDF::IndexingService
     class_attribute :stored_and_facetable_fields, :stored_fields, :symbol_fields
     self.stored_and_facetable_fields = %i[resource_type creator contributor keyword publisher subject language based_near]
-    self.stored_fields = %i[description license rights_statement date_created identifier related_url bibliographic_citation source]
+    self.stored_fields = %i[description license rights_statement rights_notes date_created identifier related_url bibliographic_citation source]
     self.symbol_fields = %i[import_url]
 
     private

data/app/indexers/hyrax/collection_indexer.rb

@@ -2,7 +2,7 @@ module Hyrax
   class CollectionIndexer < Hydra::PCDM::CollectionIndexer
     include Hyrax::IndexesThumbnails
 
-    STORED_LONG = Solrizer::Descriptor.new(:long, :stored)
+    STORED_LONG = ActiveFedora::Indexing::Descriptor.new(:long, :stored)
 
     self.thumbnail_path_service = Hyrax::CollectionThumbnailPathService
 
@@ -11,9 +11,9 @@ module Hyrax
     def generate_solr_document
       super.tap do |solr_doc|
         # Makes Collections show under the "Collections" tab
-        Solrizer.set_field(solr_doc, 'generic_type', 'Collection', :facetable)
+        ActiveFedora.index_field_mapper.set_field(solr_doc, 'generic_type', 'Collection', :facetable)
         # Index the size of the collection in bytes
-        solr_doc[Solrizer.solr_name(:bytes, STORED_LONG)] = object.bytes
+        solr_doc[ActiveFedora.index_field_mapper.solr_name(:bytes, STORED_LONG)] = object.bytes
         solr_doc['visibility_ssi'] = object.visibility
 
         object.in_collections.each do |col|

data/app/indexers/hyrax/deep_indexing_service.rb

@@ -67,13 +67,13 @@ module Hyrax
       # @param [Array] val an array of two elements, first is a string (the uri) and the second is a hash with one key: `:label`
       def append_label_and_uri(solr_doc, solr_field_key, field_info, val)
         val = val.solrize
-        self.class.create_and_insert_terms(solr_field_key,
-                                           val.first,
-                                           field_info.behaviors, solr_doc)
+        ActiveFedora::Indexing::Inserter.create_and_insert_terms(solr_field_key,
+                                                                 val.first,
+                                                                 field_info.behaviors, solr_doc)
         return unless val.last.is_a? Hash
-        self.class.create_and_insert_terms("#{solr_field_key}_label",
-                                           label(val),
-                                           field_info.behaviors, solr_doc)
+        ActiveFedora::Indexing::Inserter.create_and_insert_terms("#{solr_field_key}_label",
+                                                                 label(val),
+                                                                 field_info.behaviors, solr_doc)
       end
 
       # Use this method to append a string value from a controlled vocabulary field
@@ -83,12 +83,12 @@ module Hyrax
       # @param [Hash] field_info
       # @param [String] val
       def append_label(solr_doc, solr_field_key, field_info, val)
-        self.class.create_and_insert_terms(solr_field_key,
-                                           val,
-                                           field_info.behaviors, solr_doc)
-        self.class.create_and_insert_terms("#{solr_field_key}_label",
-                                           val,
-                                           field_info.behaviors, solr_doc)
+        ActiveFedora::Indexing::Inserter.create_and_insert_terms(solr_field_key,
+                                                                 val,
+                                                                 field_info.behaviors, solr_doc)
+        ActiveFedora::Indexing::Inserter.create_and_insert_terms("#{solr_field_key}_label",
+                                                                 val,
+                                                                 field_info.behaviors, solr_doc)
       end
 
       # Return a label for the solrized term:

data/app/indexers/hyrax/file_set_indexer.rb

@@ -2,7 +2,7 @@ module Hyrax
   class FileSetIndexer < ActiveFedora::IndexingService
     include Hyrax::IndexesThumbnails
     include Hyrax::IndexesBasicMetadata
-    STORED_LONG = Solrizer::Descriptor.new(:long, :stored)
+    STORED_LONG = ActiveFedora::Indexing::Descriptor.new(:long, :stored)
 
     def generate_solr_document
       super.tap do |solr_doc|

data/app/indexers/hyrax/indexes_workflow.rb

@@ -1,9 +1,9 @@
 module Hyrax
   module IndexesWorkflow
-    STORED_BOOL = Solrizer::Descriptor.new(:boolean, :stored, :indexed)
+    STORED_BOOL = ActiveFedora::Indexing::Descriptor.new(:boolean, :stored, :indexed)
 
     mattr_accessor :suppressed_field, instance_writer: false do
-      Solrizer.solr_name('suppressed', STORED_BOOL)
+      ActiveFedora.index_field_mapper.solr_name('suppressed', STORED_BOOL)
     end
 
     # Adds thumbnail indexing to the solr document
@@ -31,11 +31,11 @@ module Hyrax
     end
 
     def workflow_state_name_field
-      @workflow_state_name_field ||= Solrizer.solr_name('workflow_state_name', :symbol)
+      @workflow_state_name_field ||= ActiveFedora.index_field_mapper.solr_name('workflow_state_name', :symbol)
     end
 
     def workflow_role_field
-      @workflow_role_field ||= Solrizer.solr_name('actionable_workflow_roles', :symbol)
+      @workflow_role_field ||= ActiveFedora.index_field_mapper.solr_name('actionable_workflow_roles', :symbol)
     end
 
     def workflow_roles(entity)

data/app/indexers/hyrax/work_indexer.rb

@@ -9,7 +9,7 @@ module Hyrax
         solr_doc['member_ids_ssim'] = object.member_ids
         solr_doc['member_of_collections_ssim']    = object.member_of_collections.map(&:first_title)
         solr_doc['member_of_collection_ids_ssim'] = object.member_of_collections.map(&:id)
-        Solrizer.set_field(solr_doc, 'generic_type', 'Work', :facetable)
+        ActiveFedora.index_field_mapper.set_field(solr_doc, 'generic_type', 'Work', :facetable)
 
         # This enables us to return a Work when we have a FileSet that matches
         # the search query.  While at the same time allowing us not to return Collections

data/app/models/concerns/hyrax/basic_metadata.rb

@@ -19,6 +19,8 @@ module Hyrax
       # Used for a license
       property :license, predicate: ::RDF::Vocab::DC.rights
 
+      property :rights_notes, predicate: ::RDF::URI.new('http://purl.org/dc/elements/1.1/rights'), multiple: true
+
       # This is for the rights statement
       property :rights_statement, predicate: ::RDF::Vocab::EDM.rights
       property :publisher, predicate: ::RDF::Vocab::DC11.publisher

data/app/models/concerns/hyrax/collection_behavior.rb

@@ -89,7 +89,7 @@ module Hyrax
       end
 
       def collection_type_gid_document_field_name
-        Solrizer.solr_name('collection_type_gid', *index_collection_type_gid_as)
+        ActiveFedora.index_field_mapper.solr_name('collection_type_gid', *index_collection_type_gid_as)
       end
     end
 
@@ -171,12 +171,12 @@ module Hyrax
       # Field name to look up when locating the size of each file in Solr.
       # Override for your own installation if using something different
       def file_size_field
-        Solrizer.solr_name(:file_size, Hyrax::FileSetIndexer::STORED_LONG)
+        ActiveFedora.index_field_mapper.solr_name(:file_size, Hyrax::FileSetIndexer::STORED_LONG)
       end
 
       # Solr field name works use to index member ids
       def member_ids_field
-        Solrizer.solr_name('member_ids', :symbol)
+        ActiveFedora.index_field_mapper.solr_name('member_ids', :symbol)
       end
 
       def destroy_permission_template

data/app/models/concerns/hyrax/file_set/querying.rb

@@ -5,7 +5,7 @@ module Hyrax
 
       module ClassMethods
         def where_digest_is(digest_string)
-          where Solrizer.solr_name('digest', :symbol) => urnify(digest_string)
+          where ActiveFedora.index_field_mapper.solr_name('digest', :symbol) => urnify(digest_string)
         end
 
         def urnify(digest_string)

data/app/models/concerns/hyrax/human_readable_type.rb

@@ -22,8 +22,8 @@ module Hyrax
 
     def to_solr(solr_doc = {})
       super(solr_doc).tap do |doc|
-        doc[Solrizer.solr_name('human_readable_type', :facetable)] = human_readable_type
-        doc[Solrizer.solr_name('human_readable_type', :stored_searchable)] = human_readable_type
+        doc[ActiveFedora.index_field_mapper.solr_name('human_readable_type', :facetable)] = human_readable_type
+        doc[ActiveFedora.index_field_mapper.solr_name('human_readable_type', :stored_searchable)] = human_readable_type
       end
     end
   end