Skip to content

Commit d11f4a4

Browse files
committed
linting fixes
1 parent 7b5eb51 commit d11f4a4

File tree

2 files changed

+59
-41
lines changed

2 files changed

+59
-41
lines changed

app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import {
3030
import { OddModal } from '/app/molecules/OddModal'
3131
import { useNotifyDeckConfigurationQuery } from '/app/resources/deck_configuration/'
3232

33+
import { useSendIdentifyStacker } from '../ModuleWizardFlows/hooks'
3334
import { getOptions } from './utils'
3435

3536
import type { ModalProps } from '@opentrons/components'
@@ -41,7 +42,6 @@ import type {
4142
CutoutId,
4243
} from '@opentrons/shared-data'
4344
import type { OddModalHeaderBaseProps } from '/app/molecules/OddModal/types'
44-
import { useSendIdentifyStacker } from '../ModuleWizardFlows/hooks'
4545

4646
const FLEX_STACKER_FIXTURE = 'flexStackerModuleV1'
4747
const MODULE_IDENTIFY_TIME_MS = 10000
@@ -168,7 +168,10 @@ export function AddFixtureModal({
168168
const sendIdentifyStacker = useSendIdentifyStacker()
169169
const attachedModules = useModulesQuery().data?.data
170170

171-
const handleAddFixture = (addedCutoutConfigs: CutoutConfigMap[], fixtureSerialNumber?: string): void => {
171+
const handleAddFixture = (
172+
addedCutoutConfigs: CutoutConfigMap[],
173+
fixtureSerialNumber?: string
174+
): void => {
172175
const addedCutoutConfigsWithCombo = replaceCutoutFixtureWithComboFixture(
173176
addedCutoutConfigs,
174177
deckConfigWithAA,
@@ -182,11 +185,11 @@ export function AddFixtureModal({
182185
)
183186
}) as CutoutConfig[] // we can do this bc we are mapping each aa to the proper fixture
184187

185-
if (fixtureSerialNumber){
186-
const module = attachedModules?.find(
187-
m => m.serialNumber === fixtureSerialNumber
188-
) ?? null
189-
if ( module !== null){
188+
if (fixtureSerialNumber) {
189+
const module =
190+
attachedModules?.find(m => m.serialNumber === fixtureSerialNumber) ??
191+
null
192+
if (module !== null) {
190193
sendIdentifyStacker(module, false)
191194
}
192195
}
@@ -196,16 +199,16 @@ export function AddFixtureModal({
196199
}
197200

198201
const handleIdentifyFixture = (fixtureSerialNumber: string): void => {
199-
const module = attachedModules?.find(
200-
m => m.serialNumber === fixtureSerialNumber
201-
) ?? null
202-
if ( module !== null){
202+
const module =
203+
attachedModules?.find(m => m.serialNumber === fixtureSerialNumber) ?? null
204+
if (module !== null) {
203205
// Identify the stacker module
204206
sendIdentifyStacker(module, true, 'blue')
205-
//Ensure that the module reverts after a set time
206-
setTimeout(() =>{sendIdentifyStacker(module, false)}, MODULE_IDENTIFY_TIME_MS)
207+
// Ensure that the module reverts after a set time
208+
setTimeout(() => {
209+
sendIdentifyStacker(module, false)
210+
}, MODULE_IDENTIFY_TIME_MS)
207211
}
208-
209212
}
210213

211214
const fixtureOptions = availableOptions.map(cutoutConfigs => {
@@ -216,9 +219,12 @@ export function AddFixtureModal({
216219
usbPort?.hubPort != null
217220
? `${usbPort.port}.${usbPort.hubPort}`
218221
: usbPort?.port
219-
222+
220223
const fixtureSerialNumber = cutoutConfigs[0].opentronsModuleSerialNumber
221-
if (fixtureSerialNumber !== undefined && cutoutConfigs[0].cutoutFixtureId.includes(FLEX_STACKER_FIXTURE)){
224+
if (
225+
fixtureSerialNumber !== undefined &&
226+
cutoutConfigs[0].cutoutFixtureId.includes(FLEX_STACKER_FIXTURE)
227+
) {
222228
return (
223229
<FixtureOption
224230
key={cutoutConfigs[0].cutoutFixtureId}
@@ -232,13 +238,12 @@ export function AddFixtureModal({
232238
}}
233239
secondaryButtonText={t('identify')}
234240
secondaryOnClickHandler={() => {
235-
handleIdentifyFixture(fixtureSerialNumber)}
236-
}
241+
handleIdentifyFixture(fixtureSerialNumber)
242+
}}
237243
isOnDevice={isOnDevice}
238244
/>
239245
)
240-
}
241-
else{
246+
} else {
242247
return (
243248
<FixtureOption
244249
key={cutoutConfigs[0].cutoutFixtureId}
@@ -278,7 +283,7 @@ export function AddFixtureModal({
278283
) : (
279284
// This is the modal with the module fixtures
280285
// Something that checks if this is a stacker module with a TODO to remove/update if other identifiable modules are added
281-
// Call to the use identify thing that transitions back to regular after a second?
286+
// Call to the use identify thing that transitions back to regular after a second?
282287
<Modal {...modalProps}>
283288
<Flex flexDirection={DIRECTION_COLUMN} gridGap={SPACING.spacing16}>
284289
<StyledText desktopStyle="bodyDefaultRegular">

components/src/organisms/FixtureOption/index.tsx

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ import { TertiaryButton } from '../../atoms/buttons'
22
import { ListItem } from '../../atoms/ListItem/index'
33
import { StyledText } from '../../atoms/StyledText'
44
import { Flex } from '../../primitives'
5-
import { ALIGN_CENTER, JUSTIFY_FLEX_END, JUSTIFY_SPACE_BETWEEN } from '../../styles'
5+
import {
6+
ALIGN_CENTER,
7+
JUSTIFY_FLEX_END,
8+
JUSTIFY_SPACE_BETWEEN,
9+
} from '../../styles'
610
import { SPACING } from '../../ui-style-constants'
711

812
import type { MouseEventHandler } from 'react'
@@ -16,36 +20,45 @@ interface FixtureOptionProps {
1620
isOnDevice: boolean
1721
}
1822
export function FixtureOption(props: FixtureOptionProps): JSX.Element {
19-
const { onClickHandler, optionName, buttonText, secondaryOnClickHandler, secondaryButtonText } = props
20-
if (secondaryOnClickHandler !== null && secondaryButtonText !== undefined){
21-
return (
23+
const {
24+
onClickHandler,
25+
optionName,
26+
buttonText,
27+
secondaryOnClickHandler,
28+
secondaryButtonText,
29+
} = props
30+
if (secondaryOnClickHandler !== null && secondaryButtonText !== undefined) {
31+
return (
2232
<ListItem
2333
type="default"
2434
padding={SPACING.spacing16 + ' ' + SPACING.spacing24}
2535
alignItems={ALIGN_CENTER}
2636
justifyContent={JUSTIFY_SPACE_BETWEEN}
2737
>
2838
<StyledText desktopStyle="bodyDefaultSemiBold">{optionName}</StyledText>
29-
<Flex gridGap={SPACING.spacing4} width={"10rem"} justifyContent={JUSTIFY_FLEX_END}>
30-
<TertiaryButton
31-
buttonType="secondary"
32-
onClick={secondaryOnClickHandler}
33-
data-testid={optionName}
34-
>
35-
{secondaryButtonText}
36-
</TertiaryButton>
37-
<TertiaryButton
38-
buttonType="primary"
39-
onClick={onClickHandler}
40-
data-testid={optionName}
39+
<Flex
40+
gridGap={SPACING.spacing4}
41+
width={'10rem'}
42+
justifyContent={JUSTIFY_FLEX_END}
4143
>
42-
{buttonText}
43-
</TertiaryButton>
44+
<TertiaryButton
45+
buttonType="secondary"
46+
onClick={secondaryOnClickHandler}
47+
data-testid={optionName}
48+
>
49+
{secondaryButtonText}
50+
</TertiaryButton>
51+
<TertiaryButton
52+
buttonType="primary"
53+
onClick={onClickHandler}
54+
data-testid={optionName}
55+
>
56+
{buttonText}
57+
</TertiaryButton>
4458
</Flex>
4559
</ListItem>
4660
)
47-
}
48-
else{
61+
} else {
4962
return (
5063
<ListItem
5164
type="default"

0 commit comments

Comments
 (0)