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/08/14 07:13:54 UTC
[incubator-dlab] branch Bucket_fix created (now 04e71de)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch Bucket_fix
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 04e71de Bucket browser fix
This branch includes the following new commits:
new 8b3492e Merge remote-tracking branch 'origin/develop' into develop
new 04e71de Bucket browser fix
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: Merge remote-tracking branch
'origin/develop' into develop
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch Bucket_fix
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 8b3492ee74d913af57b140f10eec45123dea831f
Merge: c0aa8c9 5757ed2
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Aug 14 10:10:57 2020 +0300
Merge remote-tracking branch 'origin/develop' into develop
.../files/aws/deeplearning_description.json | 4 +-
.../files/aws/tensor-rstudio_description.json | 4 +-
.../src/general/files/aws/tensor_description.json | 4 +-
.../epam/dlab/rest/contracts/ComputationalAPI.java | 2 +-
.../service/impl/ProjectServiceImpl.java | 8 ++--
.../app/administration/roles/roles.component.scss | 2 +-
.../app/administration/roles/roles.component.ts | 1 -
.../resources/webapp/src/app/core/util/patterns.ts | 2 +-
.../audit/audit-grid/audit-grid.component.ts | 47 ++++++++++++++--------
.../bucket-browser/bucket-browser.component.html | 2 +-
.../bucket-browser/bucket-browser.component.scss | 5 +++
.../bucket-browser/bucket-data.service.ts | 28 ++++++-------
...mputational-resource-create-dialog.component.ts | 2 +-
.../install-libraries.component.scss | 7 +++-
.../resources-grid/resources-grid.component.ts | 4 +-
.../multi-level-select-dropdown.component.scss | 9 ++++-
.../notification-dialog.component.ts | 4 +-
.../src/app/shared/navbar/navbar.component.ts | 14 +++----
.../webapp/src/assets/styles/_general.scss | 2 +-
.../resources/webapp/src/assets/styles/_theme.scss | 3 ++
20 files changed, 91 insertions(+), 63 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: Bucket browser fix
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch Bucket_fix
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 04e71de748d696ec51b44cbbdb5532322807078b
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Aug 14 10:11:50 2020 +0300
Bucket browser fix
---
.../bucket-browser/bucket-data.service.ts | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
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 95aa4d4..2dce58e 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
@@ -44,24 +44,24 @@ export class BucketDataService {
public refreshBucketdata(bucket, endpoint) {
let backetData = [];
- // this.bucketBrowserService.getBucketData(bucket, endpoint).subscribe(v => {
- // const copiedData = JSON.parse(JSON.stringify(v));
- // this.serverData = v;
- // if (this.emptyFolder) {
- // copiedData.unshift(this.emptyFolder);
- // }
- //
- // backetData = this.convertToFolderTree(copiedData);
- // const data = this.buildFileTree({[bucket]: backetData}, 0);
- // this._bucketData.next(data);
- // });
+ this.bucketBrowserService.getBucketData(bucket, endpoint).subscribe(v => {
+ const copiedData = JSON.parse(JSON.stringify(v));
+ this.serverData = v;
if (this.emptyFolder) {
- array.unshift(this.emptyFolder);
+ copiedData.unshift(this.emptyFolder);
}
- this.serverData = array;
- backetData = this.convertToFolderTree(array);
+
+ backetData = this.convertToFolderTree(copiedData);
const data = this.buildFileTree({[bucket]: backetData}, 0);
this._bucketData.next(data);
+ });
+ // if (this.emptyFolder) {
+ // array.unshift(this.emptyFolder);
+ // }
+ // this.serverData = array;
+ // backetData = this.convertToFolderTree(array);
+ // const data = this.buildFileTree({[bucket]: backetData}, 0);
+ // this._bucketData.next(data);
}
public buildFileTree(obj: {[key: string]: any}, level: number): TodoItemNode[] {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org