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

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

@@ -72,20 +72,18 @@ module Hyrax
       # @return [Boolean] true if create was successful
       def create(env)
         intention = Intention.new(env.attributes)
-        attributes = intention.sanitize_params
-        new_env = Environment.new(env.curation_concern, env.current_ability, attributes)
-        validate(env, intention, attributes) && apply_visibility(new_env, intention) &&
-          next_actor.create(new_env)
+        env.attributes = intention.sanitize_params
+        validate(env, intention, env.attributes) && apply_visibility(env, intention) &&
+          next_actor.create(env)
       end
 
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if update was successful
       def update(env)
         intention = Intention.new(env.attributes)
-        attributes = intention.sanitize_params
-        new_env = Environment.new(env.curation_concern, env.current_ability, attributes)
-        validate(env, intention, attributes) && apply_visibility(new_env, intention) &&
-          next_actor.update(new_env)
+        env.attributes = intention.sanitize_params
+        validate(env, intention, env.attributes) && apply_visibility(env, intention) &&
+          next_actor.update(env)
       end
 
       private

data/app/actors/hyrax/actors/valkyrie_to_active_fedora.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Actors
+    ##
+    # Casts `env.curation_concern` from a `Valkyrie::Resource` to an
+    # `ActiveFedora::Base` model.
+    #
+    # If the curation concern is not a `Valkyrie::Resource` this is a
+    # no-op.
+    #
+    # This can be used in conjunction with `ActiveFedoraToValkyrie` to create a
+    # vertical boundary in the actor stack between actors that deal with
+    # `ActiveFedora` models and those that work on `Valkyrie::Resource` objects.
+    #
+    # @example defining a stack using both ActiveFedora and Valkyrie actors
+    #   stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
+    #     middleware.use ActorThatUsesActiveFedora
+    #     middleware.use AnotherActorThatUsesActiveFedora
+    #     middleware.use ValkyrieToActiveFedora # casts on the way up
+    #     middleware.use ActiveFedoraToValkyrie # casts on the way down
+    #     middleware.use ActorThatUsesValkyrie
+    #     middleware.use AnotherActorThatUsesValkyrie
+    #   end
+    #
+    #   actor = stack.build(Hyrax::Actors::Terminator.new)
+    #
+    # @see ValkyrieToActiveFedora
+    class ValkyrieToActiveFedora < AbstractActor
+      # @param [Hyrax::Actors::Environment] env
+      # @return [Boolean] true
+      def create(env)
+        next_actor.create(env) && cast(env)
+      end
+
+      # @param [Hyrax::Actors::Environment] env
+      # @return [Boolean] true
+      def update(env)
+        next_actor.update(env) && cast(env)
+      end
+
+      # @param [Hyrax::Actors::Environment] env
+      # @return [Boolean] true
+      def destroy(env)
+        next_actor.destroy(env) && cast(env)
+      end
+
+      private
+
+        def cast(env)
+          return true unless env.curation_concern.is_a? Valkyrie::Resource
+
+          env.curation_concern =
+            Wings::ActiveFedoraConverter.convert(resource: env.curation_concern)
+
+          true
+        end
+    end
+  end
+end

data/app/assets/javascripts/hyrax/collections.js

@@ -249,11 +249,12 @@ Blacklight.onLoad(function () {
     var tableRows = $('#documents table.collections-list-table tbody tr');
     var checkbox = null;
     var numRowsSelected = false;
+    var $modal = $('#selected-collections-delete-modal');
+    var $deleteWordingTarget = $modal.find('.pluralized');
     var deleteWording = {
-      plural: 'these collections',
-      singular: 'this collection'
+      plural: $modal.data("pluralForm"),
+      singular: $modal.data("singularForm")
     };
-    var $deleteWordingTarget = $('#selected-collections-delete-modal .pluralized');
 
     var canDeleteAll = true;
     var selectedInputs = $('#documents table.collections-list-table tbody tr')
@@ -277,7 +278,7 @@ Blacklight.onLoad(function () {
       } else {
         $deleteWordingTarget.text(deleteWording.singular);
       }
-      $('#selected-collections-delete-modal').modal('show');
+      $modal.modal('show');
     }
   });
 

data/app/assets/javascripts/hyrax/nav_safety.js

