hyrax 3.4.2 → 4.0.0.beta2

data/.regen

@@ -1 +1,2 @@
-46
+# When updating CI regen seed, set to current date.
+2022-07-01T00

data/.rubocop.yml

@@ -5,7 +5,7 @@ inherit_gem:
   bixby: bixby_default.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   DisplayCopNames: true
   Exclude:
     - 'db/**/*'

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/CONTRIBUTING.md

@@ -11,17 +11,6 @@ experience for all its members, whether they are at a formal gathering, in
 a social setting, or taking part in activities online. Please see our
 [Code of Conduct](CODE_OF_CONDUCT.md) for more information.
 
-## Samvera Community Intellectual Property Licensing and Ownership
-
-All code contributors must have an Individual Contributor License Agreement
-(iCLA) on file with the Samvera Steering Group. If the contributor works for
-an institution, the institution must have a Corporate Contributor License
-Agreement (cCLA) on file.
-
-https://wiki.lyrasis.org/display/samvera/Samvera+Community+Intellectual+Property+Licensing+and+Ownership
-
-You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
-
 ## Language
 
 The language we use matters.  Today, tomorrow, and for years to come
@@ -67,15 +56,22 @@ further details.
 
 * Fork the repository on GitHub
 * Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
-  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
-  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
-  * Please avoid working directly on the `master` branch.
+  * This is usually the `main` branch.
+  * To quickly create a topic branch based on `main`; `git branch fix/main/my_contribution main`
+  * Then checkout the new branch with `git checkout fix/main/my_contribution`.
+  * Please avoid working directly on the `main` branch.
+  * Please do not create a branch called `master`. (See note below.)
   * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
 * Make sure you have added sufficient tests and documentation for your changes.
   * Test functionality with RSpec; Test features / UI with Capybara.
 * Run _all_ the tests to assure nothing else was accidentally broken.
 
