fix(app, odd): run summery error list bug fixes

app/src/assets/localization/en/run_details.json

@@ -42,6 +42,9 @@
   "end_step_time": "End",
   "error_info": "Error {{errorCode}}: {{errorType}}",
   "error_type": "Error: {{errorType}}",
+  "error_details": "Error details",
+  "no_of_error": "{{count}} error",
+  "no_of_errors": "{{count}} errors",
   "failed_step": "Failed step",
   "final_step": "Final Step",
   "ignore_stored_data": "Ignore stored data",
@@ -98,6 +101,8 @@
   "run_complete": "Run completed",
   "run_complete_splash": "Run completed",
   "run_completed": "Run completed.",
+  "run_completed_with_errors": "Run completed with errors.",
+  "run_completed_with_warnings": "Run completed with warnings.",
   "run_cta_disabled": "Complete required steps on Protocol tab before starting the run",
   "run_failed": "Run failed.",
   "run_failed_modal_body": "Error occurred when protocol was {{command}}",
@@ -144,5 +149,8 @@
   "view_analysis_error_details": "View <errorLink>error details</errorLink>",
   "view_current_step": "View current step",
   "view_error": "View error",
-  "view_error_details": "View error details"
+  "view_error_details": "View error details",
+  "warning_details": "Warning details",
+  "no_of_warning": "{{count}} warning",
+  "no_of_warnings": "{{count}} warnings"
 }

app/src/molecules/Modal/ModalHeader.tsx

@@ -43,7 +43,6 @@ export function ModalHeader(props: ModalHeaderBaseProps): JSX.Element {
             color={iconColor}
             size="2rem"
             alignSelf={ALIGN_CENTER}
-            marginRight={SPACING.spacing16}
           />
         ) : null}
         <LegacyStyledText

app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader.tsx

@@ -345,6 +345,7 @@ export function ProtocolRunHeader({
           setShowRunFailedModal={setShowRunFailedModal}
           highestPriorityError={highestPriorityError}
           commandErrorList={commandErrorList}
+          runStatus={runStatus}
         />
       ) : null}
       <Flex
@@ -899,7 +900,8 @@ function TerminalRunBanner(props: TerminalRunProps): JSX.Element | null {
     isRunCurrent,
   } = props
   const { t } = useTranslation('run_details')
-
+  const completedWithErrors =
+    commandErrorList?.data != null && commandErrorList.data.length > 0
   const handleRunSuccessClick = (): void => {
     handleClearClick()
   }
