Skip to content

ZCU-DATA/Cherry-pick Fix duplicate id #1240

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
milanmajchrak merged 2 commits into from
Mar 11, 2026
+7 −8
Merged

ZCU-DATA/Cherry-pick Fix duplicate id #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4944074
Changed id to class
Mar 10, 2026
5b41037
Fix duplicate id license_option
Mar 10, 2026
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
1 change: 0 additions & 1 deletion cypress/e2e/header.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ describe('Header', () => {
// testA11y({
// include: ['ds-header'],
// exclude: [
// ['#search-navbar-container'], // search in navbar has duplicative ID. Will be fixed in #1174
// ['.dropdownLogin'] // "Log in" link has color contrast issues. Will be fixed in #1149
// ],
// });
Expand Down
2 changes: 1 addition & 1 deletion src/app/search-navbar/search-navbar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
<div class="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
<div class="d-inline-block position-relative">
<form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on" class="d-flex">
<input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" name="query"
Expand Down
8 changes: 4 additions & 4 deletions src/app/search-navbar/search-navbar.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('SearchNavbarComponent', () => {
spyOn(component, 'expand').and.callThrough();
spyOn(component, 'onSubmit').and.callThrough();
spyOn(router, 'navigate');
const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
const searchIcon = fixture.debugElement.query(By.css('.search-navbar-container form .submit-icon'));
searchIcon.triggerEventHandler('click', {
preventDefault: () => {/**/
}
Expand All @@ -88,7 +88,7 @@ describe('SearchNavbarComponent', () => {
describe('empty query', () => {
describe('press submit button', () => {
beforeEach(fakeAsync(() => {
const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
const searchIcon = fixture.debugElement.query(By.css('.search-navbar-container form .submit-icon'));
searchIcon.triggerEventHandler('click', {
preventDefault: () => {/**/
}
Expand All @@ -109,14 +109,14 @@ describe('SearchNavbarComponent', () => {
beforeEach(async () => {
await fixture.whenStable();
fixture.detectChanges();
searchInput = fixture.debugElement.query(By.css('#search-navbar-container form input'));
searchInput = fixture.debugElement.query(By.css('.search-navbar-container form input'));
searchInput.nativeElement.value = 'test';
searchInput.nativeElement.dispatchEvent(new Event('input'));
fixture.detectChanges();
});
describe('press submit button', () => {
beforeEach(fakeAsync(() => {
const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
const searchIcon = fixture.debugElement.query(By.css('.search-navbar-container form .submit-icon'));
searchIcon.triggerEventHandler('click', null);
tick();
fixture.detectChanges();
Expand Down
4 changes: 2 additions & 2 deletions src/app/submission/sections/clarin-license-resource/section-license.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@
<li class="dropdown-item clarin-dropdown-item pt-2" value="0" (click)="selectLicense(0)">
<b>{{'submission.sections.clarin-license.head.license-select-default-value' | translate}}</b>
</li>
<li class="dropdown-item clarin-dropdown-item pt-2"
<li class="dropdown-item clarin-dropdown-item pt-2 license-option"
*ngFor="let license of filteredLicenses4Selector"
(click)="selectLicense(license.id)"
[value]="license.id"
id="license_option">
[id]="'license_option_' + license.id">
<span [class]="'label label-default label-' + license.licenseLabel">{{license.licenseLabel}}</span>
<b class="pl-1">{{license.name}}</b>
</li>
Expand Down