You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/04/27 14:36:32 UTC
[incubator-dlab] branch bucket-browser-gcp updated: Fix merge bug
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch bucket-browser-gcp
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/bucket-browser-gcp by this push:
new 2f2f49d Fix merge bug
2f2f49d is described below
commit 2f2f49de265823a706304648a46eeef092dcd881
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Apr 27 17:35:25 2020 +0300
Fix merge bug
---
.../src/app/core/services/bucket-browser.service.ts | 15 ++++-----------
.../app/resources/bucket-browser/bucket-data.service.ts | 2 +-
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
index 0cb8557..c251ed9 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
@@ -1,11 +1,8 @@
import { Injectable } from '@angular/core';
-
import {Observable} from 'rxjs';
import {catchError, map} from 'rxjs/operators';
import {ErrorUtils} from '../util';
import {ApplicationServiceFacade} from './applicationServiceFacade.service';
-import {insideWorkspace} from '@angular/cli/utilities/project';
-
export class TodoItemNode {
children: TodoItemNode[];
@@ -24,17 +21,13 @@ export class TodoItemFlatNode {
providedIn: 'root'
})
export class BucketBrowserService {
- public dataChange = new BehaviorSubject<TodoItemNode[]>([]);
- public serverData: any = [];
- get data(): TodoItemNode[] { return this.dataChange.value; }
-
constructor(private applicationServiceFacade: ApplicationServiceFacade) {
- this.initialize();
}
- public getBacketData(): Observable<{}> {
+ public getBucketData(bucket, endpoint): Observable<{}> {
+ const url = `/${bucket}/endpoint/${endpoint}`;
return this.applicationServiceFacade
- .buildGetBucketData()
+ .buildGetBucketData(url)
.pipe(
map(response => response),
catchError(ErrorUtils.handleServiceError));
@@ -57,7 +50,7 @@ export class BucketBrowserService {
}
public deleteFile(data) {
- const url = JSON.stringify(data)
+ const url = JSON.stringify(data);
return this.applicationServiceFacade
.buildDeleteFileFromBucket(url)
.pipe(
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
index 7a169e5..7be63d4 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
@@ -36,7 +36,7 @@ export class BucketDataService {
public refreshBucketdata(bucket, endpoint) {
let backetData = [];
- this.bucketBrowserService.getBacketData(bucket, endpoint).subscribe(v => {
+ this.bucketBrowserService.getBucketData(bucket, endpoint).subscribe(v => {
this.serverData = v;
backetData = this.convertToFolderTree(v);
const data = this.buildFileTree({[bucket]: backetData}, 0);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org