From d863bf15aec15ec1c5cdfe5592f475b0fe41d5e5 Mon Sep 17 00:00:00 2001 From: Sudarshan Kumar Date: Wed, 29 Jul 2020 16:46:31 +0530 Subject: [PATCH] App onboarding fixes App onboarding fixes - PORTAL-968,969,970,971 Issue-ID: PORTAL-969 Change-Id: I4046d37aaff0b5df7605e694cabca148d64a74ea Signed-off-by: Sudarshan Kumar --- .../src/app/pages/web-analytics/web-analytics.component.scss | 5 +++++ .../application-details-dialog.component.html | 9 ++++++--- .../application-details-dialog.component.ts | 2 ++ .../application-onboarding/application-onboarding.component.html | 1 + .../application-onboarding/application-onboarding.component.ts | 9 +++++++++ 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/portal-FE-common/src/app/pages/web-analytics/web-analytics.component.scss b/portal-FE-common/src/app/pages/web-analytics/web-analytics.component.scss index c72d11e5..7e68e1ae 100644 --- a/portal-FE-common/src/app/pages/web-analytics/web-analytics.component.scss +++ b/portal-FE-common/src/app/pages/web-analytics/web-analytics.component.scss @@ -44,6 +44,11 @@ padding-bottom: 15px; padding-right: 40px; font-weight: bold; + white-space: nowrap; +} + +td.mat-cell, td.mat-footer-cell, th.mat-header-cell { + padding-right: 45px; } .ion-md-trash{ diff --git a/portal-FE-os/src/app/pages/application-onboarding/application-details-dialog/application-details-dialog.component.html b/portal-FE-os/src/app/pages/application-onboarding/application-details-dialog/application-details-dialog.component.html index 6d0c5446..f68d8798 100644 --- a/portal-FE-os/src/app/pages/application-onboarding/application-details-dialog/application-details-dialog.component.html +++ b/portal-FE-os/src/app/pages/application-onboarding/application-details-dialog/application-details-dialog.component.html @@ -252,10 +252,10 @@ Upload Image + [textMessage]="'Image file(.png or.jpg or.jpeg with dimension 200X200 pixel) must be smaller than 1MB.'"> -
Preview - Remove + Remove
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..852e9706 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 = 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; diff --git a/portal-FE-os/src/app/pages/application-onboarding/application-onboarding.component.html b/portal-FE-os/src/app/pages/application-onboarding/application-onboarding.component.html index 19f5d8ae..47722471 100644 --- a/portal-FE-os/src/app/pages/application-onboarding/application-onboarding.component.html +++ b/portal-FE-os/src/app/pages/application-onboarding/application-onboarding.component.html @@ -51,6 +51,7 @@
+ 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 5903d654..83cbfa0e 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 @@ -66,6 +66,7 @@ export class ApplicationOnboardingComponent implements OnInit { dataSource = new MatTableDataSource(this.appsList); @ViewChild(MatSort) sort: MatSort; @ViewChild(MatPaginator) paginator: MatPaginator; + showEcompSpinner:boolean = false; constructor(public applicationsService: ApplicationsService, public ngbModal: NgbModal) { } @@ -77,11 +78,13 @@ export class ApplicationOnboardingComponent implements OnInit { getOnboardingApps(){ //console.log("getOnboardingApps called"); + this.showEcompSpinner = true; this.applicationsService.getOnboardingApps() .subscribe(_data => { this.result = _data; if (this.result == null || this.result == 'undefined') { console.log('WidgetOnboardingService::getOnboardingWidgets Failed: Result or result.data is null'); + this.showEcompSpinner = false; }else { this.appsList = _data; for (var i = 0; i < this.appsList.length; i++) { @@ -94,11 +97,14 @@ export class ApplicationOnboardingComponent implements OnInit { } } this.populateTableData(this.appsList); + this.showEcompSpinner = false; } }, error =>{ console.log(error); + this.showEcompSpinner = false; this.openConfirmationModal('Error', error.message); }); + this.showEcompSpinner = false; } applyFilter(filterValue: string) { @@ -143,13 +149,16 @@ export class ApplicationOnboardingComponent implements OnInit { console.log('ApplicationOnboardingCtrl::deleteApplication: No apllication or ID... cannot delete'); return; } + this.showEcompSpinner = true; this.appsList.splice(this.appsList.indexOf(application), 1); this.applicationsService.deleteOnboardingApp(application.id) .subscribe( data => { this.result = data; this.getOnboardingApps(); + this.showEcompSpinner = false; }, error => { console.log(error); + this.showEcompSpinner = false; if(error && error.status == 405){ this.openConfirmationModal('', 'Application : ' + application.appName+ ' can not be deleted as it is associsted with one of the Microservices.'); }else{ -- 2.16.6