Skip to content

Commit e3ebb28

Browse files
TamarZanzouriTamarZanzouri
committed
linting, tests and cleanup
1 parent 50083c6 commit e3ebb28

File tree

11 files changed

+137
-107
lines changed

11 files changed

+137
-107
lines changed

‎app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ export function AddFixtureModal({
176176
}) as CutoutConfig[] // we can do this bc we are mapping each aa to the proper fixture
177177

178178
updateDeckConfiguration(newDeckConfig)
179-
console.log('deckConfigWithAA: ', deckConfigWithAA)
180179
closeModal()
181180
}
182181

‎app/src/resources/deck_configuration/hooks/useDeckConfigurationEditingTools.tsx

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ import { useState } from 'react'
22

33
import { useUpdateDeckConfigurationMutation } from '@opentrons/react-api-client'
44
import {
5-
AA_TO_AA_SLOT,
5+
CutoutFixtureIdsWithFakes,
66
FLEX_ROBOT_TYPE,
77
getDeckDefFromRobotType,
8-
getReplacementFixtureForFakeFixture,
98
getReplacementFixtureForFixtureRemoval,
10-
replaceFixtureToFakeFixtureAndTransformCutoutFixturesToAA,
119
} from '@opentrons/shared-data'
1210

1311
// TODO: return the arguments or something - don't instantiate ui in helper code like this
@@ -19,8 +17,8 @@ import { useNotifyDeckConfigurationQuery } from '../useNotifyDeckConfigurationQu
1917
import type { ReactNode } from 'react'
2018
import type {
2119
AddressableAreaNamesWithFakes,
22-
CutoutFixtureIdsWithFakes,
2320
CutoutId,
21+
CutoutFixtureId
2422
} from '@opentrons/shared-data'
2523

2624
const DECK_CONFIG_REFETCH_INTERVAL = 5000
@@ -68,7 +66,8 @@ export function useDeckConfigurationEditingTools(
6866
const replacementFixtureId = getReplacementFixtureForFixtureRemoval(
6967
cutoutFixtureId,
7068
cutoutId,
71-
addressableAreaId )
69+
addressableAreaId
70+
)
7271

7372
const fixtureGroup =
7473
deckDef.cutoutFixtures.find(cf => cf.id === cutoutFixtureId)
@@ -95,20 +94,17 @@ export function useDeckConfigurationEditingTools(
9594
: cutoutConfig
9695
)
9796
} else {
98-
const itemsToUpdateIndex = deckConfig.findIndex(x=> x.cutoutFixtureId === cutoutFixtureId)
99-
// const itemsToUpdateWithFakes = itemsToUpdate.map(x => {return {...x, cutoutFixtureId: replacementFixtureId , addressableAreaId: x.addressableAreaId == addressableAreaId ? AA_TO_AA_SLOT[addressableAreaId] : x.addressableAreaId}})
100-
101-
// console.log("itemsToUpdateWithFakes: ", itemsToUpdateWithFakes)
10297
newDeckConfig = deckConfig.map(cutoutConfig => {
103-
console.log("cutoutConfig: ", cutoutConfig)
98+
console.log('cutoutConfig: ', cutoutConfig)
10499
return cutoutConfig.cutoutId === cutoutId
105100
? {
106101
...cutoutConfig,
107102
cutoutFixtureId: replacementFixtureId,
108-
opentronsModuleSerialNumber: cutoutConfig.opentronsModuleSerialNumber ?? undefined,
103+
opentronsModuleSerialNumber:
104+
cutoutConfig.opentronsModuleSerialNumber ?? undefined,
109105
}
110106
: cutoutConfig
111-
})
107+
})
112108
}
113109
updateDeckConfiguration(newDeckConfig)
114110
}

‎components/src/hardware-sim/DeckConfigurator/HeaterShakerItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { useTranslation } from 'react-i18next'
22

33
import {
4-
AddressableAreaNamesWithFakes,
54
SINGLE_LEFT_CUTOUTS,
65
} from '@opentrons/shared-data'
76

