From af4cd2c8ed60e7c7789e8288f77cc1db7b5cc67d Mon Sep 17 00:00:00 2001 From: Kirill Lakhov Date: Fri, 8 Nov 2024 11:51:13 +0300 Subject: [PATCH 1/2] added *100 --- cvat-core/src/request.ts | 1 + cvat-ui/src/components/requests-page/request-card.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cvat-core/src/request.ts b/cvat-core/src/request.ts index 1935f78b2f0c..ad8aa04d45aa 100644 --- a/cvat-core/src/request.ts +++ b/cvat-core/src/request.ts @@ -55,6 +55,7 @@ export class Request { return this.#status.toLowerCase() as RQStatus; } + // The `progress` represents a value between 0 and 1 get progress(): number | undefined { return this.#progress; } diff --git a/cvat-ui/src/components/requests-page/request-card.tsx b/cvat-ui/src/components/requests-page/request-card.tsx index 52c109e3822c..dd2a8886941a 100644 --- a/cvat-ui/src/components/requests-page/request-card.tsx +++ b/cvat-ui/src/components/requests-page/request-card.tsx @@ -149,7 +149,7 @@ function RequestCard(props: Props): JSX.Element { const dispatch = useDispatch(); const linkToEntity = constructLink(request); - const percent = request.status === RQStatus.FINISHED ? 100 : request.progress; + const percent = request.status === RQStatus.FINISHED ? 100 : (request.progress ?? 0) * 100; const timestamps = constructTimestamps(request); const name = constructName(operation); From 6105e2c12e214c09aa8faf2733cf1d09e8052b9c Mon Sep 17 00:00:00 2001 From: Kirill Lakhov Date: Fri, 8 Nov 2024 11:59:18 +0300 Subject: [PATCH 2/2] added changelog --- changelog.d/20241108_115707_klakhov_fix_requests_progress.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelog.d/20241108_115707_klakhov_fix_requests_progress.md diff --git a/changelog.d/20241108_115707_klakhov_fix_requests_progress.md b/changelog.d/20241108_115707_klakhov_fix_requests_progress.md new file mode 100644 index 000000000000..05aea4d9c0b7 --- /dev/null +++ b/changelog.d/20241108_115707_klakhov_fix_requests_progress.md @@ -0,0 +1,4 @@ +### Fixed + +- Incorrect progress representation on `Requests` page + ()