Skip to content

Return old version if request fails #303

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 2 commits into from
Mar 4, 2024
Merged

Return old version if request fails #303

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
c80e41d
Return old version if request fails
sofyakurilova Mar 1, 2024
5ae3189
Merge branch 'dev' into bug/version_disappear_on_error
OlgaMardvilko Mar 4, 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
19 changes: 18 additions & 1 deletion modules/ui/src/app/services/test-run.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
} from '../mocks/progress.mock';
import { StatusOfTestResult, TestrunStatus } from '../model/testrun-status';
import { device } from '../mocks/device.mock';
import { VERSION } from '../mocks/version.mock';
import { NEW_VERSION, VERSION } from '../mocks/version.mock';

const MOCK_SYSTEM_CONFIG: SystemConfig = {
network: {
Expand Down Expand Up @@ -380,6 +380,23 @@ describe('TestRunService', () => {
});
});

it('fetchVersion should return old version when error happens', () => {
const version = NEW_VERSION;
const mockErrorResponse = { status: 500, statusText: 'Error' };
const data = 'Invalid request parameters';
service.getVersion().next(version);
service.fetchVersion();
const req = httpTestingController.expectOne(
'http://localhost:8000/system/version'
);
expect(req.request.method).toBe('GET');
req.flush(data, mockErrorResponse);

service.getVersion().subscribe(res => {
expect(res).toEqual(version);
});
});

it('deleteReport should have necessary request data', () => {
const apiUrl = 'http://localhost:8000/report';

Expand Down
9 changes: 6 additions & 3 deletions modules/ui/src/app/services/test-run.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core';
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
import { Observable } from 'rxjs/internal/Observable';
import { Device, TestModule } from '../model/device';
import { map, ReplaySubject, retry } from 'rxjs';
import { catchError, map, of, ReplaySubject, retry } from 'rxjs';
import { SystemConfig, SystemInterfaces } from '../model/setting';
import {
StatusOfTestResult,
Expand Down Expand Up @@ -72,7 +72,6 @@ export class TestRunService {
public systemStatus$ = this.systemStatusSubject.asObservable();
private isTestrunStartedSub$ = new BehaviorSubject<boolean>(false);
public isTestrunStarted$ = this.isTestrunStartedSub$.asObservable();
// private history = new BehaviorSubject<TestrunStatus[] | null>(null);
private version = new BehaviorSubject<Version | null>(null);

constructor(private http: HttpClient) {}
Expand Down Expand Up @@ -253,7 +252,11 @@ export class TestRunService {
fetchVersion(): void {
this.http
.get<Version>(`${API_URL}/system/version`)
.pipe(retry(1))
.pipe(
catchError(() => {
return of(this.version.value);
})
)
.subscribe(version => {
this.version.next(version);
});
Expand Down