fix(app): Plate reader DQA (#16946)

fix RQA-3570, RQA-3572, RQA-3573, RQA-3633, RQA-3634
Opentrons · Nov 22, 2024 · 6ae2f38 · 6ae2f38
1 parent 7e6c8ee
commit 6ae2f38
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/app/src/assets/localization/en/shared.json b/app/src/assets/localization/en/shared.json
@@ -11,6 +11,7 @@
   "change_robot": "Change robot",
   "clear_data": "clear data",
   "close": "close",
+  "closed": "closed",
   "close_robot_door": "Close the robot door before starting the run.",
   "confirm": "Confirm",
   "confirm_placement": "Confirm placement",

diff --git a/app/src/molecules/WizardRequiredEquipmentList/index.tsx b/app/src/molecules/WizardRequiredEquipmentList/index.tsx
@@ -155,7 +155,7 @@ function RequiredEquipmentCard(props: RequiredEquipmentCardProps): JSX.Element {
           </Flex>
         ) : null}
         <Flex
-          flex="0 1 70%"
+          flex={imageSrc == null ? '0 1 100%' : '0 1 70%'}
           flexDirection={DIRECTION_COLUMN}
           justifyContent={JUSTIFY_SPACE_AROUND}
         >

diff --git a/app/src/organisms/Desktop/Devices/HistoricalProtocolRun.tsx b/app/src/organisms/Desktop/Devices/HistoricalProtocolRun.tsx
@@ -41,12 +41,15 @@ export function HistoricalProtocolRun(
   const { t } = useTranslation('run_details')
   const { run, protocolName, robotIsBusy, robotName, protocolKey } = props
   const [drawerOpen, setDrawerOpen] = useState(false)
-  const countRunDataFiles =
+  let countRunDataFiles =
     'runTimeParameters' in run
       ? run?.runTimeParameters.filter(
           parameter => parameter.type === 'csv_file'
         ).length
       : 0
+  if ('outputFileIds' in run) {
+    countRunDataFiles += run.outputFileIds.length
+  }
   const runStatus = run.status
   const runDisplayName = formatTimestamp(run.createdAt)
   let duration = EMPTY_TIMESTAMP

diff --git a/app/src/organisms/LabwarePositionCheck/CheckItem.tsx b/app/src/organisms/LabwarePositionCheck/CheckItem.tsx
@@ -156,6 +156,13 @@ export const CheckItem = (props: CheckItemProps): JSX.Element | null => {
     t as TFunction,
     i18n
   )
+  const slotOnlyDisplayLocation = getDisplayLocation(
+    location,
+    labwareDefs,
+    t as TFunction,
+    i18n,
+    true
+  )
   const labwareDisplayName = getLabwareDisplayName(labwareDef)
 
   let placeItemInstruction: JSX.Element = (
@@ -445,7 +452,7 @@ export const CheckItem = (props: CheckItemProps): JSX.Element | null => {
         <JogToWell
           header={t('check_item_in_location', {
             item: isTiprack ? t('tip_rack') : t('labware'),
-            location: displayLocation,
+            location: slotOnlyDisplayLocation,
           })}
           body={
             <Trans
@@ -483,7 +490,7 @@ export const CheckItem = (props: CheckItemProps): JSX.Element | null => {
           {...props}
           header={t('prepare_item_in_location', {
             item: isTiprack ? t('tip_rack') : t('labware'),
-            location: displayLocation,
+            location: slotOnlyDisplayLocation,
           })}
           body={
             <UnorderedList

diff --git a/app/src/organisms/LabwarePositionCheck/utils/getDisplayLocation.ts b/app/src/organisms/LabwarePositionCheck/utils/getDisplayLocation.ts
@@ -12,12 +12,16 @@ export function getDisplayLocation(
   location: LabwareOffsetLocation,
   labwareDefinitions: LabwareDefinition2[],
   t: TFunction,
-  i18n: i18n
+  i18n: i18n,
+  slotOnly?: boolean
 ): string {
   const slotDisplayLocation = i18n.format(
     t('slot_name', { slotName: location.slotName }),
     'titleCase'
   )
+  if (slotOnly) {
+    return slotDisplayLocation
+  }
 
   if ('definitionUri' in location && location.definitionUri != null) {
     const adapterDisplayName = labwareDefinitions.find(

diff --git a/app/src/organisms/ModuleCard/AbsorbanceReaderData.tsx b/app/src/organisms/ModuleCard/AbsorbanceReaderData.tsx
@@ -12,7 +12,7 @@ export const AbsorbanceReaderData = (
   props: AbsorbanceReaderProps
 ): JSX.Element | null => {
   const { moduleData } = props
-  const { t } = useTranslation('device_details')
+  const { t, i18n } = useTranslation(['device_details', 'shared'])
 
   const StatusLabelProps = {
     status: 'Idle',
@@ -37,6 +37,10 @@ export const AbsorbanceReaderData = (
       break
     }
   }
+  const lidDisplayStatus =
+    moduleData.lidStatus === 'on'
+      ? i18n.format(t('shared:closed'), 'capitalize')
+      : i18n.format(t('shared:open'), 'capitalize')
 
   return (
     <>
@@ -46,7 +50,7 @@ export const AbsorbanceReaderData = (
         data-testid="abs_module_data"
       >
         {t('abs_reader_lid_status', {
-          status: moduleData.lidStatus === 'on' ? 'closed' : 'open',
+          status: lidDisplayStatus,
         })}
       </StyledText>
     </>