bulkrax 6.0.1 → 8.0.0

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

@@ -33,13 +33,14 @@
 
     <p class='bulkrax-p-align'>
       <% if @importer.present? %>
+	<%# TODO Consider how to account for Bulkrax.collection_model_class %>
         <% factory_record = @entry.factory.find %>
         <% if factory_record.present? && @entry.factory_class %>
-          <strong><%= @entry.factory_class.to_s %> Link:</strong>
-          <% if @entry.factory_class.to_s == 'Collection' %>
-            <%= link_to @entry.factory_class.to_s, hyrax.polymorphic_path(factory_record) %>
+          <strong><%= @entry.factory_class.model_name.human %> Link:</strong>
+          <% if defined?(Hyrax) && @entry.factory_class.model_name.human == 'Collection' %>
+            <%= link_to @entry.factory_class.model_name.human, hyrax.polymorphic_path(factory_record) %>
           <% else %>
-            <%= link_to @entry.factory_class.to_s, main_app.polymorphic_path(factory_record) %>
+            <%= link_to @entry.factory_class.model_name.human, main_app.polymorphic_path(factory_record) %>
           <% end %>
         <% else %>
           <strong>Item Link:</strong> Item has not yet been imported successfully
@@ -47,11 +48,11 @@
       <% else %>
         <% record = @entry&.hyrax_record %>
         <% if record.present? && @entry.factory_class %>
-          <strong><%= record.class.to_s %> Link:</strong>
-          <% if defined?(Collection) && record.is_a?(Collection) %>
-            <%= link_to record.class.to_s, hyrax.polymorphic_path(record) %>
+          <strong><%= record.model_name.human %> Link:</strong>
+          <% if defined?(Hyrax) && record.model_name.human == "Collection" %>
+            <%= link_to record.model_name.human, hyrax.polymorphic_path(record) %>
           <% else %>
-            <%= link_to record.class.to_s, main_app.polymorphic_path(record) %>
+            <%= link_to record.model_name.human, main_app.polymorphic_path(record) %>
           <% end %>
         <% else %>
           <strong>Item Link:</strong> No item associated with this entry or class unknown

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

@@ -33,8 +33,8 @@
     label: t('bulkrax.exporter.labels.importer'),
     required: true,
     prompt: 'Select from the list',
-    label_html: { class: 'importer export-source-option d-none' },
-    input_html: { class: 'importer export-source-option d-none form-control' },
+    label_html: { class: 'importer export-source-option d-none hidden' },
+    input_html: { class: 'importer export-source-option d-none hidden form-control' },
     collection:  form.object.importers_list.sort %>
 
   <%= form.input :export_source_collection,
@@ -42,9 +42,9 @@
     label: t('bulkrax.exporter.labels.collection'),
     required: true,
     placeholder: @collection&.title&.first,
-    label_html: { class: 'collection export-source-option d-none' },
+    label_html: { class: 'collection export-source-option d-none hidden' },
     input_html: {
-      class: 'collection export-source-option d-none form-control',
+      class: 'collection export-source-option d-none hidden form-control',
       data: {
         'autocomplete-url' => '/authorities/search/collections',
         'autocomplete' => 'collection'
@@ -56,8 +56,8 @@
     label: t('bulkrax.exporter.labels.worktype'),
     required: true,
     prompt: 'Select from the list',
-    label_html: { class: 'worktype export-source-option d-none' },
-    input_html: { class: 'worktype export-source-option d-none form-control' },
+    label_html: { class: 'worktype export-source-option d-none hidden' },
+    input_html: { class: 'worktype export-source-option d-none hidden form-control' },
     collection: Bulkrax.curation_concerns.map { |cc| [cc.to_s, cc.to_s] } %>
 
   <%= form.input :limit,
@@ -80,7 +80,7 @@
                  as: :boolean,
                  label: t('bulkrax.exporter.labels.filter_by_date') %>
 
-  <div id="date_filter_picker" class="d-none">
+  <div id="date_filter_picker" class="d-none hidden">
     <%= form.input :start_date,
                    as: :date,
                    label: t('bulkrax.exporter.labels.start_date'),
@@ -136,13 +136,13 @@
             // get the date filter option and show the corresponding date selectors
             $('.exporter_date_filter').change(function () {
                 if ($('.exporter_date_filter').find(".boolean").is(":checked"))
-                    $('#date_filter_picker').removeClass('d-none');
+                    $('#date_filter_picker').removeClass('d-none hidden');
                 else
-                    $('#date_filter_picker').addClass('d-none');
+                    $('#date_filter_picker').addClass('d-none hidden');
             });
 
             if ($('.exporter_date_filter').find(".boolean").is(":checked"))
-                $('#date_filter_picker').removeClass('d-none');
+                $('#date_filter_picker').removeClass('d-none hidden');
         });
     });
 </script>

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

