From ed127970fad6b457061d303ebcba0c71101d84f5 Mon Sep 17 00:00:00 2001 From: gabalafou Date: Tue, 26 Mar 2024 11:42:42 -0500 Subject: [PATCH] PR review --- .../metadata/components/EnvBuildStatus.tsx | 2 +- src/utils/helpers/buildMapper.ts | 41 ++++++------------- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/src/features/metadata/components/EnvBuildStatus.tsx b/src/features/metadata/components/EnvBuildStatus.tsx index 1dbfcd41..b8156245 100644 --- a/src/features/metadata/components/EnvBuildStatus.tsx +++ b/src/features/metadata/components/EnvBuildStatus.tsx @@ -31,7 +31,7 @@ const LogLink = ({ logArtifact }: { logArtifact: Artifact }) => { ); }; -export interface IEnvBuildStatusProps { +interface IEnvBuildStatusProps { build: Build; } diff --git a/src/utils/helpers/buildMapper.ts b/src/utils/helpers/buildMapper.ts index 5a676da9..3686155c 100644 --- a/src/utils/helpers/buildMapper.ts +++ b/src/utils/helpers/buildMapper.ts @@ -10,28 +10,6 @@ const STATUS_OPTIONS: { [key: Build["status"]]: string } = { const TIMEZONE = Intl.DateTimeFormat().resolvedOptions().timeZone; -const isCompleted = ({ - status, - ended_on, - scheduled_on -}: Pick) => { - let duration = 0; - if (ended_on && scheduled_on) { - const startTime = new Date(scheduled_on); - const endTime = new Date(ended_on); - duration = (endTime.valueOf() - startTime.valueOf()) / 60000; - duration = Math.round(duration); - } - - if (status === "COMPLETED") { - if (duration > 0) { - return `Completed in ${duration} min`; - } - return "Completed"; - } - return STATUS_OPTIONS[status]; -}; - const dateToTimezone = (date: string) => { if (!date) { return ""; @@ -65,11 +43,18 @@ export const buildStatus = ({ scheduled_on }: Build): string => { switch (status) { - case "BUILDING": - case "QUEUED": - return "Building"; - default: { - return isCompleted({ status, ended_on, scheduled_on }); - } + case "COMPLETED": + if (ended_on && scheduled_on) { + const startTime = new Date(scheduled_on); + const endTime = new Date(ended_on); + let duration = (endTime.valueOf() - startTime.valueOf()) / 60000; + duration = Math.round(duration); + if (duration > 0) { + return `Completed in ${duration} min`; + } + } + return "Completed"; + default: + return STATUS_OPTIONS[status]; } };