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

UI: Fixed entity select component

Browse Source
This commit is contained in:
Artem Dzhereleiko 2023-07-20 15:13:11 +03:00
parent 1d3a9a25b3
commit c913b08b53
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,16 +125,23 @@ export class EntitySelectComponent implements ControlValueAccessor, OnInit, Afte
if (value.id === NULL_UUID) { if (value.id === NULL_UUID) {
value.id = null; value.id = null;
} }
if (value.entityType === AliasEntityType.CURRENT_TENANT
|| value.entityType === AliasEntityType.CURRENT_USER
|| value.entityType === AliasEntityType.CURRENT_USER_OWNER) {
value.id = NULL_UUID;
} else if (value.entityType === AliasEntityType.CURRENT_CUSTOMER && !value.id) {
this.modelValue.id = NULL_UUID;
}
this.modelValue = value; this.modelValue = value;
this.entitySelectFormGroup.get('entityType').patchValue(value.entityType, {emitEvent: true}); this.entitySelectFormGroup.get('entityType').patchValue(value.entityType, {emitEvent: false});
this.entitySelectFormGroup.get('entityId').patchValue(value, {emitEvent: true}); this.entitySelectFormGroup.get('entityId').patchValue(value, {emitEvent: false});
} 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('entityType').patchValue(this.defaultEntityType, {emitEvent: false});
this.entitySelectFormGroup.get('entityId').patchValue(null, {emitEvent: true}); this.entitySelectFormGroup.get('entityId').patchValue(null, {emitEvent: false});
} }
} }