Skip to content

Commit

Permalink
fix: allow hyphen in path mapping
Browse files Browse the repository at this point in the history
(cherry picked from commit 87965d6)

# Conflicts:
#	gravitee-apim-console-webui/src/management/api/analytics/pathMappings/api-path-mappings-add-dialog/api-path-mappings-add-dialog.component.ts
  • Loading branch information
vikrantgravitee authored and mergify[bot] committed Jan 24, 2025
1 parent 207e974 commit 98742fd
Showing 1 changed file with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,15 @@ export class ApiPathMappingsAddDialogComponent implements OnInit {
}
}

<<<<<<< HEAD
private initFormGroup(): UntypedFormGroup {
return new UntypedFormGroup({
path: new UntypedFormControl(null, [Validators.required, isUnique(this.api.pathMappings), Validators.pattern('^/[a-zA-Z0-9:/]+')]),
=======
private initFormGroup(): FormGroup {
return new FormGroup({
path: new FormControl(null, [Validators.required, isUnique(this.api.pathMappings), Validators.pattern('^/[a-zA-Z0-9:/._-]+')]),
>>>>>>> 87965d6aa5 (fix: allow hyphen in path mapping)
});
}
}

0 comments on commit 98742fd

Please sign in to comment.