hyrax 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 865d623446e36dc64e73cf82ef855955e83d8d8f730a65f439b9b89664641c3f
-  data.tar.gz: 87aec067e009093bbd119d6d39639c5c6927b2b26173088ca7000b1241f71caa
+  metadata.gz: 98e61b637b4f510e877e88c3f2f8020a411b7d83cd0c074e142f666fbda964f1
+  data.tar.gz: 17a8be1a76c9755d5e8b2b1387e907c2d70722809cdb28a62088d913dc584384
 SHA512:
-  metadata.gz: d75dbf03372ee072f394a88af8449ff947ff42b21de9b10a83428ac98af5d01783f21e7f123ee00e3c0dd7b6d3808d4e7d59f0238e1fda703da8358d2b567447
-  data.tar.gz: 6dae952fde3a2f2fdc329775d8efe14929e23c0f92284d1848abfa8a7a8a041e4b5a197a4fa0581d3934ddc9267d0e3ca64c455a5f65b81f5287bde8110fb19e
+  metadata.gz: 445d46c5b5b5ee45ea4262e1809e92356f9536f2f919af929b9d33fafcc13c584ae0ff1c6c2b27cac8ffbcdf35f9be6fd9a726b9bf5c9cafc0632fbd8596a90c
+  data.tar.gz: d5d5ca3a839a02af1fec27d262eb8301a5880a07caba29b9ce383b37a7c7aea098e57f3ddf9c3fbc1582f5a9ffa227e7d0fc3702833a645ae86b7ab94745a2f9

data/.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.8
+        default: 2.5.9
       bundler_version:
         type: string
         default: 1.17.3
@@ -67,7 +67,7 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.8
+        default: 2.5.9
       bundler_version:
         type: string
         default: 1.17.3
