bulkrax 9.3.2 → 9.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 52b7c05e33d9749382619fe7fc1c8ced0fc007b72c5ac744838b6e7b68929828
4
- data.tar.gz: 9557d6e4aa20d0c39f77fb716f52e67ae2ca7e2c20503cd7209ae166a75f9e53
3
+ metadata.gz: 8fc173a9153f3d6bf93ca309fda4a194cf6148eb26dc6b1bd9d4ec8e36e92cb0
4
+ data.tar.gz: d180567668e87809880fd7b86a3494ea2676c7afe7749d34d9da52b0728eed3b
5
5
  SHA512:
6
- metadata.gz: 4d6ed45673433b73776134f4e8503ecfed23ff7907396118de2a29731b71bc5296829e6d80ad3835bb914c752cdedf47434587cc519f0a5a206173e136d5a395
7
- data.tar.gz: 4d05030d27a91a1df0db7552d4fb431b10fc8fb06cf8384c98fe78142a7db674463c376de349270c476b1f9b5c556041db39469ed55cdd93b95538a12305d77e
6
+ metadata.gz: 0f50fc0ac8d65266be8781a01f3bffeebf06177dc9253255ff0db130c3612b3e0d6e1cb6437cbb2445416a4e49dc31e8867c73ab423e7d34ae9a4a34b8b55c1b
7
+ data.tar.gz: 5b5162665af58619b3017297155ef07263bc1ccd5caf172e778f9f66eeb47545ea9cfdf84746786ef911433f3b29cc879997a67f64dd23df2f9e9a3b44658025
@@ -177,7 +177,9 @@ module Bulkrax
177
177
  .ordered.find_each do |rel|
178
178
  raise "#{rel} needs a child to create relationship" if rel.child_id.nil?
179
179
  raise "#{rel} needs a parent to create relationship" if rel.parent_id.nil?
180
- add_to_work(relationship: rel, parent_record: parent_record, ability: ability)
180
+ # depending on the object factory, we may not save the actual parent record, so we update it here
181
+ # after each relationship to ensure that we don't lose the membership.
182
+ parent_record = add_to_work(relationship: rel, parent_record: parent_record, ability: ability)
181
183
  self.number_of_successes += 1
182
184
  @parent_record_members_added = true
183
185
  rescue => e
@@ -187,9 +189,11 @@ module Bulkrax
187
189
  end
188
190
  end
189
191
 
190
- # save record if members were added
192
+ # save record if members were added and update the index.
193
+ # For valkyrie, we should only need to reindex, but for active fedora, both the save
194
+ # and the reindex are needed to ensure the relationships are properly persisted.
191
195
  if @parent_record_members_added
192
- Bulkrax.object_factory.save!(resource: parent_record, user: user)
196
+ Bulkrax.object_factory.save!(resource: parent_record, user: @user)
193
197
  reloaded_parent = Bulkrax.object_factory.find(parent_record.id)
194
198
  Bulkrax.object_factory.update_index(resources: [reloaded_parent])
195
199
  Bulkrax.object_factory.publish(event: 'object.membership.updated', object: reloaded_parent, user: @user)
@@ -429,7 +429,9 @@ module Bulkrax
429
429
  private
430
430
 
431
431
  def map_file_sets(file_sets)
432
+ # rubocop:disable Rails/Presence
432
433
  file_sets.map { |fs| filename(fs).to_s if filename(fs).present? }.compact
434
+ # rubocop:enable Rails/Presence
433
435
  end
434
436
  end
435
437
  end
@@ -1,24 +1,28 @@
1
- <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
1
+ <%# Conditionally override Hyrax's partial if we can't use the sidebar insertion of the menu options %>
2
+ <% use_hyrax_partial = defined?(::Hyrax::DashboardController) && ::Hyrax::DashboardController.respond_to?(:sidebar_partials) %>
3
+ <% hyrax_partial_path = use_hyrax_partial ? Hyrax::Engine.root.join('app/views/hyrax/dashboard/sidebar/_repository_content.html.erb') : nil %>
2
4
 
3
- <%= menu.nav_link(hyrax.my_collections_path,
4
- class: "nav-link",
5
- onclick: "dontChangeAccordion(event);",
6
- also_active_for: hyrax.dashboard_collections_path,
7
- title: t('hyrax.admin.sidebar.collections')) do %>
8
- <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections') %></span>
9
- <% end %>
5
+ <% if use_hyrax_partial && hyrax_partial_path && File.exist?(hyrax_partial_path) %>
6
+ <%= render inline: File.read(hyrax_partial_path), type: :erb, locals: { menu: menu } %>
7
+ <% else %>
8
+ <%# Original Bulkrax partial content below %>
9
+ <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
10
+ <%= menu.nav_link(hyrax.my_collections_path,
11
+ class: "nav-link",
12
+ onclick: "dontChangeAccordion(event);",
13
+ also_active_for: hyrax.dashboard_collections_path,
14
+ title: t('hyrax.admin.sidebar.collections')) do %>
15
+ <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections') %></span>
16
+ <% end %>
10
17
 
11
- <%= menu.nav_link(hyrax.my_works_path,
12
- class: "nav-link",
13
- onclick: "dontChangeAccordion(event);",
14
- also_active_for: hyrax.dashboard_works_path,
15
- title: t('hyrax.admin.sidebar.works')) do %>
16
- <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works') %></span>
17
- <% end %>
18
+ <%= menu.nav_link(hyrax.my_works_path,
19
+ class: "nav-link",
20
+ onclick: "dontChangeAccordion(event);",
21
+ also_active_for: hyrax.dashboard_works_path,
22
+ title: t('hyrax.admin.sidebar.works')) do %>
23
+ <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works') %></span>
24
+ <% end %>
18
25
 
19
- <% if ::Hyrax::DashboardController&.respond_to?(:sidebar_partials) %>
20
- <%= render 'hyrax/dashboard/sidebar/menu_partials', menu: menu, section: :repository_content %>
21
- <% else %>
22
26
  <% if current_ability.can_import_works? %>
23
27
  <%= menu.nav_link(bulkrax.importers_path) do %>
24
28
  <span class="fa fa-cloud-upload" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('bulkrax.admin.sidebar.importers') %></span>
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Bulkrax
4
- VERSION = '9.3.2'
4
+ VERSION = '9.3.4'
5
5
  end
metadata CHANGED
@@ -1,13 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bulkrax
3
3
  version: !ruby/object:Gem::Version
4
- version: 9.3.2
4
+ version: 9.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rob Kaufman
8
+ autorequire:
8
9
  bindir: bin
9
10
  cert_chain: []
10
- date: 1980-01-02 00:00:00.000000000 Z
11
+ date: 2026-01-15 00:00:00.000000000 Z
11
12
  dependencies:
12
13
  - !ruby/object:Gem::Dependency
13
14
  name: rails
@@ -511,6 +512,7 @@ homepage: https://github.com/samvera-labs/bulkrax
511
512
  licenses:
512
513
  - Apache-2.0
513
514
  metadata: {}
515
+ post_install_message:
514
516
  rdoc_options: []
515
517
  require_paths:
516
518
  - lib
@@ -525,7 +527,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
525
527
  - !ruby/object:Gem::Version
526
528
  version: '0'
527
529
  requirements: []
528
- rubygems_version: 3.6.8
530
+ rubygems_version: 3.5.3
531
+ signing_key:
529
532
  specification_version: 4
530
533
  summary: Import and export tool for Hyrax and Hyku
531
534
  test_files: []