dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Fixed constant boolean filters creating form

Browse Source
This commit is contained in:
ArtemDzhereleiko 2021-12-24 16:05:24 +02:00
parent 4bc2eba8a2
commit 8a421e3aa0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/modules/home/components/filter/boolean-filter-predicate.component.ts
View File

@ -109,8 +109,11 @@ export class BooleanFilterPredicateComponent implements ControlValueAccessor, Va
} }
private updateModel() { private updateModel() {
const predicate: BooleanFilterPredicate = this.booleanFilterPredicateFormGroup.getRawValue(); let predicate: BooleanFilterPredicate = null;
if (this.booleanFilterPredicateFormGroup.valid) {
predicate = this.booleanFilterPredicateFormGroup.getRawValue();
predicate.type = FilterPredicateType.BOOLEAN; predicate.type = FilterPredicateType.BOOLEAN;
}
this.propagateChange(predicate); this.propagateChange(predicate);
} }

6
ui-ngx/src/app/modules/home/components/filter/key-filter-dialog.component.ts
View File

@ -134,6 +134,10 @@ export class KeyFilterDialogComponent extends
} }
); );
} }
if (valueType === EntityKeyValueType.BOOLEAN) {
this.keyFilterFormGroup.get('value').clearValidators();
this.keyFilterFormGroup.get('value').updateValueAndValidity();
}
}); });
this.keyFilterFormGroup.get('key.type').valueChanges.pipe( this.keyFilterFormGroup.get('key.type').valueChanges.pipe(
@ -148,7 +152,7 @@ export class KeyFilterDialogComponent extends
this.showAutocomplete = false; this.showAutocomplete = false;
} }
if (this.data.telemetryKeysOnly) { if (this.data.telemetryKeysOnly) {
if (type === EntityKeyType.CONSTANT) { if (type === EntityKeyType.CONSTANT && (this.keyFilterFormGroup.get('valueType').value !== EntityKeyValueType.BOOLEAN)) {
this.keyFilterFormGroup.get('value').setValidators(Validators.required); this.keyFilterFormGroup.get('value').setValidators(Validators.required);
this.keyFilterFormGroup.get('value').updateValueAndValidity(); this.keyFilterFormGroup.get('value').updateValueAndValidity();
} else { } else {