Skip to content

329086273: (fix) [a11Y] change the version button accessible name #336

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
OlgaMardvilko merged 1 commit into from
Mar 18, 2024
Merged

329086273: (fix) [a11Y] change the version button accessible name #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions modules/ui/src/app/components/version/version.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
mat-button
class="version-content"
[class.version-content-update]="version.update_available"
[attr.aria-label]="
version?.installed_version +
' New version is available. Click here to update'
"
[attr.aria-label]="getVersionButtonLabel(version.installed_version)"
(click)="openConsentDialog(version)">
{{ version?.installed_version }}
<span
Expand Down
20 changes: 19 additions & 1 deletion modules/ui/src/app/components/version/version.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { VersionComponent } from './version.component';
import { TestRunService } from '../../services/test-run.service';
import {
TestRunService,
UNAVAILABLE_VERSION,
} from '../../services/test-run.service';
import SpyObj = jasmine.SpyObj;
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
import { Version } from '../../model/version';
Expand Down Expand Up @@ -50,6 +53,21 @@ describe('VersionComponent', () => {
expect(component).toBeTruthy();
});

it('should get correct aria label for version button', () => {
const labelUnavailableVersion = component.getVersionButtonLabel(
UNAVAILABLE_VERSION.installed_version
);

const labelAvailableVersion = component.getVersionButtonLabel(
VERSION.installed_version
);

expect(labelUnavailableVersion).toContain(
'Version temporarily unavailable.'
);
expect(labelAvailableVersion).toContain('New version is available.');
});

it('should open consent window on start', () => {
const openSpy = spyOn(component.dialog, 'open').and.returnValue({
afterClosed: () => of(true),
Expand Down
11 changes: 10 additions & 1 deletion modules/ui/src/app/components/version/version.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ import {
Output,
} from '@angular/core';
import { CommonModule } from '@angular/common';
import { TestRunService } from '../../services/test-run.service';
import {
TestRunService,
UNAVAILABLE_VERSION,
} from '../../services/test-run.service';
import { Version } from '../../model/version';
import { MatButtonModule } from '@angular/material/button';
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
Expand Down Expand Up @@ -69,6 +72,12 @@ export class VersionComponent implements OnInit, OnDestroy {
);
}

getVersionButtonLabel(installedVersion: string): string {
return installedVersion === UNAVAILABLE_VERSION.installed_version
? 'Version temporarily unavailable. Click to open the Welcome modal'
: `${installedVersion} New version is available. Click to update`;
}

openConsentDialog(version: Version) {
const dialogRef = this.dialog.open(ConsentDialogComponent, {
ariaLabel: 'Welcome to Testrun modal window',
Expand Down