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 92bfdbf Update audit actions, other small fixes 92bfdbf is described below commit 92bfdbf1677b13ca4314fc164a12976338050c85 Author: Dmytro_Gnatyshyn <di1...@ukr.net> AuthorDate: Wed Jun 17 15:21:13 2020 +0300 Update audit actions, other small fixes --- .../convert-action.pipe.ts} | 14 +++++++++----- .../app/core/pipes/{ => convert-action-pipe}/index.ts | 16 +++++++++++----- .../main/resources/webapp/src/app/core/pipes/index.ts | 1 + .../src/app/core/pipes/lib-sort-pipe/lib-sort.pipe.ts | 6 +++--- .../reports/audit/audit-grid/audit-grid.component.html | 2 +- .../app/reports/audit/audit-grid/audit-grid.component.ts | 12 ++++++------ .../webapp/src/app/reports/audit/audit.module.ts | 3 ++- 7 files changed, 33 insertions(+), 21 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/pipes/index.ts b/services/self-service/src/main/resources/webapp/src/app/core/pipes/convert-action-pipe/convert-action.pipe.ts similarity index 75% copy from services/self-service/src/main/resources/webapp/src/app/core/pipes/index.ts copy to services/self-service/src/main/resources/webapp/src/app/core/pipes/convert-action-pipe/convert-action.pipe.ts index 0a78f17..a415603 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/pipes/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/pipes/convert-action-pipe/convert-action.pipe.ts @@ -17,8 +17,12 @@ * under the License. */ -export * from './keys-pipe'; -export * from './underscoreless-pipe'; -export * from './lib-sort-pipe'; -export * from './replace-breaks-pipe'; -export * from './highlight.pipe'; +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ name: 'convertaction' }) + +export class ConvertActionPipe implements PipeTransform { + transform(value: string): any { + return value.charAt(0) + value.slice(1).toLowerCase().replace(/_/g, ' '); + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/core/pipes/index.ts b/services/self-service/src/main/resources/webapp/src/app/core/pipes/convert-action-pipe/index.ts similarity index 72% copy from services/self-service/src/main/resources/webapp/src/app/core/pipes/index.ts copy to services/self-service/src/main/resources/webapp/src/app/core/pipes/convert-action-pipe/index.ts index 0a78f17..ae12c1a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/pipes/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/pipes/convert-action-pipe/index.ts @@ -17,8 +17,14 @@ * under the License. */ -export * from './keys-pipe'; -export * from './underscoreless-pipe'; -export * from './lib-sort-pipe'; -export * from './replace-breaks-pipe'; -export * from './highlight.pipe'; +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import {ConvertActionPipe} from './convert-action.pipe'; + +@NgModule({ + imports: [CommonModule], + declarations: [ConvertActionPipe], + exports: [ConvertActionPipe] +}) + +export class ConvertActionPipeModule { } diff --git a/services/self-service/src/main/resources/webapp/src/app/core/pipes/index.ts b/services/self-service/src/main/resources/webapp/src/app/core/pipes/index.ts index 0a78f17..399ce1d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/pipes/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/pipes/index.ts @@ -22,3 +22,4 @@ export * from './underscoreless-pipe'; export * from './lib-sort-pipe'; export * from './replace-breaks-pipe'; export * from './highlight.pipe'; +export * from './convert-action-pipe'; diff --git a/services/self-service/src/main/resources/webapp/src/app/core/pipes/lib-sort-pipe/lib-sort.pipe.ts b/services/self-service/src/main/resources/webapp/src/app/core/pipes/lib-sort-pipe/lib-sort.pipe.ts index 20c4b91..e8ba377 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/pipes/lib-sort-pipe/lib-sort.pipe.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/pipes/lib-sort-pipe/lib-sort.pipe.ts @@ -24,10 +24,10 @@ import { Pipe, PipeTransform } from '@angular/core'; export class LibSortPipe { transform(array: Array<Object>): Array<Object> { const order = ['installing', 'installed', 'failed']; - array.sort((arg1:any, arg2:any) => { - if (arg1.status !== arg2.status) + array.sort((arg1: any, arg2: any) => { + if (arg1.status !== arg2.status) return order.indexOf(arg1.status) - order.indexOf(arg2.status); - else + else return arg1.name !== arg2.name ? arg1.name < arg2.name ? -1 : 1 : 0; }); return array; 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 3d5872d..aa2365e 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 @@ -80,7 +80,7 @@ </th> <td mat-cell *matCellDef=" let element"> <div class="action-wrapper"> - <span>{{element.action}}</span> + <span>{{element.action | convertaction }}</span> <div class="audit-info" (click)="openActionInfo(element)" *ngIf="element.info"> <i class="material-icons">info</i> </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 bf71876..def6d56 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 @@ -64,16 +64,16 @@ export class AuditGridComponent implements OnInit { const project = []; const actions = []; auditData.forEach(auditItem => { - if (!users.includes(auditItem.user)) { + if (auditItem.user && !users.includes(auditItem.user)) { users.push(auditItem.user); } - if (!resource.includes(auditItem.resourceName)) { + if (auditItem.resourceName && !resource.includes(auditItem.resourceName)) { resource.push(auditItem.resourceName); } - if (!project.includes(auditItem.project)) { + if (auditItem.project && !project.includes(auditItem.project)) { project.push(auditItem.project); } - if (!actions.includes(auditItem.action)) { + if (auditItem.action && !actions.includes(auditItem.action)) { actions.push(auditItem.action); } }); @@ -99,7 +99,7 @@ export class AuditGridComponent implements OnInit { template: ` <div id="dialog-box"> <header class="dialog-header"> - <h4 class="modal-title">{{data.action}}</h4> + <h4 class="modal-title">{{data.action | convertaction}}</h4> <button type="button" class="close" (click)="dialogRef.close()">×</button> </header> <div mat-dialog-content class="content"> @@ -116,7 +116,7 @@ export class AuditGridComponent implements OnInit { <!-- </li>--> <!-- </ul>--> <!-- <ng-template #message>{{data.data}}.</ng-template>--> - <p>{{data.data}}.</p> + <p>{{data.data}}</p> <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.module.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.module.ts index ae4d245..d2887a0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.module.ts @@ -22,7 +22,7 @@ import { FormsModule } from '@angular/forms'; import { NgDateRangePickerModule } from 'ng-daterangepicker'; import { MaterialModule } from '../../shared/material.module'; import { FormControlsModule } from '../../shared/form-controls'; -import { KeysPipeModule, LineBreaksPipeModule } from '../../core/pipes'; +import { KeysPipeModule, LineBreaksPipeModule, ConvertActionPipeModule } from '../../core/pipes'; import {AuditComponent} from './audit.component'; import {AuditGridComponent, AuditInfoDialogComponent} from './audit-grid/audit-grid.component'; import {AuditToolbarComponent} from './audit-toolbar/audit-toolbar.component'; @@ -32,6 +32,7 @@ import {AuditToolbarComponent} from './audit-toolbar/audit-toolbar.component'; CommonModule, FormsModule, FormControlsModule, + ConvertActionPipeModule, KeysPipeModule, LineBreaksPipeModule, NgDateRangePickerModule, --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org