-
Notifications
You must be signed in to change notification settings - Fork 2
Add support for form async validators + unique custom validator #15
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
7 commits
Select commit
Hold shift + click to select a range
0c3afe5
Add support for form async validators + unique custom validator
stissot c09298e
uniqueValidator: fix Observable not returned
stissot 36594c4
Merge remote-tracking branch 'origin/master' into asyncvalidator
stissot 8207583
Move unique validator to a separate NaturalValidators class
stissot b45927f
Lint fixing
stissot c0bbc11
Add test for `NaturalAbstractModelService.count()`
stissot e3a88d7
Lint fixing
stissot 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 |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import {AbstractControl, AsyncValidatorFn, ValidationErrors} from '@angular/forms'; | ||
| import { NaturalQueryVariablesManager } from './query-variable-manager'; | ||
| import { NaturalAbstractModelService } from '../services/abstract-model.service'; | ||
| import { map } from 'rxjs/operators'; | ||
| import { Observable, of } from 'rxjs'; | ||
|
|
||
| export class NaturalValidators { | ||
|
|
||
| /** | ||
| * Returns an async validator function that checks that the form control value is unique | ||
| */ | ||
| public static unique( | ||
| fieldName: string, | ||
| modelService: NaturalAbstractModelService<any, any, any, any, any, any, any, any, any>): AsyncValidatorFn { | ||
|
|
||
| const validator = (control: AbstractControl): Observable<ValidationErrors | null> => { | ||
|
|
||
| const condition = {}; | ||
|
|
||
| if (control.value) { | ||
|
|
||
| condition[fieldName] = {equal: {value: control.value}}; | ||
| const variables: any = { | ||
| pagination: {pageIndex: 0, pageSize: 0}, | ||
| filter: {groups: [{conditions: [condition]}]}, | ||
| }; | ||
|
|
||
| const qvm = new NaturalQueryVariablesManager<any>(); | ||
| qvm.set('variables', variables); | ||
|
|
||
| return modelService.count(qvm).pipe( | ||
| map((count: number) => { | ||
| return count > 0 ? {duplicateValue: count} : null; | ||
| }), | ||
| ); | ||
| } | ||
|
|
||
| return of(null); | ||
| }; | ||
| return validator; | ||
| } | ||
| } |
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
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 |
|---|---|---|
|
|
@@ -33,6 +33,7 @@ const typeDefs = ` | |
|
|
||
| type Post { | ||
| id: ID! | ||
| slug: String | ||
| blog: Blog | ||
| } | ||
|
|
||
|
|
||
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
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
I'm unsure about that "null". Don't change that for now, I'll test it by myself, and implement tests.