hyrax 3.4.2 → 4.0.0.beta2

data/lib/hyrax/errors.rb

@@ -15,4 +15,6 @@ module Hyrax
   class SingleMembershipError < HyraxError; end
 
   class ObjectNotFoundError < ActiveFedora::ObjectNotFoundError; end
+
+  class ModelMismatchError < HyraxError; end
 end

data/lib/hyrax/search_state.rb

@@ -9,5 +9,14 @@ module Hyrax
       return [hyrax, doc] if doc.collection?
       [main_app, doc]
     end
+
+    # The SPARQL gem stomps on the Rails definition of deep_dup and gives us a Hash instead of
+    # a HashWithIndifferentAccess. This is an ugly workaround to get the right contract with
+    # the upstream class.
+    # https://github.com/ruby-rdf/sparql/blob/develop/lib/sparql/algebra/extensions.rb#L238-L244
+    def to_hash
+      super.with_indifferent_access
+    end
+    alias to_h to_hash
   end
 end

data/lib/hyrax/specs/capybara.rb

@@ -17,16 +17,18 @@ require 'capybara-screenshot/rspec'
 require 'selenium-webdriver'
 require 'webdrivers' unless ENV['IN_DOCKER'].present? || ENV['HUB_URL'].present?
 
+Capybara.save_path = ENV['CI'] ? "/tmp/test-results" : Rails.root.join('tmp', 'capybara')
+
 if ENV['IN_DOCKER'].present? || ENV['HUB_URL'].present?
   args = %w[disable-gpu no-sandbox whitelisted-ips window-size=1400,1400]
   args.push('headless') if ActiveModel::Type::Boolean.new.cast(ENV['CHROME_HEADLESS_MODE'])
 
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome("goog:chromeOptions" => { args: args })
+  options = Selenium::WebDriver::Options.chrome("goog:chromeOptions" => { args: args })
 
   Capybara.register_driver :selenium_chrome_headless_sandboxless do |app|
     driver = Capybara::Selenium::Driver.new(app,
                                        browser: :remote,
-                                       desired_capabilities: capabilities,
+                                       capabilities: options,
                                        url: ENV['HUB_URL'])
 
     # Fix for capybara vs remote files. Selenium handles this for us
@@ -67,8 +69,8 @@ Capybara::Screenshot.register_driver(:selenium_chrome_headless_sandboxless) do |
   driver.browser.save_screenshot(path)
 end
 
-Capybara::Screenshot.autosave_on_failure = false
-Capybara::Screenshot.prune_strategy = { keep: 10 }
+Capybara::Screenshot.autosave_on_failure = true
+Capybara::Screenshot.prune_strategy = :keep_last_run
 
 # Save CircleCI artifacts
 
@@ -79,7 +81,7 @@ def save_timestamped_page_and_screenshot(page, meta)
   time_now = Time.zone.now
   timestamp = "#{time_now.strftime('%Y-%m-%d-%H-%M-%S.')}#{'%03d' % (time_now.usec / 1000).to_i}"
 
-  artifact_dir = ENV['CI'] ? "/tmp/test-results" : Rails.root.join('tmp', 'capybara')
+  artifact_dir = Capybara.save_path
 
   screenshot_name = "screenshot-#{filename}-#{line_number}-#{timestamp}.png"
   screenshot_path = "#{artifact_dir}/#{screenshot_name}"

data/lib/hyrax/specs/shared_specs/factories/strategies/json_strategy.rb

@@ -10,4 +10,8 @@ class JsonStrategy
   def result(evaluation)
     @strategy.result(evaluation).to_json
   end
+
+  def to_sym
+    :json
+  end
 end

data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb

@@ -3,6 +3,12 @@
 # @example
 #   let(:resource) { FactoryBot.valkyrie_create(:hyrax_work) }
 class ValkyrieCreateStrategy
+  def initialize
+    @strategy = FactoryBot.strategy_by_name(:create).new
+  end
+
+  delegate :association, to: :@strategy
+
   def result(evaluation)
     evaluation.notify(:after_build, evaluation.object)
     evaluation.notify(:before_create, evaluation.object)
@@ -13,6 +19,10 @@ class ValkyrieCreateStrategy
     result
   end
 
+  def to_sym
+    :valkyrie_create
+  end
+
   private
 
   def persister

