pass in layout, get location name for skip steps

Author: TamarZanzouri

app/src/organisms/ErrorRecoveryFlows/hooks/useFailedLabwareUtils.ts

@@ -50,8 +50,6 @@ interface RelevantFailedLabwareLocations {
   newLoc: LabwareLocation | null
 }
 
-export type interventionLayout = 'default' | 'stacked'
-
 export type UseFailedLabwareUtilsResult = UseTipSelectionUtilsResult & {
   /* The name of the labware relevant to the failed command, if any.  */
   failedLabwareName: string | null
@@ -63,7 +61,6 @@ export type UseFailedLabwareUtilsResult = UseTipSelectionUtilsResult & {
   failedLabwareNickname: string | null
   /* Details relating to the labware location. */
   failedLabwareLocations: RelevantFailedLabwareLocations
-  layout: interventionLayout
   labwareQuantity: string | null
 }
 
@@ -128,26 +125,20 @@ export function useFailedLabwareUtils({
     errorKind,
   })
 
-  console.log('WTFFFF: ', recentRelevantFailedLabwareCmd)
+  console.log('WTFFFF: ', failedLabwareLocations)
   const labwareQuantity = getFailedLabwareQuantity(
     runCommands,
     recentRelevantFailedLabwareCmd,
     errorKind
   )
 
-  let layout
-  if (errorKind !== ERROR_KINDS.STALL_WHILE_STACKING) {
-    layout = 'default'
-  } else layout = 'stacked'
-
   return {
     ...tipSelectionUtils,
     failedLabwareName: failedLabwareDetails?.name ?? null,
     failedLabware,
     relevantWellName,
     failedLabwareNickname: failedLabwareDetails?.nickname ?? null,
     failedLabwareLocations,
-    layout,
     labwareQuantity,
   }
 }
@@ -478,6 +469,7 @@ export function useRelevantFailedLwLocations({
     RelevantFailedLabwareLocations,
     'displayNameNewLoc' | 'newLoc'
   > => {
+    console.log('in new location:', failedCommandByRunRecord?.commandType)
     switch (failedCommandByRunRecord?.commandType) {
       case 'moveLabware':
         return {
@@ -487,6 +479,19 @@ export function useRelevantFailedLwLocations({
           }),
           newLoc: failedCommandByRunRecord.params.newLocation,
         }
+      case 'flexStacker/retrieve':
+      case 'flexStacker/store':
+        return {
+          displayNameNewLoc: getLabwareDisplayLocation({
+            ...BASE_DISPLAY_PARAMS,
+            location: BASE_DISPLAY_PARAMS.loadedModules.find(
+              m => m.id === failedCommandByRunRecord?.params.moduleId
+            ).location,
+          }),
+          newLoc: {
+            moduleId: failedCommandByRunRecord?.params.moduleId,
+          },
+        }
       default:
         return {
           displayNameNewLoc: null,

app/src/organisms/ErrorRecoveryFlows/shared/LeftColumnLabwareInfo.tsx

@@ -6,6 +6,7 @@ import type { RecoveryContentProps } from '../types'
 type LeftColumnLabwareInfoProps = RecoveryContentProps & {
   title: string
   type: ComponentProps<typeof InterventionContent>['infoProps']['type']
+  layout: ComponentProps<typeof InterventionContent>['infoProps']['layout']
   /* Renders a warning InlineNotification if provided. */
   bannerText?: string
 }
@@ -15,13 +16,13 @@ export function LeftColumnLabwareInfo({
   title,
   failedLabwareUtils,
   type,
+  layout,
   bannerText,
 }: LeftColumnLabwareInfoProps): JSX.Element | null {
   const {
     failedLabwareName,
     failedLabwareNickname,
     failedLabwareLocations,
-    layout,
     labwareQuantity,
   } = failedLabwareUtils
   const { displayNameNewLoc, displayNameCurrentLoc } = failedLabwareLocations

app/src/organisms/ErrorRecoveryFlows/shared/TwoColLwInfoAndDeck.tsx

@@ -133,6 +133,18 @@ export function TwoColLwInfoAndDeck(
     }
   }
 
+  const buildLayoutType = (): ComponentProps<
+    typeof InterventionContent
+  >['infoProps']['layout'] => {
+    switch (selectedRecoveryOption) {
+      case MANUAL_LOAD_IN_STACKER_AND_SKIP.ROUTE:
+      case MANUAL_REPLACE_STACKER_AND_RETRY.ROUTE:
+        return 'stacked'
+      default:
+        return 'default'
+    }
+  }
+
   // TODO(jh, 10-22-24): Componentize an app-only abstraction above MoveLabwareOnDeck. EXEC-788.
   const buildDeckView = (): JSX.Element => {
     switch (selectedRecoveryOption) {
@@ -210,6 +222,7 @@ export function TwoColLwInfoAndDeck(
           {...props}
           title={buildTitle()}
           type={buildType()}
+          layout={buildLayoutType()}
           bannerText={buildBannerText()}
         />
         <Flex marginTop="0.7rem">{buildDeckView()}</Flex>