@@ -14,7 +14,7 @@
             <%= form.button :submit, value: 'Update and Re-Export All Items', class: 'btn btn-primary' %>
             |
             <% cancel_path = form.object.persisted? ? exporter_path(form.object) : exporters_path %>
-            <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default ' %>
+            <%= link_to t('bulkrax.cancel'), cancel_path, class: 'btn btn-default ' %>
           </div>
         </div>
       <% end %>

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

@@ -13,62 +13,18 @@
 
 <div class="panel panel-default">
   <div class="panel-body">
-    <% if @exporters.present? %>
-      <div class="table-responsive">
-        <table class="table table-striped datatable">
-          <thead>
-            <tr>
-              <th scope="col">Name</th>
-              <th scope="col">Status</th>
-              <th scope="col">Date Exported</th>
-              <th scope="col">Downloadable Files</th>
-              <th scope="col"></th>
-              <th scope="col"></th>
-              <th scope="col"></th>
-            </tr>
-          </thead>
-          <tbody>
-            <% @exporters.each do |exporter| %>
-              <tr>
-                <th scope="row"><%= link_to exporter.name, exporter_path(exporter) %></th>
-                <td><%= exporter.status %></td>
-                <td><%= exporter.created_at %></td>
-                <td>
-                  <% if File.exist?(exporter.exporter_export_zip_path) %>
-                    <%= simple_form_for(exporter, method: :get, url: exporter_download_path(exporter)) do |form| %>
-                      <%= render 'downloads', exporter: exporter, form: form %>
-                      <%= form.button :submit, value: 'Download', data: { disable_with: false } %>
-                    <% end %>
-                  <% end%>
-                </td>
-                <td><%= link_to raw('<span class="glyphicon glyphicon-info-sign"></span>'), exporter_path(exporter) %></td>
-                <td><%= link_to raw('<span class="glyphicon glyphicon-pencil"></span>'), edit_exporter_path(exporter), data: { turbolinks: false } %></td>
-                <td><%= link_to raw('<span class="glyphicon glyphicon-remove"></span>'), exporter, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </div>
-      <% else %>
-        <p>No exporters have been created.</p>
-      <% end %>
+    <div class="table-responsive">
+      <table id='exporters-table' class="table table-striped">
+        <thead>
+          <tr>
+            <th scope="col">Name</th>
+            <th scope="col">Status</th>
+            <th scope="col">Date Exported</th>
+            <th scope="col">Downloadable Files</th>
+            <th scope="col">Actions</th>
+          </tr>
+        </thead>
+      </table>
+    </div>
   </div>
 </div>
-
-<script>
-  $(function() {
-    $('#DataTables_Table_0').DataTable({
-      destroy: true, /* Reinitialize DataTable with config below */
-      'columnDefs': [
-          { 'orderable': true, 'targets': [0, 1, 2] },
-          { 'orderable': false, 'targets': [3, 4, 5, 6] }
-      ],
-      'language': {
-        'info': 'Showing _START_ to _END_ of _TOTAL_ exporters',
-        'infoEmpty': 'No exporters to show',
-        'infoFiltered': '(filtered from _MAX_ total exporters)',
-        'lengthMenu': 'Show _MENU_ exporters'
-      }
-    })
-  })
-</script>

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

