hyrax 3.1.0 → 3.2.0

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/lib/tasks/default_admin_set.rake

@@ -3,24 +3,25 @@ namespace :hyrax do
   namespace :default_admin_set do
     desc "Create the Default Admin Set"
     task create: :environment do
-      id = AdminSet.find_or_create_default_admin_set_id
-      # I have found that when I come back to a development
-      # environment, that I may have an AdminSet in Fedora, but it is
-      # not indexed in Solr.  This remediates that situation by
-      # ensuring we have an indexed AdminSet
-      AdminSet.find(id).update_index
-      if Hyrax::PermissionTemplate.find_by(source_id: id)
+      id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
+      if Hyrax::PermissionTemplate.find_by(source_id: id.to_s)
         puts "Successfully created default admin set"
       else
         warn "ERROR: Default admin set exists but it does not have an " \
           "associated permission template.\n\nThis may happen if you cleared your " \
-          "database but you did not clear out Fedora and Solr.\n\n" \
+          "database but you did not clear out metadata datasource (e.g. Fedora, Postgres) " \
+          "and Solr.\n\n" \
           "You could manually create the permission template in the rails console" \
           " (non-destructive):\n\n" \
-          "    Hyrax::PermissionTemplate.create!(source_id: AdminSet::DEFAULT_ID)\n\n" \
-          "OR you could start fresh by clearing Fedora and Solr (destructive):\n\n" \
+          "    Hyrax::PermissionTemplate.create!(source_id: Hyrax::AdminSetCreateService::DEFAULT_ID)\n\n" \
+          "OR you could start fresh by clearing the metadata datasource and Solr (destructive):\n\n" \
+          "  For ActiveFedora or Wings Valkryie adapter (default), use...\n" \
           "    require 'active_fedora/cleaner'\n" \
-          "    ActiveFedora::Cleaner.clean!\n\n"
+          "    ActiveFedora::Cleaner.clean!\n\n" \
+          "  For Valkyrie, use...\n" \
+          "    conn = Hyrax.index_adapter.connection\n" \
+          "    conn.delete_by_query('*:*', params: { 'softCommit' => true })\n" \
+          "    Hyrax.persister.wipe!\n"
       end
     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.1.0'
+gem 'hyrax', '3.2.0'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -774,22 +774,22 @@ dependencies:
   name: valkyrie
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -1715,6 +1715,7 @@ files:
 - app/forms/hyrax/forms/admin/collection_type_form.rb
 - app/forms/hyrax/forms/admin/collection_type_participant_form.rb
 - app/forms/hyrax/forms/admin_set_form.rb
+- app/forms/hyrax/forms/administrative_set_form.rb
 - app/forms/hyrax/forms/batch_edit_form.rb
 - app/forms/hyrax/forms/batch_upload_form.rb
 - app/forms/hyrax/forms/collection_form.rb
@@ -1723,6 +1724,7 @@ files:
 - app/forms/hyrax/forms/file_manager_form.rb
 - app/forms/hyrax/forms/file_set_edit_form.rb
 - app/forms/hyrax/forms/file_set_form.rb
+- app/forms/hyrax/forms/pcdm_collection_form.rb
 - app/forms/hyrax/forms/permission.rb
 - app/forms/hyrax/forms/permission_template_form.rb
 - app/forms/hyrax/forms/resource_form.rb
@@ -2608,6 +2610,7 @@ files:
 - app/views/shared/_footer.html.erb
 - app/views/shared/_locale_picker.html.erb
 - app/views/shared/_nav_safety_modal.html.erb
+- app/views/shared/_read_only.html.erb
 - app/views/shared/_select_work_type_modal.html.erb
 - artifacts/entity-relationship-diagram.dot
 - artifacts/entity-relationship-diagram.pdf
@@ -2863,6 +2866,8 @@ files:
 - lib/hyrax/specs/spy_listener.rb
 - lib/hyrax/transactions.rb
 - lib/hyrax/transactions/apply_change_set.rb
+- lib/hyrax/transactions/collection_create.rb
+- lib/hyrax/transactions/collection_update.rb
 - lib/hyrax/transactions/container.rb
 - lib/hyrax/transactions/create_work.rb
 - lib/hyrax/transactions/destroy_work.rb
@@ -2871,6 +2876,7 @@ files:
 - lib/hyrax/transactions/steps/add_to_collections.rb
 - lib/hyrax/transactions/steps/add_to_parent.rb
 - lib/hyrax/transactions/steps/apply_collection_permission_template.rb
+- lib/hyrax/transactions/steps/apply_collection_type_permissions.rb
 - lib/hyrax/transactions/steps/apply_permission_template.rb
 - lib/hyrax/transactions/steps/apply_visibility.rb
 - lib/hyrax/transactions/steps/delete_resource.rb
@@ -2881,6 +2887,7 @@ files:
 - lib/hyrax/transactions/steps/save.rb
 - lib/hyrax/transactions/steps/save_access_control.rb
 - lib/hyrax/transactions/steps/save_work.rb
+- lib/hyrax/transactions/steps/set_collection_type_gid.rb
 - lib/hyrax/transactions/steps/set_default_admin_set.rb
 - lib/hyrax/transactions/steps/set_modified_date.rb
 - lib/hyrax/transactions/steps/set_uploaded_date_unless_present.rb
@@ -2978,7 +2985,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user