Merge pull request #15448 from thingsboard/master-rc-merge

Merge rc into master

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;
   }
 }

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,

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);
       });
     }
 

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"

ui-ngx/src/app/shared/components/entity/entity-type-select.component.html

@@ -28,6 +28,9 @@
       </mat-option>
     }
   </mat-select>
+  @if (!inlineField && subscriptSizing === 'dynamic') {
+    <mat-hint></mat-hint>
+  }
   @if (!inlineField && entityTypeFormGroup.get('entityType').hasError('required')) {
     <mat-error>
       {{ 'entity.type-required' | translate }}