X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-FE-os%2Fsrc%2Fapp%2Fpages%2Fapplication-onboarding%2Fapplication-details-dialog%2Fapplication-details-dialog.component.ts;h=2e558508ead9dbd92514e71e5974e557ecb6189f;hb=a94388ed941c82a38b2e631cc4fd77bac212335b;hp=1b15f8017d0648a12bb55cee849d9297faafcce3;hpb=a36db1a18f3d5117517313ba035e2384e00cc0a7;p=portal.git

diff --git a/portal-FE-os/src/app/pages/application-onboarding/application-details-dialog/application-details-dialog.component.ts b/portal-FE-os/src/app/pages/application-onboarding/application-details-dialog/application-details-dialog.component.ts
index 1b15f801..2e558508 100644
--- a/portal-FE-os/src/app/pages/application-onboarding/application-details-dialog/application-details-dialog.component.ts
+++ b/portal-FE-os/src/app/pages/application-onboarding/application-details-dialog/application-details-dialog.component.ts
@@ -75,6 +75,7 @@ export class ApplicationDetailsDialogComponent implements OnInit {
   @Input() action: any;
   @Output() passEntry: EventEmitter<any> = new EventEmitter();
   @ViewChild('applicationName') applicationNameElement: ElementRef;
+  @ViewChild('inputAppImageUpload') inputAppImageUpload: ElementRef;
 
   newAppModel = {
     'id': null,
@@ -200,6 +201,7 @@ export class ApplicationDetailsDialogComponent implements OnInit {
         this.applicationObj.imageUrl = null;
         this.applicationObj.imageLink = null;
         this.emptyImgForPreview = '../../../assets/images/default_app_image.gif';
+        this.inputAppImageUpload.nativeElement.value = "";
       }
     }, (resut) => {
       return;
@@ -375,6 +377,14 @@ export class ApplicationDetailsDialogComponent implements OnInit {
     if (this.isEditMode) {
       console.log("Edit application Object : ", JSON.stringify(this.applicationObj));
       console.log("Mode Of iNtegration : ", this.applicationObj.modeOfIntegration);
+      if (this.applicationObj.applicationType == "1" &&  !this.applicationObj.rolesInAAF 
+        || this.applicationObj.applicationType == "3" &&  !this.applicationObj.rolesInAAF) {
+        this.applicationObj.usesCadi = false;
+      }
+
+      if(this.applicationObj && this.applicationObj.usesCadi){
+        this.applicationObj.appBasicAuthPassword = null;
+      }
       this.applicationsService.updateOnboardingApp(this.applicationObj)
         .subscribe( _data => {
           this.result = _data;
@@ -418,6 +428,14 @@ export class ApplicationDetailsDialogComponent implements OnInit {
 
     }else{
       //console.log("Coming inside add application",this.newAppModel);
+      if (this.newAppModel.applicationType == "1" &&  !this.newAppModel.rolesInAAF 
+        || this.newAppModel.applicationType == "3" &&  !this.newAppModel.rolesInAAF) {
+        this.newAppModel.usesCadi = false;
+      }
+
+      if(this.newAppModel && this.newAppModel.usesCadi){
+        this.newAppModel.appBasicAuthPassword = null;
+      }
 
       this.applicationsService.addOnboardingApp(this.newAppModel)
         .subscribe( _data => {
@@ -434,7 +452,7 @@ export class ApplicationDetailsDialogComponent implements OnInit {
           console.log(error);
           if(error.status == 409){
             this.openConfirmationModal('Error', 'There was a problem adding the application changes. ' +
-            'The Application Name and URL should  be unique.  Error: ' +
+            'The Application Name and Namespace should  be unique.  Error: ' +
             error.status);
             return;
           } else if(error.status == 500){