Merge branch 'FORMS-18927-AllowNewMIMETypesAndExtensions' of https://github.com/adobe/aem-core-forms-components into FORMS-18927-AllowNewMIMETypesAndExtensions

Author: rajatkhurana-adobe

it/apps/src/main/content/jcr_root/apps/forms-core-components-it/clientlibs/clientlib-it-custom-function/js/functions.js

@@ -250,10 +250,12 @@ function clearValueCustomFunction(field, globals) {
  * @param {scope} globals
  */
 function customMessageUsingInvalidApi(field, globals) {
-    const minLength = 15;
+    const minLength = field.$minLength;
     const comments = field.$value.trim();
+    // api to get the error message for a particular constraint
+    const ootbErrrorMessage = field.getErrorMessage("minLength");
     if (comments.length < minLength) {
-        globals.functions.setProperty(field, {valid: false, errorMessage : "Comments must be at least 15 characters long."});
+        globals.functions.setProperty(field, {valid: false, errorMessage : `Comments must be at least ${minLength} characters long.`});
     } else {
         globals.functions.setProperty(field, {valid : true});
     }

it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/actions/submit/validate/.content.xml

@@ -30,6 +30,7 @@
                     jcr:lastModified="{Date}2024-08-12T10:50:30.221Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
+                    minLength = "15"
                     jcr:title="Text Input"
                     required="true"
                     sling:resourceType="forms-components-examples/components/form/textinput"

ui.frontend/package-lock.json

@@ -25,9 +25,9 @@
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "@aemforms/af-core": "^0.22.117",
+    "@aemforms/af-core": "^0.22.118",
     "@aemforms/af-core-xfa": "^0.1.6",
-    "@aemforms/af-formatters": "^0.22.114",
+    "@aemforms/af-formatters": "^0.22.118",
     "@aemforms/af-custom-functions": "1.0.14"
   }
 }

ui.frontend/package.json

@@ -38,30 +38,34 @@ describe('Page - Authoring', function () {
     const testTitleEditDialog = function (titleEditPathSelector, titleDrop, isSites) {
         if (isSites) {
             dropTitleInSites();
+            cy.wait(500);
             cy.get(sitesSelectors.overlays.overlay.component + titleEditPathSelector)
                 .should('be.visible')
                 .first()
-                .then($el => {
-                    cy.wrap($el).click();
-                    cy.invokeEditableAction("[data-action='CONFIGURE']");
-                    cy.get('.cq-dialog-cancel').should('be.visible').click();
-                    cy.deleteComponentByPath(titleDrop);
-                });
+                .as('titleElement');
+            
+            cy.get('@titleElement').should('exist').should('be.visible');
+            cy.get('@titleElement').click({force: true});
+            cy.invokeEditableAction("[data-action='CONFIGURE']");
+            cy.get('.cq-dialog-cancel').should('be.visible').click();
+            cy.deleteComponentByPath(titleDrop);
         } else {
             dropTitleInContainer();
+            cy.wait(500);
             cy.get(sitesSelectors.overlays.overlay.component + titleEditPathSelector)
                 .should('be.visible')
                 .first()
-                .then($el => {
-                    cy.wrap($el).click();
-                    cy.invokeEditableAction("[data-action='CONFIGURE']");
-                    cy.get('.cq-dialog-cancel').should('be.visible').click();
-                    cy.get('[data-path^="/content/forms/af/core-components-it/blank/jcr:content/guideContainer/title_"]')
-                        .should('exist')
-                        .invoke('attr', 'data-path')
-                        .then(dataPath => {
-                            cy.deleteComponentByPath(dataPath);
-                        });
+                .as('titleElement');
+            
+            cy.get('@titleElement').should('exist').should('be.visible');
+            cy.get('@titleElement').click({force: true});
+            cy.invokeEditableAction("[data-action='CONFIGURE']");
+            cy.get('.cq-dialog-cancel').should('be.visible').click();
+            cy.get('[data-path^="/content/forms/af/core-components-it/blank/jcr:content/guideContainer/title_"]')
+                .should('exist')
+                .invoke('attr', 'data-path')
+                .then(dataPath => {
+                    cy.deleteComponentByPath(dataPath);
                 });
         }
     }