[HS-1245681] Hiding child question blocks

app/scripts/controllers/editRegistrationModal.js

@@ -29,7 +29,12 @@ angular
       $scope.blockIsVisible = function (block, registrant) {
         return (
           block.type !== 'paragraphContent' &&
-          validateRegistrant.blockVisible(block, registrant, true)
+          validateRegistrant.blockVisible(
+            block,
+            registrant,
+            true,
+            $scope.conference,
+          )
         );
       };
 

app/scripts/controllers/eventRegistrations.js

@@ -202,7 +202,12 @@
       };
 
       $scope.blockIsVisible = function (block, registrant) {
-        return validateRegistrant.blockVisible(block, registrant, true);
+        return validateRegistrant.blockVisible(
+          block,
+          registrant,
+          true,
+          $scope.conference,
+        );
       };
 
       var findAnswer = function (registration, blockId) {

app/scripts/controllers/registration.js

@@ -63,6 +63,8 @@ angular
                     currentRegistration.registrants.find(
                       (r) => r.id === registrantId,
                     ),
+                    false,
+                    $scope.conference,
                   ),
                 ).length > 0
               );
@@ -83,6 +85,8 @@ angular
                   currentRegistration.registrants.find(
                     (r) => r.id === registrantId,
                   ),
+                  false,
+                  $scope.conference,
                 ),
               ).length > 0
             );
@@ -113,6 +117,8 @@ angular
                 currentRegistration.registrants.find(
                   (r) => r.id === registrantId,
                 ),
+                false,
+                $scope.conference,
               ),
             ).length > 0,
         )[0];
@@ -350,6 +356,8 @@ angular
               _.find($scope.currentRegistration.registrants, {
                 id: $scope.currentRegistrant,
               }),
+              false,
+              conference,
             );
           }),
           true,

app/scripts/controllers/registrationModal.js

@@ -128,7 +128,7 @@ angular
           block.type !== 'paragraphContent' &&
           block.profileType !== 'NAME' &&
           block.profileType !== 'EMAIL' &&
-          validateRegistrant.blockVisible(block, registrant, true)
+          validateRegistrant.blockVisible(block, registrant, true, conference)
         );
       };
     },

app/scripts/controllers/reviewRegistration.js

@@ -203,6 +203,8 @@ angular
           validateRegistrant.blockVisible(
             block,
             currentRegistration.registrants.find((r) => r.id === registrantId),
+            false,
+            $scope.conference,
           ),
         );
 
