@glowgreen/gg-questionnaire-v2 0.0.69 → 0.0.71

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -8,7 +8,6 @@ import { FormBuilder, Validators } from '@angular/forms';
8
8
  import { QuestionType } from '../enums/question-type.enum';
9
9
  import { FilterService } from './filter.service';
10
10
  import { ValidationType } from '../enums/validation-type.enum';
11
- import * as _ from 'lodash';
12
11
  import * as i0 from "@angular/core";
13
12
  import * as i1 from "@angular/forms";
14
13
  import * as i2 from "./filter.service";
@@ -178,42 +177,77 @@ var FormConstructorService = /** @class */ (function () {
178
177
  var newArray = this.fb.array([], convertedValidators);
179
178
  /** @type {?} */
180
179
  var currentArray = currentQuestionnaireForm ? ((/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])))) : false;
181
- if (currentArray) {
182
- console.log('Has current array');
183
- /** @type {?} */
184
- var controlsSnapshot = _.clone(currentArray.controls);
185
- try {
186
- for (var controlsSnapshot_1 = tslib_1.__values(controlsSnapshot), controlsSnapshot_1_1 = controlsSnapshot_1.next(); !controlsSnapshot_1_1.done; controlsSnapshot_1_1 = controlsSnapshot_1.next()) {
187
- var item = controlsSnapshot_1_1.value;
188
- console.log('Got item', item);
189
- /** @type {?} */
190
- var index = currentArray.controls.indexOf(item);
191
- /** @type {?} */
192
- var group = this.generateFormsForRepeater(question, index);
193
- console.log('Filtered to', group);
194
- // Gross comparison below. Could be optimised however it's here to avoid inf loop.
195
- /** @type {?} */
196
- var currentItemStrinify = JSON.stringify(item.controls.map((/**
197
- * @param {?} x
198
- * @return {?}
199
- */
200
- function (x) { return name; })));
201
- /** @type {?} */
202
- var newItemStringify = JSON.stringify(((/** @type {?} */ (group))).controls.map((/**
203
- * @param {?} x
204
- * @return {?}
205
- */
206
- function (x) { return name; })));
207
- if (currentItemStrinify !== newItemStringify) {
208
- group.patchValue(item.value);
209
- currentArray.setControl(index, group);
180
+ if (currentArray && question.filteredRepeaterQuestions) {
181
+ var _loop_1 = function (control) {
182
+ var e_4, _a, e_5, _b;
183
+ /** @type {?} */
184
+ var index = currentArray.controls.indexOf(control);
185
+ if (!index) {
186
+ return "continue";
187
+ }
188
+ /** @type {?} */
189
+ var filteredQuestions = question.filteredRepeaterQuestions[index];
190
+ if (!filteredQuestions) {
191
+ return "continue";
192
+ }
193
+ /** @type {?} */
194
+ var filteredQuestionNames = filteredQuestions.map((/**
195
+ * @param {?} x
196
+ * @return {?}
197
+ */
198
+ function (x) { return x.name; }));
199
+ /** @type {?} */
200
+ var filteredOutQuestions = question.repeaterQuestions.filter((/**
201
+ * @param {?} x
202
+ * @return {?}
203
+ */
204
+ function (x) { return !filteredQuestionNames.includes(x.name); }));
205
+ try {
206
+ for (var filteredOutQuestions_1 = (e_4 = void 0, tslib_1.__values(filteredOutQuestions)), filteredOutQuestions_1_1 = filteredOutQuestions_1.next(); !filteredOutQuestions_1_1.done; filteredOutQuestions_1_1 = filteredOutQuestions_1.next()) {
207
+ var filteredOutQuestion = filteredOutQuestions_1_1.value;
208
+ /** @type {?} */
209
+ var childControl = control.get(filteredOutQuestion.name);
210
+ childControl.setValidators([]);
211
+ childControl.updateValueAndValidity();
210
212
  }
211
213
  }
214
+ catch (e_4_1) { e_4 = { error: e_4_1 }; }
215
+ finally {
216
+ try {
217
+ if (filteredOutQuestions_1_1 && !filteredOutQuestions_1_1.done && (_a = filteredOutQuestions_1.return)) _a.call(filteredOutQuestions_1);
218
+ }
219
+ finally { if (e_4) throw e_4.error; }
220
+ }
221
+ try {
222
+ for (var filteredQuestions_1 = (e_5 = void 0, tslib_1.__values(filteredQuestions)), filteredQuestions_1_1 = filteredQuestions_1.next(); !filteredQuestions_1_1.done; filteredQuestions_1_1 = filteredQuestions_1.next()) {
223
+ var filteredQuestion = filteredQuestions_1_1.value;
224
+ /** @type {?} */
225
+ var childControl = control.get(filteredQuestion.name);
226
+ /** @type {?} */
227
+ var convertedValidators_1 = this_1.convertValidators(filteredQuestion.validators);
228
+ childControl.setValidators(convertedValidators_1);
229
+ childControl.updateValueAndValidity();
230
+ }
231
+ }
232
+ catch (e_5_1) { e_5 = { error: e_5_1 }; }
233
+ finally {
234
+ try {
235
+ if (filteredQuestions_1_1 && !filteredQuestions_1_1.done && (_b = filteredQuestions_1.return)) _b.call(filteredQuestions_1);
236
+ }
237
+ finally { if (e_5) throw e_5.error; }
238
+ }
239
+ };
240
+ var this_1 = this;
241
+ try {
242
+ for (var _b = tslib_1.__values(currentArray.controls), _c = _b.next(); !_c.done; _c = _b.next()) {
243
+ var control = _c.value;
244
+ _loop_1(control);
245
+ }
212
246
  }
213
247
  catch (e_3_1) { e_3 = { error: e_3_1 }; }
214
248
  finally {
215
249
  try {
216
- if (controlsSnapshot_1_1 && !controlsSnapshot_1_1.done && (_a = controlsSnapshot_1.return)) _a.call(controlsSnapshot_1);
250
+ if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
217
251
  }
218
252
  finally { if (e_3) throw e_3.error; }
219
253
  }
@@ -250,7 +284,7 @@ var FormConstructorService = /** @class */ (function () {
250
284
  * @return {?} A form group.
251
285
  */
252
286
  function (question, convertedValidators) {
253
- var e_4, _a;
287
+ var e_6, _a;
254
288
  if (question.type !== QuestionType.Checklist || question.checklistItems.length === 0) {
255
289
  return null;
256
290
  }
@@ -264,12 +298,12 @@ var FormConstructorService = /** @class */ (function () {
264
298
  checklistForms.addControl(checklistItem.name, checklistItemControl);
265
299
  }
266
300
  }
267
- catch (e_4_1) { e_4 = { error: e_4_1 }; }
301
+ catch (e_6_1) { e_6 = { error: e_6_1 }; }
268
302
  finally {
269
303
  try {
270
304
  if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
271
305
  }
272
- finally { if (e_4) throw e_4.error; }
306
+ finally { if (e_6) throw e_6.error; }
273
307
  }
274
308
  return checklistForms;
275
309
  };
@@ -294,39 +328,27 @@ var FormConstructorService = /** @class */ (function () {
294
328
  * @return {?} A form group.
295
329
  */
296
330
  function (question, index) {
297
- var e_5, _a;
331
+ var e_7, _a;
298
332
  if (question.type !== QuestionType.Repeater || question.repeaterQuestions.length === 0) {
299
333
  console.log('Question isnt a repeater or has no questions, returning null');
300
334
  return null;
301
335
  }
302
336
  /** @type {?} */
303
- var repeaterQuestions = question.repeaterQuestions;
304
- if (question.filteredRepeaterQuestions && question.filteredRepeaterQuestions[index]) {
305
- repeaterQuestions = question.filteredRepeaterQuestions[index];
306
- }
307
- console.log('Index passed', index);
308
- console.log('All filtered questions', question.filteredRepeaterQuestions);
309
- console.log('Got the following repeater questions', repeaterQuestions.map((/**
310
- * @param {?} x
311
- * @return {?}
312
- */
313
- function (x) { return x.name; })));
314
- /** @type {?} */
315
337
  var repeaterForms = this.fb.group({});
316
338
  try {
317
- for (var repeaterQuestions_1 = tslib_1.__values(repeaterQuestions), repeaterQuestions_1_1 = repeaterQuestions_1.next(); !repeaterQuestions_1_1.done; repeaterQuestions_1_1 = repeaterQuestions_1.next()) {
318
- var repeaterQuestion = repeaterQuestions_1_1.value;
339
+ for (var _b = tslib_1.__values(question.repeaterQuestions), _c = _b.next(); !_c.done; _c = _b.next()) {
340
+ var repeaterQuestion = _c.value;
319
341
  /** @type {?} */
320
342
  var repeaterQuestionControl = this.generateControlForRepeaterQuestion(repeaterQuestion);
321
343
  repeaterForms.addControl(repeaterQuestion.name, repeaterQuestionControl);
322
344
  }
323
345
  }
324
- catch (e_5_1) { e_5 = { error: e_5_1 }; }
346
+ catch (e_7_1) { e_7 = { error: e_7_1 }; }
325
347
  finally {
326
348
  try {
327
- if (repeaterQuestions_1_1 && !repeaterQuestions_1_1.done && (_a = repeaterQuestions_1.return)) _a.call(repeaterQuestions_1);
349
+ if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
328
350
  }
329
- finally { if (e_5) throw e_5.error; }
351
+ finally { if (e_7) throw e_7.error; }
330
352
  }
331
353
  return repeaterForms;
332
354
  };
@@ -376,7 +398,7 @@ var FormConstructorService = /** @class */ (function () {
376
398
  * @return {?} A convered array of form validators.
377
399
  */
378
400
  function (validators) {
379
- var e_6, _a;
401
+ var e_8, _a;
380
402
  if (!validators || validators.length === 0) {
381
403
  return [];
382
404
  }
@@ -392,12 +414,12 @@ var FormConstructorService = /** @class */ (function () {
392
414
  }
393
415
  }
394
416
  }
395
- catch (e_6_1) { e_6 = { error: e_6_1 }; }
417
+ catch (e_8_1) { e_8 = { error: e_8_1 }; }
396
418
  finally {
397
419
  try {
398
420
  if (validators_1_1 && !validators_1_1.done && (_a = validators_1.return)) _a.call(validators_1);
399
421
  }
400
- finally { if (e_6) throw e_6.error; }
422
+ finally { if (e_8) throw e_8.error; }
401
423
  }
402
424
  return convertedValidators;
403
425
  };
@@ -449,12 +471,12 @@ var FormConstructorService = /** @class */ (function () {
449
471
  * @return {?}
450
472
  */
451
473
  function (savedState, sections, currentQuestionnaireForm) {
452
- var e_7, _a, e_8, _b, e_9, _c;
474
+ var e_9, _a, e_10, _b, e_11, _c;
453
475
  try {
454
476
  for (var sections_2 = tslib_1.__values(sections), sections_2_1 = sections_2.next(); !sections_2_1.done; sections_2_1 = sections_2.next()) {
455
477
  var section = sections_2_1.value;
456
478
  try {
457
- for (var _d = (e_8 = void 0, tslib_1.__values(section.questions)), _e = _d.next(); !_e.done; _e = _d.next()) {
479
+ for (var _d = (e_10 = void 0, tslib_1.__values(section.questions)), _e = _d.next(); !_e.done; _e = _d.next()) {
458
480
  var question = _e.value;
459
481
  if (question.type !== QuestionType.Repeater) {
460
482
  continue;
@@ -471,7 +493,7 @@ var FormConstructorService = /** @class */ (function () {
471
493
  }
472
494
  try {
473
495
  // For each item that used to be there push a new empty template there to be populated.
474
- for (var repeaterArray_1 = (e_9 = void 0, tslib_1.__values(repeaterArray)), repeaterArray_1_1 = repeaterArray_1.next(); !repeaterArray_1_1.done; repeaterArray_1_1 = repeaterArray_1.next()) {
496
+ for (var repeaterArray_1 = (e_11 = void 0, tslib_1.__values(repeaterArray)), repeaterArray_1_1 = repeaterArray_1.next(); !repeaterArray_1_1.done; repeaterArray_1_1 = repeaterArray_1.next()) {
475
497
  var repeaterItem = repeaterArray_1_1.value;
476
498
  /** @type {?} */
477
499
  var index = repeaterArray.indexOf(repeaterItem);
@@ -480,30 +502,30 @@ var FormConstructorService = /** @class */ (function () {
480
502
  repeaterFormArray.push(repeaterItemTemplate);
481
503
  }
482
504
  }
483
- catch (e_9_1) { e_9 = { error: e_9_1 }; }
505
+ catch (e_11_1) { e_11 = { error: e_11_1 }; }
484
506
  finally {
485
507
  try {
486
508
  if (repeaterArray_1_1 && !repeaterArray_1_1.done && (_c = repeaterArray_1.return)) _c.call(repeaterArray_1);
487
509
  }
488
- finally { if (e_9) throw e_9.error; }
510
+ finally { if (e_11) throw e_11.error; }
489
511
  }
490
512
  }
491
513
  }
492
- catch (e_8_1) { e_8 = { error: e_8_1 }; }
514
+ catch (e_10_1) { e_10 = { error: e_10_1 }; }
493
515
  finally {
494
516
  try {
495
517
  if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
496
518
  }
497
- finally { if (e_8) throw e_8.error; }
519
+ finally { if (e_10) throw e_10.error; }
498
520
  }
499
521
  }
500
522
  }
501
- catch (e_7_1) { e_7 = { error: e_7_1 }; }
523
+ catch (e_9_1) { e_9 = { error: e_9_1 }; }
502
524
  finally {
503
525
  try {
504
526
  if (sections_2_1 && !sections_2_1.done && (_a = sections_2.return)) _a.call(sections_2);
505
527
  }
506
- finally { if (e_7) throw e_7.error; }
528
+ finally { if (e_9) throw e_9.error; }
507
529
  }
508
530
  };
509
531
  FormConstructorService.decorators = [
@@ -532,4 +554,4 @@ if (false) {
532
554
  */
533
555
  FormConstructorService.prototype.filterService;
534
556
  }
535
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-constructor.service.js","sourceRoot":"ng://@glowgreen/gg-questionnaire-v2/","sources":["lib/services/form-constructor.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { FormBuilder, FormGroup, FormControl, AbstractControl, ValidatorFn, Validators, FormArray } from '@angular/forms';\nimport { Section } from '../interfaces/section';\nimport { Question } from '../interfaces/question';\nimport { Questionnaire } from '../interfaces/questionnaire';\nimport { QuestionType } from '../enums/question-type.enum';\nimport { FilterService } from './filter.service';\nimport { Validator } from '../interfaces/validator';\nimport { ValidationType } from '../enums/validation-type.enum';\nimport * as _ from 'lodash';\nimport { RepeaterQuestion } from '../interfaces/repeater-question';\nimport { ChecklistItem } from '../interfaces/checklist-item';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class FormConstructorService {\n\n  constructor(\n    private fb: FormBuilder,\n    private filterService: FilterService\n  ) { }\n\n  /**\n   * Constructs a form group based on the questionnaire data.\n   * This form group has been filtered down based on the conditions of the sections and questions.\n   * @param questionnaire The questionnaire data to build the form group on.\n   * @returns A filted form group.\n   * @author Will Poulson\n   */\n  public generateFormsForQuestionnaire(\n    questionnaire: Questionnaire,\n    currentQuestionnaire: Questionnaire,\n    currentQuestionnaireForm: FormGroup,\n    additionalData?: Object,\n    skipFilter?: boolean\n  ): {sections: Array<Section>; forms: FormGroup} {\n    const sections = skipFilter ?\n      questionnaire.sections :\n      this.filterService.filterSections(questionnaire.sections, currentQuestionnaireForm, additionalData);\n\n    const noChange = currentQuestionnaireForm && (sections === currentQuestionnaire.sections);\n\n    if (noChange && !skipFilter) {\n      return null;\n    }\n\n    const questionnaireForms = this.generateFormsForSections(sections, currentQuestionnaireForm);\n    return {sections: sections, forms: questionnaireForms};\n  }\n\n  private generateFormsForSections(sections: Array<Section>, currentQuestionnaireForm: FormGroup) {\n    const questionnaireForms: FormGroup = this.fb.group({});\n    for (const section of sections) {\n      const sectionForms = this.generateFormsForSection(section, currentQuestionnaireForm);\n      questionnaireForms.addControl(section.name, sectionForms);\n    }\n    return questionnaireForms;\n  }\n\n  /**\n   * Constructs a form group based on the section data.\n   * This form group has been filtered down based on the conditions of the questions.\n   * @param section The section data to build the form group on.\n   * @returns A filtered form group.\n   * @author Will Poulson\n   */\n  private generateFormsForSection(section: Section, currentQuestionnaireForm: FormGroup): FormGroup {\n    const sectionForms: FormGroup = this.fb.group({});\n    for (const question of section.questions) {\n      if (question.type === QuestionType.Info) {\n        continue;\n      }\n\n      const questionControl = this.generateControlForQuestion(question, section, currentQuestionnaireForm);\n      sectionForms.addControl(question.name, questionControl);\n    }\n    return sectionForms;\n  }\n\n  /**\n   * Constructs an astract form control based on the question data.\n   * @param question The question data to build the abstract control on.\n   * @returns An abstract control.\n   * @author Will Poulson\n   */\n  private generateControlForQuestion(question: Question, section: Section, currentQuestionnaireForm: FormGroup): AbstractControl {\n    const convertedValidators = this.convertValidators(question.validators);\n    const defaultValue = question.defaultValue ? question.defaultValue : null;\n    switch (question.type) {\n      case QuestionType.Repeater:\n        const newArray = this.fb.array([], convertedValidators);\n        const currentArray = currentQuestionnaireForm ? (currentQuestionnaireForm.get([section.name, question.name]) as FormArray) : false;\n\n        if (currentArray) {\n          console.log('Has current array');\n          const controlsSnapshot = _.clone(currentArray.controls);\n          for (const item of controlsSnapshot) {\n\n            console.log('Got item', item);\n\n            const index = currentArray.controls.indexOf(item);\n            const group = this.generateFormsForRepeater(question, index);\n\n            console.log('Filtered to', group);\n\n            // Gross comparison below. Could be optimised however it's here to avoid inf loop.\n            const currentItemStrinify = JSON.stringify(item.controls.map(x => name));\n            const newItemStringify = JSON.stringify((group as any).controls.map(x => name));\n\n            if (currentItemStrinify !== newItemStringify) {\n              group.patchValue(item.value);\n              currentArray.setControl(index, group);\n            }\n          }\n        }\n\n        return currentArray ? currentArray : newArray;\n      case QuestionType.Checklist:\n        return this.generateGroupForChecklist(question, convertedValidators);\n      case QuestionType.Slider:\n        return this.fb.control(defaultValue, { validators: convertedValidators }); // Remove update on blur for sliders.\n      default:\n        return this.fb.control(defaultValue, { validators: convertedValidators, updateOn: 'blur' });\n    }\n  }\n\n  /**\n   * Generates the form group for a checklist question.\n   * @param question The question. Must be of type checklist or else null is returned.\n   * @returns A form group.\n   * @author Will Poulson\n   */\n  private generateGroupForChecklist(question: Question, convertedValidators) {\n    if (question.type !== QuestionType.Checklist || question.checklistItems.length === 0) {\n      return null;\n    }\n\n    const checklistForms: FormGroup = this.fb.group({});\n    for (const checklistItem of question.checklistItems) {\n      const checklistItemControl = this.fb.control(null, convertedValidators);\n      checklistForms.addControl(checklistItem.name, checklistItemControl);\n    }\n    return checklistForms;\n  }\n\n\n  /**\n   * Generates the form template for a repeater question.\n   * @param question The question. Must be of type repeater or else null is returned.\n   * @returns A form group.\n   * @author Will Poulson\n   */\n  public generateFormsForRepeater(question: Question, index?: any): FormGroup {\n    if (question.type !== QuestionType.Repeater || question.repeaterQuestions.length === 0) {\n      console.log('Question isnt a repeater or has no questions, returning null');\n      return null;\n    }\n\n    let repeaterQuestions = question.repeaterQuestions;\n\n    if (question.filteredRepeaterQuestions && question.filteredRepeaterQuestions[index]) {\n      repeaterQuestions = question.filteredRepeaterQuestions[index];\n    }\n\n    console.log('Index passed', index);\n    console.log('All filtered questions', question.filteredRepeaterQuestions);\n    console.log('Got the following repeater questions', repeaterQuestions.map(x => x.name));\n\n    const repeaterForms: FormGroup = this.fb.group({});\n    for (const repeaterQuestion of repeaterQuestions) {\n      const repeaterQuestionControl = this.generateControlForRepeaterQuestion(repeaterQuestion);\n      repeaterForms.addControl(repeaterQuestion.name, repeaterQuestionControl);\n    }\n    return repeaterForms;\n  }\n\n  /**\n   * Generates a control for a repeaters question.\n   * @param repeaterQuestion A repeater question.\n   * @returns An abstract control.\n   * @author Will Poulson\n   */\n  private generateControlForRepeaterQuestion(repeaterQuestion: RepeaterQuestion): AbstractControl {\n    const convertedValidators = this.convertValidators(repeaterQuestion.validators);\n    return this.fb.control(null, { validators: convertedValidators, updateOn: 'blur' });\n  }\n\n  /**\n   * Converts an array of validators into form validators.\n   * @param validators The uncoverted array of validators.\n   * @returns A convered array of form validators.\n   * @author Will Poulson\n   */\n  private convertValidators(validators: Array<Validator>): Array<ValidatorFn> {\n    if (!validators || validators.length === 0) {\n      return [];\n    }\n    const convertedValidators: Array<ValidatorFn> = [];\n    for (const validator of validators) {\n      const convertedValidator = this.convertValidator(validator);\n      if (convertedValidator) {\n        convertedValidators.push(convertedValidator);\n      }\n    }\n    return convertedValidators;\n  }\n\n  /**\n   * Converts a single validator into a form validator.\n   * @param validator The unconverted validator.\n   * @returns A converted form validator.\n   * @author Will Poulson\n   */\n  private convertValidator(validator: Validator): ValidatorFn | null {\n    switch (validator.type) {\n      case ValidationType.Required:\n        return Validators.required;\n      default:\n        return null;\n    }\n  }\n\n  /**\n   * Constructs the forms for repeaters from saved state.\n   * @param savedState The saved state to load.\n   * @param sections The sections already generated by the form constructor.\n   */\n  public constructRepeaterFromsFromState(savedState: any, sections: Array<Section>, currentQuestionnaireForm: FormGroup) {\n    for (const section of sections) {\n      for (const question of section.questions) {\n        if (question.type !== QuestionType.Repeater) {\n          continue;\n        }\n\n        const repeaterArray = savedState[section.name][question.name];\n        if (!repeaterArray || repeaterArray.length === 0) {\n          continue;\n        }\n\n        const repeaterFormArray = currentQuestionnaireForm.get([section.name, question.name]) as FormArray;\n\n        if (repeaterFormArray.controls.length === repeaterArray.length) {\n          continue;\n        }\n\n        // For each item that used to be there push a new empty template there to be populated.\n        for (const repeaterItem of repeaterArray) {\n          const index = repeaterArray.indexOf(repeaterItem);\n          const repeaterItemTemplate = this.generateFormsForRepeater(question, index);\n          repeaterFormArray.push(repeaterItemTemplate);\n        }\n      }\n    }\n  }\n}\n"]}
557
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-constructor.service.js","sourceRoot":"ng://@glowgreen/gg-questionnaire-v2/","sources":["lib/services/form-constructor.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { FormBuilder, FormGroup, FormControl, AbstractControl, ValidatorFn, Validators, FormArray } from '@angular/forms';\nimport { Section } from '../interfaces/section';\nimport { Question } from '../interfaces/question';\nimport { Questionnaire } from '../interfaces/questionnaire';\nimport { QuestionType } from '../enums/question-type.enum';\nimport { FilterService } from './filter.service';\nimport { Validator } from '../interfaces/validator';\nimport { ValidationType } from '../enums/validation-type.enum';\nimport * as _ from 'lodash';\nimport { RepeaterQuestion } from '../interfaces/repeater-question';\nimport { ChecklistItem } from '../interfaces/checklist-item';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class FormConstructorService {\n\n  constructor(\n    private fb: FormBuilder,\n    private filterService: FilterService\n  ) { }\n\n  /**\n   * Constructs a form group based on the questionnaire data.\n   * This form group has been filtered down based on the conditions of the sections and questions.\n   * @param questionnaire The questionnaire data to build the form group on.\n   * @returns A filted form group.\n   * @author Will Poulson\n   */\n  public generateFormsForQuestionnaire(\n    questionnaire: Questionnaire,\n    currentQuestionnaire: Questionnaire,\n    currentQuestionnaireForm: FormGroup,\n    additionalData?: Object,\n    skipFilter?: boolean\n  ): {sections: Array<Section>; forms: FormGroup} {\n    const sections = skipFilter ?\n      questionnaire.sections :\n      this.filterService.filterSections(questionnaire.sections, currentQuestionnaireForm, additionalData);\n\n    const noChange = currentQuestionnaireForm && (sections === currentQuestionnaire.sections);\n\n    if (noChange && !skipFilter) {\n      return null;\n    }\n\n    const questionnaireForms = this.generateFormsForSections(sections, currentQuestionnaireForm);\n    return {sections: sections, forms: questionnaireForms};\n  }\n\n  private generateFormsForSections(sections: Array<Section>, currentQuestionnaireForm: FormGroup) {\n    const questionnaireForms: FormGroup = this.fb.group({});\n    for (const section of sections) {\n      const sectionForms = this.generateFormsForSection(section, currentQuestionnaireForm);\n      questionnaireForms.addControl(section.name, sectionForms);\n    }\n    return questionnaireForms;\n  }\n\n  /**\n   * Constructs a form group based on the section data.\n   * This form group has been filtered down based on the conditions of the questions.\n   * @param section The section data to build the form group on.\n   * @returns A filtered form group.\n   * @author Will Poulson\n   */\n  private generateFormsForSection(section: Section, currentQuestionnaireForm: FormGroup): FormGroup {\n    const sectionForms: FormGroup = this.fb.group({});\n    for (const question of section.questions) {\n      if (question.type === QuestionType.Info) {\n        continue;\n      }\n\n      const questionControl = this.generateControlForQuestion(question, section, currentQuestionnaireForm);\n      sectionForms.addControl(question.name, questionControl);\n    }\n    return sectionForms;\n  }\n\n  /**\n   * Constructs an astract form control based on the question data.\n   * @param question The question data to build the abstract control on.\n   * @returns An abstract control.\n   * @author Will Poulson\n   */\n  private generateControlForQuestion(question: Question, section: Section, currentQuestionnaireForm: FormGroup): AbstractControl {\n    const convertedValidators = this.convertValidators(question.validators);\n    const defaultValue = question.defaultValue ? question.defaultValue : null;\n    switch (question.type) {\n      case QuestionType.Repeater:\n        const newArray = this.fb.array([], convertedValidators);\n        const currentArray = currentQuestionnaireForm ? (currentQuestionnaireForm.get([section.name, question.name]) as FormArray) : false;\n\n        if (currentArray && question.filteredRepeaterQuestions) {\n          for (const control of currentArray.controls) {\n\n            const index = currentArray.controls.indexOf(control);\n            \n            if (!index) {\n              continue;\n            }\n\n            const filteredQuestions = question.filteredRepeaterQuestions[index];\n\n            if (!filteredQuestions) {\n              continue;\n            }\n\n            const filteredQuestionNames = filteredQuestions.map(x => x.name);\n            const filteredOutQuestions = question.repeaterQuestions.filter(x => !filteredQuestionNames.includes(x.name))\n\n            for (const filteredOutQuestion of filteredOutQuestions) {\n              const childControl = control.get(filteredOutQuestion.name);\n              childControl.setValidators([]);\n              childControl.updateValueAndValidity();\n            }\n\n            for (const filteredQuestion of filteredQuestions) {\n              const childControl = control.get(filteredQuestion.name);\n              const convertedValidators = this.convertValidators(filteredQuestion.validators);\n              childControl.setValidators(convertedValidators);\n              childControl.updateValueAndValidity();\n            }\n          }\n        }\n\n        return currentArray ? currentArray : newArray;\n      case QuestionType.Checklist:\n        return this.generateGroupForChecklist(question, convertedValidators);\n      case QuestionType.Slider:\n        return this.fb.control(defaultValue, { validators: convertedValidators }); // Remove update on blur for sliders.\n      default:\n        return this.fb.control(defaultValue, { validators: convertedValidators, updateOn: 'blur' });\n    }\n  }\n\n  /**\n   * Generates the form group for a checklist question.\n   * @param question The question. Must be of type checklist or else null is returned.\n   * @returns A form group.\n   * @author Will Poulson\n   */\n  private generateGroupForChecklist(question: Question, convertedValidators) {\n    if (question.type !== QuestionType.Checklist || question.checklistItems.length === 0) {\n      return null;\n    }\n\n    const checklistForms: FormGroup = this.fb.group({});\n    for (const checklistItem of question.checklistItems) {\n      const checklistItemControl = this.fb.control(null, convertedValidators);\n      checklistForms.addControl(checklistItem.name, checklistItemControl);\n    }\n    return checklistForms;\n  }\n\n\n  /**\n   * Generates the form template for a repeater question.\n   * @param question The question. Must be of type repeater or else null is returned.\n   * @returns A form group.\n   * @author Will Poulson\n   */\n  public generateFormsForRepeater(question: Question, index?: any): FormGroup {\n    if (question.type !== QuestionType.Repeater || question.repeaterQuestions.length === 0) {\n      console.log('Question isnt a repeater or has no questions, returning null');\n      return null;\n    }\n\n    const repeaterForms: FormGroup = this.fb.group({});\n\n    for (const repeaterQuestion of question.repeaterQuestions) {\n      const repeaterQuestionControl = this.generateControlForRepeaterQuestion(repeaterQuestion);\n      repeaterForms.addControl(repeaterQuestion.name, repeaterQuestionControl);\n    }\n\n    return repeaterForms;\n  }\n\n  /**\n   * Generates a control for a repeaters question.\n   * @param repeaterQuestion A repeater question.\n   * @returns An abstract control.\n   * @author Will Poulson\n   */\n  private generateControlForRepeaterQuestion(repeaterQuestion: RepeaterQuestion): AbstractControl {\n    const convertedValidators = this.convertValidators(repeaterQuestion.validators);\n    return this.fb.control(null, { validators: convertedValidators, updateOn: 'blur' });\n  }\n\n  /**\n   * Converts an array of validators into form validators.\n   * @param validators The uncoverted array of validators.\n   * @returns A convered array of form validators.\n   * @author Will Poulson\n   */\n  private convertValidators(validators: Array<Validator>): Array<ValidatorFn> {\n    if (!validators || validators.length === 0) {\n      return [];\n    }\n    const convertedValidators: Array<ValidatorFn> = [];\n    for (const validator of validators) {\n      const convertedValidator = this.convertValidator(validator);\n      if (convertedValidator) {\n        convertedValidators.push(convertedValidator);\n      }\n    }\n    return convertedValidators;\n  }\n\n  /**\n   * Converts a single validator into a form validator.\n   * @param validator The unconverted validator.\n   * @returns A converted form validator.\n   * @author Will Poulson\n   */\n  private convertValidator(validator: Validator): ValidatorFn | null {\n    switch (validator.type) {\n      case ValidationType.Required:\n        return Validators.required;\n      default:\n        return null;\n    }\n  }\n\n  /**\n   * Constructs the forms for repeaters from saved state.\n   * @param savedState The saved state to load.\n   * @param sections The sections already generated by the form constructor.\n   */\n  public constructRepeaterFromsFromState(savedState: any, sections: Array<Section>, currentQuestionnaireForm: FormGroup) {\n    for (const section of sections) {\n      for (const question of section.questions) {\n        if (question.type !== QuestionType.Repeater) {\n          continue;\n        }\n\n        const repeaterArray = savedState[section.name][question.name];\n        if (!repeaterArray || repeaterArray.length === 0) {\n          continue;\n        }\n\n        const repeaterFormArray = currentQuestionnaireForm.get([section.name, question.name]) as FormArray;\n\n        if (repeaterFormArray.controls.length === repeaterArray.length) {\n          continue;\n        }\n\n        // For each item that used to be there push a new empty template there to be populated.\n        for (const repeaterItem of repeaterArray) {\n          const index = repeaterArray.indexOf(repeaterItem);\n          const repeaterItemTemplate = this.generateFormsForRepeater(question, index);\n          repeaterFormArray.push(repeaterItemTemplate);\n        }\n      }\n    }\n  }\n}\n"]}
@@ -513,33 +513,43 @@ class FormConstructorService {
513
513
  const newArray = this.fb.array([], convertedValidators);
514
514
  /** @type {?} */
515
515
  const currentArray = currentQuestionnaireForm ? ((/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])))) : false;
516
- if (currentArray) {
517
- console.log('Has current array');
518
- /** @type {?} */
519
- const controlsSnapshot = clone(currentArray.controls);
520
- for (const item of controlsSnapshot) {
521
- console.log('Got item', item);
516
+ if (currentArray && question.filteredRepeaterQuestions) {
517
+ for (const control of currentArray.controls) {
522
518
  /** @type {?} */
523
- const index = currentArray.controls.indexOf(item);
519
+ const index = currentArray.controls.indexOf(control);
520
+ if (!index) {
521
+ continue;
522
+ }
524
523
  /** @type {?} */
525
- const group = this.generateFormsForRepeater(question, index);
526
- console.log('Filtered to', group);
527
- // Gross comparison below. Could be optimised however it's here to avoid inf loop.
524
+ const filteredQuestions = question.filteredRepeaterQuestions[index];
525
+ if (!filteredQuestions) {
526
+ continue;
527
+ }
528
528
  /** @type {?} */
529
- const currentItemStrinify = JSON.stringify(item.controls.map((/**
529
+ const filteredQuestionNames = filteredQuestions.map((/**
530
530
  * @param {?} x
531
531
  * @return {?}
532
532
  */
533
- x => name)));
533
+ x => x.name));
534
534
  /** @type {?} */
535
- const newItemStringify = JSON.stringify(((/** @type {?} */ (group))).controls.map((/**
535
+ const filteredOutQuestions = question.repeaterQuestions.filter((/**
536
536
  * @param {?} x
537
537
  * @return {?}
538
538
  */
539
- x => name)));
540
- if (currentItemStrinify !== newItemStringify) {
541
- group.patchValue(item.value);
542
- currentArray.setControl(index, group);
539
+ x => !filteredQuestionNames.includes(x.name)));
540
+ for (const filteredOutQuestion of filteredOutQuestions) {
541
+ /** @type {?} */
542
+ const childControl = control.get(filteredOutQuestion.name);
543
+ childControl.setValidators([]);
544
+ childControl.updateValueAndValidity();
545
+ }
546
+ for (const filteredQuestion of filteredQuestions) {
547
+ /** @type {?} */
548
+ const childControl = control.get(filteredQuestion.name);
549
+ /** @type {?} */
550
+ const convertedValidators = this.convertValidators(filteredQuestion.validators);
551
+ childControl.setValidators(convertedValidators);
552
+ childControl.updateValueAndValidity();
543
553
  }
544
554
  }
545
555
  }
@@ -586,20 +596,8 @@ class FormConstructorService {
586
596
  return null;
587
597
  }
588
598
  /** @type {?} */
589
- let repeaterQuestions = question.repeaterQuestions;
590
- if (question.filteredRepeaterQuestions && question.filteredRepeaterQuestions[index]) {
591
- repeaterQuestions = question.filteredRepeaterQuestions[index];
592
- }
593
- console.log('Index passed', index);
594
- console.log('All filtered questions', question.filteredRepeaterQuestions);
595
- console.log('Got the following repeater questions', repeaterQuestions.map((/**
596
- * @param {?} x
597
- * @return {?}
598
- */
599
- x => x.name)));
600
- /** @type {?} */
601
599
  const repeaterForms = this.fb.group({});
602
- for (const repeaterQuestion of repeaterQuestions) {
600
+ for (const repeaterQuestion of question.repeaterQuestions) {
603
601
  /** @type {?} */
604
602
  const repeaterQuestionControl = this.generateControlForRepeaterQuestion(repeaterQuestion);
605
603
  repeaterForms.addControl(repeaterQuestion.name, repeaterQuestionControl);