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

4 months ago · 2bec3bd4df
1 changed files with 4 additions and 1 deletions
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.ts
@ -332,7 +332,10 @@ export class CfAlarmRuleConditionDialogComponent extends DialogComponent<CfAlarm
  }

  save(): void {
-    this.dialogRef.close(this.conditionFormGroup.value as AlarmRuleCondition);
+    this.dialogRef.close({
+      ...this.conditionFormGroup.value,
+      type: this.conditionFormGroup.get('type').value,
+    } as AlarmRuleCondition);
  }

  onTestScript($event: Event) {