Spring/spring-flo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finalize fixes for unique resource validator

Browse Source
This commit is contained in:
BoykoAlex
2019-12-24 18:29:09 -05:00
parent 43af4ea04e
commit f4cf3cd8f2
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/lib/shared/flo-properties.ts
View File

@@ -2,7 +2,7 @@ import { dia } from 'jointjs';
import { ValidatorFn, AsyncValidatorFn, AbstractControl, ValidationErrors } from '@angular/forms'
import { Flo } from './flo-common';
import { Subject, Observable } from 'rxjs'
import {debounceTime, map, switchMap} from 'rxjs/operators';
import {debounceTime, switchMap} from 'rxjs/operators';
export namespace Properties {
@@ -335,25 +335,42 @@ export namespace Properties {
}
const UNIQUE_RESOURCE_ERROR = {uniqueResource: true};
export namespace Validators {
export function uniqueResource(service: (value: any) => Observable<boolean>, debounceDuration: number): AsyncValidatorFn {
return (control: AbstractControl): Observable<ValidationErrors> => {
if (control.valueChanges) {
return control.valueChanges.pipe(
debounceTime(debounceDuration),
switchMap(() => service(control.value)),
map(res => {
return res ? {uniqueResource: true} : undefined;
return new Observable<ValidationErrors>(obs => {
if (control.valueChanges) {
return control.valueChanges.pipe(
debounceTime(debounceDuration),
switchMap(() => service(control.value)),
).subscribe((res) => {
if (res) {
obs.next(undefined);
} else {
obs.next(UNIQUE_RESOURCE_ERROR);
}
obs.complete();
}, () => {
obs.next(UNIQUE_RESOURCE_ERROR);
obs.complete();
});
} else {
service(control.value).subscribe((res) => {
if (res) {
obs.next(undefined);
} else {
obs.next(UNIQUE_RESOURCE_ERROR);
}
obs.complete();
}, () => {
obs.next(UNIQUE_RESOURCE_ERROR);
obs.complete();
})
);
} else {
return service(control.value).pipe(
map(res => {
return res ? {uniqueResource: true} : undefined;
})
);
}
}
});
}
}