@@ -926,15 +928,22 @@ function TerminalRunBanner(props: TerminalRunProps): JSX.Element | null {
 
   const buildErrorBanner = (): JSX.Element => {
     return (
-      <Banner type="error" iconMarginLeft={SPACING.spacing4}>
+      <Banner
+        type={runStatus === RUN_STATUS_SUCCEEDED ? 'warning' : 'error'}
+        iconMarginLeft={SPACING.spacing4}
+      >
         <Flex justifyContent={JUSTIFY_SPACE_BETWEEN} width="100%">
           <LegacyStyledText>
             {highestPriorityError != null
               ? t('error_info', {
                   errorType: highestPriorityError?.errorType,
                   errorCode: highestPriorityError?.errorCode,
                 })
-              : 'Run completed with errors.'}
+              : `${
+                  runStatus === RUN_STATUS_SUCCEEDED
+                    ? t('run_completed_with_warnings')
+                    : t('run_completed_with_errors')
+                }`}
           </LegacyStyledText>
 
           <LinkButton
@@ -951,14 +960,13 @@ function TerminalRunBanner(props: TerminalRunProps): JSX.Element | null {
   if (
     runStatus === RUN_STATUS_SUCCEEDED &&
     isRunCurrent &&
-    !isResetRunLoading
+    !isResetRunLoading &&
+    !completedWithErrors
   ) {
     return buildSuccessBanner()
   } else if (
     highestPriorityError != null ||
-    (commandErrorList?.data != null &&
-      commandErrorList.data.length > 0 &&
-      !isResetRunLoading)
+    (completedWithErrors && !isResetRunLoading)
   ) {
     return buildErrorBanner()
   } else {

app/src/organisms/Devices/ProtocolRun/RunFailedModal.tsx

@@ -23,7 +23,12 @@ import {
 import { LegacyModal } from '../../../molecules/LegacyModal'
 import { useDownloadRunLog } from '../hooks'
 
-import type { RunError, RunCommandErrors } from '@opentrons/api-client'
+import type {
+  RunError,
+  RunCommandErrors,
+  RunStatus,
+} from '@opentrons/api-client'
+import { RUN_STATUS_SUCCEEDED } from '@opentrons/api-client'
 import type { LegacyModalProps } from '../../../molecules/LegacyModal'
 import type { RunCommandError } from '@opentrons/shared-data'
 
@@ -45,6 +50,7 @@ interface RunFailedModalProps {
   setShowRunFailedModal: (showRunFailedModal: boolean) => void
   highestPriorityError?: RunError | null
   commandErrorList?: RunCommandErrors | null
+  runStatus: RunStatus | null
 }
 
 export function RunFailedModal({
@@ -53,11 +59,17 @@ export function RunFailedModal({
   setShowRunFailedModal,
   highestPriorityError,
   commandErrorList,
+  runStatus,
 }: RunFailedModalProps): JSX.Element | null {
   const { i18n, t } = useTranslation(['run_details', 'shared', 'branded'])
   const modalProps: LegacyModalProps = {
-    type: 'error',
-    title: t('run_failed_modal_title'),
+    type: runStatus === RUN_STATUS_SUCCEEDED ? 'warning' : 'error',
+    title:
+      commandErrorList == null || commandErrorList?.data.length === 0
+        ? t('run_failed_modal_title')
+        : runStatus === RUN_STATUS_SUCCEEDED
+        ? t('warning_details')
+        : t('error_details'),
     onClose: () => {
       setShowRunFailedModal(false)
     },
@@ -95,7 +107,13 @@ export function RunFailedModal({
                 errorType: errors[0].errorType,
                 errorCode: errors[0].errorCode,
               })
-            : `${errors.length} errors`}
+            : runStatus === RUN_STATUS_SUCCEEDED
+            ? t(errors.length > 1 ? 'no_of_warnings' : 'no_of_warning', {
+                count: errors.length,
+              })
+            : t(errors.length > 1 ? 'no_of_errors' : 'no_of_error', {
+                count: errors.length,
+              })}
         </LegacyStyledText>
         <Flex css={ERROR_MESSAGE_STYLE}>
           {' '}

app/src/organisms/Devices/ProtocolRun/__tests__/RunFailedModal.test.tsx

@@ -6,7 +6,7 @@ import { i18n } from '../../../../i18n'
 import { useDownloadRunLog } from '../../hooks'
 import { RunFailedModal } from '../RunFailedModal'
 
-import type { RunError } from '@opentrons/api-client'
+import { RUN_STATUS_FAILED, type RunError } from '@opentrons/api-client'
 import { fireEvent, screen } from '@testing-library/react'
 
 vi.mock('../../hooks')
@@ -39,6 +39,7 @@ describe('RunFailedModal - DesktopApp', () => {
       runId: RUN_ID,
       setShowRunFailedModal: vi.fn(),
       highestPriorityError: mockError,
+      runStatus: RUN_STATUS_FAILED
     }
     vi.mocked(useDownloadRunLog).mockReturnValue({
       downloadRunLog: vi.fn(),

app/src/organisms/OnDeviceDisplay/RunningProtocol/RunFailedModal.tsx

@@ -20,7 +20,12 @@ import { SmallButton } from '../../../atoms/buttons'
 import { Modal } from '../../../molecules/Modal'
 
 import type { ModalHeaderBaseProps } from '../../../molecules/Modal/types'
-import type { RunCommandErrors, RunError } from '@opentrons/api-client'
+import type {
+  RunCommandErrors,
+  RunError,
+  RunStatus,
+} from '@opentrons/api-client'
+import { RUN_STATUS_SUCCEEDED } from '@opentrons/api-client'
 
 import type { RunCommandError } from '@opentrons/shared-data'
 
@@ -29,13 +34,15 @@ interface RunFailedModalProps {
   setShowRunFailedModal: (showRunFailedModal: boolean) => void
   errors?: RunError[]
   commandErrorList?: RunCommandErrors
+  runStatus: RunStatus | null
 }
 
 export function RunFailedModal({
   runId,
   setShowRunFailedModal,
   errors,
   commandErrorList,
+  runStatus,
 }: RunFailedModalProps): JSX.Element | null {
   const { t, i18n } = useTranslation(['run_details', 'shared', 'branded'])
   const navigate = useNavigate()
@@ -48,7 +55,12 @@ export function RunFailedModal({
   )
     return null
   const modalHeader: ModalHeaderBaseProps = {
-    title: t('run_failed_modal_title'),
+    title:
+      commandErrorList == null || commandErrorList?.data.length === 0
+        ? t('run_failed_modal_title')
+        : runStatus === RUN_STATUS_SUCCEEDED
+        ? t('warning_details')
+        : t('error_details'),
   }
 
   const highestPriorityError = getHighestPriorityError(errors ?? [])
@@ -85,7 +97,13 @@ export function RunFailedModal({
                 errorType: errors[0].errorType,
                 errorCode: errors[0].errorCode,
               })
-            : `${errors.length} errors`}
+            : runStatus === RUN_STATUS_SUCCEEDED
+            ? t(errors.length > 1 ? 'no_of_warnings' : 'no_of_warning', {
+                count: errors.length,
+              })
+            : t(errors.length > 1 ? 'no_of_errors' : 'no_of_error', {
+                count: errors.length,
+              })}
         </LegacyStyledText>
         <Flex
           width="100%"

app/src/organisms/OnDeviceDisplay/RunningProtocol/__tests__/RunFailedModal.test.tsx

@@ -10,6 +10,7 @@ import { i18n } from '../../../../i18n'
 import { RunFailedModal } from '../RunFailedModal'
 
 import type { NavigateFunction } from 'react-router-dom'
+import { RUN_STATUS_FAILED } from '@opentrons/api-client'
 
 vi.mock('@opentrons/react-api-client')
 
@@ -100,6 +101,7 @@ describe('RunFailedModal', () => {
       runId: RUN_ID,
       setShowRunFailedModal: mockFn,
       errors: mockErrors,
+      runStatus: RUN_STATUS_FAILED,
     }
 
     vi.mocked(useStopRunMutation).mockReturnValue({

app/src/pages/RunSummary/index.tsx

@@ -332,6 +332,7 @@ export function RunSummary(): JSX.Element {
               setShowRunFailedModal={setShowRunFailedModal}
               errors={runRecord?.data.errors}
               commandErrorList={commandErrorList}
+              runStatus={runStatus}
             />
           ) : null}
           <Flex
@@ -399,7 +400,8 @@ export function RunSummary(): JSX.Element {
               height="17rem"
               css={showRunAgainSpinner ? RUN_AGAIN_CLICKED_STYLE : undefined}
             />
-            {!didRunSucceed ? (
+            {(commandErrorList != null && commandErrorList?.data.length > 0) ||
+            !didRunSucceed ? (
               <LargeButton
                 flex="1"
                 iconName="info"
@@ -408,8 +410,10 @@ export function RunSummary(): JSX.Element {
                 buttonText={t('view_error_details')}
                 height="17rem"
                 disabled={
-                  runRecord?.data.errors == null ||
-                  runRecord?.data.errors.length === 0
+                  (runRecord?.data.errors == null ||
+                    runRecord?.data.errors.length === 0) &&
+                  (commandErrorList == null ||
+                    commandErrorList?.data.length === 0)
                 }
               />
             ) : null}