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:17 UTC
[incubator-dlab] 02/02: [DLAB-2022]: Fixed allocation to another
folder during refresh
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