Fixing issues where Hyrax::FileSet resources are incorrectly cast to AF ::FileSet #7038
+10
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Test Results 13 files ±0 13 suites ±0 2h 48m 23s ⏱️ - 19m 38s For more details on these failures, see this check. Results for commit 8d2dc58. ± Comparison against base commit cf3f95e. This pull request removes 366 and adds 366 tests. Note that renamed tests count towards both. |
dlpierce
reviewed
Mar 12, 2025
Comment on lines
+12
to
+21
| before_action do | ||
| # If Hyrax.config.file_set_class is set to ::FileSet, the load above will force-cast | ||
| # the instance as a ::FileSet, even if it is a Hyrax::FileSet. Re-cast it back to | ||
| # prevent method errors and nil objects later | ||
| if @file_set.class == ::FileSet | ||
| # We can tell if a Hyrax::FileSet was improperly cast because this AF method will | ||
| # return nil since its parent is not a ActiveFedora work. | ||
| @file_set = @file_set.valkyrie_resource if @file_set.parent&.id.nil? | ||
| end | ||
| end |
There was a problem hiding this comment.
Suggested change
| before_action do | |
| # If Hyrax.config.file_set_class is set to ::FileSet, the load above will force-cast | |
| # the instance as a ::FileSet, even if it is a Hyrax::FileSet. Re-cast it back to | |
| # prevent method errors and nil objects later | |
| if @file_set.class == ::FileSet | |
| # We can tell if a Hyrax::FileSet was improperly cast because this AF method will | |
| # return nil since its parent is not a ActiveFedora work. | |
| @file_set = @file_set.valkyrie_resource if @file_set.parent&.id.nil? | |
| end | |
| end | |
| before_action :cast_file_set | |
| def cast_file_set | |
| # If Hyrax.config.file_set_class is set to ::FileSet, the load above will force-cast | |
| # the instance as a ::FileSet, even if it is a Hyrax::FileSet. Re-cast it back to | |
| # prevent method errors and nil objects later | |
| if @file_set.class == ::FileSet | |
| # We can tell if a Hyrax::FileSet was improperly cast because this AF method will | |
| # return nil since its parent is not a ActiveFedora work. | |
| @file_set = @file_set.valkyrie_resource if @file_set.parent&.id.nil? | |
| end | |
| end |
Move this to a method to allow easier overriding?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #7001
In the dassie test app, the value of
Hyrax.config.fileis set to be::FileSet. This unintentionally causes all FileSets to be force-cast back to a ActiveFedora FileSet in theFileSetsController, even if they should be a ValkyrieHyrax::FileSetresource. That's because the class name passed toload_and_authorize_resourceuses that config value.The value of
Hyrax.config.fileneeds to be left at::FileSetfor AF models to work, so this PR adds a conditional check in abefore_actionto see if it should cast a FileSet back with.valkyrie_resource. Otherwise, nothing in the FileSetsController will work (i.e. versions, etc.)