bulkrax 4.1.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e466ce0a1d1fe4b2c3baa9a6a5356b0138b5e7c1f2e1b88a7d17b852257f6b46
-  data.tar.gz: 52b585cd22870e2b4d586b3848cd48f8106f39a54341bc2aeba91a05079b9f0e
+  metadata.gz: 1c636e3c53228a9cd6f2d45356f10b2339265f5f3f11b32bd6e523a01388b60b
+  data.tar.gz: 6eeb6679cc8e93f77926baa30f91b09c9cea173d7d4135c2be9e865b558d5056
 SHA512:
-  metadata.gz: cbb4169d6956f98f3b27ac143f0f16f6ac1adb86fa66a7819fad73f28d45ba5a8578b306de8d4319112a2bf1e4b4edb4aeb3b149abfa0bd840b4eb19a1aa4172
-  data.tar.gz: b06a77c964f82d2fa17b8cde3cff5413ceb0e9ab21eb9b7e0c299d6b42a3217308fc497474151f6b51022b7d2a48b2b2af4262a7d97941038aa6505b32e053d4
+  metadata.gz: 389a8059749407dc1a6d9326e60131934b9729aaf33f1a4802c72255550fdf7e71ad874c88969e244dccf81e80ad95eb09e30179425fb1313fc2383d7f7adc7a
+  data.tar.gz: c58567026f654f0577377babd2311f537c3155f6c71833255d13730dc32eed51ec9a0708f0283b925e09945b59d338a14ffdb9945e0375de5ff7be120ed62559

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

@@ -47,6 +47,7 @@ function prepBulkrax(event) {
     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\]/
@@ -119,10 +120,35 @@ function handleParserKlass() {
     $('.parser_fields').append(window[parser_klass.data('partial')])
   }
 
