hyrax 4.0.0.beta1 → 4.0.0.rc1

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
 
@@ -147,8 +191,8 @@ We publish several Hyrax images to the [GitHub container registry][ghcr] under
 the [Samvera organization][samvera-packages].  To build them:
 
 ```sh
-export HYRAX_VERSION=v3.4.1 # or desired version
-git checkout $HYRAX_VERSION
+export HYRAX_VERSION=v4.0.0.rc1 # or desired version
+git checkout hyrax-$HYRAX_VERSION
 
 docker build --target hyrax-base --tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) .
 
@@ -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

@@ -45,7 +45,7 @@ further details.
 ### Reporting Issues
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a [Github issue](https://github.com/samvera/{{library}}/issues/) by:
+* Submit a [Github issue](https://github.com/samvera/hyrax/issues/) by:
   * Clearly describing the issue
     * Provide a descriptive summary
     * Explain the expected behavior
@@ -178,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,23 @@
-ARG RUBY_VERSION=2.7.6
-FROM ruby:$RUBY_VERSION-alpine3.15 as hyrax-base
+ARG RUBY_VERSION=2.7.7
+
+# Replace with official jemalloc package in alpine 3.17
+FROM ruby:$RUBY_VERSION-alpine3.16 as builder
+RUN apk add build-base curl
+RUN curl -sL https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 | tar -xj && \
+    cd jemalloc-5.3.0 && \
+    ./configure && \
+    make && \
+    make install
+
+FROM ruby:$RUBY_VERSION-alpine3.16 as hyrax-base
 
 ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"
+ARG RUBYGEMS_VERSION=""
 
 RUN apk --no-cache upgrade && \
-  apk --no-cache add build-base \
+  apk --no-cache add acl \
+  build-base \
   curl \
   gcompat \
   imagemagick \
@@ -16,12 +28,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
 
@@ -30,6 +43,9 @@ ENV PATH="/app/samvera:$PATH"
 ENV RAILS_ROOT="/app/samvera/hyrax-webapp"
 ENV RAILS_SERVE_STATIC_FILES="1"
 
+COPY --from=builder /usr/local/lib/libjemalloc.so.2 /usr/local/lib/
+ENV LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"
+
 ENTRYPOINT ["hyrax-entrypoint.sh"]
 CMD ["bundle", "exec", "puma", "-v", "-b", "tcp://0.0.0.0:3000"]
 
@@ -46,22 +62,21 @@ ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nu
 
 FROM hyrax-base as hyrax-worker-base
 
-ENV MALLOC_ARENA_MAX=2
-
 USER root
 RUN apk --no-cache add bash \
   ffmpeg \
   mediainfo \
-  openjdk11-jre \
+  openjdk17-jre \
   perl
 USER app
 
 RUN mkdir -p /app/fits && \
     cd /app/fits && \
-    wget https://github.com/harvard-lts/fits/releases/download/1.5.1/fits-1.5.1.zip -O fits.zip && \
+    wget https://github.com/harvard-lts/fits/releases/download/1.6.0/fits-1.6.0.zip -O fits.zip && \
     unzip fits.zip && \
-    rm fits.zip && \
-    chmod a+x /app/fits/fits.sh
+    rm fits.zip tools/mediainfo/linux/libmediainfo.so.0 tools/mediainfo/linux/libzen.so.0 && \
+    chmod a+x /app/fits/fits.sh && \
+    sed -i 's/\(<tool.*TikaTool.*>\)/<!--\1-->/' /app/fits/xml/fits.xml
 ENV PATH="${PATH}:/app/fits"
 
 CMD bundle exec sidekiq
@@ -87,9 +102,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/README.md

@@ -11,25 +11,19 @@ Docs: [![Documentation Status](https://inch-ci.org/github/samvera/hyrax.svg?bran
 [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./.github/CONTRIBUTING.md)
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 
-Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
+Jump in: [![Samvera Community Slack](https://img.shields.io/badge/samvera-slack-blueviolet)](https://samvera.slack.com/)
 
 ## Table of Contents
 
 * [What is Hyrax?](#what-is-hyrax)
-* [Feature Documentation](#feature-documentation)
-* [Support Policies](#support-policies)
-* [Help](#help)
-* [Working with Hyrax](#working-with-hyrax)
-  * [Developing the Hyrax Engine](#developing-the-hyrax-engine)
-    * [Contributing](#contributing)
-    * [Release process](#release-process)
-  * [Developing your Hyrax\-based Application](#developing-your-hyrax-based-application)
-  * [Deploying your Hyrax\-based Application to production](#deploying-your-hyrax-based-application-to-production)
+* [Getting Help and Asking Questions](#getting-help-and-asking-questions)
+* [How to Run the Code](#how-to-run-the-code)
+* [Contribute](#contribute)
+* [Release Process](#release-process)
+* [Deploy](#deploy)
 * [Acknowledgments](#acknowledgments)
 * [License](#license)
 
-<aside>Table of contents created by <a href="https://github.com/ekalinin/github-markdown-toc.go">gh-md-toc</a></aside>
-
 ## What is Hyrax?
 
 Hyrax is a [Ruby on Rails Engine](https://guides.rubyonrails.org/engines.html) built by the [Samvera community](https://samvera.org). Hyrax provides a foundation for creating many different digital repository applications.
@@ -44,112 +38,45 @@ Hyrax offers the ability to:
 * Enable/disable optional features via an administrative dashboard
 * And more (https://hyrax.samvera.org/about/)
 
-## Feature Documentation
-
-* List of features: [Feature Matrix](https://github.com/samvera/hyrax/wiki/Feature-matrix)
-* Configuration and enabling features: [Hyrax Management Guide](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide)
-* Walk-through on using features: [Hyrax Feature Guides](https://samvera.github.io/intro-to.html)
-* [Entity Relationship Diagram](./artifacts/entity-relationship-diagram.pdf)
-* For general information about Hyrax: [Hyrax Site](https://hyrax.samvera.org/)
-* A note about [versions of Hyrax](./documentation/note-about-versions.md)
-
-## Support Policies
-
-* Hyrax 3.x supports the latest browser versions for Chrome, Firefox, Edge, and Safari.
-
-## Help
-
-The Samvera community is here to help. Please see our [support guide](./.github/SUPPORT.md).
-
-## Working with Hyrax
-
-There are two primary Hyrax development concerns:
-
-1. Developing the Hyrax engine
-2. Developing your Hyrax-based Application
-
-### Developing the Hyrax Engine
-
-This is where you work on the code-base that will be used by yours and other Hyrax-based applications.  We recommend using [Docker and Hyrax's engine development containers](./CONTAINERS.md).
+## Getting Help and Asking Questions
 
-<aside>
-    <p><em><strong>Note:</em></strong> This is not the only path for Hyrax-engine development.  In the past, <a href="./documentation/legacyREADME.md">we documented extensive steps</a> to install the various dependencies for Hyrax-engine development. There is also a <a href="https://github.com/samvera/hyrax/wiki/Hyrax-Development-Guide#quick-start-for-hyrax-development">Quick Start for Hyrax engine development</a> that outlines steps for working on the Hyrax engine.</p>
-    <p>By moving to Docker, we are encoding the documentation steps for standing up a Hyrax-engine development environment.</p>
-</aside>
+More detailed documentation about Hyrax is available on the [Hyrax Github Wiki](https://github.com/samvera/hyrax/wiki) but if you have questions or need help, please email the [Samvera community tech list](https://samvera.atlassian.net/wiki/spaces/samvera/pages/1171226735/Samvera+Community+Email+Lists#Samvera-Tech-(15-20-messages-per-week-on-average)) or stop by the #dev channel in the [Samvera community Slack team](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405211682/Getting+Started+in+the+Samvera+Community#Join-the-Samvera-Slack-workspace). You can also get in touch with the [Hyrax Maintenance Working Group](https://samvera.atlassian.net/wiki/spaces/samvera/pages/496632295/Hyrax+Maintenance+Working+Group), including the Hyrax Product Owner and Hyrax Tech Lead.
 
-### Installing Analytics
+[Reporting Issues](./.github/SUPPORT.md) 
 
-Hyrax supports your choice of either Google Analytics or Matomo.  To enable analytics tracking and reporting features, follow the directions below.
+## How to Run the Code
 
-Enable Analytics Features
+[Run Hyrax Locally Using Docker](./CONTAINERS.md)
 
-Analytics can be enabled and configured using environment variables. Set HYRAX_ANALYTICS to true, set either 'google' or 'matomo' for  HYRAX_ANALYTICS_PROVIDER, and set the date you would like reporting to start (ANALYTICS_START_DATE).
+Hyrax can also work running prerequisite dependencies separately. The following describe ways to do this:
+* [Developing Your Hyrax-based Application](./documentation/developing-your-hyrax-based-app.md)
+* [Development setup using Engine Cart and Solr Fedora wrapper](https://github.com/samvera/hyrax/wiki/Development-setup-using-Engine-Cart-and-Solr---Fedora-wrapper)
 
-```
-HYRAX_ANALYTICS=true
-HYRAX_ANALYTICS_PROVIDER=google
-ANALYTICS_START_DATE=2021-08-21
-```
+## Contribute
 
-If using google, you'll also need the following ENV variables:
+We'd love to accept your contributions. Please see our [guide to contributing to Hyrax](./.github/CONTRIBUTING.md).
 
-```
-GOOGLE_ANALYTICS_ID=UA-111111-1  # Universal ID (Currently Hyrax Analytics only works with Univeral (UA) accounts)
-GOOGLE_OAUTH_APP_NAME=
-GOOGLE_OAUTHAPP_VERSION=
-GOOGLE_OAUTH_PRIVATE_KEY_PATH= # store the .p12 file in the root of your application
-GOOGLE_OAUTH_PRIVATE_KEY_SECRET=
-GOOGLE_OAUTH_CLIENT_EMAIL=
-```
+[Installing Analytics](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide#installing-analytics)
 
-Add these ENV variables if using Matomo:
-
-```
-MATOMO_SITE_ID=
-MATOMO_BASE_URL=
-MATOMO_AUTH_TOKEN=
-```
-
-#### Analytics Features
-
-Once analytics is enabled, Hyrax will automatically install the JS tracking code.  Page views and downloads of a file set are recorded and sent to the selected analytics provider.  Admin users will have access to an expanded dashboard with details about how many vistors viewed a page, and how many visitors downloaded a file.  Easily find the top works by views, and most popular file downloads!
-
-#### Contributing
-
-We'd love to accept your contributions.  Please see our guide to [contributing to Hyrax](./.github/CONTRIBUTING.md).
-
-Here are possible ways to help:
-
-* The Hyrax user interface is translated into a number of languages, and many of these translations come from Google Translate. If you are a native or fluent speaker of a non-English language, your help improving these translations are most welcome. (Hyrax currently supports English, Spanish, Chinese, Italian, German, French, and Portuguese.)
-  * Do you see English in the application where you would expect to see one of the languages above? If so, [file an issue](https://github.com/samvera/hyrax/issues/new) and suggest a translation, please.
-* [Contribute a user story](https://github.com/samvera/hyrax/issues/new).
-* Help us improve [Hyrax's test coverage](https://coveralls.io/r/samvera/hyrax) or [documentation coverage](https://inch-ci.org/github/samvera/hyrax).
-* Refactor away [code smells](https://codeclimate.com/github/samvera/hyrax).
-
-#### Release process
+## Release Process
 
 See the [release management process](https://github.com/samvera/hyrax/wiki/Release-management-process).
 
-### Developing your Hyrax-based Application
-
-For those familiar with Rails, this is where you create your own application (via `rails new`) and add Hyrax as a gem to your `Gemfile`.  Your Hyrax-based application is the place for you to create features specific to your Hyrax-based application.
+We also have a [Maintenance Policy](./documentation/MAINTENANCE.md).
 
-For more information, see [our documentation on developing your Hyrax-based application](./documentation/developing-your-hyrax-based-app.md).
-
-### Deploying your Hyrax-based Application to production
+## Deploy
 
 Steps to deploy a Hyrax-based application to production will vary depending on your particular ecosystem but here are some methods and things to consider:
-
- * [Samvera Community Knowledge Base: Running in Production](https://samvera.github.io/service-stack.html)
- * [Helm Chart](./CONTAINERS.md#deploying-to-production) (for cloud-based Kubernetes-style deployments)
+* [Hyrax Management Guide](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide) (provides guidance for things to keep in mind in production environments)
+* [Helm Chart to deploy Hyrax-based application](./CONTAINERS.md#deploying-to-production) (for cloud-based Kubernetes-style deployments)
 
 ## Acknowledgments
 
 This software has been developed by and is brought to you by the Samvera community.  Learn more at the
 [Samvera website](http://samvera.org/).
 
-![Samvera Logo](https://wiki.lyrasis.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2)
+![Samvera Logo](./samvera-fall-TM3.svg)
 
 ## License
 
-Hyrax is available under [the Apache 2.0 license](LICENSE).
+Hyrax is available under [the Apache 2.0 license](LICENSE).

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/_catalog.scss

@@ -76,6 +76,10 @@
   color: #fff;
 }
 
+.dark-text {
+  color: #000
+}
+
 .view-type-group a {
   > span.caption {
     display: none;

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

@@ -38,6 +38,10 @@ legend small {
   margin-top: 1em;
 }
 
+.select2-container .select2-choice > .select2-chosen {
+  max-width: 26em;
+}
+
 form {
   .form-group {
     align-items: center;

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;