Merge branch 'LF-3413-cypress-tests' into 'master'

LF-3413 - Cypress tests for LF-3413, 3414, and 3415 changes in the Expression Editor

See merge request lfor/formbuilder!122

Author: wamorn

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This project follows [Semantic Versioning](http://semver.org/).
 
+## [10.3.8] 2025-09-26
+### Added
+- Added Cypress tests for form and item variables.
+
 ## [10.3.7] 2025-09-25
 ### Fixed
 - Lock in @ctrl/ngx-codemirror version to 7.0.0.

cypress/e2e/form-level/form-level.cy.ts

@@ -640,7 +640,7 @@ describe('Home page', () => {
           cy.get('#expression-editor-base-dialog').should('exist');
 
           // Variables section
-          cy.get('lhc-variables > h2').should('contain', 'Item Variables');
+          cy.get('lhc-variables > h2').should('contain', 'Form Variables');
           cy.get('#variables-section .variable-row').should('have.length', 0);
 
           // Add a new variable 'a_fhir_exp'
@@ -707,9 +707,70 @@ describe('Home page', () => {
         cy.get('@variable4').eq(1).should('have.text', 'Easy Path Expression');
         cy.get('@variable4').eq(2).should('have.text', "1");
       });
+
+      it('should not allow saving a form-level variable with a missing value and display validation error', () => {
+        // Click the 'Create/edit variables' button and add two new variables
+        cy.get('button#editVariables').click();
+        cy.get('lhc-expression-editor').shadow().within(() => {
+          cy.get('#expression-editor-base-dialog').should('exist');
+
+          // Variables section
+          cy.get('lhc-variables > h2').should('contain', 'Form Variables');
+          cy.get('#variables-section .variable-row').should('have.length', 0);
+          cy.get('lhc-variables div.no-variables').should('contain.text', 'There are currently no variables for this form.');
+
+          // Add a new variable 'a'
+          cy.get('#add-variable').click();
+          cy.get('#variables-section .variable-row').should('have.length', 1);
+          cy.get('#variable-label-0').clear().type('a');
+          cy.get('#variable-type-0').select('Easy Path Expression');
+          cy.get('input#simple-expression-0').type('10');
+
+          // Add a new variable 'b'
+          cy.get('#add-variable').click();
+          cy.get('#variables-section .variable-row').should('have.length', 2);
+          cy.get('#variable-label-1').clear().type('b');
+          cy.get('#variable-type-1').select('Easy Path Expression');
+          // Intentioanlly not filling the value
+
+          // Save (Export)
+          cy.get('#export').click();
+
+          // The validation should fail and display the error.
+          cy.get('input#simple-expression-1')
+            .should('have.class', 'field-error')
+            .should('have.class', 'ng-invalid');
+
+          // Check for error message in lhc-question with ng-reflect-index="1"
+          cy.get('lhc-syntax-converter#variable-expression-1').within(() => {
+            cy.get('div#expression-error > p').should('contain.text', 'Expression is required.');
+          });
+
+          // The Save button should be disabled
+          cy.get('button#export').should('have.class', 'disabled');
+
+          // Populate the missing value
+          cy.get('input#simple-expression-1').type('11');
+
+          // The error should go away.
+          cy.get('input#simple-expression-1')
+            .should('not.have.class', 'field-error')
+            .should('not.have.class', 'ng-invalid');
+
+          // Check for error message in lhc-question with ng-reflect-index="1"
+          cy.get('lhc-syntax-converter#variable-expression-1').within(() => {
+            cy.get('div#expression-error').should('not.exist');
+          });
+
+          // Save (Export)
+          cy.get('#export').click();
+        });
+      });
     });
   });
 
+
+
   it('should display variables at the Questionnaire level', () => {
     cy.get('input[type="radio"][value="existing"]').click();
     cy.get('input[type="radio"][value="local"]').click();

cypress/e2e/item-level/variable.cy.ts

@@ -445,6 +445,55 @@ describe('Home page', () => {
 
           });
       });
+
+      it('should not allow saving an item variable with a missing value and display validation error', () => {
+        // Add a new item under the 'None'.
+        cy.clickTreeNode('None');
+        cy.contains('Add new item').scrollIntoView().click();
+        cy.getItemTextField().clear().type('Variable validation');
+        cy.selectDataType('integer');
+
+        // Click the 'Create/edit variables' button and add two new variables
+        cy.get('button#editVariables').click();
+        cy.get('lhc-expression-editor').shadow().within(() => {
+          cy.get('#expression-editor-base-dialog').should('exist');
+
+          // Variables section
+          cy.get('lhc-variables > h2').should('contain', 'Item Variables');
+          cy.get('#variables-section .variable-row').should('have.length', 0);
+          cy.get('lhc-variables div.no-variables').should('contain.text', 'There are currently no variables for this item.');
+
+          // Add a new variable 'a'
+          cy.get('#add-variable').click();
+          cy.get('#variables-section .variable-row').should('have.length', 1);
+          cy.get('#variable-label-0').clear().type('a');
+          cy.get('#variable-type-0').select('Easy Path Expression');
+          cy.get('input#simple-expression-0').type('10');
+
+          // Add a new variable 'b'
+          cy.get('#add-variable').click();
+          cy.get('#variables-section .variable-row').should('have.length', 2);
+          cy.get('#variable-label-1').clear().type('b');
+          cy.get('#variable-type-1').select('Easy Path Expression');
+          // Intentionally not filling the value
+
+          // Save (Export)
+          cy.get('#export').click();
+
+          // The validation should fail and display the error.
+          cy.get('input#simple-expression-1')
+            .should('have.class', 'field-error')
+            .should('have.class', 'ng-invalid');
+
+          // Check for error message in lhc-question with ng-reflect-index="1"
+          cy.get('lhc-syntax-converter#variable-expression-1').within(() => {
+            cy.get('div#expression-error > p').should('contain.text', 'Expression is required.');
+          });
+
+          // The Save button should be disabled
+          cy.get('button#export').should('have.class', 'disabled');
+        });
+      });
     });
   });
 });

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "formbuilder-lhcforms",
-  "version": "10.3.7",
+  "version": "10.3.8",
   "description": "Build LHC-Forms and FHIR Questionnaires",
   "homepage": "https://github.com/lhncbc/formbuilder-lhcforms",
   "license": "SEE LICENSE IN LICENSE.md",
@@ -65,7 +65,7 @@
     "@fortawesome/free-regular-svg-icons": "^6.7.2",
     "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@fullcalendar/core": "^6.1.15",
-    "@lhncbc/expression-editor": "^3.3.0",
+    "@lhncbc/expression-editor": "~4.0.0",
     "@lhncbc/ngx-schema-form": "2.13.1-forked1",
     "@ng-bootstrap/ng-bootstrap": "^18.0.0",
     "@types/fhir": "^0.0.36",