Skip to content

Commit 13775e5

Browse files
authored
Merge pull request DSpace#3001 from tdonohue/port_2933_to_7x
[Port dspace-7_x] Reset dropdown values
2 parents a7517d6 + e9c5340 commit 13775e5

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@
4040
(scrolled)="onScroll()"
4141
[scrollWindow]="false">
4242

43-
<button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length == 0">{{'form.no-results' | translate}}</button>
43+
<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
@@ -165,7 +165,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
165165
scrollableDropdownFixture.detectChanges();
166166

167167
de = scrollableDropdownFixture.debugElement.queryAll(By.css('button.dropdown-item'));
168-
btnEl = de[0].nativeElement;
168+
btnEl = de[1].nativeElement;
169169

170170
btnEl.dispatchEvent(mousedownEvent);
171171
scrollableDropdownFixture.detectChanges();

src/assets/i18n/en.json5

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

14691469
"deny-request-copy.success": "Successfully denied item request",
14701470

1471+
"dropdown.clear": "Clear selection",
1472+
1473+
"dropdown.clear.tooltip": "Clear the selected option",
1474+
14711475
"dso.name.untitled": "Untitled",
14721476

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

0 commit comments

Comments
 (0)