feat(protocol-designer): avoid use of labware "format"

protocol-designer/src/components/labware/SelectableLabware.js

@@ -2,9 +2,12 @@
 import * as React from 'react'
 import reduce from 'lodash/reduce'
 
-import { getCollidingWells, arrayToWellGroup } from '../../utils'
+import {
+  arrayToWellGroup,
+  getCollidingWells,
+  getWellSetForMultichannel,
+} from '../../utils'
 import { SELECTABLE_WELL_CLASS } from '../../constants'
-import { getWellSetForMultichannel } from '../../well-selection/utils'
 import SingleLabware from './SingleLabware'
 import SelectionRect from '../SelectionRect'
 import WellTooltip from './WellTooltip'

protocol-designer/src/labware-defs/actions.js

@@ -8,7 +8,7 @@ import uniqBy from 'lodash/uniqBy'
 import labwareSchema from '@opentrons/shared-data/labware/schemas/2.json'
 import { getLabwareDefURI } from '@opentrons/shared-data'
 import * as labwareDefSelectors from './selectors'
-import { getAllWellSetsForLabware } from '../well-selection/utils'
+import { getAllWellSetsForLabware } from '../utils'
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
 import type { GetState, ThunkAction, ThunkDispatch } from '../types'
 import type { LabwareUploadMessage } from './types'

protocol-designer/src/steplist/formLevel/errors.js

@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react'
 import { getWellRatio } from '../utils'
-import { canPipetteUseLabware } from '@opentrons/shared-data'
+import { canPipetteUseLabware } from '../../utils'
 import type { StepFieldName } from '../../form-types'
 
 /*******************

protocol-designer/src/steplist/formLevel/handleFormChange/utils.js

@@ -2,9 +2,8 @@
 import assert from 'assert'
 import round from 'lodash/round'
 import uniq from 'lodash/uniq'
-import { canPipetteUseLabware } from '@opentrons/shared-data'
+import { getWellSetForMultichannel, canPipetteUseLabware } from '../../../utils'
 import { getPipetteCapacity } from '../../../pipettes/pipetteData'
-import { getWellSetForMultichannel } from '../../../well-selection/utils'
 import type {
   LabwareDefinition2,
   PipetteChannels,

protocol-designer/src/top-selectors/substep-highlight.js

@@ -1,6 +1,7 @@
 // @flow
 import { createSelector } from 'reselect'
 import { getWellNamePerMultiTip } from '@opentrons/shared-data'
+import { getWellSetForMultichannel } from '../utils'
 import type { Command } from '@opentrons/shared-data/protocol/flowTypes/schemaV3'
 
 import mapValues from 'lodash/mapValues'
@@ -10,7 +11,6 @@ import * as StepGeneration from '../step-generation'
 import { selectors as stepFormSelectors } from '../step-forms'
 import { selectors as fileDataSelectors } from '../file-data'
 import { selectors as stepsSelectors } from '../ui/steps'
-import { getWellSetForMultichannel } from '../well-selection/utils'
 
 import type { WellGroup } from '@opentrons/components'
 import type { Selector } from '../types'

protocol-designer/src/top-selectors/tip-contents/index.js

@@ -3,14 +3,14 @@ import { createSelector } from 'reselect'
 import noop from 'lodash/noop'
 import reduce from 'lodash/reduce'
 import mapValues from 'lodash/mapValues'
-import type { WellGroup } from '@opentrons/components'
+import { getWellSetForMultichannel } from '../../utils'
 import * as StepGeneration from '../../step-generation'
 import { allSubsteps as getAllSubsteps } from '../substeps'
 import { START_TERMINAL_ITEM_ID, END_TERMINAL_ITEM_ID } from '../../steplist'
 import { selectors as stepFormSelectors } from '../../step-forms'
 import { selectors as stepsSelectors } from '../../ui/steps'
 import { selectors as fileDataSelectors } from '../../file-data'
-import { getWellSetForMultichannel } from '../../well-selection/utils'
+import type { WellGroup } from '@opentrons/components'
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
 import type { Command } from '@opentrons/shared-data/protocol/flowTypes/schemaV3'
 import type { OutputSelector } from 'reselect'
@@ -226,12 +226,11 @@ export const getTipsForCurrentStep: GetTipSelector = createSelector(
             const hoveredSubstepData =
               substepsForStep.multiRows[substepIndex][0] // just use first multi row
 
-            const wellSet = hoveredSubstepData.activeTips
-              ? getWellSetForMultichannel(
-                  labwareDef,
-                  hoveredSubstepData.activeTips.well
-                )
-              : []
+            let wellSet: ?Array<string> = []
+            const hoveredTipWell = hoveredSubstepData.activeTips?.well
+            if (hoveredTipWell != null) {
+              wellSet = getWellSetForMultichannel(labwareDef, hoveredTipWell)
+            }
 
             highlighted =
               (hoveredSubstepData &&

protocol-designer/src/ui/labware/selectors.js

@@ -2,11 +2,7 @@
 import { createSelector } from 'reselect'
 import mapValues from 'lodash/mapValues'
 import reduce from 'lodash/reduce'
-import {
-  getIsTiprack,
-  getLabwareDisplayName,
-  getLabwareFormat,
-} from '@opentrons/shared-data'
+import { getIsTiprack, getLabwareDisplayName } from '@opentrons/shared-data'
 import { selectors as stepFormSelectors } from '../../step-forms'
 import { selectors as labwareIngredSelectors } from '../../labware-ingred/selectors'
 
@@ -57,16 +53,16 @@ export const getDisposalLabwareOptions: Selector<Options> = createSelector(
     reduce(
       labwareEntities,
       (acc: Options, labware: LabwareEntity, labwareId): Options => {
-        if (getLabwareFormat(labware.def) === 'trash') {
-          return [
-            ...acc,
-            {
-              name: names[labwareId],
-              value: labwareId,
-            },
-          ]
-        }
-        return acc
+        // TODO: Ian 2019-09-17 if we create a way to distinguish "intended for disposal"
+        // labware, use that here as a filter.
+        // Until then, allow all labware to be used for disposal
+        return [
+          ...acc,
+          {
+            name: names[labwareId],
+            value: labwareId,
+          },
+        ]
       },
       []
     )

protocol-designer/src/utils/index.js

@@ -1,5 +1,6 @@
 // @flow
 import uuidv1 from 'uuid/v1'
+import { makeWellSetHelpers } from '@opentrons/shared-data'
 import type { WellGroup } from '@opentrons/components'
 import type { BoundingRect, GenericRect } from '../collision-types'
 
@@ -70,3 +71,10 @@ export const getCollidingWells = (
 // TODO IMMEDIATELY use where appropriate
 export const arrayToWellGroup = (w: Array<string>): WellGroup =>
   w.reduce((acc, wellName) => ({ ...acc, [wellName]: null }), {})
+
+// cross-PD memoization of well set utils
+export const {
+  canPipetteUseLabware,
+  getAllWellSetsForLabware,
+  getWellSetForMultichannel,
+} = makeWellSetHelpers()