RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23939 from votdev/bug_35685

Browse Source 
mgr/dashboard: Fix bug in user form when changing password

Reviewed-by: Stephan Müller <smueller@suse.com>
This commit is contained in:
Lenz Grimmer 2018-09-10 14:29:24 +02:00 committed by GitHub
commit 51604c6c78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts
View File

@ -174,18 +174,19 @@ describe('CdValidators', () => {
describe('match', () => {
let form: FormGroup;
let x: FormControl;
let y: FormControl;
beforeEach(() => {
x = new FormControl('aaa');
y = new FormControl('aaa');
form = new FormGroup({
x: new FormControl(),
y: new FormControl()
x: x,
y: y
});
});
it('should error when values are different', () => {
const x = form.get('x');
const y = form.get('y');
x.setValue('aaa');
y.setValue('aab');
CdValidators.match('x', 'y')(form);
expect(x.hasError('match')).toBeFalsy();
@ -193,14 +194,27 @@ describe('CdValidators', () => {
});
it('should not error when values are equal', () => {
const x = form.get('x');
const y = form.get('y');
x.setValue('aaa');
y.setValue('aaa');
CdValidators.match('x', 'y')(form);
expect(x.hasError('match')).toBeFalsy();
expect(y.hasError('match')).toBeFalsy();
});
it('should unset error when values are equal', () => {
y.setErrors({ match: true });
CdValidators.match('x', 'y')(form);
expect(x.hasError('match')).toBeFalsy();
expect(y.hasError('match')).toBeFalsy();
expect(y.valid).toBeTruthy();
});
it('should keep other existing errors', () => {
y.setErrors({ match: true, notUnique: true });
CdValidators.match('x', 'y')(form);
expect(x.hasError('match')).toBeFalsy();
expect(y.hasError('match')).toBeFalsy();
expect(y.hasError('notUnique')).toBeTruthy();
expect(y.valid).toBeFalsy();
});
});
describe('unique', () => {

30
src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.ts
View File

@ -108,16 +108,30 @@ export class CdValidators {
}
/**
* Validate if control1 and control2 have the same value.
* Error will be added to control2.
*
* @param {string} control1
* @param {string} control2
* Validator that requires that both specified controls have the same value.
* Error will be added to the `path2` control.
* @param {string} path1 A dot-delimited string that define the path to the control.
* @param {string} path2 A dot-delimited string that define the path to the control.
* @return {ValidatorFn} Returns a validator function that always returns `null`.
* If the validation fails an error map with the `match` property will be set
* on the `path2` control.
*/
static match(control1: string, control2: string): ValidatorFn {
static match(path1: string, path2: string): ValidatorFn {
return (control: AbstractControl): { [key: string]: any } => {
if (control.get(control1).value !== control.get(control2).value) {
control.get(control2).setErrors({ ['match']: true });
const ctrl1 = control.get(path1);
const ctrl2 = control.get(path2);
if (ctrl1.value !== ctrl2.value) {
ctrl2.setErrors({ match: true });
} else {
const hasError = ctrl2.hasError('match');
if (hasError) {
// Remove the 'match' error. If no more errors exists, then set
// the error value to 'null', otherwise the field is still marked
// as invalid.
const errors = ctrl2.errors;
_.unset(errors, 'match');
ctrl2.setErrors(_.isEmpty(_.keys(errors)) ? null : errors);
}
}
return null;
};