fix: check if bindLabel exist while searching for selected items

#177
ng-select · Jan 9, 2018 · 1835187 · 1835187
1 parent 3cf5436
commit 1835187
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/src/ng-select/items-list.ts b/src/ng-select/items-list.ts
@@ -52,7 +52,7 @@ export class ItemsList {
         }
         const index = this.items.findIndex(x => x.value === value);
         return index > -1 ? this.items[index] :
-            this.items.find(item => item.label === this.resolveNested(value, this._bindLabel))
+            this.items.find(item => item.label && item.label === this.resolveNested(value, this._bindLabel));
     }
 
     unselect(item: NgOption) {

diff --git a/src/ng-select/ng-select.component.spec.ts b/src/ng-select/ng-select.component.spec.ts
@@ -99,11 +99,28 @@ describe('NgSelectComponent', function () {
             fixture.componentInstance.cities = cities;
             tickAndDetectChanges(fixture);
 
-            expect(fixture.componentInstance.select.selectedItems).toEqual([jasmine.objectContaining(
-                {
-                    value: cities[0]
-                }
-            )]);
+            expect(fixture.componentInstance.select.selectedItems).toEqual([jasmine.objectContaining({
+                value: cities[0]
+            })]);
+        }));
+
+        it('should set items correctly if there is no bindLabel', fakeAsync(() => {
+            const fixture = createTestingModule(
+                NgSelectModelChangesTestCmp,
+                `<ng-select 
+                    [items]="cities"
+                    [clearable]="true"
+                    [(ngModel)]="selectedCity">
+                </ng-select>`);
+
+            const cities = [{ id: 7, name: 'Pailgis' }];
+            fixture.componentInstance.selectedCity = { id: 7, name: 'Pailgis' };
+            tickAndDetectChanges(fixture);
+            fixture.componentInstance.cities = [{ id: 1, name: 'Vilnius' }, { id: 2, name: 'Kaunas' }];
+            tickAndDetectChanges(fixture);
+            expect(fixture.componentInstance.select.selectedItems[0]).toEqual(jasmine.objectContaining({
+                value: cities[0]
+            }));
         }));
 
         it('should bind ngModel even if items are empty', fakeAsync(() => {