hyrax 5.1.0 → 5.2.0

data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb

@@ -14,8 +14,8 @@
       <tbody>
           <% @top_file_set_downloads.each do |download| %>
             <tr>
-              <td><%= download[1] %></td> 
-              <td><%= download[0] %></td>  
+              <td><%= download[1] %></td>
+              <td><%= download[0] %></td>
               <td><%= download[2] %></td>
             </tr>
           <% end %>
@@ -24,10 +24,7 @@
   </div>
   <div class="card-footer">
     <div class="float-right">
-     <%= paginate @top_file_set_downloads %> 
+      <%= paginate @top_file_set_downloads, outer_window: 2, theme: 'blacklight' %>
     </div>
   </div>
 </div>
- 
-
-

data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb

@@ -24,16 +24,15 @@
               <td><%= work[0] %></td>
               <td><%= work[2] %></td>
               <td><%= work[3] %></td>
-            </tr>       
+            </tr>
         <% end %>
       </tbody>
     </table>
   </div>
-  
 
   <div class="card-footer">
     <div class="float-right">
-      <%= paginate @top_works %>
+      <%= paginate @top_works, outer_window: 2, theme: 'blacklight' %>
     </div>
   </div>
 

data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb

@@ -30,12 +30,7 @@
   </div>
   <div class="card-footer">
     <div class="float-right">
-     <%= paginate @files %> 
+      <%= paginate @files, outer_window: 2, theme: 'blacklight' %>
     </div>
   </div>
 </div>
-
-
-
-
-

data/app/views/hyrax/base/_social_media.html.erb

@@ -1,3 +1,5 @@
+<% return '' if Flipflop.hide_social_buttons? %>
+
 <% page_title ||= content_for?(:page_title) ? content_for(:page_title) : default_page_title %>
 <% share_url ||= request.original_url %>
 <div class="social-media">

data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb

@@ -1,21 +1,22 @@
 <div class="btn-group">
   <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><%= t('.select') %> <span class="caret"></span>
   </button>
-  <ul class="dropdown-menu dropdown-menu-right">
+  <ul class="dropdown-menu dropdown-menu-right" role="menu">
     <% if can?( :edit, document ) && !workflow_restriction?(@presenter) %>
-      <li class="dropdown-item">
-        <%= link_to [main_app, :edit, document],
-                    class: "itemicon itemedit",
-                    title: t('hyrax.collection.document_list.edit'),
-                    id: "edit_work_link_#{document.id}" do %>
+      <%= link_to [main_app, :edit, document],
+                  class: "itemicon itemedit",
+                  role: 'menuitem',
+                  title: t('hyrax.collection.document_list.edit'),
+                  id: "edit_work_link_#{document.id}" do %>
+        <li class="dropdown-item">
           <i class="fa fa-pencil" aria-hidden="true"></i> <%= t('hyrax.collection.document_list.edit') %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
-    <li class="dropdown-item">
-      <%= display_trophy_link(current_user, document.id) do |text| %>
+    <%= display_trophy_link(current_user, document.id, role: 'menuitem') do |text| %>
+      <li class="dropdown-item">
         <i class="fa fa-star" aria-hidden="true"></i> <%= text %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
   </ul>
 </div>

data/app/views/hyrax/my/_admin_set_action_menu.html.erb

@@ -7,39 +7,43 @@
     <%= t("hyrax.dashboard.my.action.select") %>
   </button>
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
-    <li class="dropdown-item" role="menuitem" tabindex="-1">
-      <%= link_to hyrax.admin_admin_set_path(id),
-                  class: 'itemicon itemedit',
-                  title: t("hyrax.dashboard.my.action.view_admin_set") do %>
+    <%= link_to hyrax.admin_admin_set_path(id),
+                class: 'itemicon itemedit',
+                role: 'menuitem',
+                title: t("hyrax.dashboard.my.action.view_admin_set") do %>
+      <li class="dropdown-item" tabindex="-1">
         <%= t("hyrax.dashboard.my.action.view_admin_set") %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
     <% if can? :edit, admin_set_presenter.solr_document %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to hyrax.edit_admin_admin_set_path(id),
