111768: move original code back to init only for performance

tdonohue · Feb 19, 2024 · f7f86b0 · f7f86b0
1 parent 9767260
commit f7f86b0
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/...er/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/...er/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -68,18 +68,22 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    */
   ngOnInit() {
     this.updatePageInfo(this.model.maxOptions, 1);
-    this.loadOptions();
+    this.loadOptions(true);
+    this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
+    .subscribe((value) => {
+      this.setCurrentValue(value);
+    });
   }
 
-  loadOptions() {
+  loadOptions(fromInit: boolean) {
     this.loading = true;
     this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
       getFirstSucceededRemoteDataPayload(),
       catchError(() => observableOf(buildPaginatedList(new PageInfo(), []))),
       tap(() => this.loading = false)
     ).subscribe((list: PaginatedList<VocabularyEntry>) => {
       this.optionsList = list.page;
-        if (this.model.value) {
+        if (fromInit && this.model.value) {
           this.setCurrentValue(this.model.value, true);
         }
 
@@ -92,11 +96,6 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
       this.selectedIndex = 0;
       this.cdr.detectChanges();
     });
-
-    this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
-      .subscribe((value) => {
-        this.setCurrentValue(value);
-      });
   }
 
   /**
@@ -113,7 +112,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
       this.group.markAsUntouched();
       this.inputText = null;
       this.updatePageInfo(this.model.maxOptions, 1);
-      this.loadOptions();
+      this.loadOptions(false);
       sdRef.open();
     }
   }
@@ -170,7 +169,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
     this.inputText += keyName;
     // When a new key is added, we need to reset the page info
     this.updatePageInfo(this.model.maxOptions, 1);
-    this.loadOptions();
+    this.loadOptions(false);
   }
 
   removeKeyFromInput() {
@@ -179,7 +178,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
       if (this.inputText === '') {
         this.inputText = null;
       }
-      this.loadOptions();
+      this.loadOptions(false);
     }
   }