hyrax 5.0.1 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791fb1a29523524e62036fd25aed45e6297d4d010e4b20bbcd9abe468bb30278
-  data.tar.gz: fbfdf5b3523294fe5dff601c92412967da57fdd02ac6c28d2384f18e8033cb4e
+  metadata.gz: 1e1143acd065d9ea879f9d47024e4b14603dce26ce528082ba1d358a3aec9629
+  data.tar.gz: 4b75c209e9caace3457521ec1af21fc59d8250bf6a4536e74af63061d07d69bf
 SHA512:
-  metadata.gz: 98fbab4485f2bb977cfb0fe755a05a98f39a2ba6f575420bae41a70d5e361aae482d81da902203afc49aa9171decafa3d4b87d6d58c0ee05e14a9ff8221f545b
-  data.tar.gz: 8846f839b4040ce79e52738da5fe3585fa176041cc6805c8c124724c8db006d6fee2ff30e5d286bfc0ca76de1e10a331bf608c9f88109208b6bdffc2d90d3023
+  metadata.gz: 248c5cdb08d506306f7e7664f17647b7af8c0afea32a583d1fe1698cf2346b57caa3d276f4c684627326ff174340a27ea5a74cf8c79d83b79d23285feef8c06e
+  data.tar.gz: dbe9e52dea97e0162fa943120f6f3507cb25ad0fd945a7baf693ded264ee5b7308d20894f8220af43471f0cb08fb1c3b7512a5e116261bba22c425369baece15

data/.circleci/config.yml

@@ -1,181 +1,12 @@
 version: 2.1
-orbs:
-  samvera: samvera/circleci-orb@1
-  browser-tools: circleci/browser-tools@1.3
-  ruby: circleci/ruby@2
-  node: circleci/node@5
-
-executors:
-  hyrax:
-    parameters:
-      fcrepo_version:
-        type: string
-        default: '4.7.5'
-      hyrax_app:
-        type: string
-        default: 'dassie'
-      postgres_version:
-        type: string
-        default: '14.9'
-      redis_version:
-        type: string
-        default: '6.2'
-      ruby_type:
-        type: string
-        default: 'ruby'
-      ruby_version:
-        type: string
-        default: '2.5.5'
-      solr_port:
-        type: string
-        default: '8985'
-      solr_version:
-        type: string
-        default: '8.11-slim'
-    environment:
-      RAILS_ENV: test
-      RACK_ENV: test
-      FCREPO_PORT: 8080
-      POSTGRES_DB: circle_test
-      POSTGRES_HOST: 127.0.0.1
-      POSTGRES_USER: postgres
-    docker:
-      - image: "ghcr.io/samvera/hyrax/<< parameters.hyrax_app >>-dev:<< pipeline.git.revision >>"
-      - image: seleniarm/standalone-chromium:114.0
-        environment:
-          SE_NODE_SESSION_TIMEOUT: 1200
-          START_XVFB: "false"
-
-      - image: samvera/fcrepo4:<< parameters.fcrepo_version >>
-        environment:
-          CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
-      - image: zookeeper:3.4
-      - image: solr:<< parameters.solr_version >>
-        environment:
-          VERBOSE: yes
-          SECURITY_JSON: '{"authentication":{"blockUnknown": false, "class":"solr.BasicAuthPlugin", "credentials":{"solr":"IV0EHq1OnNrj6gvRCwvFwTrZ1+z1oBbnQdiVC3otuq0= Ndd7LKvVBAaZIF0QAVi1ekCfAJXr1GGfLtRUXhgrF8c="}, "realm":"My Solr users", "forwardCredentials": false}, "authorization":{ "class":"solr.RuleBasedAuthorizationPlugin", "permissions":[{"name":"security-edit", "role":"admin"}], "user-role":{"solr":"admin"}}}'
-        command: sh -c "server/scripts/cloud-scripts/zkcli.sh -zkhost localhost:2181 -cmd put /security.json \"${SECURITY_JSON}\" && solr-fg -cloud -noprompt  -p << parameters.solr_port >> -z localhost:2181"
-      - image: redis:<< parameters.redis_version >>
-      - image: cimg/postgres:<< parameters.postgres_version >>
 
+# Run a no-op workflow so CircleCI reports as a green check in pull requests.
+# This file is needed until all active hyrax branches have moved off CircleCI
+# and the integration can be deactivated.
 jobs:
