Add Show Popup property under custom property

Author: Pavitra Khatri

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java

@@ -162,6 +162,7 @@ private ReservedProperties() {
     public static final String FD_ENABLE_AUTO_SAVE = "fd:enableAutoSave";
     public static final String FD_AUTO_SAVE_STRATEGY_TYPE = "fd:autoSaveStrategyType";
     public static final String FD_AUTO_SAVE_INTERVAL = "fd:autoSaveInterval";
+    public static final String FD_PN_SHOW_AS_POPUP = "fd:showAsPopup";
     private static final Set<String> reservedProperties = aggregateReservedProperties();
 
     private static Set<String> aggregateReservedProperties() {

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java

@@ -87,6 +87,7 @@ public boolean isShowAsPopup() {
         Map<String, Object> properties = super.getProperties();
         if (resource.getValueMap().containsKey(CUSTOM_TNC_PROPERTY)) {
             properties.put(CUSTOM_TNC_PROPERTY, true);
+            properties.put(ReservedProperties.FD_PN_SHOW_AS_POPUP, isShowAsPopup());
         }
         return properties;
     }

bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java

@@ -95,7 +95,6 @@ void testExportedType() throws Exception {
     public void testGetProperties() {
         TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_TNC, TermsAndConditions.class, context);
         Assert.assertTrue(tnc.isShowApprovalOption());
-        Assert.assertTrue(tnc.isShowAsPopup());
         Assert.assertFalse(tnc.isShowLink());
     }
 
@@ -105,6 +104,7 @@ public void testCustomFDProperty() {
         Map<String, Object> props = tnc.getProperties();
         Assert.assertTrue(props.containsKey("fd:tnc"));
         Assert.assertTrue((Boolean) props.get("fd:tnc"));
+        Assert.assertFalse((Boolean) props.get("fd:showAsPopup"));
 
     }
 

bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json

@@ -11,6 +11,7 @@
     },
     "fd:path": "/content/termsandconditions",
     "fd:tnc": true,
+    "fd:showAsPopup": false,
     "customProp": "customPropValue"
   },
   "label": {

bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json

@@ -9,7 +9,8 @@
       "dorExcludeDescription": false
     },
     "fd:path": "/content/termsandconditionsNoWrapData",
-    "fd:tnc": true
+    "fd:tnc": true,
+    "fd:showAsPopup": true
   },
   "label": {
     "value": "Terms And Conditions"

bundles/af-core/src/test/resources/form/termsandconditions/test-content.json

@@ -3,7 +3,7 @@
     "showApprovalOption": true,
     "jcr:title": "Terms And Conditions",
     "fd:tnc": true,
-    "showAsPopup": true,
+    "showAsPopup": false,
     "name": "termsandconditions1694159302516",
     "sling:resourceType": "core/fd/components/form/termsandconditions/v1/termsandconditions",
     "wrapData": true,