Fixing sling output mappings in aemform embed component (#1530)

* Fixing sling output mappings in aemform embed component

* Fixing sling output mappings in aemform embed component

Author: rismehta

bundles/core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/aemform/AEMFormImpl.java

@@ -279,6 +279,12 @@ public boolean isFormSelected() {
 
     @Override
     public String getThankyouPage() {
+        if (request != null && StringUtils.isNotBlank(thankyouPage)) {
+            ResourceResolver resourceResolver = request.getResourceResolver();
+            if (resourceResolver != null) {
+                thankyouPage = StringUtils.replace(resourceResolver.map(thankyouPage), "_jcr_content", "jcr:content");
+            }
+        }
         return GuideUtils.getRedirectUrl(thankyouPage, null);
     }
 

bundles/core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/aemform/AEMFormImplTest.java

@@ -41,8 +41,10 @@ class AEMFormImplTest {
     private static final String GRID_LANG = ROOT_PAGE_LANG + "/jcr:content/root/responsivegrid";
     private static final String FORM_1 = "/aemform-1";
     private static final String FORM_2 = "/aemform-2";
+    private static final String FORM_WITH_SLINGMAPPINGS = "/aemformv2_slingmappings";
     private static final String PATH_FORM_1 = GRID + FORM_1;
     private static final String PATH_FORM_2 = GRID + FORM_2;
+    private static final String PATH_FORM_SLINGMAPPINGS = GRID + FORM_WITH_SLINGMAPPINGS;
     private static final String PATH_FORM_LANG = GRID_LANG + FORM_1;
 
     private final AemContext context = FormsCoreComponentTestContext.newAemContext();
@@ -294,6 +296,16 @@ void testJSONExport() throws Exception {
         Utils.testJSONExport(aemform, Utils.getTestExporterJSONPath(BASE, PATH_FORM_1));
     }
 
+    @Test
+    void testGetThankYouPageWithResourceResolver() {
+        // Get form under test using test resource that has _jcr_content in thankyou page path
+        AEMForm aemForm = getAEMFormUnderTest(PATH_FORM_SLINGMAPPINGS);
+
+        // Test the method - verify _jcr_content replacement
+        String result = aemForm.getThankyouPage();
+        assertEquals("/content/jcr:content/thank/page.html", result);
+    }
+
     private AEMForm getAEMFormUnderTest(String resourcePath) {
         context.currentResource(resourcePath);
         MockSlingHttpServletRequest request = context.request();

bundles/core/src/test/resources/aemform/test-content.json

@@ -80,6 +80,12 @@
                         "useiframe" : "true",
                         "usePageLocale" : "true",
                         "enableFocusOnFirstField" : true
+                    },
+                    "aemformv2_slingmappings" : {
+                        "jcr:primaryType": "nt:unstructured",
+                        "jcr:title": "",
+                        "sling:resourceType": "core/fd/components/aemform/v1/aemform",
+                        "thankyouPage": "/content/_jcr_content/thank/page"
                     }
                 }
             }