diff --git a/src/app/components/generic-select/generic-select.component.html b/src/app/components/generic-select/generic-select.component.html index 86622ddf07d7f04f0ca06d06b9a4fa4be6f094cb..1597c621cad2b677c529a9ce9d6b71cb50c4cc08 100644 --- a/src/app/components/generic-select/generic-select.component.html +++ b/src/app/components/generic-select/generic-select.component.html @@ -11,7 +11,7 @@ </mat-option> </mat-select> <button mat-button *ngIf="showClearButton" matSuffix mat-icon-button aria-label="Clear" - (click)="cancelValue($event)"> + (click)="emptySelectedList($event)"> <mat-icon>close</mat-icon> </button> <div *ngIf="enableHelpButton" class="overlap-select"> diff --git a/src/app/components/select-field-line/select-field-line.component.ts b/src/app/components/select-field-line/select-field-line.component.ts index 7ca5a451da12bf8941dbc8b7ae05b777dd28a3b2..ddc5f24f8d411885deaa2aa51fd2e87b6bc6d383 100644 --- a/src/app/components/select-field-line/select-field-line.component.ts +++ b/src/app/components/select-field-line/select-field-line.component.ts @@ -59,15 +59,14 @@ export class SelectFieldLineComponent implements OnInit { return this._select.getValue(); } - public onValueChange($event) { + public onValueChange($event: any) { this.selectedValue = $event.value this.valueChanged.emit(this.selectedValue) } - public cancelValue($event): any { + public emptySelectedList($event:any) { this.selectedValue = []; this.valueChanged.emit(this.selectedValue) - // this.validChange.emit(false) $event.stopPropagation(); } diff --git a/src/app/formulaire/elements/select/select-field.ts b/src/app/formulaire/elements/select/select-field.ts index 59e0c8d2129009c0dda64f6e8d2480e395edcb44..b9145158089167b107a6d0b34fa612be39d7f297 100644 --- a/src/app/formulaire/elements/select/select-field.ts +++ b/src/app/formulaire/elements/select/select-field.ts @@ -82,7 +82,7 @@ export abstract class SelectField extends Field { || ( !Array.isArray(previousSelectedEntry) && !Array.isArray(v) - && previousSelectedEntry.id !== v.id + && previousSelectedEntry?.id !== v?.id ) || ( Array.isArray(previousSelectedEntry)