@@ -14,7 +14,7 @@
             <%= form.button :submit, value: 'Create', class: 'btn btn-primary' %>
             |
             <% cancel_path = form.object.persisted? ? exporter_path(form.object) : exporters_path %>
-            <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default ' %>
+            <%= link_to t('bulkrax.cancel'), cancel_path, class: 'btn btn-default ' %>
           </div>
         </div>
       <% end %>

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

@@ -39,8 +39,10 @@
       <strong><%= t('bulkrax.exporter.labels.export_source') %>:</strong>
       <% case @exporter.export_from %>
       <% when 'collection' %>
-        <% collection = Collection.find(@exporter.export_source) %>
-        <%= link_to collection&.title&.first, hyrax.dashboard_collection_path(collection.id) %>
+	<% collection = Bulkrax.object_factory.find_or_nil(@exporter.export_source) %>
+	<% id = collection&.id || @exporter.export_source %>
+	<% title = collection&.title&.first || @exporter.export_source %>
+        <%= link_to title, hyrax.dashboard_collection_path(id) %>
       <% when 'importer' %>
         <% importer = Bulkrax::Importer.find(@exporter.export_source) %>
         <%= link_to importer.name, bulkrax.importer_path(importer.id) %>
@@ -95,16 +97,8 @@
 
     <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="nav-link active"><a href="#work-entries" aria-controls="work-entries" role="tab" data-toggle="tab"><%= t('bulkrax.exporter.labels.work_entries') %></a></li>
