bulkrax 8.2.0 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7886fb5eefc500cc8e567d9097e6930e67cee2908fa7fa0d79ce05fc714db392
-  data.tar.gz: c6e720816dd152931df91e06be37977216a7ef06875a98386350706e4df1e3ea
+  metadata.gz: 9a409c17f35bc09ef0a8c63d06a064d01fbff68a0e4c0b91c9bfaed45d6e8169
+  data.tar.gz: 7fad94124795ff133b83d05030c550f2a52f808ac017fdd3a436c17ce039cd01
 SHA512:
-  metadata.gz: 62971f4eab58de239643d016ec8f8701b6e71953bbb8ccc4bf1d74fd8a88d3798c506004704203107e6f676218bc0dcd337776ecccc423b6c932aeddcd0dacf5
-  data.tar.gz: f3710a5e394a470753ea83d5e007505afd91a8fcdc3c383465fdaa7f2eb9c0901b3bef7cb69ae2c9bfa6d508231095e44ac7781cc9c52565162adfe2e58a5c3d
+  metadata.gz: 65280762e81baa620e73d965d5e7c58ec4ccb40d303c00cf634e7f9b3b3850e541cc9964900ce7b9aec9f6be1a7fe81dd9781db5b74209a9f8661f5f8a96f595
+  data.tar.gz: e91e65f6de8edc1640dd9b6e75c246fff4fd0812a3f87f6b4600dd9c95afc095be6076c9a80c5bca50ccc73c3831fc0a30c1160b46f18c483a6d68277bf762a8

data/README.md

@@ -24,6 +24,14 @@ $ rails db:migrate
 
 If using Sidekiq, set up queues for `import` and `export`.
 
+### Bundle errors on ARM
+
+If posix-spawn is failing to bundle on an ARM based processor, try the following
+
+`bundle config build.posix-spawn --with-cflags="-Wno-incompatible-function-pointer-types"`
+
+Then rebundle. See https://github.com/rtomayko/posix-spawn/issues/92
+
 ### Manual Installation
 
 Add this line to your application's Gemfile:

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

@@ -5,18 +5,20 @@ $(document).on('turbolinks:load ready', function() {
   $('button#err_toggle').click(function() {
     $('#error_trace').toggle();
   });
+  
   $('button#fm_toggle').click(function() {
     $('#field_mapping').toggle();
   });
+
   $('#bulkraxItemModal').on('show.bs.modal', function (event) {
-    var button = $(event.relatedTarget) // Button that triggered the modal
-    var recipient = button.data('entry-id') // Extract info from data-* attributes
+    var button = $(event.relatedTarget); // Button that triggered the modal
+    var recipient = button.data('entry-id'); // Extract info from data-* attributes
     // If necessary, you could initiate an AJAX request here (and then do the updating in a callback).
     // Update the modal's content. We'll use jQuery here, but you could use a data binding library or other methods instead.
-    var modal = $(this)
+    var modal = $(this);
     modal.find('a').each(function() {
-      this.href = this.href.replace(/\d+\?/, recipient + '?')
-    })
-    return true
-  })
+      this.href = this.href.replace(/\d+\?/, recipient + '?');
+    });
+    return true;
+  });
 });

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

