bulkrax 9.4.1 → 9.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 420e0b83f78ad1c411b0532bda121bebe74a651a9d1abec51549273896a00bcb
-  data.tar.gz: 892e143d2de6c714121804bf547b9473545c1071ecce6ef9a6269cb60eeaf66f
+  metadata.gz: 71b1c3954d163d1bf9466de4754d00af59da446bf3772c401b11fbbd4de03a2b
+  data.tar.gz: 3a96a3b0d58992dd3c57a5253cd981bfd672645c67b47c08b2f684603467cce4
 SHA512:
-  metadata.gz: 497fe999aa3d39f3e7281b5e743a75d5b6c60ba93d0a7a40bd63bdfe248b0c35e52dffaa9b8aebe59489e68999ea9a0e22826ed30ffea0f2d8927cfaa61852d5
-  data.tar.gz: 176a04163d610ad5241b96ecd107ae4bc79e64dddaff94f2fa80b7b93ce48951934ffb8f4a3438169c185f7c5a6e9f468aa8371c3c1c3d282d7c9d59ebfde946
+  metadata.gz: f278c8b666e3b9460ed4a06aec63f963f982b11a66a3c9e4d6282a5e475238e1dad5f5a5fb006b5f913649d879f9fbe947a1caf5ad29a6d26f8846d56cff0870
+  data.tar.gz: 94a2041d470a33d8ed790f819b3e017a4cba6be85749b4693796e8a55fe4759810123dfe82525bcc08e52343f5a174ae69ba919750c99c927e80e1dd0dadd766

data/README.md

@@ -225,9 +225,15 @@ This project is intended to be a safe, welcoming space for collaboration, and co
 ```bash
 /path/to/ruby/install/bin/gem install bundler -v '~> 2.4.0'
 ```
-- Decide on your version of Hyrax to test against and export it to your environment, then bundle install. The Hyrax version should be greater or equal to 2.3.
+- Decide on your version of Hyrax & Rails to test against and export it to your environment, then bundle install. The Hyrax version should be greater or equal to 2.3.
+
+You can find version combinations that should work in [.github/workflows/test.yml](.github/workflows/test.yml)
+
+If you have previously bundle installed with a different combination of versions, you may need to remove your Gemfile.lock `rm Gemfile.lock`
+
 ```bash
-export HYRAX_VERSION="~> 4.0.0"
+export RAILS_GEM_VERSION="~> 7.2"
+export HYRAX_VERSION="~> 5.2"
 bundle install
 ```
 - Run the test migrations

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

