1 files changed, 29 insertions, 4 deletions
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 1f484160da..7c29d98641 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,7 +13,6 @@
   ~ 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' : '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">
@@ -160,8 +159,11 @@
                                  fields-prefix-name="currentPropertyIndex"
                                  read-only="(editPropertyModel.property.readonly && !isPropertyValueOwner) || isVnfConfiguration"
                                  default-value="{{getDefaultValue()}}"
-                                 max-length="maxLength"></type-map>
+                                 max-length="maxLength"
+                                 constraints = "editPropertyModel.property.constraints && editPropertyModel.property.constraints[0].validValues">
+                            </type-map>
                         </div>
+                        
                         <div ng-switch-when="list">
                             <type-list value-obj-ref="myValue"
                                   schema-property="editPropertyModel.property.schema.property"
@@ -169,14 +171,36 @@
                                   fields-prefix-name="currentPropertyIndex"
                                   read-only="editPropertyModel.property.readonly && !isPropertyValueOwner"
                                   default-value="{{getDefaultValue()}}"
-                                  max-length="maxLength"></type-list>
+                                  max-length="maxLength"
+                                  constraints = "editPropertyModel.property.constraints && editPropertyModel.property.constraints[0].validValues"></type-list>
                         </div>
+                        
                         <div ng-switch-default>
                             <div class="i-sdc-form-item" data-ng-class="{error:(forms.editForm.value.$dirty && forms.editForm.value.$invalid), 'input-group' : editPropertyModel.property.addOn}">
                                 <span ng-if="editPropertyModel.property.addOn" class="input-group-addon">{{editPropertyModel.property.addOn}}</span>
+                                <!-- Has Constraints -->
+                                <select class="i-sdc-form-select"
+                                        data-tests-id="constraints"
+                                        ng-if="(editPropertyModel.property.constraints)"
+                                        data-ng-disabled="editPropertyModel.property.readonly && !isPropertyValueOwner"
+                                        
+                                        data-ng-change="onValueChange()"
+                                        data-ng-model="editPropertyModel.property.value">
+                                    <!-- Get the default value in case exist -->
+                                    <option value = "{{editPropertyModel.property.value}}" name = "{{editPropertyModel.property.value}}" hidden selected>
+                                            {{editPropertyModel.property.value}}
+                                    </option> 
+                                    <!-- add all constratint to Select list -->
+                                    <option ng-repeat='value in constraints' value="{{value}}" name="{{value}}">
+                                        {{value}}
+                                    </option> 
+                                </select>
+                               
+                                
+                                <!-- No Constraints -->
                                 <input class="i-sdc-form-input"
                                        data-tests-id="defaultvalue"
-                                       ng-if="!((editPropertyModel.property.simpleType||editPropertyModel.property.type) == 'boolean')"
+                                       ng-if="!(editPropertyModel.property.constraints) && !((editPropertyModel.property.simpleType||editPropertyModel.property.type) == 'boolean')"
                                        data-ng-maxlength="maxLength"
                                        data-ng-disabled="editPropertyModel.property.readonly && !isPropertyValueOwner"
                                        maxlength="{{maxLength}}"
@@ -189,6 +213,7 @@
                                                         ||(!forms.editForm.value.$error.pattern && ('integer'==editPropertyModel.property.type && forms.editForm.value.$setValidity('pattern', validateIntRange(editPropertyModel.property.value)) || onValueChange()))"
                                        data-ng-change=""
                                        autofocus />
+                                <!-- Boolean -->
                                 <select class="i-sdc-form-select"
                                         data-tests-id="booleantype"
                                         ng-if="(editPropertyModel.property.simpleType||editPropertyModel.property.type) == 'boolean'"