This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1890 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 34d90b0aad1e7164c136e04f60e008f588ceed6f Author: Dmytro_Gnatyshyn <di1...@ukr.net> AuthorDate: Tue Jun 23 16:08:40 2020 +0300 [DLAB-1890]: Removed repeated request for lib groups --- .../resources/bucket-browser/bucket-browser.component.ts | 2 +- .../bucket-browser/folder-tree/folder-tree.component.ts | 6 +++--- .../app/resources/exploratory/install-libraries/index.ts | 6 +++--- .../install-libraries/install-libraries.component.ts | 16 +++++++--------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts index eeec7c8..355904f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts @@ -61,7 +61,7 @@ export class BucketBrowserComponent implements OnInit { public isSelectionOpened: any; public isFilterVisible: boolean; public buckets; - private isFileUploading: boolean; + public isFileUploading: boolean; @ViewChild(FolderTreeComponent, {static: true}) folderTreeComponent; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts index 9574434..f394e23 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts @@ -33,11 +33,11 @@ export class FolderTreeComponent implements OnDestroy { private folderTreeSubs; private path = []; - private selectedFolder: TodoItemFlatNode; + public selectedFolder: TodoItemFlatNode; private flatNodeMap = new Map<TodoItemFlatNode, TodoItemNode>(); private nestedNodeMap = new Map<TodoItemNode, TodoItemFlatNode>(); - private folderCreating = false; + public folderCreating = false; private subscriptions: Subscription = new Subscription(); public treeControl: FlatTreeControl<TodoItemFlatNode>; private treeFlattener: MatTreeFlattener<TodoItemNode, TodoItemFlatNode>; @@ -46,7 +46,7 @@ export class FolderTreeComponent implements OnDestroy { constructor( public toastr: ToastrService, private bucketBrowserService: BucketBrowserService, - private bucketDataService: BucketDataService, + public bucketDataService: BucketDataService, ) { this.treeFlattener = new MatTreeFlattener(this.transformer, this.getLevel, this.isExpandable, this.getChildren); this.treeControl = new FlatTreeControl<TodoItemFlatNode>(this.getLevel, this.isExpandable); diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts index 526aab4..36d3023 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts @@ -26,7 +26,7 @@ import { BubbleModule } from '../../../shared'; import { FormControlsModule } from '../../../shared/form-controls'; import { KeysPipeModule, LibSortPipeModule, HighLightPipeModule } from '../../../core/pipes'; -import { InstallLibrariesComponent, ErrorMessageDialogComponent } from './install-libraries.component'; +import { InstallLibrariesComponent, ErrorLibMessageDialogComponent } from './install-libraries.component'; export * from './install-libraries.component'; @NgModule({ @@ -41,8 +41,8 @@ export * from './install-libraries.component'; MaterialModule, BubbleModule ], - declarations: [InstallLibrariesComponent, ErrorMessageDialogComponent], - entryComponents: [InstallLibrariesComponent, ErrorMessageDialogComponent], + declarations: [InstallLibrariesComponent, ErrorLibMessageDialogComponent], + entryComponents: [InstallLibrariesComponent, ErrorLibMessageDialogComponent], exports: [InstallLibrariesComponent] }) export class InstallLibrariesModule {} 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 2f2d733..35d1946 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 @@ -29,7 +29,6 @@ import { LibrariesInstallationService } from '../../../core/services'; import { SortUtils, HTTP_STATUS_CODES } from '../../../core/util'; import {FilterLibsModel} from './filter-libs.model'; - @Component({ selector: 'install-libraries', templateUrl: './install-libraries.component.html', @@ -101,8 +100,8 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy { } ngOnDestroy() { - clearTimeout(this.loadLibsTimer); - clearTimeout(this.clear); + window.clearTimeout(this.loadLibsTimer); + window.clearTimeout(this.clear); } uploadLibGroups(): void { @@ -217,8 +216,8 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy { } public showErrorMessage(item): void { - const dialogRef: MatDialogRef<ErrorMessageDialogComponent> = this.dialog.open( - ErrorMessageDialogComponent, { data: item.error, width: '550px', panelClass: 'error-modalbox' }); + const dialogRef: MatDialogRef<ErrorLibMessageDialogComponent> = this.dialog.open( + ErrorLibMessageDialogComponent, { data: item.error, width: '550px', panelClass: 'error-modalbox' }); } public isInstallingInProgress(): void { @@ -367,12 +366,11 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy { <div class="text-center"> <button type="button" class="butt" mat-raised-button (click)="dialogRef.close()">Close</button> </div> - `, - styles: [] + ` }) -export class ErrorMessageDialogComponent { +export class ErrorLibMessageDialogComponent { constructor( - public dialogRef: MatDialogRef<ErrorMessageDialogComponent>, + public dialogRef: MatDialogRef<ErrorLibMessageDialogComponent>, @Inject(MAT_DIALOG_DATA) public data: any ) { } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org