Merge pull request #3073 from koenvd/combobox_value_safety_in_multi_s…

…elect

Properly handle null in writeValue when in multiselect mode and itemValueKey is defined

src/combobox/combobox.component.spec.ts

@@ -21,16 +21,20 @@ import { PlaceholderModule } from "./../placeholder/index";
 		placeholder="placeholder"
 		label="label"
 		[items]="items"
-		[(ngModel)]="model">
+		[(ngModel)]="model"
+		[type]="type"
+		[itemValueKey]="itemValueKey">
 		<cds-dropdown-list></cds-dropdown-list>
 	</cds-combo-box>`
 })
 class ComboboxTest {
 	items = [
-		{content: "one", selected: false},
-		{content: "two", selected: false},
-		{content: "three", selected: false}
+		{id: "1", content: "one", selected: false},
+		{id: "2", content: "two", selected: false},
+		{id: "3", content: "three", selected: false}
 	];
+	type = 'single';
+	itemValueKey = undefined;
 	model: ListItem;
 }
 
@@ -76,6 +80,7 @@ describe("Combo box", () => {
 		fixture.detectChanges();
 
 		expect(element.nativeElement.querySelector("input").value).toBe("one");
+		expect(wrapper.model.id).toBe("1");
 		expect(wrapper.model.content).toBe("one");
 		expect(wrapper.model.selected).toBe(true);
 
@@ -173,9 +178,9 @@ describe("Combo box", () => {
 		textInput.dispatchEvent(new Event("input"));
 
 		wrapper.items = [
-			{content: "four", selected: false},
-			{content: "five", selected: false},
-			{content: "six", selected: false}
+			{id: "4", content: "four", selected: false},
+			{id: "5", content: "five", selected: false},
+			{id: "6", content: "six", selected: false}
 		];
 
 		fixture.detectChanges();
@@ -184,4 +189,24 @@ describe("Combo box", () => {
 
 		expect(itemEls.length).toEqual(2);
 	});
+
+	it("should update model by itemValueKey when specified", () => {
+		fixture = TestBed.createComponent(ComboboxTest);
+		wrapper = fixture.componentInstance;
+		wrapper.type = "multi";
+		wrapper.itemValueKey = "id";
+		fixture.detectChanges();
+
+		element = fixture.debugElement.query(By.css("cds-combo-box"));
+
+		const dropdownToggle = element.nativeElement.querySelector(".cds--list-box__field");
+		dropdownToggle.click();
+		fixture.detectChanges();
+
+		const dropdownOption = element.nativeElement.querySelector(".cds--list-box__menu-item");
+		dropdownOption.click();
+		fixture.detectChanges();
+
+		expect(wrapper.model).toEqual(['1']);
+	});
 });

src/combobox/combobox.component.ts

@@ -638,7 +638,7 @@ export class ComboBox implements OnChanges, AfterViewInit, AfterContentInit, OnD
 				// clone the items and update their state based on the received value array
 				// this way we don't lose any additional metadata that may be passed in via the `items` Input
 				let newValues = [];
-				for (const v of value) {
+				for (const v of value ?? []) {
 					for (const item of this.view.getListItems()) {
 						if (item[this.itemValueKey] === v) {
 							newValues.push(Object.assign({}, item, { selected: true }));