hyrax 4.0.0.beta1 → 4.0.0.beta2

data/CONTAINERS.md

@@ -5,10 +5,13 @@ Our goal is to provide a practical, reusable reference environment for applicati
 
 The [Hyrax Engine Development](#hyrax-engine-development) is further along than the [Docker Image for Hyrax-based Applications](#docker-image-for-hyrax-based-applications) which is further along than [Deploying to Production](#deploying-to-production).
 
-See the [Troubleshooting](#troubleshooting) section if you encounter any issues.
+There are two options for development environments to run: 
+
+- [Dassie](#dassie-internal-test-app-with-activefedora) is the default internal test app that will run an ActiveFedora-based Hyrax web application using Fedora 4 as the backend storage. See [Troubleshooting Dassie](#troubleshooting-dassie) if you encounter any issues.
+- [Koppie](#koppie-internal-test-app-with-valkyrie-connector-to-postgres) is a newer internal test app that is a Valkyrie-based Hyrax web application that runs with PostGres as backend storage. It does not run ActiveFedora or use Fedora 4. See [Troubleshooting Koppie](#troubleshooting-koppie) if you encounter any issues.
 
 <!-- NOTE: This title is referenced in the top-level README.md. Keep that in mind if you change it. -->
-## Hyrax Engine Development
+## Hyrax Engine Development 
 
 We support a `docker-compose`-based development environment for folks working on
 the Hyrax engine. This environment is substantially more like a Hyrax production
@@ -16,6 +19,8 @@ setup than the older `fedora_wrapper`/`solr_wrapper` approach.
 
 First, make sure you have installed [Docker](https://www.docker.com/).  Then clone [the Hyrax repository](https://github.com/samvera/hyrax).
 
+### Dassie internal test app with ActiveFedora
+
 Within your cloned repository, tell Docker to get started installing your development environment:
 
 ```sh
@@ -39,7 +44,7 @@ To stop the containers for the Hyrax-based application, type <kbd>Ctrl</kbd>+<kb
 
 _**Note:** Starting and stopping Docker in this way will preserve your data between restarts._
 
-### Code Changes and Testing
+#### Code Changes and Testing
 
 With `docker-compose up` running, any changes you make to your cloned Hyrax code-base should show up in `http://localhost:3000`; There may be cases where you need to restart your test application (e.g. stop the containers and start them up again).
 
@@ -68,7 +73,7 @@ _**Note:**_ The `bundle exec rspec` portion of the command runs the whole test s
 
 _**Note**: The `/app/samvera/hyrax-webapp` is analogous to the `.internal_test_app` that we generate as part of the Hyrax engine Continuous Integration._
 
-### The Docker Container Named "app"
+#### The Docker Container Named "app"
 
 As a developer, you may need to run commands against the Hyrax-based application and/or the Hyrax engine.  Examples
 of those commands are `rails db:migrate` and `rspec`.  You would run `rails db:migrate` on the Hyrax-based
@@ -92,7 +97,7 @@ docker-compose exec -w /app/samvera/hyrax-engine app sh -c "bundle exec rake -T"
 
 In the two examples, note the difference in the `-w` switch. In the first case, it's referencing the Hyrax-based application. In the latter case, it's referencing the Hyrax engine.
 
-### Debugging
+#### Debugging
 
 If you are interested in running Hyrax in debug mode, this requires a somewhat different approach than running Hyrax bare-metal.  You need to use `docker attach` to debug the running docker instance.
 
@@ -102,9 +107,9 @@ If you are interested in running Hyrax in debug mode, this requires a somewhat d
 
 This advice comes from [Debugging Rails App With Docker Compose: How to use Byebug in a dockerized rails app](https://medium.com/gogox-technology/debugging-rails-app-with-docker-compose-39a3767962f4).
 
-### Troubleshooting
+#### Troubleshooting Dassie
 
-#### Bad Address SOLR
+##### Bad Address SOLR
 
 With `docker-compose up` running, if you see the following, then there may be issues with file permissions:
 
@@ -122,14 +127,53 @@ cp: cannot create directory '/var/solr/data/hyrax_test': Permission denied
 
 The solution that appears to work is to `docker-compose down --volumes`; This will tear down the docker instance, and remove the volumes.  You can then run `docker-compose up` to get back to work.  _**Note:** the `--volumes` switch will remove all custom data._
 
-#### Errors building the Docker image
+##### Errors building the Docker image
 
 If you encounter errors running `docker-compose build`, try running `bundle update` in `./hyrax` as well as within `./hyrax/.dassie`. That can help clear up the problem of a failure to build a particular gem.
 
-#### Containers do not all start
+##### Containers do not all start
 
 If any of the services fail to start on `docker-compose up`, try clearing out any `Gemfile.lock` files that might exist in `./hyrax` or `./hyrax/.dassie` and run `docker-compose build` again, then `docker-compose up` again.
 
+### Koppie Internal Test App with Valkyrie Connector to Postgres
+
+Build docker images for Koppie: `docker compose -f docker-compose-koppie.yml build`
+
+Start Koppie: `docker compose -f docker-compose-koppie.yml up`
+
+This starts containers for:
+
+  - a `hyrax` test application (`.koppie`);
+  - Solr
+  - Postgresql
+  - Redis
+  - Memcached
+  - SideKiq (for background jobs)
+
+It also runs database migrations. This will also bring up a development application on `http://localhost:3001`.
+
+To stop the containers for the Hyrax-based application, type <kbd>Ctrl</kbd>+<kbd>c</kbd>. To restart the containers run `docker compose -f docker-compose-koppie.yml up`.
+
+_**Note:** Starting and stopping Docker in this way will preserve your data between restarts._
+
+Koppie runs as a different project than Dassie, so it should be possible to run both concurrently (assuming your workstation has enough RAM).
+
+#### Run rails console on Koppie
+
+Currently Koppie should not be used for running specs. See [Code Changes and Testing](#code-changes-and-testing) under Dassie instead until the specs can be updated for a valkyrie only environment.
+
+```sh
+docker compose -f docker-compose-koppie.yml up
+docker compose -f docker-compose-koppie.yml exec app bundle exec rails c
+```
+#### Troubleshooting Koppie
+
+If the postgres service logs show permissions errors, there may be old data from alternate versions of the postgres image. The old data volumes can deleted by using `docker compose -f docker-compose-koppie.yml down -v`
+
+Errors such as `exec /app/samvera/hyrax-entrypoint.sh: no such file or directory` in the app, sidekiq and db_migrate services may indicate an outdated cached hyrax-base image layer was used to build the koppie image. Try `docker compose -f docker-compose-koppie.yml build --no-cache`  to rebuild all the image layers.
+
+It was also seen on a Windows 10 host and was resolved by using the git `--core.autocrlf` option when cloning the repo.
+
 <!-- NOTE: This title is referenced in the top-level documentation/developing-your-hyrax-based-app.md. Keep that in mind if you change it. -->
 ## Docker Image for Hyrax-based Applications
 
@@ -185,4 +229,4 @@ helm install -n hyrax --set image.tag=(git rev-parse HEAD) dassie chart/hyrax
 ```
 
 [ghcr]: https://docs.github.com/en/enterprise-cloud@latest/packages/working-with-a-github-packages-registry/working-with-the-container-registry
-[samvera-packages]: https://github.com/orgs/samvera/packages
+[samvera-packages]: https://github.com/orgs/samvera/packages

data/Dockerfile

@@ -3,9 +3,11 @@ FROM ruby:$RUBY_VERSION-alpine3.15 as hyrax-base
 
 ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"
+ARG RUBYGEMS_VERSION=3.3.20
 
 RUN apk --no-cache upgrade && \
-  apk --no-cache add build-base \
+  apk --no-cache add acl \
+  build-base \
   curl \
   gcompat \
   imagemagick \
@@ -16,12 +18,13 @@ RUN apk --no-cache upgrade && \
   $DATABASE_APK_PACKAGE \
   $EXTRA_APK_PACKAGES
 
+RUN setfacl -d -m o::rwx /usr/local/bundle && \
+  gem update --system $RUBYGEMS_VERSION
+
 RUN addgroup -S --gid 101 app && \
   adduser -S -G app -u 1001 -s /bin/sh -h /app app
 USER app
 
-RUN gem update bundler
-
 RUN mkdir -p /app/samvera/hyrax-webapp
 WORKDIR /app/samvera/hyrax-webapp
 
@@ -87,9 +90,10 @@ ENV HYRAX_ENGINE_PATH /app/samvera/hyrax-engine
 COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 COPY --chown=1001:101 . /app/samvera/hyrax-engine
 
-RUN gem update bundler && gem cleanup bundler && bundle -v && \
+RUN bundle -v && \
   bundle install --jobs "$(nproc)" && \
-  cd $HYRAX_ENGINE_PATH && bundle install --jobs "$(nproc)"
+  cd $HYRAX_ENGINE_PATH && \
+  bundle install --jobs "$(nproc)"
 RUN RAILS_ENV=production SECRET_KEY_BASE='fakesecret1234' DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
 

data/app/actors/hyrax/actors/collections_membership_actor.rb

@@ -70,7 +70,6 @@ module Hyrax
       # along side the FileSets on the show page
       def add(env, id)
         collection = Hyrax.config.collection_class.find(id)
-        collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
 
         return unless env.current_ability.can?(:deposit, collection)
         env.curation_concern.member_of_collections << collection
@@ -108,7 +107,7 @@ module Hyrax
 
         # Do not apply permissions to work if collection type is configured not to
         collection = Hyrax.config.collection_class.find(collection_id)
-        return unless collection.share_applies_to_new_works?
+        return unless Hyrax::CollectionType.for(collection: collection).share_applies_to_new_works?
 
         # Save the collection id in env for use in apply_permission_template_actor
         env.attributes[:collection_id] = collection_id

data/app/actors/hyrax/actors/create_with_files_actor.rb

@@ -40,7 +40,7 @@ module Hyrax
         expected_user_id = env.user.id
         files.each do |file|
           if file.user_id != expected_user_id
-            Rails.logger.error "User #{env.user.user_key} attempted to ingest uploaded_file #{file.id}, but it belongs to a different user"
+            Hyrax.logger.error "User #{env.user.user_key} attempted to ingest uploaded_file #{file.id}, but it belongs to a different user"
             return false
           end
         end

data/app/actors/hyrax/actors/create_with_remote_files_actor.rb

@@ -62,7 +62,7 @@ module Hyrax
             # Escape any space characters, so that this is a legal URI
             uri = URI.parse(Addressable::URI.escape(file_info[:url]))
             unless self.class.validate_remote_url(uri)
-              Rails.logger.error "User #{user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
+              Hyrax.logger.error "User #{user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
               return false
             end
             auth_header = file_info.fetch(:auth_header, {})
@@ -84,7 +84,7 @@ module Hyrax
               path.start_with?(dir) && path.length > dir.length
             end
           else
-            Rails.logger.debug "Assuming #{uri.scheme} uri is valid without a serious attempt to validate: #{uri}"
+            Hyrax.logger.debug "Assuming #{uri.scheme} uri is valid without a serious attempt to validate: #{uri}"
             true
           end
         end

data/app/actors/hyrax/actors/embargo_actor.rb

@@ -12,10 +12,17 @@ module Hyrax
       # Update the visibility of the work to match the correct state of the embargo, then clear the embargo date, etc.
       # Saves the embargo and the work
       def destroy
-        work.embargo_visibility! # If the embargo has lapsed, update the current visibility.
-        work.deactivate_embargo!
-        work.embargo.save!
-        work.save!
+        case work
+        when Valkyrie::Resource
+          embargo_manager = Hyrax::EmbargoManager.new(resource: work)
+          embargo_manager.release && Hyrax::AccessControlList(work).save
+          embargo_manager.nullify
+        else
+          work.embargo_visibility! # If the embargo has lapsed, update the current visibility.
+          work.deactivate_embargo!
+          work.embargo.save!
+          work.save!
+        end
       end
     end
   end

data/app/actors/hyrax/actors/lease_actor.rb

@@ -12,10 +12,17 @@ module Hyrax
       # Update the visibility of the work to match the correct state of the lease, then clear the lease date, etc.
       # Saves the lease and the work
       def destroy
-        work.lease_visibility! # If the lease has lapsed, update the current visibility.
-        work.deactivate_lease!
-        work.lease.save!
-        work.save!
+        case work
+        when Valkyrie::Resource
+          lease_manager = Hyrax::LeaseManager.new(resource: work)
+          lease_manager.release && Hyrax::AccessControlList(work).save
+          lease_manager.nullify
+        else
+          work.lease_visibility! # If the lease has lapsed, update the current visibility.
+          work.deactivate_lease!
+          work.lease.save!
+          work.save!
+        end
       end
     end
   end

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

@@ -104,7 +104,7 @@ Hyrax = {
         // On the edit work page
         new PermissionsControl($("#share"), 'tmpl-work-grant');
         // On the edit fileset page
-        new PermissionsControl($("#permission"), 'tmpl-file-set-grant');
+        new PermissionsControl($("#permission"), 'tmpl-file-set-grant', { with_visibility_component: true });
         // On the batch edit page
         new PermissionsControl($("#form_permissions"), 'tmpl-work-grant');
         // On the edit collection page

data/app/assets/javascripts/hyrax/permissions/control.es6

@@ -1,6 +1,7 @@
 import { Registry } from './registry'
 import { UserControls } from './user_controls'
 import { GroupControls } from './group_controls'
+import VisibilityComponent from '../save_work/visibility_component'
 
 export default class PermissionsControl {
   /**
@@ -8,7 +9,8 @@ export default class PermissionsControl {
    * @param {jQuery} element the jquery selector for the permissions container
    * @param {String} template_id the identifier of the template for the added elements
    */
-  constructor(element, template_id) {
+  constructor(element, template_id, options = {}) {
+    const { with_visibility_component } = options
     if (element.length === 0) {
       return
     }
@@ -17,6 +19,11 @@ export default class PermissionsControl {
     this.registry = new Registry(this.element, this.object_name(), template_id)
     this.user_controls = new UserControls(this.element, this.registry)
     this.group_controls = new GroupControls(this.element, this.registry)
+    if (with_visibility_component) {
+      this.visibility_component = new VisibilityComponent(this.element)
+    } else {
+      this.visibility_component = null
+    }
   }
 
   // retrieve object_name the name of the object to create

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

@@ -105,33 +105,14 @@ body.dashboard {
     margin-bottom: 20px;
     padding: $card-spacer-y $card-spacer-x;
 
-    .btn-group > .facet-values {
-      display: none;
-    }
-    .btn-group.show > .facet-values.show {
-      display: table;
-    }
-
-    .facet-values {
-      width: 20em; // TODO: make this responsive.
+    .dropdown-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
     }
 
     .facet-label {
-      padding: 3px 20px;
-      font-weight: 400;
-      line-height: 1.42857143;
-      color: #333;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .facet-count {
-      padding: 3px 20px;
-      font-weight: 400;
-      line-height: 1.42857143;
-      color: #333;
-      white-space: nowrap;
+      padding-right: 20px;
     }
   }
 
@@ -176,44 +157,6 @@ body.dashboard {
   }
 }
 
-.dropdown-item {
-  display: list-item;
-
-  > .facet-values {
-    display: table;
-    table-layout: fixed;
-
-    > .facet-label {
-      display: table-cell;
-      hyphens: auto;
-      text-indent: -0.938rem;
-    }
-
-    > .facet-count {
-      display: table-cell;
-      text-align: right;
-    }
-  }
-}
-
-ul#visibility_ssi-dropdown-options {
-  table-layout: fixed;
-
-  > li {
-    display: table-row;
-
-    > .facet-label {
-      display: table-cell;
-      hyphens: auto;
-    }
-
-    > .facet-count {
-      display: table-cell;
-      text-align: right;
-    }
-  }
-}
-
 .card.tabs {
   background-color: transparent;
 

data/app/components/hyrax/dropdown_facet_field_component.html.erb

@@ -0,0 +1,21 @@
+<fieldset class="btn-group">
+  <legend class="sr-only"><%= @facet_field.label %></legend>
+  <button class="btn btn-secondary dropdown-toggle" type="button" id="<%= @facet_field.key.parameterize %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" aria-controls="<%= @facet_field.key.parameterize + '-dropdown-options' %>">
+    <%= @facet_field.label %>
+  </button>
+  <ul class="dropdown-menu" id="<%= @facet_field.key.parameterize + '-dropdown-options' %>">
+    <% facet_item_presenters.each do |item| -%>
+      <li class="dropdown-item">
+        <%= render Blacklight::FacetItemComponent.new(facet_item: item, wrapping_element: nil) %>
+      </li>
+    <% end %>
+
+    <% if @facet_field.modal_path %>
+      <li class="dropdown-item more_facets">
+        <%= link_to t("more_#{@facet_field.key}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: @facet_field.label),
+          @facet_field.modal_path,
+          data: { blacklight_modal: 'trigger' } %>
+      </li>
+    <% end %>
+  </ul>
+</fieldset>

data/app/components/hyrax/dropdown_facet_field_component.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+module Hyrax
+  class DropdownFacetFieldComponent < Blacklight::FacetFieldListComponent
+    def facet_item_presenters
+      return to_enum(:facet_item_presenters) unless block_given?
+
+      @facet_field.paginator.items.each do |item|
+        skipped = facet_config.skip_item&.call(item)
+
+        yield facet_item_presenter(item) unless skipped
+
+        item.items&.each do |subitem|
+          yield facet_item_presenter(subitem.dup.tap { |i| i.fq = nil if skipped })
+        end
+      end
+    end
+
+    def facet_item_presenter(facet_item)
+      config = facet_config(facet_item.field)
+
+      (config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, config, helpers, facet_item.field)
+    end
+
+    def facet_config(key = nil)
+      return @facet_field.facet_field if key.nil?
+
+      helpers.blacklight_config.facet_fields[key]
+    end
+  end
+end

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

@@ -66,13 +66,6 @@ module Hyrax
       Hyrax::SearchService.new(config: blacklight_config, user_params: params.except(:q, :page), scope: self, search_builder_class: single_item_search_builder_class)
     end
 
-    # Instantiates the search builder that builds a query for a single item
-    # this is useful in the show view.
-    def single_item_search_builder
-      search_service.search_builder
-    end
-    deprecation_deprecate :single_item_search_builder
-
     def collection_params
       form_class.model_attributes(params[:collection])
     end
@@ -83,11 +76,15 @@ module Hyrax
       @_prefixes ||= super + ['catalog', 'hyrax/base']
     end
 
+    # rubocop:disable Style/GuardClause
     def query_collection_members
       load_member_works
-      load_member_subcollections if collection.collection_type.nestable?
-      load_parent_collections if collection.collection_type.nestable? && action_name == 'show'
+      if Hyrax::CollectionType.for(collection: collection).nestable?
+        load_member_subcollections
+        load_parent_collections if action_name == 'show'
+      end
     end
+    # rubocop:enable Style/GuardClause
 
     # Instantiate the membership query service
     def collection_member_service

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

@@ -15,8 +15,8 @@ module Hyrax
     # Removes a single embargo
     def destroy
       Hyrax::Actors::EmbargoActor.new(curation_concern).destroy
-      flash[:notice] = curation_concern.embargo_history.last
-      if curation_concern.work? && curation_concern.file_sets.present?
+      flash[:notice] = embargo_history(curation_concern)
+      if curation_concern.work? && work_has_file_set_members?(curation_concern)
         redirect_to confirm_permission_path
       else
         redirect_to edit_embargo_path
@@ -60,10 +60,19 @@ module Hyrax
     end
 
     def edit
+      @curation_concern = Hyrax::Forms::WorkEmbargoForm.new(curation_concern).prepopulate! if
+        Hyrax.config.use_valkyrie?
       add_breadcrumb t(:'hyrax.controls.home'), root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.embargoes.index.manage_embargoes'), hyrax.embargoes_path
       add_breadcrumb t(:'hyrax.embargoes.edit.embargo_update'), '#'
     end
+
+    private
+
+    def embargo_history(concern)
+      concern.try(:embargo_history) ||
+        concern.try(:embargo)&.embargo_history
+    end
   end
 end

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

@@ -15,8 +15,8 @@ module Hyrax
     # Removes a single lease
     def destroy
       Hyrax::Actors::LeaseActor.new(curation_concern).destroy
-      flash[:notice] = curation_concern.lease_history.last
-      if curation_concern.work? && curation_concern.file_sets.present?
+      flash[:notice] = lease_history(curation_concern)&.last
+      if curation_concern.work? && work_has_file_set_members?(curation_concern)
         redirect_to confirm_permission_path
       else
         redirect_to edit_lease_path
@@ -51,10 +51,19 @@ module Hyrax
     end
 
     def edit
+      @curation_concern = Hyrax::Forms::WorkLeaseForm.new(curation_concern).prepopulate! if
+        Hyrax.config.use_valkyrie?
       add_breadcrumb t(:'hyrax.controls.home'), root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.leases.index.manage_leases'), hyrax.leases_path
       add_breadcrumb t(:'hyrax.leases.edit.lease_update'), '#'
     end
+
+    private
+
+    def lease_history(concern)
+      concern.try(:lease_history) ||
+        concern.try(:lease)&.lease_history
+    end
   end
 end

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

@@ -6,7 +6,8 @@ module Hyrax
     included do
       attr_accessor :curation_concern
       helper_method :curation_concern
-      load_and_authorize_resource class: ActiveFedora::Base, instance_name: :curation_concern
+      base_class = Hyrax.config.use_valkyrie? ? Hyrax::Resource : ActiveFedora::Base
+      load_and_authorize_resource class: base_class, instance_name: :curation_concern, except: [:index]
     end
 
     # This is an override of Hyrax::ApplicationController
@@ -15,5 +16,16 @@ module Hyrax
     end
 
     def edit; end
+
+    private
+
+    def work_has_file_set_members?(work)
+      case work
+      when Valkyrie::Resource
+        Hyrax.custom_queries.find_child_file_set_ids(resource: work).any?
+      else
+        work.file_sets.present?
+      end
+    end
   end
 end

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

@@ -189,7 +189,8 @@ module Hyrax
           'work_resource.add_to_parent' => { parent_id: params[:parent_id], user: current_user },
           'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
           'change_set.set_user_as_depositor' => { user: current_user },
-          'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) }
+          'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) },
+          'work_resource.save_acl' => { permissions_params: form.input_params["permissions"] }
         )
         .call(form)
       @curation_concern = result.value_or { return after_create_error(transaction_err_msg(result)) }
@@ -202,7 +203,8 @@ module Hyrax
       result =
         transactions['change_set.update_work']
         .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
-                        'work_resource.update_work_members' => { work_members_attributes: work_members_attributes })
+                        'work_resource.update_work_members' => { work_members_attributes: work_members_attributes },
+                        'work_resource.save_acl' => { permissions_params: form.input_params["permissions"] })
         .call(form)
       @curation_concern = result.value_or { return after_update_error(transaction_err_msg(result)) }
       after_update_response

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

@@ -30,7 +30,6 @@ module Hyrax
         after_update_error(err_msg) if err_msg.present?
         return if err_msg.present?
 
-        @collection.try(:reindex_extent=, Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
         begin
           Hyrax::Collections::CollectionMemberService.add_members_by_ids(collection_id: collection_id,
                                                                          new_member_ids: batch_ids,

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

@@ -165,7 +165,7 @@ module Hyrax
           end
         end
       rescue StandardError => err
-        Rails.logger.error(err)
+        Hyrax.logger.error(err)
         after_destroy_error(params[:id])
       end
 
@@ -190,7 +190,7 @@ module Hyrax
         @collection.collection_type_gid = params[:collection_type_gid].presence || default_collection_type.to_global_id
         @collection.attributes = collection_params.except(:members, :parent_id, :collection_type_gid)
         @collection.apply_depositor_metadata(current_user.user_key)
-        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
+        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless Hyrax::CollectionType.for(collection: @collection).discoverable?
         if @collection.save
           after_create_response
         else
@@ -218,9 +218,7 @@ module Hyrax
         process_member_changes
         process_branding
 
-        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
-        # we don't have to reindex the full graph when updating collection
-        @collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
+        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless Hyrax::CollectionType.for(collection: @collection).discoverable?
         if @collection.update(collection_params.except(:members))
           after_update_response
         else
@@ -422,7 +420,6 @@ module Hyrax
           params.permit(collection: {})[:collection]
                 .merge(params.permit(:collection_type_gid)
                              .with_defaults(collection_type_gid: default_collection_type_gid))
-                .merge(member_of_collection_ids: Array(params[:parent_id]))
         end
       end
 
@@ -485,7 +482,7 @@ module Hyrax
           params[:destination_collection_id]
         flash[:notice] = "Successfully moved #{batch.count} files to #{destination_title} Collection."
       rescue StandardError => err
-        Rails.logger.error(err)
+        Hyrax.logger.error(err)
         destination_title =
           Hyrax.query_service.find_by(id: params[:destination_collection_id]).title.first ||
           destination_id

data/app/controllers/hyrax/file_sets_controller.rb

@@ -13,6 +13,7 @@ module Hyrax
     before_action do
       blacklight_config.track_search_session = false
     end
+    before_action :presenter
 
     # provides the help_text view method
     helper PermissionsHelper

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

@@ -12,6 +12,7 @@ module Hyrax
           config.add_facet_field Hyrax.config.collection_type_index_field,
                                  helper_method: :collection_type_label, limit: 5,
                                  pivot: ['has_model_ssim', Hyrax.config.collection_type_index_field],
+                                 skip_item: ->(item) { item.value == "Collection" },
                                  label: I18n.t('hyrax.dashboard.my.heading.collection_type')
           # This causes AdminSets to also be shown with the Collection Type label
           config.add_facet_field 'has_model_ssim',