Skip to content

Preserve unset Boolean values in console and enduser forms #1580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ilgrosso merged 3 commits into from
Oct 22, 2026
+875 −522
Merged

Preserve unset Boolean values in console and enduser forms #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2c865d
Preserve unset Boolean values in console and enduser forms
TatoniMatteo Oct 20, 2026
04f0577
Replaced `AjaxCheckboxPanel` with `TripleStateButtonPanel` throughout…
TatoniMatteo Oct 21, 2026
f7952cf
Resolve comment
TatoniMatteo Oct 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 75 additions & 58 deletions ...rc/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
import org.apache.syncope.client.console.wicket.markup.html.form.PolicyRenderer;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.ajax.form.IndicatorAjaxFormComponentUpdatingBehavior;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxNumberFieldPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxPalettePanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTripleStateButtonPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.BinaryFieldPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.MultiFieldPanel;
import org.apache.syncope.client.ui.commons.pages.BaseWebPage;
Expand Down Expand Up @@ -318,16 +318,18 @@ protected void onUpdate(final AjaxRequestTarget target) {
"field", "idTokenIssuer", new PropertyModel<>(clientAppTO, "idTokenIssuer"), false);
fields.add(idTokenIssuer);

AjaxCheckBoxPanel signIdToken = new AjaxCheckBoxPanel(
AjaxTripleStateButtonPanel signIdToken = new AjaxTripleStateButtonPanel(
"field", "signIdToken", new PropertyModel<>(clientAppTO, "signIdToken"));
signIdToken.addRequiredLabel();
fields.add(signIdToken);
AjaxDropDownChoicePanel<OIDCTokenSigningAlg> idTokenSigningAlg = new AjaxDropDownChoicePanel<>(
"field", "idTokenSigningAlg", new PropertyModel<>(clientAppTO, "idTokenSigningAlg"), false);
idTokenSigningAlg.setChoices(List.of(OIDCTokenSigningAlg.values()));
fields.add(idTokenSigningAlg.addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
"field", "encryptIdToken", new PropertyModel<>(clientAppTO, "encryptIdToken")));
fields.add(new AjaxTripleStateButtonPanel(
"field", "encryptIdToken", new PropertyModel<>(clientAppTO, "encryptIdToken")).
addRequiredLabel());
AjaxDropDownChoicePanel<OIDCTokenEncryptionAlg> idTokenEncryptionAlg =
new AjaxDropDownChoicePanel<>(
"field",
Expand Down Expand Up @@ -369,12 +371,15 @@ protected void onUpdate(final AjaxRequestTarget target) {
userInfoEncryptedResponseEncoding.setChoices(List.of(OIDCTokenEncryptionEncoding.values()));
fields.add(userInfoEncryptedResponseEncoding);

fields.add(new AjaxCheckBoxPanel(
"field", "jwtAccessToken", new PropertyModel<>(clientAppTO, "jwtAccessToken")));
fields.add(new AjaxCheckBoxPanel(
"field", "bypassApprovalPrompt", new PropertyModel<>(clientAppTO, "bypassApprovalPrompt")));
fields.add(new AjaxCheckBoxPanel(
"field", "generateRefreshToken", new PropertyModel<>(clientAppTO, "generateRefreshToken")));
fields.add(new AjaxTripleStateButtonPanel(
"field", "jwtAccessToken", new PropertyModel<>(clientAppTO, "jwtAccessToken")).
addRequiredLabel());
fields.add(new AjaxTripleStateButtonPanel(
"field", "bypassApprovalPrompt", new PropertyModel<>(clientAppTO, "bypassApprovalPrompt")).
addRequiredLabel());
fields.add(new AjaxTripleStateButtonPanel(
"field", "generateRefreshToken", new PropertyModel<>(clientAppTO, "generateRefreshToken")).
addRequiredLabel());

AjaxDropDownChoicePanel<OIDCSubjectType> subjectType = new AjaxDropDownChoicePanel<>(
"field", "subjectType", new PropertyModel<>(clientAppTO, "subjectType"), false);
Expand Down Expand Up @@ -553,97 +558,109 @@ public String getObject() {
logoutResponseBinding.setChoices(List.of(SAML2BindingType.values()));
fields.add(logoutResponseBinding);

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "logoutResponseEnabled",
new PropertyModel<>(clientAppTO, "logoutResponseEnabled")));
new PropertyModel<>(clientAppTO, "logoutResponseEnabled")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "requireSignedRoot",
new PropertyModel<>(clientAppTO, "requireSignedRoot")));
new PropertyModel<>(clientAppTO, "requireSignedRoot")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
"field", "signAssertions", new PropertyModel<>(clientAppTO, "signAssertions")));
fields.add(new AjaxTripleStateButtonPanel(
"field", "signAssertions", new PropertyModel<>(clientAppTO, "signAssertions")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
"field", "signResponses", new PropertyModel<>(clientAppTO, "signResponses")));
fields.add(new AjaxTripleStateButtonPanel(
"field", "signResponses", new PropertyModel<>(clientAppTO, "signResponses")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
"field", "encryptionOptional", new PropertyModel<>(clientAppTO, "encryptionOptional")));
fields.add(new AjaxTripleStateButtonPanel(
"field", "encryptionOptional", new PropertyModel<>(clientAppTO, "encryptionOptional")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
"field", "encryptAssertions", new PropertyModel<>(clientAppTO, "encryptAssertions")));
fields.add(new AjaxTripleStateButtonPanel(
"field", "encryptAssertions", new PropertyModel<>(clientAppTO, "encryptAssertions")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "encryptAttributes",
new PropertyModel<>(clientAppTO, "encryptAttributes")));
new PropertyModel<>(clientAppTO, "encryptAttributes")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingAssertionNameId",
new PropertyModel<>(clientAppTO, "skipGeneratingAssertionNameId")));
new PropertyModel<>(clientAppTO, "skipGeneratingAssertionNameId")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingSubjectConfirmationInResponseTo",
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationInResponseTo")));
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationInResponseTo")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingResponseInResponseTo",
new PropertyModel<>(clientAppTO, "skipGeneratingResponseInResponseTo")));
new PropertyModel<>(clientAppTO, "skipGeneratingResponseInResponseTo")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingSubjectConfirmationNotOnOrAfter",
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationNotOnOrAfter")));
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationNotOnOrAfter")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingSubjectConfirmationRecipient",
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationRecipient")));
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationRecipient")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingSubjectConfirmationRecipient",
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationRecipient")));
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationRecipient")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingSubjectConfirmationAddress",
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationAddress")));
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationAddress")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingSubjectConfirmationNotBefore",
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationNotBefore")));
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationNotBefore")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingSubjectConfirmationNameId",
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationNameId")));
new PropertyModel<>(clientAppTO, "skipGeneratingSubjectConfirmationNameId")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingNameIdQualifiers",
new PropertyModel<>(clientAppTO, "skipGeneratingNameIdQualifiers")));
new PropertyModel<>(clientAppTO, "skipGeneratingNameIdQualifiers")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingTransientNameId",
new PropertyModel<>(clientAppTO, "skipGeneratingTransientNameId")));
new PropertyModel<>(clientAppTO, "skipGeneratingTransientNameId")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipValidatingAuthnRequest",
new PropertyModel<>(clientAppTO, "skipValidatingAuthnRequest")));
new PropertyModel<>(clientAppTO, "skipValidatingAuthnRequest")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingServiceProviderNameIdQualifier",
new PropertyModel<>(clientAppTO, "skipGeneratingServiceProviderNameIdQualifier")));
new PropertyModel<>(clientAppTO, "skipGeneratingServiceProviderNameIdQualifier")).
addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingAuthenticatingAuthority",
new PropertyModel<>(clientAppTO, "skipGeneratingAuthenticatingAuthority")));
new PropertyModel<>(clientAppTO, "skipGeneratingAuthenticatingAuthority")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingNameIdQualifier",
new PropertyModel<>(clientAppTO, "skipGeneratingNameIdQualifier")));
new PropertyModel<>(clientAppTO, "skipGeneratingNameIdQualifier")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "skipGeneratingSessionNotOnOrAfter",
new PropertyModel<>(clientAppTO, "skipGeneratingSessionNotOnOrAfter")));
new PropertyModel<>(clientAppTO, "skipGeneratingSessionNotOnOrAfter")).addRequiredLabel());

