diff --git a/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiPageContainerHelper.java b/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiPageContainerHelper.java index 7830c6ff..e66d04ca 100644 --- a/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiPageContainerHelper.java +++ b/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiPageContainerHelper.java @@ -278,6 +278,9 @@ public static MaskEntry getMaskForView(PageDefinition pageDefinition, Integer co Set inputs = new HashSet<>(); collectVisualElementsMatchingCondition(container, (VisualElement element) -> element instanceof AttributeBased, inputs); + Set buttons = new HashSet<>(); + collectVisualElementsMatchingCondition(container, (VisualElement element) -> element instanceof Button, buttons); + Set attributeNames = inputs.stream().map(i -> ((AttributeBased) i)).map(i -> i.getAttributeType().getName()).collect(Collectors.toSet()); attributeNames.addAll(container.getAdditionalMaskAttributes().stream().map(NamedElement::getName).collect(Collectors.toSet())); @@ -287,6 +290,11 @@ public static MaskEntry getMaskForView(PageDefinition pageDefinition, Integer co attributeNames.addAll(AllVisualElements.stream().filter(e -> e.getHiddenBy() != null).map(i -> i.getHiddenBy().getName()).collect(Collectors.toSet())); attributeNames.addAll(AllVisualElements.stream().filter(e -> e.getEnabledBy() != null).map(i -> i.getEnabledBy().getName()).collect(Collectors.toSet())); attributeNames.addAll(AllVisualElements.stream().filter(e -> e.getRequiredBy() != null).map(i -> i.getRequiredBy().getName()).collect(Collectors.toSet())); + attributeNames.addAll(buttons.stream() + .map(v -> (Button) v) + .filter(e -> e.getConfirmation() != null && e.getConfirmation().getConfirmationCondition() != null) + .map(i -> i.getConfirmation().getConfirmationCondition().getName()).collect(Collectors.toSet()) + ); if (container.getTitleFrom() != null && container.getTitleFrom().equals(TitleFrom.ATTRIBUTE)) { attributeNames.add(container.getTitleAttribute().getName());