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/09/04 13:57:15 UTC
[incubator-dlab] branch DLAB-2022 created (now 5e65b5f)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-2022
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 5e65b5f [DLAB-2022]: Fixed allocation to another folder during refresh
This branch includes the following new commits:
new 507fa54 Merge remote-tracking branch 'origin/develop' into develop
new 5e65b5f [DLAB-2022]: Fixed allocation to another folder during refresh
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] 02/02: [DLAB-2022]: Fixed allocation to another
folder during refresh
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2022
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5e65b5fd0d4b702f0a82d5fe8e903e6da01a7958
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Sep 4 16:56:16 2020 +0300
[DLAB-2022]: Fixed allocation to another folder during refresh
---
.../resources/webapp/src/app/core/services/bucket-browser.service.ts | 1 +
.../src/app/resources/bucket-browser/bucket-browser.component.html | 4 ++--
.../app/resources/bucket-browser/folder-tree/folder-tree.component.ts | 4 +++-
3 files changed, 6 insertions(+), 3 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 45982eb..f412a00 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
@@ -34,6 +34,7 @@ export class TodoItemFlatNode {
item: string;
level: number;
expandable: boolean;
+ obj: string;
}
@Injectable({
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 3255628..03c8f03 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
@@ -190,8 +190,8 @@
</span>
</div>
<div class="size">{{file.object?.size | convertFileSize}}</div>
-<!-- <div class="date" *ngIf="!file.isDownloading">{{convertDate(file.object?.lastModifiedDate) | date: 'dd/MM/yyyy hh:mm:ss aa' }}</div>-->
- <div class="date" *ngIf="!file.isDownloading">{{file.object?.lastModifiedDate}}</div>
+ <div class="date" *ngIf="!file.isDownloading">{{convertDate(file.object?.lastModifiedDate) | date: 'dd/MM/yyyy hh:mm:ss aa' }}</div>
+<!-- <div class="date" *ngIf="!file.isDownloading">{{file.object?.lastModifiedDate}}</div>-->
<div class="progress-wrapper" *ngIf="file.isDownloading">
<div class="progres">
<span class="progress-bar-text">{{file.progress || 0}}% Downloading...</span>
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 cd7d199..7003a33 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
@@ -77,7 +77,8 @@ export class FolderTreeComponent implements OnDestroy {
const subject = this.dataSource._flattenedData;
const subjectData = subject.getValue();
if (this.selectedFolder) {
- this.selectedFolder = subjectData.filter(v => v.item === this.selectedFolder.item && v.level === this.selectedFolder.level)[0];
+ this.selectedFolder = subjectData.find(v => v.item === this.selectedFolder.item &&
+ v.level === this.selectedFolder.level && v.obj === this.selectedFolder.obj);
}
this.expandAllParents(this.selectedFolder || subjectData[0]);
this.showItem(this.selectedFolder || subjectData[0]);
@@ -115,6 +116,7 @@ export class FolderTreeComponent implements OnDestroy {
flatNode.item = node.item;
flatNode.level = level;
flatNode.expandable = !!node.children;
+ flatNode.obj = node.object.object;
this.flatNodeMap.set(flatNode, node);
this.nestedNodeMap.set(node, flatNode);
return flatNode;
---------------------------------------------------------------------
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 DLAB-2022
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 507fa541d5c178bcfa99ed7aa21b41acaf67e8c7
Merge: 74e2025 6d252f2
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Wed Sep 2 17:32:25 2020 +0300
Merge remote-tracking branch 'origin/develop' into develop
.../webapp/src/app/administration/management/management.component.html | 2 +-
.../webapp/src/app/administration/management/management.component.ts | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org