fields.add(new AjaxCheckBoxPanel(
fields.add(new AjaxTripleStateButtonPanel(
"field", "validateMetadataCertificates",
new PropertyModel<>(clientAppTO, "validateMetadataCertificates")));
new PropertyModel<>(clientAppTO, "validateMetadataCertificates")).addRequiredLabel());

fields.add(new AjaxTextFieldPanel(
"field", "requiredAuthenticationContextClass",
Expand Down
7 changes: 4 additions & 3 deletions ...onsole/src/main/java/org/apache/syncope/client/console/panels/SRARoutePredicatePanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTripleStateButtonPanel;
import org.apache.syncope.common.lib.types.SRARoutePredicate;
import org.apache.syncope.common.lib.types.SRARoutePredicateCond;
import org.apache.syncope.common.lib.types.SRARoutePredicateFactory;
Expand Down Expand Up @@ -76,8 +76,9 @@ protected String createRelAttribute() {
protected void populateItem(final ListItem<SRARoutePredicate> item) {
SRARoutePredicate predicate = item.getModelObject();

AjaxCheckBoxPanel negate =
new AjaxCheckBoxPanel("negate", "negate", new PropertyModel<>(predicate, "negate"));
AjaxTripleStateButtonPanel negate =
new AjaxTripleStateButtonPanel("negate", "negate", new PropertyModel<>(predicate, "negate"));
negate.setRequired(true);
item.add(negate.hideLabel());

AjaxDropDownChoicePanel<SRARoutePredicateFactory> factory =
Expand Down
7 changes: 4 additions & 3 deletions ...console/src/main/java/org/apache/syncope/client/console/panels/SRARouteWizardBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import org.apache.syncope.client.console.rest.SRARouteRestClient;
import org.apache.syncope.client.console.wizards.BaseAjaxWizardBuilder;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxNumberFieldPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTripleStateButtonPanel;
import org.apache.syncope.common.lib.to.SRARouteTO;
import org.apache.syncope.common.lib.types.SRARouteType;
import org.apache.wicket.PageReference;
Expand Down Expand Up @@ -129,7 +129,8 @@ public void setObject(final String object) {
type.addRequiredLabel().setEnabled(true);
add(type);

add(new AjaxCheckBoxPanel("logout", "logout", new PropertyModel<>(route, "logout")));
add(new AjaxTripleStateButtonPanel("logout", "logout", new PropertyModel<>(route, "logout")).
addRequiredLabel());

AjaxTextFieldPanel postLogout = new AjaxTextFieldPanel("postLogout", "postLogout", new IModel<>() {

Expand All @@ -152,7 +153,7 @@ public void setObject(final String object) {
postLogout.getField().add(new UrlValidator(new String[] { "http", "https" }));
add(postLogout);

add(new AjaxCheckBoxPanel("csrf", "csrf", new PropertyModel<>(route, "csrf")));
add(new AjaxTripleStateButtonPanel("csrf", "csrf", new PropertyModel<>(route, "csrf")).addRequiredLabel());

add(new AjaxNumberFieldPanel.Builder<Integer>().min(0).build(
"order", "order", Integer.class, new PropertyModel<>(route, "order")).
Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/org/apache/syncope/client/console/policies/AttrReleasePolicyModalPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
import org.apache.syncope.client.console.rest.PolicyRestClient;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxGridFieldPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxNumberFieldPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxPalettePanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTripleStateButtonPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.MultiFieldPanel;
import org.apache.syncope.client.ui.commons.pages.BaseWebPage;
import org.apache.syncope.common.lib.policy.AttrReleasePolicyTO;
Expand Down Expand Up @@ -114,11 +114,11 @@ public AttrReleasePolicyModalPanel(
mergingStrategy.setNullValid(false);
add(mergingStrategy);

add(new AjaxCheckBoxPanel(
add(new AjaxTripleStateButtonPanel(
"ignoreResolvedAttributes",
"ignoreResolvedAttributes",
new PropertyModel<>(model.getObject().getConf(), "principalAttrRepoConf.ignoreResolvedAttributes"),
false));
false).addRequiredLabel());

add(new AjaxNumberFieldPanel.Builder<Long>().build(
"expiration",
Expand Down
Loading
Loading