hyrax 5.0.0.rc1 → 5.0.0.rc2

data/.koppie/config/initializers/hyrax.rb

@@ -99,7 +99,7 @@ Hyrax.config do |config|
 
   # Hyrax can integrate with Zotero's Arkivo service for automatic deposit
   # of Zotero-managed research items.
-  # config.arkivo_api = false
+  config.arkivo_api = true
 
   # Stream realtime notifications to users in the browser
   # config.realtime_notifications = true
@@ -249,7 +249,7 @@ Hyrax.config do |config|
   # Identify the model class name that will be used for Collections in your app
   # (i.e. ::Collection for ActiveFedora, Hyrax::PcdmCollection for Valkyrie)
   # config.collection_model = '::Collection'
-  config.collection_model = 'Hyrax::PcdmCollection'
+  # config.collection_model = 'Hyrax::PcdmCollection'
   # Injected via `rails g hyrax:collection_resource CollectionResource`
   config.collection_model = 'CollectionResource'
 

data/.koppie/config/initializers/riiif.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
-ActiveSupport::Reloader.to_prepare do
-  Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
+Rails.application.reloader.to_prepare do
   Riiif::Image.info_service = lambda do |id, _file|
     # id will look like a path to a pcdm:file
     # (e.g. rv042t299%2Ffiles%2F6d71677a-4f80-42f1-ae58-ed1063fd79c7)
     # but we just want the id for the FileSet it's attached to.
 
-    # Capture everything before the first slash
     fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
     resp = Hyrax::SolrService.get("id:#{fs_id}")
     doc = resp['response']['docs'].first
@@ -15,24 +13,21 @@ ActiveSupport::Reloader.to_prepare do
   end
 
   if Hyrax.config.use_valkyrie?
-    # Use Valkyrie adapter to make sure file is available locally. Riiif will just open it then
-    # id comes in with the format "FILE_SET_ID/files/FILE_ID"
-    Riiif::Image.file_resolver.id_to_uri = lambda do |id|
-      file_metadata = Hyrax.query_service.find_by(id: id.split('/').last)
-      file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
-      file.disk_path.to_s
-    end
+    Riiif::Image.file_resolver = Hyrax::RiiifFileResolver.new
   else
+    Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
+
     Riiif::Image.file_resolver.id_to_uri = lambda do |id|
       Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
         Rails.logger.info "Riiif resolved #{id} to #{url}"
       end
     end
   end
+
   Riiif::Image.authorization_service = Hyrax::IiifAuthorizationService
 
   Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
   Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
 
-  Riiif::Engine.config.cache_duration = 365.days
+  Riiif::Engine.config.cache_duration = 1.day
 end

data/.koppie/config/metadata/collection_resource.yaml

@@ -2,6 +2,8 @@
 # index key names, and form properties.
 #
 # Attributes must have a type but all other configuration options are optional.
+# Please note: If using Valkyrie's Fedora Metadata Adapter, predicates for attributes
+# must be placed here.
 #
 # attributes:
 #   attribute_name:
@@ -19,4 +21,178 @@
 # Generated via
 #  `rails generate hyrax:collection_resource CollectionResource`
 
