Skip to content
This repository has been archived by the owner on Oct 20, 2021. It is now read-only.

feat(metadata): add EL support for the "email-support" API metadata #1095

Merged
merged 1 commit into from Jan 7, 2020
Merged

feat(metadata): add EL support for the "email-support" API metadata #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/metadata/metadata.validator.directive.ts
View file
Open in desktop
Expand Up @@ -31,13 +31,13 @@ const MetadataValidatorDirective: IDirective = ({
scope.$watch('format', function (newFormat) {
switch (newFormat) {
case 'numeric':
scope.ngPattern = /^\d+(\.\d{1,2})?$/;
scope.ngPattern = /^((\$\{.+\})|\d+(\.\d{1,2})?)$/;
break;
case 'url':
scope.ngPattern = /^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/;
scope.ngPattern = /^((\$\{.+\})|(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?)$/;
break;
case 'mail':
scope.ngPattern = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
scope.ngPattern = /^((\$\{.+\})|(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,})))$/;
break;
case 'string':
delete scope.ngPattern;
Expand Down
1 change: 1 addition & 0 deletions src/management/api/portal/documentation/metadata/dialog/save.api.metadata.dialog.html
View file
Open in desktop
Expand Up @@ -59,6 +59,7 @@ <h4>{{$ctrl.metadata.key?'Update':'Create'}} API metadata</h4>
<input type="text" ng-model="$ctrl.metadata.value" placeholder="{{$ctrl.metadata.defaultValue}}"
md-autofocus="{{$ctrl.metadata.key && !$ctrl.metadata.apiId?'true':'false'}}"
gv-metadata-format="$ctrl.metadata.format" ng-pattern="pattern" gv-metadata-validator>
<div class="hint">Supports Freemarker</div>
</md-input-container>

<md-input-container ng-if="$ctrl.metadata.key && !$ctrl.metadata.apiId && $ctrl.metadata.format === 'boolean'" flex>
Expand Down