Skip to content

366014294: (feat) update callouts logic #787

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
Sep 18, 2024
Merged

366014294: (feat) update callouts logic #787

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
52 changes: 27 additions & 25 deletions modules/ui/src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,33 @@ <h1 class="main-heading">Testrun</h1>
panel.
</app-callout>
</ng-container>
<app-callout
id="outdated_devices_callout"
role="alert"
aria-live="assertive"
[closable]="true"
[type]="CalloutType.Error"
(calloutClosed)="calloutClosed($event)"
*ngIf="
vm.hasExpiredDevices &&
!vm.calloutState.get('outdated_devices_callout')
">
Further information is required in your device configurations.
<ng-container *ngIf="!isDevicesRoute"
>Please update your
<a
(click)="navigateToDeviceRepository()"
(keydown.enter)="navigateToDeviceRepository()"
(keydown.space)="navigateToDeviceRepository()"
aria-label="The Devices link redirects to the device repository page."
tabindex="0"
role="link"
class="message-link"
>Devices</a
>
to continue testing.
</ng-container>
</app-callout>
<app-callout
[type]="CalloutType.Info"
*ngIf="vm.hasConnectionSettings === false">
Expand Down Expand Up @@ -244,31 +271,6 @@ <h1 class="main-heading">Testrun</h1>
>Risk Assessment questionnaire</a
>?
</app-callout>
<app-callout
id="outdated_devices_callout"
role="alert"
aria-live="assertive"
[closable]="true"
[type]="CalloutType.Error"
(calloutClosed)="calloutClosed($event)"
*ngIf="
vm.hasExpiredDevices &&
!vm.calloutState.get('outdated_devices_callout')
">
Further information is required in your device configurations.
Please update your
<a
(click)="navigateToDeviceRepository()"
(keydown.enter)="navigateToDeviceRepository()"
(keydown.space)="navigateToDeviceRepository()"
aria-label="The Devices link redirects to the device repository page."
tabindex="0"
role="link"
class="message-link"
>Devices</a
>
to continue testing.
</app-callout>
</div>
<router-outlet></router-outlet>
</div>
Expand Down
4 changes: 4 additions & 0 deletions modules/ui/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ export class AppComponent {
return this.route.url === Routes.RiskAssessment;
}

get isDevicesRoute(): boolean {
return this.route.url === Routes.Devices;
}

navigateToDeviceRepository(): void {
this.route.navigate([Routes.Devices]);
}
Expand Down
2 changes: 1 addition & 1 deletion modules/ui/src/app/components/callout/callout.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
class="callout-close-button"
mat-button
(click)="calloutClosed.emit(id)">
OK
Dismiss
</button>
</div>