From 16a9fce0e104a38371a9e5a567ec611ae3fc7f33 Mon Sep 17 00:00:00 2001 From: ys9693 Date: Sun, 19 Jan 2020 13:50:02 +0200 Subject: Catalog alignment Issue-ID: SDC-2724 Signed-off-by: ys9693 Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe --- .../src/app/models/graph/zones/policy-instance.ts | 38 ++++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'catalog-ui/src/app/models/graph/zones/policy-instance.ts') diff --git a/catalog-ui/src/app/models/graph/zones/policy-instance.ts b/catalog-ui/src/app/models/graph/zones/policy-instance.ts index cef1705a41..9dd2d5f212 100644 --- a/catalog-ui/src/app/models/graph/zones/policy-instance.ts +++ b/catalog-ui/src/app/models/graph/zones/policy-instance.ts @@ -5,6 +5,7 @@ import {GroupInstance} from "./group-instance"; import {ComponentInstance} from "../../componentsInstances/componentInstance"; import {TargetUiObject} from "../../ui-models/ui-target-object"; import {TargetOrMemberType} from "../../../utils/constants"; +import * as _ from 'lodash'; /* The request and response should be same model, need to fix in BE */ export class PolicyTargetsMap { @@ -66,24 +67,25 @@ export class PolicyInstance implements IZoneInstanceMethod { constructor(policy?:PolicyInstance) { - this.componentName = policy.componentName; - this.description = policy.description; - this.empty = policy.empty; - this.invariantName = policy.invariantName; - this.invariantUUID = policy.invariantUUID; - this.isFromCsar = policy.isFromCsar; - - this.name = policy.name; - this.normalizedName =policy.normalizedName; - this.type = policy.type; - this.policyTypeUid = policy.policyTypeUid; - this.policyUUID = policy.policyUUID; - this.properties = CommonUtils.initProperties(policy.properties); - this.targets = policy.targets; - this.uniqueId = policy.uniqueId; - this.version = policy.version; - this.instanceUniqueId = policy.instanceUniqueId; - + if(policy){ + this.componentName = policy.componentName; + this.description = policy.description; + this.empty = policy.empty; + this.invariantName = policy.invariantName; + this.invariantUUID = policy.invariantUUID; + this.isFromCsar = policy.isFromCsar; + + this.name = policy.name; + this.normalizedName =policy.normalizedName; + this.type = policy.type; + this.policyTypeUid = policy.policyTypeUid; + this.policyUUID = policy.policyUUID; + this.properties = CommonUtils.initProperties(policy.properties); + this.targets = policy.targets; + this.uniqueId = policy.uniqueId; + this.version = policy.version; + this.instanceUniqueId = policy.instanceUniqueId; + } this.iconSprite = ''; this.icon = 'icon-policy'; } -- cgit 1.2.3-korg