hyrax 2.0.3 → 2.1.0.beta1

data/spec/views/hyrax/my/works/index.html.erb_spec.rb

@@ -3,14 +3,16 @@ RSpec.describe 'hyrax/my/works/index.html.erb', type: :view do
     allow(view).to receive(:current_ability).and_return(ability)
     allow(view).to receive(:provide).and_yield
     allow(view).to receive(:provide).with(:page_title, String)
-    allow(view).to receive(:create_work_presenter).and_return(presenter)
+    assign(:create_work_presenter, presenter)
     allow(view).to receive(:can?).and_return(true)
     allow(Flipflop).to receive(:batch_upload?).and_return(batch_enabled)
+    stub_template 'shared/_select_work_type_modal.html.erb' => 'modal'
     stub_template 'hyrax/my/works/_tabs.html.erb' => 'tabs'
     stub_template 'hyrax/my/works/_search_header.html.erb' => 'search'
     stub_template 'hyrax/my/works/_document_list.html.erb' => 'list'
     stub_template 'hyrax/my/works/_results_pagination.html.erb' => 'pagination'
     stub_template 'hyrax/my/works/_scripts.js.erb' => 'batch edit stuff'
+    assign(:managed_works_count, 1)
     render
   end
 

data/spec/views/hyrax/users/_user_info.html.erb_spec.rb

@@ -1,27 +1,25 @@
 RSpec.describe 'hyrax/users/_user_info.html.erb', type: :view do
-  let(:user) { stub_model(User, user_key: 'jdoe42') }
+  let(:user) { stub_model(User, user_key: 'jdoe42', orcid: '000-000', zotero_userid: 'jdoe42zotero') }
+  let(:arkivo_api) { true }
 
-  context 'with Zotero disabled' do
-    before do
-      allow(Hyrax.config).to receive(:arkivo_api?) { false }
-      allow(user).to receive(:zotero_userid).and_raise(NoMethodError)
-      render "hyrax/users/user_info", user: user
-    end
+  before do
+    allow(Hyrax.config).to receive(:arkivo_api?).and_return(arkivo_api)
+    render "hyrax/users/user_info", user: user
+  end
 
-    it 'does not display a Zotero profile link' do
-      expect(rendered).not_to match(/Zotero Profile/)
-    end
+  it 'displays the orcid' do
+    expect(rendered).to have_link '000-000'
   end
 
-  context 'with Zotero enabled' do
-    before do
-      allow(Hyrax.config).to receive(:arkivo_api?) { true }
-      allow(user).to receive(:zotero_userid) { 'jdoe42zotero' }
-      render "hyrax/users/user_info", user: user
-    end
+  it 'displays a Zotero profile link' do
+    expect(rendered).to match(/Zotero Profile/)
+  end
+
+  context 'with Zotero disabled' do
+    let(:arkivo_api) { false }
 
-    it 'displays a Zotero profile link' do
-      expect(rendered).to match(/Zotero Profile/)
+    it 'does not display a Zotero profile link' do
+      expect(rendered).not_to match(/Zotero Profile/)
     end
   end
 end

data/spec/views/pages/show.html.erb_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe "hyrax/pages/show", type: :view do
-  let(:content_block) { FactoryBot.create(:content_block, name: 'terms_page') }
+  let(:content_block) { create(:content_block, name: 'terms_page') }
 
   before do
     assign(:page, content_block)

data/spec/views/shared/select_work_type_modal.html.erb_spec.rb

@@ -4,22 +4,48 @@ RSpec.describe 'shared/_select_work_type_modal.html.erb', type: :view do
     Hyrax::SelectTypePresenter.new(GenericWork)
   end
   let(:row2) do
-    Hyrax::SelectTypePresenter.new(RareBooks::Atlas)
+    Hyrax::SelectTypePresenter.new(NamespacedWorks::NestedWork)
   end
 
   before do
     allow(presenter).to receive(:each).and_yield(row1).and_yield(row2)
-    allow(view).to receive(:create_work_presenter).and_return(presenter)
     # Because there is no i18n set up for this work type
-    allow(row2).to receive(:name).and_return('Atlas')
-    render
+    allow(row2).to receive(:name).and_return('Nested Work')
   end
 
-  it 'draws the modal' do
-    expect(rendered).to have_selector '#worktypes-to-create.modal'
-    expect(rendered).to have_content 'Generic Work'
-    expect(rendered).to have_content 'Atlas'
-    expect(rendered).to have_selector 'input[type="radio"][data-single="/concern/generic_works/new"][data-batch="/batch_uploads/new?payload_concern=GenericWork"]'
-    expect(rendered).to have_selector 'input[type="radio"][data-single="/concern/rare_books/atlases/new"][data-batch="/batch_uploads/new?payload_concern=RareBooks%3A%3AAtlas"]'
+  context 'when no collections id' do
+    before do
+      render 'shared/select_work_type_modal', create_work_presenter: presenter
+    end
+
+    it 'draws the modal' do
+      expect(rendered).to have_selector '#worktypes-to-create.modal'
+      expect(rendered).to have_content 'Generic Work'
+      expect(rendered).to have_content 'Nested Work'
+      expect(rendered).to have_selector 'input[type="radio"][data-single="/concern/generic_works/new"][data-batch="/batch_uploads/new?payload_concern=GenericWork"]'
+      expect(rendered).to have_selector 'input[type="radio"][data-single="/concern/namespaced_works/nested_works/new"][data-batch="/batch_uploads/new?payload_concern=NamespacedWorks%3A%3ANestedWork"]'
+    end
+  end
+
+  context 'when collection id exists' do
+    before do
+      allow(view).to receive(:params).and_return(id: '1', controller: 'hyrax/dashboard/collections')
+      render 'shared/select_work_type_modal', create_work_presenter: presenter
+    end
+    it 'draws the modal with collection id' do
+      expect(rendered).to have_selector 'input[type="radio"][data-single="/concern/generic_works/new?add_works_to_collection=1"][data-batch="/batch_uploads/new?add_works_to_collection=1&payload_concern=GenericWork"]' # rubocop:disable Metrics/LineLength
+      expect(rendered).to have_selector 'input[type="radio"][data-single="/concern/namespaced_works/nested_works/new?add_works_to_collection=1"][data-batch="/batch_uploads/new?add_works_to_collection=1&payload_concern=NamespacedWorks%3A%3ANestedWork"]' # rubocop:disable Metrics/LineLength
+    end
+  end
+
+  context 'when add_works_to_collection exists' do
+    before do
+      allow(view).to receive(:params).and_return(add_works_to_collection: '1')
+      render 'shared/select_work_type_modal', create_work_presenter: presenter
+    end
+    it 'draws the modal with collection id' do
+      expect(rendered).to have_selector 'input[type="radio"][data-single="/concern/generic_works/new?add_works_to_collection=1"][data-batch="/batch_uploads/new?add_works_to_collection=1&payload_concern=GenericWork"]' # rubocop:disable Metrics/LineLength
+      expect(rendered).to have_selector 'input[type="radio"][data-single="/concern/namespaced_works/nested_works/new?add_works_to_collection=1"][data-batch="/batch_uploads/new?add_works_to_collection=1&payload_concern=NamespacedWorks%3A%3ANestedWork"]' # rubocop:disable Metrics/LineLength
+    end
   end
 end

data/tasks/hyrax_dev.rake

@@ -1,9 +1,6 @@
 require 'rspec/core/rake_task'
-require 'solr_wrapper'   # necessary for rake_support to work
-require 'fcrepo_wrapper' # necessary for rake_support to work
 require 'engine_cart/rake_task'
 require 'rubocop/rake_task'
-require 'active_fedora/rake_support'
 
 desc 'Run style checker'
 RuboCop::RakeTask.new(:rubocop) do |task|
@@ -14,6 +11,9 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc 'Spin up test servers and run specs'
 task :spec_with_app_load do
+  require 'solr_wrapper'   # necessary for rake_support to work
+  require 'fcrepo_wrapper' # necessary for rake_support to work
+  require 'active_fedora/rake_support'
   with_test_server do
     Rake::Task['spec'].invoke
   end
@@ -22,7 +22,9 @@ end
 desc "Sort locales keys in alphabetic order."
 task :i18n_sorter do
   require 'i18n_yaml_sorter'
-  locales = Dir.glob(File.expand_path('../../config/locales/**/*.yml', __FILE__))
+  locales = Dir.glob(File.expand_path('../../config/locales/**/*.yml', __FILE__)) +
+            Dir.glob(File.expand_path('../../lib/generators/hyrax/templates/config/locales/**/*.yml', __FILE__)) +
+            Dir.glob(File.expand_path('../../lib/generators/hyrax/work/templates//locale.*.yml.erb', __FILE__))
   locales.each do |locale_path|
     sorted_contents = File.open(locale_path) { |f| I18nYamlSorter::Sorter.new(f).sort }
     File.open(locale_path, 'w') { |f| f << sorted_contents }
@@ -30,6 +32,27 @@ task :i18n_sorter do
   end
 end
 
+if Gem.loaded_specs.key? 'engine_cart'
+  namespace :engine_cart do
+    # This generate task should only add its action to an existing engine_cart:generate task
+    raise 'engine_cart:generate task should already be defined' unless Rake::Task.task_defined?('engine_cart:generate')
+    task :generate do |_task|
+      puts 'Running post-generation operations...'
+      Rake::Task['engine_cart:after_generate'].invoke
+    end
+
+    desc 'Operations that need to run after the test_app migrations have run'
+    task :after_generate do
+      puts 'Creating default collection type...'
+      EngineCart.within_test_app do
+        unless system "bundle exec rake hyrax:default_collection_types:create"
+          raise "EngineCart failed on with: #{$?}"
+        end
+      end
+    end
+  end
+end
+
 desc 'Generate the engine_cart and spin up test servers and run specs'
 task ci: ['rubocop', 'engine_cart:generate'] do
   puts 'running continuous integration'

data/template.rb

@@ -1,4 +1,5 @@
-gem 'hyrax', '2.0.3'
+gem 'hyrax', '2.1.0.beta1'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'
+rails_command 'hyrax:default_collection_types:create'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0.beta1
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,371 +31,363 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: hydra-head
+  name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 11.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 11.5.2
 - !ruby/object:Gem::Dependency
