Fix selection bugs with cert template picker

cmu-sei · Jan 3, 2025 · dbed4ba · dbed4ba
1 parent c83c3bc
commit dbed4ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...ficates/components/certificate-template-picker/certificate-template-picker.component.html b/...ficates/components/certificate-template-picker/certificate-template-picker.component.html
@@ -5,8 +5,8 @@
         </label>
 
         <div class="input-group">
-            <select id="feedbackTemplate" class="form-control" [(ngModel)]="selectedTemplate"
-                (change)="handleTemplateSelect()">
+            <select id="feedbackTemplate" class="form-control" [ngModel]="selectedTemplate"
+                (ngModelChange)="handleTemplateSelect()">
                 <option [ngValue]="undefined">{{ defaultOptionText }}</option>
                 <option *ngFor="let template of templates" [ngValue]="template">
                     {{ template.name }}

diff --git a/...tificates/components/certificate-template-picker/certificate-template-picker.component.ts b/...tificates/components/certificate-template-picker/certificate-template-picker.component.ts
@@ -46,8 +46,11 @@ export class CertificateTemplatePickerComponent implements OnInit, OnChanges {
   }
 
   async ngOnChanges(changes: SimpleChanges): Promise<void> {
-    if (changes.selectedTemplateId?.currentValue && changes.selectedTemplateId.currentValue !== this.selectedTemplate?.id) {
+    if (changes.selectedTemplateId.isFirstChange()) {
       await this.load();
+    }
+
+    if (changes.selectedTemplateId?.currentValue && changes.selectedTemplateId.currentValue !== this.selectedTemplate?.id) {
       this.selectedTemplate = this.templates.find(t => t.id === changes.selectedTemplateId.currentValue);
     }
   }