Skip to content

Commit 3724115

Browse files
Remove error validation from getErrorMessages
1 parent 02ff5b4 commit 3724115

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div *ngIf="!isValid()">
22
<div class="invalid-feedback">
3-
<p *ngFor="let message of getErrorMessagesAndValidateCustomErrors()">{{message}}</p>
3+
<p *ngFor="let message of getErrorMessages()">{{message}}</p>
44
</div>
55
<ng-content></ng-content>
66
</div>

angular-reactive-validation/src/validation-messages/validation-messages.component.ts

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,8 @@ export class ValidationMessagesComponent implements OnInit, AfterContentInit, On
8484
return this.getFirstErrorPerControl().length === 0;
8585
}
8686

87-
getErrorMessagesAndValidateCustomErrors(): string[] {
88-
const firstErrorPerControl = this.getFirstErrorPerControl();
89-
this.validateCustomErrors(firstErrorPerControl);
90-
91-
return firstErrorPerControl.filter(error => error.hasMessage())
87+
getErrorMessages(): string[] {
88+
return this.getFirstErrorPerControl().filter(error => error.hasMessage())
9289
.map(error => error.getMessage());
9390
}
9491

@@ -133,21 +130,9 @@ export class ValidationMessagesComponent implements OnInit, AfterContentInit, On
133130

134131
if (messageComponent) {
135132
messageComponent.show(error);
136-
}
137-
}
138-
139-
private validateCustomErrors(errors: ValidationError[]) {
140-
errors = errors.filter(error => !error.hasMessage());
141-
142-
for (const error of errors) {
143-
const messageComponent = this.messageComponents.find(component => {
144-
return component.canHandle(error);
145-
});
146-
147-
if (!messageComponent) {
148-
throw new Error(`There is no suitable arv-validation-message element to show the '${error.key}' ` +
149-
`error of '${getControlPath(error.control)}'`);
150-
}
133+
} else {
134+
throw new Error(`There is no suitable arv-validation-message element to show the '${error.key}' ` +
135+
`error of '${getControlPath(error.control)}'`);
151136
}
152137
}
153138
}

0 commit comments

Comments
 (0)