-  name: hydra-editor
+  name: almond-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: hydra-works
+  name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: hydra-derivatives
+  name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '6.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '6.14'
 - !ruby/object:Gem::Dependency
-  name: browse-everything
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.5
-- !ruby/object:Gem::Dependency
-  name: blacklight
+  name: blacklight-gallery
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.9'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.9'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: blacklight-gallery
+  name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: tinymce-rails
+  name: browse-everything
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 0.10.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 0.10.5
 - !ruby/object:Gem::Dependency
-  name: font-awesome-rails
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: select2-rails
+  name: clipboard-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: nest
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: mailboxer
+  name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: flipflop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: oauth
+  name: flot-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
-  name: oauth2
+  name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: signet
+  name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: legato
+  name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: posix-spawn
+  name: hydra-head
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
+  name: hydra-works
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: iiif_manifest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: flot-rails
+  name: jquery-datatables-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: almond-rails
+  name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: qa
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: flipflop
+  name: kaminari_route_prefix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: jquery-datatables-rails
+  name: legato
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rdf-rdfxml
+  name: linkeddata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -409,171 +401,179 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: clipboard-rails
+  name: mailboxer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: nest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.99
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.99
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rails_autolink
+  name: noid-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: active_fedora-noid
+  name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_nested_set
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: breadcrumbs_on_rails
+  name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari_route_prefix
+  name: power_converter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: power_converter
+  name: pul_uv_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: qa
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: dry-struct
+  name: rdf-rdfxml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: redlock
   requirement: !ruby/object:Gem::Requirement
@@ -609,27 +609,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: active-fedora
+  name: samvera-nesting_indexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.5'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.5.2
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.5'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.5.2
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: linkeddata
+  name: select2-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: signet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -643,33 +657,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: engine_cart
+  name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.18.0
 - !ruby/object:Gem::Dependency
-  name: mida
+  name: capybara-maleficent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: chromedriver-helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -685,25 +733,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: solr_wrapper
+  name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -725,89 +795,101 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: jasmine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.99'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: jasmine-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.99'
 - !ruby/object:Gem::Dependency
-  name: rspec-activemodel-mocks
+  name: mida
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: capybara-maleficent
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -823,103 +905,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: i18n_yaml_sorter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jasmine
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.20.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.20.1
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: shoulda-callback-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -934,38 +1016,18 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n_yaml_sorter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<="
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<="
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
@@ -1012,7 +1074,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_fixme.yml"
 - ".scss-lint.yml"
-- ".solr_wrapper"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -1059,20 +1120,25 @@ files:
 - app/assets/javascripts/hyrax/admin/admin_set/registered_users.es6
 - app/assets/javascripts/hyrax/admin/admin_set/visibility.es6
 - app/assets/javascripts/hyrax/admin/admin_set_controls.es6
+- app/assets/javascripts/hyrax/admin/collection_type/participants.es6
+- app/assets/javascripts/hyrax/admin/collection_type/settings.es6
+- app/assets/javascripts/hyrax/admin/collection_type_controls.es6
 - app/assets/javascripts/hyrax/admin/graphs.es6
 - app/assets/javascripts/hyrax/app.js.erb
 - app/assets/javascripts/hyrax/authority_select.es6
 - app/assets/javascripts/hyrax/autocomplete.es6
 - app/assets/javascripts/hyrax/autocomplete/default.es6
 - app/assets/javascripts/hyrax/autocomplete/linked_data.es6
-- app/assets/javascripts/hyrax/autocomplete/work.es6
+- app/assets/javascripts/hyrax/autocomplete/resource.es6
 - app/assets/javascripts/hyrax/batch.js
 - app/assets/javascripts/hyrax/batch_edit.js
 - app/assets/javascripts/hyrax/batch_select.es6
 - app/assets/javascripts/hyrax/batch_select_all.js
 - app/assets/javascripts/hyrax/browse_everything.js
+- app/assets/javascripts/hyrax/collection_types.es6
 - app/assets/javascripts/hyrax/collections.js
 - app/assets/javascripts/hyrax/collections/editor.es6
+- app/assets/javascripts/hyrax/collections_forms.js
 - app/assets/javascripts/hyrax/config.js.erb
 - app/assets/javascripts/hyrax/content_blocks.js
 - app/assets/javascripts/hyrax/dashboard_actions.js
@@ -1091,7 +1157,6 @@ files:
 - app/assets/javascripts/hyrax/initialize.js
 - app/assets/javascripts/hyrax/monkey_patch_turbolinks.js.coffee
 - app/assets/javascripts/hyrax/notification.es6
-- app/assets/javascripts/hyrax/per_page.es6
 - app/assets/javascripts/hyrax/permissions.js
 - app/assets/javascripts/hyrax/permissions/control.es6
 - app/assets/javascripts/hyrax/permissions/grant.es6
@@ -1103,10 +1168,11 @@ files:
 - app/assets/javascripts/hyrax/permissions/user_controls.es6
 - app/assets/javascripts/hyrax/proxy_rights.js
 - app/assets/javascripts/hyrax/relationships.js
+- app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6
 - app/assets/javascripts/hyrax/relationships/control.es6
 - app/assets/javascripts/hyrax/relationships/registry.es6
 - app/assets/javascripts/hyrax/relationships/registry_entry.es6
-- app/assets/javascripts/hyrax/relationships/work.es6
+- app/assets/javascripts/hyrax/relationships/resource.es6
 - app/assets/javascripts/hyrax/save_work.es6
 - app/assets/javascripts/hyrax/save_work/checklist_item.es6
 - app/assets/javascripts/hyrax/save_work/deposit_agreement.es6
@@ -1115,22 +1181,26 @@ files:
 - app/assets/javascripts/hyrax/save_work/uploaded_files.es6
 - app/assets/javascripts/hyrax/save_work/visibility_component.es6
 - app/assets/javascripts/hyrax/search.js
+- app/assets/javascripts/hyrax/select_collection_type.es6
 - app/assets/javascripts/hyrax/select_submit.js
 - app/assets/javascripts/hyrax/select_work_type.es6
 - app/assets/javascripts/hyrax/single_use_links_manager.js
+- app/assets/javascripts/hyrax/sort_and_per_page.es6
 - app/assets/javascripts/hyrax/sorting.js
+- app/assets/javascripts/hyrax/tabbed_form.es6
 - app/assets/javascripts/hyrax/tabs.js
 - app/assets/javascripts/hyrax/thumbnail_select.es6
 - app/assets/javascripts/hyrax/trophy.js
 - app/assets/javascripts/hyrax/uploader.js
 - app/assets/javascripts/hyrax/user_search.js
-- app/assets/javascripts/hyrax/workflow_actions_affix.js
 - app/assets/stylesheets/_bootstrap-default-overrides.scss
 - app/assets/stylesheets/fileupload/jquery.fileupload-ui.scss
+- app/assets/stylesheets/hyrax/_accessibility.scss
 - app/assets/stylesheets/hyrax/_batch-edit.scss
 - app/assets/stylesheets/hyrax/_browse_everything_overrides.scss
 - app/assets/stylesheets/hyrax/_buttons.scss
 - app/assets/stylesheets/hyrax/_catalog.scss
+- app/assets/stylesheets/hyrax/_collection_types.scss
 - app/assets/stylesheets/hyrax/_collections.scss
 - app/assets/stylesheets/hyrax/_featured.scss
 - app/assets/stylesheets/hyrax/_file-listing.scss
@@ -1150,7 +1220,9 @@ files:
 - app/assets/stylesheets/hyrax/_nestable.scss
 - app/assets/stylesheets/hyrax/_positioning.scss
 - app/assets/stylesheets/hyrax/_proxy-rights.scss
+- app/assets/stylesheets/hyrax/_recent.scss
 - app/assets/stylesheets/hyrax/_representative-media.scss
+- app/assets/stylesheets/hyrax/_select_collection_type.scss
 - app/assets/stylesheets/hyrax/_select_work_type.scss
 - app/assets/stylesheets/hyrax/_settings.scss
 - app/assets/stylesheets/hyrax/_styles.scss
@@ -1158,16 +1230,18 @@ files:
 - app/assets/stylesheets/hyrax/_usage-stats.scss
 - app/assets/stylesheets/hyrax/_users.scss
 - app/assets/stylesheets/hyrax/_variables.scss
+- app/assets/stylesheets/hyrax/_viewer.scss
 - app/assets/stylesheets/hyrax/_work-show.scss
-- app/assets/stylesheets/hyrax/_work_editor.scss
 - app/assets/stylesheets/hyrax/blacklight_gallery.scss
 - app/assets/stylesheets/hyrax/controlled_vocabulary.scss
 - app/assets/stylesheets/hyrax/dashboard.scss
 - app/assets/stylesheets/hyrax/sidebar.scss
 - app/assets/stylesheets/typeahead.css
+- app/authorities/qa/authorities/collections.rb
 - app/authorities/qa/authorities/find_works.rb
 - app/builders/hyrax/bootstrap_breadcrumbs_builder.rb
 - app/builders/hyrax/form_builder.rb
+- app/builders/hyrax/manifest_helper.rb
 - app/channels/hyrax/application_cable/channel.rb
 - app/channels/hyrax/application_cable/connection.rb
 - app/channels/hyrax/notifications_channel.rb
@@ -1186,12 +1260,13 @@ files:
 - app/controllers/concerns/hyrax/embargoes_controller_behavior.rb
 - app/controllers/concerns/hyrax/leases_controller_behavior.rb
 - app/controllers/concerns/hyrax/manages_embargoes.rb
-- app/controllers/concerns/hyrax/parent_container.rb
 - app/controllers/concerns/hyrax/singular_subresource_controller.rb
 - app/controllers/concerns/hyrax/themed_layout_controller.rb
 - app/controllers/concerns/hyrax/works_controller_behavior.rb
 - app/controllers/hyrax/admin/admin_sets_controller.rb
 - app/controllers/hyrax/admin/appearances_controller.rb
+- app/controllers/hyrax/admin/collection_type_participants_controller.rb
+- app/controllers/hyrax/admin/collection_types_controller.rb
 - app/controllers/hyrax/admin/features_controller.rb
 - app/controllers/hyrax/admin/permission_template_accesses_controller.rb
 - app/controllers/hyrax/admin/permission_templates_controller.rb