@@ -2,205 +2,240 @@
 // All this logic will automatically be available in application.js.
 
 function prepBulkrax(event) {
-  var refresh_button = $('.refresh-set-source')
-  var base_url = $('#importer_parser_fields_base_url')
-  var initial_base_url = base_url.val()
-  var file_path_value = $('#importer_parser_fields_import_file_path').val()
-  handleFileToggle(file_path_value)
+  var refresh_button = $('.refresh-set-source');
+  var base_url = $('#importer_parser_fields_base_url');
+  var initial_base_url = base_url.val();
+  var file_path_value = $('#importer_parser_fields_import_file_path').val();
+  handleFileToggle(file_path_value);
+
+  // Initialize the uploader only if hyraxUploader is defined
+  if (typeof $.fn.hyraxUploader === 'function') {
+    // Initialize the uploader
+    $('.fileupload-bulkrax').hyraxUploader({ maxNumberOfFiles: 1 });
+
+    // Function to toggle 'required' attribute based on uploaded files
+    function toggleRequiredAttribute() {
+      const fileInput = $('#addfiles');
+      const uploadedFilesTable = $('.fileupload-bulkrax tbody.files');
+
+      if (uploadedFilesTable.find('tr.template-download').length > 0) {
+        // Remove 'required' if there are uploaded files
+        fileInput.removeAttr('required');
+      } else {
+        // Add 'required' if no uploaded files
+        fileInput.attr('required', 'required');
+      }
+    }
+
+    // Check the required attribute when a file is added or removed
+    $('#addfiles').on('change', function() {
+      toggleRequiredAttribute();
+    });
+
+    // Also check when an upload completes or is canceled
+    $('.fileupload-bulkrax').on('fileuploadcompleted fileuploaddestroyed', function() {
+      toggleRequiredAttribute();
+    });
+
+    // Ensure 'required' is only added if there are no files on form reset
+    $('#file-upload-cancel-btn').on('click', function() {
+      $('#addfiles').attr('required', 'required');
+      $('#addfiles').val(''); // Clear file input to ensure 'required' behavior resets
+    });
+
+    // Initial check in case files are already uploaded
+    toggleRequiredAttribute();
+  }
 
   // handle refreshing/loading of external sets via button click
   $('body').on('click', '.refresh-set-source', function(e) {
-    e.preventDefault()
+    e.preventDefault();
 
-    external_set_select = $("#importer_parser_fields_set")
-    handleSourceLoad(refresh_button, base_url, external_set_select)
-  })
+    external_set_select = $("#importer_parser_fields_set");
+    handleSourceLoad(refresh_button, base_url, external_set_select);
+  });
 
   // handle refreshing/loading of external sets via blur event for the base_url field
   $('body').on('blur', '#importer_parser_fields_base_url', function(e) {
-    e.preventDefault()
+    e.preventDefault();
 
     // retrieve the latest base_url
-    base_url = $('#importer_parser_fields_base_url')
+    base_url = $('#importer_parser_fields_base_url');
 
     // ensure we don't make another query if the value is the same -- this can be forced by clicking the refresh button
     if (initial_base_url != base_url.val()) {
-      external_set_select = $("#importer_parser_fields_set")
-      handleSourceLoad(refresh_button, base_url, external_set_select)
-      initial_base_url = base_url.val()
+      external_set_select = $("#importer_parser_fields_set");
+      handleSourceLoad(refresh_button, base_url, external_set_select);
+      initial_base_url = base_url.val();
     }
-  })
+  });
 
   // hide and show correct parser fields depending on klass setting
   $('body').on('change', '#importer_parser_klass', function(e) {
-    handleParserKlass()
-  })
-  handleParserKlass()
+    handleParserKlass();
+  });
+  handleParserKlass();
 
   // observer for cloud files being added
   var form = document.getElementById('new_importer');
   if (form == null) {
-    var form = document.getElementsByClassName('edit_importer')[0];
+    form = document.getElementsByClassName('edit_importer')[0];
   }
