From 8e1d1afd52cc2e85bd092976b87dac39ba8fb2ef Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Mon, 22 Jun 2026 16:34:27 +0200 Subject: [PATCH 1/2] Fixed alarm rule validity not updating when arguments change (#15820) * Fixed alarm rule validity not updating when arguments change * Code formating fix --- .../alarm-rules/cf-alarm-rule-condition.component.ts | 7 +++---- .../components/alarm-rules/cf-alarm-rule.component.ts | 10 ++++++++++ .../alarm-rules/create-cf-alarm-rules.component.ts | 8 ++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition.component.ts b/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition.component.ts index fe0670b4e7..ef539af6f5 100644 --- a/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition.component.ts +++ b/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition.component.ts @@ -142,10 +142,9 @@ export class CfAlarmRuleConditionComponent implements ControlValueAccessor, Vali } ngOnChanges(changes: SimpleChanges) { - if (changes.arguments) { - if (changes.arguments && !changes.arguments.firstChange) { - this.recalculateArgumentValidity(); - } + if (changes.arguments && !changes.arguments.firstChange) { + this.recalculateArgumentValidity(); + this.onValidatorChange(); } } diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.ts b/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.ts index 706477f72a..d9b7f868ac 100644 --- a/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.ts +++ b/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.ts @@ -84,6 +84,7 @@ export class CfAlarmRuleComponent implements ControlValueAccessor, OnInit, Valid }); private propagateChange = (v: any) => { }; + private onValidatorChange = () => { }; constructor(private dialog: MatDialog, private fb: FormBuilder, @@ -97,12 +98,21 @@ export class CfAlarmRuleComponent implements ControlValueAccessor, OnInit, Valid registerOnTouched(fn: any): void { } + registerOnValidatorChange(fn: () => void): void { + this.onValidatorChange = fn; + } + ngOnInit() { this.alarmRuleFormGroup.valueChanges.pipe( takeUntilDestroyed(this.destroyRef) ).subscribe(() => { this.updateModel(); }); + this.alarmRuleFormGroup.statusChanges.pipe( + takeUntilDestroyed(this.destroyRef) + ).subscribe(() => { + this.onValidatorChange(); + }); } setDisabledState(isDisabled: boolean): void { diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/create-cf-alarm-rules.component.ts b/ui-ngx/src/app/modules/home/components/alarm-rules/create-cf-alarm-rules.component.ts index 4d9884f851..345e155ae1 100644 --- a/ui-ngx/src/app/modules/home/components/alarm-rules/create-cf-alarm-rules.component.ts +++ b/ui-ngx/src/app/modules/home/components/alarm-rules/create-cf-alarm-rules.component.ts @@ -77,12 +77,16 @@ export class CreateCfAlarmRulesComponent implements ControlValueAccessor, Valida private usedSeverities: AlarmSeverity[] = []; private propagateChange = (v: any) => { }; + private onValidatorChange = () => { }; constructor(private fb: FormBuilder, private destroyRef: DestroyRef) { this.createAlarmRulesFormGroup.valueChanges.pipe( takeUntilDestroyed(this.destroyRef) ).subscribe(() => this.updateModel()); + this.createAlarmRulesFormGroup.statusChanges.pipe( + takeUntilDestroyed(this.destroyRef) + ).subscribe(() => this.onValidatorChange()); } registerOnChange(fn: any): void { @@ -92,6 +96,10 @@ export class CreateCfAlarmRulesComponent implements ControlValueAccessor, Valida registerOnTouched(fn: any): void { } + registerOnValidatorChange(fn: () => void): void { + this.onValidatorChange = fn; + } + createAlarmRulesFormArray(): UntypedFormArray { return this.createAlarmRulesFormGroup.get('createAlarmRules') as UntypedFormArray; } From 7db21f413eb729ff7c6598a8212109ca0d5112fb Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Mon, 22 Jun 2026 16:35:36 +0200 Subject: [PATCH 2/2] Fixed time unit input validation and unwanted dirty state when loading a value (#15822) * Fixed time unit input validation and unwanted dirty state when loading a value * Code improvements --- .../components/time-unit-input.component.ts | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ui-ngx/src/app/shared/components/time-unit-input.component.ts b/ui-ngx/src/app/shared/components/time-unit-input.component.ts index 93293698b3..79482f378f 100644 --- a/ui-ngx/src/app/shared/components/time-unit-input.component.ts +++ b/ui-ngx/src/app/shared/components/time-unit-input.component.ts @@ -206,15 +206,13 @@ export class TimeUnitInputComponent implements ControlValueAccessor, Validator, writeValue(sec: number) { if (sec !== this.modelValue) { if (isDefinedAndNotNull(sec) && isNumeric(sec) && Number(sec) !== 0) { - this.timeInputForm.patchValue(this.parseTime(sec), {emitEvent: true}); + this.timeInputForm.patchValue(this.parseTime(sec), {emitEvent: false}); this.modelValue = sec; } else { - this.timeInputForm.patchValue({ - time: 0, - timeUnit: TimeUnit.SECONDS - }, {emitEvent: false}); + this.timeInputForm.patchValue(this.secondsModel(0), {emitEvent: false}); this.modelValue = 0; } + this.refreshTimeValidators(); } } @@ -242,6 +240,14 @@ export class TimeUnitInputComponent implements ControlValueAccessor, Validator, } } } + return this.secondsModel(value); + } + + private secondsModel(time: number): TimeUnitInputModel { + return { + time, + timeUnit: TimeUnit.SECONDS + }; } private createStepMultipleOfValidator(): ValidatorFn {