From 6896c1b309aaa50dca820169b9f1ae3f8af84294 Mon Sep 17 00:00:00 2001
From: siddharth0905 <siddharth.singh4@amdocs.com>
Date: Wed, 10 Apr 2019 17:49:51 +0530
Subject: Apply Valid Value Constraints validation

Apply Valid Value Constraints validation for FE and BE in
Property Assignment, Input, Service Consumption screen

Change-Id: I01c7523bad702f003cd52fd88bc69fe950b2b4f3
Issue-ID: SDC-2224
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
---
 catalog-ui/src/app/models/properties-inputs/property-be-model.ts | 9 +++++++--
 catalog-ui/src/app/models/properties.ts                          | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'catalog-ui/src/app/models')

diff --git a/catalog-ui/src/app/models/properties-inputs/property-be-model.ts b/catalog-ui/src/app/models/properties-inputs/property-be-model.ts
index aa68551950..a1a85aa73d 100644
--- a/catalog-ui/src/app/models/properties-inputs/property-be-model.ts
+++ b/catalog-ui/src/app/models/properties-inputs/property-be-model.ts
@@ -28,12 +28,12 @@ export enum DerivedPropertyType {
 }
 
 export class PropertyBEModel {
-
+    constraints: Array<any>;
     defaultValue: string;
     definition: boolean;
     description: string;
     fromDerived: boolean;
-    getInputValues: Array<PropertyInputDetail>
+    getInputValues: Array<PropertyInputDetail>;
     name: string;
     parentUniqueId: string;
     password: boolean;
@@ -43,9 +43,12 @@ export class PropertyBEModel {
     type: string;
     uniqueId: string;
     value: string;
+    parentPropertyType: string;
+    subPropertyInputPath: string;
 
     constructor(property?: PropertyBEModel) {
         if (property) {
+            this.constraints = property.constraints;
             this.defaultValue = property.defaultValue;
             this.description = property.description;
             this.fromDerived = property.fromDerived;
@@ -60,6 +63,8 @@ export class PropertyBEModel {
             this.value = property.value;
             this.definition = property.definition;
             this.getInputValues = property.getInputValues;
+            this.parentPropertyType = property.parentPropertyType;
+            this.subPropertyInputPath = property.subPropertyInputPath;
         }
 
         if (!this.schema || !this.schema.property) {
diff --git a/catalog-ui/src/app/models/properties.ts b/catalog-ui/src/app/models/properties.ts
index a629140cb8..016c5b9f20 100644
--- a/catalog-ui/src/app/models/properties.ts
+++ b/catalog-ui/src/app/models/properties.ts
@@ -40,7 +40,6 @@ export class PropertiesGroup {
 export interface IPropertyModel extends InputPropertyBase {
 
     //server data
-    constraints:Array<Object>;
     source:string;
 
     //instance properties
@@ -60,7 +59,6 @@ export class PropertyModel extends PropertyBEModel implements IPropertyModel {
     //server data
     uniqueId:string;
     name:string;
-    constraints:Array<Object>;
     defaultValue:string;
     description:string;
     password:boolean;
@@ -93,7 +91,6 @@ export class PropertyModel extends PropertyBEModel implements IPropertyModel {
     constructor(property?:PropertyModel) {
         super(property);
         if (property) {
-            this.constraints = property.constraints;
             this.source = property.source;
             this.valueUniqueUid = property.valueUniqueUid;
             this.path = property.path;
-- 
cgit 1.2.3-korg