+  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']")
+  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')
+    if($('#fileupload').length > 0) {
+      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
+  }).cancel(function() {
+    $('.ev-browser.show').removeClass('show')
+    // User cancelled the browse operation
+  }).fail(function(status, error, text) {
+    $('.ev-browser.show').removeClass('show')
+    // URL retrieval experienced a technical failure
+  });
+}
+
 function handleSourceLoad(refresh_button, base_url, external_set_select) {
   if (base_url.val() == "") { // ignore empty base_url value
     return
@@ -163,4 +189,4 @@ function setError(selector, error) {
   selector.attr('disabled', true)
 }
 
-$(document).on({'ready': prepBulkrax, 'turbolinks:load': prepBulkrax})
+$(document).on({'ready': prepBulkrax, 'turbolinks:load': prepBulkrax})

data/app/controllers/bulkrax/exporters_controller.rb

@@ -22,7 +22,9 @@ module Bulkrax
       add_exporter_breadcrumbs
       add_breadcrumb @exporter.name
 
-      @work_entries = @exporter.entries.where(type: @exporter.parser.entry_class.to_s).page(params[:work_entries_page])
+      @work_entries = @exporter.entries.where(type: @exporter.parser.entry_class.to_s).page(params[:work_entries_page]).per(30)
+      @collection_entries = @exporter.entries.where(type: @exporter.parser.collection_entry_class.to_s).page(params[:collections_entries_page]).per(30)
+      @file_set_entries = @exporter.entries.where(type: @exporter.parser.file_set_entry_class.to_s).page(params[:file_set_entries_page]).per(30)
     end
 
     # GET /exporters/new

data/app/jobs/bulkrax/import_file_set_job.rb

@@ -12,7 +12,8 @@ module Bulkrax
     def perform(entry_id, importer_run_id)
       @importer_run_id = importer_run_id
       entry = Entry.find(entry_id)
-      parent_identifier = entry.raw_metadata[entry.related_parents_raw_mapping]&.strip
+      # e.g. "parents" or "parents_1"
+      parent_identifier = (entry.raw_metadata[entry.related_parents_raw_mapping] || entry.raw_metadata["#{entry.related_parents_raw_mapping}_1"])&.strip
 
       validate_parent!(parent_identifier)
 
@@ -57,7 +58,7 @@ module Bulkrax
     end
 
     def check_parent_exists!(parent_identifier)
-      raise MissingParentError, %(Unable to find a record with the identifier "#{parent_identifier}") if parent_record.blank?
+      raise MissingParentError, %(Unable to find a record with the identifier "#{parent_identifier}") if parent_record.nil?
     end
 
     def check_parent_is_a_work!(parent_identifier)
@@ -66,8 +67,7 @@ module Bulkrax
     end
 
     def find_parent_record(parent_identifier)
-      @parent_record ||= find_record(parent_identifier, importer_run_id)
-      @parent_record = parent_record.last if parent_record.is_a? Array
+      _, @parent_record = find_record(parent_identifier, importer_run_id)
     end
   end
 end

data/app/models/bulkrax/csv_entry.rb

@@ -112,12 +112,16 @@ module Bulkrax
     end
 
     def build_files_metadata
-      file_mapping = key_for_export('file')
-      file_sets = hyrax_record.file_set? ? Array.wrap(hyrax_record) : hyrax_record.file_sets
-      filenames = map_file_sets(file_sets)
+      # attaching files to the FileSet row only so we don't have duplicates when importing to a new tenant
+      if hyrax_record.work?
+        build_thumbnail_files
+      else
+        file_mapping = key_for_export('file')
+        file_sets = hyrax_record.file_set? ? Array.wrap(hyrax_record) : hyrax_record.file_sets
+        filenames = map_file_sets(file_sets)
 
-      handle_join_on_export(file_mapping, filenames, mapping['file']&.[]('join')&.present?)
-      build_thumbnail_files if hyrax_record.work?
+        handle_join_on_export(file_mapping, filenames, mapping['file']&.[]('join')&.present?)
+      end
     end
 
     def build_relationship_metadata

data/app/parsers/bulkrax/application_parser.rb

@@ -134,7 +134,9 @@ module Bulkrax
 
     # Base path for imported and exported files
     def base_path(type = 'import')
-      ENV['HYKU_MULTITENANT'] ? File.join(Bulkrax.send("#{type}_path"), Site.instance.account.name) : Bulkrax.send("#{type}_path")
+      # account for multiple versions of hyku
+      is_multitenant = ENV['HYKU_MULTITENANT'] == 'true' || ENV['SETTINGS__MULTITENANCY__ENABLED'] == 'true'
+      is_multitenant ? File.join(Bulkrax.send("#{type}_path"), ::Site.instance.account.name) : Bulkrax.send("#{type}_path")
     end
 
     # Path where we'll store the import metadata and files
@@ -264,6 +266,8 @@ module Bulkrax
 
       Dir["#{exporter_export_path}/**"].each do |folder|
         zip_path = "#{exporter_export_zip_path.split('/').last}_#{folder.split('/').last}.zip"
+        FileUtils.rm_rf("#{exporter_export_zip_path}/#{zip_path}")
+
         Zip::File.open(File.join("#{exporter_export_zip_path}/#{zip_path}"), create: true) do |zip_file|
           Dir["#{folder}/**/**"].each do |file|
             zip_file.add(file.sub("#{folder}/", ''), file)

data/app/parsers/bulkrax/bagit_parser.rb

@@ -134,7 +134,8 @@ module Bulkrax
 
         record.file_sets.each do |fs|
           file_name = filename(fs)
-          next if file_name.blank?
+          next if file_name.blank? || fs.original_file.blank?
+
           io = open(fs.original_file.uri)
           file = Tempfile.new([file_name, File.extname(file_name)], binmode: true)
           file.write(io.read)

data/app/parsers/bulkrax/csv_parser.rb

@@ -200,14 +200,14 @@ module Bulkrax
         # get the parent collection and child collections
         @collection_ids = ActiveFedora::SolrService.query("id:#{importerexporter.export_source} #{extra_filters}", method: :post, rows: 2_147_483_647).map(&:id)
         @collection_ids += ActiveFedora::SolrService.query("has_model_ssim:Collection AND member_of_collection_ids_ssim:#{importerexporter.export_source}", method: :post, rows: 2_147_483_647).map(&:id)
+        find_child_file_sets(@work_ids)
       when 'worktype'
         @work_ids = ActiveFedora::SolrService.query("has_model_ssim:#{importerexporter.export_source + extra_filters}", method: :post, rows: 2_000_000_000).map(&:id)
+        find_child_file_sets(@work_ids)
       when 'importer'
         set_ids_for_exporting_from_importer
       end
 
-      find_child_file_sets(@work_ids) if importerexporter.export_from == 'collection'
-
       @work_ids + @collection_ids + @file_set_ids
     end
     # rubocop:enable Metrics/AbcSize
@@ -283,6 +283,10 @@ module Bulkrax
       CsvFileSetEntry
     end
 
+    def valid_entry_types
+      ['Bulkrax::CsvCollectionEntry', 'Bulkrax::CsvFileSetEntry', 'Bulkrax::CsvEntry']
+    end
+
     # TODO: figure out why using the version of this method that's in the bagit parser
     # breaks specs for the "if importer?" line
     def total
@@ -325,6 +329,7 @@ module Bulkrax
       require 'open-uri'
       folder_count = 0
       sorted_entries = sort_entries(importerexporter.entries.uniq(&:identifier))
+                       .select { |e| valid_entry_types.include?(e.type) }
 
       sorted_entries[0..limit || total].in_groups_of(records_split_count, false) do |group|
         folder_count += 1
@@ -342,20 +347,24 @@ module Bulkrax
 
     def store_files(identifier, folder_count)
       record = ActiveFedora::Base.find(identifier)
+      return unless record
+
       file_sets = record.file_set? ? Array.wrap(record) : record.file_sets
       file_sets << record.thumbnail if exporter.include_thumbnails && record.thumbnail.present? && record.work?
       file_sets.each do |fs|
         path = File.join(exporter_export_path, folder_count, 'files')
         FileUtils.mkdir_p(path) unless File.exist? path
         file = filename(fs)
-        io = open(fs.original_file.uri)
-        next if file.blank?
+        next if file.blank? || fs.original_file.blank?
 
+        io = open(fs.original_file.uri)
         File.open(File.join(path, file), 'wb') do |f|
           f.write(io.read)
           f.close
         end
       end
+    rescue Ldp::Gone
+      return
     end
 
     def export_key_allowed(key)
@@ -391,12 +400,12 @@ module Bulkrax
       # always export models in the same order: work, collection, file set
       entries.sort_by do |entry|
         case entry.type
-        when 'Bulkrax::CsvEntry'
-          '0'
         when 'Bulkrax::CsvCollectionEntry'
           '1'
         when 'Bulkrax::CsvFileSetEntry'
           '2'
+        else
+          '0'
         end
       end
     end
@@ -446,9 +455,10 @@ module Bulkrax
     def path_to_files(**args)
       filename = args.fetch(:filename, '')
 
-      @path_to_files ||= File.join(
-        zip? ? importer_unzip_path : File.dirname(import_file_path), 'files', filename
-      )
+      return @path_to_files if @path_to_files.present? && filename.blank?
+      @path_to_files = File.join(
+          zip? ? importer_unzip_path : File.dirname(import_file_path), 'files', filename
+        )
     end
 
     private

data/app/views/bulkrax/exporters/show.html.erb

@@ -87,49 +87,25 @@
 
     <p class='bulkrax-p-align'><strong><%= t('bulkrax.exporter.labels.field_mapping') %>:</strong></p>
 
-    <p class='bulkrax-p-align'>
-      <strong><%= t('bulkrax.exporter.labels.total_work_entries') %>:</strong>
-      <%= @exporter.exporter_runs.last&.total_work_entries %>
+    <p class="bulkrax-p-align" title="<%= @exporter.last_run&.total_work_entries %> processed, <%= @exporter.last_run&.failed_records %> failed">
+      <strong>Total Entries:</strong>
+      <%= @exporter.last_run&.total_work_entries %>
     </p>
     <br>
-    <div class='bulkrax-nav-tab-table-left-align'>
-      <h2>Entries</h2>
-      <table class='table table-striped'>
-        <thead>
-          <tr>
-            <th>Identifier</th>
-            <th>Entry ID</th>
-            <th>Status</th>
-            <th>Errors</th>
-            <th>Status Set At</th>
-            <th>Actions</th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @work_entries.each do |e| %>
-            <tr>
-              <td><%= link_to e.identifier, bulkrax.exporter_entry_path(@exporter.id, e.id) %></td>
-              <td><%= e.id %></td>
-              <% if e.status == 'Complete' %>
-                <td><span class='glyphicon glyphicon-ok' style='color: green;'></span> <%= e.status %></td>
-              <% elsif e.status == 'Pending' %>
-                <td><span class='glyphicon glyphicon-option-horizontal' style='color: blue;'></span> <%= e.status %></td>
-              <% else %>
-                <td><span class='glyphicon glyphicon-remove' style='color: red;'></span> <%= e.status %></td>
-              <% end %>
-              <% if e.last_error.present? %>
-                <td><%= link_to e.last_error.dig('error_class'), bulkrax.exporter_entry_path(@exporter.id, e.id) %></td>
-              <% else %>
-                <td></td>
-              <% end %>
-              <td><%= e.status_at %></td>
-              <td><%= link_to raw("<span class='glyphicon glyphicon-info-sign'></span>"), bulkrax.exporter_entry_path(@exporter.id, e.id) %></td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= page_entries_info(@work_entries) %><br>
-      <%= paginate(@work_entries, param_name: :work_entries_page) %>
+
+    <div class="bulkrax-nav-tab-bottom-margin">
+      <!-- Nav tabs -->
+      <ul class="bulkrax-nav-tab-top-margin tab-nav nav nav-tabs" role="tablist">
+        <li role="presentation" class='active'><a href="#work-entries" aria-controls="work-entries" role="tab" data-toggle="tab">Work Entries</a></li>
+        <li role="presentation"><a href="#collection-entries" aria-controls="collection-entries" role="tab" data-toggle="tab">Collection Entries</a></li>
+        <li role="presentation"><a href="#file-set-entries" aria-controls="file-set-entries" role="tab" data-toggle="tab">File Set Entries</a></li>
+      </ul>
+      <!-- Tab panes -->
+      <div class="tab-content outline">
+        <%= render partial: 'bulkrax/shared/work_entries_tab', locals: { item: @exporter, entries: @work_entries } %>
+        <%= render partial: 'bulkrax/shared/collection_entries_tab', locals: { item: @exporter, entries: @collection_entries } %>
+        <%= render partial: 'bulkrax/shared/file_set_entries_tab', locals: { item: @exporter, entries: @file_set_entries } %>
+      </div>
       <br>
       <%= link_to 'Edit', edit_exporter_path(@exporter) %>
       |

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

@@ -4,7 +4,7 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default tabs">
+    <div class="panel panel-default tabs importer-form">
 
       <%= simple_form_for @importer, html: { multipart: true } do |form| %>
         <%= render 'form', importer: @importer, form: form %>

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

@@ -4,7 +4,7 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default tabs">
+    <div class="panel panel-default tabs importer-form">
       <%= simple_form_for @importer, html: { multipart: true } do |form| %>
         <%= render 'form', importer: @importer, form: form %>
         <div class="panel-footer">

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

@@ -80,120 +80,9 @@
       </ul>
       <!-- Tab panes -->
       <div class="tab-content outline">
-        <div role="tabpanel" class="tab-pane active bulkrax-nav-tab-table-left-align" id="work-entries">
-          <table class='table table-striped'>
-            <thead>
-              <tr>
-                <th>Identifier</th>
-                <th>Entry ID</th>
-                <th>Status</th>
-                <th>Errors</th>
-                <th>Status Set At</th>
-                <th>Actions</th>
-              </tr>
-            </thead>
-            <tbody>
-              <% @work_entries.each do |e| %>
-                <tr>
-                  <td><%= link_to e.identifier, bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                  <td><%= e.id %></td>
-                  <% if e.status == "Complete" %>
-                    <td><span class="glyphicon glyphicon-ok" style="color: green;"></span> <%= e.status %></td>
-                  <% elsif e.status == "Pending" %>
-                    <td><span class="glyphicon glyphicon-option-horizontal" style="color: blue;"></span> <%= e.status %></td>
-                  <% else %>
-                    <td><span class="glyphicon glyphicon-remove" style="color: <%= e.status == 'Deleted' ? 'green' : 'red' %>;"></span> <%= e.status %></td>
-                  <% end %>
-                  <% if e.last_error.present? %>
-                    <td><%= link_to e.last_error.dig("error_class"), bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                  <% else %>
-                    <td></td>
-                  <% end %>
-                  <td><%= e.status_at %></td>
-                  <td><%= link_to raw('<span class="glyphicon glyphicon-info-sign"></span>'), bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                </tr>
-              <% end %>
-            </tbody>
-          </table>
-          <%= page_entries_info(@work_entries) %><br />
-          <%= paginate(@work_entries, theme: 'blacklight', param_name: :work_entries_page, params: { anchor: 'work-entries'}) %>
-        </div>
-        <div role="tabpanel" class="tab-pane bulkrax-nav-tab-table-left-align" id="collection-entries">
-          <table class='table table-striped'>
-            <thead>
-              <tr>
-                <th>Identifier</th>
-                <th>Entry ID</th>
-                <th>Status</th>
-                <th>Errors</th>
-                <th>Status Set At</th>
-                <th>Actions</th>
-              </tr>
-            </thead>
-            <tbody>
-              <% @collection_entries.each do |e| %>
-                <tr>
-                  <td><%= link_to e.identifier, bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                  <td><%= e.id %></td>
-                  <% if e.status == "Complete" %>
-                    <td><span class="glyphicon glyphicon-ok" style="color: green;"></span> <%= e.status %></td>
-                  <% elsif e.status == "Pending" %>
-                    <td><span class="glyphicon glyphicon-option-horizontal" style="color: blue;"></span> <%= e.status %></td>
-                  <% else %>
-                    <td><span class="glyphicon glyphicon-remove" style="color: <%= e.status == 'Deleted' ? 'green' : 'red' %>;"></span> <%= e.status %></td>
-                  <% end %>
-                  <% if e.last_error.present? %>
-                    <td><%= link_to e.last_error.dig("error_class"), bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                  <% else %>
-                    <td></td>
-                  <% end %>
-                  <td><%= e.status_at %></td>
-                  <td><%= link_to raw('<span class="glyphicon glyphicon-info-sign"></span>'), bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                </tr>
-              <% end %>
-            </tbody>
-          </table>
-          <%= page_entries_info(@collection_entries) %><br />
-          <%= paginate(@collection_entries, theme: 'blacklight', param_name: :collections_entries_page, params: {anchor: 'collection-entries'}) %>
-        </div>
-        <div role="tabpanel" class="tab-pane bulkrax-nav-tab-table-left-align" id="file-set-entries">
-          <table class='table table-striped'>
-            <thead>
-              <tr>
-                <th>Identifier</th>
-                <th>Entry ID</th>
-                <th>Status</th>
-                <th>Errors</th>
-                <th>Status Set At</th>
-                <th>Actions</th>
-              </tr>
-            </thead>
-            <tbody>
-              <% @file_set_entries.each do |e| %>
-                <tr>
-                  <td><%= link_to e.identifier, bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                  <td><%= e.id %></td>
-                  <% if e.status == "Complete" %>
-                    <td><span class="glyphicon glyphicon-ok" style="color: green;"></span> <%= e.status %></td>
-                  <% elsif e.status == "Pending" %>
-                    <td><span class="glyphicon glyphicon-option-horizontal" style="color: blue;"></span> <%= e.status %></td>
-                  <% else %>
-                    <td><span class="glyphicon glyphicon-remove" style="color: <%= e.status == 'Deleted' ? 'green' : 'red' %>;"></span> <%= e.status %></td>
-                  <% end %>
-                  <% if e.last_error.present? %>
-                    <td><%= link_to e.last_error.dig("error_class"), bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                  <% else %>
-                    <td></td>
-                  <% end %>
-                  <td><%= e.status_at %></td>
-                  <td><%= link_to raw('<span class="glyphicon glyphicon-info-sign"></span>'), bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                </tr>
-              <% end %>
-            </tbody>
-          </table>
-          <%= page_entries_info(@file_set_entries) %><br />
-          <%= paginate(@file_set_entries, theme: 'blacklight', param_name: :file_set_entries_page, params: {anchor: 'file-set-entries'}) %>
-        </div>
+        <%= render partial: 'bulkrax/shared/work_entries_tab', locals: { item: @importer, entries: @work_entries } %>
+        <%= render partial: 'bulkrax/shared/collection_entries_tab', locals: { item: @importer, entries: @collection_entries } %>
+        <%= render partial: 'bulkrax/shared/file_set_entries_tab', locals: { item: @importer, entries: @file_set_entries } %>
       </div>
     </div>
 

data/app/views/bulkrax/shared/_collection_entries_tab.html.erb

@@ -0,0 +1,39 @@
+<div role="tabpanel" class="tab-pane bulkrax-nav-tab-table-left-align" id="collection-entries">
+  <table class='table table-striped'>
+    <thead>
+      <tr>
+        <th>Identifier</th>
+        <th>Entry ID</th>
+        <th>Status</th>
+        <th>Errors</th>
+        <th>Status Set At</th>
+        <th>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% entries.each do |e| %>
+        <% entry_path = item.class.to_s.include?('Importer') ? bulkrax.importer_entry_path(item.id, e.id) : bulkrax.exporter_entry_path(item.id, e.id) %>
+        <tr>
+          <td><%= link_to e.identifier, entry_path %></td>
+          <td><%= e.id %></td>
+          <% if e.status == "Complete" %>
+            <td><span class="glyphicon glyphicon-ok" style="color: green;"></span> <%= e.status %></td>
+          <% elsif e.status == "Pending" %>
+            <td><span class="glyphicon glyphicon-option-horizontal" style="color: blue;"></span> <%= e.status %></td>
+          <% else %>
+            <td><span class="glyphicon glyphicon-remove" style="color: <%= e.status == 'Deleted' ? 'green' : 'red' %>;"></span> <%= e.status %></td>
+          <% end %>
+          <% if e.last_error.present? %>
+            <td><%= link_to e.last_error.dig("error_class"), entry_path %></td>
+          <% else %>
+            <td></td>
+          <% end %>
+          <td><%= e.status_at %></td>
+          <td><%= link_to raw('<span class="glyphicon glyphicon-info-sign"></span>'), entry_path %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+  <%= page_entries_info(entries) %><br />
+  <%= paginate(entries, theme: 'blacklight', param_name: :collections_entries_page, params: { anchor: 'collection-entries' }) %>
+</div>

data/app/views/bulkrax/shared/_file_set_entries_tab.html.erb

@@ -0,0 +1,39 @@
+<div role="tabpanel" class="tab-pane bulkrax-nav-tab-table-left-align" id="file-set-entries">
+  <table class='table table-striped'>
+    <thead>
+      <tr>
+        <th>Identifier</th>
+        <th>Entry ID</th>
+        <th>Status</th>
+        <th>Errors</th>
+        <th>Status Set At</th>
+        <th>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% entries.each do |e| %>
+        <% entry_path = item.class.to_s.include?('Importer') ? bulkrax.importer_entry_path(item.id, e.id) : bulkrax.exporter_entry_path(item.id, e.id) %>
+        <tr>
+          <td><%= link_to e.identifier, bulkrax.importer_entry_path(item.id, e.id) %></td>
+          <td><%= e.id %></td>
+          <% if e.status == "Complete" %>
+            <td><span class="glyphicon glyphicon-ok" style="color: green;"></span> <%= e.status %></td>
+          <% elsif e.status == "Pending" %>
+            <td><span class="glyphicon glyphicon-option-horizontal" style="color: blue;"></span> <%= e.status %></td>
+          <% else %>
+            <td><span class="glyphicon glyphicon-remove" style="color: <%= e.status == 'Deleted' ? 'green' : 'red' %>;"></span> <%= e.status %></td>
+          <% end %>
+          <% if e.last_error.present? %>
+            <td><%= link_to e.last_error.dig("error_class"), bulkrax.importer_entry_path(item.id, e.id) %></td>
+          <% else %>
+            <td></td>
+          <% end %>
+          <td><%= e.status_at %></td>
+          <td><%= link_to raw('<span class="glyphicon glyphicon-info-sign"></span>'), bulkrax.importer_entry_path(item.id, e.id) %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+  <%= page_entries_info(entries) %><br />
+  <%= paginate(entries, theme: 'blacklight', param_name: :file_set_entries_page, params: { anchor: 'file-set-entries' }) %>
+</div>

data/app/views/bulkrax/shared/_work_entries_tab.html.erb

@@ -0,0 +1,39 @@
+<div role="tabpanel" class="tab-pane active bulkrax-nav-tab-table-left-align" id="work-entries">
+  <table class='table table-striped'>
+    <thead>
+      <tr>
+        <th>Identifier</th>
+        <th>Entry ID</th>
+        <th>Status</th>
+        <th>Errors</th>
+        <th>Status Set At</th>
+        <th>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% entries.each do |e| %>
+        <% entry_path = item.class.to_s.include?('Importer') ? bulkrax.importer_entry_path(item.id, e.id) : bulkrax.exporter_entry_path(item.id, e.id) %>
+        <tr>
+          <td><%= link_to e.identifier, entry_path %></td>
+          <td><%= e.id %></td>
+          <% if e.status == "Complete" %>
+            <td><span class="glyphicon glyphicon-ok" style="color: green;"></span> <%= e.status %></td>
+          <% elsif e.status == "Pending" %>
+            <td><span class="glyphicon glyphicon-option-horizontal" style="color: blue;"></span> <%= e.status %></td>
+          <% else %>
+            <td><span class="glyphicon glyphicon-remove" style="color: <%= e.status == 'Deleted' ? 'green' : 'red' %>;"></span> <%= e.status %></td>
+          <% end %>
+          <% if e.last_error.present? %>
+            <td><%= link_to e.last_error.dig("error_class"), entry_path %></td>
+          <% else %>
+            <td></td>
+          <% end %>
+          <td><%= e.status_at %></td>
+          <td><%= link_to raw('<span class="glyphicon glyphicon-info-sign"></span>'), entry_path %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+  <%= page_entries_info(entries) %><br />
+  <%= paginate(entries, theme: 'blacklight', param_name: :work_entries_page, params: { anchor: 'work-entries' }) %>
+</div>

data/lib/bulkrax/version.rb

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

data/lib/tasks/bulkrax_tasks.rake

@@ -3,28 +3,27 @@
 namespace :bulkrax do
   desc "Remove old exported zips and create new ones with the new file structure"
   task rerun_all_exporters: :environment do
+    # delete the existing folders and zip files
+    Dir["tmp/exports/**"].each { |file| FileUtils.rm_rf(file) }
+
     if defined?(::Hyku)
       Account.find_each do |account|
-        puts "=============== updating #{account.name} ============"
         next if account.name == "search"
         switch!(account)
+        puts "=============== updating #{account.name} ============"
 
-        rerun_exporters_and_delete_zips
+        make_new_exports
 
         puts "=============== finished updating #{account.name} ============"
       end
     else
-      rerun_exporters_and_delete_zips
+      make_new_exports
     end
   end
 
-  def rerun_exporters_and_delete_zips
-    begin
-      Bulkrax::Exporter.all.each { |e| Bulkrax::ExporterJob.perform_later(e.id) }
-    rescue => e
-      puts "(#{e.message})"
-    end
-
-    Dir["tmp/exports/**.zip"].each { |zip_path| FileUtils.rm_rf(zip_path) }
+  def make_new_exports
+    Bulkrax::Exporter.all.each { |e| Bulkrax::ExporterJob.perform_later(e.id) }
+  rescue => e
+    puts "(#{e.message})"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -351,6 +351,9 @@ files:
 - app/views/bulkrax/importers/upload_corrected_entries.html.erb
 - app/views/bulkrax/shared/_bulkrax_errors.html.erb
 - app/views/bulkrax/shared/_bulkrax_field_mapping.html.erb
+- app/views/bulkrax/shared/_collection_entries_tab.html.erb
+- app/views/bulkrax/shared/_file_set_entries_tab.html.erb
+- app/views/bulkrax/shared/_work_entries_tab.html.erb
 - app/views/hyrax/dashboard/sidebar/_bulkrax_sidebar_additions.html.erb
 - app/views/hyrax/dashboard/sidebar/_repository_content.html.erb
 - app/views/layouts/bulkrax/application.html.erb