data/lib/hyrax/specs/shared_specs/indexers.rb

@@ -266,6 +266,11 @@ RSpec.shared_examples 'a Collection indexer' do
         .to include(generic_type_sim: a_collection_containing_exactly('Collection'))
     end
 
+    it 'indexes member_of_collection_ids' do
+      expect(indexer.to_solr)
+        .to include(member_of_collection_ids_ssim: resource.member_of_collection_ids)
+    end
+
     it 'indexes depositor' do
       expect(indexer.to_solr)
         .to include(depositor_ssim: [resource.depositor],

data/lib/hyrax/transactions/container.rb

@@ -52,17 +52,6 @@ module Hyrax
       require 'hyrax/transactions/steps/update_work_members'
       require 'hyrax/transactions/steps/validate'
 
-      # The following transactions and steps are deprecated.
-      require 'hyrax/transactions/create_work'
-      require 'hyrax/transactions/destroy_work'
-      require 'hyrax/transactions/update_work'
-      require 'hyrax/transactions/steps/apply_collection_permission_template'
-      require 'hyrax/transactions/steps/apply_permission_template'
-      require 'hyrax/transactions/steps/apply_visibility'
-      require 'hyrax/transactions/steps/destroy_work'
-      require 'hyrax/transactions/steps/ensure_permission_template'
-      require 'hyrax/transactions/steps/save_work'
-
       extend Dry::Container::Mixin
 
       # Disable BlockLength rule for DSL code
@@ -240,49 +229,6 @@ module Hyrax
           Steps::UpdateWorkMembers.new
         end
       end
-
-      # legacy AF works processing by transactions is deprecated
-      namespace 'work' do |ops|
-        ops.register 'apply_collection_permission_template' do
-          Steps::ApplyCollectionPermissionTemplate.new
-        end
-
-        ops.register 'apply_permission_template' do
-          Steps::ApplyPermissionTemplate.new
-        end
-
-        ops.register 'apply_visibility' do
-          Steps::ApplyVisibility.new
-        end
-
-        ops.register 'destroy_work' do
-          Steps::DestroyWork.new
-        end
-
-        ops.register 'ensure_admin_set' do
-          Steps::EnsureAdminSet.new
-        end
-
-        ops.register 'ensure_permission_template' do
-          Steps::EnsurePermissionTemplate.new
-        end
-
-        ops.register 'save_work' do
-          Steps::SaveWork.new
-        end
-
-        ops.register 'set_default_admin_set' do
-          Steps::SetDefaultAdminSet.new
-        end
-
-        ops.register 'set_modified_date' do
-          Steps::SetModifiedDate.new
-        end
-
-        ops.register 'set_uploaded_date_unless_present' do
-          Steps::SetUploadedDateUnlessPresent.new
-        end
-      end
       # rubocop:enable Metrics/BlockLength
     end
   end

data/lib/hyrax/transactions/steps/remove_file_set_from_work.rb

@@ -32,15 +32,41 @@ module Hyrax
         # @return [Dry::Monads::Result]
         def call(file_set, user: nil)
           return Failure('No user provided.') if user.nil?
-
-          @query_service.find_parents(resource: file_set).each do |parent|
+          find_parents(resource: file_set).each do |parent|
             parent.member_ids -= [file_set.id]
+            unlink_file_set(parent: parent, file_set: file_set)
             saved = @persister.save(resource: parent)
             Hyrax.publisher.publish('object.metadata.updated', object: saved, user: user)
           end
-
           Success(file_set)
         end
+
+        private
+
+        def find_parents(resource:)
+          @query_service.find_parents(resource: resource)
+        end
+
+        def unlink_file_set(parent:, file_set:)
+          fid = file_set.id
+          unlink_thumbnail_id(fid: fid, parent: parent)
+          unlink_representative_id(fid: fid, parent: parent)
+          unlink_rendering_ids(fid: fid, parent: parent)
+        end
+
+        def unlink_rendering_ids(fid:, parent:)
+          parent.rendering_ids -= [fid] if parent.respond_to?(:rendering_ids) && parent.rendering_ids.present?
+        end
+
+        def unlink_representative_id(fid:, parent:)
+          parent.representative_id = nil if parent.representative_id == fid
+        end
+
+        def unlink_thumbnail_id(fid:, parent:)
+          return unless parent.thumbnail_id == fid
+          parent.thumbnail = nil if parent.respond_to? :thumbnail
+          parent.thumbnail_id = nil
+        end
       end
     end
   end

data/lib/hyrax/transactions/steps/save_access_control.rb

@@ -16,13 +16,29 @@ module Hyrax
         # @param [Valkyrie::Resource] obj
         #
         # @return [Dry::Monads::Result]
-        def call(obj)
+        def call(obj, permissions_params: [])
           return Success(obj) unless obj.respond_to?(:permission_manager)
+
           acl = obj.permission_manager&.acl
+          # Translate step args into Hyrax::Permission objects before saving
+          Array(permissions_params).each do |param|
+            permission = param_to_permission(obj, param)
+            acl << permission if permission
+          end
+
           acl&.save || (return Failure[:failed_to_save_acl, acl])
 
           Success(obj)
         end
+
+        private
+
+        def param_to_permission(obj, param)
+          return nil unless param["access"] && param["type"] && param["name"]
+          mode = param["access"].to_sym
+          agent = param["type"] == "group" ? "group/#{param['name']}" : param["name"]
+          Hyrax::Permission.new(access_to: obj.id, mode: mode, agent: agent)
+        end
       end
     end
   end

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '3.4.2'
+  VERSION = '4.0.0.beta2'
 end

data/lib/hyrax.rb

@@ -80,7 +80,7 @@ module Hyrax
   ##
   # @return [Logger]
   def self.logger
-    @logger ||= Valkyrie.logger
+    config.logger
   end
 
   def self.primary_work_type

data/lib/tasks/migrate.rake

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 namespace :hyrax do
   namespace :migrate do
+    desc 'Move all works to default AdminSet'
     task move_all_works_to_admin_set: :environment do
       require 'hyrax/move_all_works_to_admin_set'
       MoveAllWorksToAdminSet.run(AdminSet.find(AdminSet::DEFAULT_ID))
     end
 
+    desc 'Add the MANAGING role to legacy works'
     task add_admin_group_to_admin_sets: :environment do
       # Force creation of registered MANAGING role if it doesn't exist
       # This code must be invoked before calling `Sipity::Role.all` or the managing role won't be there
@@ -28,6 +30,7 @@ namespace :hyrax do
       end
     end
 
+    desc 'Set collection type and permissions for legacy (<2.1.0) Hyrax collections'
     task add_collection_type_and_permissions_to_collections: :environment do
       # Run collection migration which sets the collection_type of legacy collections to User Collection and adds
       # a permission template assigning users/groups with edit_access to the Manager role and users/groups with
@@ -37,7 +40,8 @@ namespace :hyrax do
     end
 
     # Migrate any orphan fedora data from the first to the second predicate
-    task migrate_keyword_predicate: :environment do
+    desc 'Migrate keywords and license predicates for Hyrax 2.x --> 3.x'
+    task migrate_keyword_and_license_predicate: :environment do
       Hyrax::Works::MigrationService.migrate_predicate(::RDF::Vocab::DC11.relation, ::RDF::Vocab::SCHEMA.keywords)
       Hyrax::Works::MigrationService.migrate_predicate(::RDF::Vocab::DC.rights, ::RDF::Vocab::DC.license)
     end

data/lib/valkyrie/indexing/solr/indexing_adapter.rb

@@ -79,7 +79,7 @@ module Valkyrie
                    end
 
           # if any configuration is missing, derive it from Blacklight
-          config = blacklight_based_config.merge(config)
+          config = blacklight_based_config.with_indifferent_access.merge(config)
 
           "http://#{config['host']}:#{config['port']}/solr/#{config['core']}"
         end

data/lib/wings/valkyrie/persister.rb

@@ -74,7 +74,8 @@ module Wings
 
         def initialize(msg = nil, obj:)
           self.obj = obj
-          msg = "Failed to save object {obj}.\n" + msg
+
+          msg = "Failed to save object #{obj}.\n" + msg
           super(msg)
         end
       end

data/lib/wings/valkyrie/storage.rb

@@ -73,7 +73,7 @@ module Wings
             version_graph.query([uri, RDF::Vocab::Fcrepo4.created, :created])
                          .first_object
                          .object
-          Version.new(cast_to_valkyrie_id(uri.to_s), timestamp, self)
+          Version.new(id: cast_to_valkyrie_id(uri.to_s), created: timestamp, adapter: self)
         end.sort
       end
 
@@ -86,7 +86,7 @@ module Wings
       # this implementation uses an orderable {#version_token}. in practice
       # the token is the fcrepo created date for the version, as extracted from
       # the versions graph.
-      Version = Struct.new(:id, :version_token, :adapter) do
+      Version = Struct.new("Version", :id, :created, :adapter, keyword_init: true) do
         include Comparable
 
         ##
@@ -95,6 +95,10 @@ module Wings
           adapter.find_by(id: id)
         end
 
+        def version_token
+          created
+        end
+
         def <=>(other)
           raise ArgumentError unless other.respond_to?(:version_token)
           version_token <=> other.version_token

data/package.json

@@ -0,0 +1,11 @@
+{
+  "devDependencies": {
+    "dotenv": "^16.0.1",
+    "jasmine-core": "^3.99",
+    "karma": "^6.3.20",
+    "karma-chrome-launcher": "^3.1.1",
+    "karma-coffee-preprocessor": "^1.0.1",
+    "karma-jasmine": "^4.0.2",
+    "karma-spec-reporter": "^0.0.34"
+  }
+}

data/tasks/benchmark.rake

@@ -51,6 +51,6 @@ namespace :wings do
 
   def setup_logger
     $VERBOSE = nil unless ENV['RUBY_LOUD']
-    Rails.logger.level = ENV.fetch('BM_LOG_LEVEL', :error)
+    Hyrax.logger.level = ENV.fetch('BM_LOG_LEVEL', :error)
   end
 end

data/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '3.4.2'
+gem 'hyrax', '4.0.0.beta2'
 run 'bundle install'
 generate 'hyrax:install', '-f'

data/vendor/assets/javascripts/dataTables.bootstrap4.js

@@ -0,0 +1,184 @@
+/*! DataTables Bootstrap 4 integration
+ * ©2011-2017 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * DataTables integration for Bootstrap 4. This requires Bootstrap 4 and
+ * DataTables 1.10 or newer.
+ *
+ * This file sets the defaults and adds options to DataTables to style its
+ * controls using Bootstrap. See http://datatables.net/manual/styling/bootstrap
+ * for further information.
+ */
+(function( factory ){
+	if ( typeof define === 'function' && define.amd ) {
+		// AMD
+		define( ['jquery', 'datatables.net'], function ( $ ) {
+			return factory( $, window, document );
+		} );
+	}
+	else if ( typeof exports === 'object' ) {
+		// CommonJS
+		module.exports = function (root, $) {
+			if ( ! root ) {
+				root = window;
+			}
+
+			if ( ! $ || ! $.fn.dataTable ) {
+				// Require DataTables, which attaches to jQuery, including
+				// jQuery if needed and have a $ property so we can access the
+				// jQuery object that is used
+				$ = require('datatables.net')(root, $).$;
+			}
+
+			return factory( $, root, root.document );
+		};
+	}
+	else {
+		// Browser
+		factory( jQuery, window, document );
+	}
+}(function( $, window, document, undefined ) {
+'use strict';
+var DataTable = $.fn.dataTable;
+
+
+/* Set the defaults for DataTables initialisation */
+$.extend( true, DataTable.defaults, {
+	dom:
+		"<'row'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" +
+		"<'row'<'col-sm-12'tr>>" +
+		"<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
+	renderer: 'bootstrap'
+} );
+
+
+/* Default class modification */
+$.extend( DataTable.ext.classes, {
+	sWrapper:      "dataTables_wrapper dt-bootstrap4",
+	sFilterInput:  "form-control form-control-sm",
+	sLengthSelect: "custom-select custom-select-sm form-control form-control-sm",
+	sProcessing:   "dataTables_processing card",
+	sPageButton:   "paginate_button page-item"
+} );
+
+
+/* Bootstrap paging button renderer */
+DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, buttons, page, pages ) {
+	var api     = new DataTable.Api( settings );
+	var classes = settings.oClasses;
+	var lang    = settings.oLanguage.oPaginate;
+	var aria = settings.oLanguage.oAria.paginate || {};
+	var btnDisplay, btnClass, counter=0;
+
+	var attach = function( container, buttons ) {
+		var i, ien, node, button;
+		var clickHandler = function ( e ) {
+			e.preventDefault();
+			if ( !$(e.currentTarget).hasClass('disabled') && api.page() != e.data.action ) {
+				api.page( e.data.action ).draw( 'page' );
+			}
+		};
+
+		for ( i=0, ien=buttons.length ; i<ien ; i++ ) {
+			button = buttons[i];
+
+			if ( Array.isArray( button ) ) {
+				attach( container, button );
+			}
+			else {
+				btnDisplay = '';
+				btnClass = '';
+
+				switch ( button ) {
+					case 'ellipsis':
+						btnDisplay = '&#x2026;';
+						btnClass = 'disabled';
+						break;
+
+					case 'first':
+						btnDisplay = lang.sFirst;
+						btnClass = button + (page > 0 ?
+							'' : ' disabled');
+						break;
+
+					case 'previous':
+						btnDisplay = lang.sPrevious;
+						btnClass = button + (page > 0 ?
+							'' : ' disabled');
+						break;
+
+					case 'next':
+						btnDisplay = lang.sNext;
+						btnClass = button + (page < pages-1 ?
+							'' : ' disabled');
+						break;
+
+					case 'last':
+						btnDisplay = lang.sLast;
+						btnClass = button + (page < pages-1 ?
+							'' : ' disabled');
+						break;
+
+					default:
+						btnDisplay = button + 1;
+						btnClass = page === button ?
+							'active' : '';
+						break;
+				}
+
+				if ( btnDisplay ) {
+					node = $('<li>', {
+							'class': classes.sPageButton+' '+btnClass,
+							'id': idx === 0 && typeof button === 'string' ?
+								settings.sTableId +'_'+ button :
+								null
+						} )
+						.append( $('<a>', {
+								'href': '#',
+								'aria-controls': settings.sTableId,
+								'aria-label': aria[ button ],
+								'data-dt-idx': counter,
+								'tabindex': settings.iTabIndex,
+								'class': 'page-link'
+							} )
+							.html( btnDisplay )
+						)
+						.appendTo( container );
+
+					settings.oApi._fnBindAction(
+						node, {action: button}, clickHandler
+					);
+
+					counter++;
+				}
+			}
+		}
+	};
+
+	// IE9 throws an 'unknown error' if document.activeElement is used
+	// inside an iframe or frame. 
+	var activeEl;
+
+	try {
+		// Because this approach is destroying and recreating the paging
+		// elements, focus is lost on the select button which is bad for
+		// accessibility. So we want to restore focus once the draw has
+		// completed
+		activeEl = $(host).find(document.activeElement).data('dt-idx');
+	}
+	catch (e) {}
+
+	attach(
+		$(host).empty().html('<ul class="pagination"/>').children('ul'),
+		buttons
+	);
+
+	if ( activeEl !== undefined ) {
+		$(host).find( '[data-dt-idx='+activeEl+']' ).trigger('focus');
+	}
+};
+
+
+return DataTable;
+}));

