Browse Source
Merge pull request #11337 from ArtemDzhereleiko/AD/bug-fix/delete-recipient
Fixed updating target after deleted recipient
pull/11445/head
Igor Kulikov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
10 additions and
0 deletions
-
ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
-
ui-ngx/src/app/shared/components/entity/entity-list.component.ts
|
|
|
@ -104,6 +104,7 @@ |
|
|
|
</ng-template> |
|
|
|
<ng-template #recipientsList> |
|
|
|
<tb-entity-list |
|
|
|
syncIdsWithDB |
|
|
|
required |
|
|
|
formControlName="targets" |
|
|
|
labelText="{{ 'notification.recipients' | translate }}" |
|
|
|
|
|
|
|
@ -45,6 +45,7 @@ import { MatAutocomplete } from '@angular/material/autocomplete'; |
|
|
|
import { MatChipGrid } from '@angular/material/chips'; |
|
|
|
import { coerceBooleanProperty } from '@angular/cdk/coercion'; |
|
|
|
import { SubscriptSizing } from '@angular/material/form-field'; |
|
|
|
import { coerceBoolean } from '@shared/decorators/coercion'; |
|
|
|
|
|
|
|
@Component({ |
|
|
|
selector: 'tb-entity-list', |
|
|
|
@ -106,6 +107,10 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, AfterV |
|
|
|
@Input() |
|
|
|
hint: string; |
|
|
|
|
|
|
|
@Input() |
|
|
|
@coerceBoolean() |
|
|
|
syncIdsWithDB = false; |
|
|
|
|
|
|
|
@ViewChild('entityInput') entityInput: ElementRef<HTMLInputElement>; |
|
|
|
@ViewChild('entityAutocomplete') matAutocomplete: MatAutocomplete; |
|
|
|
@ViewChild('chipList', {static: true}) chipList: MatChipGrid; |
|
|
|
@ -189,6 +194,10 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, AfterV |
|
|
|
(entities) => { |
|
|
|
this.entities = entities; |
|
|
|
this.entityListFormGroup.get('entities').setValue(this.entities); |
|
|
|
if (this.syncIdsWithDB && this.modelValue.length !== entities.length) { |
|
|
|
this.modelValue = entities.map(entity => entity.id.id); |
|
|
|
this.propagateChange(this.modelValue); |
|
|
|
} |
|
|
|
} |
|
|
|
); |
|
|
|
} else { |
|
|
|
|