-        <li role="presentation" class="nav-link"><a href="#collection-entries" aria-controls="collection-entries" role="tab" data-toggle="tab"><%= t('bulkrax.exporter.labels.collection_entries') %></a></li>
-        <li role="presentation" class="nav-link"><a href="#file-set-entries" aria-controls="file-set-entries" role="tab" data-toggle="tab"><%= t('bulkrax.exporter.labels.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 class="outline">
+        <%= render partial: 'bulkrax/shared/entries_tab', locals: { item: @exporter } %>
       </div>
       <br>
       <%= link_to 'Edit', edit_exporter_path(@exporter) %>

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

@@ -3,10 +3,10 @@
 	f = "#{form.lookup_action}_importer"
 	f = "#{f}_#{@importer.id}" unless @importer.new_record?
 %>
-<div id='cloud-files'> 
+<div id='cloud-files'>
 	<button type="button" data-toggle="browse-everything" data-route="<%=browse_everything_engine.root_path%>"
 		data-target="#<%= f %>" class="btn btn-primary" id="browse">
-		<span class="glyphicon glyphicon-plus"></span>
+		<span class="fa fa-plus"></span>
 		Add Cloud Files
 	</button>
 </div>

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

@@ -25,13 +25,19 @@
   <h4>Add CSV File to Import:</h4>
   <%# accept a single file upload; data files and bags will need to be added another way %>
 
-  <%= fi.input :file_style, collection: ['Upload a File', 'Specify a Path on the Server'], as: :radio_buttons, label: false %>
+  <% 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' } %><br />
+    <%= fi.input 'file', as: :file, input_html: { accept: 'text/csv,application/zip,application/gzip' } %><br />
   </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>

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

@@ -34,7 +34,14 @@
           <%= form.button :submit,
                           value: 'Update and Replace Files',
                           class: 'btn btn-primary',
-                          data: {confirm: "Are you sure? This will remove all files before adding them from the import."} %>
+                  data: {confirm: "Are you sure? This will remove all files before adding them from the import."} %>
+          <hr />
+          <p>Remove all works and then run the import again from a clean slate. This will remove all files and associations and any edits made since the last import will be lost.</p>
+          <%= form.button :submit,
+                  value: 'Remove and Rerun',
+                  class: 'btn btn-primary',
+                  data: {confirm: "Are you sure? This will delete all the works and any associated files and relationships before re running."} %>
+
         <% end %>
         <hr />
 

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

@@ -0,0 +1,18 @@
+<div class="modal fade" id="bulkraxItemModal" tabindex="-1" role="dialog" aria-labelledby="bulkraxItemModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-body">
+        <h5>Options for Updating an Entry</h5>
+        <hr />
+        <p>Rebuild metadata and files.</p>
+        <%= link_to 'Build', item_entry_path(item, e), method: :patch, class: 'btn btn-primary'  %>
+        <hr />
+        <p>Remove existing work and then recreate the works metadata and files.</p>
+        <%= link_to 'Remove and then Build', item_entry_path(item, e, destroy_first: true), method: :patch, class: 'btn btn-primary'  %>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -15,7 +15,7 @@
             </button>
             <%= render 'edit_form_buttons', form: form %>
            <% cancel_path = form.object.persisted? ? importer_path(form.object) : importers_path %>
-            | <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default ' %>
+            | <%= link_to t('bulkrax.cancel'), cancel_path, class: 'btn btn-default ' %>
           </div>
         </div>
       <% end %>

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

@@ -13,69 +13,25 @@
 
 <div class="panel panel-default">
   <div class="panel-body">
-    <% if @importers.present? %>
-      <div class="table-responsive">
-        <table class="table table-striped datatable">
-          <thead>
-            <tr>
-              <th scope="col">Name</th>
-              <th scope="col">Status</th>
-              <th scope="col">Last Run</th>
-              <th scope="col">Next Run</th>
-              <th scope="col">Entries Enqueued</th>
-              <th scope="col">Entries Processed</th>
-              <th scope="col">Entries Failed</th>
-              <th scope="col">Entries Deleted Upstream</th>
-              <th scope="col">Total Collection Entries</th>
-              <th scope="col">Total Work Entries</th>
-              <th scope="col">Total File Set Entries</th>
-              <th scope="col"></th>
-              <th scope="col"></th>
-              <th scope="col"></th>
-            </tr>
-          </thead>
-          <tbody>
-            <% @importers.each do |importer| %>
-              <tr>
-                <th scope="row"><%= link_to importer.name, importer_path(importer) %></th>
-                <td><%= importer.status %></td>
-                <td><%= importer.last_imported_at.strftime("%b %d, %Y") if importer.last_imported_at %></td>
-                <td><%= importer.next_import_at.strftime("%b %d, %Y") if importer.next_import_at %></td>
-                <td><%= importer.last_run&.enqueued_records %></td>
-                <td><%= (importer.last_run&.processed_records || 0) %></td>
-                <td><%= (importer.last_run&.failed_records || 0) %></td>
-                <td><%= importer.last_run&.deleted_records %></td>
-                <td><%= importer.last_run&.total_collection_entries %></td>
-                <td><%= importer.last_run&.total_work_entries %></td>
-                <td><%= importer.last_run&.total_file_set_entries %></td>
-                <td><%= link_to raw('<span class="glyphicon glyphicon-info-sign"></span>'), importer_path(importer) %></td>
-                <td><%= link_to raw('<span class="glyphicon glyphicon-pencil"></span>'), edit_importer_path(importer) %></td>
-                <td><%= link_to raw('<span class="glyphicon glyphicon-remove"></span>'), importer, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </div>
-      <% else %>
-        <p>No importers have been created.</p>
-      <% end %>
+    <div class="table-responsive">
+      <table id='importers-table' class="table table-striped">
+        <thead>
+          <tr>
+            <th scope="col">Name</th>
+            <th scope="col">Status</th>
+            <th scope="col">Last Run</th>
+            <th scope="col">Next Run</th>
+            <th scope="col">Entries Enqueued</th>
+            <th scope="col">Entries Processed</th>
+            <th scope="col">Entries Failed</th>
+            <th scope="col">Entries Deleted Upstream</th>
+            <th scope="col">Total Collection Entries</th>
+            <th scope="col">Total Work Entries</th>
+            <th scope="col">Total File Set Entries</th>
+            <th scope="col">Actions</th>
+          </tr>
+        </thead>
+      </table>
+    </div>
   </div>
 </div>
-
-<script>
-  $(function() {
-    $('#DataTables_Table_0').DataTable({
-      destroy: true, /* Reinitialize DataTable with config below */
-      'columnDefs': [
-          { 'orderable': true, 'targets': [...Array(10).keys()] },
-          { 'orderable': false, 'targets': [10, 11, 12] }
-      ],
-      'language': {
-        'info': 'Showing _START_ to _END_ of _TOTAL_ importers',
-        'infoEmpty': 'No importers to show',
-        'infoFiltered': '(filtered from _MAX_ total importers)',
-        'lengthMenu': 'Show _MENU_ importers'
-      }
-    })
-  })
-</script>

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

@@ -18,7 +18,7 @@
             <%= form.button :submit, value: 'Create', class: 'btn btn-primary' %>
             |
             <% cancel_path = form.object.persisted? ? importer_path(form.object) : importers_path %>
-            <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default ' %>
+            <%= link_to t('bulkrax.cancel'), cancel_path, class: 'btn btn-default ' %>
           </div>
         </div>
       <% end %>

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

@@ -1,9 +1,10 @@
 <div class="col-xs-12 main-header">
   <h1><span class="fa fa-cloud-upload" aria-hidden="true"></span> Importer: <%= @importer.name %></h1>
-  <% if @importer.parser_klass == 'Bulkrax::CsvParser' && @work_entries.map(&:failed?).any? %>
+
+  <% if @importer.failed_entries? %>
     <div class="pull-right">
-      <%= link_to 'Export Errored Entries', importer_export_errors_path(@importer.id), class: 'btn btn-primary' %>
-      <%= link_to 'Upload Corrected Entries', importer_upload_corrected_entries_path(@importer.id), class: 'btn btn-primary' %>
+      <%= link_to 'Export Errored Entries', importer_export_errors_path(@importer.id), class: 'btn btn-primary', data: { turbolinks: false }%>
+      <%= link_to 'Upload Corrected Entries', importer_upload_corrected_entries_path(@importer.id), class: 'btn btn-primary' if @importer.parser.is_a?(Bulkrax::CsvParser) %>
     </div>
   <% end %>
 </div>
@@ -44,7 +45,7 @@
           Parser fields:
         </a>
         <a role="button" data-toggle="collapse" data-target="#parser-fields-importer-show" aria-expanded="true" aria-controls="parser-fields-importer-show">
-          <div class="accordion-icon glyphicon glyphicon-remove-circle" aria-hidden="true"></div>
+          <div class="accordion-icon fa fa-times-circle" aria-hidden="true"></div>
         </a>
       </div>
       <div id="parser-fields-importer-show" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="parser-fields-heading">
@@ -75,17 +76,10 @@
 
     <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="nav-link active"><a href="#work-entries" aria-controls="work-entries" role="tab" data-toggle="tab"><%= t('bulkrax.importer.labels.work_entries') %></a></li>
-        <li role="presentation" class="nav-link"><a href="#collection-entries" aria-controls="collection-entries" role="tab" data-toggle="tab"><%= t('bulkrax.importer.labels.collection_entries') %></a></li>
-        <li role="presentation" class="nav-link"><a href="#file-set-entries" aria-controls="file-set-entries" role="tab" data-toggle="tab"><%= t('bulkrax.importer.labels.file_set_entries') %></a></li>
-      </ul>
-      <!-- Tab panes -->
-      <div class="tab-content outline">
-        <%= 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 class="outline">
+        <%= render partial: 'bulkrax/shared/entries_tab', locals: { item: @importer} %>
       </div>
+      <%= render partial: 'bulkrax/importers/edit_item_buttons', locals: { item: @importer, e: @first_entry } if @first_entry.present? %>
     </div>
 
     <p class="bulkrax-p-align">

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

@@ -7,7 +7,7 @@
     <p>
     Upload <b>only</b> the corrected entries for the <b><%= @importer.name %></b> importer. To export failed entries for correction,
     <%= link_to importer_export_errors_path(@importer.id) do %>
-      click here <span class='glyphicon glyphicon-download-alt'></span>
+      click here <span class='fa fa-download'></span>
     <% end %>
     </p>
     <p>Only CSV files are allowed.</p>
@@ -18,7 +18,7 @@
           <div class='fileupload-buttonbar hide-required-tag'>
             <%= fi.input 'file',
               as: :file,
-              label: "<span class='glyphicon glyphicon-plus'></span><span> Add file...</span>".html_safe,
+              label: "<span class='fa fa-plus'></span><span> Add file...</span>".html_safe,
               label_html: {
                 class: 'btn btn-success'
               },

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

@@ -5,7 +5,7 @@
         Errors:
       </a>
       <a role="button" data-toggle="collapse" data-target="#error-trace-show" aria-expanded="true" aria-controls="error-trace-show">
-        <div class="accordion-icon glyphicon glyphicon-remove-circle" aria-hidden="true"></div>
+        <div class="accordion-icon fa fa-times-circle" aria-hidden="true"></div>
       </a>
     </div>
     <div id="error-trace-show" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="error-trace-show">

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

@@ -5,7 +5,7 @@
         <strong>Field mapping:</strong>
       </a>
       <a role="button" data-toggle="collapse" data-target="#field-mapping-show" aria-expanded="true" aria-controls="field-mapping-show">
-        <div class="accordion-icon glyphicon glyphicon-remove-circle" aria-hidden="true"></div>
+        <div class="accordion-icon fa fa-times-circle" aria-hidden="true"></div>
       </a>
     </div>
     <div id="field-mapping-show" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="field-mapping-show">

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

@@ -0,0 +1,16 @@
+<div class="tab-pane bulkrax-nav-tab-table-left-align" >
+  <table id='importer-show-table' class='table table-striped'>
+    <thead>
+      <tr>
+        <th><%= t('bulkrax.table_header.labels.identifier') %></th>
+        <th><%= t('bulkrax.table_header.labels.entry_id') %></th>
+        <th><%= t('bulkrax.table_header.labels.status') %></th>
+        <th><%= t('bulkrax.table_header.labels.type') %></th>
+        <th><%= t('bulkrax.table_header.labels.updated_at') %></th>
+        <th><%= t('bulkrax.table_header.labels.errors') %></th>
+        <th><%= t('bulkrax.table_header.labels.actions') %></th>
+      </tr>
+    </thead>
+  </table>
+  <div id='importer-entry-classes' class='hidden'><%= [item.parser.entry_class.to_s, item.parser.collection_entry_class.to_s, item.parser.file_set_entry_class.to_s].compact.join('|') %></div>
+</div>

data/config/locales/bulkrax.en.yml

@@ -1,9 +1,16 @@
 en:
+  helpers: 
+    action: 
+      importer:
+        new: "New"
+      exporter: 
+        new: "New"
   bulkrax:
     admin:
       sidebar:
         exporters: Exporters
         importers: Importers
+    cancel: "Cancel"
     exporter:
       labels:
         all: All

data/config/routes.rb

@@ -3,15 +3,21 @@
 Bulkrax::Engine.routes.draw do
   resources :exporters do
     get :download
-    resources :entries, only: %i[show]
+    get :entry_table
+    collection do
+      get :exporter_table
+    end
+    resources :entries, only: %i[show update destroy]
   end
   resources :importers do
     put :continue
+    get :entry_table
     get :export_errors
     collection do
+      get :importer_table
       post :external_sets
     end
-    resources :entries, only: %i[show]
+    resources :entries, only: %i[show update destroy]
     get :upload_corrected_entries
     post :upload_corrected_entries_file
   end

data/db/migrate/20230608153601_add_indices_to_bulkrax.rb

@@ -1,14 +1,25 @@
+# This migration comes from bulkrax (originally 20230608153601)
 class AddIndicesToBulkrax < ActiveRecord::Migration[5.1]
   def change
-    add_index :bulkrax_entries, :identifier unless index_exists?(:bulkrax_entries, :identifier)
-    add_index :bulkrax_entries, :type unless index_exists?(:bulkrax_entries, :type)
-    add_index :bulkrax_entries, [:importerexporter_id, :importerexporter_type], name: 'bulkrax_entries_importerexporter_idx' unless index_exists?(:bulkrax_entries, [:importerexporter_id, :importerexporter_type], name: 'bulkrax_entries_importerexporter_idx')
-
-    add_index :bulkrax_pending_relationships, :parent_id unless index_exists?(:bulkrax_pending_relationships, :parent_id)
-    add_index :bulkrax_pending_relationships, :child_id unless index_exists?(:bulkrax_pending_relationships, :child_id) 
+    check_and_add_index :bulkrax_entries, :identifier
+    check_and_add_index :bulkrax_entries, :type
+    check_and_add_index :bulkrax_entries, [:importerexporter_id, :importerexporter_type], name: 'bulkrax_entries_importerexporter_idx'
+    check_and_add_index :bulkrax_pending_relationships, :parent_id
+    check_and_add_index :bulkrax_pending_relationships, :child_id
+    check_and_add_index :bulkrax_statuses, [:statusable_id, :statusable_type], name: 'bulkrax_statuses_statusable_idx'
+    check_and_add_index :bulkrax_statuses, [:runnable_id, :runnable_type], name: 'bulkrax_statuses_runnable_idx'
+    check_and_add_index :bulkrax_statuses, :error_class
+  end
 
-    add_index :bulkrax_statuses, [:statusable_id, :statusable_type], name: 'bulkrax_statuses_statusable_idx' unless index_exists?(:bulkrax_statuses, [:statusable_id, :statusable_type], name: 'bulkrax_statuses_statusable_idx')
-    add_index :bulkrax_statuses, [:runnable_id, :runnable_type], name: 'bulkrax_statuses_runnable_idx' unless index_exists?(:bulkrax_statuses, [:runnable_id, :runnable_type], name: 'bulkrax_statuses_runnable_idx')
-    add_index :bulkrax_statuses, :error_class unless index_exists?(:bulkrax_statuses, :error_class)
+  if RUBY_VERSION =~ /^2/
+    def check_and_add_index(table_name, column_name, options = {})
+      add_index(table_name, column_name, options) unless index_exists?(table_name, column_name, options)
+    end
+  elsif RUBY_VERSION =~ /^3/
+    def check_and_add_index(table_name, column_name, **options)
+      add_index(table_name, column_name, **options) unless index_exists?(table_name, column_name, **options)
+    end
+  else
+    raise "Ruby version #{RUBY_VERSION} is unknown"
   end
 end

data/db/migrate/20240208005801_denormalize_status_message.rb

@@ -0,0 +1,7 @@
+class DenormalizeStatusMessage < ActiveRecord::Migration[5.2]
+  def change
+    add_column :bulkrax_entries, :status_message, :string, default: 'Pending' unless column_exists?(:bulkrax_entries, :status_message)
+    add_column :bulkrax_importers, :status_message, :string, default: 'Pending' unless column_exists?(:bulkrax_importers, :status_message)
+    add_column :bulkrax_exporters, :status_message, :string, default: 'Pending' unless column_exists?(:bulkrax_exporters, :status_message)
+  end
+end

data/db/migrate/20240209070952_update_identifier_index.rb

@@ -0,0 +1,6 @@
+class UpdateIdentifierIndex < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :bulkrax_entries, :identifier if index_exists?(:bulkrax_entries, :identifier )
+    add_index :bulkrax_entries, [:identifier, :importerexporter_id, :importerexporter_type], name: 'bulkrax_identifier_idx' unless index_exists?(:bulkrax_entries, [:identifier, :importerexporter_id, :importerexporter_type], name: 'bulkrax_identifier_idx')
+  end
+end