+NOTE: This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) 
+and [language recommendations](#language).  
+Please ***do not*** create a branch called `master` for this repository or as part of 
+your pull request; the branch will either need to be removed or renamed before it can 
+be considered for inclusion in the code base and history of this repository.
+
 ### Documenting Code
 
 * All new public methods, modules, and classes should include inline documentation in [YARD](http://yardoc.org/).
@@ -131,15 +127,15 @@ further details.
 ### Submitting Changes
 
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
-* Make sure your branch is up to date with its parent branch (i.e. master)
-  * `git checkout master`
+* Make sure your branch is up to date with its parent branch (i.e. main)
+  * `git checkout main`
   * `git pull --rebase`
   * `git checkout <your-branch>`
-  * `git rebase master`
+  * `git rebase main`
   * It is a good idea to run your tests again.
 * If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
   * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * `git rebase --interactive main` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.
@@ -149,12 +145,14 @@ further details.
 We adopted [Github's Pull Request Review](https://help.github.com/articles/about-pull-request-reviews/) for our repositories.
 Common checks that may occur in our repositories:
 
-1. Travis CI - where our automated tests are running
-2. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
+1. [CircleCI](https://circleci.com/gh/samvera) - where our automated tests are running
+2. RuboCop/Bixby - where we check for style violations
+3. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
+4. CodeClimate - is our code remaining healthy (at least according to static code analysis)
 
 If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
 
-*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (Travis CI is usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
+*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (CI tests are usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
 
 #### Things to Consider When Reviewing
 
@@ -171,7 +169,7 @@ This is your chance for a mentoring moment of another developer. Take time to gi
   * Do new or changed methods, modules, and classes have documentation?
   * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
   * Does the description of the new/changed specs match your understanding of what the spec is doing?
-  * Did the Travis tests complete successfully?
+  * Did the Continuous Integration tests complete successfully?
 
 If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
 
@@ -180,4 +178,4 @@ If you are uncertain, bring other contributors into the conversation by assignin
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
 * [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
-* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/Dockerfile

@@ -1,11 +1,13 @@
-ARG RUBY_VERSION=2.7.5
+ARG RUBY_VERSION=2.7.6
 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/Rakefile

@@ -9,10 +9,6 @@ end
 
 Bundler::GemHelper.install_tasks
 
-import "#{Gem.loaded_specs['jasmine'].full_gem_path}/lib/jasmine/tasks/jasmine.rake"
-
-# Set up the test application prior to running jasmine tasks.
-task 'jasmine:require' => :setup_test_server
 task :setup_test_server do
   require 'engine_cart'
   EngineCart.load_application!

data/app/actors/hyrax/actors/base_actor.rb

@@ -37,7 +37,7 @@ module Hyrax
       # @return [Boolean] true if destroy was successful
       def destroy(env)
         env.curation_concern.in_collection_ids.each do |id|
-          destination_collection = Hyrax.config.collection_class.find(id)
+          destination_collection = ::Collection.find(id)
           destination_collection.members.delete(env.curation_concern)
           destination_collection.update_index
         end

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
@@ -93,19 +93,13 @@ module Hyrax
 
         def create_file_from_url(uri, file_name, auth_header)
           import_url = URI.decode_www_form_component(uri.to_s)
-          use_valkyrie = false
-          case curation_concern
-          when Valkyrie::Resource
-            file_set = Hyrax.persister.save(resource: Hyrax::FileSet.new(import_url: import_url, label: file_name))
-            use_valkyrie = true
-          else
-            file_set = ::FileSet.new(import_url: import_url, label: file_name)
-          end
-          __create_file_from_url(file_set: file_set, uri: uri, auth_header: auth_header, use_valkyrie: use_valkyrie)
+          file_set = ::FileSet.new(import_url: import_url, label: file_name)
+
+          __create_file_from_url(file_set: file_set, uri: uri, auth_header: auth_header)
         end
 
-        def __create_file_from_url(file_set:, uri:, auth_header:, use_valkyrie: Hyrax.config.use_valkyrie?)
-          actor = file_set_actor_class.new(file_set, user, use_valkyrie: use_valkyrie)
+        def __create_file_from_url(file_set:, uri:, auth_header:)
+          actor = file_set_actor_class.new(file_set, user)
           actor.create_metadata(visibility: curation_concern.visibility)
           actor.attach_to_work(curation_concern)
           file_set.save! if file_set.respond_to?(:save!)

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/file_actor.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'wings/services/file_metadata_builder'
 
 module Hyrax
   module Actors
@@ -11,8 +10,7 @@ module Hyrax
       # @param [FileSet] file_set the parent FileSet
       # @param [Symbol, #to_sym] relation the type/use for the file
       # @param [User] user the user to record as the Agent acting upon the file
-      def initialize(file_set, relation, user, use_valkyrie: Hyrax.config.query_index_from_valkyrie)
-        @use_valkyrie = use_valkyrie
+      def initialize(file_set, relation, user)
         @file_set = file_set
         @relation = normalize_relation(relation)
         @user = user
@@ -25,7 +23,14 @@ module Hyrax
       # @see IngestJob
       # @todo create a job to monitor the temp directory (or in a multi-worker system, directories!) to prune old files that have made it into the repo
       def ingest_file(io)
-        use_valkyrie ? perform_ingest_file_through_valkyrie(io) : perform_ingest_file_through_active_fedora(io)
+        Hydra::Works::AddFileToFileSet.call(file_set,
+                                            io,
+                                            relation,
+                                            versioning: false)
+        return false unless file_set.save
+        repository_file = related_file
+        create_version(repository_file, user)
+        CharacterizeJob.perform_later(file_set, repository_file.id, pathhint(io))
       end
 
       # Reverts file and spawns async job to characterize and create derivatives.
@@ -63,39 +68,6 @@ module Hyrax
         file_set.public_send(normalize_relation(relation)) || raise("No #{relation} returned for FileSet #{file_set.id}")
       end
 
-      def perform_ingest_file_through_active_fedora(io)
-        # Skip versioning because versions will be minted by VersionCommitter as necessary during save_characterize_and_record_committer.
-        Hydra::Works::AddFileToFileSet.call(file_set,
-                                            io,
-                                            relation,
-                                            versioning: false)
-        return false unless file_set.save
-        repository_file = related_file
-        create_version(repository_file, user)
-        CharacterizeJob.perform_later(file_set, repository_file.id, pathhint(io))
-      end
-
-      def perform_ingest_file_through_valkyrie(io) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        Deprecation.warn "FileActor support for Valkyrie was experimental and " \
-                         "is slated to be removed in favor of WorkUploadsHandler."
-        file =
-          begin
-            Hyrax.storage_adapter.upload(resource: file_set, file: io, original_filename: io.original_name, use: relation)
-          rescue StandardError => err
-            Rails.logger.error("Failed to save file_metadata through valkyrie: #{err.message}")
-            return false
-          end
-        file_metadata = Hyrax.custom_queries.find_file_metadata_by(id: file.id)
-        create_version(file_metadata, user)
-
-        file_set.file_ids << file_metadata.id
-        file_set.original_file_id = file_metadata.id
-        Hyrax.persister.save(resource: file_set)
-        Hyrax.publisher.publish('object.metadata.updated', object: file_set, user: user)
-        CharacterizeJob.perform_later(file_set, file_metadata.id.to_s, pathhint(io))
-        file_metadata
-      end
-
       def normalize_relation(relation)
         use_valkyrie ? normalize_relation_for_valkyrie(relation) : normalize_relation_for_active_fedora(relation)
       end

data/app/actors/hyrax/actors/file_set_actor.rb

@@ -4,10 +4,9 @@ module Hyrax
     # Actions are decoupled from controller logic so that they may be called from a controller or a background job.
     class FileSetActor # rubocop:disable Metrics/ClassLength
       include Lockable
-      attr_reader :file_set, :user, :attributes, :use_valkyrie
+      attr_reader :file_set, :user, :attributes
 
-      def initialize(file_set, user, use_valkyrie: Hyrax.config.query_index_from_valkyrie)
-        @use_valkyrie = use_valkyrie
+      def initialize(file_set, user)
         @file_set = file_set
         @user = user
       end
@@ -71,42 +70,17 @@ module Hyrax
       def attach_to_work(work, file_set_params = {})
         acquire_lock_for(work.id) do
           # Ensure we have an up-to-date copy of the members association, so that we append to the end of the list.
-          if valkyrie_object?(work)
-            attach_to_valkyrie_work(work, file_set_params)
-          else
-            attach_to_af_work(work, file_set_params)
-          end
+          work.reload unless work.new_record?
+          file_set.visibility = work.visibility unless assign_visibility?(file_set_params)
+          work.ordered_members << file_set
+          work.representative = file_set if work.representative_id.blank?
+          work.thumbnail = file_set if work.thumbnail_id.blank?
+          # Save the work so the association between the work and the file_set is persisted (head_id)
+          # NOTE: the work may not be valid, in which case this save doesn't do anything.
+          work.save
           Hyrax.config.callback.run(:after_create_fileset, file_set, user, warn: false)
         end
       end
-      alias attach_file_to_work attach_to_work
-      deprecation_deprecate attach_file_to_work: "use attach_to_work instead"
-
-      def attach_to_valkyrie_work(work, file_set_params)
-        work = Hyrax.query_service.find_by(id: work.id) unless work.new_record
-        file_set.visibility = work.visibility unless assign_visibility?(file_set_params)
-        fs = Hyrax.persister.save(resource: file_set)
-        Hyrax.publisher.publish('object.metadata.updated', object: fs, user: user)
-        work.member_ids << fs.id
-        work.representative_id = fs.id if work.representative_id.blank?
-        work.thumbnail_id = fs.id if work.thumbnail_id.blank?
-        # Save the work so the association between the work and the file_set is persisted (head_id)
-        # NOTE: the work may not be valid, in which case this save doesn't do anything.
-        Hyrax.persister.save(resource: work)
-        Hyrax.publisher.publish('object.metadata.updated', object: work, user: user)
-      end
-
-      # Adds a FileSet to the work using ore:Aggregations.
-      def attach_to_af_work(work, file_set_params)
-        work.reload unless work.new_record?
-        file_set.visibility = work.visibility unless assign_visibility?(file_set_params)
-        work.ordered_members << file_set
-        work.representative = file_set if work.representative_id.blank?
-        work.thumbnail = file_set if work.thumbnail_id.blank?
-        # Save the work so the association between the work and the file_set is persisted (head_id)
-        # NOTE: the work may not be valid, in which case this save doesn't do anything.
-        work.save
-      end
 
       # @param [String] revision_id the revision to revert to
       # @param [Symbol, #to_sym] relation
@@ -144,8 +118,7 @@ module Hyrax
       end
 
       def build_file_actor(relation)
-        fs = use_valkyrie ? file_set.valkyrie_resource : file_set
-        file_actor_class.new(fs, relation, user, use_valkyrie: use_valkyrie)
+        file_actor_class.new(file_set, relation, user)
       end
 
       # uses create! because object must be persisted to serialize for jobs
@@ -194,32 +167,10 @@ module Hyrax
         work.save!
       end
 
-      # switches between using valkyrie to save or active fedora to save
       def perform_save(object)
-        obj_to_save = object_to_act_on(object)
-        if valkyrie_object?(obj_to_save)
-          saved_resource = Hyrax.persister.save(resource: obj_to_save)
-          # return the same type of object that was passed in
-          saved_object_to_return = valkyrie_object?(object) ? saved_resource : Wings::ActiveFedoraConverter.new(resource: saved_resource).convert
-        else
-          obj_to_save.save
-          saved_object_to_return = obj_to_save
-        end
-        saved_object_to_return
-      end
-
-      # if passed a resource or if use_valkyrie==true, object to act on is the valkyrie resource
-      def object_to_act_on(object)
-        return object if valkyrie_object?(object)
-        use_valkyrie ? object.valkyrie_resource : object
-      end
-
-      # determine if the object is a valkyrie resource
-      def valkyrie_object?(object)
-        object.is_a? Valkyrie::Resource
+        object.save
+        object
       end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/CyclomaticComplexity
     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

@@ -92,7 +92,7 @@ Hyrax = {
     // Popover help modals. Used on the user profile page.
     popovers: function () {
         $("a[data-toggle=popover]").popover({html: true})
-            .click(function () {
+            .on("click", function () {
                 return false;
             });
     },
@@ -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/batch.js

@@ -1,10 +1,10 @@
 Blacklight.onLoad(function() {
-  $('#show_addl_descriptions').click(function() {
+  $('#show_addl_descriptions').on('click', function() {
     $('#more_descriptions').show();
     $('#show_addl_descriptions').hide();
     return false;
   });
-  $('#hide_addl_descriptions').click(function() {
+  $('#hide_addl_descriptions').on('click', function() {
     $('#more_descriptions').hide();
     $('#show_addl_descriptions').show();
     return false;