Enable editing Valkyrie resources with children #5516
Merged
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
eliotjordan
force-pushed
the
5461-parent-editing
branch
2 times, most recently
from
d71a84b
to
c30b4d3
Compare
eliotjordan
changed the title
eliotjordan
force-pushed
the
5461-parent-editing
branch
3 times, most recently
from
b2ba588
to
152c094
Compare
eliotjordan
changed the title
elrayle
requested changes
Mar 15, 2022
| describe '#file_set_presenters' do | ||
| it 'is empty' do | ||
| expect(factory.file_set_presenters.to_a).to be_empty | ||
| context 'with ActiveFedora index adapter' do |
There was a problem hiding this comment.
Good to see this tested with both AF and Valkyrie.
cjcolvar
reviewed
Mar 15, 2022
eliotjordan
force-pushed
the
5461-parent-editing
branch
from
152c094
to
00700c6
Compare
cjcolvar
requested changes
Mar 15, 2022
eliotjordan
force-pushed
the
5461-parent-editing
branch
from
00700c6
to
4758791
Compare
cjcolvar
reviewed
Mar 15, 2022
eliotjordan
force-pushed
the
5461-parent-editing
branch
from
4758791
to
d754171
Compare
cjcolvar
previously approved these changes
Mar 15, 2022
elrayle
reviewed
Mar 15, 2022
elrayle
requested changes
Mar 15, 2022
eliotjordan
force-pushed
the
5461-parent-editing
branch
from
d754171
to
38ff5ac
Compare
elrayle
reviewed
Mar 15, 2022
| @@ -30,6 +30,7 @@ def generate_solr_document # rubocop:disable Metrics/AbcSize, Metrics/MethodLeng | |||
| solr_doc['original_checksum_tesim'] = object.original_checksum | |||
| solr_doc['alpha_channels_ssi'] = object.alpha_channels | |||
| solr_doc['original_file_id_ssi'] = original_file_id | |||
| solr_doc['generic_type_si'] = 'FileSet' | |||
There was a problem hiding this comment.
The generic_type field is used in PcdmMemberPresenterFactory. This is called from:
Hyrax::WorkShowPresenter #member_presenter_factorywhich only calls it forValkyrie::ResourceHyrax::WorkFormHelper #form_file_set_select_for(parent:)which is called from several views.- select representative_id in _form_representative.html.erb
- select rendering_ids in _form_rendering.html.erb
- select thumbnail_id in _form_thumbnail.html.erb
There was a problem hiding this comment.
I tested with Main and with this PR's branch. The behavior for GenericWork is the same for both branches. GenericWork uses a different member_presenter_factory that does not depend on generic_type_si, so the addition of this index field has no impact on non-valkyrie works.
elrayle
approved these changes
Mar 16, 2022
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.
Closes #5462
Closes #5447
Adds work-around for two issues:
main_apphelper.has_model_ssim: FileSetin ActiveFedora and withhas_model_ssim: Hyrax::FileSetwith the Valkyrie solr adapter.