[ambari] branch branch-2.7 updated: [AMBARI-24610] [Log Search UI] Show user friendly component name in query input (#2278)

[tobiasistvan]

This is an automated email from the ASF dual-hosted git repository.

tobiasistvan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 48c616a  [AMBARI-24610] [Log Search UI] Show user friendly component 
name in query input (#2278)
48c616a is described below

commit 48c616ae1d9de05124167a2f413ec8e8e520f6bc
Author: Istvan Tobias <tobias.ist...@gmail.com>
AuthorDate: Tue Sep 11 00:08:52 2018 +0200

    [AMBARI-24610] [Log Search UI] Show user friendly component name in query 
input (#2278)
    
    (cherry picked from commit 7f4d05bf5ee89dd771637dbca5164ace95383ac7)
---
 .../app/components/search-box/search-box.component.html |  2 +-
 .../components/search-box/search-box.component.spec.ts  | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html
index 5af0eae..5fd87ab 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html
@@ -21,7 +21,7 @@
 <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.value}}</span>
+  <span class="parameter-value">{{(parameter.name === 'type' ? 
(parameter.value | componentLabel | async) : parameter.value)}}</span>
   <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/ambari-logsearch-web/src/app/components/search-box/search-box.component.spec.ts
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.spec.ts
index 8d42c84..32348a3 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.spec.ts
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.spec.ts
@@ -18,10 +18,14 @@
 
 import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {StoreModule} from '@ngrx/store';
+
 import {TranslationModules} from '@app/test-config.spec';
 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';
 
 describe('SearchBoxComponent', () => {
   let component: SearchBoxComponent;
@@ -29,9 +33,18 @@ describe('SearchBoxComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [SearchBoxComponent],
-      imports: TranslationModules,
+      declarations: [
+        ComponentLabelPipe,
+        SearchBoxComponent
+      ],
+      imports: [
+        ...TranslationModules,
+        StoreModule.provideStore({
+          components
+        })
+      ],
       providers: [
+        ComponentsService,
         UtilsService
       ],
       schemas: [NO_ERRORS_SCHEMA]