Skip to content

Commit 0e61cfd

Browse files
authored
Merge pull request DSpace#2933 from atmire/reset-dropdown-values
Reset dropdown values
2 parents 0607878 + 31d3ab0 commit 0e61cfd

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@
4141
[scrollWindow]="false">
4242

4343
<button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length === 0">{{'form.no-results' | translate}}</button>
44+
<button class="dropdown-item collection-item text-truncate"
45+
(click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
46+
title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
47+
>
48+
<i>{{ 'dropdown.clear' | translate }}</i>
49+
</button>
4450
<button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
4551
[class.active]="i === selectedIndex"
4652
(keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"

src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
186186
scrollableDropdownFixture.detectChanges();
187187

188188
de = scrollableDropdownFixture.debugElement.queryAll(By.css('button.dropdown-item'));
189-
btnEl = de[0].nativeElement;
189+
btnEl = de[1].nativeElement;
190190

191191
btnEl.dispatchEvent(mousedownEvent);
192192
scrollableDropdownFixture.detectChanges();

src/assets/i18n/en.json5

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,6 +1682,10 @@
16821682

16831683
"deny-request-copy.success": "Successfully denied item request",
16841684

1685+
"dropdown.clear": "Clear selection",
1686+
1687+
"dropdown.clear.tooltip": "Clear the selected option",
1688+
16851689
"dso.name.untitled": "Untitled",
16861690

16871691
"dso.name.unnamed": "Unnamed",

0 commit comments

Comments
 (0)