@@ -1208,7 +1283,9 @@ files:
 - app/controllers/hyrax/collections_controller.rb
 - app/controllers/hyrax/contact_form_controller.rb
 - app/controllers/hyrax/content_blocks_controller.rb
+- app/controllers/hyrax/dashboard/collection_members_controller.rb
 - app/controllers/hyrax/dashboard/collections_controller.rb
+- app/controllers/hyrax/dashboard/nest_collections_controller.rb
 - app/controllers/hyrax/dashboard/profiles_controller.rb
 - app/controllers/hyrax/dashboard/works_controller.rb
 - app/controllers/hyrax/dashboard_controller.rb
@@ -1250,10 +1327,13 @@ files:
 - app/conversions/power_converters/sipity_workflow_id.rb
 - app/conversions/power_converters/sipity_workflow_state.rb
 - app/forms/hyrax/forms/admin/appearance.rb
+- 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/batch_edit_form.rb
 - app/forms/hyrax/forms/batch_upload_form.rb
 - app/forms/hyrax/forms/collection_form.rb
+- app/forms/hyrax/forms/dashboard/nest_collection_form.rb
 - app/forms/hyrax/forms/file_manager_form.rb
 - app/forms/hyrax/forms/file_set_edit_form.rb
 - app/forms/hyrax/forms/permission_template_form.rb
@@ -1262,7 +1342,6 @@ files:
 - app/forms/hyrax/forms/work_form.rb
 - app/forms/hyrax/forms/workflow_action_form.rb
 - app/forms/hyrax/forms/workflow_responsibility_form.rb
-- app/helpers/dashboard_helper.rb
 - app/helpers/hyrax/ability_helper.rb
 - app/helpers/hyrax/batch_edits_helper.rb
 - app/helpers/hyrax/blacklight_override.rb
@@ -1298,6 +1377,7 @@ files:
 - app/indexers/hyrax/deep_indexing_service.rb
 - app/indexers/hyrax/file_set_indexer.rb
 - app/indexers/hyrax/indexes_workflow.rb
+- app/indexers/hyrax/repository_reindexer.rb
 - app/indexers/hyrax/work_indexer.rb
 - app/inputs/controlled_vocabulary_input.rb
 - app/inputs/multi_value_select_input.rb
@@ -1337,9 +1417,16 @@ files:
 - app/models/admin_set.rb
 - app/models/batch_upload_item.rb
 - app/models/checksum_audit_log.rb
+- app/models/collection_branding_info.rb
 - app/models/concerns/hyrax/ability.rb
+- app/models/concerns/hyrax/ability/admin_set_ability.rb
+- app/models/concerns/hyrax/ability/collection_ability.rb
+- app/models/concerns/hyrax/ability/collection_type_ability.rb
+- app/models/concerns/hyrax/ability/permission_template_ability.rb
+- app/models/concerns/hyrax/ability/solr_document_ability.rb
 - app/models/concerns/hyrax/basic_metadata.rb
 - app/models/concerns/hyrax/collection_behavior.rb
+- app/models/concerns/hyrax/collection_nesting.rb
 - app/models/concerns/hyrax/core_metadata.rb
 - app/models/concerns/hyrax/file_set/belongs_to_works.rb
 - app/models/concerns/hyrax/file_set/characterization.rb
@@ -1347,6 +1434,7 @@ files:
 - app/models/concerns/hyrax/file_set/indexing.rb
 - app/models/concerns/hyrax/file_set/querying.rb
 - app/models/concerns/hyrax/file_set_behavior.rb
+- app/models/concerns/hyrax/has_rendering.rb
 - app/models/concerns/hyrax/has_representative.rb
 - app/models/concerns/hyrax/human_readable_type.rb
 - app/models/concerns/hyrax/in_admin_set.rb
@@ -1375,6 +1463,8 @@ files:
 - app/models/file_view_stat.rb
 - app/models/hyrax/avatar_validator.rb
 - app/models/hyrax/batch_create_operation.rb
+- app/models/hyrax/collection_type.rb
+- app/models/hyrax/collection_type_participant.rb
 - app/models/hyrax/contact_form.rb
 - app/models/hyrax/download.rb
 - app/models/hyrax/event.rb
@@ -1430,6 +1520,7 @@ files:
 - app/presenters/hyrax/collection_presenter.rb
 - app/presenters/hyrax/composite_presenter_factory.rb
 - app/presenters/hyrax/dashboard/user_presenter.rb
+- app/presenters/hyrax/displays_image.rb
 - app/presenters/hyrax/embargo_presenter.rb
 - app/presenters/hyrax/file_set_presenter.rb
 - app/presenters/hyrax/file_usage.rb
@@ -1445,6 +1536,8 @@ files:
 - app/presenters/hyrax/presenter_factory.rb
 - app/presenters/hyrax/presenter_renderer.rb
 - app/presenters/hyrax/presents_attributes.rb
+- app/presenters/hyrax/select_collection_type_list_presenter.rb
+- app/presenters/hyrax/select_collection_type_presenter.rb
 - app/presenters/hyrax/select_type_list_presenter.rb
 - app/presenters/hyrax/select_type_presenter.rb
 - app/presenters/hyrax/single_use_link_presenter.rb
@@ -1474,6 +1567,10 @@ files:
 - app/search_builders/hyrax/catalog_search_builder.rb
 - app/search_builders/hyrax/collection_member_search_builder.rb
 - app/search_builders/hyrax/collection_search_builder.rb
+- app/search_builders/hyrax/dashboard/collections_search_builder.rb
+- app/search_builders/hyrax/dashboard/managed_search_filters.rb
+- app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb
+- app/search_builders/hyrax/dashboard/works_search_builder.rb
 - app/search_builders/hyrax/deactivated_embargo_search_builder.rb
 - app/search_builders/hyrax/deactivated_lease_search_builder.rb
 - app/search_builders/hyrax/deposit_search_builder.rb
@@ -1495,6 +1592,7 @@ files:
 - app/search_builders/hyrax/my/search_builder_behavior.rb
 - app/search_builders/hyrax/my/shares_search_builder.rb
 - app/search_builders/hyrax/my/works_search_builder.rb
+- app/search_builders/hyrax/nested_collections_parent_search_builder.rb
 - app/search_builders/hyrax/parent_collection_search_builder.rb
 - app/search_builders/hyrax/search_builder.rb
 - app/search_builders/hyrax/search_filters.rb
@@ -1507,7 +1605,9 @@ files:
 - app/search_builders/hyrax/work_search_builder.rb
 - app/search_builders/hyrax/works_search_builder.rb
 - app/services/hyrax/abstract_message_service.rb
+- app/services/hyrax/adapters/nesting_index_adapter.rb
 - app/services/hyrax/admin_set_create_service.rb
+- app/services/hyrax/admin_set_member_service.rb
 - app/services/hyrax/admin_set_service.rb
 - app/services/hyrax/analytics.rb
 - app/services/hyrax/batch_create_failure_service.rb
@@ -1516,6 +1616,15 @@ files:
 - app/services/hyrax/collection_member_service.rb
 - app/services/hyrax/collection_size_service.rb
 - app/services/hyrax/collection_thumbnail_path_service.rb
+- app/services/hyrax/collection_types/create_service.rb
+- app/services/hyrax/collection_types/permissions_service.rb
+- app/services/hyrax/collections/collection_member_service.rb
+- app/services/hyrax/collections/managed_collections_service.rb
+- app/services/hyrax/collections/migration_service.rb
+- app/services/hyrax/collections/nested_collection_persistence_service.rb
+- app/services/hyrax/collections/nested_collection_query_service.rb
+- app/services/hyrax/collections/permissions_create_service.rb
+- app/services/hyrax/collections/permissions_service.rb
 - app/services/hyrax/collections/search_service.rb
 - app/services/hyrax/collections_service.rb
 - app/services/hyrax/contextual_path.rb
@@ -1531,6 +1640,7 @@ files:
 - app/services/hyrax/fixity_check_failure_service.rb
 - app/services/hyrax/form_metadata_service.rb
 - app/services/hyrax/graph_exporter.rb
+- app/services/hyrax/iiif_authorization_service.rb
 - app/services/hyrax/import_url_failure_service.rb
 - app/services/hyrax/indexes_thumbnails.rb
 - app/services/hyrax/institution.rb
@@ -1542,8 +1652,8 @@ files:
 - app/services/hyrax/lockable.rb
 - app/services/hyrax/messenger_service.rb
 - app/services/hyrax/microdata.rb
+- app/services/hyrax/multiple_membership_checker.rb
 - app/services/hyrax/noid.rb
-- app/services/hyrax/parent_service.rb
 - app/services/hyrax/persist_derivatives.rb
 - app/services/hyrax/persist_directly_contained_output_file_service.rb
 - app/services/hyrax/qa_select_service.rb
@@ -1597,6 +1707,7 @@ files:
 - app/services/hyrax/workflow/workflow_permissions_generator.rb
 - app/services/hyrax/workflow/workflow_schema.rb
 - app/services/hyrax/working_directory.rb
+- app/services/hyrax/works/managed_works_service.rb
 - app/strategies/hyrax/strategies/yaml_strategy.rb
 - app/uploaders/hyrax/avatar_uploader.rb
 - app/uploaders/hyrax/uploaded_file_uploader.rb
@@ -1618,9 +1729,6 @@ files:
 - app/views/catalog/_index_header_list_default.html.erb
 - app/views/catalog/_index_list_default.html.erb
 - app/views/catalog/_search_form.html.erb
-- app/views/catalog/_show_partials/_default.html.erb
-- app/views/catalog/_show_partials/_default_details.html.erb
-- app/views/catalog/_show_partials/_facets.html.erb
 - app/views/catalog/_thumbnail_list_collection.html.erb
 - app/views/catalog/_thumbnail_list_default.html.erb
 - app/views/catalog/index.html.erb
@@ -1641,6 +1749,15 @@ files:
 - app/views/hyrax/admin/admin_sets/new.html.erb
 - app/views/hyrax/admin/admin_sets/show.html.erb
 - app/views/hyrax/admin/appearances/show.html.erb
