From 1e2ffcfc32e86afbb49cc1f432858bde4622cd75 Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko <adzhereleiko@thingsboard.io>
Date: Thu, 15 Jan 2026 12:14:52 +0200
Subject: [PATCH] UI: Fixed alarm rule filter list value type

---
 .../filter/alarm-rule-filter-list.component.html     |  2 +-
 .../filter/alarm-rule-filter-list.component.ts       | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.html b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.html
index 20b0056014..950d19abd0 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.html
@@ -41,7 +41,7 @@
           <div class="flex max-w-92% flex-full flex-col">
             <div class="flex flex-row items-center justify-start">
               <div class="filters-text flex-1">{{ filterControl.value?.argument }}</div>
-              <div class="filters-text flex-1">{{ FilterPredicateTypeTranslationMap.get(filterControl.value?.valueType) | translate }}</div>
+              <div class="filters-text flex-1">{{ entityKeyValueTypes.get(entityKeyValueTypeEnum[filterControl.value?.valueType]).name | translate }}</div>
               <button mat-icon-button color="primary" class="tb-budge-button"
                       type="button"
                       (click)="editFilter(index, readonly)"
diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.ts b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.ts
index 142d0d72f2..5bb05ab1eb 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.ts
@@ -30,7 +30,8 @@ import { Observable } from 'rxjs';
 import {
   ComplexOperation,
   complexOperationTranslationMap,
-  EntityKeyValueType
+  EntityKeyValueType,
+  entityKeyValueTypesMap
 } from '@shared/models/query/query.models';
 import { MatDialog } from '@angular/material/dialog';
 import { deepClone } from '@core/utils';
@@ -38,11 +39,7 @@ import {
   AlarmRuleFilterDialogComponent,
   AlarmRuleFilterDialogData
 } from "@home/components/alarm-rules/filter/alarm-rule-filter-dialog.component";
-import {
-  AlarmRuleFilter,
-  areFilterAndPredicateArgumentsValid,
-  FilterPredicateTypeTranslationMap
-} from "@shared/models/alarm-rule.models";
+import { AlarmRuleFilter, areFilterAndPredicateArgumentsValid } from "@shared/models/alarm-rule.models";
 import { CalculatedFieldArgument } from "@shared/models/calculated-field.models";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 
@@ -83,7 +80,8 @@ export class AlarmRuleFilterListComponent implements ControlValueAccessor, Valid
   areFilterAndPredicateArgumentsValid = areFilterAndPredicateArgumentsValid;
 
   complexOperationTranslationMap = complexOperationTranslationMap;
-  FilterPredicateTypeTranslationMap = FilterPredicateTypeTranslationMap
+  entityKeyValueTypes = entityKeyValueTypesMap;
+  entityKeyValueTypeEnum = EntityKeyValueType;
 
   private propagateChange = (v: any) => { };