Skip to content

[Port dspace-8_x] Fixed dropdown/lookup & lookup-name fields being reset when hitting enter #3796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tdonohue merged 3 commits into from
Jan 6, 2025
Merged

[Port dspace-8_x] Fixed dropdown/lookup & lookup-name fields being reset when hitting enter #3796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed4e794
119799: Prevent submission from updating the dropdown values when hit…
alexandrevryghem Dec 4, 2024
636c85a
Merge branch 'w2p-122005_fixed-dropdown-values-resetting-on-enter_con…
alexandrevryghem Jan 3, 2025
c925424
119799: Prevent the lookup/lookup-name fields from resetting when hit…
alexandrevryghem Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,12 @@
(scrolled)="onScroll()"
[scrollWindow]="false">

<button class="dropdown-item disabled"
<button class="dropdown-item disabled" type="button"
*ngIf="optionsList && optionsList.length === 0"
(click)="$event.stopPropagation(); clearFields(); sdRef.close();">{{'form.no-results' | translate}}
(click)="$event.stopPropagation(); clearFields(); sdRef.close();">
{{ 'form.no-results' | translate }}
</button>
<button class="dropdown-item lookup-item"
<button class="dropdown-item lookup-item" type="button"
*ngFor="let listEntry of optionsList"
(click)="$event.stopPropagation(); onSelect(listEntry); sdRef.close();"
title="{{ listEntry.display }}">
Expand Down
6 changes: 3 additions & 3 deletions .../ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
(scrolled)="onScroll()"
[scrollWindow]="false">

<button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length === 0">{{'form.no-results' | translate}}</button>
<button class="dropdown-item disabled" type="button" *ngIf="optionsList && optionsList.length === 0">{{'form.no-results' | translate}}</button>
<button class="dropdown-item collection-item text-truncate"
(click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
>
type="button">
<i>{{ 'dropdown.clear' | translate }}</i>
</button>
<button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
[class.active]="i === selectedIndex"
(keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
title="{{ listEntry.display }}" role="option"
title="{{ listEntry.display }}" role="option" type="button"
[attr.id]="listEntry.display === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
{{inputFormatter(listEntry)}}
</button>
Expand Down
3 changes: 3 additions & 0 deletions src/app/shared/form/form.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@
}

public addControlErrors(field: AbstractControl, formId: string, fieldId: string, fieldIndex: number) {
if (field.errors === null) {
return;

Check warning on line 157 in src/app/shared/form/form.service.ts

View check run for this annotation

Codecov / codecov/patch

src/app/shared/form/form.service.ts#L157 

Added line #L157 was not covered by tests
}
const errors: string[] = Object.keys(field.errors)
.filter((errorKey) => field.errors[errorKey] === true)
.map((errorKey) => `error.validation.${errorKey}`);
Expand Down
Loading