Browse Source

Merge remote-tracking branch 'upstream/lts-4.2' into lts-4.3

pull/15455/head
Vladyslav_Prykhodko 6 months ago
parent
commit
8cca70e442
  1. 6
      ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss
  2. 4
      ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-hierarchy-widget.component.ts
  3. 1
      ui-ngx/src/app/modules/home/components/widget/widget.component.ts
  4. 1
      ui-ngx/src/app/shared/components/entity/entity-list-select.component.html
  5. 3
      ui-ngx/src/app/shared/components/entity/entity-type-select.component.html

6
ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss

@ -40,7 +40,11 @@
margin-left: 12px; margin-left: 12px;
margin-right: 20px; margin-right: 20px;
&.inline-icon { &.inline-icon {
margin-left: 0; margin-left: 8px;
margin-right: 8px; margin-right: 8px;
padding: 6px 0 !important;
}
&.mat-icon {
font-size: 28px !important;
} }
} }

4
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 = { const subscriptionOptions: WidgetSubscriptionOptions = {
type: widgetType.latest, type: widgetType.latest,
datasources: [childrenDatasource], 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: { callbacks: {
onSubscriptionMessage: (subscription, message) => { onSubscriptionMessage: (subscription, message) => {
this.ctx.showToast(message.severity, message.message, undefined, this.ctx.showToast(message.severity, message.message, undefined,

1
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) { if (customHeaderActions$.length) {
forkJoin(customHeaderActions$).subscribe((customHeaderActions) => { forkJoin(customHeaderActions$).subscribe((customHeaderActions) => {
this.widgetContext.customHeaderActions.push(...customHeaderActions); this.widgetContext.customHeaderActions.push(...customHeaderActions);
this.dashboardWidget.updateParamsFromData(true);
}); });
} }

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

@ -23,6 +23,7 @@
*ngIf="displayEntityTypeSelect" *ngIf="displayEntityTypeSelect"
[showLabel]="true" [showLabel]="true"
[required]="required" [required]="required"
subscriptSizing="dynamic"
[useAliasEntityTypes]="useAliasEntityTypes" [useAliasEntityTypes]="useAliasEntityTypes"
[allowedEntityTypes]="allowedEntityTypes" [allowedEntityTypes]="allowedEntityTypes"
[filterAllowedEntityTypes]="filterAllowedEntityTypes" [filterAllowedEntityTypes]="filterAllowedEntityTypes"

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

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

Loading…
Cancel
Save