Merge pull request #1260 from adobe/dev-to-master-june6

rismehta · web-flow · commit 423270cc2a38 · 2024-06-06T19:27:14.000+05:30
Sync dev to master
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/page/.content.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/page/.content.xml
@@ -3,5 +3,5 @@
     jcr:description="Page Component for the Forms Components Library"
     jcr:primaryType="cq:Component"
     jcr:title="Page"
-    sling:resourceSuperType="core/fd/components/page/v1/page"
+    sling:resourceSuperType="core/fd/components/page/v2/page"
     componentGroup=".hidden"/>
diff --git a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
@@ -17,6 +17,7 @@
     "FT_FORMS-12052",
     "FT_FORMS-13209",
     "FT_FORMS-11581",
-    "FT_FORMS-14545"
+    "FT_FORMS-14545",
+    "FT_SITES-19631"
   ]
 }
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/numberinput/validation/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/numberinput/validation/.content.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+          jcr:primaryType="dam:Asset">
+    <jcr:content
+            jcr:lastModified="{Date}2023-01-30T15:58:14.439+05:30"
+            jcr:primaryType="dam:AssetContent"
+            sling:resourceType="fd/fm/af/render"
+            guide="1"
+            type="guide">
+        <metadata
+                fd:version="2.1"
+                jcr:primaryType="nt:unstructured"
+                allowedRenderFormat="HTML"
+                author="admin"
+                availableInMobileApp="{Boolean}false"
+                dorType="none"
+                formmodel="none"
+                hasCustomThumbnail="{Boolean}false"
+                themeRef="/libs/fd/af/themes/canvas"
+                title="Number Input Validation"/>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/numberinput/validation/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/numberinput/validation/.content.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+          jcr:primaryType="cq:Page">
+    <jcr:content
+            cq:deviceGroups="[mobile/groups/responsive]"
+            cq:lastModified="{Date}2024-03-15T11:49:56.500+05:30"
+            cq:lastModifiedBy="admin"
+            cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
+            jcr:language="en"
+            jcr:primaryType="cq:PageContent"
+            jcr:title="Number Input Validation"
+            sling:configRef="/conf/forms/core-components-it/samples/numberinput/basic/"
+            sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+                fd:version="2.1"
+                jcr:lastModified="{Date}2024-03-15T11:49:22.521+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="forms-components-examples/components/form/container"
+                clientLibRef="corecomponent.it.customfunction"
+                dorType="none"
+                fieldType="form"
+                schemaType="none"
+                textIsRich="true"
+                thankYouMessage="Thank you for submitting the form."
+                thankYouOption="page"
+                themeRef="/libs/fd/af/themes/canvas">
+            <numberinput1
+                    jcr:lastModified="{Date}2023-01-30T15:58:08.713+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Number Input 1"
+                    sling:resourceType="forms-components-examples/components/form/numberinput"
+                    enabled="{Boolean}true"
+                    fieldType="number-input"
+                    hideTitle="false"
+                    mandatoryMessage="This is required numberinput"
+                    name="numberinput1"
+                    readOnly="{Boolean}false"
+                    required="true"
+                    type="number"
+                    visible="{Boolean}true"/>
+            <numberinput2
+                    jcr:lastModified="{Date}2023-01-30T15:58:08.713+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Number Input 2"
+                    sling:resourceType="forms-components-examples/components/form/numberinput"
+                    enabled="{Boolean}true"
+                    fieldType="number-input"
+                    hideTitle="false"
+                    mandatoryMessage="This is required integer numberinput"
+                    name="numberinput2"
+                    readOnly="{Boolean}false"
+                    required="true"
+                    type="integer"
+                    visible="{Boolean}true"/>
+            <numberinput3
+                    jcr:lastModified="{Date}2023-01-30T15:58:08.713+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Number Input 3"
+                    sling:resourceType="forms-components-examples/components/form/numberinput"
+                    default="10"
+                    enabled="{Boolean}true"
+                    fieldType="number-input"
+                    hideTitle="false"
+                    mandatoryMessage="mandatory message!!!"
+                    name="numberinput3"
+                    readOnly="{Boolean}false"
+                    required="true"
+                    type="integer"
+                    visible="{Boolean}true"/>
+            <submit
+                    jcr:lastModified="{Date}2023-06-22T17:28:46.456+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Submit"
+                    sling:resourceType="forms-components-examples/components/form/actions/submit"
+                    buttonType="submit"
+                    dorExclusion="true"
+                    fieldType="button"
+                    name="submit1687435309125">
+                <fd:rules
+                        fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button1667450213112&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button1667450213112&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SUBMIT_FORM&quot;\,&quot;items&quot;:[]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;submitForm()&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                        jcr:primaryType="nt:unstructured"/>
+                <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        click="[submitForm()]"/>
+            </submit>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/page/afv2/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/page/afv2/.content.xml
@@ -9,7 +9,8 @@
             jcr:language="en"
             jcr:primaryType="cq:PageContent"
             jcr:title="Page Edge Delivery"
