From a94388ed941c82a38b2e631cc4fd77bac212335b Mon Sep 17 00:00:00 2001 From: Sudarshan Kumar Date: Fri, 7 Aug 2020 15:12:24 +0530 Subject: [PATCH] App Onboarding Inactive -500 Internal Server Error App Onboarding Inactive -Throwing 500 Internal Server Error Issue-ID: PORTAL-976 Change-Id: I47eca9a9c1bf95476c2df666ac1bc7e05751552c Signed-off-by: Sudarshan Kumar --- .../portal/service/EPAppCommonServiceImpl.java | 6 +++++- .../application-details-dialog.component.ts | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPAppCommonServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPAppCommonServiceImpl.java index a4463c7f..3d2432cb 100644 --- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPAppCommonServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPAppCommonServiceImpl.java @@ -1634,7 +1634,11 @@ public class EPAppCommonServiceImpl implements EPAppService { } protected String constructImageName(OnboardingApp onboardingApp) { - return "portal_" + String.valueOf(onboardingApp.getLandingPage().hashCode() + "_" + (int) (Math.random() * 100000.0)) + String appLandingPageURL = onboardingApp.getLandingPage(); + if(appLandingPageURL == null) { + appLandingPageURL = ""; + } + return "portal_" + String.valueOf(appLandingPageURL.hashCode() + "_" + (int) (Math.random() * 100000.0)) + ".png"; } 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 852e9706..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 @@ -377,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; @@ -420,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 => { @@ -436,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){ -- 2.16.6