Merge branch 'Upgrade-ng9' of https://github.com/GSA/sam-ui-elements …

…into Upgrade-ng9
GSA · Nov 9, 2020 · 617921c · 617921c
2 parents c7fa802 + a8e7c3a
commit 617921c
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/ui-kit/form-controls/sam-sds-autocomplete/autocomplete/autocomplete.component.ts b/src/ui-kit/form-controls/sam-sds-autocomplete/autocomplete/autocomplete.component.ts
@@ -72,7 +72,7 @@ export class SAMSDSAutocompleteComponent implements ControlValueAccessor {
   @Input()
   public service: SAMSDSAutocompleteServiceInterface;
 
-  @ViewChild("autocompleteSearch", { static: false })
+  @ViewChild("autocomplete", { static: false })
   autocompleteSearch: SAMSDSAutocompleteSearchComponent;
   constructor(private cd: ChangeDetectorRef) {}
 
@@ -103,10 +103,8 @@ export class SAMSDSAutocompleteComponent implements ControlValueAccessor {
       this.model.items = value;
       this.cd.markForCheck();
     } else {
-      if (!this.model || !(this.model instanceof SAMSDSSelectedItemModel)) {
-        this.model = new SAMSDSSelectedItemModel();
-      }
-      this.model.items = value && value.items ? value.items : [];
+      const items = value && value.items ? value.items : [];
+      this.model = new SAMSDSSelectedItemModel(items);
       this.cd.markForCheck();
     }
   }