Closes #2788: Dataset metadata conditional rendering#2807
Merged
Conversation
lbownik
approved these changes
May 30, 2025
diasf
reviewed
May 30, 2025
added 4 commits
May 30, 2025 14:49
… ajax disable property to block events
…onditional rendering
diasf
reviewed
Jun 3, 2025
| } | ||
|
|
||
| public boolean hasChangeListener(DatasetField datasetField) { | ||
| return this.conditionalRendering != null && this.conditionalRendering.controlledBy(datasetField); |
Collaborator
There was a problem hiding this comment.
Now that we have inputRenderersByFieldType, couldn't we detect listeners automatically?
|
|
||
| for (DatasetField sibling : siblingsFields) { | ||
| InputFieldRenderer renderer = inputRenderersByFieldType.get(sibling.getDatasetFieldType()); | ||
| if (renderer.getConditionalRendering().isDefined()) { |
Collaborator
There was a problem hiding this comment.
I guess all siblings should have a renderer, but there being different filters in edit/create modes, I would still check for non-null.
diasf
approved these changes
Jun 4, 2025
diasf
left a comment
diasf
left a comment
Collaborator
There was a problem hiding this comment.
Looks good 👍 But please check that hasChangeListener is correct when taking the first best sibling before merging.
|
|
||
| public boolean hasChangeListener(DatasetField vocabDatasetField, Map<DatasetFieldType, InputFieldRenderer> inputRenderersByFieldType) { | ||
| Optional<DatasetField> siblingField = vocabDatasetField.getDatasetFieldParent() | ||
| .getOrElseThrow(() -> new NullPointerException("datasetfield with type: " + vocabDatasetField.getTypeName() |
Collaborator
There was a problem hiding this comment.
I guess we could just return false in this case.
| .getDatasetFieldsChildren() | ||
| .stream() | ||
| .filter(df -> !df.getDatasetFieldType().getName().equals(vocabDatasetField.getDatasetFieldType().getName())) | ||
| .findFirst(); |
Collaborator
There was a problem hiding this comment.
Why only the first sibling? Couldn't it be any of the siblings? I think you could also combine it into one chain. Something like:
public boolean hasChangeListener(DatasetField vocabDatasetField, Map<DatasetFieldType, InputFieldRenderer> inputRenderersByFieldType) {
String typeName = vocabDatasetField.getDatasetFieldType().getName();
return vocabDatasetField
.getDatasetFieldParent()
.map(parent ->
parent.getDatasetFieldsChildren().stream()
.filter(df -> !df.getDatasetFieldType().getName().equals(typeName))
.map(df -> inputRenderersByFieldType.get(df.getDatasetFieldType()))
.anyMatch(renderer -> hasConditionalRenderingFor(typeName, renderer)))
.getOrElse(false);
}
private boolean hasConditionalRenderingFor(String fieldTypeName, InputFieldRenderer renderer) {
return Option.of(renderer)
.flatMap(InputFieldRenderer::getConditionalRendering)
.map(cr -> cr.getDatasetFieldName().equals(fieldTypeName))
.getOrElse(false);
}Just for inspiration, don't assume correctness 😅
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.