+
   // only setup the observer on the new and edit importer pages
   if (form != null) {
     var config = { childList: true, attributes: true };
     var callback = function(mutationsList) {
       for(var mutation of mutationsList) {
-
         if (mutation.type == 'childList') {
           browseButton = document.getElementById('browse');
-          var exp = /selected_files\[[0-9]*\]\[url\]/
+          var exp = /selected_files\[[0-9]*\]\[url\]/;
           for (var node of mutation.addedNodes) {
             if (node.attributes != undefined) {
-              var name = node.attributes.name.value
+              var name = node.attributes.name.value;
               if (exp.test(name)) {
                 browseButton.innerHTML = 'Cloud Files Added';
                 browseButton.style.backgroundColor = 'green';
-                browseButton.after(document.createElement("br"), node.value.toString())
+                browseButton.after(document.createElement("br"), node.value.toString());
               }
             }
           }
         }
       }
     };
-    var observer = new MutationObserver (callback);
-    observer.observe (form, config);
+    var observer = new MutationObserver(callback);
+    observer.observe(form, config);
   }
 }
 
 function handleFileToggle(file_path) {
   if (file_path === undefined || file_path.length === 0) {
-    $('#file_path').hide()
-    $('#file_upload').hide()
-    $('#cloud').hide()
-    $('#existing_options').hide()
-    $('#file_path input').attr('required', null)
-    $('#file_upload input').attr('required', null)
+    $('#file_path').hide();
+    $('#file_upload').hide();
+    $('#cloud').hide();
+    $('#existing_options').hide();
+    $('#file_path input').attr('required', null);
+    $('#file_upload input').attr('required', null);
   } else {
-    $('#file_path').show()
-    $('#file_upload').hide()
-    $('#cloud').hide()
-    $('#existing_options').hide()
-    $('#file_path input').attr('required', 'required')
-    $('#file_upload input').attr('required', null)
-    $('#importer_parser_fields_file_style_specify_a_path_on_the_server').attr('checked', true)
+    $('#file_path').show();
+    $('#file_upload').hide();
+    $('#cloud').hide();
+    $('#existing_options').hide();
+    $('#file_path input').attr('required', 'required');
+    $('#file_upload input').attr('required', null);
+    $('#importer_parser_fields_file_style_specify_a_path_on_the_server').attr('checked', true);
   }
 
   $('#importer_parser_fields_file_style_upload_a_file').click(function(e){
-    $('#file_path').hide()
-    $('#file_upload').show()
-    $('#cloud').hide()
-    $('#existing_options').hide()
-    $('#file_path input').attr('required', null)
-    $('#file_upload input').attr('required', 'required')
-  })
+    $('#file_path').hide();
+    $('#file_upload').show();
+    $('#cloud').hide();
+    $('#existing_options').hide();
+    $('#file_path input').attr('required', null);
+    $('#file_upload input').attr('required', 'required');
+  });
   $('#importer_parser_fields_file_style_specify_a_path_on_the_server').click(function(e){
-    $('#file_path').show()
-    $('#file_upload').hide()
-    $('#cloud').hide()
-    $('#existing_options').hide()
-    $('#file_path input').attr('required', 'required')
-    $('#file_upload input').attr('required', null)
-  })
+    $('#file_path').show();
+    $('#file_upload').hide();
+    $('#cloud').hide();
+    $('#existing_options').hide();
+    $('#file_path input').attr('required', 'required');
+    $('#file_upload input').attr('required', null);
+  });
   $('#importer_parser_fields_file_style_add_cloud_file').click(function(e){
-    $('#file_path').hide()
-    $('#file_upload').hide()
-    $('#cloud').show()
-    $('#existing_options').hide()
-    $('#file_path input').attr('required', null)
-    $('#file_upload input').attr('required', null)
-  })
+    $('#file_path').hide();
+    $('#file_upload').hide();
+    $('#cloud').show();
+    $('#existing_options').hide();
+    $('#file_path input').attr('required', null);
+    $('#file_upload input').attr('required', null);
+  });
   $('#importer_parser_fields_file_style_existing_entries').click(function(e){
-    $('#file_path').hide()
-    $('#file_upload').hide()
-    $('#cloud').hide()
-    $('#existing_options').show()
-    $('#file_path input').attr('required', null)
-    $('#file_upload input').attr('required', null)
-  })
-
+    $('#file_path').hide();
+    $('#file_upload').hide();
+    $('#cloud').hide();
+    $('#existing_options').show();
+    $('#file_path input').attr('required', null);
+    $('#file_upload input').attr('required', null);
+  });
 }
 
 function handleParserKlass() {
   <% Bulkrax.parsers.map{ |p| p[:partial]}.uniq.each do |partial| %>
   if($('.<%= partial %>').length > 0) {
-    window.<%= partial %> = $('.<%= partial %>').detach()
+    window.<%= partial %> = $('.<%= partial %>').detach();
   }
   <% end %>
 
-  var parser_klass = $("#importer_parser_klass option:selected")
+  var parser_klass = $("#importer_parser_klass option:selected");
   if(parser_klass.length > 0 && parser_klass.data('partial') && parser_klass.data('partial').length > 0) {
-    $('.parser_fields').append(window[parser_klass.data('partial')])
+    $('.parser_fields').append(window[parser_klass.data('partial')]);
   }
 
-  handleBrowseEverything()
-  var file_path_value = $('#importer_parser_fields_import_file_path').val()
-  handleFileToggle(file_path_value)
+  handleBrowseEverything();
+  var file_path_value = $('#importer_parser_fields_import_file_path').val();
+  handleFileToggle(file_path_value);
 }
 
 function handleBrowseEverything(){
-  var button = $("button[data-toggle='browse-everything']")
+  var button = $("button[data-toggle='browse-everything']");
   if(button.length == 0) { return; }
   button.browseEverything({
     route: button.data('route'),
     target: button.data('target')
   }).done(function(data) {
     var evt = { isDefaultPrevented: function() { return false; } };
-    $('.ev-browser.show').removeClass('show')
+    $('.ev-browser.show').removeClass('show');
     if($('#fileupload').length > 0) {
-      var files = $.map(data, function(d) { return { name: d.file_name, size: d.file_size, id: d.url } });
+      var files = $.map(data, function(d) { return { name: d.file_name, size: d.file_size, id: d.url }; });
       $.blueimp.fileupload.prototype.options.done.call($('#fileupload').fileupload(), evt, { result: { files: files }});
     }
-    return true
-    // User has submitted files; data contains an array of URLs and their options
+    return true;
   }).cancel(function() {
-    $('.ev-browser.show').removeClass('show')
-    // User cancelled the browse operation
+    $('.ev-browser.show').removeClass('show');
   }).fail(function(status, error, text) {
-    $('.ev-browser.show').removeClass('show')
-    // URL retrieval experienced a technical failure
+    $('.ev-browser.show').removeClass('show');
   });
 }
 
 function handleSourceLoad(refresh_button, base_url, external_set_select) {
   if (base_url.val() == "") { // ignore empty base_url value
-    return
+    return;
   }
 
-  var initial_button_text = refresh_button.html()
+  var initial_button_text = refresh_button.html();
 
-  refresh_button.html('Refreshing...')
-  refresh_button.attr('disabled', true)
+  refresh_button.html('Refreshing...');
+  refresh_button.attr('disabled', true);
 
   $.post('/importers/external_sets', {
     base_url: base_url.val(),
   }, function(res) {
     if (!res.error) {
-      genExternalSetOptions(external_set_select, res.sets) // sets is [[name, spec]...]
+      genExternalSetOptions(external_set_select, res.sets);
     } else {
-      setError(external_set_select, res.error)
+      setError(external_set_select, res.error);
     }
 
-    refresh_button.html(initial_button_text)
-    refresh_button.attr('disabled', false)
-  })
+    refresh_button.html(initial_button_text);
+    refresh_button.attr('disabled', false);
+  });
 }
 
 function genExternalSetOptions(selector, sets) {
-  out = '<option value="">- Select One -</option>'
+  out = '<option value="">- Select One -</option>';
 
   out += sets.map(function(set) {
-    return '<option value="'+set[1]+'">'+set[0]+'</option>'
-  })
+    return '<option value="'+set[1]+'">'+set[0]+'</option>';
+  });
 