-            sling:configRef="/conf/forms/afv2/"
+            sling:configRef="/conf/core-components-it/samples/customfunctionedgedelivery/"
+            cq:conf="/conf/core-components-it"
             sling:resourceType="core/fd/components/page/v2/page">
         <guideContainer
                 fd:version="2.1"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html
@@ -21,9 +21,9 @@
      data-sly-test.isEdgeDeliveryRequest="${formUtil.edgeDeliveryRequest}">
     <div>
         <div>
-      <pre>
-          <code>${formstructparser.formDefinition}</code>
-      </pre>
+            <pre>
+                <code>"${formstructparser.formDefinition @ context='jsonString'}"</code>
+            </pre>
         </div>
     </div>
 </div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/clientlibs/site/js/numberinputwidget.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/clientlibs/site/js/numberinputwidget.js
@@ -78,8 +78,7 @@
                  this.#regex = new RegExp(localeStr, "g");
                  this.#engRegex = new RegExp(engStr, "g");
              }
-             //initialise the model by the existing value entered in the widget (in case data was entered before initialisation)
-             this.#model.value = this.getValue(this.#widget.value);
+
              // change the input type to text for patterns
              this.#widget.setAttribute("type", "text");
              this.#attachEventHandlers(widget);
diff --git a/ui.tests/test-module/specs/numberinput/numberinput.runtime.spec.js b/ui.tests/test-module/specs/numberinput/numberinput.runtime.spec.js
@@ -251,6 +251,53 @@ describe("Form with Number Input", () => {
     });
 })
 
+describe("Form with Number Input Required Validation", () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/numberinput/validation.html";
+    let formContainer = null;
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        });
+    });
+
+    const validateRequiredMessage = (id, submitButton, errorMessage) => {
+        cy.get(`#${submitButton}`).find("button").click();
+        cy.get(`#${id}`).find("input").then(x => {
+            cy.get(`#${id}`).find(".cmp-adaptiveform-numberinput__errormessage").should('have.text',errorMessage);
+        });
+
+        cy.get(`#${id}`).find("input").clear().type("1234").blur().then(x => {
+            cy.get(`#${id}`).find(".cmp-adaptiveform-numberinput__errormessage").should('have.text',"");
+        });
+
+        cy.get(`#${id}`).find("input").clear().blur().then(x => {
+            cy.get(`#${id}`).find(".cmp-adaptiveform-numberinput__errormessage").should('have.text',errorMessage);
+        });
+    }
+
+
+    it("integer type validation for required field", () => {
+        const [numberInput1] = Object.entries(formContainer._fields)[0];
+        const [numberInput2] = Object.entries(formContainer._fields)[1];
+        const [submitbutton] = Object.entries(formContainer._fields)[3];
+        validateRequiredMessage(numberInput1, submitbutton, "This is required numberinput");
+        validateRequiredMessage(numberInput2, submitbutton, "This is required integer numberinput");
+    });
+
+    it("check value entered before model initialization", () => {
+        const [numberInput3, numberInput3FieldView] = Object.entries(formContainer._fields)[2];
+        const input = "1212";
+        let model = numberInput3FieldView.getModel();
+        expect(Number(model.getState().value)).to.equal(Number(10));
+
+        cy.get(`#${numberInput3}`).find("input").clear().type(input).blur().then(x => {
+            expect(Number(model.getState().value)).to.equal(Number(input));
+        })
+    });
+})
+
 describe("Form with number input and language", () => {
     const pagePath = "content/forms/af/core-components-it/samples/numberinput/basic.html"
     const bemBlock = 'cmp-adaptiveform-numberinput'
diff --git a/ui.tests/test-module/specs/page/pagev2.runtime.spec.js b/ui.tests/test-module/specs/page/pagev2.runtime.spec.js
@@ -30,3 +30,23 @@ describe("Form with Page component version 2", () => {
         cy.get("html body main form").should("exist");
     })
 })