+- app/views/hyrax/admin/collection_types/_form.html.erb
+- app/views/hyrax/admin/collection_types/_form_metadata.html.erb
+- app/views/hyrax/admin/collection_types/_form_metadata_admin_set.html.erb
+- app/views/hyrax/admin/collection_types/_form_participant_table.html.erb
+- app/views/hyrax/admin/collection_types/_form_participants.html.erb
+- app/views/hyrax/admin/collection_types/_form_settings.html.erb
+- app/views/hyrax/admin/collection_types/edit.html.erb
+- app/views/hyrax/admin/collection_types/index.html.erb
+- app/views/hyrax/admin/collection_types/new.html.erb
 - app/views/hyrax/admin/features/index.html.erb
 - app/views/hyrax/admin/stats/_date_form.html.erb
 - app/views/hyrax/admin/stats/_deposits.html.erb
@@ -1655,7 +1772,6 @@ files:
 - app/views/hyrax/base/_actions.html.erb
 - app/views/hyrax/base/_attribute_rows.html.erb
 - app/views/hyrax/base/_attributes.html.erb
-- app/views/hyrax/base/_browse_everything.html.erb
 - app/views/hyrax/base/_citations.html.erb
 - app/views/hyrax/base/_file_manager_actions.html.erb
 - app/views/hyrax/base/_file_manager_attributes.html.erb
@@ -1665,7 +1781,6 @@ files:
 - app/views/hyrax/base/_file_manager_members.html.erb
 - app/views/hyrax/base/_file_manager_resource_form.html.erb
 - app/views/hyrax/base/_file_manager_thumbnail.html.erb
-- app/views/hyrax/base/_find_work_widget.html.erb
 - app/views/hyrax/base/_form.html.erb
 - app/views/hyrax/base/_form_child_work_relationships.html.erb
 - app/views/hyrax/base/_form_files.html.erb
@@ -1682,6 +1797,7 @@ files:
 - app/views/hyrax/base/_form_permission_under_lease.html.erb
 - app/views/hyrax/base/_form_progress.html.erb
 - app/views/hyrax/base/_form_relationships.html.erb
+- app/views/hyrax/base/_form_rendering.html.erb
 - app/views/hyrax/base/_form_representative.html.erb
 - app/views/hyrax/base/_form_share.html.erb
 - app/views/hyrax/base/_form_thumbnail.html.erb
@@ -1701,6 +1817,7 @@ files:
 - app/views/hyrax/base/_social_media.html.erb
 - app/views/hyrax/base/_work_description.erb
 - app/views/hyrax/base/_work_title.erb
+- app/views/hyrax/base/_work_type.html.erb
 - app/views/hyrax/base/_workflow_actions.html.erb
 - app/views/hyrax/base/_workflow_actions_widget.erb
 - app/views/hyrax/base/edit.html.erb
@@ -1734,7 +1851,9 @@ files:
 - app/views/hyrax/collections/_show_document_list.html.erb
 - app/views/hyrax/collections/_show_document_list_row.html.erb
 - app/views/hyrax/collections/_show_fields.html.erb
+- app/views/hyrax/collections/_show_parent_collections.html.erb
 - app/views/hyrax/collections/_sort_and_per_page.html.erb
+- app/views/hyrax/collections/_subcollection_list.html.erb
 - app/views/hyrax/collections/_view_type_group.html.erb
 - app/views/hyrax/collections/show.html.erb
 - app/views/hyrax/contact_form/_directions.html.erb
@@ -1752,26 +1871,38 @@ files:
 - app/views/hyrax/dashboard/collections/_batch_edits_actions.html.erb
 - app/views/hyrax/dashboard/collections/_bookmark_control.html.erb
 - app/views/hyrax/dashboard/collections/_button_create_collection.html.erb
+- app/views/hyrax/dashboard/collections/_button_for_batch_delete_collection.html.erb
 - app/views/hyrax/dashboard/collections/_button_for_remove_selected_from_collection.html.erb
 - app/views/hyrax/dashboard/collections/_button_for_update_collection.html.erb
 - app/views/hyrax/dashboard/collections/_button_remove_from_collection.html.erb
+- app/views/hyrax/dashboard/collections/_collection_title.html.erb
 - app/views/hyrax/dashboard/collections/_document_list.html.erb
 - app/views/hyrax/dashboard/collections/_edit_actions.html.erb
+- app/views/hyrax/dashboard/collections/_flash_msg.html.erb
 - app/views/hyrax/dashboard/collections/_form.html.erb
-- app/views/hyrax/dashboard/collections/_form_default_group.html.erb
+- app/views/hyrax/dashboard/collections/_form_branding.html.erb
+- app/views/hyrax/dashboard/collections/_form_default_group_delt.html.erb
+- app/views/hyrax/dashboard/collections/_form_discovery.html.erb
 - app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb
-- app/views/hyrax/dashboard/collections/_form_permission.html.erb
 - app/views/hyrax/dashboard/collections/_form_share.html.erb
+- app/views/hyrax/dashboard/collections/_form_share_table.html.erb
 - app/views/hyrax/dashboard/collections/_list_collections.html.erb
 - app/views/hyrax/dashboard/collections/_list_works.html.erb
+- app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb
+- app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb
 - app/views/hyrax/dashboard/collections/_show_actions.html.erb
+- app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb
 - app/views/hyrax/dashboard/collections/_show_descriptions.html.erb
 - app/views/hyrax/dashboard/collections/_show_document_list.html.erb
 - app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb
 - app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb
 - app/views/hyrax/dashboard/collections/_show_fields.html.erb
+- app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb
+- app/views/hyrax/dashboard/collections/_show_parent_collections.html.erb
+- app/views/hyrax/dashboard/collections/_show_subcollection_actions.html.erb
 - app/views/hyrax/dashboard/collections/_single_item_action_fields.html.erb
 - app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb
+- app/views/hyrax/dashboard/collections/_subcollection_list.html.erb
 - app/views/hyrax/dashboard/collections/_work_action_menu.html.erb
 - app/views/hyrax/dashboard/collections/edit.html.erb
 - app/views/hyrax/dashboard/collections/edit_fields/_description.html.erb
@@ -1817,7 +1948,6 @@ files:
 - app/views/hyrax/file_sets/_single_use_links.html.erb
 - app/views/hyrax/file_sets/_versioning.html.erb
 - app/views/hyrax/file_sets/edit.html.erb
-- app/views/hyrax/file_sets/jq_upload.json.jbuilder
 - app/views/hyrax/file_sets/media_display/_audio.html.erb
 - app/views/hyrax/file_sets/media_display/_default.html.erb
 - app/views/hyrax/file_sets/media_display/_image.html.erb
@@ -1846,6 +1976,7 @@ files:
 - app/views/hyrax/leases/_table_headers.html.erb
 - app/views/hyrax/leases/edit.html.erb
 - app/views/hyrax/leases/index.html.erb
+- app/views/hyrax/my/_admin_set_action_menu.html.erb
 - app/views/hyrax/my/_batch_edits_actions.html.erb
 - app/views/hyrax/my/_collection_action_menu.html.erb
 - app/views/hyrax/my/_constraints.html.erb
@@ -1854,6 +1985,7 @@ files:
 - app/views/hyrax/my/_facet_layout.html.erb
 - app/views/hyrax/my/_facet_limit.html.erb
 - app/views/hyrax/my/_facet_pagination.html.erb
+- app/views/hyrax/my/_facet_pivot.html.erb
 - app/views/hyrax/my/_facet_selected.html.erb
 - app/views/hyrax/my/_results_pagination.html.erb
 - app/views/hyrax/my/_scripts.js.erb
@@ -1861,13 +1993,27 @@ files:
 - app/views/hyrax/my/_search_header.html.erb
 - app/views/hyrax/my/_sort_and_per_page.html.erb
 - app/views/hyrax/my/_work_action_menu.html.erb
+- app/views/hyrax/my/collections/_batch_actions.html.erb
 - app/views/hyrax/my/collections/_default_group.html.erb
 - app/views/hyrax/my/collections/_facets.html.erb
 - app/views/hyrax/my/collections/_list_collections.html.erb
+- app/views/hyrax/my/collections/_modal_add_subcollection.html.erb
+- app/views/hyrax/my/collections/_modal_add_to_collection.html.erb
+- app/views/hyrax/my/collections/_modal_add_to_collection_deny.html.erb
+- app/views/hyrax/my/collections/_modal_add_to_collection_permission_deny.html.erb
+- app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb
+- app/views/hyrax/my/collections/_modal_delete_admin_set_deny.html.erb
+- app/views/hyrax/my/collections/_modal_delete_collection.html.erb
+- app/views/hyrax/my/collections/_modal_delete_collection_deny.html.erb
+- app/views/hyrax/my/collections/_modal_delete_deny.html.erb
+- app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb
+- app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb
+- app/views/hyrax/my/collections/_modal_edit_deny.html.erb
 - app/views/hyrax/my/collections/_tabs.html.erb
 - app/views/hyrax/my/collections/index.html.erb
 - app/views/hyrax/my/facet.html.erb
 - app/views/hyrax/my/index.html.erb
+- app/views/hyrax/my/works/_batch_actions.html.erb
 - app/views/hyrax/my/works/_default_group.html.erb
 - app/views/hyrax/my/works/_facets.html.erb
 - app/views/hyrax/my/works/_list_works.html.erb
@@ -1894,6 +2040,7 @@ files:
 - app/views/hyrax/transfers/index.html.erb
 - app/views/hyrax/transfers/new.html.erb
 - app/views/hyrax/uploads/_js_templates.html.erb
+- app/views/hyrax/uploads/_js_templates_branding.html.erb
 - app/views/hyrax/uploads/create.json.jbuilder
 - app/views/hyrax/users/_activity.html.erb
 - app/views/hyrax/users/_activity_log.html.erb
@@ -1910,12 +2057,13 @@ files:
 - app/views/hyrax/users/index.html.erb
 - app/views/hyrax/users/index.json.jbuilder
 - app/views/hyrax/users/show.html.erb
+- app/views/kaminari/blacklight_compact/_paginator.html.erb
 - app/views/layouts/_head_tag_content.html.erb