-  selector.html(out)
-  selector.attr('disabled', false)
+  selector.html(out);
+  selector.attr('disabled', false);
 }
 
 function setError(selector, error) {
-  selector.html('<option value="none">Error - Please enter Base URL and try again</option>')
-  selector.attr('disabled', true)
+  selector.html('<option value="none">Error - Please enter Base URL and try again</option>');
+  selector.attr('disabled', true);
 }
 
-$(document).on({'ready': prepBulkrax, 'turbolinks:load': prepBulkrax})
+$(document).on({'ready': prepBulkrax, 'turbolinks:load': prepBulkrax});

data/app/controllers/bulkrax/importers_controller.rb

@@ -78,11 +78,13 @@ module Bulkrax
 
     # POST /importers
     # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def create
       # rubocop:disable Style/IfInsideElse
       if api_request?
         return return_json_response unless valid_create_params?
       end
+      uploads = Hyrax::UploadedFile.find(params[:uploaded_files]) if params[:uploaded_files].present?
       file = file_param
       cloud_files = cloud_params
 
@@ -93,7 +95,7 @@ module Bulkrax
       # on a new import otherwise it only gets updated during the update path
       @importer.parser_fields['update_files'] = true if params[:commit] == 'Create and Import'
       if @importer.save
-        files_for_import(file, cloud_files)
+        files_for_import(file, cloud_files, uploads)
         if params[:commit] == 'Create and Import'
           Bulkrax::ImporterJob.send(@importer.parser.perform_method, @importer.id)
           render_request('Importer was successfully created and import has been queued.')
