hyrax 3.0.0.pre.rc4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 684ca77fe907962abffc140cd9b96081584650df75282c35e0ccd6fc041473ca
-  data.tar.gz: 661b6c451fa1fbd7f25d91ab56331e88827a4f3e88fddb85bbcb1623a7d9f068
+  metadata.gz: 92a018038d9094f92a85088a61ff697aba139a326cfa96a95a7d4cdbeca98a0a
+  data.tar.gz: 8ca7c54444ba58ba89f2fc977ddcb8597122b985c9d7a7dda21d64fdcc87e648
 SHA512:
-  metadata.gz: 2f884204185783729a1d7a8d00dfa41c27e592097749f773418cdecf033aff2804e853ccefadf48d7d0c7c18da7576d3d1fa30aba05a58e687814f6d337b8c7c
-  data.tar.gz: ae5b51cbb3949d03967a5d4aa1650aaf77c8776d799df5456db09ff4b615ed8665699277f092e50267277afb654ca09e75200863f02f91c92b0f8f08465c0a60
+  metadata.gz: d5a60ae3e20bead1941c72d241bfa4fbee221eb6bf4637ad1bf58a53edd07eaaa741108707d06ece69b096b83132512875555fc64c6128b3a0c1046b079cbf9a
+  data.tar.gz: 64b2ef5c948183fa190b4f20adfae67ef22a8abc83df98c4e4581cbe83d960b3dc8d67b0453c062da5940d76f915a496fcb16f3b3a29aa63ffdeb2f0b443dab3

data/.dassie/config/cable.yml

@@ -6,5 +6,5 @@ test:
 
 production:
   adapter: redis
-  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  url: <%= ENV.fetch("REDIS_URL") { sprintf "redis://%s%s:%s/1", (ENV['REDIS_PASSWORD'].present? ? ":#{ENV['REDIS_PASSWORD']}@" : ''), ENV.fetch('REDIS_HOST', 'localhost'), ENV.fetch('REDIS_PORT', '6379') } %>
   channel_prefix: _dassie_production

data/.dassie/config/environments/development.rb

@@ -60,6 +60,8 @@ Rails.application.configure do
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
+  config.assets.prefix = '/dev-assets'
+
   # Raises error for missing translations
   config.action_view.raise_on_missing_translations = true
 

data/.dassie/config/environments/production.rb

@@ -23,7 +23,7 @@ Rails.application.configure do
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Uglifier.new(harmony: true)
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.

data/.dassie/config/redis.yml

@@ -7,3 +7,4 @@ test:
 production:
   host: <%= ENV.fetch('REDIS_HOST', 'localhost') %>
   port: <%= ENV.fetch('REDIS_PORT', 6379) %>
+  password: <%= ENV['REDIS_PASSWORD'] %>

data/.dassie/db/seeds.rb

@@ -12,3 +12,11 @@ puts "\n== Loading users"
 User.where(email: 'admin@example.com').first_or_create do |f|
   f.password = 'admin_password'
 end
+
+User.where(email: 'basic_user@example.com').first_or_create do |f|
+  f.password = 'password'
+end
+
+User.where(email: 'another_user@example.com').first_or_create do |f|
+  f.password = 'password'
+end

data/.dockerignore

