Merge pull request #199 from nmaas-platform/149-handle-namespace-crea…

…tion-during-domain-provisioning-1 update if statment
nmaas-platform · Mar 11, 2024 · e0e8c44 · e0e8c44
2 parents 4296c07 + 4f94fbd
commit e0e8c44
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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="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>

diff --git 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']
     }