@@ -27,6 +26,7 @@ import type {
2726
CutoutFixtureIdsWithFakes,
2827
CutoutId,
2928
DeckDefinition,
29+
AddressableAreaNamesWithFakes,
3030
} from '@opentrons/shared-data'
3131

3232
// TODO(BC, 2024-03-21): This component is almost identical to TemperatureModuleFixture, consider consolidating?

‎components/src/hardware-sim/DeckConfigurator/MagneticBlockItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { useTranslation } from 'react-i18next'
22

33
import {
4-
AddressableAreaNamesWithFakes,
54
SINGLE_LEFT_CUTOUTS,
65
} from '@opentrons/shared-data'
76

@@ -27,6 +26,7 @@ import type {
2726
CutoutFixtureIdsWithFakes,
2827
CutoutId,
2928
DeckDefinition,
29+
AddressableAreaNamesWithFakes
3030
} from '@opentrons/shared-data'
3131

3232
interface MagneticBlockItemProps {

‎components/src/hardware-sim/DeckConfigurator/TemperatureModuleItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { useTranslation } from 'react-i18next'
22

33
import {
4-
AddressableAreaNamesWithFakes,
54
SINGLE_LEFT_CUTOUTS,
65
} from '@opentrons/shared-data'
76

@@ -27,6 +26,7 @@ import type {
2726
CutoutFixtureIdsWithFakes,
2827
CutoutId,
2928
DeckDefinition,
29+
AddressableAreaNamesWithFakes
3030
} from '@opentrons/shared-data'
3131

3232
// TODO(BC, 2024-03-21): This component is almost identical to HeaterShakerFixture, consider consolidating?

‎components/src/hardware-sim/DeckConfigurator/TrashBinConfigItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { useTranslation } from 'react-i18next'
22

33
import {
4-
AddressableAreaNamesWithFakes,
54
SINGLE_LEFT_CUTOUTS,
65
} from '@opentrons/shared-data'
76

@@ -27,6 +26,7 @@ import type {
2726
CutoutFixtureIdsWithFakes,
2827
CutoutId,
2928
DeckDefinition,
29+
AddressableAreaNamesWithFakes
3030
} from '@opentrons/shared-data'
3131

3232
interface TrashBinConfigItemProps {

‎components/src/hardware-sim/DeckConfigurator/WasteChuteConfigItem.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { useTranslation } from 'react-i18next'
22

33
import {
4-
AddressableAreaNamesWithFakes,
5-
CutoutFixtureIdsWithFakes,
6-
CutoutId,
7-
DeckDefinition,
4+
type AddressableAreaNamesWithFakes,
5+
type CutoutFixtureIdsWithFakes,
6+
type CutoutId,
7+
type DeckDefinition,
88
DEFAULT_AA_FOR_WASTE_CHUTE,
99
} from '@opentrons/shared-data'
1010

‎protocol-designer/src/components/organisms/HardwareConfigurator/useDeckConfigurationEditing.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@ export const getNewConfig = (
333333
): DeckConfiguration => {
334334
const replacementFixtureId = getReplacementFixtureForFixtureRemoval(
335335
cutoutFixtureId,
336-
cutoutId )
336+
cutoutId
337+
)
337338

338339
const fixtureGroup =
339340
deckDef.cutoutFixtures.find(({ id }) => id === cutoutFixtureId)

‎shared-data/js/__tests__/fixtures.test.ts

Lines changed: 63 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@ import { describe, expect, it } from 'vitest'
22

33
import {
44
FAKE_STAGING_AREA_RIGHT_SLOT,
5+
FAKE_STAGING_SLOT_WITH_MAG_BLOCK,
6+
FAKE_WASTE_CHUTE_WITH_EMPTY_SLOT,
57
FLEX_ROBOT_TYPE,
68
FLEX_STACKER_V1_FIXTURE,
79
FLEX_STACKER_WITH_MAG_BLOCK_FIXTURE,
10+
FLEX_STACKER_WTIH_WASTE_CHUTE_ADAPTER_NO_COVER_FIXTURE,
811
MAGNETIC_BLOCK_V1_FIXTURE,
9-
FAKE_STAGING_SLOT_WITH_MAG_BLOCK,
1012
SINGLE_CENTER_SLOT_FIXTURE,
1113
SINGLE_LEFT_SLOT_FIXTURE,
1214
SINGLE_RIGHT_SLOT_FIXTURE,
1315
STAGING_AREA_RIGHT_SLOT_FIXTURE,
1416
STAGING_AREA_SLOT_WITH_MAGNETIC_BLOCK_V1_FIXTURE,
15-
WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
16-
FAKE_WASTE_CHUTE_WITH_EMPTY_SLOT,
1717
TEMPERATURE_MODULE_V2_FIXTURE,
18-
FLEX_STACKER_WTIH_WASTE_CHUTE_ADAPTER_NO_COVER_FIXTURE,
18+
WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
1919
} from '..'
2020
import {
21+
getAASlotNameForAA,
2122
getAAWithFakesFromCutoutFixtureId,
2223
getCutoutFixtureReplacementIfNeeded,
2324
getFlexDeckDefAAByFixtureIdForCutoutId,
2425
getReplacementFixtureForFakeFixture,
2526
getReplacementFixtureForFixtureRemoval,
2627
replaceAAWithFakeAA,
28+
replaceCutoutFixtureRemove,
2729
replaceCutoutFixtureWithComboFixture,
28-
getAASlotNameForAA,
29-
replaceCutoutFixtureRemove
3030
} from '../fixtures'
3131
import { getDeckDefFromRobotType } from '../helpers'
3232

@@ -206,7 +206,8 @@ describe('getReplacementFixtureForFixtureRemoval', () => {
206206
const result = getReplacementFixtureForFixtureRemoval(
207207
STAGING_AREA_RIGHT_SLOT_FIXTURE,
208208
'cutoutD3',
209-
'fakeD4' )
209+
'fakeD4'
210+
)
210211

211212
expect(result).toEqual(SINGLE_RIGHT_SLOT_FIXTURE)
212213
})
@@ -215,7 +216,8 @@ describe('getReplacementFixtureForFixtureRemoval', () => {
215216
const result = getReplacementFixtureForFixtureRemoval(
216217
SINGLE_RIGHT_SLOT_FIXTURE,
217218
'cutoutD3',
218-
'D3' )
219+
'D3'
220+
)
219221

220222
expect(result).toEqual(SINGLE_RIGHT_SLOT_FIXTURE)
221223
})
@@ -224,7 +226,8 @@ describe('getReplacementFixtureForFixtureRemoval', () => {
224226
const result = getReplacementFixtureForFixtureRemoval(
225227
SINGLE_RIGHT_SLOT_FIXTURE,
226228
'cutoutA1',
227-
'A1' )
229+
'A1'
230+
)
228231

229232
expect(result).toEqual(SINGLE_LEFT_SLOT_FIXTURE)
230233
})
@@ -234,7 +237,7 @@ describe('getReplacementFixtureForFixtureRemoval', () => {
234237
SINGLE_RIGHT_SLOT_FIXTURE,
235238
'cutoutA2',
236239
'A2'
237-
)
240+
)
238241

