refactor(app): Add OT-2 LPC "skip" and immediately apply offsets

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

@@ -31,6 +31,7 @@
   "clear_deck_all_lw_leave_modules": "Clear all deck slots of labware, leaving modules in place",
   "cli_ssh": "Command Line Interface (SSH)",
   "close_and_apply_offset_data": "Close and apply labware offset data",
+  "complete": "Complete",
   "confirm": "Confirm",
   "confirm_detached": "Confirm removal",
   "confirm_go_back_without_saving": "Are you sure you want to go back to the the labware list without saving?",
@@ -42,7 +43,6 @@
   "confirm_position_and_return_tip": "Confirm position, return tip to Slot {{next_slot}} and home",
   "confirm_removal": "Confirm removal",
   "continue": "Continue",
-  "custom": "Custom",
   "default": "Default",
   "default_labware_offset": "Default Labware Offset",
   "default_location_offset_added": "Default location offset added",
@@ -54,7 +54,7 @@
   "exit": "Exit",
   "exit_screen_confirm_exit": "Exit and discard all labware offsets",
   "exit_screen_go_back": "Go back to labware position check",
-  "exit_screen_subtitle": "If you exit now, all labware offsets will be discarded. This cannot be undone.",
+  "exit_screen_subtitle": "If you exit now, only the labware offsets you've confirmed will be applied to this run.",
   "exit_screen_title": "Exit before completing Labware Position Check?",
   "failed_to_save_final_position": "Failed to save final position",
   "get_labware_offset_data": "Get Labware Offset Data",
@@ -110,6 +110,7 @@
   "location_header": "Location",
   "lpc_complete": "Labware Position Check complete",
   "lpc_complete_summary_screen_heading": "Labware Position Check Complete",
+  "manual": "Manual",
   "modify_hardcoded_offsets_in_protocol": "Hardcoded offsets must be changed in your Python protocol",
   "module_display_location_text": "{{moduleName}} in Deck Slot {{slot}}",
   "module_in_slot": "{{module}} in {{slot}}",
@@ -162,6 +163,7 @@
   "secondary_pipette_tipracks_section": "Check tip racks with {{secondary_mount}} Pipette",
   "see_how_offsets_work": "See how labware offsets work",
   "select_labware_to_view_data": "Select a labware to view its stored offset data.",
+  "skip": "Skip",
   "slot": "Slot {{slotName}}",
   "slot_applied_location_offset_updated": "{{slot}} applied location offset updated",
   "slot_in_module_applied_location_offset_updated": "{{slot}} in {{module}} applied location offset updated",

app/src/organisms/Desktop/Devices/ProtocolRun/SetupLabwarePositionCheck/FlexSetupLPC/LPCSetupFlexBtns.tsx

@@ -70,6 +70,8 @@
       return t('add_missing_labware_offsets')
     } else if (offsetsConfirmed) {
       return t('offsets_already_applied')
+    } else if (lpcDisabledReason != null) {
+      return lpcDisabledReason
     } else if (!anyOffsetsToLpc) {
       return t('no_offsets_found')
     } else {

app/src/organisms/Desktop/Devices/ProtocolRun/SetupLabwarePositionCheck/OT2SetupLPC/index.tsx

@@ -15,6 +15,7 @@
   Tooltip,
   TYPOGRAPHY,
   useHoverTooltip,
+  Icon,
 } from '@opentrons/components'
 import { useProtocolQuery } from '@opentrons/react-api-client'
 
@@ -80,7 +81,7 @@
     placement: TOOLTIP_LEFT,
   })
 
