@glowgreen/gg-questionnaire-v2 0.0.43 → 0.0.45

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

@@ -264,7 +264,7 @@
          * @return {?} An array of filtered sections with their filtered questions.
          */
         function (sections, currentQuestionnaireForm, additionalData) {
-            var e_1, _a, e_2, _b, e_3, _c;
+            var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
             /** @type {?} */
             var filteredSections = [];
             try {
@@ -276,39 +276,63 @@
                     /** @type {?} */
                     var filteredQuestions = [];
                     try {
-                        for (var _d = (e_2 = void 0, __values(section.questions)), _e = _d.next(); !_e.done; _e = _d.next()) {
-                            var question = _e.value;
+                        for (var _e = (e_2 = void 0, __values(section.questions)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                            var question = _f.value;
                             if (!this.meetsConditionGroups(question.conditionGroups, currentQuestionnaireForm, additionalData)) {
                                 continue;
                             }
-                            if (question.repeaterQuestions) {
+                            // If it's a repeater we need to do a lot of extra filtering due to per item conditions.
+                            if (question.type === 'repeater') {
                                 /** @type {?} */
-                                var filteredRepeaterQuestions = [];
+                                var items = (/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])));
                                 try {
-                                    for (var _f = (e_3 = void 0, __values(question.repeaterQuestions)), _g = _f.next(); !_g.done; _g = _f.next()) {
-                                        var repeaterQuestion = _g.value;
-                                        if (this.meetsConditionGroups(repeaterQuestion.conditionGroups, currentQuestionnaireForm, additionalData)) {
-                                            this.setFetchForQuestion(question, additionalData, currentQuestionnaireForm);
-                                            filteredRepeaterQuestions.push(repeaterQuestion);
+                                    for (var _g = (e_3 = void 0, __values(items.controls)), _h = _g.next(); !_h.done; _h = _g.next()) {
+                                        var repeaterItem = _h.value;
+                                        /** @type {?} */
+                                        var filteredRepeaterItemQuestions = [];
+                                        console.log('Filtering repeater item questions');
+                                        try {
+                                            for (var _j = (e_4 = void 0, __values(question.repeaterQuestions)), _k = _j.next(); !_k.done; _k = _j.next()) {
+                                                var repeaterQuestion = _k.value;
+                                                /** @type {?} */
+                                                var meetsConditions = this.meetsConditionGroups(repeaterQuestion.conditionGroups, currentQuestionnaireForm, additionalData, (/** @type {?} */ (repeaterItem)));
+                                                if (meetsConditions) {
+                                                    repeaterQuestion.selectOptions = this.getFetchOptionsForQuestion(repeaterQuestion, additionalData, currentQuestionnaireForm, (/** @type {?} */ (repeaterItem)));
+                                                    filteredRepeaterItemQuestions.push(repeaterQuestion);
+                                                }
+                                            }
+                                        }
+                                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                                        finally {
+                                            try {
+                                                if (_k && !_k.done && (_d = _j.return)) _d.call(_j);
+                                            }
+                                            finally { if (e_4) throw e_4.error; }
+                                        }
+                                        /** @type {?} */
+                                        var index = items.controls.indexOf(repeaterItem);
+                                        if (!question.filteredRepeaterQuestions) {
+                                            question.filteredRepeaterQuestions = [];
                                         }
+                                        question.filteredRepeaterQuestions[index] = filteredRepeaterItemQuestions;
                                     }
                                 }
                                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                                 finally {
                                     try {
-                                        if (_g && !_g.done && (_c = _f.return)) _c.call(_f);
+                                        if (_h && !_h.done && (_c = _g.return)) _c.call(_g);
                                     }
                                     finally { if (e_3) throw e_3.error; }
                                 }
                             }
-                            this.setFetchForQuestion(question, additionalData, currentQuestionnaireForm);
+                            question.selectOptions = this.getFetchOptionsForQuestion(question, additionalData, currentQuestionnaireForm);
                             filteredQuestions.push(question);
                         }
                     }
                     catch (e_2_1) { e_2 = { error: e_2_1 }; }
                     finally {
                         try {
-                            if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
+                            if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                         }
                         finally { if (e_2) throw e_2.error; }
                     }
@@ -333,31 +357,34 @@
          * @param {?} question
          * @param {?} additionalData
          * @param {?} currentQuestionnaireForm
+         * @param {?=} repeaterItem
          * @return {?}
          */
-        FilterService.prototype.setFetchForQuestion = /**
+        FilterService.prototype.getFetchOptionsForQuestion = /**
          * @private
          * @param {?} question
          * @param {?} additionalData
          * @param {?} currentQuestionnaireForm
+         * @param {?=} repeaterItem
          * @return {?}
          */
-        function (question, additionalData, currentQuestionnaireForm) {
-            if (question.fetchPath) {
-                return;
+        function (question, additionalData, currentQuestionnaireForm, repeaterItem) {
+            if (!question.fetchPath) {
+                return question.selectOptions;
             }
+            console.log('Getting fetch data for', question.name);
             /** @type {?} */
             var options = additionalData[question.fetchPath];
             if (question.fetchSelectors && question.fetchSelectors.length > 0) {
                 /** @type {?} */
-                var values = this.getValuesForArray(question.fetchSelectors, currentQuestionnaireForm, additionalData);
+                var values = this.getValuesForArray(question.fetchSelectors, currentQuestionnaireForm, additionalData, repeaterItem);
                 options = lodash.get(additionalData[question.fetchPath], values);
             }
             options = this.getFinalFetchArray(options);
             if (!question.selectOptions) {
                 question.selectOptions = [];
             }
-            question.selectOptions = question.selectOptions.concat(options);
+            return question.selectOptions.concat(options);
         };
         /**
          * @private
@@ -370,7 +397,7 @@
          * @return {?}
          */
         function (items) {
-            var e_4, _a;
+            var e_5, _a;
             if (!items) {
                 return null;
             }
@@ -395,12 +422,12 @@
                     }
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
                     if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_5) throw e_5.error; }
             }
             return convertedArray;
         };
@@ -431,6 +458,7 @@
          * @param {?} conditionGroups The array of condition groups.
          * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
          * @param {?=} additionalData
+         * @param {?=} repeaterItem
          * @return {?} A boolean stating if the condition groups conditions has been met.
          */
         FilterService.prototype.meetsConditionGroups = /**
@@ -440,9 +468,10 @@
          * @param {?} conditionGroups The array of condition groups.
          * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
          * @param {?=} additionalData
+         * @param {?=} repeaterItem
          * @return {?} A boolean stating if the condition groups conditions has been met.
          */
-        function (conditionGroups, currentQuestionnaireForm, additionalData) {
+        function (conditionGroups, currentQuestionnaireForm, additionalData, repeaterItem) {
             var _this = this;
             if (!conditionGroups || conditionGroups.length === 0) {
                 return true;
@@ -452,7 +481,7 @@
              * @return {?}
              */
             function (x) {
-                return _this.meetsConditionGroup(x, currentQuestionnaireForm, additionalData) === true;
+                return _this.meetsConditionGroup(x, currentQuestionnaireForm, additionalData, repeaterItem) === true;
             }));
         };
         /**
@@ -469,6 +498,7 @@
          * @param {?} conditionGroup The condition group to check.
          * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
          * @param {?=} additionalData
+         * @param {?=} repeaterItem
          * @return {?} A boolean stating if the condition group conditions has been met.
          */
         FilterService.prototype.meetsConditionGroup = /**
@@ -478,10 +508,11 @@
          * @param {?} conditionGroup The condition group to check.
          * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
          * @param {?=} additionalData
+         * @param {?=} repeaterItem
          * @return {?} A boolean stating if the condition group conditions has been met.
          */
-        function (conditionGroup, currentQuestionnaireForm, additionalData) {
-            var e_5, _a;
+        function (conditionGroup, currentQuestionnaireForm, additionalData, repeaterItem) {
+            var e_6, _a;
             if (!conditionGroup.conditions || conditionGroup.conditions.length === 0) {
                 return true;
             }
@@ -490,15 +521,15 @@
             try {
                 for (var _b = __values(conditionGroup.conditions), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var condition = _c.value;
-                    results.push(this.meetsCondition(condition, currentQuestionnaireForm, additionalData));
+                    results.push(this.meetsCondition(condition, currentQuestionnaireForm, additionalData, repeaterItem));
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_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_5) throw e_5.error; }
+                finally { if (e_6) throw e_6.error; }
             }
             switch (conditionGroup.relationship) {
                 case ConditionRelationship.Every:
@@ -535,6 +566,7 @@
          * @param {?} condition The condition to check.
          * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
          * @param {?=} additionalData
+         * @param {?=} repeaterItem
          * @return {?} A boolean stating if the condition group conditions has been met.
          */
         FilterService.prototype.meetsCondition = /**
@@ -544,14 +576,15 @@
          * @param {?} condition The condition to check.
          * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
          * @param {?=} additionalData
+         * @param {?=} repeaterItem
          * @return {?} A boolean stating if the condition group conditions has been met.
          */
-        function (condition, currentQuestionnaireForm, additionalData) {
-            var e_6, _a, e_7, _b;
+        function (condition, currentQuestionnaireForm, additionalData, repeaterItem) {
+            var e_7, _a, e_8, _b;
             /** @type {?} */
-            var v1s = this.getValuesForArray(condition.v1s, currentQuestionnaireForm, additionalData);
+            var v1s = this.getValuesForArray(condition.v1s, currentQuestionnaireForm, additionalData, repeaterItem);
             /** @type {?} */
-            var v2s = this.getValuesForArray(condition.v2s, currentQuestionnaireForm, additionalData);
+            var v2s = this.getValuesForArray(condition.v2s, currentQuestionnaireForm, additionalData, repeaterItem);
             /** @type {?} */
             var result = false;
             switch (condition.type) {
@@ -577,7 +610,7 @@
                     for (var v2s_1 = __values(v2s), v2s_1_1 = v2s_1.next(); !v2s_1_1.done; v2s_1_1 = v2s_1.next()) {
                         var v2 = v2s_1_1.value;
                         try {
-                            for (var v1s_1 = (e_7 = void 0, __values(v1s)), v1s_1_1 = v1s_1.next(); !v1s_1_1.done; v1s_1_1 = v1s_1.next()) {
+                            for (var v1s_1 = (e_8 = void 0, __values(v1s)), v1s_1_1 = v1s_1.next(); !v1s_1_1.done; v1s_1_1 = v1s_1.next()) {
                                 var v1 = v1s_1_1.value;
                                 switch (condition.type) {
                                     case ConditionType.EqualTo:
@@ -611,21 +644,21 @@
                                 }
                             }
                         }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             try {
                                 if (v1s_1_1 && !v1s_1_1.done && (_b = v1s_1.return)) _b.call(v1s_1);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_8) throw e_8.error; }
                         }
                     }
                 }
-                catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                catch (e_7_1) { e_7 = { error: e_7_1 }; }
                 finally {
                     try {
                         if (v2s_1_1 && !v2s_1_1.done && (_a = v2s_1.return)) _a.call(v2s_1);
                     }
-                    finally { if (e_6) throw e_6.error; }
+                    finally { if (e_7) throw e_7.error; }
                 }
             }
             return result;
@@ -662,6 +695,7 @@
          * @param {?} paths The array of strings to check.
          * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
          * @param {?=} additionalData
+         * @param {?=} repeaterItem
          * @return {?} An array of strings/values
          */
         FilterService.prototype.getValuesForArray = /**
@@ -671,10 +705,11 @@
          * @param {?} paths The array of strings to check.
          * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
          * @param {?=} additionalData
+         * @param {?=} repeaterItem
          * @return {?} An array of strings/values
          */
-        function (paths, currentQuestionnaireForm, additionalData) {
-            var e_8, _a;
+        function (paths, currentQuestionnaireForm, additionalData, repeaterItem) {
+            var e_9, _a;
             if (currentQuestionnaireForm) {
                 /** @type {?} */
                 var values = [];
@@ -682,16 +717,16 @@
                     for (var paths_1 = __values(paths), paths_1_1 = paths_1.next(); !paths_1_1.done; paths_1_1 = paths_1.next()) {
                         var path = paths_1_1.value;
                         /** @type {?} */
-                        var value = this.getValueForString(path, currentQuestionnaireForm, additionalData);
+                        var value = this.getValueForString(path, currentQuestionnaireForm, additionalData, repeaterItem);
                         values.push(value);
                     }
                 }
-                catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                catch (e_9_1) { e_9 = { error: e_9_1 }; }
                 finally {
                     try {
                         if (paths_1_1 && !paths_1_1.done && (_a = paths_1.return)) _a.call(paths_1);
                     }
-                    finally { if (e_8) throw e_8.error; }
+                    finally { if (e_9) throw e_9.error; }
                 }
                 return values;
             }
@@ -713,6 +748,7 @@
          * @param {?} path The string value to check.
          * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
          * @param {?=} additionalData
+         * @param {?=} repeaterItem
          * @return {?} A string/value.
          */
         FilterService.prototype.getValueForString = /**
@@ -722,15 +758,19 @@
          * @param {?} path The string value to check.
          * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
          * @param {?=} additionalData
+         * @param {?=} repeaterItem
          * @return {?} A string/value.
          */
-        function (path, currentQuestionnaireForm, additionalData) {
+        function (path, currentQuestionnaireForm, additionalData, repeaterItem) {
             if (currentQuestionnaireForm) {
                 if (!additionalData) {
                     additionalData = {};
                 }
                 /** @type {?} */
                 var control = currentQuestionnaireForm.get(path.toString());
+                if ((!control || !control.value) && repeaterItem) {
+                    control = repeaterItem.get(path.toString());
+                }
                 /** @type {?} */
                 var value = control ? control.value : this.convertStringToValue(path);
                 return lodash.get(additionalData, path, value);
@@ -1031,25 +1071,29 @@
          * Generates the form template for a repeater question.
          * @author Will Poulson
          * @param {?} question The question. Must be of type repeater or else null is returned.
+         * @param {?=} index
          * @return {?} A form group.
          */
         FormConstructorService.prototype.generateFormsForRepeater = /**
          * Generates the form template for a repeater question.
          * @author Will Poulson
          * @param {?} question The question. Must be of type repeater or else null is returned.
+         * @param {?=} index
          * @return {?} A form group.
          */
-        function (question) {
+        function (question, index) {
             var e_4, _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 = index ? question.filteredRepeaterQuestions[index] : question.repeaterQuestions;
+            /** @type {?} */
             var repeaterForms = this.fb.group({});
             try {
-                for (var _b = __values(question.repeaterQuestions), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var repeaterQuestion = _c.value;
+                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;
                     /** @type {?} */
                     var repeaterQuestionControl = this.generateControlForRepeaterQuestion(repeaterQuestion);
                     repeaterForms.addControl(repeaterQuestion.name, repeaterQuestionControl);
@@ -1058,7 +1102,7 @@
             catch (e_4_1) { e_4 = { error: e_4_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    if (repeaterQuestions_1_1 && !repeaterQuestions_1_1.done && (_a = repeaterQuestions_1.return)) _a.call(repeaterQuestions_1);
                 }
                 finally { if (e_4) throw e_4.error; }
             }
@@ -1208,7 +1252,9 @@
                                 for (var repeaterArray_1 = (e_8 = 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 repeaterItemTemplate = this.generateFormsForRepeater(question);
+                                    var index = repeaterArray.indexOf(repeaterItem);
+                                    /** @type {?} */
+                                    var repeaterItemTemplate = this.generateFormsForRepeater(question, index);
                                     repeaterFormArray.push(repeaterItemTemplate);
                                 }
                             }