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 <42860905+dg1...@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-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org