From 977dd85fcfc18ae61ac2c4f0cbc2daaab74985ed Mon Sep 17 00:00:00 2001
From: Dmitriymush <powder322@gmail.com>
Date: Thu, 15 Feb 2024 18:56:49 +0200
Subject: [PATCH] UI: fixed typeList url query and alarm filter config
 translation

---
 .../components/alarm/alarm-filter-config.component.ts  | 10 ++++++++--
 ui-ngx/src/app/shared/models/alarm.models.ts           |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.ts
index 1218cedca2..609dbb8e7a 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.ts
@@ -45,6 +45,7 @@ import { deepClone } from '@core/utils';
 import { EntityType } from '@shared/models/entity-type.models';
 import { fromEvent, Subscription } from 'rxjs';
 import { POSITION_MAP } from '@shared/models/overlay.models';
+import { UtilsService } from '@core/services/utils.service';
 
 export const ALARM_FILTER_CONFIG_DATA = new InjectionToken<any>('AlarmFilterConfigData');
 
@@ -127,7 +128,8 @@ export class AlarmFilterConfigComponent implements OnInit, OnDestroy, ControlVal
               private translate: TranslateService,
               private overlay: Overlay,
               private nativeElement: ElementRef,
-              private viewContainerRef: ViewContainerRef) {
+              private viewContainerRef: ViewContainerRef,
+              private utils: UtilsService) {
   }
 
   ngOnInit(): void {
@@ -298,7 +300,7 @@ export class AlarmFilterConfigComponent implements OnInit, OnDestroy, ControlVal
           this.translate.instant(alarmSeverityTranslations.get(s))).join(', '));
       }
       if (this.alarmFilterConfig?.typeList?.length) {
-        filterTextParts.push(this.alarmFilterConfig.typeList.join(', '));
+        filterTextParts.push(this.alarmFilterConfig.typeList.map((type) => this.customTranslate(type)).join(', '));
       }
       if (this.alarmFilterConfig?.assignedToCurrentUser) {
         filterTextParts.push(this.translate.instant('alarm.assigned-to-me'));
@@ -313,4 +315,8 @@ export class AlarmFilterConfigComponent implements OnInit, OnDestroy, ControlVal
     }
   }
 
+  private customTranslate(entity: string) {
+    return this.utils.customTranslation(entity, entity);
+  }
+
 }
diff --git a/ui-ngx/src/app/shared/models/alarm.models.ts b/ui-ngx/src/app/shared/models/alarm.models.ts
index 43fd717ef7..57509368d5 100644
--- a/ui-ngx/src/app/shared/models/alarm.models.ts
+++ b/ui-ngx/src/app/shared/models/alarm.models.ts
@@ -335,7 +335,7 @@ export class AlarmQueryV2 {
     let query = this.affectedEntityId ? `/${this.affectedEntityId.entityType}/${this.affectedEntityId.id}` : '';
     query += this.pageLink.toQuery();
     if (this.typeList && this.typeList.length) {
-      query += `&typeList=${this.typeList.join(',')}`;
+      query += `&typeList=${this.typeList.map(type => encodeURIComponent(type)).join(',')}`;
     }
     if (this.statusList && this.statusList.length) {
       query += `&statusList=${this.statusList.join(',')}`;