hyrax 3.0.0.pre.beta2 → 3.0.0.pre.beta3

data/app/controllers/hyrax/file_sets_controller.rb

@@ -48,7 +48,7 @@ module Hyrax
     def destroy
       parent = curation_concern.parent
       actor.destroy
-      redirect_to [main_app, parent], notice: 'The file has been deleted.'
+      redirect_to [main_app, parent], notice: view_context.t('hyrax.file_sets.asset_deleted_flash.message')
     end
 
     # PATCH /concern/file_sets/:id
@@ -95,7 +95,8 @@ module Hyrax
       def after_update_response
         respond_to do |wants|
           wants.html do
-            redirect_to [main_app, curation_concern], notice: "The file #{view_context.link_to(curation_concern, [main_app, curation_concern])} has been updated."
+            link_to_file = view_context.link_to(curation_concern, [main_app, curation_concern])
+            redirect_to [main_app, curation_concern], notice: view_context.t('hyrax.file_sets.asset_updated_flash.message', link_to_file: link_to_file)
           end
           wants.json do
             @presenter = show_presenter.new(curation_concern, current_ability)

data/app/controllers/hyrax/homepage_controller.rb

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

data/app/controllers/hyrax/my/works_controller.rb

@@ -4,8 +4,8 @@ module Hyrax
       # Define collection specific filter facets.
       def self.configure_facets
         configure_blacklight do |config|
-          config.add_facet_field solr_name("admin_set", :facetable), limit: 5
-          config.add_facet_field solr_name('member_of_collections', :symbol), limit: 5
+          config.add_facet_field "admin_set_sim", limit: 5
+          config.add_facet_field "member_of_collections_ssim", limit: 5
         end
       end
       configure_facets

data/app/controllers/hyrax/my_controller.rb

@@ -9,11 +9,11 @@ module Hyrax
       blacklight_config.facet_fields = {}
       configure_blacklight do |config|
         # TODO: add a visibility facet (requires visibility to be indexed)
-        config.add_facet_field solr_name('visibility', :stored_sortable),
+        config.add_facet_field "visibility_ssi",
                                helper_method: :visibility_badge,
                                limit: 5, label: I18n.t('hyrax.dashboard.my.heading.visibility')
         config.add_facet_field IndexesWorkflow.suppressed_field, helper_method: :suppressed_to_status
-        config.add_facet_field solr_name("resource_type", :facetable), limit: 5
+        config.add_facet_field "resource_type_sim", limit: 5
       end
     end
 

data/app/controllers/hyrax/permissions_controller.rb

@@ -28,7 +28,7 @@ module Hyrax
     end
 
     def curation_concern
-      @curation_concern ||= ActiveFedora::Base.find(params[:id])
+      @curation_concern ||= Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: params[:id], use_valkyrie: false)
     end
   end
 end

data/app/controllers/hyrax/single_use_links_viewer_controller.rb

@@ -59,7 +59,7 @@ module Hyrax
       end
 
       def asset
-        @asset ||= ActiveFedora::Base.find(single_use_link.item_id)
+        @asset ||= Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: single_use_link.item_id, use_valkyrie: false)
       end
 
       def current_ability

data/app/controllers/hyrax/workflow_actions_controller.rb

@@ -16,7 +16,7 @@ module Hyrax
     private
 
       def curation_concern
-        @curation_concern ||= ActiveFedora::Base.find(params[:id])
+        @curation_concern ||= Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: params[:id], use_valkyrie: false)
       end
 
       def workflow_action_form

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

@@ -7,6 +7,14 @@ module Hyrax
       # Cast any array values on the model to scalars.
       def [](key)
         return super if key == :thumbnail_id
+        if key == :title
+          @attributes["title"].each do |value|
+            @attributes["alt_title"] << value
+          end
+          @attributes["alt_title"].delete(@attributes["alt_title"].sort.first) unless @attributes["alt_title"].empty?
+          return @attributes["title"].sort.first unless @attributes["title"].empty?
+          return ""
+        end
         super.first
       end
 

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

@@ -64,7 +64,7 @@ module Hyrax
         def initialize_combined_fields
           # For each of the files in the batch, set the attributes to be the concatenation of all the attributes
           batch_document_ids.each_with_object({}) do |doc_id, combined_attributes|
-            work = ActiveFedora::Base.find(doc_id)
+            work = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: doc_id, use_valkyrie: false)
             terms.each do |field|
               combined_attributes[field] ||= []
               combined_attributes[field] = (combined_attributes[field] + work[field].to_a).uniq

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

@@ -7,7 +7,7 @@ module Hyrax
       # Used by the search builder
       attr_reader :scope
 
-      delegate :id, :depositor, :permissions, :human_readable_type, :member_ids, :nestable?, to: :model
+      delegate :id, :depositor, :permissions, :human_readable_type, :member_ids, :nestable?, :alt_title, to: :model
 
       class_attribute :membership_service_class
 
@@ -20,7 +20,7 @@ module Hyrax
 
       delegate :blacklight_config, to: Hyrax::CollectionsController
 