@@ -4,7 +4,9 @@
 // - Add the nav-safety class to the form element.
 
 Blacklight.onLoad(function() {
+  var clickedTab;
   $('.nav-safety-confirm').on('click', function(evt) {
+    clickedTab = $(this).attr('href');
     var dirtyData = $('#nav-safety-modal[dirtyData=true]');
     if (dirtyData.length > 0) {
       evt.preventDefault();
@@ -14,9 +16,9 @@ Blacklight.onLoad(function() {
   });
   
   $('#nav-safety-dismiss').on('click', function(evt) {
-    // evt.preventDefault();
     nav_safety_off();
-    // $('#nav-safety-change-tab').modal('hide');
+    // Navigate away from active tab to clicked tab
+    window.location = clickedTab;
   });
   
   $('form.nav-safety').on('change', function(evt) {

data/app/assets/javascripts/hyrax/proxy_rights.js

@@ -22,6 +22,14 @@
             if (settings.afterAdd)
               settings.afterAdd(this, cloneElem);
           }
+        },
+        error: function (data) {
+          if (data.responseJSON !== undefined) {
+            errorMsg = data.responseJSON.description;
+            $('#errorMsg').text(errorMsg);
+            $('#proxy-deny-modal').modal('show');
+            return;
+          }
         }
       })
       return false;

data/app/assets/stylesheets/fileupload/jquery.fileupload-ui.scss

@@ -17,23 +17,9 @@
 
 .fileinput-button {
   float: left;
-  margin-right: .50em;
+  margin-right: 0.5em;
   overflow: hidden;
   position: relative;
-
-  input {
-    border-width: 0 0 100px 200px;
-    border: solid transparent;
-    cursor: pointer;
-    direction: ltr;
-    filter: alpha(opacity = 0);
-    margin: 0;
-    opacity: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    -moz-transform: translate(-300px, 0) scale(4);
-  }
 }
 
 // Global progress bar

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

@@ -661,7 +661,7 @@ button.branding-banner-remove:hover {
 
 .hyc-bl-results {
 
-  margin: 0 0 2em;
+  margin: 5em 0 2em;
 
   .alert {
     margin: 0;

data/app/assets/stylesheets/hyrax/_home-page.scss

@@ -56,6 +56,12 @@
       }
     }
 
+    @media only screen and (max-width: 767px) {
+      .navbar-nav {
+        margin-left: 10px;
+      }
+    }
+
     .active > a {
       &,
       &:hover,

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

@@ -13,3 +13,14 @@
     margin-top: $padding-small-vertical;
   }
 }
+
+.activity-display {
+  max-height: 100%;
+  overflow: scroll;
+  padding-bottom: 300px;
+  position: relative;
+
+  .activity-date {
+    padding-right: 130px;
+  }
+}

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

@@ -1,8 +1,19 @@
+// Default for smaller screens, uses mobile panel
 .viewer-wrapper {
-  height: 500px;
+  height: 390px;
 }
 
-.viewer {
+.viewer-wrapper iframe {
   height: 100%;
-  padding: 10px;
+  width: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
 }
+
+// Show various footer, header, left and right panels on larger screens only
+@media only screen and (min-width: 640px) {
+  .viewer-wrapper {
+    height: 640px;
+  }
+}

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

@@ -7,6 +7,8 @@ module Hyrax
         trail_from_referer
       else
         default_trail
+        add_breadcrumb_for_controller if user_signed_in?
+        add_breadcrumb_for_action
       end
     end
 

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

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

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

@@ -26,7 +26,8 @@ module Hyrax
     def update
       filter_docs_with_edit_access!
       copy_visibility = params[:embargoes].values.map { |h| h[:copy_visibility] }
-      ActiveFedora::Base.find(batch).each do |curation_concern|
+      af_objects = Hyrax.query_service.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: false)
+      af_objects.each do |curation_concern|
         Hyrax::Actors::EmbargoActor.new(curation_concern).destroy
         # if the concern is a FileSet, set its visibility and skip the copy_visibility_to_files, which is built for Works
         if curation_concern.file_set?

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

@@ -25,7 +25,8 @@ module Hyrax
     def update
       filter_docs_with_edit_access!
       copy_visibility = params[:leases].values.map { |h| h[:copy_visibility] }
-      ActiveFedora::Base.find(batch).each do |curation_concern|
+      af_objects = Hyrax.query_service.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: false)
+      af_objects.each do |curation_concern|
         Hyrax::Actors::LeaseActor.new(curation_concern).destroy
         curation_concern.copy_visibility_to_files if copy_visibility.include?(curation_concern.id)
       end

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

@@ -29,6 +29,7 @@ module Hyrax
       end
 
       def send_local_file_contents
+        return unless stale?(last_modified: local_file_last_modified, template: false)
         self.status = 200
         prepare_local_file_headers
         # For derivatives stored on the local file system
@@ -65,7 +66,7 @@ module Hyrax
         response.headers['Content-Type'] = local_file_mime_type
         response.headers['Content-Length'] ||= local_file_size.to_s
         # Prevent Rack::ETag from calculating a digest over body
-        response.headers['Last-Modified'] = local_file_last_modified.utc.strftime("%a, %d %b %Y %T GMT")
+        response.headers['Last-Modified'] = local_file_last_modified.httpdate
         self.content_type = local_file_mime_type
       end
 

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -38,7 +38,7 @@ module Hyrax
 
     def destroy_collection
       batch.each do |doc_id|
-        obj = ActiveFedora::Base.find(doc_id, cast: true)
+        obj = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: doc_id, use_valkyrie: false)
         obj.destroy
       end
       flash[:notice] = "Batch delete complete"
@@ -60,7 +60,7 @@ module Hyrax
       case params["update_type"]
       when "update"
         batch.each do |doc_id|
-          update_document(ActiveFedora::Base.find(doc_id))
+          update_document(Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: doc_id, use_valkyrie: false))
         end
         flash[:notice] = "Batch update complete"
         after_update