@@ -112,6 +114,7 @@ module Bulkrax
       end
       # rubocop:enable Style/IfInsideElse
     end
+    # rubocop:enable Metrics/AbcSize
 
     # PATCH/PUT /importers/1
     # # @todo refactor so as to not need to disable rubocop
@@ -120,7 +123,7 @@ module Bulkrax
       if api_request?
         return return_json_response unless valid_update_params?
       end
-
+      uploads = Hyrax::UploadedFile.find(params[:uploaded_files]) if params[:uploaded_files].present?
       file = file_param
       cloud_files = cloud_params
 
@@ -128,7 +131,7 @@ module Bulkrax
       field_mapping_params if params[:importer][:parser_fields].present?
 
       if @importer.update(importer_params)
-        files_for_import(file, cloud_files) unless file.nil? && cloud_files.nil?
+        files_for_import(file, cloud_files, uploads)
         # do not perform the import
         unless params[:commit] == 'Update Importer'
           set_files_parser_fields
@@ -218,8 +221,9 @@ module Bulkrax
 
     private
 
-    def files_for_import(file, cloud_files)
-      return if file.blank? && cloud_files.blank?
+    def files_for_import(file, cloud_files, uploads)
+      return if file.blank? && cloud_files.blank? && uploads.blank?
+
       @importer[:parser_fields]['import_file_path'] = @importer.parser.write_import_file(file) if file.present?
       if cloud_files.present?
         @importer[:parser_fields]['cloud_file_paths'] = cloud_files
@@ -229,6 +233,13 @@ module Bulkrax
         target = @importer.parser.retrieve_cloud_files(cloud_files, @importer)
         @importer[:parser_fields]['import_file_path'] = target if target.present?
       end
+
+      if uploads.present?
+        uploads.each do |upload|
+          @importer[:parser_fields]['import_file_path'] = @importer.parser.write_import_file(upload.file.file)
+        end
+      end
+
       @importer.save
     end
 

data/app/factories/bulkrax/object_factory.rb

@@ -165,7 +165,7 @@ module Bulkrax
     end
 
     def delete(_user)
-      find&.delete
+      find&.delete(eradicate: true)
     end
 
     private

data/app/jobs/bulkrax/delete_file_set_job.rb

@@ -10,11 +10,11 @@ module Bulkrax
           om = parent.ordered_members.to_a
           om.delete(file_set)
           parent.ordered_members = om
-        elsif parent.respond_to?(:member_ids)
+          parent.save
+        elsif parent&.respond_to?(:member_ids)
           parent.member_ids.delete(file_set.id)
           Hyrax.persister.save(resource: parent)
         end
-        parent.save
       end
 
       super

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

@@ -41,9 +41,16 @@
   <p>File upload and Cloud File upload must be a Zip file containing a single BagIt Bag, or a folder containing multiple BagIt Bags.</p>
   <p>The Server Path can point to a BagIt Bag, a folder containing BagIt Bags, or a zip file containing either.</p>
 
-  <%= fi.input :file_style, collection: ['Upload a File', 'Specify a Path on the Server', 'Add Cloud File'], as: :radio_buttons, label: false %>
+<%= fi.input :file_style,
+  collection: ['Upload a File', 'Specify a Path on the Server'] +
+              (defined?(::Hyrax) && Hyrax.config.browse_everything? ? ['Add Cloud File'] : []),
+  as: :radio_buttons, label: false %>
   <div id='file_upload'>
-    <%= fi.input 'file', as: :file, input_html: {accept: 'application/zip'} %><br />
+    <% if defined?(::Hyrax) %>
+      <%= render 'bulkrax/importers/file_uploader', accepted_file_types: 'application/zip' %>
+    <% else %>
+      <%= fi.input 'file', as: :file, input_html: {accept: 'application/zip'} %><br />
+    <% end %>
   </div>
   <div id='file_path'>
     <%= fi.input :import_file_path, as: :string, input_html: { value: importer.parser_fields['import_file_path'] } %>
@@ -53,4 +60,4 @@
       <%= render 'browse_everything', form: form %>
     <% end %>
   </div>
-</div>
+</div>

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

