diff options
7 files changed, 26 insertions, 21 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java index 2f98faed68..7bec5d5f09 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java @@ -84,7 +84,7 @@ import org.springframework.web.context.WebApplicationContext; public class BeGenericServlet extends BasicServlet { private static final Logger log = Logger.getLogger(BeGenericServlet.class); - private static final String PROPERTY_NAME_REGEX = "[\\w,\\d,_:]+"; + private static final String PROPERTY_NAME_REGEX = "[a-zA-Z0-9_:-@]+"; @Context protected HttpServletRequest servletRequest; protected ComponentsUtils componentsUtils; diff --git a/catalog-ui/src/app/app.ts b/catalog-ui/src/app/app.ts index ba9bd44e03..76c1d28489 100644 --- a/catalog-ui/src/app/app.ts +++ b/catalog-ui/src/app/app.ts @@ -612,7 +612,7 @@ ng1appModule.config([ ng1appModule.value('ValidationPattern', /^[\s\w\&_.:-]{1,1024}$/); ng1appModule.value('ComponentNameValidationPattern', /^(?=.*[^. ])[\s\w\&_.:-]{1,1024}$/); //DE250513 - same as ValidationPattern above, plus requirement that name not consist of dots and/or spaces alone. -ng1appModule.value('PropertyNameValidationPattern', /^[a-zA-Z0-9_:-]{1,50}$/);// DE210977 +ng1appModule.value('PropertyNameValidationPattern', /^[a-zA-Z0-9_:-@]{1,100}$/);// DE210977 ng1appModule.value('TagValidationPattern', /^[\s\w_.-]{1,50}$/); ng1appModule.value('VendorReleaseValidationPattern', /^[\x20-\x21\x23-\x29\x2B-\x2E\x30-\x39\x3B\x3D\x40-\x5B\x5D-\x7B\x7D-\xFF]{1,25}$/); ng1appModule.value('VendorNameValidationPattern', /^[\x20-\x21\x23-\x29\x2B-\x2E\x30-\x39\x3B\x3D\x40-\x5B\x5D-\x7B\x7D-\xFF]{1,60}$/); diff --git a/catalog-ui/src/app/utils/constants.ts b/catalog-ui/src/app/utils/constants.ts index d6710ed767..0de83d257e 100644 --- a/catalog-ui/src/app/utils/constants.ts +++ b/catalog-ui/src/app/utils/constants.ts @@ -165,6 +165,7 @@ export class PROPERTY_DATA { export class PROPERTY_VALUE_CONSTRAINTS { public static MAX_LENGTH = 2500; public static JSON_MAX_LENGTH = 4096; + public static NAME_MAX_LENGTH = 100; } export class Role { diff --git a/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-model.ts b/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-model.ts index fe578b6865..421e205af5 100644 --- a/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-model.ts +++ b/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-model.ts @@ -25,7 +25,7 @@ import * as _ from "lodash"; import {DataTypesService} from "app/services/data-types-service"; import {PropertyModel, DataTypesMap, Component} from "app/models"; -import {ValidationUtils, PROPERTY_DATA} from "app/utils"; +import {ValidationUtils, PROPERTY_DATA, PROPERTY_VALUE_CONSTRAINTS} from "app/utils"; export interface IPropertyFormBaseViewScope extends ng.IScope { @@ -51,6 +51,7 @@ export interface IPropertyFormBaseViewScope extends ng.IScope { isDescriptionDisable:boolean; isPropertyValueDisable:boolean; isArrowsDisabled:boolean; + nameMaxLength:number; //Validation pattern validationPattern:RegExp; @@ -138,6 +139,7 @@ export abstract class PropertyFormBaseView { this.$scope.dataTypes = this.DataTypesService.getAllDataTypesFromModel(this.component.model); //Get all data types in service this.$scope.modalPropertyFormBase = this.$uibModalInstance; this.$scope.isNew = !angular.isDefined(this.$scope.property.name); + this.$scope.nameMaxLength = PROPERTY_VALUE_CONSTRAINTS.NAME_MAX_LENGTH; this.initValidations(); this.initButtonsState(); diff --git a/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-view.html b/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-view.html index ae96b66641..bb4524ee45 100644 --- a/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-view.html +++ b/catalog-ui/src/app/view-models/forms/property-forms/base-property-form/property-form-base-view.html @@ -37,9 +37,9 @@ <label class="i-sdc-form-label" ng-class="{'required': !isService}">Name</label> <input class="i-sdc-form-input" data-tests-id="propertyName" - data-ng-maxlength="50" + data-ng-maxlength="nameMaxLength" data-ng-disabled="isNameDisable" - maxlength="50" + maxlength="{{nameMaxLength}}" data-ng-model="property.name" type="text" name="propertyName" @@ -50,7 +50,7 @@ <div class="input-error" data-ng-show="forms.editForm.propertyName.$dirty && forms.editForm.propertyName.$invalid"> <span ng-show="forms.editForm.propertyName.$error.required" translate="VALIDATION_ERROR_REQUIRED" translate-values="{'field': 'Property name' }"></span> - <span ng-show="forms.editForm.propertyName.$error.maxlength" translate="VALIDATION_ERROR_MAX_LENGTH" translate-values="{'max': '50' }"></span> + <span ng-show="forms.editForm.propertyName.$error.maxlength" translate="VALIDATION_ERROR_MAX_LENGTH" translate-values="{'max': '{{nameMaxLength}}' }"></span> <span ng-show="forms.editForm.propertyName.$error.pattern" translate="VALIDATION_ERROR_SPECIAL_CHARS_NOT_ALLOWED"></span> </div> </div> diff --git a/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts b/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts index 103b1341c0..614f1583cb 100644 --- a/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts +++ b/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts @@ -47,6 +47,7 @@ interface IPropertyFormViewModelScope extends ng.IScope { editForm:ng.IFormController; footerButtons:Array<any>; isNew:boolean; + nameMaxLength:number; isLoading:boolean; componentMetadata: { isService: boolean, isVfc: boolean } validationPattern:RegExp; @@ -241,6 +242,7 @@ export class PropertyFormViewModel { this.$scope.validationPattern = this.ValidationPattern; this.$scope.propertyNameValidationPattern = this.PropertyNameValidationPattern; this.$scope.commentValidationPattern = this.CommentValidationPattern; + this.$scope.nameMaxLength = PROPERTY_VALUE_CONSTRAINTS.NAME_MAX_LENGTH; this.$scope.isNew = (this.formState === FormState.CREATE); this.$scope.componentMetadata = { isService: this.workspaceService.metadata.isService(), diff --git a/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view.html b/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view.html index a6fd69755a..105bef3ea9 100644 --- a/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view.html +++ b/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view.html @@ -13,11 +13,11 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<ng1-modal modal="modalInstanceProperty" type="classic" class="sdc-edit-property-container" buttons="footerButtons" header="{{isNew ? 'Add' : isViewOnly ? '' : 'Update'}} Property {{isViewOnly ? 'Definition' : ''}}" show-close-button="true" data-tests-id="sdc-edit-property-container"> +<ng1-modal modal="modalInstanceProperty" type="classic" class="sdc-edit-property-container" buttons="footerButtons" header="{{isNew ? 'Add' : 'Update' }} Property" show-close-button="true" data-tests-id="sdc-edit-property-container"> <loader data-display="isLoading" relative="false" size="medium"></loader> <div class="sdc-modal-top-bar" data-ng-if="!isNew"> <div class="sdc-modal-top-bar-buttons"> - <span ng-click="delete(editPropertyModel.property)" data-ng-class="{'disabled' : isPropertyValueOwner || editPropertyModel.property.readonly || propertyOwnerType == 'group' || propertyOwnerType == 'policy' || isViewOnly}" class="sprite-new delete-btn" data-tests-id="delete_property" sdc-smart-tooltip="">Delete</span> + <span ng-click="delete(editPropertyModel.property)" data-ng-class="{'disabled' : isPropertyValueOwner || editPropertyModel.property.readonly || propertyOwnerType == 'group' || propertyOwnerType == 'policy'}" class="sprite-new delete-btn" data-tests-id="delete_property" sdc-smart-tooltip="">Delete</span> <span class="delimiter"></span> <span data-ng-click="getPrev()" data-ng-class="{'disabled' : !currentPropertyIndex }" class="sprite-new left-arrow" data-tests-id="get-prev" sdc-smart-tooltip="">Previous</span> <span data-ng-click="getNext()" data-ng-class="{'disabled' : isLastProperty }" class="sprite-new right-arrow" data-tests-id="get-next" sdc-smart-tooltip="">Next</span> @@ -37,9 +37,9 @@ <label class="i-sdc-form-label" ng-class="{'required': !componentMetadata.isService}">Name</label> <input class="i-sdc-form-input" data-tests-id="propertyName" - data-ng-maxlength="50" - data-ng-disabled="!isNew || editPropertyModel.property.readonly || isViewOnly" - maxlength="50" + data-ng-maxlength="nameMaxLength" + data-ng-disabled="!isNew || editPropertyModel.property.readonly" + maxlength="{{nameMaxLength}}" data-ng-model="editPropertyModel.property.name" type="text" name="propertyName" @@ -50,7 +50,7 @@ <div class="input-error" data-ng-show="forms.editForm.propertyName.$dirty && forms.editForm.propertyName.$invalid"> <span ng-show="forms.editForm.propertyName.$error.required" translate="VALIDATION_ERROR_REQUIRED" translate-values="{'field': 'Property name' }"></span> - <span ng-show="forms.editForm.propertyName.$error.maxlength" translate="VALIDATION_ERROR_MAX_LENGTH" translate-values="{'max': '50' }"></span> + <span ng-show="forms.editForm.propertyName.$error.maxlength" translate="VALIDATION_ERROR_MAX_LENGTH" translate-values="{'max': '{{nameMaxLength}}' }"></span> <span ng-show="forms.editForm.propertyName.$error.pattern" translate="VALIDATION_ERROR_SPECIAL_CHARS_NOT_ALLOWED"></span> </div> </div> @@ -65,7 +65,7 @@ <select class="i-sdc-form-select" data-tests-id="propertyType" data-required - data-ng-disabled="isPropertyValueOwner || editPropertyModel.property.readonly || isViewOnly" + data-ng-disabled="isPropertyValueOwner || editPropertyModel.property.readonly" name="type" data-ng-change="onTypeChange()" data-ng-model="editPropertyModel.property.type"> @@ -88,7 +88,7 @@ <select class="i-sdc-form-select" data-required data-tests-id="schema-type" - data-ng-disabled="isPropertyValueOwner || editPropertyModel.property.readonly || isViewOnly" + data-ng-disabled="isPropertyValueOwner || editPropertyModel.property.readonly" name="schemaType" data-ng-change="onSchemaTypeChange()" data-ng-model="editPropertyModel.property.schema.property.type"> @@ -122,7 +122,7 @@ <label class="i-sdc-form-label">Description</label> <textarea class="i-sdc-form-textarea" data-ng-maxlength="400" - data-ng-disabled="isPropertyValueOwner || editPropertyModel.property.readonly || isViewOnly" + data-ng-disabled="isPropertyValueOwner || editPropertyModel.property.readonly" maxlength="400" data-ng-pattern="commentValidationPattern" name="description" @@ -167,7 +167,7 @@ type-name="editPropertyModel.property.type" parent-form-obj="forms.editForm" fields-prefix-name="currentPropertyIndex" - read-only="(editPropertyModel.property.readonly && !isPropertyValueOwner) || isViewOnly" + read-only="editPropertyModel.property.readonly && !isPropertyValueOwner" default-value="{{getDefaultValue()}}" expand-by-default="true"></fields-structure> @@ -178,7 +178,7 @@ schema-property="editPropertyModel.property.schema.property" parent-form-obj="forms.editForm" fields-prefix-name="currentPropertyIndex" - read-only="(editPropertyModel.property.readonly && !isPropertyValueOwner) || isVnfConfiguration || isViewOnly" + read-only="(editPropertyModel.property.readonly && !isPropertyValueOwner) || isVnfConfiguration" default-value="{{getDefaultValue()}}" max-length="maxLength" constraints="editPropertyModel.property.constraints && editPropertyModel.property.constraints[0].validValues"> @@ -190,7 +190,7 @@ schema-property="editPropertyModel.property.schema.property" parent-form-obj="forms.editForm" fields-prefix-name="currentPropertyIndex" - read-only="(editPropertyModel.property.readonly && !isPropertyValueOwner) || isViewOnly" + read-only="editPropertyModel.property.readonly && !isPropertyValueOwner" default-value="{{getDefaultValue()}}" max-length="maxLength" constraints="editPropertyModel.property.constraints && editPropertyModel.property.constraints[0].validValues"></type-list> @@ -205,7 +205,7 @@ <select class="i-sdc-form-select" data-tests-id="constraints" ng-if="(editPropertyModel.property.constraints)" - data-ng-disabled="(editPropertyModel.property.readonly && !isPropertyValueOwner) || isViewOnly" + data-ng-disabled="editPropertyModel.property.readonly && !isPropertyValueOwner" data-ng-change="onValueChange()" data-ng-model="editPropertyModel.property.value"> @@ -226,7 +226,7 @@ data-tests-id="defaultvalue" ng-if="!(editPropertyModel.property.constraints) && !((editPropertyModel.property.simpleType||editPropertyModel.property.type) == 'boolean')" data-ng-maxlength="maxLength" - data-ng-disabled="(editPropertyModel.property.readonly && !isPropertyValueOwner) || isViewOnly" + data-ng-disabled="editPropertyModel.property.readonly && !isPropertyValueOwner" maxlength="{{maxLength}}" data-ng-model="editPropertyModel.property.value" type="text" @@ -241,7 +241,7 @@ <select class="i-sdc-form-select" data-tests-id="booleantype" ng-if="(editPropertyModel.property.simpleType||editPropertyModel.property.type) == 'boolean'" - data-ng-disabled="(editPropertyModel.property.readonly && !isPropertyValueOwner) || isViewOnly" + data-ng-disabled="editPropertyModel.property.readonly && !isPropertyValueOwner" name="value" data-ng-change="onValueChange()" data-ng-model="editPropertyModel.property.value"> |