From f77ad0d3add0ed11220e0ae18b58e6e81dfe97a3 Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Mon, 10 Jun 2024 17:25:09 +0300
Subject: [PATCH] UI: set value of not option to false if relation type cleared

---
 .../relation/relation-filters.component.html         |  5 +----
 .../relation/relation-filters.component.ts           | 12 +++++++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

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 1d6fdb7ea1..6973a6a32d 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,10 +27,7 @@
       <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"
-                           [disabled]="!relationFilterControl.get('relationType').value">
-            {{ 'relation.not' | translate}}
-          </mat-chip-option>
+          <mat-chip-option color="primary" [value]="true">{{ 'relation.not' | translate }}</mat-chip-option>
         </mat-chip-listbox>
         <tb-relation-type-autocomplete subscriptSizing="dynamic"
                                        class="flex-50" showLabel="false"
diff --git a/ui-ngx/src/app/modules/home/components/relation/relation-filters.component.ts b/ui-ngx/src/app/modules/home/components/relation/relation-filters.component.ts
index 3d438f30ad..5bbce12bec 100644
--- a/ui-ngx/src/app/modules/home/components/relation/relation-filters.component.ts
+++ b/ui-ngx/src/app/modules/home/components/relation/relation-filters.component.ts
@@ -128,7 +128,17 @@ export class RelationFiltersComponent extends PageComponent implements ControlVa
       entityTypes: [filter ? filter.entityTypes : []]
     });
     if (this.enableNotOption) {
-      formGroup.addControl('negate', this.fb.control(filter ? filter.negate : false));
+      formGroup.addControl('negate', this.fb.control({value: filter ? filter.negate : false, disabled: true}));
+      formGroup.get('relationType').valueChanges.pipe(
+        takeUntil(this.destroy$)
+      ).subscribe(value => {
+        if (value) {
+          formGroup.get('negate').enable({emitEvent: false});
+        } else {
+          formGroup.get('negate').setValue(false, {emitEvent:false});
+          formGroup.get('negate').disable({emitEvent: false});
+        }
+      });
     }
     return formGroup;
   }