@sumaris-net/ngx-components 2.6.23-beta4 → 2.6.23-beta6

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -21338,19 +21338,25 @@ class NamedFilterSelector extends AppForm {
         return super.dirty || this.filterFormDirty;
     }
     ngOnInit() {
+        this.registerAutocompleteField('namedFilter', {
+            suggestFn: (value, filter) => this.dataService.suggest(value, filter),
+            attributes: ['name'],
+            filter: this.getFilter(),
+            ...this.autocompleteConfig
+        });
         this.registerSubscription(this.form.controls.namedFilter.valueChanges.pipe(debounceTime(100), distinctUntilChanged()).subscribe((value) => this.onFilterChanges(value)));
     }
     setEntityName(entityName) {
         if (!entityName || this._entityName === entityName)
             return;
         this._entityName = entityName;
-        // add timeout to allow autocompleteConfig to be set
-        setTimeout(() => this.registerAutocompleteField('namedFilter', {
-            suggestFn: (value, filter) => this.dataService.suggest(value, filter),
-            attributes: ['name'],
-            filter: { entityName },
-            ...this.autocompleteConfig
-        }), 100);
+        // Update autocomplete filter
+        this.autocompleteField.filter = this.getFilter();
+    }
+    getFilter() {
+        return {
+            entityName: this.entityName,
+        };
     }
     markForCheck() {
         this.cd.markForCheck();