removed console log and random fixes

Author: TamarZanzouri

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

@@ -2,7 +2,6 @@ import { useState } from 'react'
 
 import { useUpdateDeckConfigurationMutation } from '@opentrons/react-api-client'
 import {
-  CutoutFixtureIdsWithFakes,
   FLEX_ROBOT_TYPE,
   getDeckDefFromRobotType,
   getReplacementFixtureForFixtureRemoval,
@@ -17,8 +16,8 @@ import { useNotifyDeckConfigurationQuery } from '../useNotifyDeckConfigurationQu
 import type { ReactNode } from 'react'
 import type {
   AddressableAreaNamesWithFakes,
+  CutoutFixtureIdsWithFakes,
   CutoutId,
-  CutoutFixtureId
 } from '@opentrons/shared-data'
 
 const DECK_CONFIG_REFETCH_INTERVAL = 5000
@@ -95,7 +94,6 @@ export function useDeckConfigurationEditingTools(
       )
     } else {
       newDeckConfig = deckConfig.map(cutoutConfig => {
-        console.log('cutoutConfig: ', cutoutConfig)
         return cutoutConfig.cutoutId === cutoutId
           ? {
               ...cutoutConfig,

components/src/hardware-sim/DeckConfigurator/AbsorbanceReaderItem.tsx

@@ -8,11 +8,11 @@ import { TYPOGRAPHY } from '../../ui-style-constants'
 import { RobotCoordsForeignObject } from '../Deck/RobotCoordsForeignObject'
 import {
   COLUMN_DEFAULT_X_ADJUSTMENT,
-  LARGE_SINGLE_ITEM_SLOT_WIDTH,
   CONFIG_STYLE_EDITABLE,
   CONFIG_STYLE_READ_ONLY,
   CONFIG_STYLE_SELECTED,
   FIXTURE_HEIGHT,
+  LARGE_SINGLE_ITEM_SLOT_WIDTH,
   Y_ADJUSTMENT,
 } from './constants'
 

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

@@ -1,8 +1,6 @@
 import { useTranslation } from 'react-i18next'
 
-import {
-  SINGLE_LEFT_CUTOUTS,
-} from '@opentrons/shared-data'
+import { SINGLE_LEFT_CUTOUTS } from '@opentrons/shared-data'
 
 import { StyledText } from '../../atoms/StyledText/StyledText'
 import { COLORS } from '../../helix-design-system'
@@ -23,10 +21,10 @@ import {
 } from './constants'
 
 import type {
+  AddressableAreaNamesWithFakes,
   CutoutFixtureIdsWithFakes,
   CutoutId,
   DeckDefinition,
-  AddressableAreaNamesWithFakes,
 } from '@opentrons/shared-data'
 
 // TODO(BC, 2024-03-21): This component is almost identical to TemperatureModuleFixture, consider consolidating?

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

@@ -1,8 +1,6 @@
 import { useTranslation } from 'react-i18next'
 
-import {
-  SINGLE_LEFT_CUTOUTS,
-} from '@opentrons/shared-data'
+import { SINGLE_LEFT_CUTOUTS } from '@opentrons/shared-data'
 
 import { StyledText } from '../../atoms/StyledText/StyledText'
 import { COLORS } from '../../helix-design-system'
@@ -23,10 +21,10 @@ import {
 } from './constants'
 
 import type {
+  AddressableAreaNamesWithFakes,
   CutoutFixtureIdsWithFakes,
   CutoutId,
   DeckDefinition,
-  AddressableAreaNamesWithFakes
 } from '@opentrons/shared-data'
 
 interface MagneticBlockItemProps {

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

@@ -1,8 +1,6 @@
 import { useTranslation } from 'react-i18next'
 
-import {
-  SINGLE_LEFT_CUTOUTS,
-} from '@opentrons/shared-data'
+import { SINGLE_LEFT_CUTOUTS } from '@opentrons/shared-data'
 
 import { StyledText } from '../../atoms/StyledText/StyledText'
 import { COLORS } from '../../helix-design-system'
@@ -23,10 +21,10 @@ import {
 } from './constants'
 
 import type {
+  AddressableAreaNamesWithFakes,
   CutoutFixtureIdsWithFakes,
   CutoutId,
   DeckDefinition,
-  AddressableAreaNamesWithFakes
 } from '@opentrons/shared-data'
 
 // TODO(BC, 2024-03-21): This component is almost identical to HeaterShakerFixture, consider consolidating?

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

@@ -1,8 +1,6 @@
 import { useTranslation } from 'react-i18next'
 
-import {
-  SINGLE_LEFT_CUTOUTS,
-} from '@opentrons/shared-data'
+import { SINGLE_LEFT_CUTOUTS } from '@opentrons/shared-data'
 
 import { StyledText } from '../../atoms/StyledText/StyledText'
 import { COLORS } from '../../helix-design-system'
@@ -23,10 +21,10 @@ import {
 } from './constants'
 
 import type {
+  AddressableAreaNamesWithFakes,
   CutoutFixtureIdsWithFakes,
   CutoutId,
   DeckDefinition,
-  AddressableAreaNamesWithFakes
 } from '@opentrons/shared-data'
 
 interface TrashBinConfigItemProps {

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

@@ -1,12 +1,6 @@
 import { useTranslation } from 'react-i18next'
 
-import {
-  type AddressableAreaNamesWithFakes,
-  type CutoutFixtureIdsWithFakes,
-  type CutoutId,
-  type DeckDefinition,
-  DEFAULT_AA_FOR_WASTE_CHUTE,
-} from '@opentrons/shared-data'
+import { DEFAULT_AA_FOR_WASTE_CHUTE } from '@opentrons/shared-data'
 
 import { StyledText } from '../../atoms/StyledText/StyledText'
 import { COLORS } from '../../helix-design-system'
@@ -24,6 +18,13 @@ import {
   Y_ADJUSTMENT,
 } from './constants'
 
+import type {
+  AddressableAreaNamesWithFakes,
+  CutoutFixtureIdsWithFakes,
+  CutoutId,
+  DeckDefinition,
+} from '@opentrons/shared-data'
+
 interface WasteChuteConfigItemProps {
   deckDefinition: DeckDefinition
   fixtureLocation: CutoutId

shared-data/js/constants.ts

@@ -678,7 +678,7 @@ export const WASTE_CHUTE_WITH_FAKE_FIXTURES: CutoutFixtureIdsWithFakes[] = [
   STAGING_AREA_SLOT_WITH_WASTE_CHUTE_RIGHT_ADAPTER_COVERED_FIXTURE,
   STAGING_AREA_SLOT_WITH_WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
   FLEX_STACKER_WTIH_WASTE_CHUTE_ADAPTER_NO_COVER_FIXTURE,
-  FAKE_WASTE_CHUTE_WITH_EMPTY_SLOT
+  FAKE_WASTE_CHUTE_WITH_EMPTY_SLOT,
 ]
 
 export const WASTE_CHUTE_ONLY_FIXTURES: CutoutFixtureId[] = [

shared-data/js/fixtures.ts

@@ -415,13 +415,11 @@ export const getReplacementFixtureForFixtureRemoval = (
   if (cutoutFixtureId === STAGING_AREA_RIGHT_SLOT_FIXTURE) {
     return SINGLE_RIGHT_SLOT_FIXTURE
   } else if (addressableAreaId && SINGLE_RIGHT_CUTOUTS.includes(cutoutId)) {
-    console.log('addressableAreaId: ', addressableAreaId)
     const cutoutFixtureReplacment = replaceCutoutFixtureRemove(
       cutoutFixtureId,
       cutoutId,
       addressableAreaId
     )
-    console.log('cutoutFixtureReplacment: ', cutoutFixtureReplacment)
     return getReplacementFixtureForFakeFixture(cutoutFixtureReplacment)
   } else if (SINGLE_RIGHT_CUTOUTS.includes(cutoutId)) {
     return SINGLE_RIGHT_SLOT_FIXTURE
@@ -897,7 +895,6 @@ export const getAASlotNameForAA = (
   const addressableAreasByFIxtureId = getFlexDeckDefAAByFixtureIdForCutoutId(
     cutoutId
   )
-  console.log('addressableAreasByFIxtureId: ', addressableAreasByFIxtureId)
   const aaListForFixtureId = addressableAreasByFIxtureId[fixtureId] ?? []
   const aaMatchInDef = aaListForFixtureId.find(aa => aa === addressableAreaId)
   return aaMatchInDef
@@ -989,8 +986,6 @@ export const replaceCutoutFixtureRemove = (
     cutoutFixtureRemoved,
     deckDef
   )
-  console.log('aaForCutoutAndFixture: ', aaForCutoutAndFixture)
-  console.log('addressableAreaId: ', addressableAreaId)
   if (WASTE_CHUTE_WITH_FAKE_FIXTURES.includes(cutoutFixtureRemoved)) {
     if (addressableAreaId === DEFAULT_AA_FOR_WASTE_CHUTE) {
       if (
@@ -1010,7 +1005,6 @@ export const replaceCutoutFixtureRemove = (
         ? getAASlotNameForAA(cutoutId, cutoutFixtureRemoved, aa)
         : aa
     )
-    console.log('updated: ', updated)
     const match = Object.entries(addressableAreasById).find(([, value]) =>
       isEqual(
         value.sort(),
@@ -1019,7 +1013,6 @@ export const replaceCutoutFixtureRemove = (
           : updated?.sort()
       )
     )
-    console.log('match: ', match)
 
     if (match) {
       return match[0] as CutoutFixtureIdsWithFakes