Skip to content

363180408: (fix) change callouts show start testrun if no valid device is available #735

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
Aug 30, 2024
Merged

363180408: (fix) change callouts show start testrun if no valid device is available #735

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
10 changes: 8 additions & 2 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 @@ -172,7 +172,12 @@ <h1 class="main-heading">Testrun</h1>
</app-callout>
<app-callout
[type]="CalloutType.Info"
*ngIf="vm.hasConnectionSettings === true && vm.hasDevices === false">
*ngIf="
vm.hasConnectionSettings === true &&
(vm.hasDevices === false ||
(!!vm.calloutState.get('outdated_devices_callout') &&
vm.isAllDevicesOutdated))
">
Step 2: To perform a device test please
<a
(click)="navigateToAddDevice()"
Expand All @@ -193,7 +198,8 @@ <h1 class="main-heading">Testrun</h1>
vm.hasDevices &&
(!vm.systemStatus || vm.systemStatus === StatusOfTestrun.Idle) &&
vm.isStatusLoaded === true &&
!vm.reports.length
!vm.reports.length &&
!vm.isAllDevicesOutdated
">
Step 3: Once device is created, you are able to
<a
Expand Down
2 changes: 2 additions & 0 deletions modules/ui/src/app/app.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import {
selectHasRiskProfiles,
selectInterfaces,
selectInternetConnection,
selectIsAllDevicesOutdated,
selectIsOpenStartTestrun,
selectIsOpenWaitSnackBar,
selectMenuOpened,
Expand Down Expand Up @@ -169,6 +170,7 @@ describe('AppComponent', () => {
{ selector: selectError, value: null },
{ selector: selectMenuOpened, value: false },
{ selector: selectHasDevices, value: false },
{ selector: selectIsAllDevicesOutdated, value: false },
{ selector: selectHasExpiredDevices, value: false },
{ selector: selectHasRiskProfiles, value: false },
{ selector: selectStatus, value: null },
Expand Down
3 changes: 3 additions & 0 deletions modules/ui/src/app/app.store.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
selectHasRiskProfiles,
selectInterfaces,
selectInternetConnection,
selectIsAllDevicesOutdated,
selectIsOpenWaitSnackBar,
selectMenuOpened,
selectReports,
Expand Down Expand Up @@ -104,6 +105,7 @@ describe('AppStore', () => {
{ selector: selectIsOpenWaitSnackBar, value: false },
{ selector: selectTestModules, value: MOCK_TEST_MODULES },
{ selector: selectInternetConnection, value: false },
{ selector: selectIsAllDevicesOutdated, value: false },
],
}),
{ provide: TestRunService, useValue: mockService },
Expand Down Expand Up @@ -165,6 +167,7 @@ describe('AppStore', () => {
consentShown: false,
hasDevices: true,
hasExpiredDevices: true,
isAllDevicesOutdated: false,
hasRiskProfiles: false,
reports: [],
isStatusLoaded: false,
Expand Down
3 changes: 3 additions & 0 deletions modules/ui/src/app/app.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
selectHasRiskProfiles,
selectInterfaces,
selectInternetConnection,
selectIsAllDevicesOutdated,
selectMenuOpened,
selectReports,
selectStatus,
Expand Down Expand Up @@ -68,6 +69,7 @@ export class AppStore extends ComponentStore<AppComponentState> {
private isStatusLoaded$ = this.select(state => state.isStatusLoaded);
private hasInternetConnection$ = this.store.select(selectInternetConnection);
private hasDevices$ = this.store.select(selectHasDevices);
private isAllDevicesOutdated$ = this.store.select(selectIsAllDevicesOutdated);
private hasExpiredDevices$ = this.store.select(selectHasExpiredDevices);
private hasRiskProfiles$ = this.store.select(selectHasRiskProfiles);
private reports$ = this.store.select(selectReports);
Expand All @@ -84,6 +86,7 @@ export class AppStore extends ComponentStore<AppComponentState> {
viewModel$ = this.select({
consentShown: this.consentShown$,
hasDevices: this.hasDevices$,
isAllDevicesOutdated: this.isAllDevicesOutdated$,
hasExpiredDevices: this.hasExpiredDevices$,
hasRiskProfiles: this.hasRiskProfiles$,
reports: this.reports$,
Expand Down
8 changes: 4 additions & 4 deletions modules/ui/src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,16 +319,16 @@ body
}

body
#main:has(app-callout .error):has(app-callout .error)
#main:has(app-callout .error app-callout .error)
app-device-repository:not(:has(.device-repository-content-empty)),
body
#main:has(app-callout .error):has(app-callout .error)
#main:has(app-callout .error app-callout .error)
app-history:not(:has(.results-content-empty)),
body
#main:has(app-callout .error):has(app-callout .error)
#main:has(app-callout .error app-callout .error)
app-progress:not(:has(.progress-content-empty)),
body
#main:has(app-callout .error):has(app-callout .error)
#main:has(app-callout .error app-callout .error)
app-risk-assessment
.risk-assessment-container {
margin-top: 156px;
Expand Down