-- app/views/layouts/dashboard.html.erb
 - app/views/layouts/error.html.erb
 - app/views/layouts/homepage.html.erb
 - app/views/layouts/hyrax.html.erb
 - app/views/layouts/hyrax/1_column.html.erb
+- app/views/layouts/hyrax/dashboard.html.erb
 - app/views/records/edit_fields/_based_near.html.erb
 - app/views/records/edit_fields/_description.html.erb
 - app/views/records/edit_fields/_language.html.erb
@@ -1949,6 +2097,7 @@ files:
 - config/features.rb
 - config/i18n-tasks.yml
 - config/initializers/hyrax_callbacks.rb
+- config/initializers/samvera-nesting_indexer_initializer.rb
 - config/initializers/simple_form.rb
 - config/locales/hyrax.de.yml
 - config/locales/hyrax.en.yml
@@ -1974,7 +2123,9 @@ files:
 - lib/generators/hyrax/config_generator.rb
 - lib/generators/hyrax/install_generator.rb
 - lib/generators/hyrax/models_generator.rb
+- lib/generators/hyrax/riiif_generator.rb
 - lib/generators/hyrax/sample_data_generator.rb
+- lib/generators/hyrax/templates/app/assets/images/us_404.svg
 - lib/generators/hyrax/templates/app/models/collection.rb
 - lib/generators/hyrax/templates/app/models/file_set.rb
 - lib/generators/hyrax/templates/catalog_controller.rb
@@ -1989,6 +2140,7 @@ files:
 - lib/generators/hyrax/templates/config/initializers/hyrax.rb
 - lib/generators/hyrax/templates/config/initializers/mini_magick.rb
 - lib/generators/hyrax/templates/config/initializers/redis_config.rb
+- lib/generators/hyrax/templates/config/initializers/riiif.rb
 - lib/generators/hyrax/templates/config/initializers/simple_form.rb
 - lib/generators/hyrax/templates/config/initializers/simple_form_bootstrap.rb
 - lib/generators/hyrax/templates/config/locales/hyrax.de.yml
@@ -2041,7 +2193,14 @@ files:
 - lib/generators/hyrax/templates/db/migrate/20170308175556_add_allows_access_grant_to_workflow.rb.erb
 - lib/generators/hyrax/templates/db/migrate/20170504192714_change_checksum_audit_log.rb.erb
 - lib/generators/hyrax/templates/db/migrate/20170621201939_create_job_io_wrappers.rb.erb
+- lib/generators/hyrax/templates/db/migrate/20170808160431_create_collection_types.rb.erb
+- lib/generators/hyrax/templates/db/migrate/20170808160432_update_collection_type_column_names.rb.erb
+- lib/generators/hyrax/templates/db/migrate/20170810190549_update_collection_type_column_options.rb.erb
+- lib/generators/hyrax/templates/db/migrate/20170816180307_create_collection_branding_infos.rb.erb
+- lib/generators/hyrax/templates/db/migrate/20170817152654_create_collection_type_participants.rb.erb
+- lib/generators/hyrax/templates/db/migrate/20170821152307_rename_admin_set_id_to_source_id.rb.erb
 - lib/generators/hyrax/templates/db/migrate/20170905135339_add_preferred_locale_to_users.rb.erb
+- lib/generators/hyrax/templates/db/migrate/20171103080032_add_collection_type_sharing_options.rb.erb
 - lib/generators/hyrax/templates/db/migrate/20171117153051_add_unique_constraint_to_permission_template_accesses.rb.erb
 - lib/generators/hyrax/templates/db/seeds.rb
 - lib/generators/hyrax/templates/hyrax.scss
@@ -2109,6 +2268,7 @@ files:
 - lib/hyrax/zotero/config.rb
 - lib/tasks/controlled_vocabularies.rake
 - lib/tasks/default_admin_set.rake
+- lib/tasks/default_collection_type.rake
 - lib/tasks/hyrax.rake
 - lib/tasks/hyrax_user.rake
 - lib/tasks/install.rake
@@ -2116,32 +2276,19 @@ files:
 - lib/tasks/reindex.rake
 - lib/tasks/stats_tasks.rake
 - lib/tasks/workflow.rake
-- solr/config/_rest_managed.json
-- solr/config/admin-extra.html
-- solr/config/elevate.xml
-- solr/config/mapping-ISOLatin1Accent.txt
-- solr/config/protwords.txt
-- solr/config/schema.xml
-- solr/config/scripts.conf
-- solr/config/solrconfig.xml
-- solr/config/spellings.txt
-- solr/config/stopwords.txt
-- solr/config/stopwords_en.txt
-- solr/config/synonyms.txt
-- solr/config/xslt/example.xsl
-- solr/config/xslt/example_atom.xsl
-- solr/config/xslt/example_rss.xsl
-- solr/config/xslt/luke.xsl
 - spec/.gitignore
 - spec/abilities/ability_spec.rb
 - spec/abilities/admin_ability_spec.rb
-- spec/abilities/admin_set_abilities_spec.rb
-- spec/abilities/collection_abilities_spec.rb
+- spec/abilities/admin_set_ability_spec.rb
+- spec/abilities/collection_ability_spec.rb
+- spec/abilities/collection_type_ability_spec.rb
 - spec/abilities/embargo_and_lease_ability_spec.rb
 - spec/abilities/file_set_abilities_spec.rb
 - spec/abilities/generic_work_abilities_spec.rb
 - spec/abilities/operation_ability_spec.rb
+- spec/abilities/permission_template_ability_spec.rb
 - spec/abilities/proxies_and_transfer_abilities_spec.rb
+- spec/abilities/solr_document_ability_spec.rb
 - spec/actors/hyrax/actors/apply_order_actor_spec.rb
 - spec/actors/hyrax/actors/apply_permission_template_actor_spec.rb
 - spec/actors/hyrax/actors/attach_members_actor_spec.rb
@@ -2163,6 +2310,7 @@ files:
 - spec/actors/hyrax/actors/optimistic_lock_validator_spec.rb
 - spec/actors/hyrax/actors/transactional_request_spec.rb
 - spec/actors/hyrax/actors/transfer_request_actor_spec.rb
+- spec/authorities/qa/authorities/collections_spec.rb
 - spec/authorities/qa/authorities/find_works_spec.rb
 - spec/channels/hyrax/application_cable/channel_spec.rb
 - spec/channels/hyrax/application_cable/connection_spec.rb
@@ -2172,6 +2320,8 @@ files:
 - spec/controllers/hyrax/accepts_batches_controller_spec.rb
 - spec/controllers/hyrax/admin/admin_sets_controller_spec.rb
 - spec/controllers/hyrax/admin/appearances_controller_spec.rb
+- spec/controllers/hyrax/admin/collection_type_participants_controller_spec.rb
+- spec/controllers/hyrax/admin/collection_types_controller_spec.rb
 - spec/controllers/hyrax/admin/features_controller_spec.rb
 - spec/controllers/hyrax/admin/permission_template_accesses_controller_spec.rb
 - spec/controllers/hyrax/admin/permission_templates_controller_spec.rb
@@ -2188,7 +2338,9 @@ files:
 - spec/controllers/hyrax/collections_controller_spec.rb
 - spec/controllers/hyrax/contact_form_controller_spec.rb
 - spec/controllers/hyrax/content_blocks_controller_spec.rb
+- spec/controllers/hyrax/dashboard/collection_members_controller_spec.rb
 - spec/controllers/hyrax/dashboard/collections_controller_spec.rb
+- spec/controllers/hyrax/dashboard/nest_collections_controller_spec.rb
 - spec/controllers/hyrax/dashboard/profiles_controller_spec.rb
 - spec/controllers/hyrax/dashboard/works_controller_spec.rb
 - spec/controllers/hyrax/dashboard_controller_spec.rb
@@ -2231,11 +2383,16 @@ files:
 - spec/conversions/power_converters/sipity_workflow_state_spec.rb
 - spec/factories/admin_sets.rb
 - spec/factories/api_items.rb
+- spec/factories/collection_branding_infos.rb
+- spec/factories/collection_type_participants.rb
+- spec/factories/collection_types.rb
+- spec/factories/collections.rb
 - spec/factories/collections_factory.rb
 - spec/factories/content_blocks.rb
 - spec/factories/featured_works.rb
 - spec/factories/file_sets.rb
 - spec/factories/generic_works.rb
+- spec/factories/object_id.rb
 - spec/factories/operations.rb
 - spec/factories/permission_template_accesses.rb
 - spec/factories/permission_templates.rb
@@ -2247,16 +2404,19 @@ files:
 - spec/factories/workflow_actions.rb
 - spec/factories/workflow_states.rb
 - spec/factories/workflows.rb
-- spec/features/admin_admin_set_spec.rb
+- spec/factory_tests/collections_factory_spec.rb
 - spec/features/admin_spec.rb
 - spec/features/batch_create_spec.rb
 - spec/features/batch_edit_spec.rb
 - spec/features/browse_catalog_spec.rb
 - spec/features/browse_dashboard_works_spec.rb
 - spec/features/catalog_search_spec.rb
+- spec/features/collection_multi_membership_spec.rb
 - spec/features/collection_spec.rb
+- spec/features/collection_type_spec.rb
 - spec/features/contact_form_spec.rb
 - spec/features/create_child_work_spec.rb
+- spec/features/create_work_admin_spec.rb
 - spec/features/create_work_spec.rb
 - spec/features/dashboard/all_works.rb
 - spec/features/dashboard/collection_spec.rb
@@ -2309,10 +2469,13 @@ files:
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
 - spec/forms/hyrax/forms/admin/appearance_spec.rb
+- spec/forms/hyrax/forms/admin/collection_type_form_spec.rb
+- spec/forms/hyrax/forms/admin/collection_type_participant_form_spec.rb
 - spec/forms/hyrax/forms/admin_set_form_spec.rb
 - spec/forms/hyrax/forms/batch_edit_form_spec.rb
 - spec/forms/hyrax/forms/batch_upload_form_spec.rb
 - spec/forms/hyrax/forms/collection_form_spec.rb
+- spec/forms/hyrax/forms/dashboard/nest_collection_form_spec.rb
 - spec/forms/hyrax/forms/file_manager_form_spec.rb
 - spec/forms/hyrax/forms/file_set_edit_form_spec.rb
 - spec/forms/hyrax/forms/permission_template_form_spec.rb
