From 13a206b2ef0fded2c7a4609430e26a1d94033941 Mon Sep 17 00:00:00 2001 From: Akshay Vasishth Date: Wed, 22 Jul 2026 18:10:09 +0530 Subject: [PATCH 1/3] FORMS-26630: Add show as popup property in guidecontainer model json --- .../internal/models/v1/form/TermsAndConditionsImpl.java | 2 ++ .../form/termsandconditions/exporter-termsandconditions.json | 1 + .../exporter-termsandconditionsNoWrapData.json | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java index ba467f2eab..f79712e28e 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java @@ -46,6 +46,7 @@ public class TermsAndConditionsImpl extends PanelImpl implements TermsAndConditions { private static final String CUSTOM_TNC_PROPERTY = "fd:tnc"; + private static final String SHOW_AS_POPUP_PROPERTY = "fd:showAsPopup"; @JsonIgnore @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_SHOW_APPROVAL_OPTION) @@ -87,6 +88,7 @@ public boolean isShowAsPopup() { Map properties = super.getProperties(); if (resource.getValueMap().containsKey(CUSTOM_TNC_PROPERTY)) { properties.put(CUSTOM_TNC_PROPERTY, true); + properties.put(SHOW_AS_POPUP_PROPERTY, isShowAsPopup()); } return properties; } diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json index 135c166a6d..6f72c3d44e 100644 --- a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json +++ b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json @@ -6,6 +6,7 @@ "properties": { "fd:path": "/content/termsandconditions", "fd:tnc": true, + "fd:showAsPopup": true, "customProp": "customPropValue" }, "label": { diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json index 17ad1f88c1..41dfbd898a 100644 --- a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json +++ b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json @@ -4,7 +4,8 @@ "name": "termsandconditions1694159302516", "properties": { "fd:path": "/content/termsandconditionsNoWrapData", - "fd:tnc": true + "fd:tnc": true, + "fd:showAsPopup": true }, "label": { "value": "Terms And Conditions" From a55ff5c6fca25ebc288f3310439fbc025d637d86 Mon Sep 17 00:00:00 2001 From: Akshay Vasishth Date: Thu, 23 Jul 2026 14:46:24 +0530 Subject: [PATCH 2/3] FORMS-26630: Update show as popup test --- .../internal/models/v1/form/TermsAndConditionsImplTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java index 228abc2260..fcc80af614 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java @@ -105,6 +105,8 @@ public void testCustomFDProperty() { Map props = tnc.getProperties(); Assert.assertTrue(props.containsKey("fd:tnc")); Assert.assertTrue((Boolean) props.get("fd:tnc")); + Assert.assertTrue(props.containsKey("fd:showAsPopup")); + Assert.assertTrue((Boolean) props.get("fd:showAsPopup")); } From 8430493307d8540618aad7d5a71aa2ee04a05c4e Mon Sep 17 00:00:00 2001 From: Akshay Vasishth Date: Wed, 29 Jul 2026 16:08:21 +0530 Subject: [PATCH 3/3] FORMS-26630: Move popup key out from condition --- .../internal/models/v1/form/TermsAndConditionsImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java index f79712e28e..390b2b4107 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java @@ -88,8 +88,8 @@ public boolean isShowAsPopup() { Map properties = super.getProperties(); if (resource.getValueMap().containsKey(CUSTOM_TNC_PROPERTY)) { properties.put(CUSTOM_TNC_PROPERTY, true); - properties.put(SHOW_AS_POPUP_PROPERTY, isShowAsPopup()); } + properties.put(SHOW_AS_POPUP_PROPERTY, isShowAsPopup()); return properties; }