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

UI: Entity autocomplete error handling

Browse Source
This commit is contained in:
Igor Kulikov 2020-04-17 15:12:37 +03:00
parent 1e079457c7
commit eb4334937c
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
View File

@ -228,18 +228,32 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
if (value != null) { if (value != null) {
if (typeof value === 'string') { if (typeof value === 'string') {
const targetEntityType = this.checkEntityType(this.entityTypeValue); const targetEntityType = this.checkEntityType(this.entityTypeValue);
this.entityService.getEntity(targetEntityType, value, {ignoreLoading: true}).subscribe( this.entityService.getEntity(targetEntityType, value, {ignoreLoading: true, ignoreErrors: true}).subscribe(
(entity) => { (entity) => {
this.modelValue = entity.id.id; this.modelValue = entity.id.id;
this.selectEntityFormGroup.get('entity').patchValue(entity, {emitEvent: false}); this.selectEntityFormGroup.get('entity').patchValue(entity, {emitEvent: false});
},
() => {
this.modelValue = null;
this.selectEntityFormGroup.get('entity').patchValue(null, {emitEvent: false});
if (value !== null) {
this.propagateChange(this.modelValue);
}
} }
); );
} else { } else {
const targetEntityType = this.checkEntityType(value.entityType); const targetEntityType = this.checkEntityType(value.entityType);
this.entityService.getEntity(targetEntityType, value.id, {ignoreLoading: true}).subscribe( this.entityService.getEntity(targetEntityType, value.id, {ignoreLoading: true, ignoreErrors: true}).subscribe(
(entity) => { (entity) => {
this.modelValue = entity.id.id; this.modelValue = entity.id.id;
this.selectEntityFormGroup.get('entity').patchValue(entity, {emitEvent: false}); this.selectEntityFormGroup.get('entity').patchValue(entity, {emitEvent: false});
},
() => {
this.modelValue = null;
this.selectEntityFormGroup.get('entity').patchValue(null, {emitEvent: false});
if (value !== null) {
this.propagateChange(this.modelValue);
}
} }
); );
} }