From 4212f9dde469ed6615b1caec542f40e9748c8ca6 Mon Sep 17 00:00:00 2001
From: LeoMorgan113 <mandragora1783@gmail.com>
Date: Fri, 16 May 2025 15:19:01 +0300
Subject: [PATCH 1/3] Fix for widgetTitlePanel templateOutlet

---
 .../lib/chart/bar-chart-with-labels-widget.component.html     | 2 +-
 .../lib/chart/bar-chart-with-labels-widget.component.ts       | 3 +++
 .../widget/lib/chart/range-chart-widget.component.html        | 2 +-
 .../widget/lib/chart/range-chart-widget.component.ts          | 3 +++
 .../widget/lib/chart/time-series-chart-widget.component.html  | 2 +-
 .../widget/lib/chart/time-series-chart-widget.component.ts    | 3 +++
 .../home/components/widget/lib/maps/map-widget.component.html | 2 +-
 .../home/components/widget/lib/maps/map-widget.component.ts   | 4 ++++
 8 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html
index 0e0170c603..3f4835f475 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html
@@ -19,7 +19,7 @@
   <div class="tb-bar-chart-overlay" [style]="overlayStyle"></div>
   @if (widgetComponent.dashboardWidget.showWidgetTitlePanel) {
     <div class="tb-widget-title-row flex justify-between">
-      <ng-container *ngTemplateOutlet="widgetComponent.widgetTitlePanel"></ng-container>
+      <ng-container *ngTemplateOutlet="widgetTitlePanel || widgetComponent.widgetTitlePanel"></ng-container>
       <ng-container *ngTemplateOutlet="widgetComponent.widgetHeaderActionsPanel"></ng-container>
     </div>
   } @else {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts
index 746daf43b3..14e77ae738 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts
@@ -58,6 +58,9 @@ export class BarChartWithLabelsWidgetComponent implements OnInit, OnDestroy, Aft
   @Input()
   ctx: WidgetContext;
 
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
   showLegend: boolean;
   legendClass: string;
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.html
index 39112c484b..fc16fbdc13 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.html
@@ -19,7 +19,7 @@
   <div class="tb-range-chart-overlay" [style]="overlayStyle"></div>
   @if (widgetComponent.dashboardWidget.showWidgetTitlePanel) {
     <div class="tb-widget-title-row flex justify-between">
-      <ng-container *ngTemplateOutlet="widgetComponent.widgetTitlePanel"></ng-container>
+      <ng-container *ngTemplateOutlet="widgetTitlePanel || widgetComponent.widgetTitlePanel"></ng-container>
       <ng-container *ngTemplateOutlet="widgetComponent.widgetHeaderActionsPanel"></ng-container>
     </div>
   } @else {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts
index 0201ec7d5f..92bc8e887f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts
@@ -66,6 +66,9 @@ export class RangeChartWidgetComponent implements OnInit, OnDestroy, AfterViewIn
   @Input()
   ctx: WidgetContext;
 
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
   showLegend: boolean;
   legendClass: string;
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.html
index 1efcf30781..fe7335c92d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.html
@@ -19,7 +19,7 @@
   <div class="tb-time-series-chart-overlay" [style]="overlayStyle"></div>
   @if (widgetComponent.dashboardWidget.showWidgetTitlePanel) {
     <div class="tb-widget-title-row flex justify-between">
-      <ng-container *ngTemplateOutlet="widgetComponent.widgetTitlePanel"></ng-container>
+      <ng-container *ngTemplateOutlet="widgetTitlePanel || widgetComponent.widgetTitlePanel"></ng-container>
       <ng-container *ngTemplateOutlet="widgetComponent.widgetHeaderActionsPanel"></ng-container>
     </div>
   } @else {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
index 2fd12b1b98..2e9f297b4a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
@@ -61,6 +61,9 @@ export class TimeSeriesChartWidgetComponent implements OnInit, OnDestroy, AfterV
   @Input()
   ctx: WidgetContext;
 
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
   horizontalLegendPosition = false;
 
   showLegend: boolean;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.component.html
index e64ee71170..c0aceeabb0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.component.html
@@ -19,7 +19,7 @@
   <div class="tb-map-overlay" [style]="overlayStyle"></div>
     @if (widgetComponent.dashboardWidget.showWidgetTitlePanel) {
       <div class="tb-widget-title-row flex justify-between">
-        <ng-container *ngTemplateOutlet="widgetComponent.widgetTitlePanel"></ng-container>
+        <ng-container *ngTemplateOutlet="widgetTitlePanel || widgetComponent.widgetTitlePanel"></ng-container>
         <ng-container *ngTemplateOutlet="widgetComponent.widgetHeaderActionsPanel"></ng-container>
       </div>
     } @else {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.component.ts
index 4ef3c3cd45..013a6c88a9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.component.ts
@@ -21,6 +21,7 @@ import {
   Input,
   OnDestroy,
   OnInit,
+  TemplateRef,
   ViewChild,
   ViewEncapsulation
 } from '@angular/core';
@@ -54,6 +55,9 @@ export class MapWidgetComponent implements OnInit, OnDestroy {
   @Input()
   ctx: WidgetContext;
 
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
   backgroundStyle$: Observable<ComponentStyle>;
   overlayStyle: ComponentStyle = {};
   padding: string;

From 4d4d16520dfaa8279aee7139efb3a00968af74a1 Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Mon, 30 Jun 2025 17:45:04 +0300
Subject: [PATCH 2/3] UI: Fixed detect changes for tables

---
 .../components/widget/lib/alarm/alarms-table-widget.component.ts | 1 +
 .../widget/lib/entity/entities-table-widget.component.ts         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
index 45825a0294..b1c0f38ef2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
@@ -340,6 +340,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
   public onDataUpdated() {
     this.alarmsDatasource.updateAlarms();
     this.clearCache();
+    this.ctx.detectChanges();
   }
 
   public onEditModeChanged() {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
index 82537384a1..f95c8c26d7 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
@@ -275,6 +275,7 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
   public onDataUpdated() {
     this.entityDatasource.dataUpdated();
     this.clearCache();
+    this.ctx.detectChanges();
   }
 
   public onEditModeChanged() {

From b20b3d2b6e529cc5a10423895ee584ac8d69502f Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Tue, 1 Jul 2025 12:46:27 +0300
Subject: [PATCH 3/3] UI: Fixed range-chart widget import

---
 .../components/widget/lib/chart/range-chart-widget.component.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts
index f5ea7487ed..f471a9e84c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts
@@ -23,6 +23,7 @@ import {
   OnDestroy,
   OnInit,
   Renderer2,
+  TemplateRef,
   ViewChild,
   ViewEncapsulation
 } from '@angular/core';