@@ -9,3 +9,4 @@ Dockerfile
 
 artifacts/*
 coverage/*
+chart/*

data/Dockerfile

@@ -7,10 +7,12 @@ ARG EXTRA_APK_PACKAGES="git"
 
 RUN apk --no-cache upgrade && \
   apk --no-cache add build-base \
+  curl \
   imagemagick \
   tzdata \
   nodejs \
   yarn \
+  zip \
   $DATABASE_APK_PACKAGE \
   $EXTRA_APK_PACKAGES
 
@@ -39,7 +41,7 @@ ARG BUNDLE_WITHOUT="development test"
 
 ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 ONBUILD RUN bundle install --jobs "$(nproc)"
-ONBUILD RUN DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
+ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
 FROM hyrax-base as hyrax-engine-dev
 
@@ -52,7 +54,7 @@ COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 COPY --chown=1001:101 . /app/samvera/hyrax-engine
 
 RUN cd /app/samvera/hyrax-engine && bundle install --jobs "$(nproc)"
-RUN DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake yarn:install
+RUN RAILS_ENV=production SECRET_KEY_BASE='fakesecret1234' DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
 
 FROM hyrax-engine-dev as hyrax-engine-dev-worker
@@ -61,9 +63,10 @@ ENV MALLOC_ARENA_MAX=2
 
 USER root
 RUN apk --no-cache add bash \
+  ffmpeg \
+  mediainfo \
   openjdk11-jre \
-  perl \
-  mediainfo
+  perl
 USER app
 
 RUN mkdir -p /app/fits && \

data/app/actors/hyrax/actors/create_with_remote_files_actor.rb

@@ -61,9 +61,18 @@ module Hyrax
         true
       end
 
+      def create_file_from_url(env, uri, file_name, auth_header)
+        case env.curation_concern
+        when Valkyrie::Resource
+          create_file_from_url_through_valkyrie(env, uri, file_name, auth_header)
+        else
+          create_file_from_url_through_active_fedora(env, uri, file_name, auth_header)
+        end
+      end
+
       # Generic utility for creating FileSet from a URL
       # Used in to import files using URLs from a file picker like browse_everything
-      def create_file_from_url(env, uri, file_name, auth_header = {})
+      def create_file_from_url_through_active_fedora(env, uri, file_name, auth_header)
         import_url = URI.decode_www_form_component(uri.to_s)
         ::FileSet.new(import_url: import_url, label: file_name) do |fs|
           actor = Hyrax::Actors::FileSetActor.new(fs, env.user)
@@ -80,6 +89,23 @@ module Hyrax
         end
       end
 
+      # Generic utility for creating Hyrax::FileSet from a URL
+      # Used in to import files using URLs from a file picker like browse_everything
+      def create_file_from_url_through_valkyrie(env, uri, file_name, auth_header)
+        import_url = URI.decode_www_form_component(uri.to_s)
+        fs = Hyrax.persister.save(resource: Hyrax::FileSet.new(import_url: import_url, label: file_name))
+        actor = Hyrax::Actors::FileSetActor.new(fs, env.user, use_valkyrie: true)
+        actor.create_metadata(visibility: env.curation_concern.visibility)
+        actor.attach_to_work(env.curation_concern)
+        if uri.scheme == 'file'
+          # Turn any %20 into spaces.
+          file_path = CGI.unescape(uri.path)
+          IngestLocalFileJob.perform_later(fs, file_path, env.user)
+        else
+          ImportUrlJob.perform_later(fs, operation_for(user: actor.user), auth_header)
+        end
+      end
+
       def operation_for(user:)
         Hyrax::Operation.create!(user: user,
                                  operation_type: "Attach Remote File")

data/app/actors/hyrax/actors/file_actor.rb

@@ -11,7 +11,7 @@ module Hyrax
       # @param [FileSet] file_set the parent FileSet
       # @param [Symbol, #to_sym] relation the type/use for the file
       # @param [User] user the user to record as the Agent acting upon the file
-      def initialize(file_set, relation, user, use_valkyrie: false)
+      def initialize(file_set, relation, user, use_valkyrie: Hyrax.config.query_index_from_valkyrie)
         @use_valkyrie = use_valkyrie
         @file_set = file_set
         @relation = normalize_relation(relation)
@@ -75,7 +75,7 @@ module Hyrax
         CharacterizeJob.perform_later(file_set, repository_file.id, pathhint(io))
       end
 
-      def perform_ingest_file_through_valkyrie(io)
+      def perform_ingest_file_through_valkyrie(io) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         file =
           begin
             Hyrax.storage_adapter.upload(resource: file_set, file: io, original_filename: io.original_name, use: relation)
@@ -87,7 +87,9 @@ module Hyrax
         create_version(file_metadata, user)
         id = file_metadata.file_identifier
         file_set.file_ids << id
+        file_set.original_file_id = id
         Hyrax.persister.save(resource: file_set)
+        Hyrax.publisher.publish('object.metadata.updated', object: file_set, user: user)
         CharacterizeJob.perform_later(file_set, id.to_s, pathhint(io))
         file_metadata
       end

data/app/actors/hyrax/actors/file_set_actor.rb

@@ -6,7 +6,7 @@ module Hyrax
       include Lockable
       attr_reader :file_set, :user, :attributes, :use_valkyrie
 
-      def initialize(file_set, user, use_valkyrie: false)
+      def initialize(file_set, user, use_valkyrie: Hyrax.config.query_index_from_valkyrie)
         @use_valkyrie = use_valkyrie
         @file_set = file_set
         @user = user
@@ -68,7 +68,6 @@ module Hyrax
         yield(file_set) if block_given?
       end
 
-      # Adds a FileSet to the work using ore:Aggregations.
       # Locks to ensure that only one process is operating on the list at a time.
       def attach_to_work(work, file_set_params = {})
         acquire_lock_for(work.id) do
@@ -87,15 +86,18 @@ module Hyrax
       def attach_to_valkyrie_work(work, file_set_params)
         work = Hyrax.query_service.find_by(id: work.id) unless work.new_record
         file_set.visibility = work.visibility unless assign_visibility?(file_set_params)
-        Hyrax.persister.save(resource: file_set)
-        work.member_ids << file_set.id
-        work.representative_id = file_set.id if work.representative_id.blank?
-        work.thumbnail_id = file_set.id if work.thumbnail_id.blank?
+        fs = Hyrax.persister.save(resource: file_set)
+        Hyrax.publisher.publish('object.metadata.updated', object: fs, user: user)
+        work.member_ids << fs.id
+        work.representative_id = fs.id if work.representative_id.blank?
+        work.thumbnail_id = fs.id if work.thumbnail_id.blank?
         # Save the work so the association between the work and the file_set is persisted (head_id)
         # NOTE: the work may not be valid, in which case this save doesn't do anything.
         Hyrax.persister.save(resource: work)
+        Hyrax.publisher.publish('object.metadata.updated', object: work, user: user)
       end
 
+      # Adds a FileSet to the work using ore:Aggregations.
       def attach_to_af_work(work, file_set_params)
         work.reload unless work.new_record?
         file_set.visibility = work.visibility unless assign_visibility?(file_set_params)

data/app/controllers/concerns/hyrax/works_controller_behavior.rb

@@ -113,10 +113,21 @@ module Hyrax
     end
 
     def destroy
-      title = curation_concern.to_s
-      env = Actors::Environment.new(curation_concern, current_ability, {})
-      return unless actor.destroy(env)
-      Hyrax.config.callback.run(:after_destroy, curation_concern.id, current_user, warn: false)
+      case curation_concern
+      when ActiveFedora::Base
+        title = curation_concern.to_s
+        env = Actors::Environment.new(curation_concern, current_ability, {})
+        return unless actor.destroy(env)
+        Hyrax.config.callback.run(:after_destroy, curation_concern.id, current_user, warn: false)
+      else
+        transactions['work_resource.destroy']
+          .with_step_args('work_resource.delete' => { user: current_user })
+          .call(curation_concern)
+          .value!
+
+        title = Array(curation_concern.title).first
+      end
+
       after_destroy_response(title)
     end
 
@@ -380,7 +391,7 @@ module Hyrax
 
     def after_destroy_response(title)
       respond_to do |wants|
-        wants.html { redirect_to my_works_path, notice: "Deleted #{title}" }
+        wants.html { redirect_to hyrax.my_works_path, notice: "Deleted #{title}" }
         wants.json { render_json_response(response_type: :deleted, message: "Deleted #{curation_concern.id}") }
       end
     end

data/app/forms/hyrax/forms/resource_form.rb

@@ -43,6 +43,20 @@ module Hyrax
         property :access, virtual: true, prepopulator: ->(_opts) { self.access = model.mode }
       end
 
+      ##
+      # @api private
+      InWorksPopulator = lambda do |_options|
+        self.in_works_ids =
+          if persisted?
+            Hyrax.query_service
+                 .find_inverse_references_by(resource: model, property: :member_ids)
+                 .select(&:work?)
+                 .map(&:id)
+          else
+            []
+          end
+      end
+
       ##
       # @api private
       #
@@ -90,6 +104,7 @@ module Hyrax
 
       # pcdm relationships
       property :admin_set_id, prepopulator: ->(_opts) { self.admin_set_id = AdminSet::DEFAULT_ID }
+      property :in_works_ids, virtual: true, prepopulator: InWorksPopulator
       property :member_ids, default: [], type: Valkyrie::Types::Array
       property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
 

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -20,6 +20,14 @@ module Hyrax
     include Hyrax::WorkFormHelper
     include Hyrax::WorkflowsHelper
 
+    ##
+    # @return [Array<String>] the list of all user groups
+    def available_user_groups(ability:)
+      return ::User.group_service.role_names if ability.admin?
+
+      ability.user_groups
+    end
+
     # Which translations are available for the user to select
     # @return [Hash{String => String}] locale abbreviations as keys and flags as values
     def available_translations

data/app/indexers/hyrax/valkyrie_file_set_indexer.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+module Hyrax
+  ##
+  # Indexes Hyrax::FileSet objects
+  class ValkyrieFileSetIndexer < Hyrax::ValkyrieIndexer
+    include Hyrax::ResourceIndexer
+    include Hyrax::PermissionIndexer
+    include Hyrax::VisibilityIndexer
+    include Hyrax::Indexer(:core_metadata)
+    include Hyrax::Indexer(:basic_metadata)
+
+    # include Hyrax::IndexesThumbnails # TODO: Is there a Valkyrie version of a thumbnail indexer?
+
+    def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+      super.tap do |solr_doc| # rubocop:disable Metrics/BlockLength
+        # Metadata from the FileSet
+        solr_doc['file_ids_ssim']         = resource.file_ids&.map(&:to_s)
+        solr_doc['original_file_id_ssi']  = resource.original_file_id.to_s
+        solr_doc['thumbnail_id_ssi']      = resource.thumbnail_id.to_s
+        solr_doc['extracted_text_id_ssi'] = resource.extracted_text_id.to_s
+
+        # Add in metadata from the original file.
+        file_metadata = original_file
+        return solr_doc unless file_metadata
+
+        # Label is the actual file name. It's not editable by the user.
+        solr_doc['original_file_alternate_ids_tesim'] = file_metadata.alternate_ids&.map(&:to_s) if file_metadata.alternate_ids.present?
+
+        solr_doc['original_filename_tesi']  = file_metadata.original_filename if file_metadata.original_filename.present?
+        solr_doc['original_filename_ssi']   = file_metadata.original_filename if file_metadata.original_filename.present?
+        solr_doc['mime_type_tesi']          = file_metadata.mime_type if file_metadata.mime_type.present?
+        solr_doc['mime_type_ssi']           = file_metadata.mime_type if file_metadata.mime_type.present?
+
+        solr_doc['file_format_tesim']       = file_format(file_metadata)
+        solr_doc['file_format_sim']         = file_format(file_metadata)
+        solr_doc['file_size_lts']           = file_metadata.size[0]
+        solr_doc['type_tesim']              = file_metadata.type if file_metadata.type.present?
+
+        # attributes set by fits
+        solr_doc['format_label_tesim']      = file_metadata.format_label if file_metadata.format_label.present?
+        solr_doc['size_tesim']              = file_metadata.size if file_metadata.size.present?
+        solr_doc['well_formed_tesim']       = file_metadata.well_formed if file_metadata.well_formed.present?
+        solr_doc['valid_tesim']             = file_metadata.valid if file_metadata.valid.present?
+        solr_doc['fits_version_tesim']      = file_metadata.fits_version if file_metadata.fits_version.present?
+        solr_doc['exif_version_tesim']      = file_metadata.exif_version if file_metadata.exif_version.present?
+        solr_doc['checksum_tesim']          = file_metadata.checksum if file_metadata.checksum.present?
+
+        # shared attributes across multiple file types
+        solr_doc['frame_rate_tesim']        = file_metadata.frame_rate if file_metadata.frame_rate.present? # audio, video
+        solr_doc['bit_rate_tesim']          = file_metadata.bit_rate if file_metadata.bit_rate.present? # audio, video
+        solr_doc['duration_tesim']          = file_metadata.duration if file_metadata.duration.present? # audio, video
+        solr_doc['sample_rate_tesim']       = file_metadata.sample_rate if file_metadata.sample_rate.present? # audio, video
+
+        solr_doc['height_tesim']            = file_metadata.height if file_metadata.height.present? # image, video
+        solr_doc['width_tesim']             = file_metadata.width if file_metadata.width.present? # image, video
+
+        # attributes set by fits for audio files
+        solr_doc['bit_depth_tesim']         = file_metadata.bit_depth if file_metadata.bit_depth.present?
+        solr_doc['channels_tesim']          = file_metadata.channels if file_metadata.channels.present?
+        solr_doc['data_format_tesim']       = file_metadata.data_format if file_metadata.data_format.present?
+        solr_doc['offset_tesim']            = file_metadata.offset if file_metadata.offset.present?
+
+        # attributes set by fits for documents
+        solr_doc['file_title_tesim']        = file_metadata.file_title if file_metadata.file_title.present?
+        solr_doc['page_count_tesim']        = file_metadata.page_count if file_metadata.page_count.present?
+        solr_doc['language_tesim']          = file_metadata.language if file_metadata.language.present?
+        solr_doc['word_count_tesim']        = file_metadata.word_count if file_metadata.word_count.present?
+        solr_doc['character_count_tesim']   = file_metadata.character_count if file_metadata.character_count.present?
+        solr_doc['line_count_tesim']        = file_metadata.line_count if file_metadata.line_count.present?
+        solr_doc['character_set_tesim']     = file_metadata.character_set if file_metadata.character_set.present?
+        solr_doc['markup_basis_tesim']      = file_metadata.markup_basis if file_metadata.markup_basis.present?
+        solr_doc['paragraph_count_tesim']   = file_metadata.paragraph_count if file_metadata.paragraph_count.present?
+        solr_doc['markup_language_tesim']   = file_metadata.markup_language if file_metadata.markup_language.present?
+        solr_doc['table_count_tesim']       = file_metadata.table_count if file_metadata.table_count.present?
+        solr_doc['graphics_count_tesim']    = file_metadata.graphics_count if file_metadata.graphics_count.present?
+
+        # attributes set by fits for images
+        solr_doc['byte_order_tesim']        = file_metadata.byte_order if file_metadata.byte_order.present?
+        solr_doc['compression_tesim']       = file_metadata.compression if file_metadata.compression.present?
+        solr_doc['color_space_tesim']       = file_metadata.color_space if file_metadata.color_space.present?
+        solr_doc['profile_name_tesim']      = file_metadata.profile_name if file_metadata.profile_name.present?
+        solr_doc['profile_version_tesim']   = file_metadata.profile_version if file_metadata.profile_version.present?
+        solr_doc['orientation_tesim']       = file_metadata.orientation if file_metadata.orientation.present?
+        solr_doc['color_map_tesim']         = file_metadata.color_map if file_metadata.color_map.present?
+        solr_doc['image_producer_tesim']    = file_metadata.image_producer if file_metadata.image_producer.present?
+        solr_doc['capture_device_tesim']    = file_metadata.capture_device if file_metadata.capture_device.present?
+        solr_doc['scanning_software_tesim'] = file_metadata.scanning_software if file_metadata.scanning_software.present?
+        solr_doc['gps_timestamp_tesim']     = file_metadata.gps_timestamp if file_metadata.gps_timestamp.present?
+        solr_doc['latitude_tesim']          = file_metadata.latitude if file_metadata.latitude.present?
+        solr_doc['longitude_tesim']         = file_metadata.longitude if file_metadata.longitude.present?
+
+        # attributes set by fits for video
+        solr_doc['aspect_ratio_tesim']      = file_metadata.aspect_ratio if file_metadata.aspect_ratio.present?
+      end
+    end
+
+    private
+
+    def original_file
+      Hyrax.custom_queries.find_original_file(file_set: resource)
+    rescue Valkyrie::Persistence::ObjectNotFoundError
+      Hyrax.custom_queries.find_files(file_set: resource).first
+    end
+
+    def file_format(file)
+      if file.mime_type.present? && file.format_label.present?
+        "#{file.mime_type.split('/').last} (#{file.format_label.join(', ')})"
+      elsif file.mime_type.present?
+        file.mime_type.split('/').last
+      elsif file.format_label.present?
+        file.format_label
+      end
+    end
+  end
+end

data/app/indexers/hyrax/valkyrie_indexer.rb

@@ -95,7 +95,12 @@ module Hyrax
       # @example
       #     ValkyrieIndexer.for(resource: Book.new) # => #<BookIndexer ...>
       def for(resource:)
-        indexer_class_for(resource).new(resource: resource)
+        case resource
+        when Hyrax::FileSet
+          Hyrax::ValkyrieFileSetIndexer.new(resource: resource)
+        else
+          indexer_class_for(resource).new(resource: resource)
+        end
       end
 
       private

data/app/indexers/hyrax/valkyrie_work_indexer.rb

@@ -16,6 +16,8 @@ module Hyrax
         solr_doc['admin_set_id_ssim'] = [resource.admin_set_id.to_s]
         solr_doc['member_of_collection_ids_ssim'] = resource.member_of_collection_ids.map(&:to_s)
         solr_doc['member_ids_ssim'] = resource.member_ids.map(&:to_s)
+        solr_doc['depositor_ssim'] = [resource.depositor]
+        solr_doc['depositor_tesim'] = [resource.depositor]
       end
     end
 

data/app/jobs/embargo_expiry_job.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 class EmbargoExpiryJob < Hyrax::ApplicationJob
   def perform
-    records_with_expired_embargos.each do |id|
-      work = ActiveFedora::Base.find(id)
-      Hyrax::Actors::EmbargoActor.new(work).destroy
+    records_with_expired_embargos.each do |resource|
+      Hyrax::EmbargoManager.release_embargo_for(resource: resource) &&
+        Hyrax::AccessControlList(resource).save
     end
   end
 
   ##
-  # @return [Enumerator<String>] ids for all the objects that have expired active embargoes
+  # @return [Enumerator<Valkyrie::Resource>] ids for all the objects that have expired active embargoes
   def records_with_expired_embargos
-    Hyrax::EmbargoService.assets_with_expired_embargoes.map(&:id)
+    ids = Hyrax::EmbargoService.assets_with_expired_embargoes.map(&:id)
+
+    Hyrax.query_service.find_many_by_ids(ids: ids)
   end
 end