From 153a35821f0d25ce23cca467b76c5a7c5092c744 Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Mon, 3 Jul 2017 20:16:55 +0300
Subject: [sdc] - last merges before moving to LF

Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---
 .../workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts   | 2 +-
 .../workspace/tabs/tosca-artifacts/tosca-artifacts-view.html            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts
index 5d03563042..f12e95c9df 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts
+++ b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts
@@ -221,7 +221,7 @@ export class ResourceArtifactsViewModel {
             if (artifact.artifactGroupType === ArtifactGroupType.INFORMATION) {//fix DE256847
                 return this.$scope.currentComponent.artifacts && (!this.$scope.currentComponent.artifacts[artifact.artifactLabel] || !this.$scope.currentComponent.artifacts[artifact.artifactLabel].artifactName);
             }
-            return this.$scope.currentComponent.deploymentArtifacts && (!this.$scope.currentComponent.deploymentArtifacts[artifact.artifactLabel]);//fix DE251314
+            return this.$scope.currentComponent.selectedInstance && this.$scope.currentComponent.selectedInstance.deploymentArtifacts && this.$scope.currentComponent.selectedInstance.deploymentArtifacts[artifact.artifactLabel];
         };
 
         this.$scope.addOrUpdate = (artifact:ArtifactModel):void => {
diff --git a/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view.html b/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view.html
index 5df6b5c11f..2cc0778a90 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view.html
+++ b/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view.html
@@ -36,7 +36,7 @@
                     </div>
                     <div data-ng-repeat-end="" data-ng-if="artifact.selected" class="item-opened"  data-tests-id="details-{{$index}}">
                         <div><span class="details-title">Label:</span> {{artifact.artifactLabel}}</div>
-                        <div><span class="details-title">UUID:</span> {{artifact.uniqueId}}</div>
+                        <div><span class="details-title">UUID:</span> {{artifact.artifactUUID}}</div>
                         <div><span class="details-title">Description:</span> {{artifact.description}}</div>
 
 
-- 
cgit 1.2.3-korg