From 74c75e5fb7699ff9cf7add5f9a182420972e7592 Mon Sep 17 00:00:00 2001
From: Mohamed Khelif <mohamed.khelif@mongodb.com>
Date: Thu, 8 Feb 2024 13:41:10 -0500
Subject: [PATCH 1/2] Don't show eta timer if the eta has been exceeded

---
 src/gql/generated/types.ts                         | 2 +-
 src/pages/task/metadata/ETATimer/ETATimer.test.tsx | 4 ++++
 src/pages/task/metadata/ETATimer/index.tsx         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
index 1498b53f36..fbf2a187b8 100644
--- a/src/gql/generated/types.ts
+++ b/src/gql/generated/types.ts
@@ -2583,6 +2583,7 @@ export type TaskEndDetail = {
 
 export type TaskEventLogData = {
   __typename?: "TaskEventLogData";
+  blockedOn?: Maybe<Scalars["String"]["output"]>;
   hostId?: Maybe<Scalars["String"]["output"]>;
   jiraIssue?: Maybe<Scalars["String"]["output"]>;
   jiraLink?: Maybe<Scalars["String"]["output"]>;
@@ -2651,7 +2652,6 @@ export type TaskLogs = {
   __typename?: "TaskLogs";
   agentLogs: Array<LogMessage>;
   allLogs: Array<LogMessage>;
-  defaultLogger: Scalars["String"]["output"];
   eventLogs: Array<TaskEventLogEntry>;
   execution: Scalars["Int"]["output"];
   systemLogs: Array<LogMessage>;
diff --git a/src/pages/task/metadata/ETATimer/ETATimer.test.tsx b/src/pages/task/metadata/ETATimer/ETATimer.test.tsx
index 9ce6b47d17..2b655b9911 100644
--- a/src/pages/task/metadata/ETATimer/ETATimer.test.tsx
+++ b/src/pages/task/metadata/ETATimer/ETATimer.test.tsx
@@ -47,4 +47,8 @@ describe("etaTimer", () => {
     expect(global.clearInterval).toHaveBeenCalledWith(expect.any(Number));
     expect(jest.getTimerCount()).toBe(0);
   });
+  it("if the eta has been exceeded, it does not render", () => {
+    render(<ETATimer startTime={new Date()} expectedDuration={0} />);
+    expect(screen.queryByTestId("task-metadata-eta")).not.toBeInTheDocument();
+  });
 });
diff --git a/src/pages/task/metadata/ETATimer/index.tsx b/src/pages/task/metadata/ETATimer/index.tsx
index 438a4e72d0..c54a33488b 100644
--- a/src/pages/task/metadata/ETATimer/index.tsx
+++ b/src/pages/task/metadata/ETATimer/index.tsx
@@ -12,7 +12,6 @@ interface ETATimerProps {
 const ETATimer: React.FC<ETATimerProps> = ({ expectedDuration, startTime }) => {
   const parsedStartTime = new Date(startTime);
   const { endTimer, runningTime } = useRunningTime(parsedStartTime);
-
   useEffect(() => {
     if (runningTime >= expectedDuration) {
       endTimer();
@@ -20,6 +19,7 @@ const ETATimer: React.FC<ETATimerProps> = ({ expectedDuration, startTime }) => {
   }, [runningTime, expectedDuration, endTimer]);
 
   const eta = expectedDuration - runningTime;
+  if (eta < 0) return null;
   return (
     <MetadataItem data-cy="task-metadata-eta">
       ETA: {msToDuration(eta)}

From fd25724812594f0e4d0e3f182d6edb8c0e1130f5 Mon Sep 17 00:00:00 2001
From: Mohamed Khelif <mohamed.khelif@mongodb.com>
Date: Fri, 16 Feb 2024 16:16:37 -0500
Subject: [PATCH 2/2] Fix tests

---
 src/pages/task/metadata/Metadata.test.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/task/metadata/Metadata.test.tsx b/src/pages/task/metadata/Metadata.test.tsx
index aae7f2f631..287bea0aaf 100644
--- a/src/pages/task/metadata/Metadata.test.tsx
+++ b/src/pages/task/metadata/Metadata.test.tsx
@@ -45,7 +45,6 @@ describe("metadata", () => {
       },
     );
     expect(screen.queryByDataCy("task-metadata-estimated_start")).toBeNull();
-    expect(screen.getByDataCy("task-metadata-eta")).toBeInTheDocument();
     expect(screen.getByDataCy("task-metadata-started")).toBeInTheDocument();
     expect(screen.queryByDataCy("task-metadata-finished")).toBeNull();
     expect(screen.queryByDataCy("task-trace-link")).toBeNull();