@@ -2321,19 +2484,19 @@ files:
 - spec/forms/hyrax/forms/workflow_responsibility_form_spec.rb
 - spec/forms/hyrax/generic_work_form_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
-- spec/helpers/dashboard_helper_spec.rb
 - spec/helpers/hyrax/ability_helper_spec.rb
 - spec/helpers/hyrax/batch_edits_helper_spec.rb
 - spec/helpers/hyrax/charts_helper_spec.rb
-- spec/helpers/hyrax/citations_behaviors/formatters/chicago_formatter_spec.rb
 - spec/helpers/hyrax/collections_helper_spec.rb
 - spec/helpers/hyrax/content_block_helper_spec.rb
+- spec/helpers/hyrax/dashboard_helper_behavior_spec.rb
 - spec/helpers/hyrax/file_set_helper_spec.rb
 - spec/helpers/hyrax/trophy_helper_spec.rb
 - spec/helpers/hyrax_helper_spec.rb
 - spec/indexers/hyrax/collection_indexer_spec.rb
 - spec/indexers/hyrax/file_set_indexer_spec.rb
 - spec/indexers/hyrax/generic_work_indexer_spec.rb
+- spec/indexers/hyrax/repository_reindexer_spec.rb
 - spec/inputs/controlled_vocabulary_input_spec.rb
 - spec/inputs/multifile_input_spec.rb
 - spec/javascripts/authority_select_spec.js
@@ -2360,6 +2523,7 @@ files:
 - spec/javascripts/required_field_spec.js
 - spec/javascripts/save_manager_spec.coffee
 - spec/javascripts/save_work_spec.js
+- spec/javascripts/settings_spec.js
 - spec/javascripts/single_use_links_spec.coffee
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
@@ -2416,7 +2580,9 @@ files:
 - spec/models/admin_set_spec.rb
 - spec/models/batch_upload_item_spec.rb
 - spec/models/checksum_audit_log_spec.rb
+- spec/models/collection_branding_info_spec.rb
 - spec/models/collection_spec.rb
+- spec/models/concerns/hyrax/collection_nesting_spec.rb
 - spec/models/content_block_spec.rb
 - spec/models/featured_work_list_spec.rb
 - spec/models/featured_work_spec.rb
@@ -2425,6 +2591,9 @@ files:
 - spec/models/file_view_stat_spec.rb
 - spec/models/flipflop_spec.rb
 - spec/models/generic_work_spec.rb
+- spec/models/hyrax/batch_create_operation_spec.rb
+- spec/models/hyrax/collection_type_participant_spec.rb
+- spec/models/hyrax/collection_type_spec.rb
 - spec/models/hyrax/download_spec.rb
 - spec/models/hyrax/operation_spec.rb
 - spec/models/hyrax/pageview_spec.rb
@@ -2483,6 +2652,8 @@ files:
 - spec/presenters/hyrax/permission_badge_spec.rb
 - spec/presenters/hyrax/presenter_factory_spec.rb
 - spec/presenters/hyrax/presenter_renderer_spec.rb
+- spec/presenters/hyrax/select_collection_type_list_presenter_spec.rb
+- spec/presenters/hyrax/select_collection_type_presenter_spec.rb
 - spec/presenters/hyrax/select_type_list_presenter_spec.rb
 - spec/presenters/hyrax/select_type_presenter_spec.rb
 - spec/presenters/hyrax/single_use_link_presenter_spec.rb
@@ -2504,9 +2675,13 @@ files:
 - spec/renderers/hyrax/renderers/linked_attribute_renderer_spec.rb
 - spec/renderers/hyrax/renderers/rights_statement_attribute_renderer_spec.rb
 - spec/requests/legacy_routing_spec.rb
+- spec/requests/riiif_spec.rb
 - spec/routing/admin_routes_spec.rb
 - spec/routing/api_route_spec.rb
 - spec/routing/citations_route_spec.rb
+- spec/routing/collection_permission_templates_routes_spec.rb
+- spec/routing/collection_types_routes.rb
+- spec/routing/dashboard_routes_spec.rb
 - spec/routing/featured_works_route_spec.rb
 - spec/routing/operations_spec.rb
 - spec/routing/ownership_transfers_route_spec.rb
@@ -2517,9 +2692,15 @@ files:
 - spec/search_builders/hyrax/admin_admin_set_member_search_builder_spec.rb
 - spec/search_builders/hyrax/admin_set_search_builder_spec.rb
 - spec/search_builders/hyrax/catalog_search_builder_spec.rb
+- spec/search_builders/hyrax/collection_member_search_builder_spec.rb
+- spec/search_builders/hyrax/collection_search_builder_spec.rb
+- spec/search_builders/hyrax/dashboard/collections_search_builder_spec.rb
+- spec/search_builders/hyrax/dashboard/nested_collections_search_builder_spec.rb
+- spec/search_builders/hyrax/dashboard/works_search_builder_spec.rb
 - spec/search_builders/hyrax/embargo_search_builder_spec.rb
 - spec/search_builders/hyrax/file_set_search_builder_spec.rb
 - spec/search_builders/hyrax/lease_search_builder_spec.rb
+- spec/search_builders/hyrax/my/collections_search_builder_spec.rb
 - spec/search_builders/hyrax/my/find_works_search_builder_spec.rb
 - spec/search_builders/hyrax/my/shares_search_builder_spec.rb
 - spec/search_builders/hyrax/my/works_search_builder_spec.rb
@@ -2529,13 +2710,24 @@ files:
 - spec/search_builders/hyrax/work_search_builder_spec.rb
 - spec/search_builders/hyrax/works_search_builder_spec.rb
 - spec/services/hyrax/abstract_message_service_spec.rb
+- spec/services/hyrax/adapters/nesting_index_adapter_spec.rb
 - spec/services/hyrax/admin_set_create_service_spec.rb
+- spec/services/hyrax/admin_set_member_service_spec.rb
 - spec/services/hyrax/admin_set_service_spec.rb
 - spec/services/hyrax/batch_create_failure_service_spec.rb
 - spec/services/hyrax/batch_create_success_service_spec.rb
 - spec/services/hyrax/change_content_depositor_service_spec.rb
 - spec/services/hyrax/collection_member_service_spec.rb
 - spec/services/hyrax/collection_size_service_spec.rb
+- spec/services/hyrax/collection_types/create_service_spec.rb
+- spec/services/hyrax/collection_types/permissions_service_spec.rb
+- spec/services/hyrax/collections/collection_member_service_spec.rb
+- spec/services/hyrax/collections/managed_collections_service_spec.rb
+- spec/services/hyrax/collections/migration_service_spec.rb
+- spec/services/hyrax/collections/nested_collection_persistence_service_spec.rb
+- spec/services/hyrax/collections/nested_collection_query_service_spec.rb
+- spec/services/hyrax/collections/permissions_create_service_spec.rb
+- spec/services/hyrax/collections/permissions_service_spec.rb
 - spec/services/hyrax/collections_service_spec.rb
 - spec/services/hyrax/curation_concern_spec.rb
 - spec/services/hyrax/database_migrator_spec.rb
@@ -2548,14 +2740,15 @@ files:
 - spec/services/hyrax/file_set_fixity_check_service_spec.rb
 - spec/services/hyrax/fixity_check_failure_service_spec.rb
 - spec/services/hyrax/graph_exporter_spec.rb
+- spec/services/hyrax/iiif_authorization_service_spec.rb
 - spec/services/hyrax/import_url_failure_service_spec.rb
 - spec/services/hyrax/lease_service_spec.rb
 - spec/services/hyrax/license_service_spec.rb
 - spec/services/hyrax/lock_manager_spec.rb
 - spec/services/hyrax/messenger_service_spec.rb
 - spec/services/hyrax/microdata_spec.rb
+- spec/services/hyrax/multiple_membership_checker_spec.rb
 - spec/services/hyrax/noid_spec.rb
-- spec/services/hyrax/parent_service_spec.rb
 - spec/services/hyrax/persist_derivatives_spec.rb
 - spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb
 - spec/services/hyrax/qa_select_service_spec.rb
@@ -2600,6 +2793,7 @@ files:
 - spec/services/hyrax/workflow/workflow_permissions_generator_spec.rb
 - spec/services/hyrax/workflow/workflow_schema_spec.rb
 - spec/services/hyrax/working_directory_spec.rb
+- spec/services/hyrax/works/managed_works_service_spec.rb
 - spec/spec_helper.rb
 - spec/strategies/hyrax/strategies/yaml_strategy_spec.rb
 - spec/support/controller_level_helpers.rb
@@ -2611,13 +2805,13 @@ files:
 - spec/support/input_support.rb
 - spec/support/logging_formatter.rb
 - spec/support/matchers/api_responses.rb
+- spec/support/matchers/collection_type_property_matchers.rb
 - spec/support/matchers/response_matchers.rb
 - spec/support/rake.rb
 - spec/support/selectors.rb
 - spec/support/spec_statistic.rb
 - spec/support/speedup.rb
 - spec/support/statistic_helper.rb
-- spec/support/uploaded_file_monkeypatch.rb
 - spec/tasks/rake_spec.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/disable_animations_in_test_environment.rb
@@ -2639,20 +2833,27 @@ files:
 - spec/views/hyrax/admin/admin_sets/index.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/index.json.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/show.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_metadata.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_metadata_admin_set.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_participants.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_participants_table.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_settings.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/index.html.erb_spec.rb
 - spec/views/hyrax/admin/features/index.html.erb_spec.rb
 - spec/views/hyrax/admin/stats/show.html.erb_spec.rb
 - spec/views/hyrax/admin/users/index.html.erb_spec.rb
 - spec/views/hyrax/admin/workflow_roles/index.html.erb_spec.rb
 - spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb
 - spec/views/hyrax/base/_attributes.html.erb_spec.rb
-- spec/views/hyrax/base/_browse_everything.html.erb_spec.rb
 - spec/views/hyrax/base/_citations.html.erb_spec.rb
-- spec/views/hyrax/base/_find_work_widget.html.erb_spec.rb
 - spec/views/hyrax/base/_form.html.erb_spec.rb
 - spec/views/hyrax/base/_form_child_work_relationships.html.erb_spec.rb
