refactor(js): Fix a variety of type definitions that will break in future Flow versions

app/package.json

@@ -16,10 +16,6 @@
     "url": "https://github.com/Opentrons/opentrons/issues"
   },
   "homepage": "https://github.com/Opentrons/opentrons",
-  "devDependencies": {
-    "flow-bin": "^0.110.1",
-    "flow-typed": "^2.6.2"
-  },
   "dependencies": {
     "@opentrons/components": "3.15.2",
     "@opentrons/shared-data": "3.15.2",

app/src/analytics/make-event.js

@@ -47,8 +47,8 @@ export function makeEvent(
       return getProtocolAnalyticsData(state).then(data => ({
         name: 'protocolUploadRequest',
         properties: {
-          ...data,
           ...getRobotAnalyticsData(state),
+          ...data,
         },
       }))
     }
@@ -63,8 +63,8 @@ export function makeEvent(
       return getProtocolAnalyticsData(state).then(data => ({
         name: 'protocolUploadResponse',
         properties: {
-          ...data,
           ...getRobotAnalyticsData(state),
+          ...data,
           success: actionType === 'robot:SESSION_RESPONSE',
           error: (actionPayload.error && actionPayload.error.message) || '',
         },
@@ -76,8 +76,8 @@ export function makeEvent(
       return getProtocolAnalyticsData(state).then(data => ({
         name: 'runStart',
         properties: {
-          ...data,
           ...getRobotAnalyticsData(state),
+          ...data,
         },
       }))
     }
@@ -94,8 +94,8 @@ export function makeEvent(
       return getProtocolAnalyticsData(state).then(data => ({
         name: 'runFinish',
         properties: {
-          ...data,
           ...getRobotAnalyticsData(state),
+          ...data,
           runTime,
           success,
           error,

app/src/buildroot/reducer.js

@@ -81,14 +81,15 @@ export function buildrootReducer(
 
     case Constants.BR_STATUS: {
       const { stage, progress, message } = action.payload
+      const currentError = state.session?.error || null
 
       return {
         ...state,
         session: {
           ...state.session,
           stage,
           progress: typeof progress === 'number' ? progress : null,
-          error: stage === Constants.ERROR ? message : state.session?.error,
+          error: stage === Constants.ERROR ? message : currentError,
         },
       }
     }

app/src/components/CalibrateDeck/AttachTip.js

@@ -1,19 +1,14 @@
 // @flow
 import * as React from 'react'
-import type { PipetteModelSpecs } from '@opentrons/shared-data'
 import type { CalibrateDeckStartedProps, CalibrationStep } from './types'
 import { PrimaryButton } from '@opentrons/components'
 
 import styles from './styles.css'
 
-type Props = CalibrateDeckStartedProps & {
+type Props = {|
+  ...CalibrateDeckStartedProps,
   proceed: () => mixed,
-}
-
-type DiagramProps = {
-  calibrationStep: CalibrationStep,
-  pipette: PipetteModelSpecs,
-}
+|}
 
 type Channels = 'single' | 'multi'
 
@@ -72,7 +67,7 @@ export default function AttachTipModal(props: Props) {
   )
 }
 
-function getDiagramSrc(props: DiagramProps): string {
+function getDiagramSrc(props: Props): string {
   const { calibrationStep, pipette } = props
   const channelsKey = pipette.channels === 8 ? 'multi' : 'single'
 

app/src/components/CalibrateDeck/ClearDeckAlert.js

@@ -8,7 +8,7 @@ import ClearDeckAlertModal from '../ClearDeckAlertModal'
 import type { Dispatch } from '../../types'
 import type { CalibrateDeckProps } from './types'
 
-type OP = $Exact<CalibrateDeckProps>
+type OP = CalibrateDeckProps
 
 type DP = {|
   onContinue: () => mixed,

app/src/components/CalibrateDeck/ConfirmPosition.js

@@ -5,9 +5,10 @@ import { PrimaryButton } from '@opentrons/components'
 import JogControls from '../JogControls'
 import Instructions from './Instructions'
 
-type Props = CalibrateDeckStartedProps & {
+type Props = {|
+  ...CalibrateDeckStartedProps,
   proceed: () => mixed,
-}
+|}
 
 export default function ConfirmPosition(props: Props) {
   return (

app/src/components/CalibrateDeck/InstructionsModal.js

@@ -16,11 +16,11 @@ import ConfirmPosition from './ConfirmPosition'
 import type { Dispatch } from '../../types'
 import type { CalibrateDeckStartedProps } from './types'
 
-type OP = $Exact<CalibrateDeckStartedProps>
+type OP = CalibrateDeckStartedProps
 
 type DP = {| proceed: () => mixed |}
 
-type Props = { ...OP, ...DP }
+type Props = {| ...OP, ...DP |}
 
 const TITLE = 'Deck Calibration'
 

app/src/components/CalibrateDeck/types.js

@@ -33,12 +33,12 @@ export type DP = {|
   back: () => mixed,
 |}
 
-export type CalibrateDeckProps = { ...OP, ...SP, ...DP }
+export type CalibrateDeckProps = {| ...OP, ...SP, ...DP |}
 
-export type CalibrateDeckStartedProps = {
-  ...$Exact<CalibrateDeckProps>,
+export type CalibrateDeckStartedProps = {|
+  ...CalibrateDeckProps,
   exitUrl: string,
   mount: Mount,
   pipette: PipetteModelSpecs,
   calibrationStep: CalibrationStep,
-}
+|}

app/src/components/CalibrateLabware/ConfirmPositionContents.js

@@ -23,7 +23,7 @@ type DP = {|
   jog: Jog,
 |}
 
-type Props = { ...OP, ...DP }
+type Props = {| ...OP, ...DP |}
 
 export default connect<Props, OP, _, _, _, _>(
   null,
@@ -32,6 +32,7 @@ export default connect<Props, OP, _, _, _, _>(
 
 function ConfirmPositionContents(props: Props) {
   const {
+    jog,
     onConfirmClick,
     labware,
     calibrator,
@@ -49,7 +50,7 @@ function ConfirmPositionContents(props: Props) {
         {...{ labware, calibrator, calibrateToBottom, useCenteredTroughs }}
         buttonText={confirmButtonText}
       />
-      <JogControls {...props} />
+      <JogControls jog={jog} />
       <PrimaryButton title="confirm" onClick={onConfirmClick}>
         {confirmButtonText}
       </PrimaryButton>

app/src/components/CalibrateLabware/ProceedToRun.js

@@ -34,7 +34,6 @@ function ProceedToRun(props: Props) {
   }, [sessionModules])
 
   const handleClick = () => {
-    // $FlowFixMe: robotActions.returnTip is not typed
     returnTip()
     if (mustPrepForRun) {
       setRunPrepModalOpen(true)

app/src/components/CalibratePanel/LabwareList.js

@@ -24,12 +24,12 @@ type SP = {|
 
 type DP = {| dispatch: Dispatch |}
 
-type Props = {
+type Props = {|
   labware: Array<Labware>,
   modulesBySlot: { [Slot]: SessionModule },
   disabled: boolean,
   setLabware: (labware: Labware) => mixed,
-}
+|}
 
 export default withRouter<{||}, _>(
   connect<Props, _, SP, {||}, State, Dispatch>(
@@ -54,7 +54,6 @@ function LabwareList(props: Props) {
             modulesBySlot[lw.slot].name
           }
           isDisabled={disabled}
-          confirmed={lw.confirmed}
           onClick={() => setLabware(lw)}
         />
       ))}

app/src/components/CalibratePanel/LabwareListItem.js

@@ -14,7 +14,7 @@ import type { Labware } from '../../robot'
 import { THERMOCYCLER } from '../../modules'
 
 type LabwareListItemProps = {|
-  ...$Exact<Labware>,
+  ...Labware,
   moduleName?: ModuleType,
   isDisabled: boolean,
   onClick: () => mixed,

app/src/components/ConnectPanel/UnreachableRobotItem.js

@@ -24,11 +24,7 @@ export default function UnreachableRobotItem(props: UnreachableRobot) {
             disabled
             hoverTooltipHandlers={hoverTooltipHandlers}
           >
-            <Icon
-              name={'alert-circle'}
-              className={styles.robot_item_icon}
-              disabled
-            />
+            <Icon name={'alert-circle'} className={styles.robot_item_icon} />
             <p className={styles.link_text}>{displayName}</p>
           </RobotLink>
         )}

app/src/components/ReviewDeck/Prompt.js

@@ -9,13 +9,14 @@ import { selectors as robotSelectors, type Labware } from '../../robot'
 import styles from './styles.css'
 
 type Props = {|
-  ...$Exact<Labware>,
+  ...Labware,
   onClick: () => void,
 |}
 
 export default function Prompt(props: Props) {
-  const { name, definition, slot, onClick } = props
-  const labwareType = robotSelectors.labwareType(props)
+  const { onClick, ...labware } = props
+  const { name, definition, slot } = labware
+  const labwareType = robotSelectors.labwareType(labware)
   const labwareTitle = definition ? getLabwareDisplayName(definition) : name
 
   return (

app/src/components/RobotSettings/SelectNetwork/SelectKey.js

@@ -40,7 +40,6 @@ export default class SelectKey extends React.Component<Props> {
       event.target.value = ''
       // $FlowFixMe: see TODO and HACK in app/src/http-api-client/networking.js
       this.props.addKey(file).then(success => {
-        // $FlowFixMe: ditto
         this.props.onValueChange(this.props.name, success.payload.response.id)
       })
     }

app/src/components/RobotSettings/SelectNetwork/fields.js

@@ -31,13 +31,13 @@ type PasswordFieldProps = {
   toggleShowPassword: (name: string) => mixed,
 }
 
-type SelectOptionFieldProps = {
+type SelectOptionFieldProps = {|
   ...BaseFieldProps,
   options: Array<SelectOption>,
   placeholder?: string,
-  onValueChange?: (name: string, value: ?string) => mixed,
+  onValueChange: (name: string, value: ?string) => mixed,
   onLoseFocus?: (name: string) => mixed,
-}
+|}
 
 const SHOW_PASSWORD_LABEL = 'Show password'
 const FIELD_ID_PREFIX = '__ConnectForm__'

app/src/components/TipProbe/types.js

@@ -1,7 +1,7 @@
 // @flow
 import type { Pipette } from '../../robot'
 
-export type TipProbeProps = $Exact<Pipette>
+export type TipProbeProps = Pipette
 
 export type TipProbeState =
   | 'unprobed'

app/src/components/calibrate-pipettes/Pipettes.js

@@ -6,6 +6,7 @@ import { PIPETTE_MOUNTS } from '../../pipettes'
 import { InstrumentGroup } from '@opentrons/components'
 import styles from './styles.css'
 
+import type { InstrumentInfoProps } from '@opentrons/components'
 import type { Pipette, TiprackByMountMap } from '../../robot/types'
 import type { Mount } from '../../pipettes/types'
 
@@ -19,7 +20,12 @@ type Props = {|
 export default function Pipettes(props: Props) {
   const { currentMount, pipettes, tipracksByMount } = props
 
-  const infoByMount = PIPETTE_MOUNTS.reduce((result, mount) => {
+  const infoByMount = PIPETTE_MOUNTS.reduce<
+    $Shape<{|
+      left?: InstrumentInfoProps,
+      right?: InstrumentInfoProps,
+    |}>
+  >((result, mount) => {
     const pipette = pipettes.find(p => p.mount === mount)
     const tiprack = tipracksByMount[mount]
     const pipetteConfig = pipette?.modelSpecs

app/src/discovery/types.js

@@ -16,37 +16,37 @@ export type ReachableStatus = 'reachable'
 export type UnreachableStatus = 'unreachable'
 
 // service with a known IP address
-export type ResolvedRobot = {
+export type ResolvedRobot = {|
   ...$Exact<Service>,
   ip: $NonMaybeType<$PropertyType<Service, 'ip'>>,
   local: $NonMaybeType<$PropertyType<Service, 'local'>>,
   ok: $NonMaybeType<$PropertyType<Service, 'ok'>>,
   serverOk: $NonMaybeType<$PropertyType<Service, 'serverOk'>>,
   displayName: string,
-}
+|}
 
 // fully connectable robot
-export type Robot = {
+export type Robot = {|
   ...$Exact<ResolvedRobot>,
   ok: true,
   health: $NonMaybeType<$PropertyType<Service, 'health'>>,
   status: ConnectableStatus,
   connected: boolean,
-}
+|}
 
 // robot with a known IP (i.e. advertising over mDNS) but unconnectable
-export type ReachableRobot = {
+export type ReachableRobot = {|
   ...$Exact<ResolvedRobot>,
   ok: false,
   status: ReachableStatus,
-}
+|}
 
 // robot with an unknown IP
-export type UnreachableRobot = {
+export type UnreachableRobot = {|
   ...$Exact<Service>,
   displayName: string,
   status: UnreachableStatus,
-}
+|}
 
 export type ViewableRobot = Robot | ReachableRobot
 

app/src/http-api-client/calibration.js

@@ -1,5 +1,6 @@
 // @flow
 // http api client module for /calibration/**
+// DEPRECATED(mc, 2020-01-13)
 import { createSelector } from 'reselect'
 
 import type { OutputSelector } from 'reselect'
@@ -68,8 +69,7 @@ export type DeckCalStartState = ApiCall<DeckStartRequest, DeckStartResponse>
 export type DeckCalCommandState = ApiCall<DeckCalRequest, DeckCalResponse>
 
 type RobotCalState = {
-  'calibration/deck/start'?: DeckCalStartState,
-  'calibration/deck'?: DeckCalCommandState,
+  [string]: any,
 }
 
 type CalState = {
@@ -82,7 +82,7 @@ const DECK_START: 'calibration/deck/start' = 'calibration/deck/start'
 // TODO(mc, 2018-07-05): flow helper until we have one reducer, since
 // p === 'constant' checks but p === CONSTANT does not, even if
 // CONSTANT is defined as `const CONSTANT: 'constant' = 'constant'`
-function getCalPath(p: string): ?CalPath {
+function getCalPath(p: string): string | null {
   if (p === 'calibration/deck/start' || p === 'calibration/deck') return p
 
   return null
@@ -158,7 +158,7 @@ export function calibrationReducer(state: ?CalState, action: Action): CalState {
       }
 
       if (path === DECK_START) {
-        stateByName[DECK] = {
+        stateByName[(DECK: string)] = {
           request: null,
           response: null,
           error: null,