From 1289b4205424830f384ff66325b3ac03a818086a Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Tue, 14 Apr 2026 16:33:41 +0200 Subject: [PATCH 1/9] Fixed Alarm Assignee icon placement --- .../modules/home/components/alarm/alarm-assignee.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss index c8de20ad36..925c6defc9 100644 --- a/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss +++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss @@ -40,7 +40,7 @@ margin-left: 12px; margin-right: 20px; &.inline-icon { - margin-left: 0; + margin-left: 8px; margin-right: 8px; } } From 48fe4074fdfa029ab33f77b49dab610d28880f4d Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Wed, 15 Apr 2026 12:22:18 +0200 Subject: [PATCH 2/9] Fix mat icon styles --- .../home/components/alarm/alarm-assignee.component.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss index 925c6defc9..1aeded1767 100644 --- a/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss +++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss @@ -42,5 +42,9 @@ &.inline-icon { margin-left: 8px; margin-right: 8px; + padding: 6px 0 !important; + } + &.mat-icon { + font-size: 28px !important; } } From 7c869239d3263794f4128ae38596e9e7a739167a Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Wed, 15 Apr 2026 12:24:08 +0200 Subject: [PATCH 3/9] Adjusted size of entity type select to fit error message --- .../shared/components/entity/entity-list-select.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html index e6a5067783..595b33ec1d 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html +++ b/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html @@ -19,7 +19,7 @@ Date: Wed, 15 Apr 2026 15:35:00 +0200 Subject: [PATCH 4/9] Propagated size of page to child nodes in Entities hierarchy widget --- .../widget/lib/entity/entities-hierarchy-widget.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts index 12cd55f5b1..1aee063a96 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts @@ -471,7 +471,8 @@ export class EntitiesHierarchyWidgetComponent extends PageComponent implements O childrenNodesLoadCb(this.prepareNodes(childNodes)); } } - } + }, + pageSize: this.ctx.widgetConfig.pageSize }; this.ctx.subscriptionApi.createSubscription(subscriptionOptions, true); } From a46592b6a75dad45aba63489021c19d5e1918959 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Wed, 15 Apr 2026 16:55:52 +0200 Subject: [PATCH 5/9] Minor rework --- .../widget/lib/entity/entities-hierarchy-widget.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts index 1aee063a96..ea8f02756b 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts @@ -448,6 +448,7 @@ export class EntitiesHierarchyWidgetComponent extends PageComponent implements O const subscriptionOptions: WidgetSubscriptionOptions = { type: widgetType.latest, datasources: [childrenDatasource], + pageSize: this.ctx.widgetConfig.pageSize, callbacks: { onSubscriptionMessage: (subscription, message) => { this.ctx.showToast(message.severity, message.message, undefined, @@ -471,8 +472,7 @@ export class EntitiesHierarchyWidgetComponent extends PageComponent implements O childrenNodesLoadCb(this.prepareNodes(childNodes)); } } - }, - pageSize: this.ctx.widgetConfig.pageSize + } }; this.ctx.subscriptionApi.createSubscription(subscriptionOptions, true); } From c8c1d49eaf88baa28be749b3bb9865132b30e9c8 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Wed, 15 Apr 2026 15:01:57 +0200 Subject: [PATCH 6/9] Added update run after custom header actions available --- .../src/app/modules/home/components/widget/widget.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/ui-ngx/src/app/modules/home/components/widget/widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/widget.component.ts index c42a4c6b48..cb96a493a1 100644 --- a/ui-ngx/src/app/modules/home/components/widget/widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/widget.component.ts @@ -332,6 +332,7 @@ export class WidgetComponent extends PageComponent implements OnInit, OnChanges, if (customHeaderActions$.length) { forkJoin(customHeaderActions$).subscribe((customHeaderActions) => { this.widgetContext.customHeaderActions.push(...customHeaderActions); + this.dashboardWidget.updateParamsFromData(true); }); } From f3a1c5faab2b6b445cdfe14e7a8409acb5bb7f12 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Wed, 15 Apr 2026 17:08:05 +0200 Subject: [PATCH 7/9] Fixed not proper set of timewindow for child nodes in Entities hierarchy widget --- .../widget/lib/entity/entities-hierarchy-widget.component.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts index 12cd55f5b1..e1e140e326 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts @@ -448,6 +448,9 @@ export class EntitiesHierarchyWidgetComponent extends PageComponent implements O const subscriptionOptions: WidgetSubscriptionOptions = { type: widgetType.latest, datasources: [childrenDatasource], + useDashboardTimewindow: this.ctx.widgetConfig.useDashboardTimewindow, + dashboardTimewindow: this.ctx.dashboardTimewindow, + timeWindowConfig: this.ctx.widgetConfig.useDashboardTimewindow ? this.ctx.dashboardTimewindow : this.ctx.widgetConfig.timewindow, callbacks: { onSubscriptionMessage: (subscription, message) => { this.ctx.showToast(message.severity, message.message, undefined, From a0fd36bc1e66eecb7102c9fd46a03141e70b76f8 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Wed, 15 Apr 2026 17:20:19 +0200 Subject: [PATCH 8/9] Approach change --- .../components/entity/entity-list-select.component.html | 3 ++- .../components/entity/entity-type-select.component.html | 2 +- .../shared/components/entity/entity-type-select.component.ts | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html index 595b33ec1d..ea9248f17a 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html +++ b/ui-ngx/src/app/shared/components/entity/entity-list-select.component.html @@ -19,10 +19,11 @@ {{ label }} diff --git a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts index 4e6d6d4347..ea24c373d6 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts +++ b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts @@ -21,7 +21,7 @@ import { AliasEntityType, EntityType, entityTypeTranslations } from '@app/shared import { EntityService } from '@core/http/entity.service'; import { coerceBoolean } from '@shared/decorators/coercion'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { MatFormFieldAppearance } from '@angular/material/form-field'; +import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field'; @Component({ selector: 'tb-entity-type-select', @@ -69,6 +69,9 @@ export class EntityTypeSelectComponent implements ControlValueAccessor, OnInit, @Input() appearance: MatFormFieldAppearance = 'fill'; + @Input() + subscriptSizing: SubscriptSizing = 'fixed'; + @Input() @coerceBoolean() inlineField: boolean; From e2260ff5577cf653a9729ae68f192ccca3f03651 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Wed, 15 Apr 2026 17:27:04 +0200 Subject: [PATCH 9/9] Add hint to reserve space --- .../shared/components/entity/entity-type-select.component.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html index 65e3615887..b3f4fa5300 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html +++ b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.html @@ -24,6 +24,9 @@ {{ displayEntityTypeFn(type) }} + @if (!inlineField && subscriptSizing === 'dynamic') { + + } {{ 'entity.type-required' | translate }}