+- spec/views/hyrax/base/_form_files.html.erb_spec.rb
 - spec/views/hyrax/base/_form_metadata.html.erb_spec.rb
 - spec/views/hyrax/base/_form_progress.html.erb_spec.rb
 - spec/views/hyrax/base/_form_relationships.html.erb_spec.rb
+- spec/views/hyrax/base/_form_rendering.html.erb_spec.rb
 - spec/views/hyrax/base/_items.html.erb_spec.rb
 - spec/views/hyrax/base/_member.html.erb_spec.rb
 - spec/views/hyrax/base/_relationships.html.erb_spec.rb
@@ -2671,15 +2872,29 @@ files:
 - spec/views/hyrax/collections/_show_descriptions.html.erb_spec.rb
 - spec/views/hyrax/collections/_show_document_list.html.erb_spec.rb
 - spec/views/hyrax/collections/_show_document_list_row.html.erb_spec.rb
+- spec/views/hyrax/collections/_show_parent_collections.html.erb_spec.rb
+- spec/views/hyrax/collections/_sort_and_per_page.html.erb_spec.rb
+- spec/views/hyrax/collections/_subcollection_list.html.erb_spec.rb
 - spec/views/hyrax/collections/show.html.erb_spec.rb
 - spec/views/hyrax/dashboard/_sidebar.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_form_branding.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_form_discovery.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_form_share_table.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_show_actions.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_descriptions.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_document_list.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_document_list_row.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_show_parent_collections.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_show_subcollection_actions.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_subcollection_list.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_work_action_menu.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/edit.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/show.html.erb_spec.rb
 - spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb
@@ -2699,6 +2914,7 @@ files:
 - spec/views/hyrax/homepage/_sortable_featured.html.erb_spec.rb
 - spec/views/hyrax/homepage/index.html.erb_spec.rb
 - spec/views/hyrax/leases/index.html.erb_spec.rb
+- spec/views/hyrax/my/_collection_action_menu.html.erb_spec.rb
 - spec/views/hyrax/my/_search_header.html.erb_spec.rb
 - spec/views/hyrax/my/_work_action_menu.html.erb_spec.rb
 - spec/views/hyrax/my/collections/_list_collections.html.erb_spec.rb
@@ -2756,12 +2972,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user
@@ -2773,13 +2989,16 @@ test_files:
 - spec/.gitignore
 - spec/abilities/ability_spec.rb
 - spec/abilities/admin_ability_spec.rb
-- spec/abilities/admin_set_abilities_spec.rb
-- spec/abilities/collection_abilities_spec.rb
+- spec/abilities/admin_set_ability_spec.rb
+- spec/abilities/collection_ability_spec.rb
+- spec/abilities/collection_type_ability_spec.rb
 - spec/abilities/embargo_and_lease_ability_spec.rb
 - spec/abilities/file_set_abilities_spec.rb
 - spec/abilities/generic_work_abilities_spec.rb
 - spec/abilities/operation_ability_spec.rb
+- spec/abilities/permission_template_ability_spec.rb
 - spec/abilities/proxies_and_transfer_abilities_spec.rb
+- spec/abilities/solr_document_ability_spec.rb
 - spec/actors/hyrax/actors/apply_order_actor_spec.rb
 - spec/actors/hyrax/actors/apply_permission_template_actor_spec.rb
 - spec/actors/hyrax/actors/attach_members_actor_spec.rb
@@ -2801,6 +3020,7 @@ test_files:
 - spec/actors/hyrax/actors/optimistic_lock_validator_spec.rb
 - spec/actors/hyrax/actors/transactional_request_spec.rb
 - spec/actors/hyrax/actors/transfer_request_actor_spec.rb
+- spec/authorities/qa/authorities/collections_spec.rb
 - spec/authorities/qa/authorities/find_works_spec.rb
 - spec/channels/hyrax/application_cable/channel_spec.rb
 - spec/channels/hyrax/application_cable/connection_spec.rb
@@ -2810,6 +3030,8 @@ test_files:
 - spec/controllers/hyrax/accepts_batches_controller_spec.rb
 - spec/controllers/hyrax/admin/admin_sets_controller_spec.rb
 - spec/controllers/hyrax/admin/appearances_controller_spec.rb
+- spec/controllers/hyrax/admin/collection_type_participants_controller_spec.rb
+- spec/controllers/hyrax/admin/collection_types_controller_spec.rb
 - spec/controllers/hyrax/admin/features_controller_spec.rb
 - spec/controllers/hyrax/admin/permission_template_accesses_controller_spec.rb
 - spec/controllers/hyrax/admin/permission_templates_controller_spec.rb
@@ -2826,7 +3048,9 @@ test_files:
 - spec/controllers/hyrax/collections_controller_spec.rb
 - spec/controllers/hyrax/contact_form_controller_spec.rb
 - spec/controllers/hyrax/content_blocks_controller_spec.rb
+- spec/controllers/hyrax/dashboard/collection_members_controller_spec.rb
 - spec/controllers/hyrax/dashboard/collections_controller_spec.rb
+- spec/controllers/hyrax/dashboard/nest_collections_controller_spec.rb
 - spec/controllers/hyrax/dashboard/profiles_controller_spec.rb
 - spec/controllers/hyrax/dashboard/works_controller_spec.rb
 - spec/controllers/hyrax/dashboard_controller_spec.rb
@@ -2869,11 +3093,16 @@ test_files:
 - spec/conversions/power_converters/sipity_workflow_state_spec.rb
 - spec/factories/admin_sets.rb
 - spec/factories/api_items.rb
+- spec/factories/collection_branding_infos.rb
+- spec/factories/collection_type_participants.rb
+- spec/factories/collection_types.rb
+- spec/factories/collections.rb
 - spec/factories/collections_factory.rb
 - spec/factories/content_blocks.rb
 - spec/factories/featured_works.rb
 - spec/factories/file_sets.rb
 - spec/factories/generic_works.rb
+- spec/factories/object_id.rb
 - spec/factories/operations.rb
 - spec/factories/permission_template_accesses.rb
 - spec/factories/permission_templates.rb
@@ -2885,16 +3114,19 @@ test_files:
 - spec/factories/workflow_actions.rb
 - spec/factories/workflow_states.rb
 - spec/factories/workflows.rb
-- spec/features/admin_admin_set_spec.rb
+- spec/factory_tests/collections_factory_spec.rb
 - spec/features/admin_spec.rb
 - spec/features/batch_create_spec.rb
 - spec/features/batch_edit_spec.rb
 - spec/features/browse_catalog_spec.rb
 - spec/features/browse_dashboard_works_spec.rb
 - spec/features/catalog_search_spec.rb
+- spec/features/collection_multi_membership_spec.rb
 - spec/features/collection_spec.rb
+- spec/features/collection_type_spec.rb
 - spec/features/contact_form_spec.rb
 - spec/features/create_child_work_spec.rb
+- spec/features/create_work_admin_spec.rb
 - spec/features/create_work_spec.rb
 - spec/features/dashboard/all_works.rb
 - spec/features/dashboard/collection_spec.rb
@@ -2947,10 +3179,13 @@ test_files:
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
 - spec/forms/hyrax/forms/admin/appearance_spec.rb
+- spec/forms/hyrax/forms/admin/collection_type_form_spec.rb
+- spec/forms/hyrax/forms/admin/collection_type_participant_form_spec.rb
 - spec/forms/hyrax/forms/admin_set_form_spec.rb
 - spec/forms/hyrax/forms/batch_edit_form_spec.rb
 - spec/forms/hyrax/forms/batch_upload_form_spec.rb
 - spec/forms/hyrax/forms/collection_form_spec.rb
+- spec/forms/hyrax/forms/dashboard/nest_collection_form_spec.rb
 - spec/forms/hyrax/forms/file_manager_form_spec.rb
 - spec/forms/hyrax/forms/file_set_edit_form_spec.rb
 - spec/forms/hyrax/forms/permission_template_form_spec.rb
@@ -2959,19 +3194,19 @@ test_files:
 - spec/forms/hyrax/forms/workflow_responsibility_form_spec.rb
 - spec/forms/hyrax/generic_work_form_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
-- spec/helpers/dashboard_helper_spec.rb
 - spec/helpers/hyrax/ability_helper_spec.rb
 - spec/helpers/hyrax/batch_edits_helper_spec.rb
 - spec/helpers/hyrax/charts_helper_spec.rb
-- spec/helpers/hyrax/citations_behaviors/formatters/chicago_formatter_spec.rb
 - spec/helpers/hyrax/collections_helper_spec.rb
 - spec/helpers/hyrax/content_block_helper_spec.rb
+- spec/helpers/hyrax/dashboard_helper_behavior_spec.rb
 - spec/helpers/hyrax/file_set_helper_spec.rb
 - spec/helpers/hyrax/trophy_helper_spec.rb
 - spec/helpers/hyrax_helper_spec.rb
 - spec/indexers/hyrax/collection_indexer_spec.rb
 - spec/indexers/hyrax/file_set_indexer_spec.rb
 - spec/indexers/hyrax/generic_work_indexer_spec.rb
+- spec/indexers/hyrax/repository_reindexer_spec.rb
 - spec/inputs/controlled_vocabulary_input_spec.rb
 - spec/inputs/multifile_input_spec.rb
 - spec/javascripts/authority_select_spec.js
@@ -2998,6 +3233,7 @@ test_files:
 - spec/javascripts/required_field_spec.js
 - spec/javascripts/save_manager_spec.coffee
 - spec/javascripts/save_work_spec.js
+- spec/javascripts/settings_spec.js
 - spec/javascripts/single_use_links_spec.coffee
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
@@ -3054,7 +3290,9 @@ test_files:
 - spec/models/admin_set_spec.rb
 - spec/models/batch_upload_item_spec.rb
 - spec/models/checksum_audit_log_spec.rb
+- spec/models/collection_branding_info_spec.rb
 - spec/models/collection_spec.rb
+- spec/models/concerns/hyrax/collection_nesting_spec.rb
 - spec/models/content_block_spec.rb
 - spec/models/featured_work_list_spec.rb
 - spec/models/featured_work_spec.rb
