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/06/30 17:29:49 UTC
[incubator-dlab] branch DLAB-1898 updated (2a57d03 -> 4df8130)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-1898
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 2a57d03 Fix upload file quantity in Bucket browser
new c7b53f9 [DLAB-1898]: Made possible to delete empty folder via bucket browser
new 4df8130 [DLAB-1898]: Fixed audit for bucket-browser
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.
Summary of changes:
.../com/epam/dlab/backendapi/resources/BucketResource.java | 4 ++--
.../app/reports/audit/audit-grid/audit-grid.component.scss | 7 +++++++
.../app/reports/audit/audit-grid/audit-grid.component.ts | 13 +++++++++++--
.../resources/bucket-browser/bucket-browser.component.ts | 4 ++--
.../bucket-browser/folder-tree/folder-tree.component.ts | 3 +--
.../notification-dialog/notification-dialog.component.ts | 2 +-
.../webapp/src/app/shared/navbar/navbar.component.ts | 2 +-
7 files changed, 25 insertions(+), 10 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1898]: Fixed audit for bucket-browser
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1898
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4df8130de8079956af6be1bd88406ec60184e829
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Jun 30 20:29:20 2020 +0300
[DLAB-1898]: Fixed audit for bucket-browser
---
.../webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts | 6 ++++--
.../src/app/resources/bucket-browser/bucket-browser.component.ts | 4 ++--
.../resources/bucket-browser/folder-tree/folder-tree.component.ts | 1 -
.../notification-dialog/notification-dialog.component.ts | 2 +-
.../main/resources/webapp/src/app/shared/navbar/navbar.component.ts | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
index 8bc18dd..c5eeea5 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
@@ -168,11 +168,13 @@ export class AuditGridComponent implements OnInit {
<div class="scrolling-content mat-list-wrapper" id="scrolling">
<mat-list-item class="list-item" *ngFor="let action of actionList">
<div class="info-item-title">{{action[0]}}</div>
- <div class="info-item-data">
+ <div class="info-item-data" *ngIf="action[0] === 'File(s)'">
<div class="file-description ellipsis" *ngFor="let description of action[1]?.split(',')" [matTooltip]="description" matTooltipPosition="above">
{{description}}
</div>
-<!-- <div *ngFor="let description of action[1]?.split(',')">{{description}}</div>-->
+ </div>
+ <div class="info-item-data" *ngIf="action[0] !== 'File(s)'">
+ <div *ngFor="let description of action[1]?.split(',')">{{description}}</div>
</div>
</mat-list-item>
</div>
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 2485a40..5bef23d 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
@@ -381,11 +381,11 @@ export class BucketBrowserComponent implements OnInit {
if (action === 'delete') {
const itemsForDeleting = [...folderSelected, ...selected];
const objects = itemsForDeleting.map(obj => obj.object.object);
- const dataForServer = [];
+ let dataForServer = [];
objects.forEach(object => {
dataForServer.push(...this.bucketDataService.serverData.map(v => v.object).filter(v => v.indexOf(object) === 0));
});
-
+ dataForServer = [...dataForServer, ...objects].filter((v, i, arr) => i === arr.indexOf(v));
this.dialog.open(BucketConfirmationDialogComponent, {data: {items: itemsForDeleting, type: 'delete'} , width: '550px'})
.afterClosed().subscribe((res) => {
!res && this.clearSelection();
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 7f353cd..9400637 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
@@ -227,7 +227,6 @@ private addNewItem(node: TodoItemFlatNode, file, isFile) {
})
.subscribe(_ => {
this.bucketDataService.insertItem(flatParent, itemValue, false);
- // this.bucketDataService.refreshBucketdata(bucket, this.endpoint);
this.toastr.success('Folder successfully created!', 'Success!');
this.folderCreating = false;
this.removeItem(node);
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index a860b39..657b47f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -54,7 +54,7 @@ import {Endpoint} from '../../../administration/project/project.component';
will be stopped
</p>
</div>
- <span class="strong">by a schedule in 15 minutes.</span>
+ <span class="strong">by a schedule in less than 15 minutes.</span>
</div>
<div *ngIf="data.type === 'message'"><span [innerHTML]="data.template"></span></div>
<div *ngIf="data.type === 'confirmation'" class="confirm-dialog">
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index 1f33caa..e30f8db 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -76,7 +76,7 @@ import {ProgressBarService} from '../../core/services/progress-bar.service';
})
export class NavbarComponent implements OnInit, OnDestroy {
- private readonly CHECK_ACTIVE_SCHEDULE_TIMEOUT: number = 55000;
+ private readonly CHECK_ACTIVE_SCHEDULE_TIMEOUT: number = 300000;
private readonly CHECK_ACTIVE_SCHEDULE_PERIOD: number = 15;
currentUserName: string;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1898]: Made possible to delete empty
folder via bucket browser
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1898
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c7b53f9f1850846b1e941cf94e03c50475987602
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Wed Jun 17 15:52:38 2020 +0300
[DLAB-1898]: Made possible to delete empty folder via bucket browser
---
.../com/epam/dlab/backendapi/resources/BucketResource.java | 4 ++--
.../app/reports/audit/audit-grid/audit-grid.component.scss | 7 +++++++
.../src/app/reports/audit/audit-grid/audit-grid.component.ts | 11 +++++++++--
.../bucket-browser/folder-tree/folder-tree.component.ts | 2 +-
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
index 4ceb55e..098d125 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
@@ -52,8 +52,8 @@ import java.nio.file.Paths;
@Path("/bucket")
@Slf4j
public class BucketResource {
- private static final String AUDIT_UPLOAD_MESSAGE = "File name: %s. File size: %d.";
- private static final String AUDIT_MESSAGE = "File name: %s.";
+ private static final String AUDIT_UPLOAD_MESSAGE = "File(s): %s";
+ private static final String AUDIT_MESSAGE = "File(s): %s";
private static final String OBJECT_FORM_FIELD = "object";
private static final String BUCKET_FORM_FIELD = "bucket";
private static final String ENDPOINT_FORM_FIELD = "endpoint";
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
index 125a404..cc42920 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
@@ -33,14 +33,21 @@
tr {
.th_user {
width: 19%;
+
}
.th_action {
width: 11%;
+ .label{
+ padding-bottom: 10px;
+ }
}
.th_date {
width: 14%;
+ .label{
+ padding-bottom: 10px;
+ }
}
.th_project{
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
index adff99b..8bc18dd 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
@@ -168,8 +168,11 @@ export class AuditGridComponent implements OnInit {
<div class="scrolling-content mat-list-wrapper" id="scrolling">
<mat-list-item class="list-item" *ngFor="let action of actionList">
<div class="info-item-title">{{action[0]}}</div>
- <div class="info-item-data" >
- <div *ngFor="let description of action[1]?.split(',')">{{description}}</div>
+ <div class="info-item-data">
+ <div class="file-description ellipsis" *ngFor="let description of action[1]?.split(',')" [matTooltip]="description" matTooltipPosition="above">
+ {{description}}
+ </div>
+<!-- <div *ngFor="let description of action[1]?.split(',')">{{description}}</div>-->
</div>
</mat-list-item>
</div>
@@ -197,6 +200,10 @@ export class AuditGridComponent implements OnInit {
.info-item-title{width: 40%; padding: 10px 0}
.list-header {padding-top: 5px;}
.info-item-data{width: 60%; text-align: left; padding: 10px 0}
+ .file-description{ overflow: hidden; display: block; direction: rtl;}
+
+
+
`]
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 f394e23..7f353cd 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
@@ -222,7 +222,7 @@ private addNewItem(node: TodoItemFlatNode, file, isFile) {
this.bucketDataService.emptyFolder = null;
this.bucketBrowserService.createFolder({
'bucket': bucket,
- 'folder': path,
+ 'folder': path.replace(/ا/g, ''),
'endpoint': this.endpoint
})
.subscribe(_ => {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org