FORMS-21841: fix rule-editor tests and update custom function extract… (#1718)

* FORMS-21841: fix rule-editor tests and update custom function extraction from rules at runtime

* FORMS-21841: fix rule-editor tests and update custom function extraction from rules at runtime

* FORMS-21841: fix rule-editor tests and update custom function extraction from rules at runtime

---------

Co-authored-by: Arun Kumar Attri <aattri@adobe.com>

Author: arunattri26

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

@@ -137,6 +137,22 @@ function formatEmailInput(field)
     return transformedEmail;
 }
 
+/**
+ * Validates email input
+ * @name validateEmailInput Validates email input
+ * @param {object} field field whose value to be validated
+ * @return {string}
+ */
+function validateEmailInput(field)
+{
+    var email = field.$value;
+    if (!email) {
+        return "false";
+    }
+    // Simple email regex pattern
+    var pattern = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return pattern.test(email) ? "true" : "false";
+}
 
 /**
  * Formats telephone input

it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json

@@ -23,9 +23,9 @@
     "FT_FORMS-14068",
     "FT_FORMS-16351",
     "FT_FORMS-14518",
-    "FT_FORMS-13519"
+    "FT_FORMS-13519",
+    "FT_FORMS-17107"
   ],
   "disabledToggles": [
-    "FT_FORMS-17107"
   ]
 }

it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/emailinput/basic/.content.xml

@@ -69,6 +69,7 @@
                     sling:resourceType="forms-components-examples/components/form/emailinput"
                     autocomplete="email"
                     displayValueExpression="formatEmailInput($field)"
+                    validationExpression="validateEmailInput($field) == 'true'"
                     enabled="{Boolean}true"
                     fieldType="email"
                     hideTitle="false"
@@ -80,6 +81,7 @@
                     visible="{Boolean}true">
                 <fd:rules
                         fd:format="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FORMAT_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;VALUE_FIELD&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.emailinput4&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;emailinput4&quot;}}\,{&quot;nodeName&quot;:&quot;Using&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;Expression&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;NUMBER_FORMAT_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;NUMBER_FORMAT_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;formatEmailInput&quot;\,&quot;displayName&quot;:&quot;Formats email input&quot;\,&quot;type&quot;:&quot;STRING&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;OBJECT|AFCOMPONENT&quot;\,&quot;name&quot;:&quot;field&quot;\,&quot;description&quot;:&quot;field whose value to be formatted&quot;}]\,&quot;impl&quot;:&quot;$0($1)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.emailinput4&quot;\,&quot;displayName&quot;:&quot;Email Input 4&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;displayPath&quot;:&quot;FORM/Email Input 4/&quot;\,&quot;name&quot;:&quot;emailinput4&quot;\,&quot;parent&quot;:&quot;$form&quot;}}}]}}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:&quot;formatEmailInput($field)&quot;\,&quot;eventName&quot;:&quot;Format&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                        fd:validate="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;VALIDATE_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.emailinput4&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;name&quot;:&quot;emailinput4&quot;}}\,{&quot;nodeName&quot;:&quot;Using&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;Expression&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPARISON_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.emailinput4&quot;\,&quot;displayName&quot;:&quot;Email Input 4&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;displayPath&quot;:&quot;FORM/Email Input 4/&quot;\,&quot;name&quot;:&quot;emailinput4&quot;\,&quot;parent&quot;:&quot;$form&quot;}}}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;true&quot;}}]}\,&quot;nested&quot;:false}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:&quot;validateEmailInput($field) == 'true'&quot;\,&quot;eventName&quot;:&quot;Validate&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
                         jcr:primaryType="nt:unstructured"
                         validationStatus="valid"/>
                 <fd:events jcr:primaryType="nt:unstructured"/>

ui.frontend/src/RuleUtils.js

@@ -116,6 +116,14 @@ class RuleUtils {
             if (!items) return;
 
             Object.values(items).forEach(item => {
+
+                if (item.validationExpression) {
+                    extractFunctionNamesFromRuleExpression(item.validationExpression);
+                }
+                if (item.displayValueExpression) {
+                    extractFunctionNamesFromRuleExpression(item.displayValueExpression);
+                }
+                
                 if (item.events) {
                     Object.values(item.events).forEach(eventArray => {
                         eventArray.forEach(eventString => {

ui.tests/test-module/libs/commons/guideSelectors.js

@@ -201,7 +201,8 @@ var selectors = {
             IS_CLICKED : "coral-selectlist [value='is clicked']",
             IS_SUBMITTED_SUCCESSFULLY : "coral-selectlist [value='is submitted successfully']",
             SUBMISSION_FAILS : "coral-selectlist [value='submission fails']",
-            NAVIGATE_TO : "coral-selectlist [value='NAVIGATE_TO']"
+            NAVIGATE_TO : "coral-selectlist [value='NAVIGATE_TO']",
+            NAVIGATE_IN_PANEL : "coral-selectlist [value='NAVIGATE_IN_PANEL']"
         }
     }
 };

ui.tests/test-module/specs/numberinput/numberinput.runtime.cy.js

@@ -67,8 +67,7 @@ describe("Form with Number Input", () => {
         });
     })
 
-    // @arun to uncomment this
-    it.skip(" model's changes are reflected in the html ", () => {
+    it(" model's changes are reflected in the html ", () => {
         Object.entries(formContainer._fields).forEach(([id, field]) => {
             let model = field.getModel();
             model.value = 24

ui.tests/test-module/specs/ruleeditor/authoring/navigatePanel.authoring.cy.js

@@ -3,8 +3,7 @@ const commons = require('../../../libs/commons/commons'),
     formsSelectors = require('../../../libs/commons/guideSelectors'),
     afConstants = require('../../../libs/commons/formsConstants');
 
-// @arun to uncomment this soon
-describe.skip('Rule editor navigate-in-panel rule authoring',function(){
+describe('Rule editor navigate-in-panel rule authoring',function(){
     let toggle_array = [];
 
     before(() => {
@@ -93,6 +92,14 @@ describe.skip('Rule editor navigate-in-panel rule authoring',function(){
         cy.getRuleEditorIframe().find(formsSelectors.ruleEditor.operator.IS_CLICKED).should("exist");
         cy.getRuleEditorIframe().find(formsSelectors.ruleEditor.operator.IS_CLICKED).click();
 
+        // delete else block if present
+        cy.getRuleEditorIframe().then($iframe => {
+            const $button = $iframe.find(".else-section-button > .delete-else-button");
+            if ($button.length) {
+              cy.wrap($button).click();
+            }
+        });
+
         // check and click on dropdown to view the actions available
         cy.getRuleEditorIframe().find(formsSelectors.ruleEditor.choiceModels.BLOCK_STATEMENT + " .choice-view-default").should("exist");
         cy.getRuleEditorIframe().find(formsSelectors.ruleEditor.choiceModels.BLOCK_STATEMENT + " .choice-view-default").click({multiple: true, force: true});