mirror of
https://github.com/bitwarden/browser
synced 2025-12-18 01:03:35 +00:00
Improve SSO Config validation (#572)
* Extract SsoConfig enums to own file * Add ChangeStripSpaces directive * Move custom validators to jslib * Add a11y-invalid directive * Add and implement dirtyValidators * Create ssoConfigView model and factory methods * Add interface for select options * Don't build SsoConfigData if null Co-authored-by: Oscar Hinton <oscar@oscarhinton.com>
This commit is contained in:
25
angular/src/validators/dirty.validator.ts
Normal file
25
angular/src/validators/dirty.validator.ts
Normal file
@@ -0,0 +1,25 @@
|
||||
import { AbstractControl, ValidationErrors, ValidatorFn, Validators } from "@angular/forms";
|
||||
import { requiredIf } from "./requiredIf.validator";
|
||||
|
||||
/**
|
||||
* A higher order function that takes a ValidatorFn and returns a new validator.
|
||||
* The new validator only runs the ValidatorFn if the control is dirty. This prevents error messages from being
|
||||
* displayed to the user prematurely.
|
||||
*/
|
||||
function dirtyValidator(validator: ValidatorFn) {
|
||||
return (control: AbstractControl): ValidationErrors | null => {
|
||||
return control.dirty ? validator(control) : null;
|
||||
};
|
||||
}
|
||||
|
||||
export function dirtyRequiredIf(predicate: (predicateCtrl: AbstractControl) => boolean) {
|
||||
return dirtyValidator(requiredIf(predicate));
|
||||
}
|
||||
|
||||
/**
|
||||
* Equivalent to dirtyValidator(Validator.required), however using dirtyValidator returns a new function
|
||||
* each time which prevents formControl.hasError from properly comparing functions for equality.
|
||||
*/
|
||||
export function dirtyRequired(control: AbstractControl): ValidationErrors | null {
|
||||
return control.dirty ? Validators.required(control) : null;
|
||||
}
|
||||
10
angular/src/validators/requiredIf.validator.ts
Normal file
10
angular/src/validators/requiredIf.validator.ts
Normal file
@@ -0,0 +1,10 @@
|
||||
import { AbstractControl, ValidationErrors, Validators } from "@angular/forms";
|
||||
|
||||
/**
|
||||
* Returns a new validator which will apply Validators.required only if the predicate is true.
|
||||
*/
|
||||
export function requiredIf(predicate: (predicateCtrl: AbstractControl) => boolean) {
|
||||
return (control: AbstractControl): ValidationErrors | null => {
|
||||
return predicate(control) ? Validators.required(control) : null;
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user