-                    class: 'itemicon itemedit',
-                    title: t("hyrax.dashboard.my.action.edit_admin_set") do %>
+      <%= link_to hyrax.edit_admin_admin_set_path(id),
+                  class: 'itemicon itemedit',
+                  role: 'menuitem',
+                  title: t("hyrax.dashboard.my.action.edit_admin_set") do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.edit_admin_set") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% else %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to "#",
-                    class: 'itemicon itemedit edit-collection-deny-button',
-                    title: t("hyrax.dashboard.my.action.edit_collection") do %>
+      <%= link_to "#",
+                  class: 'itemicon itemedit edit-collection-deny-button',
+                  role: 'menuitem',
+                  title: t("hyrax.dashboard.my.action.edit_collection") do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.edit_collection") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
-    <li class="dropdown-item" role="menuitem" tabindex="-1">
-      <%= link_to "#",
-                     class: 'itemicon itemtrash delete-collection-button',
-                     title: t("hyrax.dashboard.my.action.delete_admin_set"),
-                     data: { totalitems: admin_set_presenter.total_items ,
-                             membership: admin_set_presenter.collection_type_is_require_membership? ,
-                             hasaccess: (can?(:edit, admin_set_presenter.solr_document)) } do %>
+    <%= link_to "#",
+                class: 'itemicon itemtrash delete-collection-button',
+                role: 'menuitem',
+                title: t("hyrax.dashboard.my.action.delete_admin_set"),
+                data: { totalitems: admin_set_presenter.total_items,
+                        membership: admin_set_presenter.collection_type_is_require_membership?,
+                        hasaccess: (can?(:edit, admin_set_presenter.solr_document)) } do %>
+      <li class="dropdown-item" tabindex="-1">
         <%= t("hyrax.dashboard.my.action.delete_admin_set") %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
   </ul>
 </div>

data/app/views/hyrax/my/_collection_action_menu.html.erb

@@ -7,52 +7,57 @@
     <%= t("hyrax.dashboard.my.action.select") %>
   </button>
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
-    <li class="dropdown-item" role="menuitem" tabindex="-1">
-      <%= link_to hyrax.dashboard_collection_path(id),
-                  class: 'itemicon itemedit',
-                  title: t("hyrax.dashboard.my.action.view_collection") do %>
+    <%= link_to hyrax.dashboard_collection_path(id),
+                class: 'itemicon itemedit',
+                role: 'menuitem',
+                title: t("hyrax.dashboard.my.action.view_collection") do %>
+      <li class="dropdown-item" tabindex="-1">
         <%= t("hyrax.dashboard.my.action.view_collection") %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
     <% if can? :edit, collection_presenter.solr_document %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to hyrax.edit_dashboard_collection_path(id),
-                    class: 'itemicon itemedit',
-                    title: t("hyrax.dashboard.my.action.edit_collection")  do %>
+      <%= link_to hyrax.edit_dashboard_collection_path(id),
+                  class: 'itemicon itemedit',
+                  role: 'menuitem',
+                  title: t("hyrax.dashboard.my.action.edit_collection")  do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.edit_collection") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% else %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to "#",
-                    class: 'itemicon itemedit edit-collection-deny-button',
-                    title: t("hyrax.dashboard.my.action.edit_collection") do %>
+      <%= link_to "#",
+                  class: 'itemicon itemedit edit-collection-deny-button',
+                  role: 'menuitem',
+                  title: t("hyrax.dashboard.my.action.edit_collection") do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.edit_collection") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
-    <li class="dropdown-item" role="menuitem" tabindex="-1">
-      <%= link_to "#",
-                  class: 'itemicon itemtrash delete-collection-button',
-                  title: t("hyrax.dashboard.my.action.delete_collection"),
-                  data: { totalitems: collection_presenter.total_items ,
-                          membership: collection_presenter.collection_type_is_require_membership? ,
-                          hasaccess: (can?(:edit, collection_presenter.solr_document)) } do %>
+    <%= link_to "#",
+                class: 'itemicon itemtrash delete-collection-button',
+                role: 'menuitem',
+                title: t("hyrax.dashboard.my.action.delete_collection"),
+                data: { totalitems: collection_presenter.total_items ,
+                        membership: collection_presenter.collection_type_is_require_membership? ,
+                        hasaccess: (can?(:edit, collection_presenter.solr_document)) } do %>
+      <li class="dropdown-item" tabindex="-1">
         <%= t("hyrax.dashboard.my.action.delete_collection") %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
 
     <% if collection_presenter.collection_type_is_nestable? %>
       <% # The user should have deposit access to the parent we are adding, and read access to the child (the collection we are linking here). %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to "#",
