Skip to content

Commit ecebc35

Browse files
committed
refactor hooks directory
1 parent 718a560 commit ecebc35

File tree

3 files changed

+46
-42
lines changed

3 files changed

+46
-42
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from './useDefaultPosition'
2+
export * from './usePositionReference'
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import { useSelector } from 'react-redux'
2+
3+
import { getRobotType } from '../../../../file-data/selectors'
4+
import {
5+
getAdditionalEquipmentEntities,
6+
getLabwareEntities,
7+
getPipetteEntities,
8+
} from '../../../../step-forms/selectors'
9+
import { getLiquidClassesValues } from '../../../../steplist/formLevel/handleFormChange/utils'
10+
11+
import type { WellLocation } from '@opentrons/shared-data'
12+
import type { FormData } from '../../../../form-types'
13+
import type { MoveLiquidPrefixType } from '../../../../resources/types'
14+
15+
export function useDefaultPosition(
16+
formData: FormData | null,
17+
prefix: MoveLiquidPrefixType
18+
): WellLocation {
19+
const pipetteEntities = useSelector(getPipetteEntities)
20+
const labwareEntities = useSelector(getLabwareEntities)
21+
const additionalEquipmentEntities = useSelector(
22+
getAdditionalEquipmentEntities
23+
)
24+
const robotType = useSelector(getRobotType)
25+
if (formData == null) {
26+
return {}
27+
}
28+
const liquidClassDefaultValues = getLiquidClassesValues({
29+
rawForm: formData,
30+
pipetteEntities,
31+
labwareEntities,
32+
additionalEquipmentEntities,
33+
robotType,
34+
})
35+
return {
36+
origin: liquidClassDefaultValues[`${prefix}_position_reference`],
37+
offset: {
38+
x: liquidClassDefaultValues[`${prefix}_x_position`],
39+
y: liquidClassDefaultValues[`${prefix}_y_position`],
40+
z: liquidClassDefaultValues[`${prefix}_mmFromBottom`],
41+
},
42+
}
43+
}

protocol-designer/src/components/organisms/TipPositionModal/hooks.tsx renamed to protocol-designer/src/components/organisms/TipPositionModal/hooks/usePositionReference.tsx

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useState } from 'react'
22
import { useTranslation } from 'react-i18next'
3-
import { useSelector } from 'react-redux'
43
import { round } from 'lodash'
54

65
import { DropdownMenu } from '@opentrons/components'
@@ -10,19 +9,9 @@ import {
109
POSITION_REFERENCE_TOP,
1110
} from '@opentrons/shared-data'
1211

13-
import { getRobotType } from '../../../file-data/selectors'
14-
import {
15-
getAdditionalEquipmentEntities,
16-
getLabwareEntities,
17-
getPipetteEntities,
18-
} from '../../../step-forms/selectors'
19-
import { getLiquidClassesValues } from '../../../steplist/formLevel/handleFormChange/utils'
20-
2112
import type { Dispatch, SetStateAction } from 'react'
2213
import type { DropdownOption } from '@opentrons/components'
23-
import type { PositionReference, WellLocation } from '@opentrons/shared-data'
24-
import type { FormData } from '../../../form-types'
25-
import type { MoveLiquidPrefixType } from '../../../resources/types'
14+
import type { PositionReference } from '@opentrons/shared-data'
2615

2716
interface UsePositionReferenceResult {
2817
positionReferenceDropdown: JSX.Element
@@ -123,33 +112,3 @@ export function usePositionReference(args: {
123112
setReference,
124113
}
125114
}
126-
127-
export function useDefaultPosition(
128-
formData: FormData | null,
129-
prefix: MoveLiquidPrefixType
130-
): WellLocation {
131-
const pipetteEntities = useSelector(getPipetteEntities)
132-
const labwareEntities = useSelector(getLabwareEntities)
133-
const additionalEquipmentEntities = useSelector(
134-
getAdditionalEquipmentEntities
135-
)
136-
const robotType = useSelector(getRobotType)
137-
if (formData == null) {
138-
return {}
139-
}
140-
const liquidClassDefaultValues = getLiquidClassesValues({
141-
rawForm: formData,
142-
pipetteEntities,
143-
labwareEntities,
144-
additionalEquipmentEntities,
145-
robotType,
146-
})
147-
return {
148-
origin: liquidClassDefaultValues[`${prefix}_position_reference`],
149-
offset: {
150-
x: liquidClassDefaultValues[`${prefix}_x_position`],
151-
y: liquidClassDefaultValues[`${prefix}_y_position`],
152-
z: liquidClassDefaultValues[`${prefix}_mmFromBottom`],
153-
},
154-
}
155-
}

0 commit comments

Comments
 (0)