From 387cf467903912f246f8611c71c38eccf48df051 Mon Sep 17 00:00:00 2001 From: kurilova Date: Wed, 18 Jun 2025 10:04:53 +0000 Subject: [PATCH 1/2] Adds device sorting --- modules/ui/src/app/model/device.ts | 2 ++ modules/ui/src/app/services/test-run.service.ts | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/ui/src/app/model/device.ts b/modules/ui/src/app/model/device.ts index 62100f170..0e72519a8 100644 --- a/modules/ui/src/app/model/device.ts +++ b/modules/ui/src/app/model/device.ts @@ -26,6 +26,8 @@ export interface Device { technology?: string; test_pack?: TestingType; additional_info?: Question[]; + created_at: string; + modified_at: string; } export enum DeviceStatus { diff --git a/modules/ui/src/app/services/test-run.service.ts b/modules/ui/src/app/services/test-run.service.ts index a80bc37ab..8a8e016d2 100644 --- a/modules/ui/src/app/services/test-run.service.ts +++ b/modules/ui/src/app/services/test-run.service.ts @@ -64,7 +64,17 @@ export class TestRunService { } fetchDevices(): Observable { - return this.http.get(`${API_URL}/devices`); + return this.http + .get(`${API_URL}/devices`) + .pipe( + map(items => + items.sort( + (a, b) => + new Date(b.modified_at).getTime() - + new Date(a.modified_at).getTime() + ) + ) + ); } getSystemConfig(): Observable { From 26d2cced054f626b72fa33b239572df40cc23b46 Mon Sep 17 00:00:00 2001 From: kurilova Date: Wed, 18 Jun 2025 10:39:06 +0000 Subject: [PATCH 2/2] Fix tests --- modules/ui/src/app/model/device.ts | 4 ++-- modules/ui/src/app/services/test-run.service.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ui/src/app/model/device.ts b/modules/ui/src/app/model/device.ts index 0e72519a8..919603479 100644 --- a/modules/ui/src/app/model/device.ts +++ b/modules/ui/src/app/model/device.ts @@ -26,8 +26,8 @@ export interface Device { technology?: string; test_pack?: TestingType; additional_info?: Question[]; - created_at: string; - modified_at: string; + created_at?: string; + modified_at?: string; } export enum DeviceStatus { diff --git a/modules/ui/src/app/services/test-run.service.ts b/modules/ui/src/app/services/test-run.service.ts index 8a8e016d2..ba5733cc0 100644 --- a/modules/ui/src/app/services/test-run.service.ts +++ b/modules/ui/src/app/services/test-run.service.ts @@ -65,7 +65,7 @@ export class TestRunService { fetchDevices(): Observable { return this.http - .get(`${API_URL}/devices`) + .get[]>(`${API_URL}/devices`) .pipe( map(items => items.sort(