From 810c2a7ed3af17887481382a57cb7b06a54a1a6d Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Mon, 14 Jun 2021 18:57:02 +0300
Subject: [PATCH] UI: Fixed bug, not disabled deleting alias used only in alarm
 widgets

---
 .../alias/entity-aliases-dialog.component.ts  | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/alias/entity-aliases-dialog.component.ts b/ui-ngx/src/app/modules/home/components/alias/entity-aliases-dialog.component.ts
index 08119e6ce8..aeb0f9c286 100644
--- a/ui-ngx/src/app/modules/home/components/alias/entity-aliases-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alias/entity-aliases-dialog.component.ts
@@ -98,24 +98,17 @@ export class EntityAliasesDialogComponent extends DialogComponent<EntityAliasesD
         this.data.widgets.forEach((widget) => {
           if (widget.type === widgetType.rpc) {
             if (widget.config.targetDeviceAliasIds && widget.config.targetDeviceAliasIds.length > 0) {
-              const targetDeviceAliasId = widget.config.targetDeviceAliasIds[0];
-              widgetsTitleList = this.aliasToWidgetsMap[targetDeviceAliasId];
-              if (!widgetsTitleList) {
-                widgetsTitleList = [];
-                this.aliasToWidgetsMap[targetDeviceAliasId] = widgetsTitleList;
-              }
-              widgetsTitleList.push(widget.config.title);
+              this.addWidgetTitleToWidgetsMap(widget.config.targetDeviceAliasIds[0], widget.config.title);
+            }
+          } else if (widget.type === widgetType.alarm) {
+            if (widget.config.alarmSource) {
+              this.addWidgetTitleToWidgetsMap(widget.config.alarmSource.entityAliasId, widget.config.title);
             }
           } else {
             const datasources = this.utils.validateDatasources(widget.config.datasources);
             datasources.forEach((datasource) => {
               if (datasource.type === DatasourceType.entity && datasource.entityAliasId) {
-                widgetsTitleList = this.aliasToWidgetsMap[datasource.entityAliasId];
-                if (!widgetsTitleList) {
-                  widgetsTitleList = [];
-                  this.aliasToWidgetsMap[datasource.entityAliasId] = widgetsTitleList;
-                }
-                widgetsTitleList.push(widget.config.title);
+                this.addWidgetTitleToWidgetsMap(datasource.entityAliasId, widget.config.title);
               }
             });
           }
@@ -141,6 +134,15 @@ export class EntityAliasesDialogComponent extends DialogComponent<EntityAliasesD
     });
   }
 
+  private addWidgetTitleToWidgetsMap(aliasId: string, widgetTitle: string) {
+    let widgetsTitleList: Array<string> = this.aliasToWidgetsMap[aliasId];
+    if (!widgetsTitleList) {
+      widgetsTitleList = [];
+      this.aliasToWidgetsMap[aliasId] = widgetsTitleList;
+    }
+    widgetsTitleList.push(widgetTitle);
+  }
+
   private createEntityAliasFormControl(aliasId: string, entityAlias: EntityAlias): AbstractControl {
     const aliasFormControl = this.fb.group({
       id: [aliasId],