239242
expect(result).toEqual(SINGLE_CENTER_SLOT_FIXTURE)
240243
})
@@ -244,7 +247,7 @@ describe('getReplacementFixtureForFixtureRemoval', () => {
244247
STAGING_AREA_SLOT_WITH_MAGNETIC_BLOCK_V1_FIXTURE,
245248
'cutoutD3',
246249
'magneticBlockV1D3'
247-
)
250+
)
248251

249252
expect(result).toEqual(STAGING_AREA_RIGHT_SLOT_FIXTURE)
250253
})
@@ -254,7 +257,7 @@ describe('getReplacementFixtureForFixtureRemoval', () => {
254257
FLEX_STACKER_WITH_MAG_BLOCK_FIXTURE,
255258
'cutoutD3',
256259
'magneticBlockV1D3'
257-
)
260+
)
258261

259262
expect(result).toEqual(FLEX_STACKER_V1_FIXTURE)
260263
})
@@ -271,15 +274,9 @@ describe('getFlexDeckDefAAByFixtureIdForCutoutId', () => {
271274
flexStackerModuleV1WithMagneticBlockV1: [
272275
'flexStackerModuleV1A4',
273276
'magneticBlockV1A3',
274-
],
275-
fakeStagingAreaRightSlot: [
276-
"A3",
277-
"fakeA4",
278-
],
279-
fakeStagingSlotWithMagBlockV1: [
280-
"magneticBlockV1A3",
281-
"fakeA4",
282-
],
277+
],
278+
fakeStagingAreaRightSlot: ['A3', 'fakeA4'],
279+
fakeStagingSlotWithMagBlockV1: ['magneticBlockV1A3', 'fakeA4'],
283280
heaterShakerModuleV1: ['heaterShakerV1A3'],
284281
temperatureModuleV2: ['temperatureModuleV2A3'],
285282
magneticBlockV1: ['magneticBlockV1A3'],
@@ -299,18 +296,9 @@ describe('getFlexDeckDefAAByFixtureIdForCutoutId', () => {
299296
'absorbanceReaderV1D3',
300297
'absorbanceReaderV1LidDockD4',
301298
],
302-
fakeStagingAreaRightSlot: [
303-
"D3",
304-
"fakeD4",
305-
],
306-
fakeStagingSlotWithMagBlockV1: [
307-
"fakeD4",
308-
"magneticBlockV1D3",
309-
],
310-
fakeWasteChuteWithEmptySlot: [
311-
"96ChannelWasteChute",
312-
"fakeD4",
313-
],
299+
fakeStagingAreaRightSlot: ['D3', 'fakeD4'],
300+
fakeStagingSlotWithMagBlockV1: ['fakeD4', 'magneticBlockV1D3'],
301+
fakeWasteChuteWithEmptySlot: ['96ChannelWasteChute', 'fakeD4'],
314302
flexStackerModuleV1: ['D3', 'flexStackerModuleV1D4'],
315303
flexStackerModuleV1WithMagneticBlockV1: [
316304
'flexStackerModuleV1D4',
@@ -326,7 +314,7 @@ describe('getFlexDeckDefAAByFixtureIdForCutoutId', () => {
326314
'8ChannelWasteChute',
327315
'96ChannelWasteChute',
328316
'flexStackerModuleV1D4',
329-
'gripperWasteChute'
317+
'gripperWasteChute',
330318
],
331319
singleRightSlot: ['D3'],
332320
stagingAreaRightSlot: ['D3', 'D4'],
@@ -374,49 +362,79 @@ describe('getFlexDeckDefAAByFixtureIdForCutoutId', () => {
374362

375363
describe('getReplacementFixtureForFakeFixture', () => {
376364
it('should return staging slot fixture instead of FAKE_STAGING_AREA_RIGHT_SLOT', () => {
377-
const result = getReplacementFixtureForFakeFixture(FAKE_STAGING_AREA_RIGHT_SLOT)
365+
const result = getReplacementFixtureForFakeFixture(
366+
FAKE_STAGING_AREA_RIGHT_SLOT
367+
)
378368
expect(result).toEqual(SINGLE_RIGHT_SLOT_FIXTURE)
379369
})
380370

381371
it('should return waste chute fixture instead of FAKE_WASTE_CHUTE_WITH_EMPTY_SLOT', () => {
382-
const result = getReplacementFixtureForFakeFixture(FAKE_WASTE_CHUTE_WITH_EMPTY_SLOT)
372+
const result = getReplacementFixtureForFakeFixture(
373+
FAKE_WASTE_CHUTE_WITH_EMPTY_SLOT
374+
)
383375
expect(result).toEqual(WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE)
384376
})
385377

386378
it('should return mag block fixture instead of FAKE_STAGING_SLOT_WITH_MAG_BLOCK', () => {
387-
const result = getReplacementFixtureForFakeFixture(FAKE_STAGING_SLOT_WITH_MAG_BLOCK)
379+
const result = getReplacementFixtureForFakeFixture(
380+
FAKE_STAGING_SLOT_WITH_MAG_BLOCK
381+
)
388382
expect(result).toEqual(MAGNETIC_BLOCK_V1_FIXTURE)
389383
})
390384
})
391385

392-
describe('getAASlotNameForAA', ()=> {
386+
describe('getAASlotNameForAA', () => {
393387
it('should get aa name for single right slot', () => {
394-
const result = getAASlotNameForAA('cutoutA3', FAKE_STAGING_SLOT_WITH_MAG_BLOCK, 'magneticBlockV1A3')
388+
const result = getAASlotNameForAA(
389+
'cutoutA3',
390+
FAKE_STAGING_SLOT_WITH_MAG_BLOCK,
391+
'magneticBlockV1A3'
392+
)
395393
expect(result).toEqual('A3')
396394
})
397395

398396
it('should return aa name for single center slot', () => {
399-
const result = getAASlotNameForAA('cutoutD1', TEMPERATURE_MODULE_V2_FIXTURE, 'temperatureModuleV2D1')
397+
const result = getAASlotNameForAA(
398+
'cutoutD1',
399+
TEMPERATURE_MODULE_V2_FIXTURE,
400+
'temperatureModuleV2D1'
401+
)
400402
expect(result).toEqual('D1')
401403
})
402404

403405
it('should get input aa name for single center slot', () => {
404-
const result = getAASlotNameForAA('cutoutD2', MAGNETIC_BLOCK_V1_FIXTURE, 'magneticBlockV1D2')
406+
const result = getAASlotNameForAA(
407+
'cutoutD2',
408+
MAGNETIC_BLOCK_V1_FIXTURE,
409+
'magneticBlockV1D2'
410+
)
405411
expect(result).toEqual('D2')
406412
})
407413
})
408414

409415
describe('replaceCutoutFixtureRemove', () => {
410416
it('should get fixture replacment for FLEX_STACKER_WITH_MAG_BLOCK_FIXTURE', () => {
411-
const result = replaceCutoutFixtureRemove(FLEX_STACKER_WITH_MAG_BLOCK_FIXTURE, 'cutoutD3', 'magneticBlockV1D3')
417+
const result = replaceCutoutFixtureRemove(
418+
FLEX_STACKER_WITH_MAG_BLOCK_FIXTURE,
419+
'cutoutD3',
420+
'magneticBlockV1D3'
421+
)
412422
expect(result).toEqual(FLEX_STACKER_V1_FIXTURE)
413423
})
414424
it('should get fixture replacment for MAGNETIC_BLOCK_V1_FIXTURE', () => {
415-
const result = replaceCutoutFixtureRemove(MAGNETIC_BLOCK_V1_FIXTURE, 'cutoutD3', 'magneticBlockV1D3')
425+
const result = replaceCutoutFixtureRemove(
426+
MAGNETIC_BLOCK_V1_FIXTURE,
427+
'cutoutD3',
428+
'magneticBlockV1D3'
429+
)
416430
expect(result).toEqual(SINGLE_RIGHT_SLOT_FIXTURE)
417431
})
418432
it('should get fixture replacment for FLEX_STACKER_WITH_WASTE_CHUTE_ADAPTER_COVERED_FIXTURE', () => {
419-
const result = replaceCutoutFixtureRemove(FLEX_STACKER_WTIH_WASTE_CHUTE_ADAPTER_NO_COVER_FIXTURE, 'cutoutD3', 'flexStackerModuleV1D4')
433+
const result = replaceCutoutFixtureRemove(
434+
FLEX_STACKER_WTIH_WASTE_CHUTE_ADAPTER_NO_COVER_FIXTURE,
435+
'cutoutD3',
436+
'flexStackerModuleV1D4'
437+
)
420438
expect(result).toEqual(WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE)
421439
})
422-
})
440+
})

0 commit comments

Comments
 (0)