Fix for filtering entity and alarm tables

ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts

@@ -328,18 +328,18 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
       this.updateData();
     });
 
-    this.ctx.aliasController?.filtersChanged.pipe(
-      takeUntil(this.destroy$)
-    ).subscribe((filters) => {
-      let currentFilterId = this.ctx.datasources?.[0]?.filterId;
-      if (this.displayPagination && currentFilterId && filters.includes(currentFilterId)) {
-        this.paginator.pageIndex = 0;
-      }
-      this.updateData();
-    });
-
     if (this.displayPagination) {
       this.sort.sortChange.pipe(takeUntil(this.destroy$)).subscribe(() => this.paginator.pageIndex = 0);
+
+      this.ctx.aliasController?.filtersChanged.pipe(
+        takeUntil(this.destroy$)
+      ).subscribe((filters) => {
+        let currentFilterId = this.ctx.defaultSubscription.options.alarmSource?.filterId;
+        if (currentFilterId && filters.includes(currentFilterId)) {
+          this.paginator.pageIndex = 0;
+        }
+        this.updateData();
+      });
     }
     ((this.displayPagination ? merge(this.sort.sortChange, this.paginator.page) : this.sort.sortChange) as Observable<any>).pipe(
       takeUntil(this.destroy$)

ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts

@@ -263,18 +263,18 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
       this.updateData();
     });
 
-    this.ctx.aliasController?.filtersChanged.pipe(
-      takeUntil(this.destroy$)
-    ).subscribe((filters) => {
-      let currentFilterId = this.ctx.datasources?.[0]?.filterId;
-      if (this.displayPagination && currentFilterId && filters.includes(currentFilterId)) {
-        this.paginator.pageIndex = 0;
-      }
-      this.updateData();
-    });
-
     if (this.displayPagination) {
       this.sort.sortChange.pipe(takeUntil(this.destroy$)).subscribe(() => this.paginator.pageIndex = 0);
+
+      this.ctx.aliasController?.filtersChanged.pipe(
+        takeUntil(this.destroy$)
+      ).subscribe((filters) => {
+        let currentFilterId = this.ctx.defaultSubscription.options.datasources?.[0]?.filterId;
+        if (currentFilterId && filters.includes(currentFilterId)) {
+          this.paginator.pageIndex = 0;
+        }
+        this.updateData();
+      });
     }
     ((this.displayPagination ? merge(this.sort.sortChange, this.paginator.page) : this.sort.sortChange) as Observable<any>).pipe(
       takeUntil(this.destroy$)