-attributes: {}
+attributes:
+  description:
+    type: string
+    multiple: true
+    form:
+      primary: true
+    index_keys:
+      - "description_tesim"
+    predicate: http://purl.org/dc/elements/1.1/description
+  creator:
+    type: string
+    multiple: true
+    form:
+      required: false
+      primary: false
+    index_keys:
+      - "creator_tesim"
+    predicate: http://purl.org/dc/elements/1.1/creator
+  rights_statement:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "rights_statement_tesim"
+    predicate: http://www.europeana.eu/schemas/edm/rights
+  abstract:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "abstract_tesim"
+    predicate: http://purl.org/dc/terms/abstract
+  access_right:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "access_right_tesim"
+    predicate: http://purl.org/dc/terms/accessRights
+  alternative_title:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "alternative_title_tesim"
+    predicate: http://purl.org/dc/terms/alternative
+  based_near:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "based_near_sim"
+      - "based_near_tesim"
+    predicate: http://xmlns.com/foaf/0.1/based_near
+  bibliographic_citation:
+    type: string
+    multiple: true
+    predicate: http://purl.org/dc/terms/bibliographicCitation
+  contributor:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "contributor_tesim"
+    predicate: http://purl.org/dc/elements/1.1/contributor
+  date_created:
+    type: date_time
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "date_created_tesim"
+    predicate: http://purl.org/dc/terms/created
+  identifier:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "identifier_tesim"
+    predicate: http://purl.org/dc/terms/identifier
+  import_url:
+    type: string
+    predicate: http://scholarsphere.psu.edu/ns#importUrl
+  keyword:
+    type: string
+    multiple: true
+    index_keys:
+      - "keyword_sim"
+      - "keyword_tesim"
+    form:
+      primary: false
+    predicate: http://schema.org/keywords
+  publisher:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "publisher_tesim"
+    predicate: http://purl.org/dc/elements/1.1/publisher
+  label:
+    type: string
+    form:
+      primary: false
+    index_keys:
+      - "label_tesim"
+    predicate: info:fedora/fedora-system:def/model#downloadFilename
+  language:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "language_tesim"
+    predicate: http://purl.org/dc/elements/1.1/language
+  license:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "license_tesim"
+    predicate: http://purl.org/dc/terms/license
+  relative_path:
+    type: string
+    predicate: http://scholarsphere.psu.edu/ns#relativePath
+  related_url:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "related_url_tesim"
+    predicate: http://www.w3.org/2000/01/rdf-schema#seeAlso
+  resource_type:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "resource_type_sim"
+      - "resource_type_tesim"
+    predicate: http://purl.org/dc/terms/type
+  rights_notes:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "rights_notes_tesim"
+    predicate: http://purl.org/dc/elements/1.1/rights
+  source:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "source_tesim"
+    predicate: http://purl.org/dc/terms/source
+  subject:
+    type: string
+    multiple: true
+    index_keys:
+      - "subject_sim"
+      - "subject_tesim"
+    form:
+      primary: false
+    predicate: http://purl.org/dc/elements/1.1/subject

data/.koppie/config/metadata/generic_work.yaml

@@ -2,6 +2,8 @@
 # index key names, and form properties.
 #
 # Attributes must have a type but all other configuration options are optional.
+# Please note: If using Valkyrie's Fedora Metadata Adapter, predicates for attributes
+# must be placed here.
 #
 # attributes:
 #   attribute_name:

data/.koppie/config/metadata/monograph.yaml

@@ -2,6 +2,8 @@
 # index key names, and form properties.
 #
 # Attributes must have a type but all other configuration options are optional.
+# Please note: If using Valkyrie's Fedora Metadata Adapter, predicates for attributes
+# must be placed here.
 #
 # attributes:
 #   attribute_name:
@@ -23,6 +25,7 @@
 attributes:
   monograph_title:
     type: string
+    predicate: http://hyrax-example.com/monograph_title
   record_info:
     type: string
     form:
@@ -30,26 +33,33 @@ attributes:
       primary: true
     index_keys:
       - "record_info_tesim"
+    predicate: http://hyrax-example.com/record_info
   place_of_publication:
     type: string
     form:
       required: false
       primary: true
+    predicate: http://hyrax-example.com/place_of_publication
   genre:
     type: string
     form:
       primary: true
+    predicate: http://hyrax-example.com/genre
   series_title:
     type: string
     form:
       primary: false
+    predicate: http://hyrax-example.com/series_title
   target_audience:
     type: string
     form:
       multiple: true
+    predicate: http://hyrax-example.com/target_audience
   table_of_contents:
     type: string
     form:
       multiple: false
+    predicate: http://hyrax-example.com/table_of_contents
   date_of_issuance:
     type: string
+    predicate: http://hyrax-example.com/date_of_issuance

data/.koppie/config/role_map.yml

@@ -1,28 +1,6 @@
-# nurax-pg uses Hydra::RoleManagement for user and role definition.  The following
-# examples show how to perform common setup actions.
-#
-# @see https://github.com/samvera/hydra-role-management
-#
-# Create admin role
-#
-#   admin_role = Role.find_or_create_by(name: 'admin')
-#
-# Create a user
-#
-#   admin_user = User.find_or_create_by(email: 'user@example.com') do |user|
-#     user.password = 'change_me'
-#     user.password_confirmation = 'change_me'
-#     user.confirmed_at = DateTime.now
-#   end
-#   admin_user.roles << admin_role unless admin_user.roles.include?(admin_role)
-#   admin_user.save!(validate: false)
-#
-# You can create non-admin roles and assign users to those roles using a similar pattern.
-#
-# The following roles might be used for testing, so they remain here.  They will not
-# be available for use when logged in through the browser.
-#
 development:
+  admin:
+    - admin@example.com
   archivist:
     - archivist1@example.com
 
@@ -45,4 +23,4 @@ test:
 
 production:
   admin:
-    - systems@curationexperts.com
+    - admin@example.com

data/.koppie/config/routes.rb

@@ -5,14 +5,13 @@ Rails.application.routes.draw do
         mount BrowseEverything::Engine => '/browse'
 
   mount Blacklight::Engine => '/'
-  
+
   concern :searchable, Blacklight::Routes::Searchable.new
 
   resource :catalog, only: [:index], as: 'catalog', path: '/catalog', controller: 'catalog' do
     concerns :searchable
   end
   devise_for :users
-  mount Hydra::RoleManagement::Engine => '/'
   mount Sidekiq::Web => '/sidekiq'
   mount Qa::Engine => '/authorities'
   mount Hyrax::Engine, at: '/'

data/.koppie/config/solr.yml

@@ -2,6 +2,6 @@
 development:
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/nurax-pg-solr-dev" %>
 test: &test
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/nurax-pg-test" %>
+  url: <%= ENV['TEST_SOLR_URL'] ||ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/nurax-pg-test" %>
 production:
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/nurax-pg" %>

data/.koppie/config/valkyrie_index.yml

@@ -1,12 +1,6 @@
 development:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] || 'localhost' %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] || 8987 %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] || 'nurax-pg-valkyrie-dev' %>
-test:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] || 'localhost' %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] || 8987 %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] || 'nurax-pg-test' %>
+  url: <%= ENV['SOLR_DEVELOPMENT_URL'] || ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/koppie" %>
+test: &test
+  url: <%= ENV['SOLR_TEST_URL'] || ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/koppie-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/koppie-prod" %>

data/.koppie/config/zotero.yml

@@ -0,0 +1,6 @@
+#
+# To integrate your app with Zotero, set ENV variables with your API info
+#
+zotero:
+  client_key: <%= ENV["ZOTERO_CLIENT_KEY"] %>
+  client_secret: <%= ENV["ZOTERO_CLIENT_SECRET"] %>

data/.koppie/db/migrate/20230725222727_create_hyrax_counter_metrics.hyrax.rb

@@ -0,0 +1,14 @@
+class CreateHyraxCounterMetrics < ActiveRecord::Migration[6.0]
+  def change
+    create_table :hyrax_counter_metrics do |t|
+      t.string :worktype
+      t.string :resource_type
+      t.integer :work_id
+      t.date :date
+      t.integer :total_item_investigations
+      t.integer :total_item_requests
+
+      t.timestamps
+    end
+  end
+end

data/.koppie/db/migrate/20230803165135_change_work_id_to_string.rb

@@ -0,0 +1,5 @@
+class ChangeWorkIdToString < ActiveRecord::Migration[6.1]
+  def change
+    change_column :hyrax_counter_metrics, :work_id, :string
+  end
+end

data/.koppie/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: 2021_12_07_172259) do
+ActiveRecord::Schema.define(version: 2023_08_03_165135) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -140,6 +140,17 @@ ActiveRecord::Schema.define(version: 2021_12_07_172259) do
     t.index ["machine_id"], name: "index_hyrax_collection_types_on_machine_id", unique: true
   end
 
