Merge pull request #14942 from thingsboard/lts-4.3

Merge lts-4.3 to rc

ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.ts

@@ -180,7 +180,7 @@ export class AlarmRuleDialogComponent extends DialogComponent<AlarmRuleDialogCom
         });
     } else {
       this.fieldFormGroup.get('name').markAsTouched();
-      this.entitySelect.entityAutocompleteMarkAsTouched();
+      this.entitySelect?.entityAutocompleteMarkAsTouched();
     }
   }
 

ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.html

@@ -125,7 +125,7 @@
       <section class="tb-form-panel stroked">
         <div class="flex flex-row items-center justify-between">
           <div class="tb-form-panel-title">{{ 'alarm-rule.type' | translate }}</div>
-          <tb-toggle-select formControlName="type" selectMediaBreakpoint="xs" [disabled]="isNoData">
+          <tb-toggle-select formControlName="type" selectMediaBreakpoint="xs">
             <tb-toggle-option *ngFor="let alarmConditionType of alarmConditionTypes" [value]="alarmConditionType">
               {{ alarmConditionTypeTranslation.get(alarmConditionType) | translate }}
             </tb-toggle-option>

ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.ts

@@ -228,6 +228,11 @@ export class CfAlarmRuleConditionDialogComponent extends DialogComponent<CfAlarm
     if (this.isNoData && this.conditionFormGroup.get('type').value !== AlarmRuleConditionType.SIMPLE) {
       this.conditionFormGroup.get('type').patchValue(AlarmRuleConditionType.SIMPLE);
     }
+    if (this.isNoData) {
+      this.conditionFormGroup.get('type').disable({emitEvent: false});
+    } else {
+      this.conditionFormGroup.get('type').enable({emitEvent: false});
+    }
   }
 
   private hasNoData(data: Array<AlarmRuleFilter>) {

ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition.component.ts

@@ -295,6 +295,9 @@ export class CfAlarmRuleConditionComponent implements ControlValueAccessor, Vali
       }
     }).afterClosed().subscribe((result) => {
       if (result) {
+        if (!this.modelValue) {
+          this.modelValue = {} as AlarmRuleCondition;
+        }
         this.modelValue.schedule = result;
         this.updateModel();
       }

ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.models.ts

@@ -28,7 +28,7 @@ import { Circle, Effect, Element, G, Gradient, Path, Runner, Svg, Text, Timeline
 import '@svgdotjs/svg.filter.js';
 import tinycolor from 'tinycolor2';
 import { WidgetContext } from '@home/models/widget-component.models';
-import { Observable, of } from 'rxjs';
+import { Observable, of, shareReplay } from 'rxjs';
 import { isSvgIcon, splitIconName } from '@shared/models/icon.models';
 import { catchError, map, take } from 'rxjs/operators';
 import { MatIconRegistry } from '@angular/material/icon';
@@ -336,6 +336,8 @@ export abstract class PowerButtonShape {
   protected onPowerSymbolCircle: Path;
   protected onPowerSymbolLine: Path;
 
+  private onIcon$: Observable<Element>;
+
   protected constructor(protected widgetContext: WidgetContext,
                         protected svgShape: Svg,
                         protected iconRegistry: MatIconRegistry,
@@ -428,7 +430,10 @@ export abstract class PowerButtonShape {
 
   public drawOnShape(onCenterGroup?: G, label?: boolean, labelWeight?: string, circleStroke?: boolean, mask?: Circle) {
     if (this.icons.onButtonIcon.showIcon) {
-      this.createIconElement(this.icons.onButtonIcon.icon, this.icons.onButtonIcon.iconSize).subscribe(icon => {
+      this.onIcon$ = this.createIconElement(this.icons.onButtonIcon.icon, this.icons.onButtonIcon.iconSize)
+        .pipe(shareReplay(1));
+
+      this.onIcon$.subscribe(icon => {
         this.onPowerSymbolIcon = icon.center(cx, cy);
         if (isDefinedAndNotNull(onCenterGroup)) {
           this.onPowerSymbolIcon.addTo(onCenterGroup);
@@ -462,7 +467,9 @@ export abstract class PowerButtonShape {
 
   public onCenterTimeLine(timeline: Timeline, label: boolean) {
     if (this.icons.onButtonIcon.showIcon) {
-      this.onPowerSymbolIcon.timeline(timeline);
+      if (this.onIcon$) {
+        this.onIcon$.subscribe(icon => icon.timeline(timeline))
+      }
     } else {
       if (label) {
         this.onLabelShape.timeline(timeline);

ui-ngx/src/app/shared/models/alarm.models.ts

@@ -28,7 +28,6 @@ import { UserId } from '@shared/models/id/user-id';
 import { AlarmFilter } from '@shared/models/query/query.models';
 import { HasTenantId } from '@shared/models/entity.models';
 import { isDefinedAndNotNull, isNotEmptyStr } from '@core/utils';
-import { defaults } from 'lodash';
 
 export enum AlarmsMode {
   ALL,