@@ -1,5 +1,4 @@
 <div class='csv_fields'>
-
   <%= fi.input :visibility,
     label: 'Default Visibility',
     collection: [
@@ -11,7 +10,6 @@
     input_html: { class: 'form-control' },
     hint: 'If your CSV includes the visibility field, it will override the default setting.'
   %>
-
   <% if defined?(::Hyrax) %>
     <% rights_statements = Hyrax.config.rights_statement_service_class.new %>
     <%= fi.input :rights_statement,
@@ -24,26 +22,32 @@
           %>
     <%= fi.input :override_rights_statement, as: :boolean, hint: 'If checked, always use the selected rights statment. If unchecked, use rights or rights_statement from the record and only use the provided value if dc:rights is blank.', input_html: { checked: (importer.parser_fields['override_rights_statement'] == "1") } %>
   <% end %>
-  <h4>Add CSV File to Import:</h4>
+  <h4>Add CSV or ZIP File to Import:</h4>
   <%# accept a single file upload; data files and bags will need to be added another way %>
-
   <% file_style_list = ['Upload a File', 'Specify a Path on the Server'] %>
   <% file_style_list << 'Existing Entries' unless importer.new_record? %>
   <%= fi.input :file_style, collection: file_style_list, as: :radio_buttons, label: false %>
+  
   <div id='file_upload'>
-    <%= fi.input 'file', as: :file, input_html: { accept: 'text/csv,application/zip,application/gzip' } %><br />
+    <% if defined?(::Hyrax) %>
+      <%= render 'bulkrax/importers/file_uploader', accepted_file_types: 'text/csv,application/zip,application/gzip' %>
+    <% else %>
+      <%= fi.input 'file', as: :file, input_html: { accept: 'text/csv,application/zip,application/gzip' } %><br />
+    <% end %>
   </div>
+  
   <div id='file_path'>
     <%= fi.input :import_file_path, as: :string, input_html: { value: importer.parser_fields['import_file_path'] } %>
   </div>
+  
   <div id='existing_options'>
     <%= fi.collection_check_boxes :entry_statuses, [['Failed'], ['Pending'], ['Skipped'], ['Deleted'], ['Complete']], :first, :first %>
   </div>
-
+  
   <% if defined?(::Hyrax) && Hyrax.config.browse_everything? %>
-	  <h4>Add Files to Import:</h4>
-	  <p>Choose files to upload. The filenames must be unique, and the filenames must be referenced in a column called 'file' in the accompanying CSV file.</p>
+    <h4>Add Files to Import:</h4>
+    <p>Choose files to upload. The filenames must be unique, and the filenames must be referenced in a column called 'file' in the accompanying CSV file.</p>
     <%= render 'browse_everything', form: form %>
   <% end %>
   <br />
-</div>
+</div>

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

@@ -0,0 +1,37 @@
+<div class="fileupload-bulkrax">
+  <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">
+    <div class="row">
+      <div class="col-12">
+        <div class="fileinput-button" id="add-files">
+          <input id="addfiles" type="file" style="display:none;" name="files[]"
+                 accept="<%= accepted_file_types || 'text/csv,application/zip,application/gzip' %>" multiple />
+          <button type="button" class="btn btn-success" onclick="document.getElementById('addfiles').click();">
+            <span class="fa fa-plus"></span>
+            <span>Add Files</span>
+          </button>
+        </div>
+        <button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel">
+          <span class="fa fa-ban"></span>
+          <span>Cancel Upload</span>
+        </button>
+        <span class="fileupload-process"></span>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-12">
+        <div class="fileupload-progress fade">
+          <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+            <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
+          </div>
+          <div class="progress-extended">&nbsp;</div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="dropzone">
+    Drop files here to upload
+  </div>
+  <%= render 'hyrax/uploads/js_templates' %>
+</div>

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

@@ -47,16 +47,22 @@
   <p>File upload and Cloud File upload MUST be a either a single XML file (for metadata only import) OR a Zip file containing the XML files and data files, each in a separate folder.</p>
   <p>The Server Path can point to a folder containing XML files and data files to import, or direct to the XML file itself.</p>
 
-  <%= fi.input :file_style, collection: ['Upload a File', 'Specify a Path on the Server', 'Add Cloud File'], as: :radio_buttons, label: false %>
+<%= fi.input :file_style,
+  collection: ['Upload a File', 'Specify a Path on the Server'] +
+              (defined?(::Hyrax) && Hyrax.config.browse_everything? ? ['Add Cloud File'] : []),
+  as: :radio_buttons, label: false %>
   <div id='file_upload'>
-    <%= fi.input 'file', as: :file, input_html: {accept: ['application/zip', 'application/xml']} %><br />
+    <% if defined?(::Hyrax) %>
+      <%= render 'bulkrax/importers/file_uploader', accepted_file_types: 'application/zip,application/xml' %>
+    <% else %>
+      <%= fi.input 'file', as: :file, input_html: {accept: ['application/zip', 'application/xml']} %><br />
+    <% end%>
   </div>
   <div id='file_path'>
     <%= fi.input :import_file_path, as: :string, input_html: { value: importer.parser_fields['import_file_path'] } %>
   </div>
   <div id='cloud'>
     <% if defined?(::Hyrax) && Hyrax.config.browse_everything? %>
-      <%= render 'browse_everything', form: form %>
     <% end %>
   </div>
-</div>
+</div>

data/lib/bulkrax/version.rb

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

data/lib/bulkrax.rb

@@ -98,7 +98,20 @@ module Bulkrax
     attr_writer :collection_model_class
 
     def collection_model_internal_resource
-      collection_model_class.try(:internal_resource) || collection_model_class.to_s
+      # WARN: Using #try on :internal_resource can yield unexpected results.
+      # If the method is undefined, it can return a truthy value instead of
+      # the typical nil.
+      #
+      # E.g.
+      # ```ruby
+      # Hyrax::FileSet.try(:internal_resource) || 'hi'
+      # => #<Dry::Types::Result::Failure input=:internal_resource error=...
+      # ```
+      if collection_model_class.respond_to?(:internal_resource)
+        collection_model_class.internal_resource
+      else
+        collection_model_class.to_s
+      end
     end
 
     def file_model_class
@@ -108,7 +121,20 @@ module Bulkrax
     attr_writer :file_model_class
 
     def file_model_internal_resource
-      file_model_class.try(:internal_resource) || file_model_class.to_s
+      # WARN: Using #try on :internal_resource can yield unexpected results.
+      # If the method is undefined, it can return a truthy value instead of
+      # the typical nil.
+      #
+      # E.g.
+      # ```ruby
+      # Hyrax::FileSet.try(:internal_resource) || 'hi'
+      # => #<Dry::Types::Result::Failure input=:internal_resource error=...
+      # ```
+      if file_model_class.respond_to?(:internal_resource)
+        file_model_class.internal_resource
+      else
+        file_model_class.to_s
+      end
     end
 
     def curation_concerns
@@ -118,7 +144,18 @@ module Bulkrax
     attr_writer :curation_concerns
 
     def curation_concern_internal_resources
-      curation_concerns.map { |cc| cc.try(:internal_resource) || cc.to_s }.uniq
+      curation_concerns.map do |cc|
+        # WARN: Using #try on :internal_resource can yield unexpected results.
+        # If the method is undefined, it can return a truthy value instead of
+        # the typical nil.
+        #
+        # E.g.
+        # ```ruby
+        # Hyrax::FileSet.try(:internal_resource) || 'hi'
+        # => #<Dry::Types::Result::Failure input=:internal_resource error=...
+        # ```
+        cc.respond_to?(:internal_resource) ? cc.internal_resource : cc.to_s
+      end.uniq
     end
 
     attr_writer :ingest_queue_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 8.3.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-19 00:00:00.000000000 Z
+date: 2024-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
@@ -428,6 +428,7 @@ files:
 - app/views/bulkrax/importers/_csv_fields.html.erb
 - app/views/bulkrax/importers/_edit_form_buttons.html.erb
 - app/views/bulkrax/importers/_edit_item_buttons.html.erb
+- app/views/bulkrax/importers/_file_uploader.html.erb
 - app/views/bulkrax/importers/_form.html.erb
 - app/views/bulkrax/importers/_oai_fields.html.erb
 - app/views/bulkrax/importers/_xml_fields.html.erb
@@ -518,7 +519,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Import and export tool for Hyrax and Hyku