+  create_table "hyrax_counter_metrics", force: :cascade do |t|
+    t.string "worktype"
+    t.string "resource_type"
+    t.string "work_id"
+    t.date "date"
+    t.integer "total_item_investigations"
+    t.integer "total_item_requests"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
   create_table "hyrax_default_administrative_set", force: :cascade do |t|
     t.string "default_admin_set_id", null: false
     t.datetime "created_at", null: false

data/CONTAINERS.md

@@ -71,8 +71,6 @@ Let's break down the above command:
 
 _**Note:**_ The `bundle exec rspec` portion of the command runs the whole test suite. See the [rspec command documentation](https://github.com/rspec/rspec-core#the-rspec-command) for how to refine your test runs.
 
-_**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"
 
 As a developer, you may need to run commands against the Hyrax-based application and/or the Hyrax engine.  Examples
@@ -191,7 +189,7 @@ We publish several Hyrax images to the [GitHub container registry][ghcr] under
 the [Samvera organization][samvera-packages].  To build them:
 
 ```sh
-export HYRAX_VERSION=v5.0.0.rc1 # or desired version
+export HYRAX_VERSION=v5.0.0.rc2 # or desired version
 git checkout hyrax-$HYRAX_VERSION
 
 docker build --target hyrax-base --tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) .

data/Dockerfile

@@ -33,7 +33,7 @@ USER app
 RUN mkdir -p /app/samvera/hyrax-webapp
 WORKDIR /app/samvera/hyrax-webapp
 
-COPY --chown=1001:101 ./bin /app/samvera
+COPY --chown=1001:101 ./bin/*.sh /app/samvera/
 ENV PATH="/app/samvera:$PATH"
 ENV RAILS_ROOT="/app/samvera/hyrax-webapp"
 ENV RAILS_SERVE_STATIC_FILES="1"
@@ -89,6 +89,13 @@ ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nu
 
 FROM hyrax-base as hyrax-engine-dev
 
+USER root
+RUN apk --no-cache add bash \
+  ffmpeg \
+  mediainfo \
+  perl
+USER app
+
 ARG APP_PATH=.dassie
 ARG BUNDLE_WITHOUT=
 
@@ -100,7 +107,9 @@ COPY --chown=1001:101 . /app/samvera/hyrax-engine
 RUN bundle -v && \
   bundle install --jobs "$(nproc)" && \
   cd $HYRAX_ENGINE_PATH && \
-  bundle install --jobs "$(nproc)"
+  bundle install --jobs "$(nproc)" && \
+  yarn
+
 RUN RAILS_ENV=production SECRET_KEY_BASE='fakesecret1234' DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
 

data/Gemfile

@@ -14,25 +14,8 @@ group :development, :test do
   gem "simplecov", require: false
 end
 
-test_app_path = ENV['RAILS_ROOT'] ||
-                ENV.fetch('ENGINE_CART_DESTINATION', File.expand_path('.internal_test_app', File.dirname(__FILE__)))
-test_app_gemfile = File.expand_path('Gemfile', test_app_path)
-
-# rubocop:disable Bundler/DuplicatedGem
-if File.exist?(test_app_gemfile)
-  begin
-    Bundler.ui.info "[Hyrax] Including test application dependencies from #{test_app_gemfile}"
-    eval_gemfile test_app_gemfile
-  rescue Bundler::GemfileError => e
-    Bundler.ui.warn '[Hyrax] Skipping Rails application dependencies:'
-    Bundler.ui.warn e.message
-  end
-elsif ENV['RAILS_VERSION'] == 'edge'
-  gem 'rails', github: 'rails/rails', source: 'https://rubygems.org'
-  ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
-elsif ENV['RAILS_VERSION']
-  gem 'rails', ENV['RAILS_VERSION'], source: 'https://rubygems.org'
-else
-  Bundler.ui.warn '[Hyrax] Skipping all Rails dependency injection'
+# Install gems from test app
+if ENV['RAILS_ROOT']
+  test_app_gemfile_path = File.expand_path('Gemfile', ENV['RAILS_ROOT'])
+  eval_gemfile test_app_gemfile_path
 end
-# rubocop:enable Bundler/DuplicatedGem

data/Gemfile.dassie

@@ -0,0 +1,2 @@
+# Use dedicated lock files for dassie/koppie to avoid gem mismatches
+eval_gemfile 'Gemfile'

data/Gemfile.koppie

@@ -0,0 +1,2 @@
+# Use dedicated lock files for dassie/koppie to avoid gem mismatches
+eval_gemfile 'Gemfile'

data/README.md

@@ -50,7 +50,6 @@ More detailed documentation about Hyrax is available on the [Hyrax Github Wiki](
 
 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)
 
 ## Contribute
 

data/Rakefile

@@ -9,17 +9,6 @@ end
 
 Bundler::GemHelper.install_tasks
 
-task :setup_test_server do
-  require 'engine_cart'
-  EngineCart.load_application!
-end
-
 Dir.glob('tasks/*.rake').each { |r| import r }
 
 task default: :ci
-
-# Load the test app's rake tasks so they can be run from the app namespace (e.g. app:db:migrate)
-if File.exist?(File.expand_path(".internal_test_app/Rakefile", __dir__))
-  APP_RAKEFILE = File.expand_path(".internal_test_app/Rakefile", __dir__)
-  load 'rails/tasks/engine.rake'
-end

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

@@ -14,12 +14,9 @@ module Hyrax
       def destroy
         case work
         when Valkyrie::Resource
-          embargo_manager = Hyrax::EmbargoManager.new(resource: work)
-          return if embargo_manager.embargo.embargo_release_date.blank?
-
-          embargo_manager.deactivate!
-          work.embargo = Hyrax.persister.save(resource: embargo_manager.embargo)
-          Hyrax::AccessControlList(work).save
+          Hyrax::EmbargoManager.deactivate_embargo_for(resource: work) &&
+            Hyrax.persister.save(resource: work.embargo) &&
+            Hyrax::AccessControlList(work).save
         else
           work.embargo_visibility! # If the embargo has lapsed, update the current visibility.
           work.deactivate_embargo!

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

@@ -41,7 +41,7 @@
     var checked = $("#check_all")[0]['checked'];
 
     // check each individual box
-    $("input[type='checkbox'].batch_document_selector").each(function(index, value) {
+    $("input[type='checkbox'].batch_document_selector:not(.disabled)").each(function(index, value) {
        value['checked'] = checked;
     });
     toggleButtons();

data/app/assets/javascripts/hyrax/file_manager/member.es6

@@ -10,7 +10,7 @@ export class InputTracker {
     this.notifier = notifier
     this.element.data("initial-value", this.element.val())
     this.element.data("tracker", this)
-    this.element.trigger("change", this.value_changed)
+    this.element.on("change", this.value_changed)
   }
 
   reset() {

data/app/assets/stylesheets/hyrax/_file-listing.scss

@@ -70,8 +70,6 @@ h4 .small {
 .batch-info {
 
   .sort-toggle {
-    height: 5.1em;
-
     button {
       margin-left: 10px;
     }

data/app/assets/stylesheets/hyrax/_work-show.scss

@@ -116,6 +116,21 @@ ul.tabular {
   background: #fff;
   border-color: #e0e0e0;
 
+  & > .btn {
+    padding: 0;
+    border: 0;
+  }
+
+  .btn-primary {
+    margin-bottom: 1rem;
+  }
+
+  .workflow-comments {
+    label {
+      font-weight: bold;
+    }
+  }
+
   .card-header {
     background-color: #e6ab5f;
     color: #ffffff;
@@ -128,8 +143,9 @@ ul.tabular {
   .card-body {
     background-color: #f2f1eb;
   }
-}
 
-.workflow-actions {
-  background-color: #f8f8f8;
+  .workflow-actions {
+    background-color: #f8f8f8;
+    padding: 1rem;
+  }
 }