fallback to analysis commands if commandsAsPreSerializedList endpoint…

… comes back empty
Opentrons · Apr 29, 2024 · e5099b6 · e5099b6
1 parent 4598c85
commit e5099b6
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/app/src/organisms/RunPreview/index.tsx b/app/src/organisms/RunPreview/index.tsx
@@ -54,19 +54,19 @@ export const RunPreviewComponent = (
       ? (RUN_STATUSES_TERMINAL as RunStatus[]).includes(runStatus)
       : false
   // we only ever want one request done for terminal runs because this is a heavy request
-  const commandsFromQuery =
-    useAllCommandsAsPreSerializedList(
-      runId,
-      { cursor: 0, pageLength: MAX_COMMANDS },
-      {
-        staleTime: Infinity,
-        cacheTime: Infinity,
-        enabled: isRunTerminal,
-      }
-    ).data?.data ?? []
-  const parsedCommandsFromQuery = commandsFromQuery.map(command =>
-    JSON.parse(command)
-  )
+  const commandsFromQuery = useAllCommandsAsPreSerializedList(
+    runId,
+    { cursor: 0, pageLength: MAX_COMMANDS },
+    {
+      staleTime: Infinity,
+      cacheTime: Infinity,
+      enabled: isRunTerminal,
+    }
+  ).data?.data
+  const parsedCommandsFromQuery =
+    commandsFromQuery == null
+      ? robotSideAnalysis?.commands
+      : commandsFromQuery.map(command => JSON.parse(command))
   const viewPortRef = React.useRef<HTMLDivElement | null>(null)
   const currentRunCommandKey = useNotifyLastRunCommandKey(runId, {
     refetchInterval: LIVE_RUN_COMMANDS_POLL_MS,