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

Merge pull request #8965 from ArtemDzhereleiko/AD/bug-fix/entity-select

Browse Source 
Fixed entity select component for alias dialog component
This commit is contained in:
Igor Kulikov 2023-08-04 14:03:36 +03:00 committed by GitHub
commit ed736984ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui-ngx/src/app/shared/components/entity/entity-select.component.ts
View File

@ -122,20 +122,18 @@ export class EntitySelectComponent implements ControlValueAccessor, OnInit, Afte
writeValue(value: EntityId | null): void { writeValue(value: EntityId | null): void {
if (value != null) { if (value != null) {
if (value.id === NULL_UUID) { this.modelValue = {
value.id = null; entityType: value.entityType,
} id: value.id !== NULL_UUID ? value.id : null
this.modelValue = value; };
this.entitySelectFormGroup.get('entityType').patchValue(value.entityType, {emitEvent: true});
this.entitySelectFormGroup.get('entityId').patchValue(value, {emitEvent: true});
} else { } else {
this.modelValue = { this.modelValue = {
entityType: this.defaultEntityType, entityType: this.defaultEntityType,
id: null id: null
}; };
this.entitySelectFormGroup.get('entityType').patchValue(this.defaultEntityType, {emitEvent: true});
this.entitySelectFormGroup.get('entityId').patchValue(null, {emitEvent: true});
} }
this.entitySelectFormGroup.get('entityType').patchValue(this.modelValue.entityType, {emitEvent: false});
this.entitySelectFormGroup.get('entityId').patchValue(this.modelValue.id, {emitEvent: false});
} }
updateView(entityType: EntityType | AliasEntityType | null, entityId: string | null) { updateView(entityType: EntityType | AliasEntityType | null, entityId: string | null) {