This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1887 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d0a1324eb8bc99c8f58bde73b0f9f1c7969f8371 Author: Dmytro_Gnatyshyn <di1...@ukr.net> AuthorDate: Wed Jun 24 13:56:42 2020 +0300 [DLAB-1889]: Added resource-type filter property to query params --- .../resources/webapp/src/app/core/services/audit.service.ts | 2 +- .../app/reports/audit/audit-grid/audit-grid.component.html | 2 +- .../app/reports/audit/audit-grid/audit-grid.component.ts | 13 +++++++++---- .../audit/audit-toolbar/audit-toolbar.component.html | 3 --- .../audit/audit-toolbar/audit-toolbar.component.scss | 2 +- .../webapp/src/app/reports/audit/audit.component.ts | 6 +++--- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/audit.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/audit.service.ts index 499c716..1d54792 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/audit.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/audit.service.ts @@ -18,7 +18,7 @@ export class AuditService { queryString += `&resource-names=${filterData.resources.join(',')}`; } if (filterData.resource_types.length) { - queryString += `&resource_types=${filterData.resource_types.map(v => v.toLowerCase()).join(',')}`; + queryString += `&resource-types=${filterData.resource_types.join(',')}`; } if (filterData.users.length) { queryString += `&users=${filterData.users.join(',')}`; diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html index faf6256..a6125f9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html @@ -204,7 +204,7 @@ <i class="material-icons">close</i> </button> - <button mat-icon-button class="btn apply" (click)="refreshAudit(true)" [disabled]="!didFilterChanged()"> + <button mat-icon-button class="btn apply" (click)="buildAuditGrid(true)" [disabled]="!didFilterChanged()"> <i class="material-icons">done</i> </button> </div> 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 d0f6e2d..dedd0c7 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,7 +53,7 @@ export class AuditGridComponent implements OnInit { ngOnInit() {} - public refreshAudit(filter?) { + public buildAuditGrid(filter?) { if (!this.showItemsPrPage) { if (window.localStorage.getItem('audit_per_page')) { this.showItemsPrPage = +window.localStorage.getItem('audit_per_page'); @@ -84,6 +84,11 @@ export class AuditGridComponent implements OnInit { }); } + public refreshAuditPage() { + this.filterAuditData = this.copiedFilterAuditData; + this.getAuditData(); + } + public setAvaliblePeriod(period) { this.filterAuditData.date_start = period.start_date; this.filterAuditData.date_end = period.end_date; @@ -106,7 +111,7 @@ export class AuditGridComponent implements OnInit { this.firstItem = 1; if (this.lastItem !== item) { this.lastItem = item; - this.refreshAudit(); + this.buildAuditGrid(); } } @@ -131,12 +136,12 @@ export class AuditGridComponent implements OnInit { public loadItemsForPage(action) { this.changePage(action); - this.refreshAudit(); + this.buildAuditGrid(); } public resetFilterConfigurations() { this.filterAuditData = FilterAuditModel.getDefault(); - this.refreshAudit(true); + this.buildAuditGrid(true); } public didFilterChanged() { diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.html index 601a4dd..3562b08 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.html @@ -34,9 +34,6 @@ <ng-daterangepicker [(ngModel)]="value" [options]="options" (ngModelChange)="onChange($event)"></ng-daterangepicker> </div> <div class="action-butt"> -<!-- <button mat-raised-button class="butt" (click)="export($event)" [disabled]="!reportData?.report_lines.length">--> -<!-- <i class="material-icons">file_download</i>Export--> -<!-- </button>--> <button mat-raised-button class="butt" (click)="rebuild($event)"> <i class="material-icons">autorenew</i>Refresh </button> diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.scss index 4a150bf..744bfdc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.scss @@ -41,7 +41,7 @@ section.toolbar { button { &:first-child { - margin-right: 10px; + margin-right: 0; } } 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 814c444..6f48b71 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 @@ -83,16 +83,16 @@ export class AuditComponent implements OnInit, OnDestroy { } public buildAuditReport() { - this.auditGrid.refreshAudit(); + this.auditGrid.buildAuditGrid(); } public rebuildAuditGrid() { - this.buildAuditReport(); + this.auditGrid.refreshAuditPage(); } private getEnvironmentHealthStatus() { this.healthStatusService.getEnvironmentHealthStatus() - .subscribe((result: any) => {}); + .subscribe(); } public setRangeOption(event) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org