From 27163ab0074326216309a232ee29a835a927ded8 Mon Sep 17 00:00:00 2001
From: "Tufman, Shay (st198j)" <st198j@att.com>
Date: Thu, 14 May 2020 10:43:28 +0300
Subject: [PATCH] Fix edit deployment artifact icon, and download

Change-Id: I9e66870b03fcc5edcea30a18809cf8a2c539e674
Issue-ID: SDC-3053
Signed-off-by: Tufman, Shay (st198j) <st198j@att.com>
(cherry picked from commit 8a6289f745fd37afcad9d0a15a6666c50fb46aef)
---
 .../deployment-artifacts-page.component.html              | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/catalog-ui/src/app/ng2/pages/workspace/deployment-artifacts/deployment-artifacts-page.component.html b/catalog-ui/src/app/ng2/pages/workspace/deployment-artifacts/deployment-artifacts-page.component.html
index 1df318e4a5..4c942b2df9 100644
--- a/catalog-ui/src/app/ng2/pages/workspace/deployment-artifacts/deployment-artifacts-page.component.html
+++ b/catalog-ui/src/app/ng2/pages/workspace/deployment-artifacts/deployment-artifacts-page.component.html
@@ -39,18 +39,23 @@
         <ngx-datatable-column [resizeable]="false" [flexGrow]="0.6">
             <ng-template ngx-datatable-cell-template let-row="row">
                 <div class="download-artifact-button">
-                    <svg-icon *ngIf="!row.heatParameters?.length && !state.isViewOnly" class="action-icon action-icon-1" [mode]="'primary2'" [name]="'edit-o'"
+                    <!--                    Edit HEAT_ENV / HEAT_NESTED / HEAT_ARTIFACT / VF_LICENSE-->
+                    <svg-icon *ngIf="(row.artifactType !== 'HEAT' && row.artifactType !== 'HEAT_VOL' && row.artifactType !== 'HEAT_NET') && !state.isViewOnly" class="action-icon" [mode]="'primary2'" [name]="'edit-o'"
                               testId="edit_{{row.artifactDisplayName}}" clickable="true" size="medium"
                               (click)="addOrUpdateArtifact(row, state.isViewOnly)"></svg-icon>
-                    <svg-icon *ngIf="row.heatParameters?.length && !state.isViewOnly" class="action-icon action-icon-2" [mode]="'primary2'" [name]="'indesign_status'"
+                    <!--                    Edit HEAT-->
+                    <svg-icon *ngIf="(row.artifactType === 'HEAT' || row.artifactType === 'HEAT_VOL' || row.artifactType === 'HEAT_NET') && !state.isViewOnly" class="action-icon" [mode]="'primary2'" [name]="'indesign_status'"
                               testId="update_heat_params_{{row.artifactDisplayName}}" clickable="true" size="medium"
                               (click)="updateEnvParams(row, state.isViewOnly)"></svg-icon>
-                    <svg-icon *ngIf="!row.isFromCsar && !state.isViewOnly" class="action-icon action-icon-3" [mode]="'primary2'" [name]="'trash-o'"
+                    <svg-icon *ngIf="!row.isFromCsar && !state.isViewOnly" class="action-icon" [mode]="'primary2'" [name]="'trash-o'"
                               testId="delete_{{row.artifactDisplayName}}" clickable="true" size="medium" (click)="deleteArtifact(row)"></svg-icon>
-                    <svg-icon *ngIf="row.isGenericBrowseable()" class="action-icon action-icon-4" [mode]="'primary2'" [name]="'search-o'"
+                    <svg-icon *ngIf="row.isGenericBrowseable()" class="action-icon" [mode]="'primary2'" [name]="'search-o'"
                               testId="gab-{{row.artifactDisplayName}}" clickable="true" size="medium" (click)="openGenericArtifactBrowserModal(row)"></svg-icon>
-
                     <!--Download-->
+                    <download-artifact class="action-icon" [artifact]="row"
+                                       [componentId]="componentId"
+                                       [componentType]="componentType"
+                                       testId="download_{{row.artifactDisplayName}}"></download-artifact>
                 </div>
             </ng-template>
         </ngx-datatable-column>
-- 
2.16.6