Repository navigation
[TR] The option "None of the above" is not unticked in case other option is selected #1667
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,8 +56,6 @@ import { ProfileValidators } from '../../pages/risk-assessment/profile-form/prof | |
| import { DomSanitizer } from '@angular/platform-browser'; | ||
| import { Subject } from 'rxjs/internal/Subject'; | ||
| import { takeUntil } from 'rxjs/internal/operators/takeUntil'; | ||
| import { startWith } from 'rxjs/internal/operators/startWith'; | ||
| import { pairwise } from 'rxjs/internal/operators/pairwise'; | ||
| @Component({ | ||
| selector: 'app-dynamic-form', | ||
|
|
||
|
|
@@ -141,7 +139,7 @@ export class DynamicFormComponent implements OnInit, OnDestroy { | |
| const multiSelect = this.getMultiSelectGroup(question); | ||
| this.formGroup.addControl(index.toString(), multiSelect); | ||
| const noneKey = this.getNoneOptionIndex(question.options); | ||
| if (noneKey) { | ||
| if (noneKey !== null) { | ||
| this.applyNoneLogic(multiSelect, noneKey.toString()); | ||
| } | ||
| } else { | ||
|
|
@@ -224,38 +222,38 @@ export class DynamicFormComponent implements OnInit, OnDestroy { | |
| }); | ||
| } | ||
|
|
||
| private applyNoneLogic(control: AbstractControl, noneKey: string) { | ||
| control.valueChanges | ||
| .pipe(takeUntil(this.destroy$), startWith(control.value), pairwise()) | ||
| .subscribe(([prev, curr]) => { | ||
| const changedKey = Object.keys(curr).find( | ||
| key => curr[key] === true && prev[key] === false | ||
| ); | ||
| private applyNoneLogic(control: FormGroup, noneKey: string) { | ||
| let prevValue = { ...control.value }; | ||
|
|
||
| if (!changedKey) { | ||
| return; | ||
| } | ||
| control.valueChanges.pipe(takeUntil(this.destroy$)).subscribe(currValue => { | ||
| const changedKey = Object.keys(currValue).find( | ||
| key => currValue[key] === true && !prevValue[key] | ||
| ); | ||
|
|
||
| if (changedKey == noneKey) { | ||
| const newValue = { ...curr }; | ||
| if (changedKey === noneKey) { | ||
| const newValue = { ...currValue }; | ||
|
|
||
| Object.keys(newValue).forEach(key => { | ||
| if (key !== noneKey) { | ||
| newValue[key] = false; | ||
| } | ||
| }); | ||
| Object.keys(newValue).forEach(key => { | ||
| if (key !== noneKey) { | ||
| newValue[key] = false; | ||
| } | ||
| }); | ||
|
|
||
| control.setValue(newValue, { emitEvent: false }); | ||
| } else if (curr[noneKey] === true) { | ||
| control.patchValue({ [noneKey]: false }, { emitEvent: false }); | ||
| } | ||
| }); | ||
| control.setValue(newValue, { emitEvent: false }); | ||
| } else if (changedKey && currValue[noneKey] === true) { | ||
| control.patchValue({ [noneKey]: false }, { emitEvent: false }); | ||
| } | ||
|
|
||
| prevValue = { ...control.value }; | ||
| }); | ||
| } | ||
|
|
||
| private getNoneOptionIndex(options: OptionType[] | undefined): number | null { | ||
| if (!options) return null; | ||
| return options.findIndex(option => | ||
| this.getOptionValue(option)?.toLowerCase().includes('none') | ||
| ); | ||
| const index = options.findIndex(option => { | ||
| const value = this.getOptionValue(option); | ||
| return typeof value === 'string' && value.toLowerCase().includes('none'); | ||
| }); | ||
| return index !== -1 ? index : null; | ||
| } | ||
|
Comment on lines
251
to
258
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The private getNoneOptionIndex(options: OptionType[] | undefined): number | null {
if (!options) return null;
const index = options.findIndex(option => {
const value = this.getOptionValue(option);
return typeof value === 'string' && value.toLowerCase().includes('none');
});
return index !== -1 ? index : null;
} |
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Subscribing to each individual control's
valueChangesin a loop creates multiple subscriptions and is less efficient. It can also lead to memory leaks if the form controls are recreated or updated. A cleaner and more idiomatic Angular/RxJS approach is to subscribe to the parentFormGroup'svalueChangesonce, and keep track of the previous value using a local variable to detect changes.