-                    class: 'itemicon add-to-collection',
-                    title: t("hyrax.dashboard.my.action.add_to_collection"),
-                    data: { nestable: collection_presenter.collection_type_is_nestable? ,
-                            hasaccess: (can?(:read, collection_presenter.solr_document)) } do %>
+      <%= link_to "#",
+                  class: 'itemicon add-to-collection',
+                  role: 'menuitem',
+                  title: t("hyrax.dashboard.my.action.add_to_collection"),
+                  data: { nestable: collection_presenter.collection_type_is_nestable? ,
+                          hasaccess: (can?(:read, collection_presenter.solr_document)) } do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.add_to_collection") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
   </ul>
 </div>

data/app/views/hyrax/my/_work_action_menu.html.erb

@@ -8,38 +8,39 @@
   </button>
 
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= document.id %>">
-
     <% if can? :edit, document.id %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to [main_app, :edit, document],
-                    id: 'action-edit-work' do %>
+      <%= link_to [main_app, :edit, document],
+                  id: 'action-edit-work', role: 'menuitem' do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.edit_work") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
 
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to [main_app, document],
-                    method: :delete,
-                    id: 'action-delete-work',
-                    data: {
-                      confirm: t("hyrax.dashboard.my.action.work_confirmation", application_name: application_name) } do %>
+      <%= link_to [main_app, document],
+                  method: :delete,
+                  id: 'action-delete-work',
+                  role: 'menuitem',
+                  data: {
+                    confirm: t("hyrax.dashboard.my.action.work_confirmation", application_name: application_name) } do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.delete_work") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
 