data/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js

@@ -83,7 +83,7 @@
 
             // Callback to retrieve the list of files from the server response:
             getFilesFromResponse: function (data) {
-                if (data.result && $.isArray(data.result.files)) {
+                if (data.result && Array.isArray(data.result.files)) {
                     return data.result.files;
                 }
                 return [];

data/vendor/assets/javascripts/fileupload/jquery.fileupload.js

@@ -322,7 +322,7 @@
             if ($.type(options.formData) === 'function') {
                 return options.formData(options.form);
             }
-            if ($.isArray(options.formData)) {
+            if (Array.isArray(options.formData)) {
                 return options.formData;
             }
             if ($.type(options.formData) === 'object') {
@@ -562,7 +562,7 @@
                 if (!paramName.length) {
                     paramName = [fileInput.prop('name') || 'files[]'];
                 }
-            } else if (!$.isArray(paramName)) {
+            } else if (!Array.isArray(paramName)) {
                 paramName = [paramName];
             }
             return paramName;

data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js

@@ -74,7 +74,7 @@
                             '" name="iframe-transport-' + counter + '"></iframe>'
                     ).bind('load', function () {
                         var fileInputClones,
-                            paramNames = $.isArray(options.paramName) ?
+                            paramNames = Array.isArray(options.paramName) ?
                                     options.paramName : [options.paramName];
                         iframe
                             .unbind('load')