Improve entities and alarms table widget title processing.

@@ -150,7 +150,8 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
   private settings: AlarmsTableWidgetSettings;
   private settings: AlarmsTableWidgetSettings;
   private widgetConfig: WidgetConfig;
   private widgetConfig: WidgetConfig;
   private subscription: IWidgetSubscription;
   private subscription: IWidgetSubscription;
-  private alarmSource: Datasource;
+
+  private alarmsTitlePattern: string;
 
 
   private displayDetails = true;
   private displayDetails = true;
   private allowAcknowledgment = true;
   private allowAcknowledgment = true;
@@ -215,7 +216,6 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
     this.settings = this.ctx.settings;
     this.settings = this.ctx.settings;
     this.widgetConfig = this.ctx.widgetConfig;
     this.widgetConfig = this.ctx.widgetConfig;
     this.subscription = this.ctx.defaultSubscription;
     this.subscription = this.ctx.defaultSubscription;
-    this.alarmSource = this.subscription.alarmSource;
     this.initializeConfig();
     this.initializeConfig();
     this.updateAlarmSource();
     this.updateAlarmSource();
     this.ctx.updateWidgetParams();
     this.ctx.updateWidgetParams();
@@ -248,6 +248,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
 
 
   public onDataUpdated() {
   public onDataUpdated() {
     this.ngZone.run(() => {
     this.ngZone.run(() => {
+      this.updateTitle(true);
       this.alarmsDatasource.updateAlarms();
       this.alarmsDatasource.updateAlarms();
       this.ctx.detectChanges();
       this.ctx.detectChanges();
     });
     });
@@ -296,15 +297,13 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
 
 
     this.actionCellDescriptors = this.actionCellDescriptors.concat(this.ctx.actionsApi.getActionDescriptors('actionCellButton'));
     this.actionCellDescriptors = this.actionCellDescriptors.concat(this.ctx.actionsApi.getActionDescriptors('actionCellButton'));
 
 
-    let alarmsTitle: string;
-
     if (this.settings.alarmsTitle && this.settings.alarmsTitle.length) {
     if (this.settings.alarmsTitle && this.settings.alarmsTitle.length) {
-      alarmsTitle = this.utils.customTranslation(this.settings.alarmsTitle, this.settings.alarmsTitle);
+      this.alarmsTitlePattern = this.utils.customTranslation(this.settings.alarmsTitle, this.settings.alarmsTitle);
     } else {
     } else {
-      alarmsTitle = this.translate.instant('alarm.alarms');
+      this.alarmsTitlePattern = this.translate.instant('alarm.alarms');
     }
     }
 
 
-    this.ctx.widgetTitle = createLabelFromDatasource(this.alarmSource, alarmsTitle);
+    this.updateTitle(false);
 
 
     this.enableSelection = isDefined(this.settings.enableSelection) ? this.settings.enableSelection : true;
     this.enableSelection = isDefined(this.settings.enableSelection) ? this.settings.enableSelection : true;
     if (!this.allowAcknowledgment && !this.allowClear) {
     if (!this.allowAcknowledgment && !this.allowClear) {
@@ -353,6 +352,16 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
     $(this.elementRef.nativeElement).addClass(namespace);
     $(this.elementRef.nativeElement).addClass(namespace);
   }
   }
 
 
+  private updateTitle(updateWidgetParams = false) {
+    const newTitle = createLabelFromDatasource(this.subscription.alarmSource, this.alarmsTitlePattern);
+    if (this.ctx.widgetTitle !== newTitle) {
+      this.ctx.widgetTitle = newTitle;
+      if (updateWidgetParams) {
+        this.ctx.updateWidgetParams();
+      }
+    }
+  }
+
   private updateAlarmSource() {
   private updateAlarmSource() {
 
 
     if (this.enableSelection) {
     if (this.enableSelection) {
@@ -361,8 +370,8 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
 
 
     const latestDataKeys: Array<DataKey> = [];
     const latestDataKeys: Array<DataKey> = [];
 
 
-    if (this.alarmSource) {
-      this.alarmSource.dataKeys.forEach((alarmDataKey) => {
+    if (this.subscription.alarmSource) {
+      this.subscription.alarmSource.dataKeys.forEach((alarmDataKey) => {
         const dataKey: EntityColumn = deepClone(alarmDataKey) as EntityColumn;
         const dataKey: EntityColumn = deepClone(alarmDataKey) as EntityColumn;
         dataKey.entityKey = dataKeyToEntityKey(alarmDataKey);
         dataKey.entityKey = dataKeyToEntityKey(alarmDataKey);
         dataKey.title = this.utils.customTranslation(dataKey.label, dataKey.label);
         dataKey.title = this.utils.customTranslation(dataKey.label, dataKey.label);

@@ -125,6 +125,8 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
   private widgetConfig: WidgetConfig;
   private widgetConfig: WidgetConfig;
   private subscription: IWidgetSubscription;
   private subscription: IWidgetSubscription;
 
 
+  private entitiesTitlePattern: string;
+
   private defaultPageSize = 10;
   private defaultPageSize = 10;
   private defaultSortOrder = 'entityName';
   private defaultSortOrder = 'entityName';
 
 
@@ -205,6 +207,7 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
 
 
   public onDataUpdated() {
   public onDataUpdated() {
     this.ngZone.run(() => {
     this.ngZone.run(() => {
+      this.updateTitle(true);
       this.entityDatasource.dataUpdated();
       this.entityDatasource.dataUpdated();
       this.ctx.detectChanges();
       this.ctx.detectChanges();
     });
     });
@@ -219,16 +222,13 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
 
 
     this.actionCellDescriptors = this.ctx.actionsApi.getActionDescriptors('actionCellButton');
     this.actionCellDescriptors = this.ctx.actionsApi.getActionDescriptors('actionCellButton');
 
 
-    let entitiesTitle: string;
-
     if (this.settings.entitiesTitle && this.settings.entitiesTitle.length) {
     if (this.settings.entitiesTitle && this.settings.entitiesTitle.length) {
-      entitiesTitle = this.utils.customTranslation(this.settings.entitiesTitle, this.settings.entitiesTitle);
+      this.entitiesTitlePattern = this.utils.customTranslation(this.settings.entitiesTitle, this.settings.entitiesTitle);
     } else {
     } else {
-      entitiesTitle = this.translate.instant('entity.entities');
+      this.entitiesTitlePattern = this.translate.instant('entity.entities');
     }
     }
 
 
-    const datasource = this.subscription.datasources[0];
-    this.ctx.widgetTitle = createLabelFromDatasource(datasource, entitiesTitle);
+    this.updateTitle(false);
 
 
     this.searchAction.show = isDefined(this.settings.enableSearch) ? this.settings.enableSearch : true;
     this.searchAction.show = isDefined(this.settings.enableSearch) ? this.settings.enableSearch : true;
     this.displayPagination = isDefined(this.settings.displayPagination) ? this.settings.displayPagination : true;
     this.displayPagination = isDefined(this.settings.displayPagination) ? this.settings.displayPagination : true;
@@ -250,6 +250,16 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
     $(this.elementRef.nativeElement).addClass(namespace);
     $(this.elementRef.nativeElement).addClass(namespace);
   }
   }
 
 
+  private updateTitle(updateWidgetParams = false) {
+    const newTitle = createLabelFromDatasource(this.subscription.datasources[0], this.entitiesTitlePattern);
+    if (this.ctx.widgetTitle !== newTitle) {
+      this.ctx.widgetTitle = newTitle;
+      if (updateWidgetParams) {
+        this.ctx.updateWidgetParams();
+      }
+    }
+  }
+
   private updateDatasources() {
   private updateDatasources() {
 
 
     const displayEntityName = isDefined(this.settings.displayEntityName) ? this.settings.displayEntityName : true;
     const displayEntityName = isDefined(this.settings.displayEntityName) ? this.settings.displayEntityName : true;