T458 license field display

.github/workflows/ci-cache.yml

@@ -33,6 +33,7 @@ jobs:
           mkdir /opt/scholarspace-minter
           mkdir /opt/scholarspace/fedora-data
           mkdir /opt/scholarspace/solr-data
+          mkdir /opt/scholarspace/scholarspace-ingest
           cd /opt/scholarspace
      # Checkout the repository code
       - name: Check out repository code

Dockerfile

@@ -41,6 +41,7 @@ RUN mkdir -p /opt/scholarspace/scholarspace-hyrax \
     && mkdir -p /opt/scholarspace/scholarspace-tmp \
     && mkdir -p /opt/scholarspace/scholarspace-minter \
     && mkdir -p /opt/scholarspace/scholarspace-derivatives \
+    && mkdir -p /opt/scholarspace/scholarspace-ingest \
     && chmod 775 -R /opt/scholarspace/scholarspace-derivatives
 
 WORKDIR /opt/scholarspace/scholarspace-hyrax

Gemfile

@@ -64,8 +64,7 @@ gem 'riiif', '~> 2.0'
 
 gem 'cookies_eu'
 
-#gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git'
-gem 'bulkrax', '2.3.0'
+gem 'bulkrax', '8.1.0'
 
 gem 'willow_sword', github: 'notch8/willow_sword'
 

Gemfile.lock

@@ -104,7 +104,7 @@ GEM
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
-    bagit (0.4.5)
+    bagit (0.4.6)
       docopt (~> 0.5.0)
       validatable (~> 1.6)
     base64 (0.2.0)
@@ -162,18 +162,21 @@ GEM
       signet (~> 0.8)
       typhoeus
     builder (3.2.4)
-    bulkrax (2.3.0)
-      bagit (~> 0.4)
+    bulkrax (8.1.0)
+      bagit (~> 0.4.6)
       coderay
+      denormalize_fields
       iso8601 (~> 0.9.0)
       kaminari
       language_list (~> 1.2, >= 1.2.1)
-      libxml-ruby (~> 3.1.0)
+      libxml-ruby (~> 3.2.4)
       loofah (>= 2.2.3)
+      marcel
       oai (>= 0.4, < 2.x)
       rack (>= 2.0.6)
       rails (>= 5.1.6)
       rdf (>= 2.0.2, < 4.0)
+      rubyzip
       simple_form
     byebug (11.1.3)
     cancancan (1.17.0)
@@ -221,6 +224,8 @@ GEM
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
     declarative-option (0.1.0)
+    denormalize_fields (1.3.0)
+      activerecord (>= 4.1.14, < 8.0.0)
     deprecation (1.1.0)
       activesupport
     devise (4.9.2)
@@ -577,7 +582,7 @@ GEM
       multi_json
     libv8-node (16.19.0.1-x86_64-darwin)
     libv8-node (16.19.0.1-x86_64-linux)
-    libxml-ruby (3.1.0)
+    libxml-ruby (3.2.4)
     link_header (0.0.8)
     linkeddata (3.1.6)
       equivalent-xml (~> 0.6)
@@ -1062,7 +1067,7 @@ DEPENDENCIES
   blacklight_range_limit
   bootsnap (>= 1.1.0)
   bootstrap-sass (~> 3.0)
-  bulkrax (= 2.3.0)
+  bulkrax (= 8.1.0)
   byebug
   capybara (>= 2.15)
   chosen-rails

README.md

@@ -66,6 +66,7 @@ a separate user for the app, but it is not necessary.  That user will need to ow
       /opt/scholarspace/certs 
       /opt/scholarspace/scholarspace-tmp 
       /opt/scholarspace/scholarspace-minter 