@@ -1,3 +1,22 @@
+function bulkraxDatatableLanguage() {
+  var i18n = (window.BulkraxI18n && window.BulkraxI18n.datatable && window.BulkraxI18n.datatable.language) || {}
+  return {
+    emptyTable: i18n.empty_table,
+    info: i18n.info,
+    infoEmpty: i18n.info_empty,
+    infoFiltered: i18n.info_filtered,
+    lengthMenu: i18n.length_menu,
+    loadingRecords: i18n.loading_records,
+    processing: i18n.processing,
+    search: i18n.search,
+    zeroRecords: i18n.zero_records,
+    paginate: {
+      next: i18n.next,
+      previous: i18n.previous
+    }
+  }
+}
+
 Blacklight.onLoad(function() {
   if($('#importer-show-table').length) {
     $('#importer-show-table').DataTable( {
@@ -10,6 +29,7 @@ Blacklight.onLoad(function() {
       "ajax": window.location.href.replace(/(\/(importers|exporters)\/\d+)/, "$1/entry_table.json"),
       "pageLength": 30,
       "lengthMenu": [[30, 100, 200], [30, 100, 200]],
+      "language": bulkraxDatatableLanguage(),
       "columns": [
         { "data": "identifier" },
         { "data": "id" },
@@ -45,6 +65,7 @@ Blacklight.onLoad(function() {
       "ajax": window.location.href.replace(/(\/importers)/, "$1/importer_table.json"),
       "pageLength": 30,
       "lengthMenu": [[30, 100, 200], [30, 100, 200]],
+      "language": bulkraxDatatableLanguage(),
       "order": [[2, 'desc']],
       "columns": [
         { "data": "name" },
@@ -76,6 +97,7 @@ Blacklight.onLoad(function() {
       "ajax": window.location.href.replace(/(\/exporters)/, "$1/exporter_table.json"),
       "pageLength": 30,
       "lengthMenu": [[30, 100, 200], [30, 100, 200]],
+      "language": bulkraxDatatableLanguage(),
       "columns": [
         { "data": "name" },
         { "data": "status_message" },
@@ -94,13 +116,22 @@ Blacklight.onLoad(function() {
 
 })
 
+function bulkraxDatatableFilters() {
+  return (window.BulkraxI18n && window.BulkraxI18n.datatable && window.BulkraxI18n.datatable.filters) || {}
+}
+
+function bulkraxDatatableStatuses() {
+  return (window.BulkraxI18n && window.BulkraxI18n.datatable && window.BulkraxI18n.datatable.status) || {}
+}
+
 function entrySelect() {
   let entrySelect = document.createElement('select')
   entrySelect.id = 'entry-filter'
   entrySelect.classList.value = 'form-control input-sm'
   entrySelect.style.marginRight = '10px'
 
-  entrySelect.add(new Option('Filter by Entry Class', ''))
+  var filters = bulkraxDatatableFilters()
+  entrySelect.add(new Option(filters.filter_by_entry_class || 'Filter by Entry Class', ''))
   // Read the options from the footer and add them to the entrySelect
   $('#importer-entry-classes').text().split('|').forEach(function (col, i) {
     entrySelect.add(new Option(col.trim()))
@@ -122,13 +153,17 @@ function statusSelect() {
   statusSelect.classList.value = 'form-control input-sm'
   statusSelect.style.marginRight = '10px'
 
-  statusSelect.add(new Option('Filter by Status', ''));
-  statusSelect.add(new Option('Complete'))
-  statusSelect.add(new Option('Pending'))
-  statusSelect.add(new Option('Failed'))
-  statusSelect.add(new Option('Skipped'))
-  statusSelect.add(new Option('Deleted'))
-  statusSelect.add(new Option('Complete (with failures)'))
+  var filters = bulkraxDatatableFilters()
+  var statuses = bulkraxDatatableStatuses()
+  statusSelect.add(new Option(filters.filter_by_status || 'Filter by Status', ''));
+  // The option value must remain the English status string, as that is what
+  // the backend search/filter logic matches against.
+  statusSelect.add(new Option(statuses.complete || 'Complete', 'Complete'))
+  statusSelect.add(new Option(statuses.pending || 'Pending', 'Pending'))
+  statusSelect.add(new Option(statuses.failed || 'Failed', 'Failed'))
+  statusSelect.add(new Option(statuses.skipped || 'Skipped', 'Skipped'))
+  statusSelect.add(new Option(statuses.deleted || 'Deleted', 'Deleted'))
+  statusSelect.add(new Option(statuses.complete_with_failures || 'Complete (with failures)', 'Complete (with failures)'))
 
   document.querySelector('div.dataTables_filter').firstChild.prepend(statusSelect)
 

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

@@ -91,6 +91,9 @@
     // Hierarchy rendering limits
     MAX_TREE_DEPTH: 50, // Prevent stack overflow on deeply nested hierarchies
 
+    // Validation issue list cap — accordion shows up to this many items; full list is in the downloaded CSV
+    MAX_ISSUE_ITEMS: 10,
+
     // API endpoints
     ENDPOINTS: {
       DEMO_SCENARIOS: '/importers/guided_import/demo_scenarios',
@@ -1341,6 +1344,8 @@
     $('input[name="importer[parser_fields][override_rights_statement]"]').prop('checked', false)
 
     // Clear review step warnings from previous run
+    $('.review-errors-list').empty()
+    $('.review-errors').hide()
     $('.review-warnings-list').empty()
     $('.review-warnings').hide()
     $('.large-import-warning').hide()
@@ -1658,8 +1663,11 @@
 
     // Download errors button
     if (data.validationErrorsCacheKey) {
+      var locale = $('input[name="locale"]').val()
       var downloadUrl =
-        CONSTANTS.ENDPOINTS.DOWNLOAD_VALIDATION_ERRORS + '?key=' + encodeURIComponent(data.validationErrorsCacheKey)
+        CONSTANTS.ENDPOINTS.DOWNLOAD_VALIDATION_ERRORS +
+        '?key=' + encodeURIComponent(data.validationErrorsCacheKey) +
+        (locale ? '&locale=' + encodeURIComponent(locale) : '')
       var $btn = $(
         '<a class="btn btn-outline-secondary btn-sm mt-2" href="' +
           downloadUrl +
@@ -1745,12 +1753,14 @@
     return grouped
   }
 
-  // Render missing required fields grouped by model
+  // Render missing required fields grouped by model. Group count capped at
+  // CONSTANTS.MAX_ISSUE_ITEMS so we never show a partial group.
   function renderMissingRequiredFields(items) {
     var groupedByModel = groupItemsByModel(items)
+    var modelNames = Object.keys(groupedByModel).slice(0, CONSTANTS.MAX_ISSUE_ITEMS)
     var parts = []
 
-    Object.keys(groupedByModel).forEach(function (modelName) {
+    modelNames.forEach(function (modelName) {
       parts.push('<div class="missing-field-group">')
       parts.push('<strong class="missing-field-model">' + modelName + '</strong>')
       parts.push('<ul>')
@@ -1768,9 +1778,14 @@
     return parts.join('')
   }
 
-  // Render default issue items (unrecognized fields, file references, etc.)
+  // Render default issue items (unrecognized fields, file references, etc.).
+  // When items carry a `category` (row-level errors/warnings), show up to
+  // CONSTANTS.MAX_ISSUE_ITEMS per category so each distinct problem type is
+  // represented. Otherwise fall back to a simple slice of the first N items.
   function renderDefaultIssueItems(items) {
-    var listItems = items.map(function (item) {
+    var hasCategories = items.some(function (item) { return item.category })
+    var capped = hasCategories ? capItemsPerCategory(items) : items.slice(0, CONSTANTS.MAX_ISSUE_ITEMS)
+    var listItems = capped.map(function (item) {
       var msg = item.message ? ' — ' + item.message : ''
       return '<li>• ' + item.field + msg + '</li>'
     })
@@ -1778,6 +1793,19 @@
     return '<ul>' + listItems.join('') + '</ul>'
   }
 
+  // Keep the first CONSTANTS.MAX_ISSUE_ITEMS entries per category, preserving
+  // their original order so rows still read top-to-bottom within each category.
+  function capItemsPerCategory(items) {
+    var counts = {}
+    var result = []
+    items.forEach(function (item) {
+      var cat = item.category || 'uncategorized'
+      counts[cat] = (counts[cat] || 0) + 1
+      if (counts[cat] <= CONSTANTS.MAX_ISSUE_ITEMS) result.push(item)
+    })
+    return result
+  }
+
   // Render issue items based on issue type
   function renderIssueItems(issue) {
     var hasModelField = issue.items.some(function (item) { return item.model })
@@ -1845,7 +1873,7 @@
             issue.title,
             issue.icon,
             issue.severity,
-            issue.count,
+            countDisplayFor(issue),
             issue.defaultOpen,
             issueContent
           )
@@ -1855,6 +1883,185 @@
 
   }
 
+  // Build the count badge display for a validation issue accordion.
+  // Returns a plain number (or null) normally, or an HTML fragment with a
+  // truncation note when the inline list is capped.
+  function countDisplayFor(issue) {
+    if (issue.count == null) return null
+    if (!isIssueTruncated(issue)) return issue.count
+
+    var noteText = t('validation_truncated_note', {
+      shown: issueShownCount(issue)
+    })
+    var tooltip = t('validation_truncated_tooltip')
+    return issue.count +
+      ' <span class="accordion-count-note" title="' + escapeHtml(tooltip) +
+      '" aria-label="' + escapeHtml(tooltip) + '">' +
+      escapeHtml(noteText) + '</span>'
+  }
+
+  // How many items are actually rendered in the accordion body, mirroring the
+  // slicing logic in renderDefaultIssueItems / renderMissingRequiredFields.
+  function issueShownCount(issue) {
+    var items = issue.items || []
+    if (!items.length) return 0
+
+    var hasModelField = issue.type === 'missing_required_fields' &&
+      items.some(function (item) { return item.model })
+    if (hasModelField) {
+      return Math.min(issueDisplayUnitCount(issue), CONSTANTS.MAX_ISSUE_ITEMS)
+    }
+
+    var hasCategories = items.some(function (item) { return item.category })
+    if (hasCategories) return capItemsPerCategory(items).length
+
+    return Math.min(items.length, CONSTANTS.MAX_ISSUE_ITEMS)
+  }
+
+  // Decide whether an issue's rendered item list is capped. Mirrors the
+  // slicing logic in renderDefaultIssueItems / renderMissingRequiredFields so
+  // the header note only appears when items are actually dropped.
+  function isIssueTruncated(issue) {
+    var items = issue.items || []
+    if (!items.length) return false
+
+    var hasModelField = issue.type === 'missing_required_fields' &&
+      items.some(function (item) { return item.model })
+    if (hasModelField) return issueDisplayUnitCount(issue) > CONSTANTS.MAX_ISSUE_ITEMS
+
+    var hasCategories = items.some(function (item) { return item.category })
+    if (hasCategories) {
+      var counts = {}
+      for (var i = 0; i < items.length; i++) {
+        var cat = items[i].category || 'uncategorized'
+        counts[cat] = (counts[cat] || 0) + 1
+        if (counts[cat] > CONSTANTS.MAX_ISSUE_ITEMS) return true
+      }
+      return false
+    }
+
+    return items.length > CONSTANTS.MAX_ISSUE_ITEMS
+  }
+
+  // Render one review-section (errors or warnings) on Step 3 from a list of
+  // validation issues. Each issue gets a breakdown appropriate to its shape:
+  // row-level issues group by category, missing_required_fields groups by
+  // model, everything else is a flat list of field names.
+  function renderReviewIssueSection(issues, sectionSelector, listSelector) {
+    if (!issues.length) {
+      $(listSelector).empty()
+      $(sectionSelector).hide()
+      return
+    }
+
+    var html = ''
+    issues.forEach(function (issue) {
+      var label = issue.title
+      if (issue.count) { label += ' (' + issue.count + ')' }
+      var detail = issue.summary || issue.description || ''
+      html += '<p>' + label
+      if (detail) { html += ' — ' + detail }
+      html += '</p>'
+
+      html += renderReviewIssueBreakdown(issue)
+    })
+    $(listSelector).html(html)
+    $(sectionSelector).show()
+  }
+
+  // Pick the right breakdown renderer for an issue on the Step 3 summary.
+  function renderReviewIssueBreakdown(issue) {
+    var items = issue.items || []
+    if (!items.length) return ''
+
+    if (issue.type === 'row_level_errors' || issue.type === 'row_level_warnings') {
+      return renderWarningCategoryBreakdown(items)
+    }
+    if (issue.type === 'missing_required_fields' && items.some(function (i) { return i.model })) {
+      return renderMissingRequiredBreakdown(items)
+    }
+    return renderFieldListBreakdown(items)
+  }
+
+  // Missing required fields grouped by model, matching the Step 1 accordion layout.
+  function renderMissingRequiredBreakdown(items) {
+    var grouped = groupItemsByModel(items)
+    var html = '<ul class="review-warning-categories">'
+    Object.keys(grouped).forEach(function (modelName) {
+      var fields = grouped[modelName].map(escapeHtml).join(', ')
+      html += '<li><strong>' + escapeHtml(modelName) + ':</strong> ' + fields + '</li>'
+    })
+    html += '</ul>'
+    return html
+  }
+
+  // Flat list of `field — message` entries — used for unrecognized fields,
+  // file references, notices. Message provides the context a bare field name
+  // lacks (e.g. "No model column found — all rows will be imported as …").
+  function renderFieldListBreakdown(items) {
+    var html = '<ul class="review-warning-categories">'
+    items.forEach(function (item) {
+      if (!item || !item.field) return
+      var line = escapeHtml(item.field)
+      if (item.message) line += ' — ' + escapeHtml(item.message)
+      html += '<li>' + line + '</li>'
+    })
+    html += '</ul>'
+    return html
+  }
+
+  // Render a bulleted breakdown of row-warning items grouped by category.
+  // Used on the Review & Start Import step under "Row Validation Warnings".
+  function renderWarningCategoryBreakdown(items) {
+    var counts = items.reduce(function (acc, item) {
+      var cat = item.category || 'uncategorized'
+      acc[cat] = (acc[cat] || 0) + 1
+      return acc
+    }, {})
+    var html = '<ul class="review-warning-categories">'
+    Object.keys(counts).forEach(function (cat) {
+      html += '<li>' + escapeHtml(warningCategoryLabel(cat)) + ' (' + counts[cat] + ')</li>'
+    })
+    html += '</ul>'
+    return html
+  }
+
+  // Localized label for a warning category, with a humanized fallback so a
+  // new validator category doesn't produce raw snake_case in the UI.
+  function warningCategoryLabel(category) {
+    var key = 'warning_category_' + category
+    var label = t(key)
+    if (label === key) return humanizeCategory(category)
+    return label
+  }
+
+  function humanizeCategory(category) {
+    if (!category) return ''
+    return category
+      .replace(/_/g, ' ')
+      .replace(/\b\w/g, function (c) { return c.toUpperCase() })
+  }
+
+  // Count the display units for an issue. For missing-required-fields grouped
+  // by model the unit is a model-group; for everything else it's an item.
+  function issueDisplayUnitCount(issue) {
+    if (!issue.items || !issue.items.length) return 0
+    var hasModelField = issue.type === 'missing_required_fields' &&
+      issue.items.some(function (item) { return item.model })
+    if (!hasModelField) return issue.items.length
+
+    var seen = {}
+    var groups = 0
+    issue.items.forEach(function (item) {
+      var key = item.model || 'Unknown'
+      if (!seen[key]) {
+        seen[key] = true
+        groups += 1
+      }
+    })
+    return groups
+  }
+
   // Create accordion HTML
   function createAccordion(title, icon, variant, count, defaultOpen, content) {
     var variantClass = 'accordion-' + variant
@@ -2313,26 +2520,14 @@
 
     $('.review-settings').html(settingsHtml)
 
-    // Warnings — derive from messages.issues so all warning types are covered
-    var warningIssues = (data && data.messages && data.messages.issues)
-      ? data.messages.issues.filter(function (issue) { return issue.severity === 'warning' })
-      : []
-    if (warningIssues.length > 0) {
-      var warningsHtml = ''
-      warningIssues.forEach(function (issue) {
-        var label = issue.title
-        if (issue.count) { label += ' (' + issue.count + ')' }
-        var detail = issue.summary || issue.description || ''
-        warningsHtml += '<p>' + label
-        if (detail) { warningsHtml += ' — ' + detail }
-        warningsHtml += '</p>'
-      })
-      $('.review-warnings-list').html(warningsHtml)
-      $('.review-warnings').show()
-    } else {
-      $('.review-warnings-list').empty()
-      $('.review-warnings').hide()
-    }
+    // Errors and warnings — derive from messages.issues so every severity is covered.
+    // Row-level errors/warnings get a per-category breakdown beneath the summary line.
+    var allIssues = (data && data.messages && data.messages.issues) || []
+    var errorIssues = allIssues.filter(function (issue) { return issue.severity === 'error' })
+    var warningIssues = allIssues.filter(function (issue) { return issue.severity === 'warning' })
+
+    renderReviewIssueSection(errorIssues, '.review-errors', '.review-errors-list')
+    renderReviewIssueSection(warningIssues, '.review-warnings', '.review-warnings-list')
 
     // Large import warning
     $('.total-items-count').text(totalItems)

data/app/assets/stylesheets/bulkrax/stepper/_review.scss

@@ -50,20 +50,22 @@
   }
 }
 
-.review-warnings {
-  h4 {
-    color: $color-warning-dark;
-  }
-}
+.review-errors h4 { color: $color-error-dark; }
+.review-warnings h4 { color: $color-warning-dark; }
 
-.review-warnings-list {
-  font-size: 12px;
-  color: $color-warning-dark;
+.review-errors-list { color: $color-error-dark; }
+.review-warnings-list { color: $color-warning-dark; }
 
-  ul {
-    margin: 0;
-    padding-left: 0;
-    list-style: none;
+.review-errors-list,
+.review-warnings-list {
+  .review-warning-categories {
+    margin: 4px 0 8px 0;
+    padding-left: 20px;
+    list-style: disc;
+
+    li {
+      font-size: 13px;
+    }
   }
 }
 

data/app/controllers/bulkrax/entries_controller.rb

@@ -75,7 +75,7 @@ module Bulkrax
       return unless defined?(::Hyrax)
       add_breadcrumb t(:'hyrax.controls.home'), main_app.root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb 'Importers', bulkrax.importers_path
+      add_breadcrumb t(:'bulkrax.headings.importers'), bulkrax.importers_path
       add_breadcrumb @importer.name, bulkrax.importer_path(@importer.id)
       add_breadcrumb @entry.id
     end
@@ -88,7 +88,7 @@ module Bulkrax
       return unless defined?(::Hyrax)
       add_breadcrumb t(:'hyrax.controls.home'), main_app.root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb 'Exporters', bulkrax.exporters_path
+      add_breadcrumb t(:'bulkrax.headings.exporters'), bulkrax.exporters_path
       add_breadcrumb @exporter.name, bulkrax.exporter_path(@exporter.id)
       add_breadcrumb @entry.id
     end

data/app/controllers/bulkrax/exporters_controller.rb

@@ -48,7 +48,7 @@ module Bulkrax
       @exporter = Exporter.new
       return unless defined?(::Hyrax)
       add_exporter_breadcrumbs
-      add_breadcrumb 'New'
+      add_breadcrumb t(:'bulkrax.headings.new_exporter')
     end
 
     # GET /exporters/1/edit
@@ -56,7 +56,7 @@ module Bulkrax
       if defined?(::Hyrax)
         add_exporter_breadcrumbs
         add_breadcrumb @exporter.name, bulkrax.exporter_path(@exporter.id)
-        add_breadcrumb 'Edit'
+        add_breadcrumb t(:'bulkrax.headings.edit_exporter')
       end
 
       # Correctly populate export_source_collection input
@@ -141,7 +141,7 @@ module Bulkrax
     def add_exporter_breadcrumbs
       add_breadcrumb t(:'hyrax.controls.home'), main_app.root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb 'Exporters', bulkrax.exporters_path
+      add_breadcrumb t(:'bulkrax.headings.exporters'), bulkrax.exporters_path
     end
 
     # Download methods

data/app/controllers/bulkrax/guided_imports_controller.rb

@@ -48,6 +48,8 @@ module Bulkrax
     end
 
     def download_validation_errors
+      set_locale_from_params
+
       cache_key = params[:key].to_s
       expected_prefix = "guided_import_errors:#{session.id}:"
       return head :not_found unless cache_key.start_with?(expected_prefix)
@@ -165,7 +167,7 @@ module Bulkrax
     def add_importer_breadcrumbs
       add_breadcrumb t(:'hyrax.controls.home'), main_app.root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb 'Importers', bulkrax.importers_path
+      add_breadcrumb t(:'bulkrax.headings.importers'), bulkrax.importers_path
     end
 
     def check_permissions

data/app/controllers/bulkrax/importers_controller.rb

@@ -63,7 +63,7 @@ module Bulkrax
         json_response('new')
       elsif defined?(::Hyrax)
         add_importer_breadcrumbs
-        add_breadcrumb 'New'
+        add_breadcrumb t(:'bulkrax.headings.new_importer')
       end
     end
 
@@ -84,7 +84,7 @@ module Bulkrax
       elsif defined?(::Hyrax)
         add_importer_breadcrumbs
         add_breadcrumb @importer.name, bulkrax.importer_path(@importer.id)
-        add_breadcrumb 'Edit'
+        add_breadcrumb t(:'bulkrax.headings.edit_importer')
       end
     end
 
@@ -189,9 +189,9 @@ module Bulkrax
       return unless defined?(::Hyrax)
       add_breadcrumb t(:'hyrax.controls.home'), main_app.root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb 'Importers', bulkrax.importers_path
+      add_breadcrumb t(:'bulkrax.headings.importers'), bulkrax.importers_path
       add_breadcrumb @importer.name, bulkrax.importer_path(@importer.id)
-      add_breadcrumb 'Upload Corrected Entries'
+      add_breadcrumb t(:'bulkrax.headings.upload_corrected_entries_action')
     end
 
     # POST /importer/1/upload_corrected_entries_file
@@ -313,7 +313,7 @@ module Bulkrax
     def add_importer_breadcrumbs
       add_breadcrumb t(:'hyrax.controls.home'), main_app.root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb 'Importers', bulkrax.importers_path
+      add_breadcrumb t(:'bulkrax.headings.importers'), bulkrax.importers_path
     end
 
     def setup_client(url)

data/app/matchers/bulkrax/application_matcher.rb

@@ -33,12 +33,11 @@ module Bulkrax
     end
 
     def process_split
-      if self.split.is_a?(TrueClass)
-        @result = @result.split(Bulkrax.multi_value_element_split_on)
-      elsif self.split
-        @result = @result.split(Regexp.new(self.split))
-        @result = @result.map(&:strip).select(&:present?)
-      end
+      pattern = Bulkrax::SplitPatternCoercion.coerce(self.split)
+      return unless pattern
+
+      @result = @result.split(pattern)
+      @result = @result.map(&:strip).select(&:present?) unless self.split.is_a?(TrueClass)
     end
 
     def process_parse

data/app/models/bulkrax/csv_entry.rb

@@ -165,7 +165,7 @@ module Bulkrax
     def add_file
       self.parsed_metadata['file'] ||= []
       if record['file']&.is_a?(String)
-        self.parsed_metadata['file'] = record['file'].split(Bulkrax.multi_value_element_split_on)
+        self.parsed_metadata['file'] = record['file'].split(Bulkrax::CsvParser.file_split_pattern)
       elsif record['file'].is_a?(Array)
         self.parsed_metadata['file'] = record['file']
       end

data/app/parsers/bulkrax/csv_parser.rb

@@ -13,6 +13,16 @@ module Bulkrax
       true
     end
 
+    # @return [Regexp] the pattern String#split should use on a `file` cell.
+    #   Honours the `file` mapping's `split:` when set, otherwise falls back
+    #   to {Bulkrax.multi_value_element_split_on}.
+    def self.file_split_pattern
+      file_mapping = Bulkrax.field_mappings.dig(to_s, 'file') ||
+                     Bulkrax.field_mappings.dig(to_s, :file) || {}
+      split_value  = file_mapping['split'] || file_mapping[:split]
+      Bulkrax::SplitPatternCoercion.coerce(split_value) || Bulkrax.multi_value_element_split_on
+    end
+
     def records(_opts = {})
       return @records if @records.present?
 
@@ -352,20 +362,13 @@ module Bulkrax
       raise StandardError, 'No records were found' if records.blank?
       return [] if importerexporter.metadata_only?
 
+      # Compute once — these don't vary per record.
+      file_mapping  = Bulkrax.field_mappings.dig(self.class.to_s, 'file', :from)&.first&.to_sym || :file
+      split_pattern = self.class.file_split_pattern
+      files_dir     = path_to_files
+
       @file_paths ||= records.map do |r|
-        file_mapping = Bulkrax.field_mappings.dig(self.class.to_s, 'file', :from)&.first&.to_sym || :file
         next if r[file_mapping].blank?
-
-        split_value = Bulkrax.field_mappings.dig(self.class.to_s, :file, :split)
-        split_pattern = case split_value
-                        when Regexp
-                          split_value
-                        when String
-                          Regexp.new(split_value)
-                        else
-                          Bulkrax.multi_value_element_split_on
-                        end
-        files_dir = path_to_files
         raise StandardError, "Record references local files but no files directory could be resolved from the import path" if files_dir.nil?
 
         r[file_mapping].split(split_pattern).map do |f|

data/app/parsers/concerns/bulkrax/csv_parser/csv_template_generation.rb

@@ -27,7 +27,10 @@ module Bulkrax
 
         def initialize(models: nil, admin_set_id: nil)
           @admin_set_id = admin_set_id
-          @mapping_manager = CsvTemplate::MappingManager.new
+          # Template generation excludes system-maintained fields (generated:
+          # true) so users don't see columns like date_uploaded, depositor,
+          # etc. on the downloadable template.
+          @mapping_manager = CsvTemplate::MappingManager.new(include_generated: false)
           @mappings = @mapping_manager.mappings
           @field_analyzer = CsvTemplate::FieldAnalyzer.new(@mappings, admin_set_id)
           @all_models = CsvTemplate::ModelLoader.new(Array.wrap(models)).models