From d1bcd2ecd488759430989009ceb3cc5695d62f04 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Thu, 9 Apr 2026 13:35:56 +0200
Subject: [PATCH] Fixed table alignment

---
 .../filter/filter-predicate-list.component.html          | 9 ++++-----
 .../components/filter/filter-predicate.component.html    | 1 +
 .../home/components/filter/filter-predicate.component.ts | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/filter/filter-predicate-list.component.html b/ui-ngx/src/app/modules/home/components/filter/filter-predicate-list.component.html
index df46c7d0e9..74abefec34 100644
--- a/ui-ngx/src/app/modules/home/components/filter/filter-predicate-list.component.html
+++ b/ui-ngx/src/app/modules/home/components/filter/filter-predicate-list.component.html
@@ -22,12 +22,11 @@
         <div class="flex flex-full flex-row items-center justify-start gap-2">
           <div class="flex flex-1 flex-row pl-2">
             <label translate class="filter-title max-w-30% flex-full">filter.operation.operation</label>
-            <label translate class="filter-title max-w-[68%] flex-full">filter.value</label>
-            @if (displayUserParameters) {
-              <label translate class="filter-title max-w-[8%] flex-full">filter.user-parameters</label>
-            }
+            <label translate class="filter-title max-w-70% flex-full">filter.value</label>
           </div>
-          <span [class.!hidden]="disabled" class="min-w-10">&nbsp;</span>
+          @if (displayUserParameters) {
+            <span [class.!hidden]="disabled" class="min-w-12">&nbsp;</span>
+          }
         </div>
       </div>
       <mat-divider style="padding-bottom: 5px;"></mat-divider>
diff --git a/ui-ngx/src/app/modules/home/components/filter/filter-predicate.component.html b/ui-ngx/src/app/modules/home/components/filter/filter-predicate.component.html
index d3a0ba01d4..6c99a7bfcd 100644
--- a/ui-ngx/src/app/modules/home/components/filter/filter-predicate.component.html
+++ b/ui-ngx/src/app/modules/home/components/filter/filter-predicate.component.html
@@ -78,6 +78,7 @@
       <tb-filter-predicate-value
         [allowUserDynamicSource]="allowUserDynamicSource"
         [onlyUserDynamicSource]="onlyUserDynamicSource"
+        [operation]="filterPredicateFormGroup.get('operation').value"
         class="max-w-70% flex-full"
         [valueType]="valueType"
         formControlName="value">
diff --git a/ui-ngx/src/app/modules/home/components/filter/filter-predicate.component.ts b/ui-ngx/src/app/modules/home/components/filter/filter-predicate.component.ts
index 797f8f2a4f..0b074c2205 100644
--- a/ui-ngx/src/app/modules/home/components/filter/filter-predicate.component.ts
+++ b/ui-ngx/src/app/modules/home/components/filter/filter-predicate.component.ts
@@ -155,7 +155,7 @@ export class FilterPredicateComponent implements ControlValueAccessor, Validator
           type: this.type,
           value: v.value,
           operation: v.operation,
-          ignoreCase: v.ignoreCase
+          ignoreCase: !!v.ignoreCase
         } as KeyFilterPredicate;
       }
       predicate = {