@@ -82,7 +82,7 @@ module Hyrax
       end
 
       def destroy_batch
-        batch.each { |id| ActiveFedora::Base.find(id).destroy }
+        batch.each { |id| Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: id, use_valkyrie: false).destroy }
         after_update
       end
 

data/app/controllers/hyrax/dashboard/collections_controller.rb

@@ -83,7 +83,7 @@ module Hyrax
         # we pass the parent_id through a hidden field in the form and link the two after the create.
         link_parent_collection(params[:parent_id]) unless params[:parent_id].nil?
         respond_to do |format|
-          ActiveFedora::SolrService.instance.conn.commit
+          Hyrax::SolrService.commit
           format.html { redirect_to edit_dashboard_collection_path(@collection), notice: t('hyrax.dashboard.my.action.collection_create_success') }
           format.json { render json: @collection, status: :created, location: dashboard_collection_path(@collection) }
         end
@@ -202,7 +202,7 @@ module Hyrax
         end
 
         def link_parent_collection(parent_id)
-          parent = ActiveFedora::Base.find(parent_id)
+          parent = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: parent_id, use_valkyrie: false)
           Hyrax::Collections::NestedCollectionPersistenceService.persist_nested_collection_for(parent: parent, child: @collection)
         end
 
@@ -279,10 +279,10 @@ module Hyrax
           public_files = []
           uploaded_file_ids.each_with_index do |ufi, i|
             if ufi.include?('public')
-              update_logo_info(ufi, params["alttext"][i], params["linkurl"][i])
+              update_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
               public_files << ufi
             else # brand new one, insert in the database
-              logo_info = create_logo_info(ufi, params["alttext"][i], params["linkurl"][i])
+              logo_info = create_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
               public_files << logo_info.local_path
             end
           end
@@ -375,7 +375,7 @@ module Hyrax
 
         def remove_members_from_collection
           batch.each do |pid|
-            work = ActiveFedora::Base.find(pid)
+            work = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: pid, use_valkyrie: false)
             work.member_of_collections.delete @collection
             work.save!
           end
@@ -458,6 +458,17 @@ module Hyrax
         def params_for_query
           params.merge(q: params[:cq])
         end
+
+        # Only accept HTTP|HTTPS urls;
+        # @return <String> the url
+        def verify_linkurl(linkurl)
+          url = Loofah.scrub_fragment(linkurl, :prune).to_s
+          url if valid_url?(url)
+        end
+
+        def valid_url?(url)
+          (url =~ URI.regexp(['http', 'https']))
+        end
     end
   end
 end

data/app/controllers/hyrax/dashboard_controller.rb

@@ -6,6 +6,15 @@ module Hyrax
     before_action :authenticate_user!
     before_action :build_breadcrumbs, only: [:show]
 
+    ##
+    # @!attribute [rw] sidebar_partials
+    #   @return [Hash]
+    #
+    # @example Add a custom partial to the tasks sidebar block
+    #   Hyrax::DashboardController.sidebar_partials[:tasks] << "hyrax/dashboard/sidebar/custom_task"
+    class_attribute :sidebar_partials
+    self.sidebar_partials = { activity: [], configuration: [], repository_content: [], tasks: [] }
+
     def show
       if can? :read, :admin_dashboard
         @presenter = Hyrax::Admin::DashboardPresenter.new

data/app/controllers/hyrax/depositors_controller.rb

@@ -3,7 +3,6 @@ module Hyrax
     include DenyAccessOverrideBehavior
 
     before_action :authenticate_user!
-    before_action :validate_users, only: :create
 
     layout :decide_layout
 
@@ -17,7 +16,10 @@ module Hyrax
     def create
       grantor = authorize_and_return_grantor
       grantee = ::User.from_url_component(params[:grantee_id])
-      if grantor.can_receive_deposits_from.include?(grantee)
+
+      if grantor == grantee
+        render_json_response(response_type: :unprocessable_entity, message: view_context.t('hyrax.dashboard.proxy_add_deny'))
+      elsif grantor.can_receive_deposits_from.include?(grantee)
         head :ok
       else
         grantor.can_receive_deposits_from << grantee
@@ -32,10 +34,6 @@ module Hyrax
       head :ok
     end
 
-    def validate_users
-      head :ok if params[:user_id] == params[:grantee_id]
-    end
-
     private
 
       def authorize_and_return_grantor

data/app/controllers/hyrax/downloads_controller.rb

@@ -18,7 +18,7 @@ module Hyrax
         # For derivatives stored on the local file system
         send_local_content
       else
-        raise ActiveFedora::ObjectNotFoundError
+        raise Hyrax::ObjectNotFoundError
       end
     end