[DLAB-1898]: Fixed audit for bucket-browser
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 @@
<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 @@
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 @@
})
.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 @@
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 @@
})
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;