@@ -250,7 +252,12 @@ angular
       };
 
       $scope.blockVisibleForRegistrant = function (block, registrant) {
-        return validateRegistrant.blockVisible(block, registrant);
+        return validateRegistrant.blockVisible(
+          block,
+          registrant,
+          false,
+          $scope.conference,
+        );
       };
 
       $scope.acceptedPaymentMethods = function () {

app/scripts/directives/blockRegistration.js

@@ -196,7 +196,12 @@
           var registrant = _.find($scope.currentRegistration.registrants, {
             id: $scope.currentRegistrant,
           });
-          return validateRegistrant.blockVisible(block, registrant);
+          return validateRegistrant.blockVisible(
+            block,
+            registrant,
+            false,
+            $scope.conference,
+          );
         };
 
         function clearAnswerIfOptionHidden(isVisible, block, $scope, choice) {

app/scripts/services/validateRegistrant.js

@@ -5,7 +5,16 @@
   .service(
     'validateRegistrant',
     function validateRegistrant($window, ruleTypeConstants, $filter) {
-      const blockVisibleRuleCheck = (block, registrant, ruleType) => {
+      const blockVisibleRuleCheck = (
+        block,
+        registrant,
+        ruleType,
+        conference,
+      ) => {
+        const blocks = conference
+          ? _.flatMap(conference.registrationPages, 'blocks')
+          : undefined;
+
         let answers = registrant.answers;
         let ruleOperand = '';
         let validRuleCount = 0;
@@ -73,6 +82,19 @@
                 ? parseFloat(rule.value)
                 : rule.value;
             }
+            // Hide this block if the question that the rule is based on (parentBlock) is hidden.
+            let parentBlock = _.find(blocks, { id: rule.parentBlockId });
+            if (
+              conference &&
+              !blockVisibleRuleCheck(
+                parentBlock,
+                registrant,
+                ruleType,
+                conference,
+              )
+            ) {
+              return;
+            }
 
             if (rule.operator === '=' && answerValue === ruleValue) {
               validRuleCount++;
@@ -214,13 +236,14 @@
         return false;
       };
 
-      this.blockVisible = (block, registrant, isAdmin) => {
+      this.blockVisible = (block, registrant, isAdmin, conference) => {
         const visible =
           angular.isDefined(registrant) &&
           blockVisibleRuleCheck(
             block,
             registrant,
             ruleTypeConstants.SHOW_QUESTION,
+            conference,
           ) &&
           blockInRegistrantType(block, registrant) &&
           this.isAnyChoiceVisible(block, registrant);

test/spec/controllers/eventForm.spec.js

@@ -292,14 +292,14 @@ describe('Controller: eventForm', function () {
 
   describe('addNewPage', () => {
     it('adds a new page', () => {
-      expect(scope.conference.registrationPages.length).toBe(2);
+      expect(scope.conference.registrationPages.length).toBe(3);
 
       scope.addNewPage();
-      const newPage = scope.conference.registrationPages[2];
+      const newPage = scope.conference.registrationPages[3];
 
-      expect(scope.conference.registrationPages.length).toBe(3);
-      expect(newPage.title).toBe('Page 3');
-      expect($location.hash()).toBe('page3');
+      expect(scope.conference.registrationPages.length).toBe(4);
+      expect(newPage.title).toBe('Page 4');
+      expect($location.hash()).toBe('page4');
     });
   });
 

test/spec/controllers/registration.spec.js

@@ -46,7 +46,7 @@ describe('Controller: registration', () => {
   it('should have validPages based on current registrant', () => {
     let validPages = scope.validPages;
 
-    expect(validPages.length).toEqual(2);
+    expect(validPages.length).toEqual(3);
   });
 
   it('should getFirstValidPage', () => {
@@ -104,7 +104,7 @@ describe('Controller: registration', () => {
       },
     ];
 
-    expect(scope.validPages.length).toEqual(2);
+    expect(scope.validPages.length).toEqual(3);
     scope.currentRegistrant = testData.registration.registrants[1].id;
     scope.checkValidPages();
 
@@ -126,7 +126,7 @@ describe('Controller: registration', () => {
 
     expect(checkValidPagesSpy).toHaveBeenCalledWith();
 
-    expect(scope.validPages.length).toEqual(2);
+    expect(scope.validPages.length).toEqual(3);
 
     expect(nextPage).toEqual(scope.conference.registrationPages[1]);
   });

test/spec/services/validateRegistrant.spec.js

@@ -14,6 +14,8 @@ describe('Service: validateRegistrant', function () {
       validateRegistrant.blockVisible(
         testData.conference.registrationPages[1].blocks[0],
         testData.registration.registrants[0],
+        false,
+        testData.conference,
       ),
     ).toBe(true);
   });
@@ -285,9 +287,14 @@ describe('Service: validateRegistrant', function () {
     };
 
     // at least one choice is visible
-    expect(validateRegistrant.blockVisible(block, registrant, false)).toBe(
-      true,
-    );
+    expect(
+      validateRegistrant.blockVisible(
+        block,
+        registrant,
+        false,
+        testData.conference,
+      ),
+    ).toBe(true);
   });
 
   it('no choices are visible, block should be hidden', function () {
@@ -306,8 +313,150 @@ describe('Service: validateRegistrant', function () {
     };
 
     // no choices are visible
-    expect(validateRegistrant.blockVisible(block, registrant, false)).toBe(
-      false,
-    );
+    expect(
+      validateRegistrant.blockVisible(
+        block,
+        registrant,
+        false,
+        testData.conference,
+      ),
+    ).toBe(false);
+  });
+
+  describe('blockVisible()', function () {
+    const blockIds = [
+      'd6f1b12a-8c98-4e83-8857-1111111',
+      '38f8ece0-adf7-423d-9588-2222222',
+      'a7acefb9-72ef-4195-9b14-3333333',
+    ];
+    const Q1Multiple = _.find(testData.conference.registrationPages[2].blocks, {
+      id: blockIds[0],
+    });
+    const Q2Multiple = _.find(testData.conference.registrationPages[2].blocks, {
+      id: blockIds[1],
+    });
+    const Q3Dropdown = _.find(testData.conference.registrationPages[2].blocks, {
+      id: blockIds[2],
+    });
+    const registrant = angular.copy(testData.registration.registrants[0]);
+    const answerParent =
+      registrant.answers[
+        _.findIndex(registrant.answers, {
+          blockId: blockIds[0],
+        })
+      ];
+    const answerChild =
+      registrant.answers[
+        _.findIndex(registrant.answers, {
+          blockId: blockIds[1],
+        })
+      ];
+    const answerGrandchild =
+      registrant.answers[
+        _.findIndex(registrant.answers, {
+          blockId: blockIds[2],
+        })
+      ];
+
+    it('should only show the parent question when its answer is empty', function () {
+      answerParent.value = '';
+      answerChild.value = '';
+      answerGrandchild.value = '';
+
+      expect(
+        validateRegistrant.blockVisible(
+          Q1Multiple,
+          registrant,
+          false,
+          testData.conference,
+        ),
+      ).toBe(true);
+
+      expect(
+        validateRegistrant.blockVisible(
+          Q2Multiple,
+          registrant,
+          false,
+          testData.conference,
+        ),
+      ).toBe(false);
+
+      expect(
+        validateRegistrant.blockVisible(
+          Q3Dropdown,
+          registrant,
+          false,
+          testData.conference,
+        ),
+      ).toBe(false);
+    });
+
+    it('should show child and grandchild questions when answers are selected', function () {
+      // all are visible
+      answerParent.value = 'radio option - show child';
+      answerChild.value = 'radio option - show grandchild';
+      answerGrandchild.value = '';
+
+      expect(
+        validateRegistrant.blockVisible(
+          Q1Multiple,
+          registrant,
+          false,
+          testData.conference,
+        ),
+      ).toBe(true);
+
+      expect(
+        validateRegistrant.blockVisible(
+          Q2Multiple,
+          registrant,
+          false,
+          testData.conference,
+        ),
+      ).toBe(true);
+
+      expect(
+        validateRegistrant.blockVisible(
+          Q3Dropdown,
+          registrant,
+          false,
+          testData.conference,
+        ),
+      ).toBe(true);
+    });
+
+    it('should hide the child and grandchild questions when the parent answer change and the child is hidden', function () {
+      // all are visible
+      answerParent.value = 'radio option - hide child';
+      answerChild.value = 'radio option - show grandchild';
+      answerGrandchild.value = '1';
+
+      expect(
+        validateRegistrant.blockVisible(
+          Q1Multiple,
+          registrant,
+          false,
+          testData.conference,
+        ),
+      ).toBe(true);
+
+      expect(
+        validateRegistrant.blockVisible(
+          Q2Multiple,
+          registrant,
+          false,
+          testData.conference,
+        ),
+      ).toBe(false);
+
+      expect(
+        validateRegistrant.blockVisible(
+          Q3Dropdown,
+          registrant,
+          false,
+          testData.conference,
+        ),
+      ).toBe(false);
+    });
   });
 });