From 1bba43af8ccc18193bf872a95f39c61c1d9085c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Bolbo=C8=99enco?= <alex.bolbosenco@gmail.com>
Date: Tue, 3 Jul 2018 22:04:11 +0300
Subject: [PATCH] [ADF-3298] Select CardView item label removed (#3555)

* placeholder removed

* test added
---
 .../card-view-selectitem.component.html                  | 2 +-
 .../card-view-selectitem.component.spec.ts               | 9 +++++++++
 .../card-view/models/card-view-selectitem.model.spec.ts  | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.html b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.html
index 458c28a946..7fd5e59135 100644
--- a/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.html
+++ b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.html
@@ -3,7 +3,7 @@
     <div *ngIf="!isEditable()" data-automation-class="read-only-value">{{ property.displayValue | async }}</div>
     <div *ngIf="isEditable()">
         <mat-form-field>
-            <mat-select placeholder="{{ property.label | translate }}" [(value)]="value" (change)="onChange($event)" data-automation-class="select-box">
+            <mat-select [(value)]="value" (change)="onChange($event)" data-automation-class="select-box">
               <mat-option *ngFor="let option of getOptions() | async" [value]="option.key">
                 {{ option.label | translate }}
               </mat-option>
diff --git a/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts
index ea15a42ff0..f98c435d73 100644
--- a/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts
+++ b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts
@@ -87,6 +87,15 @@ describe('CardViewSelectItemComponent', () => {
             expect(selectBox).not.toBeNull();
         });
 
+        it('should not have label twice', () => {
+            component.ngOnChanges();
+            component.editable = true;
+            fixture.detectChanges();
+
+            const label = fixture.debugElement.query(By.css('[data-automation-class="select-box"] .mat-form-field-label'));
+            expect(label).toBeNull();
+        });
+
         it('should update property on input blur', async(() => {
             spyOn(cardViewUpdateService, 'update');
 
diff --git a/lib/core/card-view/models/card-view-selectitem.model.spec.ts b/lib/core/card-view/models/card-view-selectitem.model.spec.ts
index d0100ffdba..d187a2ce02 100644
--- a/lib/core/card-view/models/card-view-selectitem.model.spec.ts
+++ b/lib/core/card-view/models/card-view-selectitem.model.spec.ts
@@ -21,7 +21,7 @@ import { CardViewSelectItemProperties } from '../interfaces/card-view.interfaces
 import { of } from 'rxjs/observable/of';
 
 describe('CardViewSelectItemModel', () => {
-    let properties: CardViewSelectItemProperties;
+    let properties: CardViewSelectItemProperties<string>;
     const mockData = [{ key: 'one', label: 'One' }, { key: 'two', label: 'Two' }, { key: 'three', label: 'Three' }];
 
     beforeEach(() => {