@@ -3063,6 +3301,9 @@ test_files:
 - spec/models/file_view_stat_spec.rb
 - spec/models/flipflop_spec.rb
 - spec/models/generic_work_spec.rb
+- spec/models/hyrax/batch_create_operation_spec.rb
+- spec/models/hyrax/collection_type_participant_spec.rb
+- spec/models/hyrax/collection_type_spec.rb
 - spec/models/hyrax/download_spec.rb
 - spec/models/hyrax/operation_spec.rb
 - spec/models/hyrax/pageview_spec.rb
@@ -3121,6 +3362,8 @@ test_files:
 - spec/presenters/hyrax/permission_badge_spec.rb
 - spec/presenters/hyrax/presenter_factory_spec.rb
 - spec/presenters/hyrax/presenter_renderer_spec.rb
+- spec/presenters/hyrax/select_collection_type_list_presenter_spec.rb
+- spec/presenters/hyrax/select_collection_type_presenter_spec.rb
 - spec/presenters/hyrax/select_type_list_presenter_spec.rb
 - spec/presenters/hyrax/select_type_presenter_spec.rb
 - spec/presenters/hyrax/single_use_link_presenter_spec.rb
@@ -3142,9 +3385,13 @@ test_files:
 - spec/renderers/hyrax/renderers/linked_attribute_renderer_spec.rb
 - spec/renderers/hyrax/renderers/rights_statement_attribute_renderer_spec.rb
 - spec/requests/legacy_routing_spec.rb
+- spec/requests/riiif_spec.rb
 - spec/routing/admin_routes_spec.rb
 - spec/routing/api_route_spec.rb
 - spec/routing/citations_route_spec.rb
+- spec/routing/collection_permission_templates_routes_spec.rb
+- spec/routing/collection_types_routes.rb
+- spec/routing/dashboard_routes_spec.rb
 - spec/routing/featured_works_route_spec.rb
 - spec/routing/operations_spec.rb
 - spec/routing/ownership_transfers_route_spec.rb
@@ -3155,9 +3402,15 @@ test_files:
 - spec/search_builders/hyrax/admin_admin_set_member_search_builder_spec.rb
 - spec/search_builders/hyrax/admin_set_search_builder_spec.rb
 - spec/search_builders/hyrax/catalog_search_builder_spec.rb
+- spec/search_builders/hyrax/collection_member_search_builder_spec.rb
+- spec/search_builders/hyrax/collection_search_builder_spec.rb
+- spec/search_builders/hyrax/dashboard/collections_search_builder_spec.rb
+- spec/search_builders/hyrax/dashboard/nested_collections_search_builder_spec.rb
+- spec/search_builders/hyrax/dashboard/works_search_builder_spec.rb
 - spec/search_builders/hyrax/embargo_search_builder_spec.rb
 - spec/search_builders/hyrax/file_set_search_builder_spec.rb
 - spec/search_builders/hyrax/lease_search_builder_spec.rb
+- spec/search_builders/hyrax/my/collections_search_builder_spec.rb
 - spec/search_builders/hyrax/my/find_works_search_builder_spec.rb
 - spec/search_builders/hyrax/my/shares_search_builder_spec.rb
 - spec/search_builders/hyrax/my/works_search_builder_spec.rb
@@ -3167,13 +3420,24 @@ test_files:
 - spec/search_builders/hyrax/work_search_builder_spec.rb
 - spec/search_builders/hyrax/works_search_builder_spec.rb
 - spec/services/hyrax/abstract_message_service_spec.rb
+- spec/services/hyrax/adapters/nesting_index_adapter_spec.rb
 - spec/services/hyrax/admin_set_create_service_spec.rb
+- spec/services/hyrax/admin_set_member_service_spec.rb
 - spec/services/hyrax/admin_set_service_spec.rb
 - spec/services/hyrax/batch_create_failure_service_spec.rb
 - spec/services/hyrax/batch_create_success_service_spec.rb
 - spec/services/hyrax/change_content_depositor_service_spec.rb
 - spec/services/hyrax/collection_member_service_spec.rb
 - spec/services/hyrax/collection_size_service_spec.rb
+- spec/services/hyrax/collection_types/create_service_spec.rb
+- spec/services/hyrax/collection_types/permissions_service_spec.rb
+- spec/services/hyrax/collections/collection_member_service_spec.rb
+- spec/services/hyrax/collections/managed_collections_service_spec.rb
+- spec/services/hyrax/collections/migration_service_spec.rb
+- spec/services/hyrax/collections/nested_collection_persistence_service_spec.rb
+- spec/services/hyrax/collections/nested_collection_query_service_spec.rb
+- spec/services/hyrax/collections/permissions_create_service_spec.rb
+- spec/services/hyrax/collections/permissions_service_spec.rb
 - spec/services/hyrax/collections_service_spec.rb
 - spec/services/hyrax/curation_concern_spec.rb
 - spec/services/hyrax/database_migrator_spec.rb
@@ -3186,14 +3450,15 @@ test_files:
 - spec/services/hyrax/file_set_fixity_check_service_spec.rb
 - spec/services/hyrax/fixity_check_failure_service_spec.rb
 - spec/services/hyrax/graph_exporter_spec.rb
+- spec/services/hyrax/iiif_authorization_service_spec.rb
 - spec/services/hyrax/import_url_failure_service_spec.rb
 - spec/services/hyrax/lease_service_spec.rb
 - spec/services/hyrax/license_service_spec.rb
 - spec/services/hyrax/lock_manager_spec.rb
 - spec/services/hyrax/messenger_service_spec.rb
 - spec/services/hyrax/microdata_spec.rb
+- spec/services/hyrax/multiple_membership_checker_spec.rb
 - spec/services/hyrax/noid_spec.rb
-- spec/services/hyrax/parent_service_spec.rb
 - spec/services/hyrax/persist_derivatives_spec.rb
 - spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb
 - spec/services/hyrax/qa_select_service_spec.rb
@@ -3238,6 +3503,7 @@ test_files:
 - spec/services/hyrax/workflow/workflow_permissions_generator_spec.rb
 - spec/services/hyrax/workflow/workflow_schema_spec.rb
 - spec/services/hyrax/working_directory_spec.rb
+- spec/services/hyrax/works/managed_works_service_spec.rb
 - spec/spec_helper.rb
 - spec/strategies/hyrax/strategies/yaml_strategy_spec.rb
 - spec/support/controller_level_helpers.rb
@@ -3249,13 +3515,13 @@ test_files:
 - spec/support/input_support.rb
 - spec/support/logging_formatter.rb
 - spec/support/matchers/api_responses.rb
+- spec/support/matchers/collection_type_property_matchers.rb
 - spec/support/matchers/response_matchers.rb
 - spec/support/rake.rb
 - spec/support/selectors.rb
 - spec/support/spec_statistic.rb
 - spec/support/speedup.rb
 - spec/support/statistic_helper.rb
-- spec/support/uploaded_file_monkeypatch.rb
 - spec/tasks/rake_spec.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/disable_animations_in_test_environment.rb
@@ -3277,20 +3543,27 @@ test_files:
 - spec/views/hyrax/admin/admin_sets/index.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/index.json.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/show.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_metadata.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_metadata_admin_set.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_participants.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_participants_table.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_settings.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/index.html.erb_spec.rb
 - spec/views/hyrax/admin/features/index.html.erb_spec.rb
 - spec/views/hyrax/admin/stats/show.html.erb_spec.rb
 - spec/views/hyrax/admin/users/index.html.erb_spec.rb
 - spec/views/hyrax/admin/workflow_roles/index.html.erb_spec.rb
 - spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb
 - spec/views/hyrax/base/_attributes.html.erb_spec.rb
-- spec/views/hyrax/base/_browse_everything.html.erb_spec.rb
 - spec/views/hyrax/base/_citations.html.erb_spec.rb
-- spec/views/hyrax/base/_find_work_widget.html.erb_spec.rb
 - spec/views/hyrax/base/_form.html.erb_spec.rb
 - spec/views/hyrax/base/_form_child_work_relationships.html.erb_spec.rb
+- spec/views/hyrax/base/_form_files.html.erb_spec.rb
 - spec/views/hyrax/base/_form_metadata.html.erb_spec.rb
 - spec/views/hyrax/base/_form_progress.html.erb_spec.rb
 - spec/views/hyrax/base/_form_relationships.html.erb_spec.rb
+- spec/views/hyrax/base/_form_rendering.html.erb_spec.rb
 - spec/views/hyrax/base/_items.html.erb_spec.rb
 - spec/views/hyrax/base/_member.html.erb_spec.rb
 - spec/views/hyrax/base/_relationships.html.erb_spec.rb
@@ -3309,15 +3582,29 @@ test_files:
 - spec/views/hyrax/collections/_show_descriptions.html.erb_spec.rb
 - spec/views/hyrax/collections/_show_document_list.html.erb_spec.rb
 - spec/views/hyrax/collections/_show_document_list_row.html.erb_spec.rb
+- spec/views/hyrax/collections/_show_parent_collections.html.erb_spec.rb
+- spec/views/hyrax/collections/_sort_and_per_page.html.erb_spec.rb
+- spec/views/hyrax/collections/_subcollection_list.html.erb_spec.rb
 - spec/views/hyrax/collections/show.html.erb_spec.rb
 - spec/views/hyrax/dashboard/_sidebar.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_form_branding.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_form_discovery.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_form_share_table.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_show_actions.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_descriptions.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_document_list.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_document_list_row.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_show_parent_collections.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_show_subcollection_actions.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_subcollection_list.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_work_action_menu.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/edit.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/show.html.erb_spec.rb
 - spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb
@@ -3337,6 +3624,7 @@ test_files:
 - spec/views/hyrax/homepage/_sortable_featured.html.erb_spec.rb
 - spec/views/hyrax/homepage/index.html.erb_spec.rb
 - spec/views/hyrax/leases/index.html.erb_spec.rb
+- spec/views/hyrax/my/_collection_action_menu.html.erb_spec.rb
 - spec/views/hyrax/my/_search_header.html.erb_spec.rb
 - spec/views/hyrax/my/_work_action_menu.html.erb_spec.rb
 - spec/views/hyrax/my/collections/_list_collections.html.erb_spec.rb