-  kaniko-build:
-    parameters:
-      hyrax_app:
-        type: string
-        default: dassie
-      ruby_version:
-        type: string
-        default: 3.2.2
-    docker:
-      - image: gcr.io/kaniko-project/executor:v1.14.0-debug
-        entrypoint: ""
-    steps:
-      - run:
-          name: Configure GHCR credentials
-          command: |
-             cat > /kaniko/.docker/config.json \<<- JSON
-             {
-               "auths": {
-                 "ghcr.io": {
-                   "auth": "$(echo -n $GHCR_USER:$GHCR_TOKEN | base64)"
-                 }
-               }
-             }
-             JSON
-      - run:
-          name: Build and Push image
-          command: |
-            /kaniko/executor \
-                --cache=true \
-                --build-arg "EXTRA_APK_PACKAGES=git bash" \
-                --build-arg "APP_PATH=.<< parameters.hyrax_app >>" \
-                --build-arg "RUBY_VERSION=<< parameters.ruby_version >>" \
-                --context "git://github.com/$(echo $CIRCLE_REPOSITORY_URL | sed -E 's/.+:(.+)\.git/\1/')#refs/heads/${CIRCLE_BRANCH}#${CIRCLE_SHA1}" \
-                --target "hyrax-engine-dev" \
-                --destination "ghcr.io/samvera/hyrax/<< parameters.hyrax_app >>-dev:${CIRCLE_SHA1}"
-
-  hyrax-test:
-    parameters:
-      hyrax_app:
-        type: string
-        default: dassie
-      hyrax_valkyrie:
-        type: string
-        default: "false"
-      ruby_version:
-        type: string
-        default: 3.2.2
-    executor:
-      name: hyrax
-      hyrax_app: << parameters.hyrax_app >>
-      ruby_version: << parameters.ruby_version >>
-    resource_class: large
-    parallelism: 12
-    environment:
-      CHROME_HEADLESS_MODE: true
-      DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test
-      HUB_URL: http://localhost:4444/wd/hub
-      HYRAX_VALKYRIE: << parameters.hyrax_valkyrie >>
-      IN_DOCKER: true
-      KARMA_BROWSER: remote-chromium
-      SOLR_URL: http://127.0.0.1:8985/solr/hydra-test
-      VALKYRIE_SOLR_CORE: valkyrie-test
-      VALKYRIE_SOLR_PORT: 8985
-    steps:
-      - run:
-          name: Create solr core
-          command: |
-            cd /app/samvera/hyrax-webapp/solr/conf
-            zip -1 -r solr_conf.zip ./*
-            db-wait.sh localhost:8985 # wait for solr to be available before hitting the API
-            curl -H "Content-type:application/octet-stream" --data-binary @solr_conf.zip "http://solr:SolrRocks@127.0.0.1:8985/solr/admin/configs?action=UPLOAD&name=solrconfig"
-            curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8985/api/collections/ -d '{create: {name: hydra-test, config: solrconfig, numShards: 1}}'
-            curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8985/api/collections/ -d '{create: {name: valkyrie-test, config: solrconfig, numShards: 1}}'
-      - ruby/rspec-test:
-          app-dir: /app/samvera/hyrax-engine
-
-  rubocop:
-    working_directory: ~/hyrax
+  build:
     docker:
-      - image: cimg/ruby:3.2.2
+      - image: cimg/base:current
+    resource_class: small
     steps:
-      - checkout
-      - run: bundle install
-      - ruby/rubocop-check
-
-workflows:
-  version: 2
-  dassie:
-    jobs:
-      - rubocop
-      - kaniko-build:
-          name: "dassie-build"
-          ruby_version: "3.2.2"
-          hyrax_app: "dassie"
-      - hyrax-test:
-          name: "dassie-test"
-          ruby_version: "3.2.2"
-          hyrax_app: "dassie"
-          requires:
-            - dassie-build
-      - hyrax-test:
-          name: "dassie-valkyrie-test"
-          ruby_version: "3.2.2"
-          hyrax_app: "dassie"
-          hyrax_valkyrie: "1"
-          requires:
-            - dassie-build
-
-  koppie:
-    jobs:
-      - kaniko-build:
-          name: "koppie-build"
-          ruby_version: "3.2.2"
-          hyrax_app: "koppie"
-      - hyrax-test:
-          name: "koppie-test"
-          ruby_version: "3.2.2"
-          hyrax_app: "koppie"
-          requires:
-            - koppie-build
+      - run: echo "Hyrax tests have moved to Github Actions."

data/.dassie/.env

@@ -2,7 +2,7 @@ ANALYTICS_START_DATE=2021-08-21
 BUNDLE_GEMFILE=Gemfile.dassie
 BUNDLE_PATH=/app/bundle
 CH12N_TOOL=fits_servlet
-CHROME_HEADLESS_MODE=false
+CHROME_HEADLESS_MODE=true
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5
 DATABASE_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax?pool=5
@@ -13,15 +13,16 @@ FCREPO_PORT=8080
 FCREPO_REST_PATH=rest
 FCREPO_TEST_BASE_PATH=/test
 FITS_SERVLET_URL=http://fits:8080/fits
-HUB_URL=http://chrome:4444/wd/hub
+HUB_URL=http://chrome:4444
 HYRAX_ANALYTICS=false
 HYRAX_ANALYTICS_PROVIDER=google
 HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
 HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
 HYRAX_UPLOAD_PATH=/app/samvera/hyrax-webapp/uploads/
+HYRAX_VALKYRIE=true
 IN_DOCKER=true
 KARMA_BROWSER=remote-chromium
-KARMA_HOSTNAME=app
+KARMA_HOSTNAME=web
 MEMCACHED_HOST=memcached
 RACK_ENV=development
 RAILS_ENV=development
@@ -35,5 +36,9 @@ SOLR_HOST=solr
 SOLR_PORT=8983
 SOLR_TEST_URL=http://solr:8983/solr/hyrax_test
 SOLR_URL=http://solr:8983/solr/hyrax
+TB_RSPEC_OPTIONS=--force-color --format RspecJunitFormatter --out rspec.xml
+TB_RSPEC_FORMATTER=progress
+VALKYRIE_ID_TYPE=string
 VALKYRIE_SOLR_HOST=solr
 VALKYRIE_SOLR_PORT=8983
+VALKYRIE_TRANSITION=false

data/.dassie/Gemfile

@@ -14,12 +14,23 @@ gem 'coffee-rails', '~> 4.2'
 gem 'dalli'
 gem 'devise'
 gem 'devise-guests', '~> 0.8'
+
+# Required because grpc and google-protobuf gem's binaries are not compatible with Alpine Linux.
+# To install the package in Alpine: `apk add ruby-grpc`
+# The pinned versions should match the version provided by the Alpine packages.
+if RUBY_PLATFORM =~ /musl/
+  path '/usr/lib/ruby/gems/3.2.0' do
+    gem 'google-protobuf', '~> 3.24.4', force_ruby_platform: true
+    gem 'grpc', '~> 1.59.3', force_ruby_platform: true
+  end
+end
+
 gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
 gem 'jbuilder', '~> 2.5'
 gem 'jquery-rails'
 gem 'pg', '~> 1.3'
 gem 'puma'
-gem 'rails', '~> 6.1'
+gem 'rails', '~> 6.1', '>= 6.1.7.10'
 gem 'riiif', '~> 2.1'
 gem 'rsolr', '>= 1.0', '< 3'
 gem 'sass-rails', '~> 6.0'
@@ -46,4 +57,4 @@ group :development, :test do
   gem 'pry-doc'
   gem 'pry-rails'
   gem 'pry-rescue'
-end
+end

data/.dassie/app/controllers/hyrax/generic_work_resources_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:work_resource GenericWorkResource`
+module Hyrax
+  # Generated controller for GenericWorkResource
+  class GenericWorkResourcesController < ApplicationController
+    # Adds Hyrax behaviors to the controller.
+    include Hyrax::WorksControllerBehavior
+    include Hyrax::BreadcrumbsForWorks
+    self.curation_concern_type = ::GenericWorkResource
+
+    # Use a Valkyrie aware form service to generate Valkyrie::ChangeSet style
+    # forms.
+    self.work_form_service = Hyrax::FormFactory.new
+  end
+end

data/.dassie/app/controllers/hyrax/generic_works_controller.rb

@@ -6,7 +6,13 @@ module Hyrax
     # Adds Hyrax behaviors to the controller.
     include Hyrax::WorksControllerBehavior
     include Hyrax::BreadcrumbsForWorks
-    self.curation_concern_type = ::GenericWork
+    if Hyrax.config.valkyrie_transition?
+      self.curation_concern_type = ::GenericWorkResource
+
+      self.work_form_service = Hyrax::FormFactory.new
+    else
+      self.curation_concern_type = ::GenericWork
+    end
 
     # Use this line if you want to use a custom presenter
     self.show_presenter = Hyrax::GenericWorkPresenter

data/.dassie/app/forms/generic_work_resource_form.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:work_resource GenericWorkResource`
+#
+# @see https://github.com/samvera/hyrax/wiki/Hyrax-Valkyrie-Usage-Guide#forms
+# @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
+class GenericWorkResourceForm < Hyrax::Forms::ResourceForm(GenericWorkResource)
+  include Hyrax::FormFields(:basic_metadata)
+  include Hyrax::FormFields(:generic_work_resource)
+
+  # Define custom form fields using the Valkyrie::ChangeSet interface
+  #
+  # property :my_custom_form_field
+
+  # if you want a field in the form, but it doesn't have a directly corresponding
+  # model attribute, make it virtual
+  #
+  # property :user_input_not_destined_for_the_model, virtual: true
+end

data/.dassie/app/indexers/generic_work_resource_indexer.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:work_resource GenericWorkResource`
+class GenericWorkResourceIndexer < Hyrax::ValkyrieWorkIndexer
+  include Hyrax::Indexer(:basic_metadata)
+  include Hyrax::Indexer(:generic_work_resource)
+
+  # Uncomment this block if you want to add custom indexing behavior:
+  #  def to_solr
+  #    super.tap do |index_document|
+  #      index_document[:my_field_tesim]   = resource.my_field.map(&:to_s)
+  #      index_document[:other_field_ssim] = resource.other_field
+  #    end
+  #  end
+end

data/.dassie/app/models/admin_set_resource.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AdminSetResource < Hyrax::AdministrativeSet
+  include Hyrax::ArResource
+  include Hyrax::Permissions::Readable
+  Hyrax::ValkyrieLazyMigration.migrating(self, from: ::AdminSet) if Hyrax.config.valkyrie_transition?
+
+  # include WithPermissionTemplateShim
+end

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

@@ -32,4 +32,6 @@ class CollectionResource < Hyrax::PcdmCollection
   #
   include Hyrax::Schema(:basic_metadata)
   include Hyrax::Schema(:collection_resource)
+
+  Hyrax::ValkyrieLazyMigration.migrating(self, from: ::Collection) if Hyrax.config.valkyrie_transition?
 end

data/.dassie/app/models/file_set.rb

@@ -3,3 +3,5 @@
 class FileSet < ActiveFedora::Base
   include ::Hyrax::FileSetBehavior
 end
+
+Hyrax::ValkyrieLazyMigration.migrating(Hyrax::FileSet, from: ::FileSet) if Hyrax.config.valkyrie_transition?

data/.dassie/app/models/generic_work_resource.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:work_resource GenericWorkResource`
+class GenericWorkResource < Hyrax::Work
+  include Hyrax::Schema(:basic_metadata)
+  include Hyrax::Schema(:generic_work_resource)
+
+  Hyrax::ValkyrieLazyMigration.migrating(self, from: GenericWork) if Hyrax.config.valkyrie_transition?
+end

data/.dassie/app/views/hyrax/generic_work_resources/_generic_work_resource.html.erb

@@ -0,0 +1,2 @@
+<%# This is a search result view %>
+<%= render 'catalog/document', document: generic_work_resource, document_counter: generic_work_resource_counter  %>

data/.dassie/config/analytics.yml

@@ -1,10 +1,15 @@
 analytics:
+  ga4:
+    analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
+    property_id: <%= ENV['GOOGLE_ANALYTICS_PROPERTY_ID'] %>
+    account_json: <%= ENV['GOOGLE_ACCOUNT_JSON'] %>
+    account_json_path: <%= ENV['GOOGLE_ACCOUNT_JSON_PATH'] %>
   google:
     analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
     app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME'] %>
     app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION'] %>
-    privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
     privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
+    privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
     privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
     client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>
   matomo:

data/.dassie/config/application.rb

@@ -18,5 +18,29 @@ module Dassie
 
     # use SideKiq by default
     config.active_job.queue_adapter = :sidekiq
+    # inline can be useful when debugging
+    # config.active_job.queue_adapter = :inline
+
+    ##
+    # When using the Goddess adapter of Hyrax 5.x, we want to have a
+    # canonical answer for what are the Work Types that we want to manage.
+    #
+    # We don't want to rely on `Hyrax.config.curation_concerns`, as these are
+    # the ActiveFedora implementations.
+    #
+    # @return [Array<Class>]
+    def self.work_types
+      Hyrax.config.curation_concerns.map do |cc|
+        if cc.to_s.end_with?("Resource")
+          cc
+        else
+          # We may encounter a case where we don't have an old ActiveFedora
+          # model that we're mapping to.  For example, let's say we add Game as
+          # a curation concern.  And Game has only ever been written/modeled via
+          # Valkyrie.  We don't want to also have a GameResource.
+          "#{cc}Resource".safe_constantize || cc
+        end
+      end
+    end
   end
 end

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

@@ -13,6 +13,8 @@ Hyrax.config do |config|
   config.register_curation_concern :"namespaced_works/nested_work"
   # Injected via `rails g hyrax:work_resource Monograph`
   config.register_curation_concern :monograph
+  # Injected via `rails g hyrax:work_resource GenericWorkResource`
+  # config.register_curation_concern :generic_work_resource
 
   config.iiif_image_server = true
   config.work_requires_files = false
@@ -65,9 +67,17 @@ Hyrax.config do |config|
   # config.admin_set_model = 'Hyrax::AdministrativeSet'
 
   # dassie needs legacy AF models
-  config.collection_model = '::Collection'
-  config.admin_set_model = 'AdminSet'
-  config.file_set_model = '::FileSet'
+  # If using Frayja/Frigg then use the resource they provide
+  if Hyrax.config.valkyrie_transition?
+    config.collection_model = 'CollectionResource'
+    config.admin_set_model = 'AdminSetResource'
+    config.file_set_model = 'Hyrax::FileSet'
+  else
+    # dassie needs legacy AF models
+    config.collection_model = '::Collection'
+    config.admin_set_model = 'AdminSet'
+    config.file_set_model = '::FileSet'
+  end
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"

data/.dassie/config/initializers/wings.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+# rubocop:disable Metrics/BlockLength
+
+# Freyja setup adapted from hyku
+if Hyrax.config.valkyrie_transition?
+  Rails.application.config.after_initialize do
+    [ # List AF work models
+      GenericWork
+    ].each do |klass|
+      Wings::ModelRegistry.register("#{klass}Resource".constantize, klass)
+      # we register itself so we can pre-translate the class in Freyja instead of having to translate in each query_service
+      Wings::ModelRegistry.register(klass, klass)
+    end
+    Wings::ModelRegistry.register(Collection, Collection)
+    Wings::ModelRegistry.register(CollectionResource, Collection)
+    Wings::ModelRegistry.register(AdminSet, AdminSet)
+    Wings::ModelRegistry.register(AdminSetResource, AdminSet)
+    Wings::ModelRegistry.register(FileSet, FileSet)
+    Wings::ModelRegistry.register(Hyrax::FileSet, FileSet)
+    Wings::ModelRegistry.register(Hydra::PCDM::File, Hydra::PCDM::File)
+    Wings::ModelRegistry.register(Hyrax::FileMetadata, Hydra::PCDM::File)
+
+    Valkyrie::MetadataAdapter.register(
+      Freyja::MetadataAdapter.new,
+      :freyja
+    )
+    Valkyrie.config.metadata_adapter = :freyja
+    Hyrax.config.query_index_from_valkyrie = true
+    Hyrax.config.index_adapter = :solr_index
+
+    Valkyrie::StorageAdapter.register(
+      Valkyrie::Storage::VersionedDisk.new(base_path: Rails.root.join("storage", "files"),
+        file_mover: FileUtils.method(:cp)),
+      :disk
+    )
+    Valkyrie.config.storage_adapter  = :disk
+    Valkyrie.config.indexing_adapter = :solr_index
+
+    # load all the sql based custom queries
+    [
+      Hyrax::CustomQueries::Navigators::CollectionMembers,
+      Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
+      Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
+      Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
+      Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
+      Hyrax::CustomQueries::Navigators::FindFiles,
+      Hyrax::CustomQueries::FindAccessControl,
+      Hyrax::CustomQueries::FindCollectionsByType,
+      Hyrax::CustomQueries::FindFileMetadata,
+      Hyrax::CustomQueries::FindIdsByModel,
+      Hyrax::CustomQueries::FindManyByAlternateIds,
+      Hyrax::CustomQueries::FindModelsByAccess,
+      Hyrax::CustomQueries::FindCountBy,
+      Hyrax::CustomQueries::FindByDateRange,
+      # Hyrax::CustomQueries::FindBySourceIdentifier  # from bulkrax
+    ].each do |handler|
+      Hyrax.query_service.services[0].custom_queries.register_query_handler(handler)
+    end
+
+    # [
+    #   Wings::CustomQueries::FindBySourceIdentifier
+    # ].each do |handler|
+    #   Hyrax.query_service.services[1].custom_queries.register_query_handler(handler)
+    # end
+
+    # Register each work resource pair
+    # Wings::ModelRegistry.register(GenericWorkResource, GenericWork)
+  end
+
+  Rails.application.config.to_prepare do
+    AdminSetResource.class_eval do
+      attribute :internal_resource, Valkyrie::Types::Any.default("AdminSet"), internal: true
+    end
+
+    CollectionResource.class_eval do
+      attribute :internal_resource, Valkyrie::Types::Any.default("Collection"), internal: true
+    end
+
+    Valkyrie.config.resource_class_resolver = lambda do |resource_klass_name|
+      # TODO: Can we use some kind of lookup.
+      klass_name = resource_klass_name.gsub(/^Wings\((.+)\)$/, '\1')
+      klass_name = klass_name.gsub(/Resource$/, '')
+      if %w[
+        GenericWork
+      ].include?(klass_name)
+        "#{klass_name}Resource".constantize
+      elsif 'Collection' == klass_name
+        CollectionResource
+      elsif 'AdminSet' == klass_name
+        AdminSetResource
+        # Without this mapping, we'll see cases of Postgres Valkyrie adapter attempting to write to
+        # Fedora.  Yeah!
+      elsif 'Hydra::AccessControl' == klass_name
+        Hyrax::AccessControl
+      elsif 'FileSet' == klass_name
+        Hyrax::FileSet
+      elsif 'Hydra::AccessControls::Embargo' == klass_name
+        Hyrax::Embargo
+      elsif 'Hydra::AccessControls::Lease' == klass_name
+        Hyrax::Lease
+      elsif 'Hydra::PCDM::File' == klass_name
+        Hyrax::FileMetadata
+      else
+        klass_name.constantize
+      end
+    end
+  end
+  # rubocop:enable Metrics/BlockLength
+end

data/.dassie/config/metadata/generic_work_resource.yaml

@@ -0,0 +1,22 @@
+# Simple yaml config-driven schema which is used to define model attributes,
+# index key names, and form properties.
+#
+# Attributes must have a type but all other configuration options are optional.
+#
+# attributes:
+#   attribute_name:
+#     type: string
+#     multiple: false
+#     index_keys:
+#       - "attribute_name_sim"
+#     form:
+#       required: true
+#       primary: true
+#       multiple: false
+#
+# @see config/metadata/basic_metadata.yaml for an example configuration
+#
+# Generated via
+#  `rails generate hyrax:work_resource GenericWorkResource`
+
+attributes: {}

data/.dassie/config/valkyrie_index.yml

@@ -1,12 +1,6 @@
 development:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] || 'hyrax-valkyrie-dev' %>
-test:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] || 8987 %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] || 'hyrax-valkyrie-test' %>
+  url: <%= ENV['SOLR_DEVELOPMENT_URL'] || ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/hyrax-valkyrie-dev" %>
+test: &test
+  url: <%= ENV['SOLR_TEST_URL'] || ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8987)}/solr/hyrax-valkyrie-test" %>
 production:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/hyrax-valkyrie" %>

data/.dassie/db/migrate/20240506070809_valkyrie_id_to_string.rb

@@ -0,0 +1,5 @@
+class ValkyrieIdToString < ActiveRecord::Migration[6.1]
+  def change
+    change_column :orm_resources, :id, :text, default: -> { '(uuid_generate_v4())::text' }
+  end
+end

data/.dassie/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_08_21_153635) do
+ActiveRecord::Schema.define(version: 2024_05_06_070809) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -251,7 +251,7 @@ ActiveRecord::Schema.define(version: 2023_08_21_153635) do
     t.index ["namespace"], name: "index_minter_states_on_namespace", unique: true
   end
 
-  create_table "orm_resources", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
+  create_table "orm_resources", id: :text, default: -> { "(uuid_generate_v4())::text" }, force: :cascade do |t|
     t.jsonb "metadata", default: {}, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false

data/.dassie/spec/indexers/generic_work_resource_indexer_spec.rb

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

data/.dassie/spec/models/generic_work_resource_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:work_resource GenericWorkResource`
+require 'rails_helper'
+require 'hyrax/specs/shared_specs/hydra_works'
+
+RSpec.describe GenericWorkResource do
+  subject(:work) { described_class.new }
+
+  it_behaves_like 'a Hyrax::Work'
+end