This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push: new 239eb05 [DLAB-1654]: Made modal windows static if user is not assigned to a project (#674) 239eb05 is described below commit 239eb05f6ee8ca78fba4f73e7d9673a0a47d3637 Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com> AuthorDate: Wed Mar 25 13:32:14 2020 +0200 [DLAB-1654]: Made modal windows static if user is not assigned to a project (#674) --- .../management/management.component.ts | 70 +++++++++++----------- .../webapp/src/assets/styles/_dialogs.scss | 1 + 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index d31783a..477b872 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -48,7 +48,7 @@ import { ProjectService } from '../../core/services'; export class ManagementComponent implements OnInit { public user: string = ''; public healthStatus: GeneralEnvironmentStatus; - public anyEnvInProgress: boolean = false; + // public anyEnvInProgress: boolean = false; public dialogRef: any; constructor( @@ -86,9 +86,9 @@ export class ManagementComponent implements OnInit { error => this.toastr.error('Environment management failed!', 'Oops!')); } - showBackupDialog() { - this.dialog.open(BackupDilogComponent, { panelClass: 'modal-sm' }); - } + // showBackupDialog() { + // this.dialog.open(BackupDilogComponent, { panelClass: 'modal-sm' }); + // } showEndpointsDialog() { this.dialog.open(EndpointsComponent, { panelClass: 'modal-xl-s' }) @@ -105,16 +105,16 @@ export class ManagementComponent implements OnInit { }); } - openSsnMonitorDialog() { - this.dialog.open(SsnMonitorComponent, { panelClass: 'modal-lg' }); - } - - isEnvironmentsInProgress(exploratory): boolean { - return exploratory.some(item => { - return item.exploratory.some(el => el.status === 'creating' || el.status === 'starting' || - el.resources.some(elem => elem.status === 'creating' || elem.status === 'starting' || elem.status === 'configuring')); - }); - } + // openSsnMonitorDialog() { + // this.dialog.open(SsnMonitorComponent, { panelClass: 'modal-lg' }); + // } + // + // isEnvironmentsInProgress(exploratory): boolean { + // return exploratory.some(item => { + // return item.exploratory.some(el => el.status === 'creating' || el.status === 'starting' || + // el.resources.some(elem => elem.status === 'creating' || elem.status === 'starting' || elem.status === 'configuring')); + // }); + // } setBudgetLimits($event) { this.projectService.updateProjectsBudget($event.projects).subscribe((result: any) => { @@ -137,37 +137,37 @@ export class ManagementComponent implements OnInit { // .subscribe(() => this.handleSuccessAction(event.action), error => this.toastr.error(error.message, 'Oops!')); // } - handleSuccessAction(action) { - this.toastr.success(`Action ${action} is processing!`, 'Processing!'); - this.projectService.getProjectsManagingList().subscribe(data => { - this.dialogRef.componentInstance.data.projectsList = data; - this.dialogRef.componentInstance.setProjectsControl(); - }); - this.buildGrid(); - } - - get creatingBackup(): boolean { - return this.backupService.inProgress; - } + // handleSuccessAction(action) { + // this.toastr.success(`Action ${action} is processing!`, 'Processing!'); + // this.projectService.getProjectsManagingList().subscribe(data => { + // this.dialogRef.componentInstance.data.projectsList = data; + // this.dialogRef.componentInstance.setProjectsControl(); + // }); + // this.buildGrid(); + // } + // + // get creatingBackup(): boolean { + // return this.backupService.inProgress; + // } - private getExploratoryList() { - this.userResourceService.getUserProvisionedResources() - .subscribe((result) => this.anyEnvInProgress = this.isEnvironmentsInProgress( - ExploratoryModel.loadEnvironments(result))); - } + // private getExploratoryList() { + // this.userResourceService.getUserProvisionedResources() + // .subscribe((result) => this.anyEnvInProgress = this.isEnvironmentsInProgress( + // ExploratoryModel.loadEnvironments(result))); + // } private getEnvironmentHealthStatus() { this.healthStatusService .getEnvironmentStatuses() .subscribe((status: GeneralEnvironmentStatus) => { this.healthStatus = status; - this.getExploratoryList(); + // this.getExploratoryList(); }); } - private getActiveUsersList() { - return this.healthStatusService.getActiveUsers(); - } + // private getActiveUsersList() { + // return this.healthStatusService.getActiveUsers(); + // } private getTotalBudgetData() { return this.healthStatusService.getTotalBudgetData(); diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index 08708f8..c6f8fe8 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -62,6 +62,7 @@ mat-dialog-container { #dialog-box { color: $modal-text-color; + min-height: 150px; .dialog-header { padding-left: 30px; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org