This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch audit in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/audit by this push: new 7250f2f Audit changes 7250f2f is described below commit 7250f2fc2e6df3d560882277fd4e9c95c2376f99 Author: Dmytro_Gnatyshyn <di1...@ukr.net> AuthorDate: Wed Jun 10 17:06:51 2020 +0300 Audit changes --- .../app/reports/audit/audit-grid/audit-grid.component.ts | 14 ++++++++------ .../webapp/src/app/reports/audit/audit.component.ts | 9 ++++++--- .../exploratory/detail-dialog/detail-dialog.component.ts | 3 +-- 3 files changed, 15 insertions(+), 11 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 811e3e1..7c40eaa 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 @@ -53,14 +53,16 @@ export class AuditGridComponent implements OnInit { }); } + public setAvaliblePeriod(period) { + this.filterConfiguration.date_start = period.start_date; + this.filterConfiguration.date_end = period.end_date; + } + public createFilterData (auditData) { const users = []; const resource = []; const project = []; const actions = []; - const date_start = ''; - const date_end = ''; - console.log(auditData); auditData.forEach(auditItem => { if (!users.includes(auditItem.user)) { users.push(auditItem.user); @@ -75,8 +77,7 @@ export class AuditGridComponent implements OnInit { actions.push(auditItem.action); } }); - this.filterConfiguration = new FilterAuditModel(users, resource, project, actions, '', ''); - console.log(this.filterAuditData); + this.filterConfiguration = new FilterAuditModel(users, resource, project || [], actions, '', ''); } toggleFilterRow(): void { @@ -102,7 +103,7 @@ export class AuditGridComponent implements OnInit { <button type="button" class="close" (click)="dialogRef.close()">×</button> </header> <div mat-dialog-content class="content"> - <ul info-items-list> + <ul info-items-list *ngIf="data.data.length>1;else message"> <li class="info-item"> <span class="info-item-title">Group:</span> <span class="info-item-data"> {{data.data.name}}</span> @@ -114,6 +115,7 @@ export class AuditGridComponent implements OnInit { </span> </li> </ul> + <ng-template #message>{{data.data[0]}}.</ng-template> <div class="text-center m-top-30 m-bott-10"> <!-- <button type="button" class="butt" mat-raised-button (click)="dialogRef.close()">No</button>--> <!-- <button type="button" class="butt butt-success" mat-raised-button--> diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts index 3b355bb..814c444 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts @@ -39,7 +39,7 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; <!-- </dlab-toolbar>--> <!-- <mat-divider></mat-divider>--> <!-- <dlab-reporting-grid (filterReport)="filterReport($event)" (resetRangePicker)="resetRangePicker()"></dlab-reporting-grid>--> - <audit-toolbar (rebuildAudit)="rebuildAuditGrid()"> + <audit-toolbar (rebuildAudit)="rebuildAuditGrid()" (setRangeOption) = setRangeOption($event)> </audit-toolbar> <mat-divider></mat-divider> <dlab-audit-grid></dlab-audit-grid> @@ -67,11 +67,10 @@ export class AuditComponent implements OnInit, OnDestroy { @ViewChild(AuditGridComponent, { static: true }) auditGrid: AuditGridComponent; @ViewChild(AuditToolbarComponent, { static: true }) auditToolbar: AuditToolbarComponent; - public auditData; + public availablePeriod: any; constructor( private healthStatusService: HealthStatusService, - private auditService: AuditService, public toastr: ToastrService, ) { } @@ -95,4 +94,8 @@ export class AuditComponent implements OnInit, OnDestroy { this.healthStatusService.getEnvironmentHealthStatus() .subscribe((result: any) => {}); } + + public setRangeOption(event) { + this.auditGrid.setAvaliblePeriod(event) + } } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts index b2788f5..64759cb 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts @@ -161,7 +161,6 @@ export class DetailDialogComponent implements OnInit { } private logAction(name: any, description: string) { - this.auditService.sendDataToAudit({resource_name: name, info: ['User opened link' + description]}).subscribe(); - console.log(`${name}: ${description}`); + this.auditService.sendDataToAudit({resource_name: name, info: [`User followed ${description} link`]}).subscribe(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org