X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-FE-os%2Fsrc%2Fapp%2Fpages%2Fapplication-onboarding%2Fapplication-onboarding.component.ts;h=5903d654961a8acbc464dac8ef5746287ba23f22;hb=c1cda6283174db9ab610ce7142222c8a00be5bc9;hp=8cbf1d288073e69d4ca16356712817a3e1e955ab;hpb=099ece77f49e4a6bc4d9b35ef03a5e0f33bf8384;p=portal.git

diff --git a/portal-FE-os/src/app/pages/application-onboarding/application-onboarding.component.ts b/portal-FE-os/src/app/pages/application-onboarding/application-onboarding.component.ts
index 8cbf1d28..5903d654 100644
--- a/portal-FE-os/src/app/pages/application-onboarding/application-onboarding.component.ts
+++ b/portal-FE-os/src/app/pages/application-onboarding/application-onboarding.component.ts
@@ -61,7 +61,7 @@ export class ApplicationOnboardingComponent implements OnInit {
   emptyImgForPreview: string;
   isUserSuperAdmin: boolean = false;
   displayedColumns: string[] = ['thumbnail', 'applicationName','active', 
-  'integrationType', 'guestAccess', 'url','restURL',
+  'integrationType', 'modeOfIntegration', 'guestAccess', 'landingPage','restURL',
   'communicationKey', 'applicationNamespace', 'centralAuthAccess'];
   dataSource = new MatTableDataSource(this.appsList);
   @ViewChild(MatSort) sort: MatSort;
@@ -112,9 +112,11 @@ export class ApplicationOnboardingComponent implements OnInit {
     this.dataSource.paginator = this.paginator;
   };
 
-  openAddApplicationModal(rowData: any) {
-    const modalRef = this.ngbModal.open(ApplicationDetailsDialogComponent, { size: 'lg' });
+  openAddApplicationModal(rowData: any, action:any) {
+    console.log("Action : ", action);
+    const modalRef = this.ngbModal.open(ApplicationDetailsDialogComponent, { size: 'lg', backdrop: 'static', keyboard: false });
     modalRef.componentInstance.title = 'Application Details';
+    modalRef.componentInstance.action = action;
     //console.log("selectedData in parent",rowData);
     if(rowData != 'undefined' && rowData){
       modalRef.componentInstance.applicationObj = rowData;
@@ -134,7 +136,7 @@ export class ApplicationOnboardingComponent implements OnInit {
   }
 
   deleteApplication(application: IApplications){
-    let confirmationMsg = 'You are about to delete this App : ' + application.name+ '. Click OK to continue.';
+    let confirmationMsg = 'You are about to delete this App : ' + application.appName+ '. Click OK to continue.';
     this.openInformationModal("Confirmation",confirmationMsg).result.then((result) => {
       if (result === 'Ok') {
         if(!application || application == null){
@@ -148,7 +150,11 @@ export class ApplicationOnboardingComponent implements OnInit {
             this.getOnboardingApps();
           }, error => {
             console.log(error);
-            this.openConfirmationModal('Error', error);
+            if(error && error.status == 405){
+              this.openConfirmationModal('', 'Application : ' + application.appName+ ' can not be deleted as it is associsted with one of the Microservices.');
+            }else{
+              this.openConfirmationModal('Error', error.message);
+            }
         });
       }
     }, (resut) => {
@@ -162,7 +168,7 @@ export class ApplicationOnboardingComponent implements OnInit {
         if(res) {
           this.isUserSuperAdmin = true;
           this.displayedColumns = ['thumbnail', 'applicationName','active', 
-          'integrationType', 'guestAccess', 'url','restURL',
+          'integrationType', 'modeOfIntegration', 'guestAccess', 'landingPage','restURL',
           'communicationKey', 'applicationNamespace', 'centralAuthAccess', 'delete'];
         }  
         //console.log("isUserSuperAdmin :: ",this.isUserSuperAdmin);