From 44e8197a7434e12fb719e7130d403bbd5210185c Mon Sep 17 00:00:00 2001
From: mintsweet <0x1304570@gmail.com>
Date: Thu, 19 Sep 2024 20:23:43 +1200
Subject: [PATCH] feat: improve the pipeline duration display
---
.../routes/pipeline/components/duration.tsx | 26 +++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/config-ui/src/routes/pipeline/components/duration.tsx b/config-ui/src/routes/pipeline/components/duration.tsx
index 7558f9fb313..67ea9e290f4 100644
--- a/config-ui/src/routes/pipeline/components/duration.tsx
+++ b/config-ui/src/routes/pipeline/components/duration.tsx
@@ -20,6 +20,28 @@ import dayjs from 'dayjs';
import { IPipelineStatus } from '@/types';
+const duration = (minute: number) => {
+ if (minute < 1) {
+ return '1m';
+ }
+
+ if (minute < 60) {
+ return `${Math.ceil(minute / 60)}m`;
+ }
+
+ if (minute < 60 * 24) {
+ const hours = Math.floor(minute / 60);
+ const minutes = minute - hours * 60;
+ return `${hours}h${minutes}m`;
+ }
+
+ const days = Math.floor(minute / (60 * 24));
+ const hours = Math.floor((minute - days * 60 * 24) / 60);
+ const minutes = minute - days * 60 * 24 - hours * 60;
+
+ return `${days}d${hours}h${minutes}m`;
+};
+
interface Props {
status: IPipelineStatus;
beganAt: string | null;
@@ -36,12 +58,12 @@ export const PipelineDuration = ({ status, beganAt, finishedAt }: Props) => {
status,
)
) {
- return {dayjs(beganAt).toNow(true)};
+ return {duration(dayjs(beganAt).diff(dayjs(), 'm'))};
}
if (!finishedAt) {
return -;
}
- return {dayjs(beganAt).from(finishedAt, true)};
+ return {duration(dayjs(beganAt).diff(dayjs(finishedAt), 'm'))};
};