@smartbit4all/ng-client 3.2.0 → 3.2.2

package/fesm2020/smartbit4all-ng-client.mjs

@@ -13614,32 +13614,19 @@ class SmartFilterEditorContentComponent {
         this.expressionUiActionModels = [];
         this.type = FilterExpressionBuilderUiModel.TypeEnum;
     }
-    ngAfterViewInit() {
-        if (this.smartFilterChangeSubscription) {
-            this.smartFilterChangeSubscription.unsubscribe();
-        }
-        this.smartFilterChangeSubscription = this.simpleFilterFormChild.onBlurSubject?.pipe(takeUntil(this._destroy$)).subscribe(() => {
-            this.saveFilter();
-        });
-        if (this.smartFilterSophisticatedChangeSubscription) {
-            this.smartFilterSophisticatedChangeSubscription.unsubscribe();
-        }
-        this.smartFilterSophisticatedChangeSubscription =
-            this.simpleFilterFormChild.sophisticatedValueChange?.pipe(takeUntil(this._destroy$)).subscribe((change) => {
-                if (change.kind === 'selection') {
-                    this.saveFilter();
-                }
-            });
-    }
+    ngAfterViewInit() { }
     ngOnInit() {
         this.service.load();
-        this.setUp();
+        this.service.modelChanged.pipe(takeUntil(this._destroy$)).subscribe(() => this.setUp());
     }
     ngOnDestroy() {
         this._destroy$.next();
         this._destroy$.complete();
     }
     setupSimpleFilter() {
+        if (this.simpleFilterForm) {
+            return;
+        }
         let widgets = [];
         let key;
         let model = {};
@@ -13679,6 +13666,21 @@ class SmartFilterEditorContentComponent {
             useOnBlurEvent: true,
             widgets,
         };
+        if (this.smartFilterChangeSubscription) {
+            this.smartFilterChangeSubscription.unsubscribe();
+        }
+        this.smartFilterChangeSubscription = this.simpleFilterFormChild.onBlurSubject?.pipe(takeUntil(this._destroy$)).subscribe(() => {
+            this.saveFilter();
+        });
+        if (this.smartFilterSophisticatedChangeSubscription) {
+            this.smartFilterSophisticatedChangeSubscription.unsubscribe();
+        }
+        this.smartFilterSophisticatedChangeSubscription =
+            this.simpleFilterFormChild.sophisticatedValueChange?.pipe(takeUntil(this._destroy$)).subscribe((change) => {
+                if (change.kind === 'selection') {
+                    this.saveFilter();
+                }
+            });
     }
     extractFilterFieldFromFormModel() {
         let simpleFilter = this.simpleFilterFormChild?.submitForm(false).componentModel.data;
@@ -13728,6 +13730,9 @@ class SmartFilterEditorContentComponent {
         }
     }
     constructForm() {
+        if (this.smartForm) {
+            return;
+        }
         let generatedWidgets = this.layoutService.render({
             layoutDefinitions: this.service.model?.selectedFieldEditor?.layoutDef?.widgets,
         });