This is an automated email from the ASF dual-hosted git repository. tobiasistvan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git
The following commit(s) were added to refs/heads/master by this push: new 1eba447 [AMBARI-25015] [Log Search UI] Cluster search param added by default when the app loaded on service logs screen (#59) 1eba447 is described below commit 1eba447f099f6ab68d8bf8ed1f558a9056c756ca Author: Istvan Tobias <tobias.ist...@gmail.com> AuthorDate: Fri Dec 7 14:15:27 2018 +0100 [AMBARI-25015] [Log Search UI] Cluster search param added by default when the app loaded on service logs screen (#59) --- .../filters-panel/filters-panel.component.ts | 20 +++++++++++++------- .../components/search-box/search-box.component.html | 6 +++++- .../search-box/search-box.component.spec.ts | 2 ++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.ts b/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.ts index 7fa2b0f..cc5be26 100644 --- a/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.ts +++ b/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.ts @@ -119,23 +119,29 @@ export class FiltersPanelComponent implements OnDestroy, OnInit { const logsType = this.logsContainerService.logsTypeMap[currentLogsType]; const fieldsModel: any = logsType && logsType.fieldsModel; let subType: string; - let fields: Observable<any>; + let fields$: Observable<any>; switch (currentLogsType) { case 'auditLogs': - fields = fieldsModel.getParameter(subType ? 'overrides' : 'defaults'); + fields$ = fieldsModel.getParameter(subType ? 'overrides' : 'defaults'); if (subType) { - fields = fields.map(items => items && items[subType]); + fields$ = fields$.map(items => items && items[subType]); } break; case 'serviceLogs': - fields = fieldsModel.getAll(); + fields$ = fieldsModel.getAll(); break; default: - fields = Observable.from([]); + fields$ = Observable.from([]); break; } - this.searchBoxItems$ = fields.defaultIfEmpty([]).map(items => items ? items.filter(field => field.filterable) : []) - .map(this.utils.logFieldToListItemMapper); + this.searchBoxItems$ = fields$.defaultIfEmpty([]).map(items => items ? items.filter(field => field.filterable) : []) + .map(this.utils.logFieldToListItemMapper) + .map((fields: ListItem[]): ListItem[] => fields.map( + (field: ListItem): ListItem => ({ + ...field, + isChecked: false + }) + )); } isFilterConditionDisplayed(key: string): boolean { diff --git a/ambari-logsearch-web/src/app/components/search-box/search-box.component.html b/ambari-logsearch-web/src/app/components/search-box/search-box.component.html index 5fd87ab..25b0b10 100644 --- a/ambari-logsearch-web/src/app/components/search-box/search-box.component.html +++ b/ambari-logsearch-web/src/app/components/search-box/search-box.component.html @@ -21,7 +21,11 @@ <ng-container *ngFor="let parameter of parameters"> <label class="parameter-label" [class.exclude]="parameter.isExclude" [class.include]="!parameter.isExclude"> {{parameter.label | translate}}: - <span class="parameter-value">{{(parameter.name === 'type' ? (parameter.value | componentLabel | async) : parameter.value)}}</span> + <ng-container [ngSwitch]="parameter.name"> + <span *ngSwitchCase="type" class="parameter-value">{{parameter.value | componentLabel | async}}</span> + <span *ngSwitchCase="host" class="parameter-value">{{parameter.value | hostName | async}}</span> + <span *ngSwitchDefault class="parameter-value">{{parameter.value}}</span> + </ng-container> <span class="fa toggle-parameter action-icon" [ngClass]="{'fa-search-minus': parameter.isExclude, 'fa-search-plus': !parameter.isExclude}" (click)="toggleParameter($event, parameter.id)" tooltip="{{('filter.toggleTo.' + (parameter.isExclude ? 'include' : 'exclude')) | translate}}"></span> <span class="fa fa-times remove-parameter action-icon" (click)="removeParameter($event, parameter.id)"></span> diff --git a/ambari-logsearch-web/src/app/components/search-box/search-box.component.spec.ts b/ambari-logsearch-web/src/app/components/search-box/search-box.component.spec.ts index 32348a3..971fe27 100644 --- a/ambari-logsearch-web/src/app/components/search-box/search-box.component.spec.ts +++ b/ambari-logsearch-web/src/app/components/search-box/search-box.component.spec.ts @@ -26,6 +26,7 @@ import {UtilsService} from '@app/services/utils.service'; import {SearchBoxComponent} from './search-box.component'; import {ComponentsService, components} from '@app/services/storage/components.service'; import {ComponentLabelPipe} from '@app/pipes/component-label'; +import {HostNamePipe} from "@app/pipes/host-name.pipe"; describe('SearchBoxComponent', () => { let component: SearchBoxComponent; @@ -35,6 +36,7 @@ describe('SearchBoxComponent', () => { TestBed.configureTestingModule({ declarations: [ ComponentLabelPipe, + HostNamePipe, SearchBoxComponent ], imports: [