This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1875 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit be593c779c0bc30dbd2d5f7084a0942bbc1ef753 Author: Dmytro_Gnatyshyn <di1...@ukr.net> AuthorDate: Tue Jun 16 12:32:04 2020 +0300 [DLAB-1875]: Passed correct endpoint --- .../bucket-browser/bucket-browser.component.html | 8 ++++---- .../bucket-browser/bucket-browser.component.ts | 21 ++++++++------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html index 05d2715..c5486fd 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html @@ -117,16 +117,16 @@ [hidden] = "!isSelectionOpened" (emitActiveBucket)=openBucket($event) [buckets]='buckets' - [openedBucket] = this.bucketName + [openedBucket]=this.bucketName > </dlab-bucket-tree> </div> <div class="navigation" [ngClass]="{'selection-opened': isSelectionOpened}" [hidden]="!path"> <dlab-folder-tree (showFolderContent)=onFolderClick($event) - (disableAll) = dissableAll($event) - [folders] = folders - [endpoint] = endpoint + (disableAll)=dissableAll($event) + [folders]=folders + [endpoint]=endpoint > </dlab-folder-tree> </div> <div class="directory" [ngClass]="{'selection-opened': isSelectionOpened}" [hidden]="!path"> 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 b6dcf0d..9f60ee4 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 @@ -58,15 +58,12 @@ export class BucketBrowserComponent implements OnInit { public isQueueFull: boolean; public refreshTokenLimit = 900000; private isTokenRefreshing = false; - @ViewChild(FolderTreeComponent, {static: true}) folderTreeComponent; public isSelectionOpened: any; - isFilterVisible: boolean; + public isFilterVisible: boolean; public buckets; private isFileUploading: boolean; - private isFileUploaded: boolean; - - + @ViewChild(FolderTreeComponent, {static: true}) folderTreeComponent; constructor( @Inject(MAT_DIALOG_DATA) public data: any, @@ -85,8 +82,8 @@ export class BucketBrowserComponent implements OnInit { ngOnInit() { this.bucketName = this.data.bucket; - this.bucketDataService.refreshBucketdata(this.bucketName, this.data.endpoint); this.endpoint = this.data.endpoint; + this.bucketDataService.refreshBucketdata(this.bucketName, this.endpoint); this.bucketStatus = this.data.bucketStatus; this.buckets = this.data.buckets; } @@ -318,7 +315,7 @@ export class BucketBrowserComponent implements OnInit { file.status = 'uploaded'; delete file.request; this.sendFile(this.addedFiles.filter(v => v.status === 'waiting')[0]); - this.bucketDataService.refreshBucketdata(this.bucketName, this.data.endpoint); + this.bucketDataService.refreshBucketdata(this.bucketName, this.endpoint); } }, error => { window.clearInterval(file.interval); @@ -333,14 +330,15 @@ export class BucketBrowserComponent implements OnInit { public refreshBucket() { this.path = ''; - this.bucketDataService.refreshBucketdata(this.bucketName, this.data.endpoint); + this.bucketDataService.refreshBucketdata(this.bucketName, this.endpoint); this.isSelectionOpened = false; } public openBucket($event) { this.bucketName = $event.name; + this.endpoint = $event.endpoint; this.path = ''; - this.bucketDataService.refreshBucketdata(this.bucketName, $event.endpoint); + this.bucketDataService.refreshBucketdata(this.bucketName, this.endpoint); this.isSelectionOpened = false; } @@ -391,7 +389,7 @@ export class BucketBrowserComponent implements OnInit { res && this.bucketBrowserService.deleteFile({ bucket: this.bucketName, endpoint: this.endpoint, 'objects': dataForServer }).subscribe(() => { - this.bucketDataService.refreshBucketdata(this.bucketName, this.data.endpoint); + this.bucketDataService.refreshBucketdata(this.bucketName, this.endpoint); this.toastr.success('Objects successfully deleted!', 'Success!'); this.clearSelection(); }, error => { @@ -434,9 +432,6 @@ export class BucketBrowserComponent implements OnInit { return new Date(utcDate.setTime( utcDate.getTime() - utcDate.getTimezoneOffset() * 60 * 1000 )); } - // public toggleFileUploaded($event: any) { - // this.isFileUploaded = $event; - // } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org