@glowgreen/gg-questionnaire-v2 0.0.70 → 0.0.72

package/bundles/glowgreen-gg-questionnaire-v2.umd.js

@@ -1011,34 +1011,78 @@
                     var newArray = this.fb.array([], convertedValidators);
                     /** @type {?} */
                     var currentArray = currentQuestionnaireForm ? ((/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])))) : false;
-                    if (currentArray) {
-                        console.log('Has current array');
-                        /** @type {?} */
-                        var controlsSnapshot = lodash.clone(currentArray.controls);
-                        try {
-                            for (var controlsSnapshot_1 = __values(controlsSnapshot), controlsSnapshot_1_1 = controlsSnapshot_1.next(); !controlsSnapshot_1_1.done; controlsSnapshot_1_1 = controlsSnapshot_1.next()) {
-                                var item = controlsSnapshot_1_1.value;
-                                console.log('Got item', item);
-                                /** @type {?} */
-                                var index = currentArray.controls.indexOf(item);
-                                /** @type {?} */
-                                var group = this.generateFormsForRepeater(question, index);
-                                console.log('Filtered to', group);
-                                // Gross comparison below. Could be optimised however it's here to avoid inf loop.
-                                /** @type {?} */
-                                var currentItemStrinify = JSON.stringify(Object.keys(item.controls));
-                                /** @type {?} */
-                                var newItemStringify = JSON.stringify(Object.keys(group.controls));
-                                if (currentItemStrinify !== newItemStringify) {
-                                    group.patchValue(item.value);
-                                    currentArray.setControl(index, group);
+                    if (currentArray && question.filteredRepeaterQuestions) {
+                        var _loop_1 = function (control) {
+                            var e_4, _a, e_5, _b;
+                            /** @type {?} */
+                            var index = currentArray.controls.indexOf(control);
+                            if (!index) {
+                                return "continue";
+                            }
+                            /** @type {?} */
+                            var filteredQuestions = question.filteredRepeaterQuestions[index];
+                            if (!filteredQuestions) {
+                                return "continue";
+                            }
+                            /** @type {?} */
+                            var filteredQuestionNames = filteredQuestions.map((/**
+                             * @param {?} x
+                             * @return {?}
+                             */
+                            function (x) { return x.name; }));
+                            /** @type {?} */
+                            var filteredOutQuestions = question.repeaterQuestions.filter((/**
+                             * @param {?} x
+                             * @return {?}
+                             */
+                            function (x) { return !filteredQuestionNames.includes(x.name); }));
+                            console.log('Triggering filtering for item', index);
+                            try {
+                                for (var filteredOutQuestions_1 = (e_4 = void 0, __values(filteredOutQuestions)), filteredOutQuestions_1_1 = filteredOutQuestions_1.next(); !filteredOutQuestions_1_1.done; filteredOutQuestions_1_1 = filteredOutQuestions_1.next()) {
+                                    var filteredOutQuestion = filteredOutQuestions_1_1.value;
+                                    /** @type {?} */
+                                    var childControl = control.get(filteredOutQuestion.name);
+                                    childControl.setValidators([]);
+                                    childControl.updateValueAndValidity({ onlySelf: true, emitEvent: false });
                                 }
                             }
+                            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                            finally {
+                                try {
+                                    if (filteredOutQuestions_1_1 && !filteredOutQuestions_1_1.done && (_a = filteredOutQuestions_1.return)) _a.call(filteredOutQuestions_1);
+                                }
+                                finally { if (e_4) throw e_4.error; }
+                            }
+                            try {
+                                for (var filteredQuestions_1 = (e_5 = void 0, __values(filteredQuestions)), filteredQuestions_1_1 = filteredQuestions_1.next(); !filteredQuestions_1_1.done; filteredQuestions_1_1 = filteredQuestions_1.next()) {
+                                    var filteredQuestion = filteredQuestions_1_1.value;
+                                    /** @type {?} */
+                                    var childControl = control.get(filteredQuestion.name);
+                                    /** @type {?} */
+                                    var convertedValidators_1 = this_1.convertValidators(filteredQuestion.validators);
+                                    childControl.setValidators(convertedValidators_1);
+                                    childControl.updateValueAndValidity({ onlySelf: true, emitEvent: false });
+                                }
+                            }
+                            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                            finally {
+                                try {
+                                    if (filteredQuestions_1_1 && !filteredQuestions_1_1.done && (_b = filteredQuestions_1.return)) _b.call(filteredQuestions_1);
+                                }
+                                finally { if (e_5) throw e_5.error; }
+                            }
+                        };
+                        var this_1 = this;
+                        try {
+                            for (var _b = __values(currentArray.controls), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                var control = _c.value;
+                                _loop_1(control);
+                            }
                         }
                         catch (e_3_1) { e_3 = { error: e_3_1 }; }
                         finally {
                             try {
-                                if (controlsSnapshot_1_1 && !controlsSnapshot_1_1.done && (_a = controlsSnapshot_1.return)) _a.call(controlsSnapshot_1);
+                                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                             }
                             finally { if (e_3) throw e_3.error; }
                         }
@@ -1075,7 +1119,7 @@
          * @return {?} A form group.
          */
         function (question, convertedValidators) {
-            var e_4, _a;
+            var e_6, _a;
             if (question.type !== QuestionType.Checklist || question.checklistItems.length === 0) {
                 return null;
             }
@@ -1089,12 +1133,12 @@
                     checklistForms.addControl(checklistItem.name, checklistItemControl);
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_6) throw e_6.error; }
             }
             return checklistForms;
         };
@@ -1119,39 +1163,27 @@
          * @return {?} A form group.
          */
         function (question, index) {
-            var e_5, _a;
+            var e_7, _a;
             if (question.type !== QuestionType.Repeater || question.repeaterQuestions.length === 0) {
                 console.log('Question isnt a repeater or has no questions, returning null');
                 return null;
             }
             /** @type {?} */
-            var repeaterQuestions = question.repeaterQuestions;
-            if (question.filteredRepeaterQuestions && question.filteredRepeaterQuestions[index]) {
-                repeaterQuestions = question.filteredRepeaterQuestions[index];
-            }
-            console.log('Index passed', index);
-            console.log('All filtered questions', question.filteredRepeaterQuestions);
-            console.log('Got the following repeater questions', repeaterQuestions.map((/**
-             * @param {?} x
-             * @return {?}
-             */
-            function (x) { return x.name; })));
-            /** @type {?} */
             var repeaterForms = this.fb.group({});
             try {
-                for (var repeaterQuestions_1 = __values(repeaterQuestions), repeaterQuestions_1_1 = repeaterQuestions_1.next(); !repeaterQuestions_1_1.done; repeaterQuestions_1_1 = repeaterQuestions_1.next()) {
-                    var repeaterQuestion = repeaterQuestions_1_1.value;
+                for (var _b = __values(question.repeaterQuestions), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var repeaterQuestion = _c.value;
                     /** @type {?} */
                     var repeaterQuestionControl = this.generateControlForRepeaterQuestion(repeaterQuestion);
                     repeaterForms.addControl(repeaterQuestion.name, repeaterQuestionControl);
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
             finally {
                 try {
-                    if (repeaterQuestions_1_1 && !repeaterQuestions_1_1.done && (_a = repeaterQuestions_1.return)) _a.call(repeaterQuestions_1);
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_5) throw e_5.error; }
+                finally { if (e_7) throw e_7.error; }
             }
             return repeaterForms;
         };
@@ -1201,7 +1233,7 @@
          * @return {?} A convered array of form validators.
          */
         function (validators) {
-            var e_6, _a;
+            var e_8, _a;
             if (!validators || validators.length === 0) {
                 return [];
             }
@@ -1217,12 +1249,12 @@
                     }
                 }
             }
-            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            catch (e_8_1) { e_8 = { error: e_8_1 }; }
             finally {
                 try {
                     if (validators_1_1 && !validators_1_1.done && (_a = validators_1.return)) _a.call(validators_1);
                 }
-                finally { if (e_6) throw e_6.error; }
+                finally { if (e_8) throw e_8.error; }
             }
             return convertedValidators;
         };
@@ -1274,12 +1306,12 @@
          * @return {?}
          */
         function (savedState, sections, currentQuestionnaireForm) {
-            var e_7, _a, e_8, _b, e_9, _c;
+            var e_9, _a, e_10, _b, e_11, _c;
             try {
                 for (var sections_2 = __values(sections), sections_2_1 = sections_2.next(); !sections_2_1.done; sections_2_1 = sections_2.next()) {
                     var section = sections_2_1.value;
                     try {
-                        for (var _d = (e_8 = void 0, __values(section.questions)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                        for (var _d = (e_10 = void 0, __values(section.questions)), _e = _d.next(); !_e.done; _e = _d.next()) {
                             var question = _e.value;
                             if (question.type !== QuestionType.Repeater) {
                                 continue;
@@ -1296,7 +1328,7 @@
                             }
                             try {
                                 // For each item that used to be there push a new empty template there to be populated.
-                                for (var repeaterArray_1 = (e_9 = void 0, __values(repeaterArray)), repeaterArray_1_1 = repeaterArray_1.next(); !repeaterArray_1_1.done; repeaterArray_1_1 = repeaterArray_1.next()) {
+                                for (var repeaterArray_1 = (e_11 = void 0, __values(repeaterArray)), repeaterArray_1_1 = repeaterArray_1.next(); !repeaterArray_1_1.done; repeaterArray_1_1 = repeaterArray_1.next()) {
                                     var repeaterItem = repeaterArray_1_1.value;
                                     /** @type {?} */
                                     var index = repeaterArray.indexOf(repeaterItem);
@@ -1305,30 +1337,30 @@
                                     repeaterFormArray.push(repeaterItemTemplate);
                                 }
                             }
-                            catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                            catch (e_11_1) { e_11 = { error: e_11_1 }; }
                             finally {
                                 try {
                                     if (repeaterArray_1_1 && !repeaterArray_1_1.done && (_c = repeaterArray_1.return)) _c.call(repeaterArray_1);
                                 }
-                                finally { if (e_9) throw e_9.error; }
+                                finally { if (e_11) throw e_11.error; }
                             }
                         }
                     }
-                    catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                    catch (e_10_1) { e_10 = { error: e_10_1 }; }
                     finally {
                         try {
                             if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
                         }
-                        finally { if (e_8) throw e_8.error; }
+                        finally { if (e_10) throw e_10.error; }
                     }
                 }
             }
-            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            catch (e_9_1) { e_9 = { error: e_9_1 }; }
             finally {
                 try {
                     if (sections_2_1 && !sections_2_1.done && (_a = sections_2.return)) _a.call(sections_2);
                 }
-                finally { if (e_7) throw e_7.error; }
+                finally { if (e_9) throw e_9.error; }
             }
         };
         FormConstructorService.decorators = [