hyrax 2.1.0.rc1 → 2.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7758e362b3ead3c21f48bf9cf6763565ea0304fb
-  data.tar.gz: 3788d88af39d4ab5b81a17bb94bf90d39e2852fa
+  metadata.gz: 2f567b87262e35a9cb150d7155519d89714b19b0
+  data.tar.gz: 1ba5abb5d18be1edaacdb1bceb77030e1dfa1c66
 SHA512:
-  metadata.gz: 4c1e3c4e80619330f7e5dd1d624a38296618d2dc40e371485d70039e52068af1dbb9593cea59a5aac0a6951b392b82800426d530a13825523517637ce9cac7e7
-  data.tar.gz: 02d3518cccfd2c631cda0e27b1dfa200bbbec739c184d211da2d9ec215f663d19f13623009bd5bc96fef967152244729acb9def82aa67d320543d44c12907636
+  metadata.gz: b72273e1c7ecb34223b97e5839232fcdcb5f26d036903bdb2e50f2ec45d437a52edcf88012fc88f2d6c0c14a4a7ac9bd46965b3cdeada506d6e553352f38418f
+  data.tar.gz: 389b8b29eee7704e80cf71cdceb6ed8f8e96c0bde66a312bb06f31a73cf3996f0e4afbeba6ae132b7f04132a15b036b6ba06e14385ec7c51ff90c8fab65572dd

data/.github/CONTRIBUTING.md

@@ -6,16 +6,16 @@ keeping on top of things.
 
 ## Code of Conduct
 
-The Samvera Community is dedicated to providing a welcoming and positive 
+The Samvera Community is dedicated to providing a welcoming and positive
 experience for all its members, whether they are at a formal gathering, in
-a social setting, or taking part in activities online. Please see our 
+a social setting, or taking part in activities online. Please see our
 [Code of Conduct](CODE_OF_CONDUCT.md) for more information.
 
 ## Samvera Community Intellectual Property Licensing and Ownership
 
-All code contributors must have an Individual Contributor License Agreement 
-(iCLA) on file with the Samvera Steering Group. If the contributor works for 
-an institution, the institution must have a Corporate Contributor License 
+All code contributors must have an Individual Contributor License Agreement
+(iCLA) on file with the Samvera Steering Group. If the contributor works for
+an institution, the institution must have a Corporate Contributor License
 Agreement (cCLA) on file.
 
 https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Property+Licensing+and+Ownership
@@ -64,7 +64,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * This work greatly increases the usability of the code base and supports the on-ramping of new committers.
   * We will all be understanding of one another's time constraints in this area.
 * YARD examples:
