This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1662 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 84af2d741178de94fcb4505b4a400d721ca32194 Author: Dmytro_Gnatyshyn <[email protected]> AuthorDate: Tue Aug 4 10:28:42 2020 +0300 Add 2 inputs for lib and version --- .../ami-create-dialog/ami-create-dialog.component.ts | 2 +- .../app/resources/resources-grid/resources-grid.component.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.ts index e783951..92362f7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.ts @@ -57,7 +57,7 @@ export class AmiCreateDialogComponent implements OnInit { public assignChanges(data) { this._userResource.createAMI(data).subscribe( - response => response.status === HTTP_STATUS_CODES.ACCEPTED && this.dialogRef.close(), + response => response.status === HTTP_STATUS_CODES.ACCEPTED && this.dialogRef.close(true), error => this.toastr.error(error.message || `Image creation failed!`, 'Oops!')); } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 69e8b02..4a62de4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -150,6 +150,7 @@ export class ResourcesGridComponent implements OnInit { this.getDefaultFilterConfiguration(); (this.environments.length) ? this.getUserPreferences() : this.filteredEnvironments = []; this.healthStatus && !this.healthStatus.billingEnabled && this.modifyGrid(); + window.scrollTop = window.scrollTop + 50 this.progressBarService.stopProgressBar(); }, () => this.progressBarService.stopProgressBar()); } @@ -234,21 +235,20 @@ export class ResourcesGridComponent implements OnInit { error => this.toastr.error(error.message || 'Exploratory starting failed!', 'Oops!')); } else if (action === 'stop') { this.dialog.open(ConfirmationDialogComponent, { data: { notebook: data, type: ConfirmationDialogType.StopExploratory }, panelClass: 'modal-sm' }) - .afterClosed().subscribe(() => this.buildGrid()); + .afterClosed().subscribe((res) => res && this.buildGrid()); } else if (action === 'terminate') { this.dialog.open(ConfirmationDialogComponent, { data: { notebook: data, type: ConfirmationDialogType.TerminateExploratory }, panelClass: 'modal-sm' }) - .afterClosed().subscribe(() => this.buildGrid()); + .afterClosed().subscribe((res) => res && this.buildGrid()); } else if (action === 'install') { this.dialog.open(InstallLibrariesComponent, { data: data, panelClass: 'modal-fullscreen' }) - .afterClosed().subscribe(() => this.buildGrid()); + .afterClosed().subscribe((res) => res && this.buildGrid()); } else if (action === 'schedule') { this.dialog.open(SchedulerComponent, { data: { notebook: data, type: 'EXPLORATORY' }, panelClass: 'modal-xl-s' }) - .afterClosed().subscribe(() => this.buildGrid()); + .afterClosed().subscribe((res) => res && this.buildGrid()); } else if (action === 'ami') { this.dialog.open(AmiCreateDialogComponent, { data: data, panelClass: 'modal-sm' }) - - .afterClosed().subscribe(() => this.buildGrid()); + .afterClosed().subscribe((res) => res && this.buildGrid()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
