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 0fb6daa2e [DLAB-2015]: Updated image for available group lib list receiving (#881) 0fb6daa2e is described below commit 0fb6daa2e59323c7d2d3d4a8a93dff8141addd85 Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com> AuthorDate: Tue Sep 1 13:50:34 2020 +0300 [DLAB-2015]: Updated image for available group lib list receiving (#881) [DLAB-2015]: [User guide]: Updated image for available group lib list receiving --- doc/notebook_list_libs.png | Bin 20684 -> 32756 bytes .../install-libraries.component.ts | 21 ++++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/notebook_list_libs.png b/doc/notebook_list_libs.png index fea4d47..437c9fb 100644 Binary files a/doc/notebook_list_libs.png and b/doc/notebook_list_libs.png differ diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts index 28afa05..94d7666 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts @@ -124,7 +124,7 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy { this.libs_uploaded = false; this.uploading = true; - setTimeout(() => this.librariesInstallationService.getGroupsList(this.notebook.project, this.notebook.name, this.model.computational_name) + this.librariesInstallationService.getGroupsList(this.notebook.project, this.notebook.name, this.model.computational_name) .pipe( takeUntil(this.unsubscribe$), ) @@ -140,8 +140,7 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy { this.group_select && this.group_select.setDefaultOptions( this.groupsList, 'Select group', 'group_lib', null, 'list', this.groupsListMap); }, - error => this.toastr.error(error.message || 'Groups list loading failed!', 'Oops!')), 1000); - + error => this.toastr.error(error.message || 'Groups list loading failed!', 'Oops!')); } private getResourcesList() { @@ -289,9 +288,16 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy { public isInstallingInProgress(): void { this.installingInProgress = this.notebookLibs.some(lib => lib.filteredStatus.some(status => status.status === 'installing')); if (this.installingInProgress) { - window.clearTimeout(this.loadLibsTimer); - this.loadLibsTimer = window.setTimeout(() => this.getInstalledLibrariesList(), 10000); + // window.clearTimeout(this.loadLibsTimer); + // this.loadLibsTimer = window.setTimeout(() => this.getInstalledLibrariesList(), 10000); + timer(10000).pipe(take(1)).subscribe(v => this.getInstalledLibrariesList()); } + const source = timer(1000); + + const subscribe = source.subscribe(val => console.log(val)); + + console.log(source); + console.log(subscribe); } public reinstallLibrary(item, lib) { @@ -355,7 +361,8 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy { } else { this.libs_uploaded = false; this.uploading = true; - this.clear = window.setTimeout(() => this.uploadLibGroups(), this.CHECK_GROUPS_TIMEOUT); + // this.clear = window.setTimeout(() => this.uploadLibGroups(), this.CHECK_GROUPS_TIMEOUT); + timer(this.CHECK_GROUPS_TIMEOUT).pipe(take(1)).subscribe(() => this.uploadLibGroups()); } } @@ -411,7 +418,7 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy { ) .subscribe((libs: GetLibrary) => { if (libs.autoComplete === 'UPDATING') { - timer(500000).pipe( + timer(5000).pipe( take(1) ).subscribe(_ => { this.getMatchedLibs(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org