This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push: new a6e65fb [DLAB-1898]: Made possible to delete empty folder via bucket browser and Fixed audit for bucket-browser (#803) a6e65fb is described below commit a6e65fba0fcd69cc3c215ce57ce3fe457fe0467a Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com> AuthorDate: Tue Jun 30 20:33:18 2020 +0300 [DLAB-1898]: Made possible to delete empty folder via bucket browser and Fixed audit for bucket-browser (#803) [DLAB-1898]: Made possible to delete empty folder via bucket browser and Fixed audit for bucket-browser --- .../com/epam/dlab/backendapi/resources/BucketResource.java | 8 +++++--- .../app/reports/audit/audit-grid/audit-grid.component.scss | 8 +++++++- .../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, 28 insertions(+), 12 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 a8195e9..9aa58b6 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,9 +52,11 @@ import java.nio.file.Paths; @Path("/bucket") @Slf4j public class BucketResource { - private static final String AUDIT_UPLOAD_OBJECT_MESSAGE = "File name: %s. File size: %d."; - private static final String AUDIT_UPLOAD_FOLDER_MESSAGE = "Folder name: %s."; - 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 AUDIT_UPLOAD_FOLDER_MESSAGE = "Folder(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 f1c1df0..d2f4f9a 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 @@ -32,15 +32,21 @@ tr { .th_user { - width: 15%; + 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..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,8 +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 *ngFor="let description of action[1]?.split(',')">{{description}}</div> + <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> + <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> @@ -197,6 +202,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/bucket-browser.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts index d3c4c73..fc8ed49 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 f394e23..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 @@ -222,12 +222,11 @@ 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(_ => { 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-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org