Merge pull request #9629 from ArtemDzhereleiko/AD/bug-fix/stacking-relation-query-filter

Dashboard alias stacking relation filters

ui-ngx/src/app/modules/home/components/alias/entity-alias-dialog.component.ts

@@ -20,11 +20,11 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import {
+  FormGroupDirective,
+  NgForm,
   UntypedFormBuilder,
   UntypedFormControl,
   UntypedFormGroup,
-  FormGroupDirective,
-  NgForm,
   ValidatorFn,
   Validators
 } from '@angular/forms';
@@ -36,6 +36,7 @@ import { UtilsService } from '@core/services/utils.service';
 import { TranslateService } from '@ngx-translate/core';
 import { EntityService } from '@core/http/entity.service';
 import { Observable } from 'rxjs';
+import { isEmpty, isEqual } from '@core/utils';
 
 export interface EntityAliasDialogData {
   isAdd: boolean;
@@ -141,6 +142,12 @@ export class EntityAliasDialogComponent extends DialogComponent<EntityAliasDialo
     this.alias.alias = this.entityAliasFormGroup.get('alias').value.trim();
     this.alias.filter = this.entityAliasFormGroup.get('filter').value;
     this.alias.filter.resolveMultiple = this.entityAliasFormGroup.get('resolveMultiple').value;
+    if (!isEmpty(this.alias.filter?.filters)) {
+      this.alias.filter.filters = this.alias.filter.filters.filter((value, index, self) =>
+        self.findIndex(v => v.relationType === value.relationType && isEqual(v.entityTypes, value.entityTypes)) === index &&
+        (value.relationType || value.entityTypes.length)
+      );
+    }
     if (this.alias.filter.type) {
       this.validate().subscribe(() => {
           if (this.isAdd) {