Browse Source

UI: Fixed profile tab

pull/14293/head
ArtemDzhereleiko 11 months ago
parent
commit
534b037146
  1. 2
      ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-list.component.ts
  2. 2
      ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-value.component.ts
  3. 2
      ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate.component.ts
  4. 2
      ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.html

2
ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-list.component.ts

@ -107,7 +107,7 @@ export class AlarmRuleFilterPredicateListComponent implements ControlValueAccess
registerOnTouched(fn: any): void { registerOnTouched(fn: any): void {
} }
setDisabledState?(isDisabled: boolean): void { setDisabledState(isDisabled: boolean): void {
this.disabled = isDisabled; this.disabled = isDisabled;
if (this.disabled) { if (this.disabled) {
this.filterListFormGroup.disable({emitEvent: false}); this.filterListFormGroup.disable({emitEvent: false});

2
ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-value.component.ts

@ -107,7 +107,7 @@ export class AlarmRuleFilterPredicateValueComponent implements ControlValueAcces
).subscribe(value => this.updateValueModeValidators(value)) ).subscribe(value => this.updateValueModeValidators(value))
} }
setDisabledState?(isDisabled: boolean): void { setDisabledState(isDisabled: boolean): void {
if (isDisabled) { if (isDisabled) {
this.filterPredicateValueFormGroup.disable({emitEvent: false}); this.filterPredicateValueFormGroup.disable({emitEvent: false});
this.dynamicModeControl.disable({emitEvent: false}); this.dynamicModeControl.disable({emitEvent: false});

2
ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate.component.ts

@ -118,7 +118,7 @@ export class AlarmRuleFilterPredicateComponent implements ControlValueAccessor,
}; };
} }
setDisabledState?(isDisabled: boolean): void { setDisabledState(isDisabled: boolean): void {
this.disabled = isDisabled; this.disabled = isDisabled;
if (isDisabled) { if (isDisabled) {
this.filterPredicateFormGroup.disable({emitEvent: false}); this.filterPredicateFormGroup.disable({emitEvent: false});

2
ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.html

@ -57,7 +57,7 @@
</tb-toggle-select> </tb-toggle-select>
</div> </div>
} }
@if (alarmRulesOldVersion) { @if (alarmRulesOldVersion || isEdit) {
<div class="mat-padding" [formGroup]="detailsForm" *ngIf="alarmRules.isActive"> <div class="mat-padding" [formGroup]="detailsForm" *ngIf="alarmRules.isActive">
<div formGroupName="profileData"> <div formGroupName="profileData">
<tb-device-profile-alarms formControlName="alarms" [deviceProfileId]="entity.id"></tb-device-profile-alarms> <tb-device-profile-alarms formControlName="alarms" [deviceProfileId]="entity.id"></tb-device-profile-alarms>

Loading…
Cancel
Save