From 866e473af72b92f92aaea3c4fb7c8c6b4620fe16 Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Mon, 11 Mar 2024 13:54:42 +0100
Subject: [PATCH 1/2] update if statment

---
 .../bulkDeployment/bulk-view/bulk-view.component.html       | 2 +-
 .../bulkDeployment/bulk-view/bulk-view.component.ts         | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html b/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html
index 9a8b6c0..6174585 100644
--- a/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html
+++ b/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html
@@ -224,7 +224,7 @@ <h3>{{'BULK.APP.VIEW_HEADER' | translate}}</h3>
                             <td>{{getAppInstanceName(response)}}</td>
                             <td>{{getDomainCodeName(response)}}</td>
                             <td style="width: 5%" class="text-right">
-                    <span *ngif="getAppInstanceId(response) !== undefined && getAppInstanceId(response) !== null" class="dropdown">
+                    <span *ngif="iSWorkingInstance(response)" class="dropdown">
             <a style="display: inline-block" class="dropdown-toggle " aria-expanded="false" aria-haspopup="true"
                data-toggle="dropdown" href="#" role="button">
               <em class="fas fa-cog icon-black icon-bigger"></em>
diff --git a/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.ts b/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.ts
index cb3c1c4..8cf1d03 100644
--- a/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.ts
+++ b/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.ts
@@ -1,5 +1,5 @@
 import {Component, OnDestroy, OnInit} from '@angular/core';
-import {BulkDeployment} from '../../../model/bulk-deployment';
+import {BulkDeployment, BulkDeploymentState} from '../../../model/bulk-deployment';
 import {AppdeploymentService} from '../appdeployment.service';
 import {ActivatedRoute, Router} from '@angular/router';
 import {BulkResponse, BulkType} from '../../../model/bulk-response';
@@ -55,6 +55,10 @@ export class BulkViewComponent implements OnInit, OnDestroy {
         return entry?.details['appInstanceId']
     }
 
+    public iSWorkingInstance(entry: BulkResponse) {
+        return entry?.state === BulkDeploymentState.COMPLETED || entry?.state.toString() == 'COMPLETED'
+    }
+
     public getAppInstanceName(entry: BulkResponse) {
         return entry?.details['appInstanceName']
     }

From 4f94fbdb98c55f7f65560caf1b01143d1a3e567b Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Mon, 11 Mar 2024 14:16:04 +0100
Subject: [PATCH 2/2] small fix

---
 .../appmarket/bulkDeployment/bulk-view/bulk-view.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html b/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html
index 6174585..d77979a 100644
--- a/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html
+++ b/src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html
@@ -224,7 +224,7 @@ <h3>{{'BULK.APP.VIEW_HEADER' | translate}}</h3>
                             <td>{{getAppInstanceName(response)}}</td>
                             <td>{{getDomainCodeName(response)}}</td>
                             <td style="width: 5%" class="text-right">
-                    <span *ngif="iSWorkingInstance(response)" class="dropdown">
+                    <span *ngif="response.type === 'APPLICATION' && response?.details['appInstanceId'] !== undefined" class="dropdown">
             <a style="display: inline-block" class="dropdown-toggle " aria-expanded="false" aria-haspopup="true"
                data-toggle="dropdown" href="#" role="button">
               <em class="fas fa-cog icon-black icon-bigger"></em>