fix(app): fix timestamp used for protocol completion

Opentrons · Nov 15, 2024 · e0047a5 · e0047a5
1 parent df80263
commit e0047a5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/src/organisms/ODD/RobotDashboard/RecentRunProtocolCard.tsx b/app/src/organisms/ODD/RobotDashboard/RecentRunProtocolCard.tsx
@@ -160,7 +160,8 @@ export function ProtocolWithLastRun({
   }
   // TODO(BC, 2023-06-05): see if addSuffix false allow can remove usage of .replace here
   const formattedLastRunTime = formatDistance(
-    new Date(runData.createdAt),
+    // Fallback to current date if completedAt is null, though this should never happen since runs must be completed to appear in dashboard
+    new Date(runData.completedAt ?? new Date()),
     new Date(),
     {
       addSuffix: true,

diff --git a/app/src/organisms/ODD/RobotDashboard/__tests__/RecentRunProtocolCard.test.tsx b/app/src/organisms/ODD/RobotDashboard/__tests__/RecentRunProtocolCard.test.tsx
@@ -87,7 +87,7 @@ const missingBoth = [
 const mockRunData = {
   id: RUN_ID,
   createdAt: '2022-05-03T21:36:12.494778+00:00',
-  completedAt: 'thistime',
+  completedAt: '2023-05-03T21:36:12.494778+00:00',
   startedAt: 'thistime',
   protocolId: 'mockProtocolId',
   status: RUN_STATUS_FAILED,
@@ -169,7 +169,7 @@ describe('RecentRunProtocolCard', () => {
   it('should render text', () => {
     render(props)
     const lastRunTime = formatDistance(
-      new Date(mockRunData.createdAt),
+      new Date(mockRunData.completedAt),
       new Date(),
       {
         addSuffix: true,

diff --git a/app/src/pages/ODD/ProtocolDashboard/index.tsx b/app/src/pages/ODD/ProtocolDashboard/index.tsx
@@ -254,7 +254,7 @@ export function ProtocolDashboard(): JSX.Element {
                 {sortedProtocols.map(protocol => {
                   const lastRun = runs.data?.data.find(
                     run => run.protocolId === protocol.id
-                  )?.createdAt
+                  )?.completedAt
 
                   return (
                     <ProtocolCard