-    <li class="dropdown-item" role="menuitem" tabindex="-1">
-      <%= display_trophy_link(current_user, document.id) do |text| %>
+    <%= display_trophy_link(current_user, document.id, role: 'menuitem' ) do |text| %>
+      <li class="dropdown-item" tabindex="-1">
         <%= text %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
 
     <% if can? :transfer, document.id %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to(hyrax.new_work_transfer_path(document.id), id: 'action-transfer-work', class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
+      <%= link_to(hyrax.new_work_transfer_path(document.id), id: 'action-transfer-work', role: 'menuitem',
+                  class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.transfer") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
   </ul>
 </div>

data/config/features.rb

@@ -6,46 +6,56 @@ Flipflop.configure do
   strategy Hyrax::Strategies::YamlStrategy, config: Hyrax.config.feature_config_path
   strategy :default
 
-  feature :proxy_deposit,
-          default: true,
-          description: "Depositors may designate proxies to deposit works on their behalf"
-
-  feature :transfer_works,
-          default: true,
-          description: "Depositors may transfer their works to another user"
-
-  # Note, if this is deactivated, a default admin set will be created and all
-  # works will be assigned to it when they are created.
-  feature :assign_admin_set,
-          default: true,
-          description: "Ability to assign uploaded items to an admin set"
-
-  feature :show_deposit_agreement,
-          default: true,
-          description: "Show a deposit agreement to users creating works"
-
-  feature :active_deposit_agreement_acceptance,
-          default: Hyrax.config.active_deposit_agreement_acceptance?,
-          description: "Require an active acceptance of the deposit agreement by checking a checkbox"
-
-  feature :batch_upload,
-          default: false,
-          description: "Enable uploading batches of works"
-
-  feature :hide_private_items,
-          default: false,
-          description: "Do not show the private items."
-
-  feature :hide_users_list,
-          default: true,
-          description: "Do not show users list unless user has authenticated."
-
-  feature :cache_work_iiif_manifest,
-          default: false,
-          description: "Use Rails.cache to cache the JSON document for IIIF manifests"
-  feature :read_only,
-          default: false,
-          description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
+  group :site_configuration do
+    feature :cache_work_iiif_manifest,
+            default: false,
+            description: "Use Rails.cache to cache the JSON document for IIIF manifests"
+
+    feature :hide_private_items,
+            default: false,
+            description: "Do not show the private items."
+
+    feature :hide_social_buttons,
+            default: false,
+            description: "Do not show social media share buttons."
+
+    feature :hide_users_list,
+            default: true,
+            description: "Do not show users list unless user has authenticated."
+
+    feature :read_only,
+            default: false,
+            description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
+  end
+
+  group :repository_management do
+    feature :active_deposit_agreement_acceptance,
+            default: Hyrax.config.active_deposit_agreement_acceptance?,
+            description: "Require an active acceptance of the deposit agreement by checking a checkbox"
+
+    # Note, if this is deactivated, a default admin set will be created and all
+    # works will be assigned to it when they are created.
+    feature :assign_admin_set,
+            default: true,
+            description: "Ability to assign uploaded items to an admin set"
+
+    feature :batch_upload,
+            default: false,
+            description: "Enable uploading batches of works"
+
+    feature :proxy_deposit,
+            default: true,
+            description: "Depositors may designate proxies to deposit works on their behalf"
+
+    feature :show_deposit_agreement,
+            default: true,
+            description: "Show a deposit agreement to users creating works"
+
+    feature :transfer_works,
+            default: true,
+            description: "Depositors may transfer their works to another user"
+  end
+
 rescue Flipflop::StrategyError, Flipflop::FeatureError => err
   Hyrax.logger.warn "Ignoring #{err}: #{err.message}"
 end

data/config/initializers/indexing_adapter_initializer.rb

@@ -7,3 +7,7 @@ Valkyrie::IndexingAdapter.register(
 Valkyrie::IndexingAdapter.register(
   Valkyrie::Indexing::NullIndexingAdapter.new, :null_index
 )
+Valkyrie::IndexingAdapter.register(
+  Valkyrie::Indexing::RedisQueue::IndexingAdapter.new,
+  :redis_queue
+)

data/config/initializers/new_framework_defaults_7_2.rb

@@ -2,7 +2,9 @@
 
 # Any options set here are to override Rails 7.2 configuration defaults
 
-# These fix a couple of issues arising from Rails 7.2 enforcement of HTML5 semantics
-# by default when using certain Rails methods
-Rails.application.config.action_view.button_to_generates_button_tag = false
-Rails.application.config.action_view.sanitizer_vendor = Rails::HTML4::Sanitizer
+if Rails::VERSION::MAJOR >= 7
+  # These fix a couple of issues arising from Rails 7.2 enforcement of HTML5 semantics
+  # by default when using certain Rails methods
+  Rails.application.config.action_view.button_to_generates_button_tag = false
+  Rails.application.config.action_view.sanitizer_vendor = Rails::HTML4::Sanitizer
+end

data/config/initializers/reform_rails_6_1_monkey_patch.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+return if Rails::VERSION::MAJOR >= 7
+
+# Taken from https://github.com/trailblazer/reform-rails/issues/86#issuecomment-763120151
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Lint/UselessAssignment
+module Reform
+  class Contract < Disposable::Twin
+    class Result
+      private
+
+      # this doesn't do nested errors (e.g. )
+      def filter_for(method, *args)
+        @results.collect { |r| r.public_send(method, *args).to_h }
+                .inject({}) { |hah, err| hah.merge(err) { |_key, old_v, new_v| (new_v.is_a?(Array) ? (old_v |= new_v) : old_v.merge(new_v)) } }
+                .find_all do |_k, v| # filter :nested=>{:something=>["too nested!"]} #DISCUSS: do we want that here?
+          if v.is_a?(Hash)
+            nested_errors = v.select { |attr_key, val| attr_key.is_a?(Integer) && val.is_a?(Array) && val.any? }
+            v = nested_errors.to_a if nested_errors.any?
+          end
+          v.is_a?(ActiveModel::DeprecationHandlingMessageArray)
+        end.to_h
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:disable Lint/UselessAssignment

data/config/metadata/core_metadata.yaml

@@ -20,4 +20,5 @@ attributes:
     type: string
     predicate: http://id.loc.gov/vocabulary/relators/dpt
     index_keys:
+      - "depositor_ssim"
       - "depositor_tesim"

data/docker-compose-dassie.yml

@@ -68,14 +68,14 @@ services:
   chrome:
     image: selenium/standalone-chromium:4
     environment:
-#      - START_XVFB=false
+      #      - START_XVFB=false
       - SE_NODE_SESSION_TIMEOUT=800
       - SE_ENABLE_TRACING=false
       - SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP=true
       - SE_BROWSER_ARGS_DISABLE_DSHM=--disable-dev-shm-usage
       - SE_BROWSER_ARGS_HEADLESS=--headless=new
-#    logging:
-#      driver: none
+    #    logging:
+    #      driver: none
     volumes:
       - /dev/shm:/dev/shm
     shm_size: 2g
@@ -118,7 +118,7 @@ services:
   memcached:
     image: bitnami/memcached
     ports:
-      - '11211:11211'
+      - "11211:11211"
     networks:
       - hyrax
 

data/documentation/developing-your-hyrax-based-app.md

@@ -32,7 +32,7 @@ You can also try [Running Hyrax-based application in local VM](https://github.co
 During development, running only the dependent services in a container environment may be beneficial. This avoids potential headaches concerning file permissions and eases the use of debugging tools. The application generation instructions below use [Lando](https://lando.dev) to achieve this setup.
 
 This document contains instructions specific to setting up an app with __Hyrax
-v5.1.0__. If you are looking for instructions on installing a different
+v5.2.0__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -148,7 +148,7 @@ Generate a new Rails application using the template.
 **NOTE:** `HYRAX_SKIP_WINGS` is needed here to avoid loading the Wings compatibility layer during the application generation process.
 
 ```shell
-HYRAX_SKIP_WINGS=true rails _7.2.2.1_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.1.0-beta1/template.rb
+HYRAX_SKIP_WINGS=true rails _7.2.2.1_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.2.0/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/hyrax.gemspec

@@ -32,7 +32,7 @@ SUMMARY
   # NOTE: rails does not follow sem-ver conventions, it's
   # minor version releases can include breaking changes; see
   # http://guides.rubyonrails.org/maintenance_policy.html
-  spec.add_dependency 'rails', '~> 7.2', '< 8.0'
+  spec.add_dependency 'rails', '> 6.1', '< 8.0'
 
   spec.add_dependency 'active-fedora', '~> 15.0'
   spec.add_dependency 'almond-rails', '~> 0.1'
@@ -100,7 +100,7 @@ SUMMARY
   spec.add_development_dependency 'pg', '~> 1.2'
   spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
   spec.add_development_dependency 'rspec-its', '~> 1.1'
-  spec.add_development_dependency 'rspec-rails', '~> 7.0'
+  spec.add_development_dependency 'rspec-rails', '> 6.1'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency "selenium-webdriver", '~> 4.4'
   spec.add_development_dependency 'i18n-debug'

data/lib/freyja/persister.rb

@@ -13,6 +13,7 @@ module Freyja
     #   was modified in the database between been read into memory and persisted
     # rubocop:disable Lint/UnusedMethodArgument
     def save(resource:, external_resource: false, perform_af_validation: false)
+      was_wings = resource.respond_to?(:wings?) && resource.wings?
       orm_object = resource_factory.from_resource(resource: resource)
       orm_object.transaction do
         orm_object.save!
@@ -23,18 +24,24 @@ module Freyja
                 "Called from #{Gem.location_of_caller.join(':')}"
         end
       end
-      convert_and_migrate_resource(orm_object)
+      convert_and_migrate_resource(orm_object, was_wings)
 
     rescue ActiveRecord::StaleObjectError
       raise Valkyrie::Persistence::StaleObjectError, "The object #{resource.id} has been updated by another process."
     end
     # rubocop:enable Lint/UnusedMethodArgument
 
-    def convert_and_migrate_resource(orm_object)
+    def convert_and_migrate_resource(orm_object, was_wings)
       new_resource = resource_factory.to_resource(object: orm_object)
-      if Hyrax.config.valkyrie_transition?
+      # if the resource was wings and is now a Valkyrie resource, we need to migrate sipity, files, and members
+      if Hyrax.config.valkyrie_transition? && was_wings && !new_resource.wings?
         MigrateFilesToValkyrieJob.perform_later(new_resource) if new_resource.is_a?(Hyrax::FileSet) && new_resource.file_ids.size == 1 && new_resource.file_ids.first.id.to_s.match('/files/')
-        MigrateResourcesJob.perform_later(ids: new_resource.member_ids.map(&:to_s)) if new_resource.is_a?(Hyrax::Work)
+        # migrate any members if the resource is a Hyrax work
+        if new_resource.is_a?(Hyrax::Work)
+          member_ids = new_resource.member_ids.map(&:to_s)
+          MigrateResourcesJob.perform_later(ids: member_ids) unless member_ids.empty?
+          MigrateSipityEntityJob.perform_now(id: new_resource.id.to_s)
+        end
       end
       new_resource
     end