-  const { launchLPC, lpcProps, showLPC } = useLPCFlows({
+  const { launchLPC, lpcProps, showLPC, isLaunchingLPC } = useLPCFlows({
     runId,
     robotType,
     protocolName,
@@ -142,9 +143,19 @@
           onClick={launchLPC}
           id="LabwareSetup_checkLabwarePositionsButton"
           {...runLPCTargetProps}
-          disabled={lpcDisabledReason !== null}
+          disabled={lpcDisabledReason !== null || isLaunchingLPC}
         >
-          {t('run_labware_position_check')}
+          <Flex alignItems={ALIGN_CENTER}>
+            {isLaunchingLPC && (
+              <Icon
+                size="1rem"
+                spin
+                name="ot-spinner"
+                marginRight={SPACING.spacing8}
+              />
+            )}
+            {t('run_labware_position_check')}
+          </Flex>
         </PrimaryButton>
         {lpcDisabledReason !== null ? (
           <Tooltip tooltipProps={runLPCTooltipProps}>

app/src/organisms/LabwareOffsetsTable/AccordionDetail.tsx

@@ -35,7 +35,7 @@
 
   const buildColTwoText = (): string => {
     if (isHardcoded || lsExistingOffset?.vector != null) {
-      return t('custom')
+      return t('manual')
     } else if (defaultExistingOffset?.vector != null) {
       return t('default')
     } else {

app/src/organisms/LabwarePositionCheck/LPCFlows/LPCFlows.tsx

@@ -16,6 +16,7 @@ export interface LegacySupportLPCFlowsProps extends LPCFlowsProps {
 
 export interface LPCFlowsProps {
   onCloseClick: () => void
+  isClosing: boolean
   runId: string
   robotType: RobotType
   deckConfig: DeckConfiguration

app/src/organisms/LabwarePositionCheck/LPCFlows/useLPCFlows.ts

@@ -119,7 +119,10 @@
   const {
     createLabwareDefinition,
   } = useCreateMaintenanceRunLabwareDefinitionMutation()
-  const { deleteMaintenanceRun } = useDeleteMaintenanceRunMutation()
+  const {
+    deleteMaintenanceRun,
+    isLoading: isClosing,
+  } = useDeleteMaintenanceRunMutation()
 
   // After the maintenance run is created, add labware defs to the maintenance run.
   useEffect(() => {
@@ -192,6 +195,7 @@
         showLPC,
         lpcProps: {
           onCloseClick: handleCloseLPC,
+          isClosing,
           runId,
           robotType,
           deckConfig,

app/src/organisms/LabwarePositionCheck/LPCWizardContainer.tsx

@@ -17,6 +17,7 @@
           {...props}
           existingOffsets={props.ot2Offsets}
           mostRecentAnalysis={props.analysis}
+          isDeletingMaintenanceRun={props.isClosing}
         />
       )
     default: {

app/src/organisms/LegacyLabwarePositionCheck/CheckItem.tsx

@@ -30,13 +30,17 @@
 import { getDisplayLocation } from './utils/getDisplayLocation'
 
 import type { Dispatch } from 'react'
-import type { LabwareOffset } from '@opentrons/api-client'
+import type {
+  LabwareOffset,
+  LegacyLabwareOffsetLocation,
+} from '@opentrons/api-client'
 import type {
   CompletedProtocolAnalysis,
   CreateCommand,
   LabwareLocation,
   MoveLabwareCreateCommand,
   RobotType,
+  Coordinates,
 } from '@opentrons/shared-data'
 import type { useChainRunCommands } from '/app/resources/runs'
 import type {
@@ -55,6 +59,13 @@
   proceed: () => void
   chainRunCommands: ReturnType<typeof useChainRunCommands>['chainRunCommands']
   setFatalError: (errorMessage: string) => void
+  isApplyingOffsets: boolean
+  calculateAndApplyOffset: (
+    initialPosition: Coordinates | null,
+    finalPosition: Coordinates | null,
+    labwareId: string,
+    location: LegacyLabwareOffsetLocation
+  ) => Promise<void>
   registerPosition: Dispatch<RegisterPositionAction>
   workingOffsets: WorkingOffset[]
   existingOffsets: LabwareOffset[]
@@ -63,6 +74,7 @@
   robotType: RobotType
   shouldUseMetalProbe: boolean
 }
+
 export const CheckItem = (props: CheckItemProps): JSX.Element | null => {
   const {
     labwareId,
@@ -80,7 +92,9 @@
     existingOffsets,
     setFatalError,
     robotType,
+    isApplyingOffsets,
     shouldUseMetalProbe,
+    calculateAndApplyOffset,
   } = props
   const { t, i18n } = useTranslation(['labware_position_check', 'shared'])
   const isOnDevice = useSelector(getIsOnDevice)
@@ -355,7 +369,7 @@
           },
         ]
 
-  const handleConfirmPosition = (): void => {
+  const handleConfirmPositionAndApply = (): void => {
     const heaterShakerPrepCommands: CreateCommand[] =
       moduleId != null &&
       moduleType != null &&
@@ -403,17 +417,29 @@
             location,
             position,
           })
-          proceed()
+          return calculateAndApplyOffset(
+            initialPosition ?? null,
+            position,
+            labwareId,
+            location
+          )
         } else {
           setFatalError('CheckItem failed to save final position with message')
+          return Promise.reject(
+            new Error('CheckItem failed to save final position with message')
+          )
         }
       })
+      .then(() => {
+        proceed()
+      })
       .catch((e: Error) => {
         setFatalError(
           `CheckItem failed to move from final position with message: ${e.message}`
         )
       })
   }
+
   const handleGoBack = (): void => {
     chainRunCommands(
       [
@@ -479,7 +505,8 @@
           }
           labwareDef={labwareDef}
           pipetteName={pipetteName}
-          handleConfirmPosition={handleConfirmPosition}
+          handleConfirmPositionAndApply={handleConfirmPositionAndApply}
+          isApplyingOffsets={isApplyingOffsets}
           handleGoBack={handleGoBack}
           handleJog={handleJog}
           initialPosition={initialPosition}
@@ -506,6 +533,7 @@
           labwareDef={labwareDef}
           confirmPlacement={handleConfirmPlacement}
           robotType={robotType}
+          onSkip={proceed}
         />
       )}
     </Flex>

app/src/organisms/LegacyLabwarePositionCheck/JogToWell.tsx

@@ -9,6 +9,7 @@
   COLORS,
   DIRECTION_COLUMN,
   Flex,
+  Icon,
   JUSTIFY_CENTER,
   JUSTIFY_SPACE_BETWEEN,
   LabwareRender,
@@ -53,7 +54,8 @@
   'https://support.opentrons.com/s/article/How-Labware-Offsets-work-on-the-OT-2'
 
 interface JogToWellProps {
-  handleConfirmPosition: () => void
+  handleConfirmPositionAndApply: () => void
+  isApplyingOffsets: boolean
   handleGoBack: () => void
   handleJog: Jog
   pipetteName: PipetteName
@@ -71,7 +73,8 @@
     body,
     pipetteName,
     labwareDef,
-    handleConfirmPosition,
+    handleConfirmPositionAndApply,
+    isApplyingOffsets,
     handleGoBack,
     handleJog,
     initialPosition,
@@ -198,7 +201,7 @@
             />
             <SmallButton
               buttonText={t('shared:confirm_position')}
-              onClick={handleConfirmPosition}
+              onClick={handleConfirmPositionAndApply}
             />
           </Flex>
           {showFullJogControls
@@ -259,11 +262,27 @@
           >
             <NeedHelpLink href={LPC_HELP_LINK_URL} />
             <Flex gridGap={SPACING.spacing8}>
-              <SecondaryButton onClick={handleGoBack}>
+              <SecondaryButton
+                onClick={handleGoBack}
+                disabled={isApplyingOffsets}
+              >
                 {t('shared:go_back')}
               </SecondaryButton>
-              <PrimaryButton onClick={handleConfirmPosition}>
-                {t('shared:confirm_position')}
+              <PrimaryButton
+                onClick={handleConfirmPositionAndApply}
+                disabled={isApplyingOffsets}
+              >
+                <Flex>
+                  {isApplyingOffsets ? (
+                    <Icon
+                      size="1rem"
+                      spin
+                      name="ot-spinner"
+                      marginRight={SPACING.spacing8}
+                    />
+                  ) : null}
+                  {t('shared:confirm_position')}
+                </Flex>
               </PrimaryButton>
             </Flex>
           </Flex>