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..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 @@ -40,7 +40,11 @@ margin-left: 12px; margin-right: 20px; &.inline-icon { - margin-left: 0; + margin-left: 8px; margin-right: 8px; + padding: 6px 0 !important; + } + &.mat-icon { + font-size: 28px !important; } } 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..4998a9ab9c 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,10 @@ export class EntitiesHierarchyWidgetComponent extends PageComponent implements O const subscriptionOptions: WidgetSubscriptionOptions = { type: widgetType.latest, datasources: [childrenDatasource], + pageSize: this.ctx.widgetConfig.pageSize, + 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, 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 443c801633..b04fad8caf 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 @@ -334,6 +334,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); }); } 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 fb7eac1806..7c5b22d8e7 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 @@ -23,7 +23,7 @@ style="min-width: 100px; padding-right: 8px;" [showLabel]="true" [required]="required" - [useAliasEntityTypes]="useAliasEntityTypes" + subscriptSizing="dynamic"[useAliasEntityTypes]="useAliasEntityTypes" [allowedEntityTypes]="allowedEntityTypes" [filterAllowedEntityTypes]="filterAllowedEntityTypes" [additionEntityTypes]="additionEntityTypes" 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 e13e11bde0..190eff28e1 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 @@ -28,6 +28,9 @@ } + @if (!inlineField && subscriptSizing === 'dynamic') { + + } @if (!inlineField && entityTypeFormGroup.get('entityType').hasError('required')) { {{ 'entity.type-required' | translate }}