+
+describe("Form with Page component version 2 for eds rendering", () => {
+    const pagePath = "/bin/franklin.delivery/adobe-rnd/aem-boilerplate-forms/main/content/forms/af/core-components-it/samples/page/afv2.html"
+    beforeEach(() => {
+        cy.openPage(pagePath);
+    });
+
+    it(" form should get rendered with main tag in body and should have pre code tags ", () => {
+        cy.get("html body main div div div pre code").should("exist");
+        cy.get("html body main div div div pre code").then(($codeEle)=>{
+            const encodedJson=$codeEle.get()[0].innerHTML;
+            const formJson=JSON.parse(JSON.parse(encodedJson));
+            expect(formJson).to.have.property("id");
+            expect(formJson).to.have.property("fieldType");
+            expect(formJson).to.have.property(":items");
+            expect(formJson).to.have.property("title");
+
+        })
+    })
+})
diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.spec.js b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.spec.js
@@ -17,7 +17,6 @@ import 'cypress-wait-until';
 
 describe("Form Runtime with Recaptcha Input", () => {
 
-    const FT_CLOUD_CONFIG_PROVIDER = "FT_FORMS-8771";
     const pagePath = "content/forms/af/core-components-it/samples/recaptcha/basic.html"
     const enterprisePagePath = "content/forms/af/core-components-it/samples/recaptcha/enterprisescore.html"
     const bemBlock = 'cmp-adaptiveform-recaptcha'
@@ -28,16 +27,6 @@ describe("Form Runtime with Recaptcha Input", () => {
 
     let formContainer = null
 
-    let toggle_array = [];
-
-    before(() => {
-        cy.fetchFeatureToggles().then((response) => {
-            if (response.status === 200) {
-                toggle_array = response.body.enabled;
-            }
-        });
-    });
-
     // Whitelist the error message
     cy.on('uncaught:exception', (err) => {
         // when we render form with captcha, and FT is not enabled, this error is expected
@@ -73,44 +62,38 @@ describe("Form Runtime with Recaptcha Input", () => {
         })
     }
 
-    if (toggle_array.includes(FT_CLOUD_CONFIG_PROVIDER)) {
-        it(" should get model and view initialized properly ", () => {
-            expect(formContainer, "formcontainer is initialized").to.not.be.null;
-            expect(formContainer._model.items.length, "model and view elements match").to.equal(Object.keys(formContainer._fields).length);
-            Object.entries(formContainer._fields).forEach(([id, field]) => {
-                expect(field.getId()).to.equal(id)
-                expect(formContainer._model.getElement(id), `model and view are in sync`).to.equal(field.getModel())
-            });
-        })
-
-        it(" model's changes are reflected in the html ", () => {
-            const [id, fieldView] = Object.entries(formContainer._fields)[0]
-            const model = formContainer._model.getElement(id)
-            cy.get('#' + id + ' .cmp-adaptiveform-recaptcha__widget > div.g-recaptcha').should('exist');
-
-            checkHTML(model.id, model.getState()).then(() => {
-                model.visible = false
-                return checkHTML(model.id, model.getState())
-            }).then(() => {
-                model.enable = false
-                return checkHTML(model.id, model.getState())
-            })
+    it(" should get model and view initialized properly ", () => {
+        expect(formContainer, "formcontainer is initialized").to.not.be.null;
+        expect(formContainer._model.items.length, "model and view elements match").to.equal(Object.keys(formContainer._fields).length);
+        Object.entries(formContainer._fields).forEach(([id, field]) => {
+            expect(field.getId()).to.equal(id)
+            expect(formContainer._model.getElement(id), `model and view are in sync`).to.equal(field.getModel())
         });
+    })
 
-        it(" html changes are reflected in model ", () => {
-            const [id, fieldView] = Object.entries(formContainer._fields)[0]
-            const model = formContainer._model.getElement(id)
+    it(" model's changes are reflected in the html ", () => {
+        const [id, fieldView] = Object.entries(formContainer._fields)[0]
+        const model = formContainer._model.getElement(id)
+        cy.get('#' + id + ' .cmp-adaptiveform-recaptcha__widget > div.g-recaptcha').should('exist');
+
+        checkHTML(model.id, model.getState()).then(() => {
+            model.visible = false
+            return checkHTML(model.id, model.getState())
+        }).then(() => {
+            model.enable = false
+            return checkHTML(model.id, model.getState())
+        })
+    });
+
+    it(" html changes are reflected in model ", () => {
+        const [id, fieldView] = Object.entries(formContainer._fields)[0]
+        const model = formContainer._model.getElement(id)
+        cy.log(model.getState().value)
+        cy.get(`#${id}`).click().then(x => {
             cy.log(model.getState().value)
-            cy.get(`#${id}`).click().then(x => {
-                cy.log(model.getState().value)
-                expect(model.getState().value).to.not.be.null
-            })
-        });
-    } else {
-        it('Feature toggle of captcha is disabled, skipping tests', () => {
-            cy.log('Tests were skipped because the feature toggle of captcha is disabled');
-        });
-    }
+            expect(model.getState().value).to.not.be.null
+        })
+    });
 
     it("decoration element should not have same class name", () => {
         expect(formContainer, "formcontainer is initialized").to.not.be.null;

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`"FT_FORMS-12052",`
`18`	`18`	`"FT_FORMS-13209",`
`19`	`19`	`"FT_FORMS-11581",`
`20`		`- "FT_FORMS-14545"`
	`20`	`+ "FT_FORMS-14545",`
	`21`	`+ "FT_SITES-19631"`
`21`	`22`	`]`
`22`	`23`	`}`