@@ -86,6 +86,15 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/
+      - when:
+          condition:
+            equal: [ '2.5.9', << parameters.ruby_version >> ]
+          steps:
+            - run:
+                name: "Lock browse everything for Ruby 2.5"
+                command: |
+                  sed -i.bak "s/browse-everything.*/browse-everything\', \'1.1.2\'/" hyrax.gemspec
+                  bundle
       - samvera/engine_cart_generate:
           cache_key: v1-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-{{ checksum ".circleci/config.yml" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
       - samvera/bundle:
@@ -101,7 +110,7 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.8
+        default: 2.5.9
       bundler_version:
         type: string
         default: 1.17.3
@@ -150,43 +159,43 @@ jobs:
             --header 'Content-Type: application/json'
 workflows:
   version: 2
-  ruby2-5-8:
+  ruby2-5:
     jobs:
       - bundle:
-          ruby_version: "2.5.8"
+          ruby_version: "2.5.9"
           rails_version: "5.2.6"
       - build:
-          ruby_version: "2.5.8"
+          ruby_version: "2.5.9"
           rails_version: "5.2.6"
           requires:
             - bundle
       - test:
-          name: "ruby2-5-8"
-          ruby_version: "2.5.8"
+          name: "ruby2-5"
+          ruby_version: "2.5.9"
           requires:
             - build
-  ruby2-6-6:
+  ruby2-6:
     jobs:
       - bundle:
-          ruby_version: "2.6.6"
+          ruby_version: "2.6.7"
           rails_version: "5.2.6"
       - build:
-          ruby_version: "2.6.6"
+          ruby_version: "2.6.7"
           rails_version: "5.2.6"
           requires:
             - bundle
       - test:
-          name: "ruby2-6-6"
-          ruby_version: "2.6.6"
+          name: "ruby2-6"
+          ruby_version: "2.6.7"
           requires:
             - build
       - test:
-          name: "ruby2-6-6-valkyrie"
-          ruby_version: "2.6.6"
+          name: "ruby2-6-valkyrie"
+          ruby_version: "2.6.7"
           hyrax_valkyrie: "true"
           requires:
             - build
-  ruby2-7-4:
+  ruby2-7:
     jobs:
       - bundle:
           ruby_version: "2.7.4"
@@ -199,7 +208,7 @@ workflows:
           requires:
             - bundle
       - test:
-          name: "ruby2-7-4"
+          name: "ruby2-7"
           ruby_version: "2.7.4"
           bundler_version: "2.1.4"
           requires:

data/.dassie/.env

@@ -1,4 +1,4 @@
 MEMCACHED_HOST=memcached
 REDIS_PROVIDER=SIDEKIQ_REDIS_URL
-SIDEKIQ_REDIS_URL=redis://redis:6379/0
 SEED_DASSIE=true
+SIDEKIQ_REDIS_URL=redis://redis:6379/0

data/.dassie/Gemfile

@@ -8,7 +8,7 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.4'
+ruby '2.7.5'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.4', '>= 5.2.4.4'

data/.dassie/app/forms/collection_resource_form.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+class CollectionResourceForm < Hyrax::Forms::PcdmCollectionForm
+  include Hyrax::FormFields(:basic_metadata)
+  include Hyrax::FormFields(:collection_resource)
+end

data/.dassie/app/indexers/collection_resource_indexer.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+class CollectionResourceIndexer < Hyrax::PcdmCollectionIndexer
+  include Hyrax::Indexer(:basic_metadata)
+  include Hyrax::Indexer(:collection_resource)
+end

data/.dassie/app/models/collection_resource.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+class CollectionResource < Hyrax::PcdmCollection
+  # @note Do not directly update `basic_metadata.yaml`.  It is also used by works.
+  #
+  # To change metadata for collections
+  # * extend by adding fields to `/config/metadata/collection_resource.yaml`
+  # * remove all basic metadata
+  #   * if you generated `with_basic_metadata` and now don't want any basic metadata,
+  #       comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  # * remove some basic metadata
+  #   * comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  #   * copy fields you want to keep from `/config/metadata/basic_metadata.yaml`
+  #       to `/config/metadata/collection_resource.yaml`
+  # * override some basic metadata
+  #   * fields are not allowed to repeat, so to override any basic metadata, you
+  #       must first comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  #   * copy all fields you want to keep unchanged or to override from `/config/metadata/basic_metadata.yaml`
+  #       to `/config/metadata/collection_resource.yaml`
+  #   * update them in `config/metadata/collection_resource.yaml to have the desired
+  #       characteristics
+  #
+  # Alternative:
+  # * comment out or delete schema include statements
+  # * add Valkyrie attributes to this class
+  # * update form and indexer to process the attributes
+  #
+  include Hyrax::Schema(:basic_metadata)
+  include Hyrax::Schema(:collection_resource)
+end

data/.dassie/config/initializers/file_services.rb

@@ -0,0 +1,4 @@
+ActiveSupport::Reloader.to_prepare do
+  Hydra::Derivatives.config.output_file_service = Hyrax::ValkyriePersistDerivatives
+  Hydra::Derivatives.config.source_file_service = Hyrax::LocalFileService
+end

data/.dassie/config/initializers/hyrax.rb

@@ -54,7 +54,8 @@ Hyrax.config do |config|
   ##
   # NOTE: To Valkyrie works, use Monograph which is_a Hyrax::Work is_a Valkyrie::Resource
   # To use Valkyrie models, uncomment the following lines.
-  # config.collection_model = 'Hyrax::PcdmCollection'
+  # config.collection_model = 'Hyrax::PcdmCollection' # collection without basic metadata
+  # config.collection_model = 'CollectionResource'    # collection with basic metadata
   # config.admin_set_model = 'Hyrax::AdministrativeSet'
 end
 

data/.dassie/config/metadata/collection_resource.yaml

@@ -0,0 +1,23 @@
+# Simple yaml config-driven schema which is used to define model attributes,
+# index key names, and form properties.
+#
+# Originally generated with no metadata via
+#  `rails generate hyrax:collection_resource CollectionResource`
+#
+# A few custom fields are added for testing purposes.
+
+---
+attributes:
+  target_audience:
+    type: string
+    form:
+      primary: true
+      multiple: true
+  department:
+    type: string
+    form:
+      primary: true
+  course:
+    type: string
+    form:
+      primary: false

data/.dassie/db/seeds.rb

@@ -68,6 +68,8 @@ if wipe_data
 end
 
 if seed_dassie
+  puts 'Seeding Dassie ...'
+
   Hyrax::RequiredDataSeeder.new.generate_seed_data
   Hyrax::TestDataSeeders::UserSeeder.generate_seeds
 end

data/.dassie/spec/forms/collection_resource_form_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+require 'rails_helper'
+require 'valkyrie/specs/shared_specs'
+
+RSpec.describe CollectionResourceForm do
+  let(:change_set) { described_class.new(resource) }
+  let(:resource)   { CollectionResource.new }
+
+  it_behaves_like 'a Valkyrie::ChangeSet'
+end

data/.dassie/spec/indexers/collection_resource_indexer_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+require 'rails_helper'
+require 'hyrax/specs/shared_specs/indexers'
+
+RSpec.describe CollectionResourceIndexer do
+  let(:indexer_class) { described_class }
+  let(:resource)      { CollectionResource.new }
+
+  it_behaves_like 'a Hyrax::Resource indexer'
+  it_behaves_like 'a Basic metadata indexer'
+end

data/.dassie/spec/models/collection_resource_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+require 'rails_helper'
+require 'hyrax/specs/shared_specs/hydra_works'
+
+RSpec.describe CollectionResource do
+  subject(:collection) { described_class.new }
+
+  it_behaves_like 'a Hyrax::PcdmCollection'
+  it_behaves_like 'a model with basic metadata'
+end

data/.regen

@@ -1 +1 @@
-41
+46

data/.rubocop.yml

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

data/.rubocop_fixme.yml

@@ -171,14 +171,31 @@ RSpec/RepeatedDescription:
     - 'spec/models/sipity/workflow_state_action_spec.rb'
     - 'spec/models/sipity/workflow_state_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Exclude:
     - 'app/models/admin_set.rb'
+    - 'app/models/hyrax/permission_template.rb'
 
 # Offense count: 1
-Style/MethodMissingSuper:
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'app/services/hyrax/works/migration_service.rb'
+
+# Offense count: 12
+Lint/MissingSuper:
   Exclude:
+    - 'app/actors/hyrax/actors/interpret_visibility_actor.rb'
+    - 'app/actors/hyrax/actors/ordered_members_actor.rb'
     - 'app/models/concerns/hyrax/file_set/characterization.rb'
+    - 'app/presenters/hyrax/file_usage.rb'
+    - 'app/presenters/hyrax/work_usage.rb'
+    - 'app/services/hyrax/batch_create_failure_service.rb'
+    - 'app/services/hyrax/batch_create_success_service.rb'
+    - 'app/services/hyrax/collection_types/create_service.rb'
+    - 'app/services/hyrax/solr_query_service.rb'
+    - 'lib/hyrax/form_fields.rb'
+    - 'lib/hyrax/health_checks/solr_check.rb'
+    - 'lib/hyrax/schema.rb'

data/CONTAINERS.md

@@ -143,28 +143,32 @@ _This is for applications that mount Hyrax and is separate from the docker conta
 
 ### Maintaining
 
-We publish several Hyrax images to hub.docker.com under the
-[`samveralabs` group][dockerhub-samveralabs]. To build them, do:
+We publish several Hyrax images to the [GitHub container registry][ghcr] under
+the [Samvera organization][samvera-packages].  To build them:
 
 ```sh
-# build an image for an app using Postgresql (`gem 'pg'`)
-docker build --target hyrax --tag samveralabs/hyrax:(git rev-parse HEAD) .
-docker push samveralabs/hyrax:(git rev-parse HEAD)
+export HYRAX_VERSION=v3.4.1 # or desired version
+git checkout $HYRAX_VERSION
 
-# or; build a development image with sqlite
-docker build --target hyrax --tag samveralabs/hyrax:(git rev-parse HEAD)-sqlite --build-arg DATABASE_APK_PACKAGE="sqlite" .
-docker push samveralabs/hyrax:(git rev-parse HEAD)-sqlite
+docker build --target hyrax-base --tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) .
+
+docker tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) ghcr.io/samvera/hyrax/hyrax-base:$HYRAX_VERSION
+
+docker push ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD)
+docker push ghcr.io/samvera/hyrax/hyrax-base:$HYRAX_VERSION
 ```
 
+Do the same for `hyrax-worker-base`.
+
 We also publish an image for the stable test application `dassie`:
 
 ```sh
-docker build --target hyrax-engine-dev --tag samveralabs/dassie:(git rev-parse HEAD) .
+docker build --target hyrax-engine-dev --tag ghcr.io/samvera/hyrax/dassie:$(git rev-parse HEAD) .
 
-docker tag samveralabs/dassie:(git rev-parse HEAD) samveralabs/dassie:$HYRAX_VERSION
+docker tag ghcr.io/samvera/hyrax/dassie:$(git rev-parse HEAD) ghcr.io/samvera/hyrax/dassie:$HYRAX_VERSION
 
-docker push samveralabs/dassie:(git rev-parse HEAD)
-docker push samveralabs/dassie:$HYRAX_VERSION
+docker push ghcr.io/samvera/hyrax/dassie:$(git rev-parse HEAD)
+docker push ghcr.io/samvera/hyrax/dassie:$HYRAX_VERSION
 ```
 
 ## Deploying to Production
@@ -180,4 +184,5 @@ helm dependency update chart/hyrax
 helm install -n hyrax --set image.tag=(git rev-parse HEAD) dassie chart/hyrax
 ```
 
-[dockerhub-samveralabs]: https://hub.docker.com/r/samveralabs
+[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

data/Dockerfile

@@ -1,5 +1,5 @@
-ARG RUBY_VERSION=2.7.4
-FROM ruby:$RUBY_VERSION-alpine3.14 as hyrax-base
+ARG RUBY_VERSION=2.7.5
+FROM ruby:$RUBY_VERSION-alpine3.15 as hyrax-base
 
 ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"

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

@@ -70,7 +70,7 @@ 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
+        collection.try(:reindex_extent=, Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
 
         return unless env.current_ability.can?(:deposit, collection)
         env.curation_concern.member_of_collections << collection

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/collections_v2.es6

@@ -1,10 +1,12 @@
 import CollectionUtilities from 'hyrax/collections_utils';
+import Editor from 'hyrax/editor';
 
 export default class CollectionsV2 {
   constructor() {
     this.collectionUtilities = new CollectionUtilities();
     this.setupAddSharingHandler();
     this.sharingAddButtonDisabler();
+    this.setupEditor();
   }
 
   /**
@@ -54,4 +56,15 @@ export default class CollectionsV2 {
         )
       );
   }
+
+  /**
+   * Set up editor to enable Geonames autocomplete for Location data
+   * @return {void}
+   */
+   setupEditor() {
+    var element = $("[data-behavior='collection-form']");
+    if (element.length > 0) {
+      new Editor(element).init();
+    }
+   }
 }

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/controllers/concerns/hyrax/collections_controller_behavior.rb

@@ -41,9 +41,7 @@ module Hyrax
     private
 
     def presenter
-      @presenter ||= begin
-        presenter_class.new(curation_concern, current_ability)
-      end
+      @presenter ||= presenter_class.new(curation_concern, current_ability)
     end
 
     def curation_concern

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