bulkrax 9.2.0 → 9.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb04fb1689c90c0cb7b96d0fbab95f371e4e4718509638812e62b0bffa1cc9e0
-  data.tar.gz: b3df0b413a151f7c49c6a39e07a705ec0e8c87d181a66de2a0ae75d567297f08
+  metadata.gz: 462afc87884a3c6ed23d3d8b9237ec3dafeffcd2cda9b8e0836d74e0bcd68657
+  data.tar.gz: 4373f2ab775eb346a9b34b2bf7c2238b2b3c192a2c5d9a7e039974a56527ca74
 SHA512:
-  metadata.gz: 89a766b0116729946c1ffba1252362fff3f29fd57ab774aebab39fa5b6f2b207a511de3da801b47bce7352a8ef2ca2e3811f306ca0f701ef592acd2a66103f34
-  data.tar.gz: b559f0441c55c23a64568d95d1bcb533dc5b11cf12c9ad8aaed3ab852a0f9ea88b1e9140968b6272af54d05d2edae3ff3dadb5433e07fa6c55d90e615f42447d
+  metadata.gz: 887b076e34be355fe1708d97d1ab022106aa0c7e9eb8acf80233a3db0c648fb4642ab5be3cf8ddaf9fc270ebf61d0762630d803893de6d417a3baf6332405d86
+  data.tar.gz: bd12861189a4182da26dd3337dd4d89536616ec632a211ba4d8821c3d390d4b03093ed49a77a184359b95c7ae1667bcd4efc59a2fd907af370cadb861eb8f895

data/app/assets/javascripts/bulkrax/importers.js.erb

@@ -15,9 +15,11 @@ function prepBulkrax(event) {
   // Initialize the uploader only if hyraxUploader is defined
   if (typeof $.fn.hyraxUploader === 'function') {
     // Initialize the uploader
-    $('.fileupload-bulkrax').hyraxUploader({ 
+    var uploader = $('.fileupload-bulkrax');
+    var maxFileSize = uploader.data('max-file-size');
+    uploader.hyraxUploader({ 
       maxNumberOfFiles: 1,
-      maxFileSize: <%= (defined?(Hyrax) && Hyrax.config.uploader[:maxFileSize]) || 524288000 %>
+      maxFileSize: maxFileSize
     });
 
     // Function to toggle 'required' attribute based on uploaded files

data/app/factories/bulkrax/valkyrie_object_factory.rb

@@ -236,7 +236,8 @@ module Bulkrax
     # @input [Fileset or FileMetadata]
     # @return [FileMetadata] the original file
     def self.original_file(fileset:)
-      fileset.try(:original_file) || fileset
+      return fileset if fileset.is_a?(Hyrax::FileMetadata)
+      fileset.try(:original_file)
     end
 
     ##
@@ -293,6 +294,10 @@ module Bulkrax
     def delete(user)
       obj = find
       raise ObjectFactoryInterface::ObjectNotFoundError, "Object not found to delete" unless obj
+      # delete the file sets when we delete a work
+      # This has to be done before the work is deleted or we can't find them
+      # via the custom query
+      destroy_existing_files(object: obj)
 
       Hyrax.persister.delete(resource: obj)
       Hyrax.index_adapter.delete(resource: obj)
@@ -547,8 +552,9 @@ module Bulkrax
     end
 
     # @Override Destroy existing files with Hyrax::Transactions
-    def destroy_existing_files
+    def destroy_existing_files(object: @object)
       existing_files = Hyrax.custom_queries.find_child_file_sets(resource: object)
+      return if existing_files.empty?
 
       existing_files.each do |fs|
         transactions["file_set.destroy"]
@@ -558,10 +564,10 @@ module Bulkrax
           .value!
       end
 
-      @object.member_ids = @object.member_ids.reject { |m| existing_files.detect { |f| f.id == m } }
-      @object.rendering_ids = []
-      @object.representative_id = nil
-      @object.thumbnail_id = nil
+      object.member_ids = object.member_ids.reject { |m| existing_files.detect { |f| f.id == m } }
+      object.rendering_ids = []
+      object.representative_id = nil
+      object.thumbnail_id = nil
     end
 
     def transform_attributes(update: false)

data/app/jobs/bulkrax/delete_and_import_job.rb

@@ -5,10 +5,13 @@ module Bulkrax
     queue_as :import
 
     def perform(entry, importer_run)
-      status = self.class::DELETE_CLASS.perform_now(entry, importer_run)
-      if status.status_message == "Deleted"
-        entry = Bulkrax::Entry.find(entry.id) # maximum reload
-        self.class::IMPORT_CLASS.perform_now(entry.id, importer_run.id)
+      # Delete the object if it exists, then reimport it.
+      # If the object doesn't exist, just reimport it.
+      begin
+        status = self.class::DELETE_CLASS.perform_now(entry, importer_run)
+        reimport(entry, importer_run) if status.status_message == "Deleted"
+      rescue Bulkrax::ObjectFactoryInterface::ObjectNotFoundError
+        reimport(entry, importer_run)
       end
 
     rescue => e
@@ -16,5 +19,10 @@ module Bulkrax
       # this causes caught exception to be reraised
       raise
     end
+
+    def reimport(entry, importer_run)
+      entry = Bulkrax::Entry.find(entry.id) # maximum reload
+      self.class::IMPORT_CLASS.perform_now(entry.id, importer_run.id)
+    end
   end
 end

data/app/jobs/bulkrax/delete_file_set_job.rb

@@ -3,7 +3,16 @@
 module Bulkrax
   class DeleteFileSetJob < DeleteJob
     def perform(entry, importer_run)
+      # Ensure the entry has metadata built for delete if it
+      # doesn't already so it can be found for deletion.
+      if entry.respond_to?(:build_metadata_for_delete) &&
+         entry.parsed_metadata.nil? &&
+         entry.raw_metadata.present?
+        entry.build_metadata_for_delete
+        entry.save!
+      end
       file_set = entry.factory.find
+
       if file_set
         parent = file_set.parent
         if parent&.respond_to?(:ordered_members)

data/app/models/concerns/bulkrax/export_behavior.rb

@@ -27,10 +27,10 @@ module Bulkrax
     # Prepend the file_set id to ensure a unique filename and also one that is not longer than 255 characters
     def filename(file_set)
       # return if there are no files on the fileset
-      return if Bulkrax.object_factory.original_file(fileset: file_set).blank?
+      file = Bulkrax.object_factory.original_file(fileset: file_set)
+      return '' if file.blank?
 
       fn = Bulkrax.object_factory.filename_for(fileset: file_set)
-      file = Bulkrax.object_factory.original_file(fileset: file_set)
       ext = file_extension(file: file, filename: fn)
 
       # Prepend the file_set id to ensure a unique filename

data/app/views/bulkrax/importers/_file_uploader.html.erb

@@ -1,4 +1,4 @@
-<div class="fileupload-bulkrax">
+<div class="fileupload-bulkrax" data-max-file-size="<%= (defined?(Hyrax) && Hyrax.config.uploader[:maxFileSize]) || 524288000 %>">
   <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>
   <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
   <div class="fileupload-buttonbar">

data/lib/bulkrax/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bulkrax
-  VERSION = '9.2.0'
+  VERSION = '9.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.2.1
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-10 00:00:00.000000000 Z
+date: 2025-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails