Browse Source
Merge pull request #8965 from ArtemDzhereleiko/AD/bug-fix/entity-select
Fixed entity select component for alias dialog component
pull/9050/head
Igor Kulikov
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
6 additions and
8 deletions
-
ui-ngx/src/app/shared/components/entity/entity-select.component.ts
|
|
@ -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) { |
|
|
|
