Browse Source

Merge pull request #8311 from vvlladd28/bug/timeinterval/disable

Fix disable time interval in timewindow panel
pull/8363/head
Igor Kulikov 3 years ago
committed by GitHub
parent
commit
3ffe9dd762
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      ui-ngx/src/app/shared/components/time/timeinterval.component.ts
  2. 9
      ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts

4
ui-ngx/src/app/shared/components/time/timeinterval.component.ts

@ -64,8 +64,6 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
@coerceBoolean()
isEdit = false;
hideFlagValue = false;
@Input()
@coerceBoolean()
hideFlag = false;
@ -208,7 +206,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
}
onHideFlagChange() {
this.hideFlagChange.emit(this.hideFlagValue);
this.hideFlagChange.emit(this.hideFlag);
}
onTimeInputChange(type: string) {

9
ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts

@ -157,9 +157,9 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
disabled: hideTimezone
}]
});
this.updateValidators();
this.timewindowForm.get('aggregation.type').valueChanges.subscribe(() => {
this.updateValidators();
this.updateValidators(this.timewindowForm.get('aggregation.type').value);
this.timewindowForm.get('aggregation.type').valueChanges.subscribe((aggregationType: AggregationType) => {
this.updateValidators(aggregationType);
});
}
@ -172,8 +172,7 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
return limit;
}
private updateValidators() {
const aggType = this.timewindowForm.get('aggregation.type').value;
private updateValidators(aggType: AggregationType) {
if (aggType !== AggregationType.NONE) {
this.timewindowForm.get('aggregation.limit').clearValidators();
} else {

Loading…
Cancel
Save