Skip to content

Update form layouts after project policy reset #116

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

Open
unity-idm-agent wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Update form layouts after project policy reset #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c59365
UY-XXXX update form layouts after policy reset
unity-idm-agent May 24, 2026
81a5ffc
Harden policy layout reset test
unity-idm-agent May 24, 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
3 changes: 3 additions & 0 deletions engine/src/main/java/pl/edu/icm/unity/engine/utils/GroupDelegationConfigGeneratorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import pl.edu.icm.unity.base.registration.EnquiryForm;
import pl.edu.icm.unity.base.registration.EnquiryFormBuilder;
import pl.edu.icm.unity.base.registration.EnquiryFormNotifications;
import pl.edu.icm.unity.base.registration.FormLayoutUtils;
import pl.edu.icm.unity.base.registration.FormType;
import pl.edu.icm.unity.base.registration.GroupRegistrationParam;
import pl.edu.icm.unity.base.registration.ParameterRetrievalSettings;
Expand Down Expand Up @@ -426,6 +427,7 @@ public void resetFormsPolicies(String formName, FormType formType, List<Long> pr
for (Long policyDocumentId : projectPolicyDocumentsIds) {
addPolicyParam(form.getPolicyAgreements(), policyDocumentId);
}
FormLayoutUtils.updateRegistrationFormLayout(form.getFormLayouts(), form);
regFormDB.update(form);
}
else if (formType.equals(FormType.ENQUIRY))
Expand All @@ -435,6 +437,7 @@ else if (formType.equals(FormType.ENQUIRY))
for (Long policyDocumentId : projectPolicyDocumentsIds) {
addPolicyParam(form.getPolicyAgreements(), policyDocumentId);
}
FormLayoutUtils.updateEnquiryLayout(form.getLayout(), form);
enqFormDB.update(form);
}

Expand Down
29 changes: 29 additions & 0 deletions engine/src/test/java/pl/edu/icm/unity/engine/project/TestGroupDelegationConfigGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.util.Arrays;
Expand Down Expand Up @@ -38,8 +39,12 @@
import pl.edu.icm.unity.base.registration.BaseFormNotifications;
import pl.edu.icm.unity.base.registration.EnquiryForm;
import pl.edu.icm.unity.base.registration.EnquiryFormBuilder;
import pl.edu.icm.unity.base.registration.FormType;
import pl.edu.icm.unity.base.registration.RegistrationForm;
import pl.edu.icm.unity.base.registration.RegistrationFormBuilder;
import pl.edu.icm.unity.base.registration.layout.FormLayout;
import pl.edu.icm.unity.base.registration.layout.FormLayoutElement;
import pl.edu.icm.unity.base.registration.layout.FormParameterElement;
import pl.edu.icm.unity.base.translation.TranslationProfile;
import pl.edu.icm.unity.base.translation.TranslationRule;
import pl.edu.icm.unity.engine.api.translation.form.TranslatedRegistrationRequest.AutomaticRequestAction;
Expand Down Expand Up @@ -244,6 +249,30 @@ public void shouldValidateUpdateEnquiryForm() throws EngineException
assertThat(errors.size()).isEqualTo(0);
}

@Test
public void shouldUpdateCustomEnquiryLayoutWhenProjectPoliciesAreReset() throws EngineException
{
when(mockPolicyDocumentDB.getByKey(2L)).thenReturn(new StoredPolicyDocument(2L, "Policy"));
EnquiryForm form = new EnquiryFormBuilder()
.withName("aenSuffix")
.withTargetGroups(new String[] { "/" })
.withType(EnquiryForm.EnquiryType.STICKY)
.withAddedGroupParam()
.withGroupPath("/A/?*/**")
.endGroupParam()
.withLayout(new FormLayout(List.of(new FormParameterElement(FormLayoutElement.GROUP, 0))))
.build();
when(mockEnqFormDB.get(eq("aenSuffix"))).thenReturn(form);

generator.resetFormsPolicies("aenSuffix", FormType.ENQUIRY, List.of(2L));

assertThat(form.getPolicyAgreements()).hasSize(1);
assertThat(form.getLayout().getElements()).containsExactly(
new FormParameterElement(FormLayoutElement.GROUP, 0),
new FormParameterElement(FormLayoutElement.POLICY_AGREEMENT, 0));
verify(mockEnqFormDB).update(form);
}

@Test
public void shouldThrowValidationErrorsWhenRegistrationFormIsIncorrect() throws EngineException
{
Expand Down