-  * [Hydra::Works::RemoveGenericFile](https://github.com/projecthydra-labs/hydra-works/blob/master/lib/hydra/works/services/generic_work/remove_generic_file.rb)
+  * [Hyrax::AdminSet](https://github.com/samvera/hyrax/blob/master/app/models/admin_set.rb)
   * [ActiveTriples::LocalName::Minter](https://github.com/ActiveTriples/active_triples-local_name/blob/master/lib/active_triples/local_name/minter.rb)
 * [Getting started with YARD](http://www.rubydoc.info/gems/yard/file/docs/GettingStarted.md)
 

data/README.md

@@ -63,7 +63,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v2.1.0.rc1__. If you are looking for instructions on installing a different
+v2.1.0.rc2__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -80,8 +80,8 @@ Prerequisites are required for both creating a Hyrax\-based app and contributing
 
 Hyrax requires the following software to work:
 
-1. [Solr](http://lucene.apache.org/solr/) version >= 5.x (tested up to 6.4.1)
-1. [Fedora Commons](http://www.fedora-commons.org/) digital repository version >= 4.5.1 (tested up to 4.7.1)
+1. [Solr](http://lucene.apache.org/solr/) version >= 5.x (tested up to 7.0.0)
+1. [Fedora Commons](http://www.fedora-commons.org/) digital repository version >= 4.5.1 (tested up to 4.7.5)
 1. A SQL RDBMS (MySQL, PostgreSQL), though **note** that SQLite will be used by default if you're looking to get up and running quickly
 1. [Redis](http://redis.io/), a key-value store
 1. [ImageMagick](http://www.imagemagick.org/) with JPEG-2000 support
@@ -132,7 +132,7 @@ Note here that the following commands assume you're setting up Hyrax in a develo
 
 First, you'll need a working Ruby installation. You can install this via your operating system's package manager -- you are likely to get farther with OSX, Linux, or UNIX than Windows but your mileage may vary -- but we recommend using a Ruby version manager such as [RVM](https://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv).
 
-We recommend either Ruby 2.4 or the latest 2.3 version.
+We recommend either Ruby 2.5 or the latest 2.4 version.
 
 ## Redis
 
@@ -142,11 +142,11 @@ Starting up Redis will depend on your operating system, and may in fact already
 
 ## Rails
 
-Hyrax requires Rails 5. We recommend the latest Rails 5.0 release.
+Hyrax requires Rails 5. We recommend the latest Rails 5.1 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 5.0.6
+gem install rails -v 5.1.6
 ```
 
 ### JavaScript runtime
@@ -162,7 +162,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.0.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.1.0.rc1/template.rb
+rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.1.0.rc2/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
@@ -200,7 +200,7 @@ Many of the services performed by Hyrax are resource intensive, and therefore ar
 
 Hyrax implements these jobs using the Rails [ActiveJob](http://edgeguides.rubyonrails.org/active_job_basics.html) framework, allowing you to choose the message queue system of your choice.
 
-For initial testing and development, it is recommended that you change the default ActiveJob adapter from `:async` to `:inline`. This adapter will execute jobs immediately (in the foreground) as they are received. This can be accomplished by adding the following to your `config/application.rb`
+For initial development, it is recommended that you change the default ActiveJob adapter from `:async` to `:inline`. This adapter will execute jobs immediately (in the foreground) as they are received. This can be accomplished by adding the following to your `config/environments/development.rb`
 
 ```
 class Application < Rails::Application
@@ -210,6 +210,16 @@ class Application < Rails::Application
 end
 ```
 
+For testing, it is recommended that you use the [built-in `:test` adapter](http://api.rubyonrails.org/classes/ActiveJob/QueueAdapters/TestAdapter.html) which stores enqueued and performed jobs, running only those configured to run during test setup. To do this, add the following to `config/environments/test.rb`:
+
+```ruby
+Rails.application.configure do
+  # ...
+  config.active_job.queue_adapter = :test
+  # ...
+end
+```
+
 **For production applications** you will want to use a more robust message queue system such as [Sidekiq](http://sidekiq.org/). The Hyrax Development Guide has a detailed walkthrough of [installing and configuring Sidekiq](https://github.com/samvera/hyrax/wiki/Using-Sidekiq-with-Hyrax).
 
 ## Create default administrative set

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

@@ -48,7 +48,7 @@ Hyrax = {
     // The Collection edit page
     collectionEditor: function() {
       var CollectionControls = require('hyrax/collections/editor');
-      var controls = new CollectionControls($('#collection_permissions'));
+      var controls = new CollectionControls($('#collection-edit-controls'));
     },
 
     // Collections v2 - collections related js should (over time) be moved here

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

@@ -1,3 +1,5 @@
+var autocompleteModule = require('hyrax/autocomplete');
+
 Blacklight.onLoad(function () {
 
   /**
@@ -182,18 +184,31 @@ Blacklight.onLoad(function () {
   $('[data-behavior="updates-collection"]').on('click', function() {
       var string_to_replace = "collection_replace_id",
         form = $(this).closest("form"),
-        collection_id = $(".collection-selector:checked")[0].value;
+        collection_id = $('#member_of_collection_ids')[0].value;
 
       form[0].action = form[0].action.replace(string_to_replace, collection_id);
       form.append('<input type="hidden" value="add" name="collection[members]"></input>');
   });
 
+  // Initializes the autocomplete element for the add to collection modal
+  $('#collection-list-container').on('show.bs.modal', function() {
+    var inputField = $('#member_of_collection_ids');
+    var autocomplete = new autocompleteModule();
+    autocomplete.setup(inputField, inputField.data('autocomplete'), inputField.data('autocompleteUrl'));
+  });
+
   // Display access deny for edit request.
   $('#documents').find('.edit-collection-deny-button').on('click', function (e) {
     e.preventDefault();
     $('#collections-to-edit-deny-modal').modal('show');
   });
 
+  // Display access deny for remove parent collection button.
+  $('#parent-collections-wrapper').find('.remove-parent-from-collection-deny-button').on('click', function (e) {
+    e.preventDefault();
+    $('#parent-collection-to-remove-deny-modal').modal('show');
+  });
+
   // Remove this parent collection list button clicked
   $('#parent-collections-wrapper')
     .find('.remove-from-collection-button')
@@ -266,18 +281,6 @@ Blacklight.onLoad(function () {
     }
   });
 
-  $('#show-more-parent-collections').on('click', function () {
-    $(this).hide();
-    $("#more-parent-collections").show();
-    $("#show-less-parent-collections").show();
-  });
-
-  $('#show-less-parent-collections').on('click', function () {
-    $(this).hide();
-    $("#more-parent-collections").hide();
-    $("#show-more-parent-collections").show();
-  });
-
   // Add to collection modal form post
   $('#add-to-collection-modal').find('.modal-add-button').on('click', function (e) {
     var $self = $(this),

data/app/assets/javascripts/hyrax/monkey_patch_turbolinks.js.coffee

@@ -9,3 +9,15 @@ if Turbolinks?
       else
         @failed = true
         @delegate.requestFailedWithStatusCode(@xhr.status, @xhr.responseText)
+
+  # Fixes a back/forward navigation problem with UV and turbolinks
+  # See https://github.com/samvera/hyrax/issues/2964
+  # This is based on https://github.com/turbolinks/turbolinks/issues/219#issuecomment-275838923
+  $(window).on 'popstate', (event) =>
+    @turbolinks_location = Turbolinks.Location.wrap(window.location)
+    return if Turbolinks.controller.location.requestURL == @turbolinks_location.requestURL
+    return if event.state?.turbolinks
+    if @window_turbolinks = window.history.state?.turbolinks
+      Turbolinks.controller.historyPoppedToLocationWithRestorationIdentifier(@turbolinks_location, @window_turbolinks.restorationIdentifier)
+    else
+      Turbolinks.controller.historyPoppedToLocationWithRestorationIdentifier(@turbolinks_location, Turbolinks.uuid())

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

@@ -46,6 +46,10 @@ body.dashboard {
     margin-top: 0.5em;
   }
 
+  .count-display {
+    font-size: 1.1em;
+  }
+
   .tabs {
     margin-top: $tab-margin;
     position: relative;

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

@@ -73,9 +73,6 @@ module Hyrax
       end
 
       def edit
-        member_works
-        # this is used to populate the "add to a collection" action for the members
-        @user_collections = find_collections_for_form
         form
       end
 
@@ -129,7 +126,6 @@ module Hyrax
 
       def after_update_error
         form
-        query_collection_members
         respond_to do |format|
           format.html { render action: 'edit' }
           format.json { render json: @collection.errors, status: :unprocessable_entity }
@@ -153,11 +149,12 @@ module Hyrax
         end
       end
 
-      def after_destroy(id)
+      def after_destroy(_id)
+        # leaving id to avoid changing the method's parameters prior to release
         respond_to do |format|
           format.html do
             redirect_to my_collections_path,
-                        notice: t('hyrax.dashboard.my.action.collection_delete_success', id: id)
+                        notice: t('hyrax.dashboard.my.action.collection_delete_success')
           end
           format.json { head :no_content, location: my_collections_path }
         end
@@ -166,7 +163,7 @@ module Hyrax
       def after_destroy_error(id)
         respond_to do |format|
           format.html do
-            flash[:notice] = t('hyrax.dashboard.my.action.collection_delete_fail', id: id)
+            flash[:notice] = t('hyrax.dashboard.my.action.collection_delete_fail')
             render :edit, status: :unprocessable_entity
           end
           format.json { render json: { id: id }, status: :unprocessable_entity, location: dashboard_collection_path(@collection) }

data/app/controllers/hyrax/my_controller.rb

@@ -56,6 +56,7 @@ module Hyrax
         @empty_batch = batch.empty?
         @all_checked = (count_on_page == @document_list.count)
         @add_works_to_collection = params.fetch(:add_works_to_collection, '')
+        @add_works_to_collection_label = params.fetch(:add_works_to_collection_label, '')
       end
 
       def query_solr

data/app/helpers/hyrax/collections_helper.rb

@@ -20,6 +20,15 @@ module Hyrax
       content_tag :span, safe_join([t('hyrax.collection.is_part_of'), ': '] + 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
+    def append_collection_type_url(url, collection_type_id)
+      uri = URI.parse(url)
+      uri.query = [uri.query, "collection_type_id=#{collection_type_id}"].compact.join('&')
+      uri.to_s
+    end
+
     # @return [Boolean]
     def has_collection_search_parameters?
       params[:cq].present?

data/app/models/sipity/workflow.rb

@@ -39,20 +39,19 @@ module Sipity
     # Within the given permission_template scope:
     #   * Activate the specified workflow_id or workflow_name
     #   * Deactivate the other workflows
-    #
-    # TODO: Resolve https://github.com/samvera/hyrax/issues/2151 as the documentation is aspirational and not reality
-    #
     # @param permission_template [Hyrax::PermissionTemplate] The scope for activation of the workflow id
     # @param workflow_id [Integer] The workflow_id within the given permission_template that should be activated
     # @param workflow_name [String] The name of the workflow within the given permission template that should be activated
-    # @return [TrueClass]
+    # @return [Sipity::Workflow] active workflow
     # @raise [ActiveRecord::RecordNotFound] When we have a mismatch on permission template and workflow id or workflow name
     # @raise [RuntimeError] When you don't specify a workflow_id or workflow_name
     def self.activate!(permission_template:, workflow_id: nil, workflow_name: nil)
       raise "You must specify a workflow_id or workflow_name to activate!" if workflow_id.blank? && workflow_name.blank?
-      finder_attributes = { permission_template: permission_template, id: workflow_id, name: workflow_name }.compact
-      Sipity::Workflow.find_by!(finder_attributes).tap do |workflow|
-        Sipity::Workflow.where(permission_template: permission_template, active: true).update(active: nil)
+      workflow_to_activate = Sipity::Workflow.find_by!({ permission_template: permission_template, id: workflow_id, name: workflow_name }.compact)
+      active_workflow = Sipity::Workflow.where(permission_template: permission_template, active: true)
+      return workflow_to_activate if workflow_to_activate == active_workflow.first
+      workflow_to_activate.tap do |workflow|
+        active_workflow.update(active: nil)
         workflow.update!(active: true)
       end
     end

data/app/presenters/hyrax/work_show_presenter.rb

@@ -57,7 +57,10 @@ module Hyrax
 
     # @return [Boolean] render the UniversalViewer
     def universal_viewer?
-      Hyrax.config.iiif_image_server? &&
+      representative_id.present? &&
+        representative_presenter.present? &&
+        representative_presenter.image? &&
+        Hyrax.config.iiif_image_server? &&
         members_include_viewable_image?
     end
 

data/app/services/hyrax/adapters/nesting_index_adapter.rb

@@ -133,6 +133,7 @@ module Hyrax
       def self.find_solr_document_by(id:)
         query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([id])
         document = ActiveFedora::SolrService.query(query, rows: 1).first
+        document = ActiveFedora::Base.find(id).to_solr if document.nil?
         raise "Unable to find SolrDocument with ID=#{id}" if document.nil?
         document
       end

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

@@ -40,7 +40,7 @@ module Hyrax
         require_membership: false,
         assigns_workflow: false,
         assigns_visibility: false,
-        badge_color: "#663333",
+        badge_color: "#705070",
         participants: [{ agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: ::Ability.admin_group_name, access: Hyrax::CollectionTypeParticipant::MANAGE_ACCESS },
                        { agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: ::Ability.registered_group_name, access: Hyrax::CollectionTypeParticipant::CREATE_ACCESS }]
       }.freeze
@@ -58,7 +58,7 @@ module Hyrax
         require_membership: true,
         assigns_workflow: true,
         assigns_visibility: true,
-        badge_color: "#663333",
+        badge_color: "#405060",
         participants: [{ agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: ::Ability.admin_group_name, access: Hyrax::CollectionTypeParticipant::MANAGE_ACCESS },
                        { agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE, agent_id: ::Ability.admin_group_name, access: Hyrax::CollectionTypeParticipant::CREATE_ACCESS }]
       }.freeze

data/app/services/hyrax/file_set_fixity_check_service.rb

@@ -78,7 +78,7 @@ module Hyrax
       def fixity_check_file(file)
         versions = file.has_versions? ? file.versions.all : [file]
 
-        versions = [versions.max_by(&:created)] if latest_version_only
+        versions = [versions.max_by(&:created)] if file.has_versions? && latest_version_only
 
         versions.collect { |v| fixity_check_file_version(file.id, v.uri.to_s) }.flatten
       end

data/app/views/hyrax/dashboard/collections/_form.html.erb

@@ -1,4 +1,4 @@
-<div class="panel panel-default tabs">
+<div class="panel panel-default tabs" id="collection-edit-controls">
   <ul class="nav nav-tabs" role="tablist">
     <li class="active">
       <a href="#description" role="tab" data-toggle="tab"><%= t('.tabs.description') %></a>

data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb

@@ -13,12 +13,17 @@
               <fieldset>
                 <legend><%= t("hyrax.collection.select_form.select_heading") %></legend>
               <ul>
-                <% user_collections.sort { |c1,c2| c2[CatalogController.uploaded_field] <=> c1[CatalogController.uploaded_field] }.each_with_index do |collection,index| %>
-                  <li>
-                    <% selected = (collection.id == @add_works_to_collection) || (@add_works_to_collection.blank? && index == 0) %>
-                    <%= radio_button_tag(:id, collection.id, selected, class: "collection-selector") %>
-                    <%= label_tag(:collection, collection.title_or_label, for: "id_#{collection.id}") %>
-                  </li>
+                <% if @add_works_to_collection.present? %>
+                  <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, disabled: true %>
+                  <%= hidden_field_tag 'member_of_collection_ids', @add_works_to_collection %>
+                <% else %>
+                  <%= text_field_tag 'member_of_collection_ids', nil,
+                              prompt: :translate,
+                              data: {
+                                placeholder: t('simple_form.placeholders.defaults.member_of_collection_ids'),
+                                autocomplete: 'collection',
+                                'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/collections?access=deposit'
+                              } %>
                 <% end %>
               </ul>
               </fieldset>

data/app/views/hyrax/dashboard/collections/_modal_parent_collection_remove_deny.html.erb

@@ -0,0 +1,14 @@
+<div class="modal fade" id="parent-collection-to-remove-deny-modal" tabindex="-1" role="dialog" aria-labelledby="remove-parent-collection-label">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <form class="delete-collection-form">
+        <div class="modal-body">
+          <p><%= t('hyrax.dashboard.collections.form_relationships.modals.remove_parent_collection_deny') %></p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" data-dismiss="modal"><%= t('helpers.action.close') %></button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>

data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb

@@ -16,7 +16,7 @@
     </div>
     <div>
       <%= link_to t('hyrax.collection.actions.add_existing_works.label'),
-                  hyrax.my_works_path(add_works_to_collection: presenter.id),
+                  hyrax.my_works_path(add_works_to_collection: presenter.id, add_works_to_collection_label: presenter.title),
                   title: t('hyrax.collection.actions.add_existing_works.desc'),
                   class: 'btn btn-link side-arrows',
                   data: { turbolinks: false } %>

data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb

@@ -6,6 +6,16 @@
     <div class="collections-list-title">
       <%= link_to document, [hyrax, :dashboard, document], id: "src_copy_link_#{document.id}" %>
     </div>
-    <button class="btn btn-xs btn-danger remove-from-collection-button" <%= "disabled" unless can? :edit, document.id %>><%= t('hyrax.collections.show.buttons.remove_from_collection') %></button>
+    <% if can? :edit, id %>
+      <% if can? :edit, document.id %>
+        <button class="btn btn-xs btn-danger remove-from-collection-button"><%= t('hyrax.collections.show.buttons.remove_from_collection') %></button>
+      <% else %>
+        <%= link_to "#",
+                    class: 'btn btn-xs btn-danger remove-parent-from-collection-deny-button',
+                    title: t('hyrax.collections.show.buttons.remove_from_collection') do %>
+            <%= t('hyrax.collections.show.buttons.remove_from_collection') %>
+        <% end %>
+      <% end %>
+    <% end %>
   </div>
 </li>

data/app/views/hyrax/dashboard/collections/show.html.erb

@@ -96,6 +96,7 @@
 <% if @presenter.collection_type_is_nestable? && !has_collection_search_parameters? %>
   <%= render 'hyrax/my/collections/modal_add_to_collection', source: 'show' %>
   <%= render 'hyrax/my/collections/modal_add_subcollection', id: @presenter.id, source: 'show' %>
+  <%= render 'hyrax/dashboard/collections/modal_parent_collection_remove_deny', source: 'show' %>
 <% end %>
 
 <% unless has_collection_search_parameters? %>