From 0968de8881743a6a8a6dc674ac8855875e66f987 Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Mon, 10 Jun 2024 16:44:54 +0300
Subject: [PATCH] UI: fixed error on save relation qeury alias with empty
 relation filter, not option disabled if relation type is empty

---
 .../home/components/alias/entity-alias-dialog.component.ts   | 2 +-
 .../home/components/relation/relation-filters.component.html | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/alias/entity-alias-dialog.component.ts b/ui-ngx/src/app/modules/home/components/alias/entity-alias-dialog.component.ts
index 21d90e0c12..ac25981f6e 100644
--- a/ui-ngx/src/app/modules/home/components/alias/entity-alias-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alias/entity-alias-dialog.component.ts
@@ -145,7 +145,7 @@ export class EntityAliasDialogComponent extends DialogComponent<EntityAliasDialo
     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)
+        (value.relationType || value.entityTypes?.length)
       );
     }
     if (this.alias.filter.type) {
diff --git a/ui-ngx/src/app/modules/home/components/relation/relation-filters.component.html b/ui-ngx/src/app/modules/home/components/relation/relation-filters.component.html
index 055b5df22e..1d6fdb7ea1 100644
--- a/ui-ngx/src/app/modules/home/components/relation/relation-filters.component.html
+++ b/ui-ngx/src/app/modules/home/components/relation/relation-filters.component.html
@@ -27,7 +27,10 @@
       <div class="tb-form-table-row align-start"
            *ngFor="let relationFilterControl of relationFiltersFormArray.controls; let $index = index">
         <mat-chip-listbox *ngIf="enableNotOption" class="flex-18 center-stretch" [formControl]="relationFilterControl.get('negate')">
-          <mat-chip-option color="primary" [value]="true">{{ 'relation.not' | translate}}</mat-chip-option>
+          <mat-chip-option color="primary" [value]="true"
+                           [disabled]="!relationFilterControl.get('relationType').value">
+            {{ 'relation.not' | translate}}
+          </mat-chip-option>
         </mat-chip-listbox>
         <tb-relation-type-autocomplete subscriptSizing="dynamic"
                                        class="flex-50" showLabel="false"