-      self.terms = [:resource_type, :title, :creator, :contributor, :description,
+      self.terms = [:alt_title, :resource_type, :title, :creator, :contributor, :description,
                     :keyword, :license, :publisher, :date_created, :subject, :language,
                     :representative_id, :thumbnail_id, :identifier, :based_near,
                     :related_url, :visibility, :collection_type_gid]
@@ -41,6 +41,36 @@ module Hyrax
         @scope = ProxyScope.new(current_ability, repository, blacklight_config)
       end
 
+      # Cast back to multi-value when saving
+      # Reads from form
+      def self.model_attributes(attributes)
+        attrs = super
+        return attrs unless attributes[:title]
+
+        attrs[:title] = Array(attributes[:title])
+        return attrs if attributes[:alt_title].nil?
+        Array(attributes[:alt_title]).each do |value|
+          attrs["title"] << value if value != ""
+        end
+        attrs
+      end
+
+      # @param [Symbol] key the field to read
+      # @return the value of the form field.
+      # For display in edit page
+      def [](key)
+        return model.member_of_collection_ids if key == :member_of_collection_ids
+        if key == :title
+          @attributes["title"].each do |value|
+            @attributes["alt_title"] << value
+          end
+          @attributes["alt_title"].delete(@attributes["alt_title"].sort.first) unless @attributes["alt_title"].empty?
+          return @attributes["title"].sort.first unless @attributes["title"].empty?
+          return ""
+        end
+        super
+      end
+
       def permission_template
         @permission_template ||= begin
                                    template_model = PermissionTemplate.find_or_create_by(source_id: model.id)
@@ -60,7 +90,8 @@ module Hyrax
 
       # Terms that appear within the accordion
       def secondary_terms
-        [:creator,
+        [:alt_title,
+         :creator,
          :contributor,
          :keyword,
          :license,

data/app/forms/hyrax/forms/file_set_edit_form.rb

@@ -5,7 +5,7 @@ module Hyrax::Forms
 
     delegate :depositor, :permissions, to: :model
 
-    self.required_fields = [:title, :creator, :keyword, :license]
+    self.required_fields = [:title, :creator, :license]
 
     self.model_class = ::FileSet
 

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

@@ -17,12 +17,10 @@ module Hyrax
                :visibility_during_embargo, :embargo_release_date, :visibility_after_embargo,
                :visibility_during_lease, :lease_expiration_date, :visibility_after_lease,
                :visibility, :in_works_ids, :depositor, :on_behalf_of, :permissions,
-               :member_ids, to: :model
+               :member_ids, :alt_title, to: :model
 
-      attr_reader :agreement_accepted
-
-      self.terms = [:title, :creator, :contributor, :description,
-                    :keyword, :license, :rights_statement, :rights_notes, :publisher, :date_created,
+      self.terms = [:title, :alt_title, :creator, :contributor, :description, :abstract,
+                    :keyword, :license, :rights_statement, :access_right, :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,
@@ -30,18 +28,39 @@ module Hyrax
                     :visibility, :ordered_member_ids, :source, :in_works_ids,
                     :member_of_collection_ids, :admin_set_id]
 
-      self.required_fields = [:title, :creator, :keyword, :rights_statement]
+      self.required_fields = [:title, :creator, :rights_statement]
 
       # The service that determines the cardinality of each field
       self.field_metadata_service = Hyrax::FormMetadataService
 
       def initialize(model, current_ability, controller)
         @current_ability = current_ability
-        @agreement_accepted = !model.new_record?
         @controller = controller
         super(model)
       end
 
+      # Cast back to multi-value when saving
+      # Reads from form
+      def self.model_attributes(attributes)
+        attrs = super
+        return attrs unless attributes[:title]
+
+        attrs[:title] = Array(attributes[:title])
+        return attrs if attributes[:alt_title].nil?
+        Array(attributes[:alt_title]).each do |value|
+          attrs["title"] << value if value != ""
+        end
+        attrs
+      end
+
+      ##
+      # @return [Boolean] whether the deposit agreement has already been
+      #   accepted
+      def agreement_accepted?
+        !model.new_record?
+      end
+      alias agreement_accepted agreement_accepted?
+
       # when the add_works_to_collection parameter is set, they mean to create
       # a new work and add it to that collection.
       def member_of_collections
@@ -95,8 +114,16 @@ module Hyrax
 
       # @param [Symbol] key the field to read
       # @return the value of the form field.
+      # For display in edit page
       def [](key)
         return model.member_of_collection_ids if key == :member_of_collection_ids
+        if key == :title
+          @attributes["title"].each do |value|
+            @attributes["alt_title"] << value
+          end
+          @attributes["alt_title"].delete(@attributes["alt_title"].sort.first) unless @attributes["alt_title"].empty?
+          return @attributes[key.to_s].sort.first
+        end
         super
       end
 

data/app/forms/hyrax/forms/workflow_responsibility_form.rb

@@ -12,10 +12,6 @@ module Hyrax
         @model ||= Sipity::WorkflowResponsibility.new
       end
 
-      def to_model
-        model_instance
-      end
-
       delegate :model_name, :to_key, :workflow_role_id, :persisted?, :save!, to: :model_instance
 
       def user_id

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 = ActiveFedora.index_field_mapper.solr_name(solr_field, :facetable)
+      facet_field = solr_field.to_s + "_sim"
       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[ActiveFedora.index_field_mapper.solr_name("title", :stored_searchable)]
+      solr_field = solr_docs.first["title_tesim"]
       return nil if solr_field.nil?
       solr_field.first
     end
@@ -307,8 +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(ActiveFedora.index_field_mapper.solr_name(facet.keys.first, :facetable),
-                               facet.values.first)
+        state.add_facet_params(facet.keys.first.to_s + "_sim", facet.values.first)
       end
 
       def institution

data/app/helpers/hyrax/iiif_helper.rb

@@ -8,5 +8,13 @@ module Hyrax
     def iiif_viewer_display_partial(work_presenter)
       'hyrax/base/iiif_viewers/' + work_presenter.iiif_viewer.to_s
     end
+
+    def universal_viewer_base_url
+      "#{request&.base_url}/uv/uv.html"
+    end
+
+    def universal_viewer_config_url
+      "#{request&.base_url}/uv/uv-config.json"
+    end
   end
 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
-        ActiveFedora.index_field_mapper.set_field(solr_doc, 'generic_type', 'Admin Set', :facetable)
+        solr_doc['generic_type_sim'] = ['Admin Set']
       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 rights_notes date_created identifier related_url bibliographic_citation source]
+    self.stored_fields = %i[alt_title description abstract license rights_statement rights_notes access_right date_created identifier related_url bibliographic_citation source]
     self.symbol_fields = %i[import_url]
 
     private

data/app/indexers/hyrax/collection_indexer.rb

@@ -11,9 +11,9 @@ module Hyrax
     def generate_solr_document
       super.tap do |solr_doc|
         # Makes Collections show under the "Collections" tab
-        ActiveFedora.index_field_mapper.set_field(solr_doc, 'generic_type', 'Collection', :facetable)
+        solr_doc['generic_type_sim'] = ["Collection"]
         # Index the size of the collection in bytes
-        solr_doc[ActiveFedora.index_field_mapper.solr_name(:bytes, STORED_LONG)] = object.bytes
+        solr_doc['bytes_lts'] = object.bytes
         solr_doc['visibility_ssi'] = object.visibility
 
         object.in_collections.each do |col|

data/app/indexers/hyrax/file_set_indexer.rb

@@ -27,6 +27,8 @@ module Hyrax
         solr_doc['duration_tesim']          = object.duration
         solr_doc['sample_rate_tesim']       = object.sample_rate
         solr_doc['original_checksum_tesim'] = object.original_checksum
+        solr_doc['alpha_channels_ssi']      = object.alpha_channels
+        solr_doc['original_file_id_ssi']    = original_file_id
       end
     end
 
@@ -37,6 +39,11 @@ module Hyrax
         object.original_file.digest.first.to_s
       end
 
+      def original_file_id
+        return unless object.original_file
+        Hyrax::VersioningService.versioned_file_id object.original_file
+      end
+
       def file_format
         if object.mime_type.present? && object.format_label.present?
           "#{object.mime_type.split('/').last} (#{object.format_label.join(', ')})"

data/app/indexers/hyrax/indexes_workflow.rb

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

data/app/indexers/hyrax/valkyrie_indexers/base_indexer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module Hyrax
+  module ValkyrieIndexers
+    class BaseIndexer
+      attr_reader :resource
+      def initialize(resource:)
+        @resource = resource
+      end
+
+      def to_solr
+        {
+          "id": resource.id.to_s,
+          "created_at_dtsi": resource.created_at,
+          "updated_at_dtsi": resource.updated_at
+        }
+      end
+    end
+  end
+end

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)
-        ActiveFedora.index_field_mapper.set_field(solr_doc, 'generic_type', 'Work', :facetable)
+        solr_doc['generic_type_sim'] = ['Work']
 
         # 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/jobs/attach_files_to_work_job.rb

@@ -8,7 +8,8 @@ class AttachFilesToWorkJob < Hyrax::ApplicationJob
     validate_files!(uploaded_files)
     depositor = proxy_or_depositor(work)
     user = User.find_by_user_key(depositor)
-    work_permissions = work.permissions.map(&:to_hash)
+
+    work, work_permissions = create_permissions work, depositor
     metadata = visibility_attributes(work_attributes)
     uploaded_files.each do |uploaded_file|
       next if uploaded_file.file_set_uri.present?
@@ -24,6 +25,13 @@ class AttachFilesToWorkJob < Hyrax::ApplicationJob
 
   private
 
+    def create_permissions(work, depositor)
+      work.edit_users += [depositor]
+      work.edit_users = work.edit_users.dup
+      work_permissions = work.permissions.map(&:to_hash)
+      [work, work_permissions]
+    end
+
     # The attributes used for visibility - sent as initial params to created FileSets.
     def visibility_attributes(attributes)
       attributes.slice(:visibility, :visibility_during_lease,