+      /opt/scholarspace/scholarspace-ingest 
       ```
 6. In `/opt/scholarspace/scholarspace-hyrax` run `cp example.env .env` to create the local environment file.
 7. Edit `.env` to add the following values:
@@ -174,16 +175,6 @@ echo $CR_PAT | docker login ghcr.io -u [USERNAME] --password-stdin
 
 ## Setting up a new production instance
 
-### (Optional) Install etd-loader
-
-* Install the **etd-loader** application in `/opt/etd-loader` as per instructions at https://github.com/gwu-libraries/etd-loader
-
-* When configuring `config.py`, ensure that it contains the following values:
-  ```
-  ingest_path = "/opt/scholarspace/scholarspace-hyrax"
-  ingest_command = "rake RAILS_ENV=production gwss:ingest_etd"
-  ```
-
 ### Migrating Production Database
 
 In the app-server container (i.e. through `docker exec -it scholarspace-hyrax_app-server_1 /bin/sh`, followed by `su scholarspace`), run:

app/models/ability.rb

@@ -42,4 +42,15 @@ def contentadmins_can_create_curation_concerns
     can :index, Hydra::AccessControls::Embargo
     can :index, Hydra::AccessControls::Lease
   end
+
+  # Added for Bulkrax 5.0.0+
+  def can_import_works?
+    # can_create_any_work?
+    admin? or contentadmin_user?
+  end
+
+  def can_export_works?
+    # can_create_any_work?
+    admin? or contentadmin_user?
+  end
 end

app/models/collection.rb

@@ -4,4 +4,8 @@ class Collection < ActiveFedora::Base
   # You can replace these metadata if they're not suitable
   include Hyrax::BasicMetadata
   self.indexer = Hyrax::CollectionWithBasicMetadataIndexer
+
+  property :bulkrax_identifier, predicate: ::RDF::URI("https://iro.bl.uk/resource#bulkraxIdentifier"), multiple: false do |index|
+    index.as :stored_searchable, :facetable
+  end
 end

app/models/file_set.rb

@@ -1,4 +1,10 @@
 # Generated by hyrax:models:install
 class FileSet < ActiveFedora::Base
+#  include ::Hyrax::FileSetBehavior
+
+  property :bulkrax_identifier, predicate: ::RDF::URI("https://iro.bl.uk/resource#bulkraxIdentifier"), multiple: false do |index|
+    index.as :stored_searchable, :facetable
+  end
+
   include ::Hyrax::FileSetBehavior
 end

app/models/gw_etd.rb

@@ -28,5 +28,9 @@ class GwEtd < ActiveFedora::Base
     index.as :stored_searchable, :facetable
   end
 
+  property :bulkrax_identifier, predicate: ::RDF::URI("https://iro.bl.uk/resource#bulkraxIdentifier"), multiple: false do |index|
+    index.as :stored_searchable, :facetable
+  end
+
   include ::Hyrax::BasicMetadata
 end

app/models/gw_journal_issue.rb

@@ -24,6 +24,10 @@ class GwJournalIssue < ActiveFedora::Base
     index.as :stored_searchable
   end
 
+  property :bulkrax_identifier, predicate: ::RDF::URI("https://iro.bl.uk/resource#bulkraxIdentifier"), multiple: false do |index|
+    index.as :stored_searchable, :facetable
+  end
+
   # This must be included at the end, because it finalizes the metadata
   # schema (by adding accepts_nested_attributes)
   include ::Hyrax::BasicMetadata

app/models/gw_work.rb

@@ -16,5 +16,9 @@ class GwWork < ActiveFedora::Base
     index.as :stored_searchable
   end
 
+  property :bulkrax_identifier, predicate: ::RDF::URI("https://iro.bl.uk/resource#bulkraxIdentifier"), multiple: false do |index|
+    index.as :stored_searchable, :facetable
+  end
+
   include ::Hyrax::BasicMetadata
-end
+end

app/services/hyrax/qa_authorities_patch.rb

@@ -0,0 +1,12 @@
+module Hyrax
+    module QaSelectServicePatch
+        def include_current_value(value, _index, render_options, html_options)
+            unless value.blank? || active?(value)
+                html_options[:class][-1] += ' force-select'
+                render_options += [[label(value) { value }, value]]
+            end
+            [render_options, html_options]
+        end
+    end
+end
+Hyrax::QaSelectService.prepend Hyrax::QaSelectServicePatch

app/views/hyrax/gw_etds/_attribute_rows.erb

@@ -11,6 +11,7 @@
 <%= presenter.attribute_to_html(:related_url, render_as: :external_link) %>
 <%= presenter.attribute_to_html(:resource_type, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:source) %>
+<%= presenter.attribute_to_html(:license, render_as: :license) %>
 <%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement) %>
 <%= presenter.attribute_to_html(:gw_affiliation, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:degree, render_as: :faceted) %>

app/views/hyrax/gw_works/_attribute_rows.erb

@@ -11,6 +11,7 @@
 <%= presenter.attribute_to_html(:related_url, render_as: :external_link) %>
 <%= presenter.attribute_to_html(:resource_type, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:source) %>
+<%= presenter.attribute_to_html(:license, render_as: :license) %>
 <%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement) %>
 <%= presenter.attribute_to_html(:gw_affiliation, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:degree, render_as: :faceted) %>

bin/importer

@@ -0,0 +1,146 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../config/environment'
+
+require 'slop'
+
+def main(opts = {})
+  check_required_params
+
+  update = opts[:importer_id].present?
+  port = opts[:port].presence
+  url = build_url(opts.delete(:importer_id), opts.delete(:url), port)
+
+  headers = { 'Content-Type' => 'application/json' }
+  headers['Authorization'] = "Token: #{opts.delete(:auth_token)}"
+  params = build_params(opts)
+
+  logger.info("POST to #{url} - PARAMS #{params}")
+
+  conn = Faraday.new(
+    url: url,
+    headers: headers
+  )
+
+  response = if update
+               conn.put do |request|
+                 request.body = params.to_json
+               end
+             else
+               conn.post do |request|
+                 request.body = params.to_json
+               end
+             end
+
+  puts "#{response.status} - #{response.body.truncate(200)}"
+end
+
+def check_required_params
+  if opts[:importer_id].blank? && invalid?(opts)
+    puts 'Missing required parameters'
+    help
+  end
+
+  if opts[:auth_token].blank? # rubocop:disable Style/GuardClause
+    puts 'Missing Authentication Token --auth_token'
+    exit
+  end
+end
+
+def invalid?(opts)
+  required_params.each do |p|
+    return true if opts[p.to_sym].blank?
+  end
+  return false
+end
+
+def required_params
+  Bulkrax.api_definition['bulkrax']['importer'].map { |key, value| key if value['required'] == true }.compact
+end
+
+def build_params(opts = {})
+  params = {}
+  params[:commit] = opts.delete(:commit)
+  parser_fields = {
+    metadata_file_name: opts.delete(:metadata_file_name),
+    metadata_format: opts.delete(:metadata_format),
+    rights_statement: opts.delete(:rights_statement),
+    override_rights_statement: opts.delete(:override_rights_statement),
+    import_file_path: opts.delete(:import_file_path),
+    metadata_prefix: opts.delete(:metadata_prefix),
+    set: opts.delete(:set),
+    collection_name: opts.delete(:collection_name)
+  }.compact
+  params[:importer] = opts.compact
+  params[:importer][:user_id] = opts.delete(:user_id)
+  params[:importer][:admin_set_id] = opts.delete(:admin_set_id)
+  params[:importer][:parser_fields] = parser_fields || {}
+  return params.compact
+end
+
+def build_url(importer_id, url, port = nil)
+  if url.nil?
+    protocol = Rails.application.config.force_ssl ? 'https://' : 'http://'
+    host = Rails.application.config.action_mailer.default_url_options[:host]
+    url = "#{protocol}#{host}"
+    url = "#{url}:#{port}" if port
+  end
+  path = Bulkrax::Engine.routes.url_helpers.polymorphic_path(Bulkrax::Importer)
+  url = File.join(url, path)
+  url = File.join(url, importer_id) if importer_id
+  return url
+end
+
+def logger
+  Rails.logger
+end
+
+def version
+  puts "Bulkrax #{Bulkrax::VERSION}"
+  puts "Slop #{Slop::VERSION}"
+end
+
+# Format the help for the CLI
+def help
+  puts 'CREATE:'
+  puts '  bin/importer --name "My Import" --parser_klass Bulkrax::CsvParser --commit "Create and Import" --import_file_path /data/tmp/import.csv --auth_token 12345'
+  puts 'UPDATE:'
+  puts '  bin/importer --importer_id 1 --commit "Update and Re-Import (update metadata only)" --import_file_path /data/tmp/import.csv --auth_token 12345'
+  puts 'PARAMETERS:'
+  Bulkrax.api_definition['bulkrax']['importer'].each_pair do |key, value|
+    next if key == 'parser_fields'
+    puts "  --#{key}"
+    value.each_pair do |k, v|
+      next if k == 'contained_in'
+      puts "    #{k}: #{v}"
+    end
+  end
+  puts '  --url'
+  puts "    Repository URL"
+  exit
+end
+
+# Setup the options
+options = Slop.parse do |o|
+  o.on '--version', 'Print the version' do
+    version
+    exit
+  end
+
+  o.on '--help', 'Print help' do
+    help
+    exit
+  end
+
+  Bulkrax.api_definition['bulkrax']['importer'].each_pair do |key, value|
+    if value['required'].blank?
+      o.string "--#{key}", value['definition'], default: nil
+    else
+      o.string "--#{key}", value['definition']
+    end
+  end
+  o.string '--url', 'Repository URL'
+end
+
+main(options.to_hash)

config/authorities/licenses.yml

@@ -42,5 +42,9 @@ terms:
       term: CC0 1.0 Universal
       active: true
     - id: http://www.europeana.eu/portal/rights/rr-r.html
+      term: All rights reserved (deprecated)
+      active: false
+    - id: All rights reserved
       term: All rights reserved
       active: true
+

config/environments/test.rb

@@ -41,5 +41,5 @@
   # config.action_view.raise_on_missing_translations = true
   config.permanent_url_base = "https://scholarspace-etds.library.gwu.edu/"
 
-  config.active_job.queue_adapter = :test
+  config.active_job.queue_adapter = :sidekiq
 end